openerp-dev-web team mailing list archive

["ARA\(OpenERP\)" <ara@xxxxxxxxxxx>]

ARA(OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #615522 Report Of Invoice  : Payment Term + Due date not printed
  https://bugs.launchpad.net/bugs/615522
  #649029 [sale] incoterm field poorly implemented [direct sql / not translatable]
  https://bugs.launchpad.net/bugs/649029
  #672553 opening entries from chart of account doesn't use context
  https://bugs.launchpad.net/bugs/672553
  #674480 [6.0 RC2] incorrect creation of Accounting Journals is some localizations prevents multiple charts from being installed
  https://bugs.launchpad.net/bugs/674480
  #681398 sale access right
  https://bugs.launchpad.net/bugs/681398
  #689536 [6.0] partner layout salesman/salesteam issue
  https://bugs.launchpad.net/bugs/689536
  #690326 [6.0RC1] View mode "tree,form,search" in several window actions
  https://bugs.launchpad.net/bugs/690326
  #690753 [6.0] and [5.x] account_analytic_line must not be deleted if the journal etc is deleted
  https://bugs.launchpad.net/bugs/690753
  #691072 [6.0RC1][TRUNK][account_voucher] Wrong definition of field 'company_id' in 'account_voucher_line' object
  https://bugs.launchpad.net/bugs/691072
  #692986 [6.0] hr_payroll_account hr_payroll_account_view.xml - required fields block opening form
  https://bugs.launchpad.net/bugs/692986

For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/44565

hello,
I have fixed following bugs.
https://bugs.launchpad.net/openobject-addons/+bug/692986  
      --hr_payroll_account - required fields block opening form
Thanks
ara
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/44565
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'hr_payroll_account/hr_payroll_demo.xml'
--- hr_payroll_account/hr_payroll_demo.xml	2010-10-27 14:13:28 +0000
+++ hr_payroll_account/hr_payroll_demo.xml	2010-12-23 12:01:45 +0000
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
         <record id="hr_payroll.hr_payslip_line_houserantallowance1" model="hr.payslip.line">
             <field name="account_id" ref="account.a_salary_expense"/>
         </record>
-        
+
         <record id="hr_payroll.hr_payslip_line_convanceallowance1" model="hr.payslip.line">
             <field name="account_id" ref="account.a_salary_expense"/>
         </record>
@@ -26,7 +26,7 @@
 
         <!-- Assigned Default Account in Different Demo Employees -->
 
-        <record id="hr.employee" model="hr.employee">
+        <!--record id="hr.employee" model="hr.employee">
             <field name="property_bank_account" ref="account.bnk"/>
             <field name="salary_account" ref="account.a_salary_expense"/>
             <field name="employee_account" ref="account.a_expense"/>
@@ -37,7 +37,7 @@
             <field name="salary_account" ref="account.a_salary_expense"/>
             <field name="employee_account" ref="account.a_expense"/>
         </record>
-        
+
         <record id="hr.employee2" model="hr.employee">
             <field name="property_bank_account" ref="account.bnk"/>
             <field name="salary_account" ref="account.a_salary_expense"/>
@@ -54,6 +54,52 @@
             <field name="property_bank_account" ref="account.bnk"/>
             <field name="salary_account" ref="account.a_salary_expense"/>
             <field name="employee_account" ref="account.a_expense"/>
+        </record-->
+
+        <record id="bnk" model="account.account">
+            <field name="code">X110041</field>
+            <field name="name">Bank Current Account</field>
+            <field ref="account.cas" name="parent_id"/>
+            <field name="type">liquidity</field>
+            <field name="user_type" ref="account.account_type_asset"/>
+        </record>
+
+        <record id="a_salary_expense" model="account.account">
+            <field name="code">X21122</field>
+            <field name="name">Salary Expenses</field>
+            <field ref="account.ovr" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.account_type_expense"/>
+        </record>
+
+        <record id="a_expense" model="account.account">
+            <field name="code">X21102</field>
+            <field name="name">Expenses</field>
+            <field ref="account.ovr" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account.account_type_expense"/>
+        </record>
+
+        <!-- Properties -->
+        <record forcecreate="True" id="property_bank_account" model="ir.property">
+            <field name="name">property_bank_account</field>
+            <field name="fields_id" search="[('model','=','hr.employee'),('name','=','property_bank_account')]"/>
+            <field eval="'account.account,'+str(bnk)" name="value"/>
+            <field name="company_id" ref="base.main_company"/>
+        </record>
+
+        <record forcecreate="True" id="salary_account" model="ir.property">
+            <field name="name">salary_account</field>
+            <field name="fields_id" search="[('model','=','hr.employee'),('name','=','salary_account')]"/>
+            <field eval="'account.account,'+str(a_salary_expense)" name="value"/>
+            <field name="company_id" ref="base.main_company"/>
+        </record>
+
+        <record forcecreate="True" id="employee_account" model="ir.property">
+            <field name="name">employee_account</field>
+            <field name="fields_id" search="[('model','=','hr.employee'),('name','=','employee_account')]"/>
+            <field eval="'account.account,'+str(a_expense)" name="value"/>
+            <field name="company_id" ref="base.main_company"/>
         </record>
 
     </data>