← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3

 

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 Miscalculation of parent_store data when moving multiple records under same parent
  https://bugs.launchpad.net/bugs/708603
  #711533 v6 hr_attendance - time is rounded to hour
  https://bugs.launchpad.net/bugs/711533
  #712960 [Trunk] - increase size of col. date in payment order pdf
  https://bugs.launchpad.net/bugs/712960
  #715269 [TRUNK] Residual Amount is Wrong referenced and wrong calculated.
  https://bugs.launchpad.net/bugs/715269

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

[FIX] l10n_uk: improved the account type of tax,residual amount is correctly referenced and calculated" --fixes lp:715269 
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/49036
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_uk/l10n_uk_chart.xml'
--- l10n_uk/l10n_uk_chart.xml	2011-01-14 00:11:01 +0000
+++ l10n_uk/l10n_uk_chart.xml	2011-02-09 09:56:24 +0000
@@ -50,7 +50,7 @@
             <field name="code">1112</field>
             <field name="name">Input VAT</field>
             <field ref="cli" name="parent_id"/>
-            <field name="type">payable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="account_type_liability"/>
         </record>
 
@@ -124,7 +124,7 @@
             <field name="code">11003</field>
             <field name="name">Output VAT</field>
             <field ref="cas" name="parent_id"/>
-            <field name="type">receivable</field>
+            <field name="type">other</field>
             <field name="user_type" ref="account_type_asset"/>
         </record>
 


Follow ups