[IMP] ported product_gift module to 6.1: order view has changed / use the brand new _prepare_order_picking and _prepare_order_line_move

product_gift/product.py

@@ -20,8 +20,7 @@
 #################################################################################
 
 from osv import osv, fields
-import tools
-import os, sys, imp
+
 
 class product_product(osv.osv):
     _inherit = "product.product"
@@ -31,7 +30,7 @@ class product_product(osv.osv):
     }
 
     _defaults = {
-        'allow_gift_wrap': lambda *a: True,
+        'allow_gift_wrap': True,
     }
 
 product_product()

product_gift/sale.py

@@ -3,6 +3,7 @@
 #                                                                               #
 #    product_is_a_gift for OpenERP                                              #
 #    Copyright (C) 2011 Akretion Sébastien BEAU <sebastien.beau@akretion.com>   #
+#    Copyright (C) 2011 Camptocamp SA. (author Guewen Baconnier)
 #                                                                               #
 #    This program is free software: you can redistribute it and/or modify       #
 #    it under the terms of the GNU Affero General Public License as             #
@@ -20,7 +21,6 @@
 #################################################################################
 
 from osv import osv, fields
-import netsvc
 
 
 class sale_order(osv.osv):
@@ -29,11 +29,16 @@ class sale_order(osv.osv):
     
     _columns = {
         'gift_message': fields.text('Gift Message'),
-
     }
 
+    def _prepare_order_picking(self, cr, uid, order, *args):
+        values = super(sale_order, self)._prepare_order_picking(cr, uid, order, *args)
+        values.update({'gift_message' : order.gift_message})
+        return values
+
 sale_order()
 
+
 class sale_order_line(osv.osv):
     
     _inherit = "sale.order.line"
@@ -41,9 +46,12 @@ class sale_order_line(osv.osv):
     _columns = {
         'gift_message': fields.text('Gift Message'),
         'need_gift_wrap': fields.boolean('Add Gift Wrap'),
-
     }
 
-sale_order_line()
+    def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, *args):
+        values = super(sale_order_line, self)._prepare_order_line_move(cr, uid, order, line, picking_id, date_planned, *args)
+        values.update({'gift_message': line.gift_message,
+                       'need_gift_wrap': line.need_gift_wrap})
+        return values
 
- 
+sale_order_line()

product_gift/sale_view.xml

@@ -22,11 +22,11 @@
                         <field name="gift_message" colspan="4" nolabel="1"/>
 					</xpath>
 
-					<xpath expr="/form/notebook/page/field/form/notebook/page[@string='Order Line']/field[@name='product_packaging']" position="after">
+					<xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page[@string='Order Line']/group/field[@name='product_packaging']" position="after">
 						<field name="need_gift_wrap" />
 					</xpath>
 
-					<xpath expr="/form/notebook/page/field/form/notebook/page[@string='Notes']" position="after">
+					<xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page[@string='Extra Info']" position="after">
                         <page string="Gift Message">
                             <field name="gift_message" colspan="4" nolabel="1"/>
                         </page>

product_gift/stock.py

@@ -20,7 +20,6 @@
 #################################################################################
 
 from osv import osv, fields
-import netsvc
 
 
 class stock_picking(osv.osv):
@@ -30,12 +29,6 @@ class stock_picking(osv.osv):
         'gift_message': fields.text('Gift Message'),
     }
 
-    def create(self, cr, uid, vals, context=None):
-        if vals.get('sale_id', False) and not 'gift_message' in vals:
-            order = self.pool.get('sale.order').browse(cr, uid, vals['sale_id'], context=context)
-            vals.update({'gift_message' : order.gift_message})
-        return super(stock_picking, self).create(cr, uid, vals, context=context)
-
 stock_picking()
 
 
@@ -47,11 +40,4 @@ class stock_move(osv.osv):
         'need_gift_wrap': fields.boolean('Need Gift Wrap'),
     }
 
-    def create(self, cr, uid, vals, context=None):
-        if vals.get('sale_line_id', False) and not ('gift_message' in vals and 'need_gift_wrap' in vals):
-            line = self.pool.get('sale.order.line').browse(cr, uid, vals['sale_line_id'], context=context)
-            vals.update({'gift_message' : line.gift_message, 'need_gift_wrap': line.need_gift_wrap})
-        return super(stock_move, self).create(cr, uid, vals, context=context)
-
-
 stock_move()