Merge lp:~camptocamp/ocb-addons/7.0-fix-lp-1210195-RDE into lp:ocb-addons

[Romain Deheele - Camptocamp]

Hello,

This branch fixes bug #1210195:access denied when a subsidiary company's user tries to create a reordering rule(multicompany context)

https://bugs.launchpad.net/openobject-addons/+bug/1210195

Romain

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

This fix breaks the database creation from scratch.

2013-09-26 07:53:54,261 8361 INFO openerp_prod_doremi openerp.modules.loading: module procurement: loading stock_orderpoint.xml
2013-09-26 07:53:54,321 8361 ERROR openerp_prod_doremi openerp.tools.convert: Parse error in /home/afayolle/work/customers/doremi/openerp_buildout_prod/parts/addons/procurement/stock_orderpoint.xml:7:
<record id="stock_warehouse_orderpoint_0" model="stock.warehouse.orderpoint">
            <field name="product_max_qty">25.0</field>
            <field name="product_min_qty">5.0</field>
            <field model="product.uom" name="product_uom" ref="product.product_uom_dozen"/>
            <field model="stock.warehouse" name="warehouse_id" search="[]"/>
            <field model="product.product" name="product_id" ref="product.product_product_36"/>
            <field name="location_id" ref="stock.stock_location_stock"/>
        </record>
Traceback (most recent call last):
  File "/home/afayolle/work/customers/doremi/openerp_buildout_prod/parts/server/openerp/tools/convert.py", line 847, in parse
    self._tags[rec.tag](self.cr, rec, n)
  File "/home/afayolle/work/customers/doremi/openerp_buildout_prod/parts/server/openerp/tools/convert.py", line 814, in _tag_record
    id = self.pool.get('ir.model.data')._update(cr, self.uid, rec_model, self.module, res, rec_id or False, not self.isnoupdate(data_node), noupdate=self.isnoupdate(data_node), mode=self.mode, context=rec_context )
  File "/home/afayolle/work/customers/doremi/openerp_buildout_prod/parts/server/openerp/addons/base/ir/ir_model.py", line 963, in _update
    res_id = model_obj.create(cr, uid, values, context=context)
  File "/home/afayolle/work/customers/doremi/openerp_buildout_prod/parts/server/openerp/osv/orm.py", line 4318, in create
    vals = self._add_missing_default_values(cr, user, vals, context)
  File "/home/afayolle/work/customers/doremi/openerp_buildout_prod/parts/server/openerp/osv/orm.py", line 2487, in _add_missing_default_values
    defaults = self.default_get(cr, uid, missing_defaults, context)
  File "/home/afayolle/work/customers/doremi/openerp_buildout_prod/parts/addons/procurement/procurement.py", line 554, in default_get
    warehouse = self.pool.get('stock.warehouse').browse(cr, uid, res['warehouse_id'], context)
KeyError: 'warehouse_id'

review: Needs Fixing (code review, test)

[Holger Brunn (Therp) (hbrunn)]

setting to work in progress due to inactivity

[Stefan Rijnhart (Opener) (stefan-opener)]

Competing fix was merged in upstream 7.0: https://code.launchpad.net/~openerp-dev/openobject-addons/7.0-opw-596679-rgo/+merge/186294. Setting to rejected.

Unmerged revisions

9414. By Romain Deheele - Camptocamp on 2013-08-21

[FIX] fix bug #1210195:fix access denied when a subsidiary company's user tries to create a reordering rule(multicompany context)

=== modified file 'procurement/procurement.py'
--- procurement/procurement.py	2012-10-23 16:05:04 +0000
+++ procurement/procurement.py	2013-08-21 08:52:01 +0000
@@ -537,7 +537,8 @@
         'qty_multiple': lambda *a: 1,
         'name': lambda x,y,z,c: x.pool.get('ir.sequence').get(y,z,'stock.orderpoint') or '',
         'product_uom': lambda sel, cr, uid, context: context.get('product_uom', False),
-        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c)
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c),
+        'warehouse_id': lambda self, cr, uid, c: self.pool.get('stock.warehouse')._default_warehouse_id(cr, uid, context=c)
     }
     _sql_constraints = [
         ('qty_multiple_check', 'CHECK( qty_multiple > 0 )', 'Qty Multiple must be greater than zero.'),
@@ -548,10 +549,7 @@
 
     def default_get(self, cr, uid, fields, context=None):
         res = super(stock_warehouse_orderpoint, self).default_get(cr, uid, fields, context)
-        # default 'warehouse_id' and 'location_id'
-        if 'warehouse_id' not in res:
-            warehouse = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'warehouse0', context)
-            res['warehouse_id'] = warehouse.id
+        # default location_id'
         if 'location_id' not in res:
             warehouse = self.pool.get('stock.warehouse').browse(cr, uid, res['warehouse_id'], context)
             res['location_id'] = warehouse.lot_stock_id.id

=== modified file 'stock/stock.py'
--- stock/stock.py	2013-08-15 07:54:23 +0000
+++ stock/stock.py	2013-08-21 08:52:01 +0000
@@ -2944,6 +2944,15 @@
         'lot_output_id': fields.many2one('stock.location', 'Location Output', required=True, domain=[('usage','<>','view')]),
     }
 
+    def _default_warehouse_id(self, cr, uid, context=None):
+        company_id = self.pool.get('res.users').read(cr, uid, uid, ['company_id'])['company_id']
+        if company_id:
+            default_warehouse_id = self.search(cr, uid, [('company_id','=',company_id[0])])
+            if default_warehouse_id:
+                return default_warehouse_id[0]
+            else:
+                raise osv.except_osv(_("Warning"), _("Please define the warehouse and locations for %s company first."%(company_id[1])))
+
     def _default_lot_input_stock_id(self, cr, uid, context=None):
         lot_input_stock = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock')
         return lot_input_stock.id