Merge lp:~camptocamp/openerp-humanitarian-ngo/purchase-wkfl-fix_copy_origin-rde into lp:openerp-humanitarian-ngo/purchase-wkfl

[Romain Deheele - Camptocamp]

Hi,

When a cost estimate is confirmed, a copy of chosen rfq is duplicated to create a PO in draftpo state.
The problem was that during this operation the origin is lost, because openerp original orm method copy clears the origin field.
This MP overwrites purchase.order copy to pick origin if PO comes from requisition.

[Leonardo Pistone (lepistone)]

Romain,

I suggest doing that another way, that I find more clear.

if default is None:
    default = {}

initial_origin = default.get('origin')

...super...

if initial_origin:
   ...write...

thanks!

review: Needs Fixing (code review)

[lp:~camptocamp/openerp-humanitarian-ngo/purchase-wkfl-fix_copy_origin-rde]

72. By Romain Deheele - Camptocamp on 2014-01-28

[IMP] improve origin checking

[Romain Deheele - Camptocamp (romaindeheele)]

I doubt about this MP utility.
It seems that rev 12 in lp:openerp-humanitarian-ngo/addons-backport has introduced
origin cleaning in purchase addon, def copy.
Actually, in stable/ocb addons, origin cleaning in purchase addon is not present.

Romain

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Check on requisition id is missing

review: Needs Fixing

[lp:~camptocamp/openerp-humanitarian-ngo/purchase-wkfl-fix_copy_origin-rde]

73. By Romain Deheele - Camptocamp on 2014-02-06

[FIX] forget a condition : only set origin if the PO comes from requisition

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

LGTM

review: Approve (code review, no test)

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

LGTM thanks

review: Approve (code review + no tests)

=== modified file 'purchase_requisition_extended/model/purchase_order.py'
--- purchase_requisition_extended/model/purchase_order.py	2013-11-01 11:44:19 +0000
+++ purchase_requisition_extended/model/purchase_order.py	2014-02-06 09:48:29 +0000
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from openerp.osv import fields, orm
+from openerp import SUPERUSER_ID
 
 
 class purchase_order(orm.Model):
@@ -63,6 +64,17 @@
         })
         return values
 
+    def copy(self, cr, uid, id, default=None, context=None):
+        """ Need to set origin after copy because original copy clears origin """
+        if default is None:
+            default = {}
+        initial_origin = default.get('origin')
+        newid = super(purchase_order, self).copy(cr, uid, id, default=default,
+                                                 context=context)
+        if initial_origin and 'requisition_id' in default:
+            self.write(cr, SUPERUSER_ID, [newid], {'origin': origin}, context=context)
+        return newid
+
 
 class purchase_order_line(orm.Model):
     _inherit = 'purchase.order.line'