Merge lp:~openerp-dev/openobject-addons/trunk-bug-800100-mdi into lp:openobject-addons

[DJ Patel (OpenERP)]

Hello Sir,

I have fix the issue: https://bugs.launchpad.net/openobject-addons/+bug/800100 "Sale: Constraint Error-Order Reference must be unique per company".

I changes the constraint for sale order and purchase order.

Thanks and Regards,

Divyesh Makwana(MDI)

[Raphael Collet (OpenERP) (rco-openerp)]

Please remove the "space fixes". Those are not bugfixes, and make the diff harder to read.

Now please fix those real problems:
- in account.invoice, 'number' is a related field and is not present in the table;
- in sale.order, 'company_id' is a related field and is not present in the table.

Thanks,
Raphael

review: Needs Fixing

[DJ Patel (OpenERP) (mdi-openerp)]

Hello Raphael Collet,

As per you suggestion

- in account.invoice, 'number' is a related field and is not present in the table;
- in sale.order, 'company_id' is a related field and is not present in the table.

but in both field defination, the store=True is there.
So, Both the fields are present in table.
will you please check once more.

Thanks and Regards,

Divyesh Makwana(MDI)

[DJ Patel (OpenERP) (mdi-openerp)]

review: Needs Resubmitting

[Purnendu Singh (OpenERP) (purnendu-singh)]

seems ok now

review: Approve

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Improve the string in stock.py.
change Order Reference to Reference.

Thanks,
Mustufa

review: Needs Fixing

[DJ Patel (OpenERP) (mdi-openerp)]

review: Needs Resubmitting

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2011-11-16 10:51:15 +0000
+++ account/account_invoice.py	2011-11-17 11:06:32 +0000
@@ -286,6 +286,9 @@
         'internal_number': False,
         'user_id': lambda s, cr, u, c: u,
     }
+    _sql_constraints = [
+        ('number_uniq', 'unique(number, company_id)', 'Invoice Number must be unique per Company!'),
+    ]
 
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
         journal_obj = self.pool.get('account.journal')

=== modified file 'mrp/mrp.py'
--- mrp/mrp.py	2011-11-13 10:03:46 +0000
+++ mrp/mrp.py	2011-11-17 11:06:32 +0000
@@ -272,7 +272,7 @@
         if context is None:
             context = {}
             context['lang'] = self.pool.get('res.users').browse(cr,uid,uid).context_lang
-            
+
         if product_id:
             prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
             v = {'name': prod.name, 'product_uom': prod.uom_id.id}
@@ -491,6 +491,9 @@
         'name': lambda x, y, z, c: x.pool.get('ir.sequence').get(y, z, 'mrp.production') or '/',
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.production', context=c),
     }
+    _sql_constraints = [
+        ('name_uniq', 'unique(name, company_id)', 'Reference must be unique per Company!'),
+    ]
     _order = 'priority desc, date_planned asc';
 
     def _check_qty(self, cr, uid, ids, context=None):

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2011-11-15 15:32:01 +0000
+++ purchase/purchase.py	2011-11-17 11:06:32 +0000
@@ -227,7 +227,7 @@
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.order', context=c),
     }
     _sql_constraints = [
-        ('name_uniq', 'unique(name)', 'Order Reference must be unique !'),
+        ('name_uniq', 'unique(name, company_id)', 'Order Reference must be unique per Company!'),
     ]
     _name = "purchase.order"
     _description = "Purchase Order"

=== modified file 'sale/sale.py'
--- sale/sale.py	2011-11-16 18:54:43 +0000
+++ sale/sale.py	2011-11-17 11:06:32 +0000
@@ -280,7 +280,7 @@
         'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'],
     }
     _sql_constraints = [
-        ('name_uniq', 'unique(name)', 'Order Reference must be unique !'),
+        ('name_uniq', 'unique(name, company_id)', 'Order Reference must be unique per Company!'),
     ]
     _order = 'name desc'
 

=== modified file 'stock/stock.py'
--- stock/stock.py	2011-11-15 09:50:27 +0000
+++ stock/stock.py	2011-11-17 11:06:32 +0000
@@ -661,6 +661,9 @@
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.picking', context=c)
     }
+    _sql_constraints = [
+        ('name_uniq', 'unique(name, company_id)', 'Reference must be unique per Company!'),
+    ]
 
     def action_process(self, cr, uid, ids, context=None):
         if context is None: context = {}
@@ -1798,7 +1801,7 @@
 
     def onchange_date(self, cr, uid, ids, date, date_expected, context=None):
         """ On change of Scheduled Date gives a Move date.
-        @param date_expected: Scheduled Date 
+        @param date_expected: Scheduled Date
         @param date: Move Date
         @return: Move Date
         """
@@ -2261,7 +2264,7 @@
         return super(stock_move, self).unlink(
             cr, uid, ids, context=ctx)
 
-    # _create_lot function is not used anywhere 
+    # _create_lot function is not used anywhere
     def _create_lot(self, cr, uid, ids, product_id, prefix=False):
         """ Creates production lot
         @return: Production lot id
@@ -2307,7 +2310,7 @@
         self.action_done(cr, uid, res)
         return res
 
-    # action_split function is not used anywhere 
+    # action_split function is not used anywhere
     def action_split(self, cr, uid, ids, quantity, split_by_qty=1, prefix=False, with_lot=True, context=None):
         """ Split Stock Move lines into production lot which specified split by quantity.
         @param cr: the database cursor