Merge lp:~vauxoo/openerp-policies/truiz-openerp-policies into lp:openerp-policies

[Tulio Ruiz (Vauxoo)]

Fix 956340 and 956332

Unmerged revisions

92. By Tulio Ruiz (Vauxoo) on 2012-03-19

[FIX] Se arregla el cominio para que se puedan seleccionar a los usuarios que están en el grupo de técnicos únicamente como responsables de los equipos

91. By Tulio Ruiz (Vauxoo) on 2012-03-19

[FIX] Comentada la carga de xmls ya que se mostraban errores y hay un script para dicha migración

=== modified file 'policy_maintenance/__openerp__.py'
--- policy_maintenance/__openerp__.py	2011-08-17 08:14:48 +0000
+++ policy_maintenance/__openerp__.py	2012-03-19 15:33:19 +0000
@@ -33,24 +33,25 @@
     'category' : 'Custom',
     'website' : 'http://vauxoo.com',
     'depends' : ['base', 'account', 'sale', 'project', 'hr', 'hr_expense', 'crm_profiling', 'decimal_precision'],
-    'update_xml' : ['policy_maintenance_menu.xml',
+    'update_xml' : [
+                    'security/groups.xml',
+                    'security/ir.model.access.csv',
+                    'policy_maintenance_menu.xml',
                     'vehicle_view.xml',
                     'policy_equipment_view.xml',
                     'invoice_view.xml',
                     'partner_view.xml',
-#                    'security/groups.xml',
-#                    'security/ir.model.access.csv',
                 ],
     'init_xml' : [
             'data/decimal_precision.xml',
-            'data/res_partner_clients.xml',
-            'data/partner_locations.xml',
-            'data/policy_contract.xml',
-            'data/equipment_service_type.xml',
-            'data/policy_equipment.xml',
-            'data/equipment_type.xml',
-            'data/payment_types.xml',
-            'data/vehicle.xml',
+#            'data/res_partner_clients.xml',
+#            'data/partner_locations.xml',
+#            'data/policy_contract.xml',
+#            'data/equipment_service_type.xml',
+#            'data/policy_equipment.xml',
+#            'data/equipment_type.xml',
+#            'data/payment_types.xml',
+#            'data/vehicle.xml',
         ],
     'active' : False,
     'installable': True,
 
=== modified file 'policy_maintenance/partner_view.xml'
--- policy_maintenance/partner_view.xml	2011-08-10 15:18:01 +0000
+++ policy_maintenance/partner_view.xml	2012-03-19 15:33:19 +0000
@@ -27,14 +27,14 @@
             <data>
                 <field name="progress_rate" position="replace" />
                 <field name="parent_id" position="replace" />
-                <field name="priority" position="replace" />
-                <field name="timesheet_id" position="replace" />
+                <!--                <field name="priority" position="replace" /> -->
+                <!--                <field name="sheet" position="replace" /> -->
                 <field name="planned_hours" position="replace" />
                 <field name="effective_hours" position="replace" />
                 <field name="date_start" position="replace">
                     <field name="date_planned" />
                 </field>
-                <field name="date_end" position="replace">
+                <field name="date" position="replace">
                     <field name="date_done" />
                 </field>
                 <field name="date_done" position="after">
 
=== modified file 'policy_maintenance/policy.py'
--- policy_maintenance/policy.py	2011-07-11 18:21:32 +0000
+++ policy_maintenance/policy.py	2012-03-19 15:33:19 +0000
@@ -276,6 +276,22 @@
 
 class technician(osv.osv):
     _inherit = "hr.employee"
+
+    def _is_tech_fcn(self, cr, uid, ids, prop, unknow_none, context = None):
+        if context is None:
+            context = {}
+        res = {}
+        if not len(ids):
+            return res
+        reads = self.browse(cr, uid, ids, context=context)
+        for record in reads:
+            res.update({record.id:False})
+            for cat in record.category_ids:
+                if cat.id == 57:
+                    res.update({record.id:True})
+                    continue
+        return res
+
     _columns = {
         'policy_ids': fields.many2many(
                 'policy.contract',
@@ -284,8 +300,18 @@
                 'policy_id',
                 'Policies',
             ),
+        'is_technician': fields.function(
+            _is_tech_fcn, 
+            method=True, 
+            store={'hr.employee': (lambda self, cr, uid, ids, c={}: ids, ['category_ids'], 20)},
+            type="boolean", 
+            string='Is technician', 
+            help="Wether employee is technician or not"),
     }
 
+technician()
+
+
 
 class sale_order(osv.osv):
     _inherit = 'sale.order'
 
=== modified file 'policy_maintenance/policy_equipment_view.xml'
--- policy_maintenance/policy_equipment_view.xml	2011-08-17 19:10:26 +0000
+++ policy_maintenance/policy_equipment_view.xml	2012-03-19 15:33:19 +0000
@@ -92,7 +92,7 @@
                         <newline/>
                         <separator string="Equipment's Preventive Maintenance" colspan="4"/>
                         <newline/>
-                        <field name="employee_id" domain="[('category_id', '=', 'Técnico')]"/>
+                        <field name="employee_id" domain="[('is_technician', '=', True)]"/>
                         <field name="eq_preventive_mainteinance_ids" nolabel="1"/>
                     </group>
                 </form>
 
=== modified file 'policy_maintenance/security/ir.model.access.csv'
--- policy_maintenance/security/ir.model.access.csv	2011-04-19 00:36:29 +0000
+++ policy_maintenance/security/ir.model.access.csv	2012-03-19 15:33:19 +0000
@@ -1,12 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "equipment_full_manager","equipment_full_manager","model_policy_equipment","policy_manager",1,1,1,1
 "contract_coverage_full_manager","contract_coverage_full_manager","model_policy_contract_coverage","policy_manager",1,1,1,1
-"tech_team_full_manager","tech_team_full_manager","model_policy_tech","policy_manager",1,1,1,1
-"tech_team_contract_full_manager","tech_team_contract_manager","model_policy_tech_contract","policy_manager",1,1,1,1
 "payment_type_full_manager","payment_type_full_manager","model_policy_payment_type","policy_manager",1,1,1,1
 "contract_full_manager","contract_full_manager","model_policy_contract","policy_manager",1,1,1,1
 "equipment_type_full_manager","equipment_type_full_manager","model_policy_equipment_type","policy_manager",1,1,1,1
 "service_type_full_manager","service_type_full_manager","model_policy_equipment_service_type","policy_manager",1,1,1,1
 "vehicle_full_manager","vehicle_full_manager","model_policy_vehicle","policy_manager",1,1,1,1
-"tech_full_manager","tech_full_manager","model_tech_team","policy_manager",1,1,1,1
-"tech_contract_full_manager","tech_contract_full_manager","model_tech_team_contract","policy_manager",1,1,1,1