openerp-dev-web team mailing list archive

["Meera Trambadia \(OpenERP\)" <mtr@xxxxxxxxxxx>]

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

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #600547 Invoice totals not updated when a line is moved (store={...} bug?)
  https://bugs.launchpad.net/bugs/600547
  #690895 copy account.move crash 
  https://bugs.launchpad.net/bugs/690895
  #694144 [6.0] sales manager dashboard - sales by month - sql query error, usabiliy
  https://bugs.launchpad.net/bugs/694144
  #695632 [RC1]Two same fields creating problem in web-client
  https://bugs.launchpad.net/bugs/695632
  #695960 [6.0RC1][hr_timesheet]Problems printing timesheet reports
  https://bugs.launchpad.net/bugs/695960
  #702805 an employee shouldn't be able to see expenses and holidays of others employee
  https://bugs.launchpad.net/bugs/702805
  #703836 [Trunk] hr_expense: Invoice button not working
  https://bugs.launchpad.net/bugs/703836
  #705766 Wrong Picked Widget in Sale Order in OpenERP v6.0.1
  https://bugs.launchpad.net/bugs/705766
  #707144 [6.0] hr_payroll 'C/D' versus 'D/C' 
  https://bugs.launchpad.net/bugs/707144
  #708603 Traceback occurs at the time of "Account" duplication.
  https://bugs.launchpad.net/bugs/708603

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

=>l10n_de,l10n_ec,l10n_gr: correct property account in account.chart.template
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/48269
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'l10n_de/account_chart_template_skr04.xml'
--- l10n_de/account_chart_template_skr04.xml	2011-01-14 00:11:01 +0000
+++ l10n_de/account_chart_template_skr04.xml	2011-02-02 05:29:16 +0000
@@ -8,8 +8,8 @@
             <field name="account_root_id" ref="chart_skr04"/>
             <field name="tax_code_root_id" ref="tax_code_USTVA_skr04"/>
             <field name="bank_account_view_id" ref="chart_skr04_1800"/>
-            <field name="property_account_receivable" ref="chart_skr04_1200"/>
-            <field name="property_account_payable" ref="chart_skr04_3300"/>
+            <field name="property_account_receivable" ref="chart_skr04_1206"/>
+            <field name="property_account_payable" ref="chart_skr04_3301"/>
             <field name="property_account_expense_categ" ref="chart_skr04_5400"/>
             <field name="property_account_income_categ" ref="chart_skr04_4400"/>
         </record>

=== modified file 'l10n_ec/account_chart.xml'
--- l10n_ec/account_chart.xml	2011-01-14 00:11:01 +0000
+++ l10n_ec/account_chart.xml	2011-02-02 05:29:16 +0000
@@ -4201,8 +4201,8 @@
 	  <field name="bank_account_view_id" ref="10"/>
 	  <field name="property_account_receivable" ref="4"/>
 	  <field name="property_account_payable" ref="5"/>
-	  <field name="property_account_expense_categ" ref="6"/>
-	  <field name="property_account_income_categ" ref="7"/>		    
+	  <field name="property_account_expense_categ" ref="60101"/>
+	  <field name="property_account_income_categ" ref="710101"/>		    
 	</record>	
 
   </data>

=== modified file 'l10n_gr/account_tax.xml'
--- l10n_gr/account_tax.xml	2011-01-14 10:09:40 +0000
+++ l10n_gr/account_tax.xml	2011-02-02 05:29:16 +0000
@@ -19,7 +19,7 @@
         <field name="bank_account_view_id" ref="chartgr_38_03"/>
         <field name="property_account_receivable" ref="chartgr_30_00"/>
         <field name="property_account_payable" ref="chartgr_50_00"/>
-        <field name="property_account_expense_categ" ref="chartgr_64_98"/>
+        <field name="property_account_expense_categ" ref="chartgr_64_98_00"/>
         <field name="property_account_income_categ" ref="chartgr_71_00"/>
     </record>