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/48291

=>l10n_lu,l10n_cr: correct property account in account.chart.template
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/48291
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 'hr_attendance/report/attendance_by_month.py'
--- hr_attendance/report/attendance_by_month.py	2011-01-17 18:02:22 +0000
+++ hr_attendance/report/attendance_by_month.py	2011-02-02 10:36:22 +0000
@@ -83,7 +83,9 @@
                     # sum up the attendances' durations
                     ldt = None
                     for att in attendences:
+                        print"--att---",att
                         dt = datetime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
+                        print"--dt---",dt
                         if ldt and att['action'] == 'sign_out':
                             wh += (dt - ldt).seconds/60/60
                         else:

=== modified file 'l10n_cr/data/account_chart_template.xml'
--- l10n_cr/data/account_chart_template.xml	2011-01-14 00:11:01 +0000
+++ l10n_cr/data/account_chart_template.xml	2011-02-02 10:36:22 +0000
@@ -14,8 +14,8 @@
             <field name="property_account_payable" ref="account_account_template_0_211001"/>
             <field name="property_account_income" ref="account_account_template_0_410001"/>
             <field name="property_account_expense" ref="account_account_template_0_511301"/>
-            <field name="property_account_income_categ" ref="account_account_template_0_400000"/>
-            <field name="property_account_expense_categ" ref="account_account_template_0_500000"/>
+            <field name="property_account_income_categ" ref="account_account_template_0_410001"/>
+            <field name="property_account_expense_categ" ref="account_account_template_0_511301"/>
         </record>
         <record id="account_chart_template_x" model="account.chart.template">
             <field name="name">Costa Rica - Company 1</field>
@@ -26,8 +26,8 @@
             <field name="property_account_payable" ref="account_account_template_x211001"/>
             <field name="property_account_income" ref="account_account_template_x410001"/>
             <field name="property_account_expense" ref="account_account_template_x511301"/>
-            <field name="property_account_income_categ" ref="account_account_template_x400000"/>
-            <field name="property_account_expense_categ" ref="account_account_template_x500000"/>
+            <field name="property_account_income_categ" ref="account_account_template_x410001"/>
+            <field name="property_account_expense_categ" ref="account_account_template_x511301"/>
         </record>
     </data>
 </openerp>

=== modified file 'l10n_lu/l10n_lu_data.xml'
--- l10n_lu/l10n_lu_data.xml	2011-01-14 00:11:01 +0000
+++ l10n_lu/l10n_lu_data.xml	2011-02-02 10:36:22 +0000
@@ -3783,9 +3783,9 @@
             <field name="tax_code_root_id" ref="account_tax_code_template_1"/>
             <field name="bank_account_view_id" ref="account_550"/>
             <field name="property_account_receivable" ref="account_401000"/>
-            <field name="property_account_payable" ref="account_441000"/>
+            <field name="property_account_payable" ref="account_700000"/>
             <field name="property_account_expense_categ" ref="account_600000"/>
-            <field name="property_account_income_categ" ref="account_700000"/>
+            <field name="property_account_income_categ" ref="account_441000"/>
         </record>