Merge lp:~openerp-dev/openobject-addons/trunk-bug-717198-pso into lp:openobject-addons

[Priyesh (OpenERP)]

Fixed bug: 717198 (https://bugs.launchpad.net/openobject-addons/+bug/717198)
Fixed wrong computation of amount currency in analytic lines.

[Priyesh (OpenERP) (pso-openerp)]

Moved amount currency function from account to analytic plans.

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

account/account_analytic_line.py => remove unused changes.
self.pool.get('res.currency') => declare outside loop

review: Needs Fixing

[Priyesh (OpenERP) (pso-openerp)]

Removed Extra spaces and Declared "self.pool.get('res.currency')" outside loop.

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

[qdp (OpenERP) (qdp)]

for this bug, i'm not sure this is the god way to solve the problem. I would have prefer to have a new fields.float to save the percentage used t compute the amount in company currency, then in the _get_amount function we can just call super() and apply this percentage to the result to get the final result.

It seems more interesting because:
1)it reuses the code of super and do not compute again by its own the amount in currency (which is error prone, btw there is an error in this method: you should have passed a date in the context in compute() in order to use the rate at the good date... so maybe there are other errors)
2)it stores a new information that seems very valuable for any future needs

Thanks

review: Needs Fixing

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

As per the discussion with qdp no need to call super() as it is related field on parent class and here we define it fields.function.

just add percentage field on analytic line and return total_in_currency * percentage ..

Thanks to qdp for suggestion.
mra

[Priyesh (OpenERP) (pso-openerp)]

Added new field for percentage, Improved create_analytic_lines and Improved function for amount currency

review: Needs Resubmitting

=== modified file 'account_analytic_plans/account_analytic_plans.py'
--- account_analytic_plans/account_analytic_plans.py	2011-01-14 00:11:01 +0000
+++ account_analytic_plans/account_analytic_plans.py	2011-05-06 06:06:37 +0000
@@ -47,6 +47,26 @@
             res[r[self._fields_id]].append( r['id'] )
         return res
 
+class account_analytic_line(osv.osv):
+    _inherit = 'account.analytic.line'
+    _description = 'Analytic Line'
+
+    def _get_amount(self, cr, uid, ids, name, args, context=None):
+        res = {}
+        for id in ids:
+            res.setdefault(id, 0.0)
+        for line in self.browse(cr, uid, ids, context=context):
+            amount = line.move_id and line.move_id.amount_currency * (line.percentage / 100) or 0.0
+            res[line.id] = amount
+        return res
+
+    _columns = {
+        'amount_currency': fields.function(_get_amount, string="Amount Currency", type="float", method=True, store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True),
+        'percentage': fields.float('Percentage')
+    }
+
+account_analytic_line()
+
 class account_analytic_plan(osv.osv):
     _name = "account.analytic.plan"
     _description = "Analytic Plan"
@@ -338,6 +358,7 @@
                        'move_id': line.id,
                        'journal_id': line.journal_id.analytic_journal_id.id,
                        'ref': line.ref,
+                       'percentage': line2.rate
                    }
                    analytic_line_obj.create(cr, uid, al_vals, context=context)
         return True

=== modified file 'account_analytic_plans/account_analytic_plans_view.xml'
--- account_analytic_plans/account_analytic_plans_view.xml	2011-01-27 09:49:39 +0000
+++ account_analytic_plans/account_analytic_plans_view.xml	2011-05-06 06:06:37 +0000
@@ -312,5 +312,17 @@
             </field>
         </record>
 
+        <record id="view_account_analytic_line_percentage_form" model="ir.ui.view">
+            <field name="name">account.analytic.line.percentage.form</field>
+            <field name="model">account.analytic.line</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_account_analytic_line_form"/>
+            <field name="arch" type="xml">
+            	<field name="amount" colspan="4" position="after">
+            	    <field name="percentage" colspan="4"/>
+            	</field>
+            </field>
+        </record>
+
 </data>
 </openerp>