add Copyright and GPL license into the Header of Python files

[odoo/odoo.git] / addons / purchase / wizard / wizard_group.py

diff --git a/addons/purchase/wizard/wizard_group.py b/addons/purchase/wizard/wizard_group.py
index 3763de3..b3e5c40 100644 (file)
--- a/addons/purchase/wizard/wizard_group.py
+++ b/addons/purchase/wizard/wizard_group.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) All Rights Reserved.
 #
 # $Id$
 #
@@ -89,11 +89,14 @@ def _mergeOrders(self, cr, uid, data, context):
                                'pricelist_id': porder.pricelist_id.id,
                                'state': 'draft',
                                'order_line': {},
-                               'notes': '%s' % (porder.notes,),
+                               'notes': '%s' % (porder.notes or '',),
                        })
                else:
                        #order_infos['name'] += ', %s' % porder.name
-                       order_infos['notes'] += ('\n%s' % (porder.notes,))
+                       if porder.notes:
+                               order_infos['notes'] += ('\n%s' % (porder.notes,))
+                       if porder.origin:
+                               order_infos['origin'] = order_infos['origin'] +' '+ porder.origin
 
                for order_line in porder.order_line:
                        line_key = make_key(order_line, ('name', 'date_planned', 'taxes_id', 'price_unit', 'notes', 'product_id', 'move_dest_id', 'account_analytic_id'))
@@ -136,7 +139,7 @@ def _mergeOrders(self, cr, uid, data, context):
 
        return {
                'domain': "[('id','in', ["+','.join(map(str,allorders))+"])]",
-               'name': 'Purchase Orders',
+               'name': 'Purchase orders',
                'view_type': 'form',
                'view_mode': 'tree,form',
                'res_model': 'purchase.order',