Merge lp:~camptocamp/openobject-addons/7.0-fix-1190259 into lp:openobject-addons/7.0

[Yannick Vaucher @ Camptocamp]

[FIX] analytic_user_function - wrong override of domain for account_id in timesheet lines

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

An other option would be to use the boolean field 'use_timehseets'

There is a bigger cleaning to do about it in hr_timesheet and hr_timesheet_sheet modules

Complete domain might be
[('type','in',['normal', 'contract']), ('state', '<>', 'close'),('use_timesheets','=',1)]

gtAnd complete context should be:
context="{'default_use_timesheets': 1, 'default_type': 'contract'}"

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

I corrected it by using position="attributes" instead of position="replace" this should solve most of the issues still some changes needs to be in hr_timesheet/hr_timesheet_view.xml and in hr_timesheet_sheet/hr_timesheet_sheet_view.xml

[lp:~camptocamp/openobject-addons/7.0-fix-1190259]

9230. By Yannick Vaucher @ Camptocamp on 2013-06-13

[IMP] hr_timesheet_sheet - domain and context of account_id in hr_timesheet_sheet view

9231. By Yannick Vaucher @ Camptocamp on 2013-06-13

[IMP] hr_timesheet - domain and context of account_id in hr_timesheet_line view, also removed checked on parent_id != False as this seems too restricitve and filtering on type should be enough

9232. By Yannick Vaucher @ Camptocamp on 2013-08-30

[FIX] hr_timesheet - operator in domain

Unmerged revisions

9232. By Yannick Vaucher @ Camptocamp on 2013-08-30

[FIX] hr_timesheet - operator in domain

9231. By Yannick Vaucher @ Camptocamp on 2013-06-13

[IMP] hr_timesheet - domain and context of account_id in hr_timesheet_line view, also removed checked on parent_id != False as this seems too restricitve and filtering on type should be enough

9230. By Yannick Vaucher @ Camptocamp on 2013-06-13

[IMP] hr_timesheet_sheet - domain and context of account_id in hr_timesheet_sheet view

9229. By Yannick Vaucher @ Camptocamp on 2013-06-13

[IMP] analytic_user_function - use attributes instead of replace in view inheritance in order to keep domain and context

9228. By Yannick Vaucher @ Camptocamp on 2013-06-13

[FIX] analytic_user_function - also add contract in domain for hr_timesheet_line view inherits

9227. By Yannick Vaucher @ Camptocamp on 2013-06-12

[FIX] analytic_user_function - wrong override of domain for account_id in timesheet lines

=== modified file 'analytic_user_function/analytic_user_function_view.xml'
--- analytic_user_function/analytic_user_function_view.xml	2013-03-12 12:33:21 +0000
+++ analytic_user_function/analytic_user_function_view.xml	2013-08-30 12:45:36 +0000
@@ -65,8 +65,8 @@
             <field name="priority" eval="18"/>
             <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='timesheet_ids']/tree/field[@name='account_id']" position="replace">
-                    <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)"/>
+                <xpath expr="//field[@name='timesheet_ids']/tree/field[@name='account_id']" position="attributes">
+                    <attribute name="on_change">on_change_account_id(account_id, user_id, unit_amount)</attribute>
                 </xpath>
             </field>
         </record>
@@ -78,8 +78,8 @@
             <field name="priority" eval="19"/>
             <field name="inherit_id" ref="hr_timesheet_sheet.hr_timesheet_sheet_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='timesheet_ids']/form/field[@name='account_id']" position="replace">
-                    <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)"/>
+                <xpath expr="//field[@name='timesheet_ids']/form/field[@name='account_id']" position="attributes">
+                    <attribute name="on_change">on_change_account_id(account_id, user_id, unit_amount)</attribute>
                 </xpath>
             </field>
         </record>
@@ -90,8 +90,8 @@
             <field name="model">hr.analytic.timesheet</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='account_id']" position="replace">
-                    <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" />
+                <xpath expr="//field[@name='account_id']" position="attributes">
+                    <attribute name="on_change">on_change_account_id(account_id, user_id, unit_amount)</attribute>
                 </xpath>
             </field>
         </record>
@@ -112,8 +112,8 @@
             <field name="model">hr.analytic.timesheet</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
             <field name="arch" type="xml">
-                <xpath expr="/tree/field[@name='account_id']" position="replace">
-                    <field name="account_id" domain="[('type','=','normal'),('state', '&lt;&gt;', 'close')]" on_change="on_change_account_id(account_id, user_id, unit_amount)" />
+                <xpath expr="/tree/field[@name='account_id']" position="attributes">
+                    <attribute name="on_change">on_change_account_id(account_id, user_id, unit_amount)</attribute>
                 </xpath>
             </field>
         </record>

=== modified file 'hr_timesheet/hr_timesheet_view.xml'
--- hr_timesheet/hr_timesheet_view.xml	2012-12-14 11:14:32 +0000
+++ hr_timesheet/hr_timesheet_view.xml	2013-08-30 12:45:36 +0000
@@ -10,7 +10,7 @@
                     <field name="date" on_change="on_change_date(date)"/>
                     <field name="user_id" on_change="on_change_user_id(user_id)" required="1" options='{"no_open": True}'/>
                     <field name="name"/>
-                    <field domain="[('type','=','normal'),('use_timesheets','=',1)]" name="account_id" context="{'default_use_timesheets': 1, 'default_type': 'contract'}"/>
+                    <field domain="[('type','in',['normal','contract']),('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" context="{'default_use_timesheets': 1, 'default_type': 'contract'}"/>
                     <field name="unit_amount" string="Duration" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" sum="Total time" widget="float_time"/>
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" invisible="1"/>
                     <field name="journal_id" invisible="1"/>
@@ -47,7 +47,7 @@
                                 </div>
                             </group>
                             <group string="Accounting">
-                                <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id" select="1"/>
+                                <field domain="[('type','in',['normal','contract']),('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" select="1" context="{'default_use_timesheets': 1, 'default_type': 'contract'}"/>
                                 <field name="amount"/>
                                 <field name="general_account_id"/>
                                 <field name="journal_id"/>

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_view.xml'
--- hr_timesheet_sheet/hr_timesheet_sheet_view.xml	2012-12-17 11:14:02 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet_view.xml	2013-08-30 12:45:36 +0000
@@ -106,7 +106,7 @@
                             <field context="{'employee_id': employee_id, 'user_id':user_id, 'timesheet_date_from': date_from, 'timesheet_date_to': date_to}" name="timesheet_ids" nolabel="1">
                                 <tree editable="top" string="Timesheet Activities">
                                     <field name="date"/>
-                                    <field domain="[('type','in',['normal', 'contract']), ('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id, user_id)" context="{'default_use_timesheets': 1}"/>
+                                    <field domain="[('type','in',['normal', 'contract']), ('state', '&lt;&gt;', 'close'), ('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id, user_id)" context="{'default_use_timesheets': 1, 'default_type': 'contract'}"/>
                                     <field name="name"/>
                                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time" string="Hours" sum="Hours"/>
                                     <field name="to_invoice" widget="selection"/>
@@ -119,7 +119,7 @@
                                 </tree>
                                 <form string="Timesheet Activities" version="7.0">
                                     <field name="date"/>
-                                    <field domain="[('type','=','normal'), ('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id, user_id)"/>
+                                    <field domain="[('type','in',['normal', 'contract']), ('state', '&lt;&gt;', 'close'), ('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id, user_id)" context="{'default_use_timesheets': 1, 'default_type': 'contract'}"/>
                                     <field name="name"/>
                                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
                                     <field name="to_invoice"/>