Merge lp:~openerp-dev/openobject-addons/6.0-opw-572926-rha into lp:openobject-addons/6.0

[Rifakat Husen (OpenERP)]

Hello,

Created separate account tax line enrty while posing accouning entries from stock valuation.

Currently it was posting (untaxed + tax) amount account move but I should post tax entry separately same like it does from invoicing.

Please review it and let me know if changes required.

Thanks,
Rifakat Haradwala

[lp:~openerp-dev/openobject-addons/6.0-opw-572926-rha]

5156. By Rifakat Husen (OpenERP) on 2012-03-23

[FIX] stock: optomized code and refactore mothod

5157. By Rifakat Husen (OpenERP) on 2012-03-26

[FIX] stock: refactored method and created proper tax movement

[Naresh(OpenERP) (nch-openerp)]

review: Approve

Unmerged revisions

5157. By Rifakat Husen (OpenERP) on 2012-03-26

[FIX] stock: refactored method and created proper tax movement

5156. By Rifakat Husen (OpenERP) on 2012-03-23

[FIX] stock: optomized code and refactore mothod

5155. By Rifakat Husen (OpenERP) on 2012-03-23

[FIX] sale,purchase: created separate account tax line enrty while posing accouning entries from stoack valuation

=== modified file 'purchase/stock.py'
--- purchase/stock.py	2012-02-24 12:55:01 +0000
+++ purchase/stock.py	2012-03-26 06:26:18 +0000
@@ -43,6 +43,15 @@
                 reference_amount, reference_currency_id = move.purchase_line_id.price_unit * move.product_qty, move.picking_id.purchase_id.pricelist_id.currency_id.id
         return reference_amount, reference_currency_id
 
+    def _create_account_move_line(self, cr, uid, move, src_account_id, dest_account_id, reference_amount, reference_currency_id, context=None):
+        result = super(stock_move, self)._create_account_move_line(cr, uid, move, src_account_id, dest_account_id, reference_amount, reference_currency_id, context=context)
+        if move.purchase_line_id and move.purchase_line_id.taxes_id:
+            tax_info = self.pool.get('account.tax').compute_all(cr, uid, move.purchase_line_id.taxes_id, reference_amount, 1.00)
+            result = self._tax_line_from_move_line(cr, uid, move,
+                         src_account_id, dest_account_id, tax_info,
+                         result, move.picking_id.type, context=context)
+        return result
+
 stock_move()
 
 #

=== modified file 'sale/stock.py'
--- sale/stock.py	2012-02-21 19:16:22 +0000
+++ sale/stock.py	2012-03-26 06:26:18 +0000
@@ -32,6 +32,16 @@
         if picking.sale_id:
             self.pool.get('stock.picking').write(cr, uid, [res], {'sale_id': picking.sale_id.id})
         return res
+
+    def _create_account_move_line(self, cr, uid, move, src_account_id, dest_account_id, reference_amount, reference_currency_id, context=None):
+        result = super(stock_move, self)._create_account_move_line(cr, uid, move, src_account_id, dest_account_id, reference_amount, reference_currency_id, context=context)
+        if move.sale_line_id and move.sale_line_id.tax_id:
+            tax_info = self.pool.get('account.tax').compute_all(cr, uid, move.sale_line_id.tax_id, reference_amount, 1.00)
+            result = self._tax_line_from_move_line(cr, uid, move,
+                         src_account_id, dest_account_id, tax_info,
+                         result, move.picking_id.type, context=context)
+        return result
+    
 stock_move()
 
 class stock_picking(osv.osv):

=== modified file 'stock/stock.py'
--- stock/stock.py	2012-03-13 16:33:22 +0000
+++ stock/stock.py	2012-03-26 06:26:18 +0000
@@ -2176,6 +2176,29 @@
             wf_service.trg_write(uid, 'stock.picking', pick_id, cr)
 
         return True
+    
+    def _tax_line_from_move_line(self, cr, uid, move, src_account_id, dest_account_id, tax_info, result, type, context=None):
+        if type in ('in'):
+            result[0][2]['debit'] = tax_info['total_included']
+            result[1][2].update(credit=tax_info['total'])
+            for tax in tax_info.get('taxes'):
+                tax_line = result[1][2].copy()
+                tax_line.update(name=tax['name'], credit = tax['amount'],
+                                account_id=tax['account_collected_id'] or src_account_id,
+                                tax_code_id = tax['tax_code_id'],
+                                tax_amount = tax['tax_sign'] * abs(tax['amount']))
+                result.append((0, 0, tax_line))
+        elif type in ('out'):
+            result[1][2]['credit'] = tax_info['total_included']
+            result[0][2].update(debit=tax_info['total'])
+            for tax in tax_info.get('taxes'):
+                tax_line = result[0][2].copy()
+                tax_line.update(name=tax['name'], debit = tax['amount'],
+                                account_id=tax['account_collected_id'] or src_account_id,
+                                tax_code_id = tax['tax_code_id'],
+                                tax_amount = tax['tax_sign'] * abs(tax['amount']))
+                result.append((0, 0, tax_line))
+        return result
 
     def _create_account_move_line(self, cr, uid, move, src_account_id, dest_account_id, reference_amount, reference_currency_id, context=None):
         """