[MERGE] forward port of branch 7.0 up to 03df412f

diff --cc addons/account/account_bank_statement.py
Simple merge

diff --cc addons/account/account_invoice.py
Simple merge

diff --cc addons/product/product_view.xml
index 4a17e85,26bc294..7260d4a
--- 1/addons/product/product_view.xml
--- 2/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@@ -143,19 -114,13 +143,19 @@@
                              <page string="Inventory" groups="base.group_user">
                                  <group name="inventory">
                                      <group name="status" string="Status">
 -                                        <field name="state"/>
 -                                        <field name="product_manager"/>
 +                                        <field name="state"
 +                                            attrs="{'readonly': [('is_only_child', '=', False)]}"/>
 +                                        <field name="product_manager"
 +                                            attrs="{'readonly': [('is_only_child', '=', False)]}"
 +                                            context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_sale_manager']}"/>
                                      </group>
-                                     <group name="Weights" groups="product.group_stock_packaging" string="Weights">
+                                     <group name="Weights" string="Weights">
 -                                        <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
 -                                        <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
 -                                        <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
 +                                        <field digits="(14, 3)" name="volume"
 +                                            attrs="{'readonly': ['|', ('type','=','service'), ('is_only_child', '=', False)]}"/>
 +                                        <field name="weight"
 +                                            attrs="{'readonly': ['|', ('type','=','service'), ('is_only_child', '=', False)]}"/>
 +                                        <field name="weight_net" 
 +                                            attrs="{'readonly': ['|', ('type','=','service'), ('is_only_child', '=', False)]}"/>
                                      </group>
                                  </group>
                              </page>

diff --cc addons/stock/product_view.xml
index 2efd1c8,77adebb..561d0ba
--- 1/addons/stock/product_view.xml
--- 2/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@@ -95,21 -88,18 +95,21 @@@
                          <label for="qty_available"/>
                              <div>
                                  <field name="qty_available" class="oe_inline"/>
 -                                <button name="%(action_view_change_product_quantity)d" string="update"
 -                                type="action"
 -                                class="oe_link"/>
 +                                <button name="%(action_view_change_product_quantity)d" string="⇒ Update"
 +                                    type="action"
 +                                    class="oe_link"/>
                              </div>
 +                        <label for="incoming_qty"/>
 +                        <div>
                              <field name="incoming_qty" class="oe_inline"/>
 -                            <field name="outgoing_qty" class="oe_inline"/>
 -                            <field name="virtual_available" class="oe_inline"/>
 +                        </div>
 +                        <field name="outgoing_qty" class="oe_inline"/>
 +                        <field name="virtual_available" class="oe_inline"/>
                      </group>
-                     <group name="lot" groups="stock.group_tracking_lot,stock.group_production_lot" string="Lots">
-                         <field name="track_production" groups="stock.group_production_lot"/>
-                         <field name="track_incoming" groups="stock.group_tracking_lot"/>
-                         <field name="track_outgoing" groups="stock.group_tracking_lot"/>
+                     <group name="lot" groups="stock.group_production_lot" string="Lots">
+                         <field name="track_production"/>
+                         <field name="track_incoming"/>
+                         <field name="track_outgoing"/>
                      </group>
                  </group>
                  <group name="status" position="after" version="7.0">

diff --cc addons/stock/stock_view.xml
Simple merge