Merge lp:~wiz-keed/openobject-addons/trunk-multicompany-aware-delivery-method-fix into lp:openobject-addons

[Paul Catinean]

Unmerged revisions

9285. By Paul Catinean on 2014-04-05

[FIX] Added company field to delivery.carrier model for company awareness of delivery methods

=== modified file 'delivery/__openerp__.py'
--- delivery/__openerp__.py	2013-12-09 10:17:38 +0000
+++ delivery/__openerp__.py	2014-04-05 10:34:35 +0000
@@ -35,6 +35,7 @@
     'depends': ['sale_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	2014-01-30 21:49:44 +0000
+++ delivery/delivery.py	2014-04-05 10:34:35 +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'),
         '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'),
 
=== modified file 'delivery/delivery_view.xml'
--- delivery/delivery_view.xml	2012-12-21 16:48:08 +0000
+++ delivery/delivery_view.xml	2014-04-05 10:34:35 +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-05 10:34:35 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="1">
+
+    <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="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>