Merge lp:~unifield-team/unifield-wm/us-923 into lp:unifield-wm

[jftempo]

=== modified file 'msf_supply_doc_export/po_follow_up_menu.xml'
--- msf_supply_doc_export/po_follow_up_menu.xml	2014-11-05 14:45:55 +0000
+++ msf_supply_doc_export/po_follow_up_menu.xml	2016-02-09 14:56:03 +0000
@@ -6,8 +6,8 @@
          <field name="name">PO Follow Up per Supplier</field>
          <field name="res_model">po.follow.up</field>
          <field name="view_type">form</field>
-         <field name="view_mode">tree,graph</field>
-         <field name="view_id" ref="po_follow_up_view"></field>
+         <field name="view_mode">form</field>
+         <!--         <field name="view_id" ref="po_follow_up_view" />-->
          <field name="context">{}</field>
          <field name="help">The Purchase Order follow up report.</field>
       </record>
@@ -16,4 +16,4 @@
     </data>
 </openerp>
 			
-	
\ No newline at end of file
+	

=== modified file 'stock_override/stock_view.xml'
--- stock_override/stock_view.xml	2015-11-19 15:48:39 +0000
+++ stock_override/stock_view.xml	2016-02-09 14:56:03 +0000
@@ -252,7 +252,7 @@
             <field name="inherit_id" ref="stock.view_inventory_tree" />
             <field name="arch" type="xml">
                 <xpath expr="/tree" position="attributes">
-                    <attribute name="string">Batch inventory</attribute>
+                    <attribute name="string">Physical inventory</attribute>
                 </xpath>
             </field>
         </record>