openerp-dev-web team mailing list archive

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

mtr(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

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

Account_budget:corrected the spelling 'theoritical' to 'theoretical'
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/44893
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 'account_budget/account_budget.py'
--- account_budget/account_budget.py	2010-12-30 09:58:09 +0000
+++ account_budget/account_budget.py	2010-12-30 11:28:04 +0000
@@ -197,7 +197,7 @@
         'paid_date': fields.date('Paid Date'),
         'planned_amount':fields.float('Planned Amount', required=True, digits_compute=dp.get_precision('Account')),
         'practical_amount':fields.function(_prac, method=True, string='Practical Amount', type='float', digits_compute=dp.get_precision('Account')),
-        'theoritical_amount':fields.function(_theo, method=True, string='Theoritical Amount', type='float', digits_compute=dp.get_precision('Account')),
+        'theoritical_amount':fields.function(_theo, method=True, string='Theoretical Amount', type='float', digits_compute=dp.get_precision('Account')),
         'percentage':fields.function(_perc, method=True, string='Percentage', type='float'),
         'company_id': fields.related('crossovered_budget_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
     }

=== modified file 'account_budget/account_budget_view.xml'
--- account_budget/account_budget_view.xml	2010-12-30 09:58:09 +0000
+++ account_budget/account_budget_view.xml	2010-12-30 11:28:04 +0000
@@ -78,7 +78,7 @@
                                     <field name="paid_date"/>
                                     <field name="planned_amount" sum="Planned Amount"/>
                                     <field name="practical_amount" select="1" sum="Practical Amount" />
-                                    <field name="theoritical_amount" sum="Theoritical Amount"/>
+                                    <field name="theoritical_amount" sum="Theoretical Amount"/>
                                     <field name="percentage"/>
                                 </tree>
                                 <form string="Budget Lines">
@@ -121,7 +121,7 @@
                                     <field name="paid_date"/>
                                     <field name="planned_amount" sum="Planned Amount"/>
                                     <field name="practical_amount" sum="Practical Amount"/>
-                                    <field name="theoritical_amount" sum="Theoritical Amount"/>
+                                    <field name="theoritical_amount" sum="Theoretical Amount"/>
                                     <field name="percentage"/>
                                 </tree>
                                 <form string="Budget Lines">