[MERGE] merge with parent branch

bzr revid: cha@tinyerp.com-20120710102201-h5mjjkoyprp70lf0

2 files changed, 30 insertions, 32 deletions

diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index 64c151af33c..f6638f22002 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -13,38 +13,36 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <sheet>
-                        <group string="Traceability">
-                            <field name="group_stock_production_lot"/>
-                            <field name="group_stock_tracking_lot"/>
-                            <field name="module_product_expiry"
-                                attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                    <group string="Traceability">
+                        <field name="group_stock_production_lot"/>
+                        <field name="group_stock_tracking_lot"/>
+                        <field name="module_product_expiry"
+                            attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
+                    </group>
+                    <group string="Logistics">
+                        <group>
+                            <field name="group_stock_multiple_locations"/>
+                            <field name="module_stock_invoice_directly"/>
                         </group>
-                        <group string="Logistics">
-                            <group>
-                                <field name="group_stock_multiple_locations"/>
-                                <field name="module_stock_invoice_directly"/>
-                            </group>
-                            <group>
-                                <field name="module_stock_location"/>
-                                <field name="decimal_precision"/>
-                            </group>
+                        <group>
+                            <field name="module_stock_location"/>
+                            <field name="decimal_precision"/>
                         </group>
-                        <group string="Products">
-                            <group>
-                                <field name="group_stock_packaging"/>
-                                <field name="group_uom"/>
-                                <field name="group_uos"/>
-                            </group>
-                            <group>
-                                <field name="group_stock_inventory_valuation"/>
-                                <field name="group_product_variant"/>
-                            </group>
+                    </group>
+                    <group string="Products">
+                        <group>
+                            <field name="group_stock_packaging"/>
+                            <field name="group_uom"/>
+                            <field name="group_uos"/>
                         </group>
-                        <group string="Partners">
-                            <field name="module_claim_from_delivery"/>
+                        <group>
+                            <field name="group_stock_inventory_valuation"/>
+                            <field name="group_product_variant"/>
                         </group>
-                    </sheet>
+                    </group>
+                    <group string="Partners">
+                        <field name="module_claim_from_delivery"/>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index 593dc7eb9f3..dd3e791d41a 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -22,10 +22,10 @@ access_stock_production_lot_user,stock.production.lot user,model_stock_productio
 access_stock_production_lot_revision,stock.production.lot.revision,model_stock_production_lot_revision,stock.group_stock_user,1,1,1,1

 access_stock_move_manager,stock.move manager,model_stock_move,stock.group_stock_manager,1,1,0,0

 access_stock_move_user,stock.move user,model_stock_move,stock.group_stock_user,1,0,0,0

-access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.group_stock_user,1,1,1,1

-access_stock_inventory_manager,stock.inventory manager,model_stock_inventory,stock.group_stock_manager,1,0,0,0

-access_stock_inventory_line_user,stock.inventory.line user,model_stock_inventory_line,stock.group_stock_user,1,1,1,1

-access_stock_inventory_line_manager,stock.inventory.line manager,model_stock_inventory_line,stock.group_stock_manager,1,0,0,0

+access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.group_stock_user,1,0,0,0

+access_stock_inventory_manager,stock.inventory manager,model_stock_inventory,stock.group_stock_manager,1,1,1,1

+access_stock_inventory_line_user,stock.inventory.line user,model_stock_inventory_line,stock.group_stock_user,1,0,0,0

+access_stock_inventory_line_manager,stock.inventory.line manager,model_stock_inventory_line,stock.group_stock_manager,1,1,1,1

 access_stock_report_prodlots,stock.report.prodlots,model_stock_report_prodlots,stock.group_stock_manager,1,0,0,0

 access_stock_location_sale_manager,stock.location sale manager,model_stock_location,base.group_sale_manager,1,0,0,0

 access_stock_location_stock_manager,stock.location stock manager,model_stock_location,stock.group_stock_manager,1,0,0,0