Merge lp:~openerp-dev/openobject-addons/7.0-opw-593811-dhr into lp:openobject-addons/7.0

[Dharti Ratani(OpenERP)]

Hello Sir,

Improved Analytic Accounts form view.
Steps to produce :
Install account_analytic_analysis or analytic_contract_hr_expense module.
Create an analytic account.
Set Timesheets true.
Set the type to 'contract or project' or 'template of contract'.
Set On Timesheets or Charge Expenses true.
Remove either pricelist or Invoicng ratio (which is required here)
Then change the type to Analytic account or Analytic view, the Contract Information page is invisible but the error shows Invalid field error and you can't save the form.
So made both fields require if type is Contract or temlated and On timesheets or Charge expense is true.

Thanks
dhr

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Please see remarks from https://code.launchpad.net/~camptocamp/ocb-addons/lp1191036/+merge/171050

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/7.0-opw-593811-dhr]

9247. By Dharti Ratani(OpenERP) on 2013-09-11

[MERGE]Merged with 7.0

9248. By Dharti Ratani(OpenERP) on 2013-09-11

[IMP]Improved as per suggestion

[Dharti Ratani(OpenERP) (dhr-openerp)]

Hello,

I have improved as per suggestion.

Thanks
Dharti

review: Needs Resubmitting

Unmerged revisions

9248. By Dharti Ratani(OpenERP) on 2013-09-11

[IMP]Improved as per suggestion

9247. By Dharti Ratani(OpenERP) on 2013-09-11

[MERGE]Merged with 7.0

9246. By Dharti Ratani(OpenERP) on 2013-06-17

[FIX]Changed the attrs in account_analytic_analysis for Pricelists and Invoicing ratio in an analytic account form should be required if type is contract or project and invoiceing is based on timesheet or expenses

9245. By Dharti Ratani(OpenERP) on 2013-06-17

[FIX]Fixed the issue: Pricelists and Invoicing ratio in an analytic account form should be required if type is contract or project and invoiceing is based on timesheet or expenses

=== modified file 'account_analytic_analysis/account_analytic_analysis_view.xml'
--- account_analytic_analysis/account_analytic_analysis_view.xml	2013-06-07 16:09:27 +0000
+++ account_analytic_analysis/account_analytic_analysis_view.xml	2013-09-11 09:35:34 +0000
@@ -139,11 +139,11 @@
                         <group>
                             <field name="pricelist_id"
                                 class="oe_inline"
-                                attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                                attrs="{'required': ['|',('type','=','template'),('type','=','contract'), ('invoice_on_timesheets', '=', True)]}"/>
                             <field name="to_invoice"
                                 class="oe_inline"
                                 widget="selection"
-                                attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                                attrs="{'required': ['|',('type','=','template'),('type','=','contract'), ('invoice_on_timesheets', '=', True)]}"/>
                         </group>
                     </group>
                  </xpath>

=== modified file 'analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml'
--- analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml	2013-03-13 16:19:50 +0000
+++ analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml	2013-09-11 09:35:34 +0000
@@ -44,10 +44,10 @@
                     <attribute name="attrs">{'invisible': [('invoice_on_timesheets','=',False),('charge_expenses','=',False)]}</attribute>
                 </xpath>
                 <xpath expr="//field[@name='pricelist_id']" position="attributes">
-                    <attribute name="attrs">{'required': ['|',('invoice_on_timesheets','=',True),('charge_expenses','=',True)]}</attribute>
+                    <attribute name="attrs">{'required': ['|',('type','=','template'),('type','=','contract'), '|', ('invoice_on_timesheets','=',True),('charge_expenses','=',True)]}</attribute>
                 </xpath>
                 <xpath expr="//field[@name='to_invoice']" position="attributes">
-                    <attribute name="attrs">{'required': ['|',('invoice_on_timesheets','=',True),('charge_expenses','=',True)]}</attribute>
+                    <attribute name="attrs">{'required': ['|',('type','=','template'),('type','=','contract'), '|', ('invoice_on_timesheets','=',True),('charge_expenses','=',True)]}</attribute>
                     <attribute name="string">Expenses and Timesheet Invoicing Ratio</attribute>
                 </xpath>
             </field>