Merge branch '11.0' of https://github.com/hibou-io/hibou-odoo-suite into 11.0

maintenance_purchase_detail/README.rst

@@ -0,0 +1,26 @@
+***********************************
+Hibou - Maintenance Purchase Detail
+***********************************
+
+Record purchase date and details on Equipments.
+
+For more information and add-ons, visit `Hibou.io <https://hibou.io/>`_.
+
+=============
+Main Features
+=============
+
+Adds the following fields to Maintenance Equipment:
+
+* Purchase Date
+* Purchase Condition (dropdown)
+* Purchase Note
+
+Additionally, adds a smart button to archive Equipments.
+
+=======
+License
+=======
+
+Please see `LICENSE <https://github.com/hibou-io/hibou-odoo-suite/blob/master/LICENSE>`_.
+Copyright Hibou Corp. 2018

maintenance_purchase_detail/__init__.py

@@ -0,0 +1 @@
+from . import models

maintenance_purchase_detail/__manifest__.py

@@ -0,0 +1,22 @@
+{
+    'name': 'Equipment Purchase Detail',
+    'version': '11.0.1.0.0',
+    'author': 'Hibou Corp. <hello@hibou.io>',
+    'category': 'Human Resources',
+    'summary': 'Record purchase date and details on Equipments.',
+    'description': """
+Equipment Purchase Detail
+=========================
+
+Adds fields for purchase date, and condition on the Equipment form.
+""",
+    'website': 'https://hibou.io/',
+    'depends': [
+        'maintenance',
+    ],
+    'data': [
+        'views/maintenance_views.xml',
+    ],
+    'installable': True,
+    'auto_install': False,
+}

maintenance_purchase_detail/models/__init__.py

@@ -0,0 +1 @@
+from . import maintenance

maintenance_purchase_detail/models/maintenance.py

@@ -0,0 +1,13 @@
+from odoo import api, fields, models
+
+
+class MaintenanceEquipment(models.Model):
+    _inherit = 'maintenance.equipment'
+
+    purchase_date = fields.Date(string='Purchase Date')
+    purchase_condition = fields.Selection([
+                             ('new', 'New'),
+                             ('used', 'Used'),
+                             ('other', 'Other'),
+                         ], string='Purchase Condition')
+    purchase_note = fields.Text(string='Purchase Note')

maintenance_purchase_detail/views/maintenance_views.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record model="ir.ui.view" id="hr_equipment_view_form_inherited">
+        <field name="name">equipment.form.inherited</field>
+        <field name="model">maintenance.equipment</field>
+        <field name="inherit_id" ref="maintenance.hr_equipment_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@name='button_box']" position="inside">
+                <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
+                    <field name="active" widget="boolean_button" options="{&quot;terminology&quot;: &quot;archive&quot;}"/>
+                </button>
+            </xpath>
+            <xpath expr="//field[@name='warranty']" position="after">
+                <field name="purchase_date"/>
+                <field name="purchase_condition"/>
+                <field name="purchase_note"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>

maintenance_usage/views/maintenance_views.xml

@@ -17,6 +17,7 @@
         <field name="name">equipment.form.inherited</field>
         <field name="model">maintenance.equipment</field>
         <field name="inherit_id" ref="maintenance.hr_equipment_view_form"/>
+        <field name="priority" eval="200"/>
         <field name="arch" type="xml">
             <xpath expr="//div[@name='button_box']" position="inside">
                 <button name="action_open_usage_log"
@@ -27,16 +28,12 @@
                     <field string="Usage" name="usage_count" widget="statinfo"/>
                 </button>
             </xpath>
-            <xpath expr="//field[@name='note']" position="before">
-                <group>
-                    <group name="usage_info" string="Usage">
-                        <label for="usage_qty"/>
-                        <div class="o_row" name="usage">
-                            <field name="usage_qty" nolabel="1"/>
-                            <field name="usage_uom_id" nolabel="1" readonly="1"/>
-                        </div>
-                    </group>
-                </group>
+            <xpath expr="//form/sheet/group/group[1]" position="inside">
+                <label for="usage_qty"/>
+                <div class="o_row" name="usage">
+                    <field name="usage_qty" nolabel="1"/>
+                    <field name="usage_uom_id" nolabel="1" readonly="1"/>
+                </div>
             </xpath>
             <xpath expr="//group[@name='maintenance']" position="inside">
                 <field name="maintenance_usage"/>