[FIX] module name

calendar_default_value/__openerp__.py

@@ -3,15 +3,19 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 {
-    'name': 'Calendar Usability',
+    'name': 'Calendar Default Values',
-    'summary': 'Make calendar creation quicker',
+    'summary': 'Makes calendar creation quicker',
     'description': """
-Calendar Usability
+Calendar Default Values
-==================
+=======================
 
 Define opening hours for each day of week at calendar creation.
 
-Override map_day() and get_my_calendar_data() method to customize behavior.
+Method to override for behavior customization:
+
+    - get_my_calendar_data()
+    - map_day()
+    - string_format()
 
 """,
     'version': '8.0.1.0.0',
@@ -22,6 +26,7 @@ Override map_day() and get_my_calendar_data() method to customize behavior.
     ],
     'website': 'http://www.akretion.com/',
     'data': [
+        'calendar_view.xml',
     ],
     'license': 'AGPL-3',
 }

calendar_default_value/calendar_view.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<openerp>
+  <data>
+
+
+    <record id="resource_calendar_form" model="ir.ui.view">
+        <field name="model">resource.calendar</field>
+        <field name="inherit_id" ref="resource.resource_calendar_form"/>
+        <field name="arch" type="xml">
+            <field name="name" position="after">
+                <field name="hour_range"/>
+            </field>
+        </field>
+    </record>
+
+    <record id="view_resource_calendar_tree" model="ir.ui.view">
+        <field name="model">resource.calendar</field>
+        <field name="inherit_id" ref="resource.view_resource_calendar_tree"/>
+        <field name="arch" type="xml">
+            <field name="name" position="after">
+                <field name="hour_range"/>
+            </field>
+        </field>
+    </record>
+
+
+  </data>
+</openerp>

calendar_default_value/i18n/calendar_default_value.pot

@@ -0,0 +1,37 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* calendar_default_value
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-01-05 17:42+0000\n"
+"PO-Revision-Date: 2016-01-05 17:42+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: calendar_default_value
+#: field:resource.calendar,hour_range:0
+msgid "Hour Range"
+msgstr ""
+
+#. module: calendar_default_value
+#: model:ir.model,name:calendar_default_value.model_resource_calendar
+msgid "Resource Calendar"
+msgstr ""
+
+#. module: calendar_default_value
+#: help:resource.calendar,hour_range:0
+msgid "String representation of working hours"
+msgstr ""
+
+#. module: calendar_default_value
+#: model:ir.model,name:calendar_default_value.model_resource_calendar_attendance
+msgid "Work Detail"
+msgstr ""
+

calendar_default_value/i18n/fr_FR.po

@@ -0,0 +1,38 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* calendar_default_value
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-01-05 18:43+0100\n"
+"PO-Revision-Date: 2016-01-05 18:44+0100\n"
+"Last-Translator: David BEAL <david.beal@akretion.com>\n"
+"Language-Team: \n"
+"Language: fr_FR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: Poedit 1.8.4\n"
+
+#. module: calendar_default_value
+#: field:resource.calendar,hour_range:0
+msgid "Hour Range"
+msgstr "Plage Horaire"
+
+#. module: calendar_default_value
+#: model:ir.model,name:calendar_default_value.model_resource_calendar
+msgid "Resource Calendar"
+msgstr "Calendrier de la ressource"
+
+#. module: calendar_default_value
+#: help:resource.calendar,hour_range:0
+msgid "String representation of working hours"
+msgstr "Représentation en chaîne de caractères des heures de travail"
+
+#. module: calendar_default_value
+#: model:ir.model,name:calendar_default_value.model_resource_calendar_attendance
+msgid "Work Detail"
+msgstr "Détail du travail"

calendar_default_value/resource.py

@@ -6,10 +6,29 @@ import collections
 from openerp import models, fields, api
 
 
+class ResourceCalendarAttendance(models.Model):
+    _inherit = 'resource.calendar.attendance'
+
+    # PR is done for v9
+    # https://github.com/odoo/odoo/pull/10310
+    calendar_id = fields.Many2one(ondelete='cascade')
+
+
 class ResourceCalendar(models.Model):
     _inherit = 'resource.calendar'
+    _rec_name = 'display_name'
 
-    name = fields.Char(compute='_compute_name', store=True)
+    hour_range = fields.Char(
+        string='Hour Range', compute='_compute_hour_range',
+        readonly=True, store=True,
+        help="String representation of working hours")
+    display_name = fields.Char(compute='_compute_display_name', store=True)
+
+    @api.multi
+    @api.depends('name', 'hour_range')
+    def _compute_display_name(self):
+        for rec in self:
+            rec.display_name = "%s: %s" % (rec.name, rec.hour_range)
 
     @api.model
     def default_get(self, fields_list):
@@ -28,9 +47,32 @@ class ResourceCalendar(models.Model):
         values['attendance_ids'] = vals
         return values
 
+    @api.model
+    def _populate_attendance(self, hours, hour_from, hour_to):
+        return {
+            'hour_from': hour_from,
+            'hour_to': hour_to,
+            'name': '.',
+            'dayofweek': str(hours),
+        }
+
+    @api.model
+    def get_my_calendar_data(self):
+        'Override me according to your opening hours'
+        Params = collections.namedtuple(
+            'Params', 'hour_from hour_to hour_from2 hour_to2 endday')
+        return Params(
+            endday=5,
+            hour_from=8,
+            hour_to=12,
+            # put hour_to/from to False if you don't want use them
+            hour_from2=13,
+            hour_to2=17,
+        )
+
     @api.multi
     @api.depends('attendance_ids')
-    def _compute_name(self):
+    def _compute_hour_range(self):
         for rec in self:
             if rec.attendance_ids:
                 info = []
@@ -52,43 +94,20 @@ class ResourceCalendar(models.Model):
                             info[-1:][0], int(hours.hour_from),
                             int(hours.hour_to))
                     dayofweek = hours.dayofweek
-                rec.name = ', '.join(info)
+                rec.hour_range = ', '.join(info)
 
     @api.model
     def string_format(self, main_string=None):
-        'Override me to customize calendar name'
+        'Override me to customize calendar hour_range'
         if main_string:
             # ie: 'Lu 8-12'
             return '%s %s-%s'
-        # ie: 'Lu 8-12 and 13-17'
+        # ie: 'Lu 8-12 / 13-17'
         return '%s / %s-%s'
 
     @api.model
     def map_day(self):
-        'Override me to customize calendar name'
+        'Override me to customize calendar hour_range'
         return {'Monday': 'Lu', 'Tuesday': 'Ma', 'Wednesday': 'Me',
                 'Thursday': 'Je', 'Friday': 'Ve', 'Saturday': 'Sa',
                 'Sunday': 'Di'}
-
-    @api.model
-    def get_my_calendar_data(self):
-        'Override me according to your opening hours'
-        Params = collections.namedtuple(
-            'Params', 'hour_from hour_to hour_from2 hour_to2 endday')
-        return Params(
-            endday=5,
-            hour_from=8,
-            hour_to=12,
-            # put hour_to/from to False if you don't want use them
-            hour_from2=13,
-            hour_to2=17,
-        )
-
-    @api.model
-    def _populate_attendance(self, hours, hour_from, hour_to):
-        return {
-            'hour_from': hour_from,
-            'hour_to': hour_to,
-            'name': '.',
-            'dayofweek': str(hours),
-        }