From 753eddd26f13ba94dab8cf53e270dc32dc9663bf Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 21 Feb 2011 14:40:35 +0530
Subject: [PATCH 1/3] [FIX]Account:analytic line adding product doesnt add the
 unit of measure

lp bug: https://launchpad.net/bugs/716107 fixed

bzr revid: ron@tinyerp.com-20110221091035-17bz1yzwslbtd9rs
---
 addons/account/account_analytic_line.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index fa150b291dc..2ad40592011 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -80,7 +80,11 @@ class account_analytic_line(osv.osv):
         j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
         prod = product_obj.browse(cr, uid, prod_id, context=context)
         result = 0.0
-
+        product_uom_id=False
+        if prod_id:
+            product_uom_id = prod.uom_id.id
+            if j_id.type == 'purchase':
+                product_uom_id = prod.uom_po_id.id
         if j_id.type <> 'sale':
             a = prod.product_tmpl_id.property_account_expense.id
             if not a:
@@ -127,6 +131,7 @@ class account_analytic_line(osv.osv):
         return {'value': {
             'amount': result,
             'general_account_id': a,
+            'product_uom_id':product_uom_id
             }
         }
 

From 6c9834f0d5aded27de37bada7c6f7edccaed799c Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 21 Feb 2011 17:59:45 +0530
Subject: [PATCH 2/3] [IMP]Account:analytic line adding product doesnt add the
 unit of measure

bzr revid: ron@tinyerp.com-20110221122945-oe29d7jzbusvgvn8
---
 addons/account/account_analytic_line.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 2ad40592011..43bd821695d 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -80,11 +80,10 @@ class account_analytic_line(osv.osv):
         j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
         prod = product_obj.browse(cr, uid, prod_id, context=context)
         result = 0.0
-        product_uom_id=False
-        if prod_id:
-            product_uom_id = prod.uom_id.id
+        if prod_id or not unit:
+            unit = prod.uom_id.id
             if j_id.type == 'purchase':
-                product_uom_id = prod.uom_po_id.id
+                unit = prod.uom_po_id.id
         if j_id.type <> 'sale':
             a = prod.product_tmpl_id.property_account_expense.id
             if not a:
@@ -131,7 +130,7 @@ class account_analytic_line(osv.osv):
         return {'value': {
             'amount': result,
             'general_account_id': a,
-            'product_uom_id':product_uom_id
+            'product_uom_id':unit
             }
         }
 

From 2bde63a85b8d9922bb463d967711f7fd2c9915eb Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 21 Feb 2011 18:20:34 +0530
Subject: [PATCH 3/3] [IMP]Account:analytic line adding product doesnt add the
 unit of measure

bzr revid: ron@tinyerp.com-20110221125034-kke587zoskk27gzl
---
 addons/account/account_analytic_line.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 43bd821695d..7286229bdf0 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -80,7 +80,7 @@ class account_analytic_line(osv.osv):
         j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
         prod = product_obj.browse(cr, uid, prod_id, context=context)
         result = 0.0
-        if prod_id or not unit:
+        if prod_id:
             unit = prod.uom_id.id
             if j_id.type == 'purchase':
                 unit = prod.uom_po_id.id