Merge lp:~openerp-dev/openobject-addons/trunk-bug-1080651-shp into lp:openobject-addons

[Pankita Shah(OpenERP)]

Hello,

 - i have fixed problem of physical inventory. which is deleted when it is in confirm and done state.
    solve this problem add constraint on state field

thanks

shp

[lp:~openerp-dev/openobject-addons/trunk-bug-1080651-shp]

8075. By Atul Patel(OpenERP) on 2012-12-31

[FIX]: Replace name and browse method

[Atul Patel(OpenERP) (atp-openerp)]

hello,

it's work

thanks.

review: Approve

[lp:~openerp-dev/openobject-addons/trunk-bug-1080651-shp]

8076. By Atul Patel(OpenERP) on 2012-12-31

[MERGE]: Merged with lp:openobject-addons

Unmerged revisions

8076. By Atul Patel(OpenERP) on 2012-12-31

[MERGE]: Merged with lp:openobject-addons

8075. By Atul Patel(OpenERP) on 2012-12-31

[FIX]: Replace name and browse method

8074. By Pankita Shah(OpenERP) on 2012-11-27

[FIX] add constaint on physical inventories when it is in confirm and done state

=== modified file 'stock/stock.py'
--- stock/stock.py	2012-12-21 16:48:08 +0000
+++ stock/stock.py	2012-12-31 09:22:21 +0000
@@ -2759,6 +2759,12 @@
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', context=c)
     }
 
+    def unlink(self, cr, uid, ids, context=None):
+        for inv in self.browse(cr, uid, ids, context=context):
+            if inv.state not in ('draft', 'cancel'):
+                raise osv.except_osv(_('Invalid Action!'), _('Cannot delete physical inventories which are already confirmed or done.'))
+        return super(stock_inventory, self).unlink(cr, uid, ids, context=context)
+
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}