From 0036d659495c06050e8874a6be69dedb212a314d Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Fri, 6 May 2011 10:51:05 +0530
Subject: [PATCH] [IMP] account_analytic_plans: Added new field percentage,
 Improved create_analytic_lines and get amount from amount currency of move
 line

bzr revid: pso@tinyerp.com-20110506052105-t28i1jyn9nf2zbfy
---
 .../account_analytic_plans/account_analytic_plans.py |  9 ++++-----
 .../account_analytic_plans_view.xml                  | 12 ++++++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 3285e1c1562..4498fb1e1d3 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -53,20 +53,18 @@ class account_analytic_line(osv.osv):
 
     def _get_amount(self, cr, uid, ids, name, args, context=None):
         res = {}
-        currency_obj = self.pool.get('res.currency')
         if not ids:
             return res
         for id in ids:
             res.setdefault(id, 0.0)
         for line in self.browse(cr, uid, ids, context=context):
-            from_currency_id = line.company_id.currency_id.id
-            to_currency_id = line.currency_id.id
-            from_amount = line.amount
-            res[line.id] = currency_obj.compute(cr, uid, from_currency_id, to_currency_id, from_amount, round=True, context=context)
+            amount = line.move_id.amount_currency * (line.percentage / 100)
+            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()
@@ -362,6 +360,7 @@ class account_move_line(osv.osv):
                        '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
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 8282461e512..4f7096d031c 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -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>