Merge lp:~wiz-keed/openobject-addons/7.0-delivery-carrier-multi-company-awareness into lp:openobject-addons/7.0

[Paul Catinean]

[FIX] Added multi-company awareness to delivery module

Unmerged revisions

9956. By Paul Catinean on 2014-04-04

[FIX] Added multi-company awareness to delivery module

=== modified file 'delivery/__openerp__.py'
--- delivery/__openerp__.py	2012-11-29 22:26:45 +0000
+++ delivery/__openerp__.py	2014-04-04 08:17:26 +0000
@@ -35,6 +35,7 @@
     'depends': ['sale', 'purchase', 'stock'],
     'data': [
         'security/ir.model.access.csv',
+	'security/delivery_security.xml',
         'delivery_report.xml',
         'delivery_view.xml',
         'partner_view.xml',

=== modified file 'delivery/delivery.py'
--- delivery/delivery.py	2012-12-17 15:23:03 +0000
+++ delivery/delivery.py	2014-04-04 08:17:26 +0000
@@ -64,6 +64,7 @@
     _columns = {
         'name': fields.char('Delivery Method', size=64, required=True),
         'partner_id': fields.many2one('res.partner', 'Transport Company', required=True, help="The partner that is doing the delivery service."),
+	'company_id': fields.many2one('res.company', 'Company', required=False),
         'product_id': fields.many2one('product.product', 'Delivery Product', required=True),
         'grids_id': fields.one2many('delivery.grid', 'carrier_id', 'Delivery Grids'),
         'price' : fields.function(get_price, string='Price'),
@@ -78,6 +79,7 @@
     _defaults = {
         'active': 1,
         'free_if_more_than': False,
+	'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'delivery.carrier', context=c),
     }
 
     def grid_get(self, cr, uid, ids, contact_id, context=None):

=== modified file 'delivery/delivery_view.xml'
--- delivery/delivery_view.xml	2012-12-21 16:48:08 +0000
+++ delivery/delivery_view.xml	2014-04-04 08:17:26 +0000
@@ -32,6 +32,7 @@
                             <field name="product_id"/>
                         </group>
                         <group>
+			<field name="company_id" groups="base.group_multi_company"/>
                         <field name="active"/>
                         </group>
                     </group>

=== added file 'delivery/security/delivery_security.xml'
--- delivery/security/delivery_security.xml	1970-01-01 00:00:00 +0000
+++ delivery/security/delivery_security.xml	2014-04-04 08:17:26 +0000
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+
+    <record model="ir.rule" id="delivery_carrier_rule">
+        <field name="name">delivery_carrier multi-company</field>
+        <field name="model_id" search="[('model','=','delivery.carrier')]" model="ir.model"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+    </record>
+
+</data>
+</openerp>