Merge lp:~openerp-dev/openobject-addons/6.0-opw-381990-han into lp:openobject-addons/6.0

[Hardik Ansodariya (OpenERP)]

Hello,

Fixed the issue Problem with side effect of automatic chaining moves

Thanks
Hardik

[Rifakat Husen (OpenERP) (rha-openerp)]

Hello,

I have applied this scenario of 2 level chaining location and getting wrong result,
Stock (chaining location: Shop 1)
Shop 1 (Chaining location: Shop 2)

Solution:
You need to go to the depth of all stock moves(move_dest_id in the move) which are chained and cancel that moves.

Feel free to ask if any doubt.

review: Needs Fixing

[Rifakat Husen (OpenERP) (rha-openerp)]

Hardik,

Canceling the chaining move would not be a good practice I think.
What we can do is, try to reach to the depth of the chaining location and return picking to the supplier from that last chained location.

Indeed in you fix you tried to do that but you did not reach to the depth location.

For example, we have chaining like, stock > shop 1 > shop 2,
Currently return picking is considering from stock (creating stock -> supplier return move),
Instead we should consider the last chained location (shop 2 in this case) and create
shop 2 -> supplier return move. So ultimately it will send back goods from the final location in which we had goods priorly and our stock level will not be altered.

Kindly check all the possible test cases.

Thanks.

[Hardik Ansodariya (OpenERP) (han-tinyerp)]

Hello,

i have fix the issue of depth location according to your suggestion.
kindly review it

Thanks
Hardik

review: Needs Resubmitting

[Hardik Ansodariya (OpenERP) (han-tinyerp)]

Hello,

I have add the method _recursive_chain_location for depth location according to your suggestion.
kindly review it

Thanks
Hardik

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/6.0-opw-381990-han]

5032. By Hardik Ansodariya (OpenERP) on 2012-02-09

[FIX] stock_return_picking: removed useless code:(Maintanabce Case-381990)

[Naresh(OpenERP) (nch-openerp)]

Feature request needs a bit more check on this for all the cases so rejecting it for the stable version

Thanks,
Naresh

review: Disapprove

Unmerged revisions

5032. By Hardik Ansodariya (OpenERP) on 2012-02-09

[FIX] stock_return_picking: removed useless code:(Maintanabce Case-381990)

5031. By Hardik Ansodariya (OpenERP) on 2012-02-09

[FIX] stock_retrun_picking: Fix the depth problem of chained location : (Maintenance Case : 381990

5030. By Hardik Ansodariya (OpenERP) on 2012-02-02

[FIX] stock_location :Fix the depth problem of chained location : (Maintenance Case : 381990)

5029. By Hardik Ansodariya (OpenERP) on 2012-02-01

[FIX] stock_location :Problem with side effect of automatic chaining moves : (Maintenance Case : 381990)

5028. By Hardik Ansodariya (OpenERP) on 2012-02-01

[FIX] stock_location :Problem with side effect of automatic chaining moves : (Maintenance Case : 381990)

=== modified file 'account/report/account_tax_report.py'
--- account/report/account_tax_report.py	2011-01-14 00:11:01 +0000
+++ account/report/account_tax_report.py	2012-02-09 13:37:18 +0000
@@ -229,4 +229,4 @@
 report_sxw.report_sxw('report.account.vat.declaration', 'account.tax.code',
     'addons/account/report/account_tax_report.rml', parser=tax_report, header="internal")
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'account/wizard/account_vat.py'
--- account/wizard/account_vat.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_vat.py	2012-02-09 13:37:18 +0000
@@ -35,10 +35,10 @@
     def _get_tax(self, cr, uid, context=None):
         taxes = self.pool.get('account.tax.code').search(cr, uid, [('parent_id', '=', False)], limit=1)
         return taxes and taxes[0] or False
-
+    
     _defaults = {
         'based_on': 'invoices',
-        'chart_tax_id': _get_tax
+        'chart_tax_id': _get_tax,
     }
 
     def create_vat(self, cr, uid, ids, context=None):
@@ -56,4 +56,4 @@
 
 account_vat_declaration()
 
-#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'stock/stock.py'
--- stock/stock.py	2012-01-10 12:52:13 +0000
+++ stock/stock.py	2012-02-09 13:37:18 +0000
@@ -1648,6 +1648,14 @@
             default = {}
         default = default.copy()
         return super(stock_move, self).copy(cr, uid, id, default, context=context)
+    
+    def _recursive_chain_location(self, cr, uid, move):
+        dest = True and move.location_dest_id
+        while dest:
+            final_location = dest
+            chained_location = dest.chained_location_id
+            dest = dest and chained_location
+        return final_location.id
 
     def _auto_init(self, cursor, context=None):
         res = super(stock_move, self)._auto_init(cursor, context=context)

=== modified file 'stock/wizard/stock_return_picking.py'
--- stock/wizard/stock_return_picking.py	2011-01-18 13:41:41 +0000
+++ stock/wizard/stock_return_picking.py	2012-02-09 13:37:18 +0000
@@ -168,7 +168,7 @@
                 new_picking = pick_obj.copy(cr, uid, pick.id, {'name':'%s-return' % pick.name,
                         'move_lines':[], 'state':'draft', 'type':new_type,
                         'date':date_cur, 'invoice_state':data['invoice_state'],})
-            new_location=move.location_dest_id.id
+            new_location= move_obj._recursive_chain_location(cr, uid, move)
             if move.state=='done':
                 new_qty = data['return%s' % move.id]
                 returned_qty = move.product_qty
@@ -215,6 +215,7 @@
             'type':'ir.actions.act_window',
             'context':context,
         }
+    
 
 stock_return_picking()