From c439bdb3c0eda54914055955d63147d06c3a7d54 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 20 Sep 2012 15:17:11 +0200
Subject: [PATCH] [FIX] sale: put back the button 'View Invoice' on sale orders
 (removed for no reason) + reorganized files to reduce the diff with trunk

bzr revid: qdp-launchpad@openerp.com-20120920131711-hu825gunt4cbtzin
---
 addons/sale/sale_demo.xml             |  2 +-
 addons/sale/sale_view.xml             |  7 +++++--
 addons/sale/sale_workflow.xml         | 17 +++--------------
 addons/sale_stock/sale_stock_data.xml |  3 ---
 addons/sale_stock/sale_stock_view.xml | 12 ++++--------
 5 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 4c2ad474123..2cedf6f58ab 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -286,7 +286,7 @@
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="price_unit">12.50</field>
         </record>
-        
+
         <!-- Confirm some Sale Orders-->
         <workflow action="order_confirm" model="sale.order" ref="sale_order_7"/>
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index d5da6df24f3..23d2c556f40 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <!-- Top menu item -->
         <!--
             This menu item's purpose is to overwrite another one defined in
@@ -155,9 +156,10 @@
                             <button name="print_quotation" string="Print" type="object" states="sent"/>
                             <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
                             <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
+                            <button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight"
+                              attrs="{'invisible': [('invoice_exists', '=', False)]}"/>
                             <button name="%(action_view_sale_advance_payment_inv)d" string="Create Invoice"
                                 type="action" states="manual" class="oe_highlight"/>
-                                
                             <button name="cancel" states="draft,sent" string="Cancel"/>
                             <button name="action_cancel" states="manual,progress" string="Cancel" type="object"/>
                             <button name="invoice_cancel" states="invoice_except" string="Cancel"/>
@@ -179,7 +181,7 @@
                         </group>
                         <group>
                             <field name="date_order"/>
-                            <field name="shop_id"  invisible="1"/>
+                            <field name="shop_id" invisible="1"/>
                             <field name="client_order_ref"/>
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                         </group>
@@ -287,6 +289,7 @@
                                 </group>
                                 <group>
                                     <field name="invoiced"/>
+                                    <field name="invoice_exists" invisible="1"/>
                                 </group>
                             </group>
                         </page>
diff --git a/addons/sale/sale_workflow.xml b/addons/sale/sale_workflow.xml
index 41684e519cd..53542c754bc 100644
--- a/addons/sale/sale_workflow.xml
+++ b/addons/sale/sale_workflow.xml
@@ -19,8 +19,8 @@
             <field name="name">sent</field>
             <field name="kind">function</field>
             <field name="action">write({'state':'sent'})</field>
-        </record>
-                
+        </record>   
+     
         <record id="act_router" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">router</field>
@@ -87,66 +87,56 @@
         </record>
 
         <!-- Transistion -->
-        
+
         <record id="trans_draft_sent" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_sent"/>
             <field name="signal">quotation_sent</field>
         </record>
-        
         <record id="trans_draft_router" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_router"/>
             <field name="signal">order_confirm</field>
         </record>
-        
         <record id="trans_draft_cancel" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">cancel</field>
         </record>
-        
         <record id="trans_sent_router" model="workflow.transition">
             <field name="act_from" ref="act_sent"/>
             <field name="act_to" ref="act_router"/>
             <field name="signal">order_confirm</field>
         </record>
-        
         <record id="trans_sent_cancel" model="workflow.transition">
             <field name="act_from" ref="act_sent"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">cancel</field>
         </record>
-        
         <record id="trans_router_wait_invoice" model="workflow.transition">
             <field name="act_from" ref="act_router"/>
             <field name="act_to" ref="act_wait_invoice"/>
         </record>
-        
         <record id="trans_wait_invoice_all_lines_invoiced" model="workflow.transition">
             <field name="act_from" ref="act_wait_invoice"/>
             <field name="act_to" ref="act_invoice_end"/>
             <field name="signal">all_lines</field>
         </record>
-
         <record id="trans_wait_invoice_cancel2" model="workflow.transition">
             <field name="act_from" ref="act_wait_invoice"/>
             <field name="act_to" ref="act_cancel2"/>
             <field name="signal">cancel</field>
         </record>
-
         <record id="trans_wait_invoice_invoice_manual" model="workflow.transition">
             <field name="act_from" ref="act_wait_invoice"/>
             <field name="act_to" ref="act_invoice"/>
             <field name="signal">manual_invoice</field>
         </record>
-
         <record id="trans_invoice_invoice_end" model="workflow.transition">
             <field name="act_from" ref="act_invoice"/>
             <field name="act_to" ref="act_invoice_end"/>
             <field name="signal">subflow.paid</field>
         </record>
-        
         <record id="trans_invoice_invoice_except" model="workflow.transition">
             <field name="act_from" ref="act_invoice"/>
             <field name="act_to" ref="act_invoice_except"/>
@@ -167,7 +157,6 @@
             <field name="act_to" ref="act_invoice_cancel"/>
             <field name="signal">invoice_cancel</field>
         </record>
-        
         <record id="trans_invoice_end_done" model="workflow.transition">
             <field name="act_from" ref="act_invoice_end"/>
             <field name="act_to" ref="act_done"/>
diff --git a/addons/sale_stock/sale_stock_data.xml b/addons/sale_stock/sale_stock_data.xml
index 7c4844de33a..bb4944bd87e 100644
--- a/addons/sale_stock/sale_stock_data.xml
+++ b/addons/sale_stock/sale_stock_data.xml
@@ -5,9 +5,6 @@
         <!-- Resource: sale.shop -->
         <record id="sale.sale_shop_1" model="sale.shop">
             <field name="warehouse_id" ref="stock.warehouse0"/>
-            <!--  Copy the name of any company. Without demo data this will yield
-                  the main company name, which is correct. With demo data it will
-                  be random, but it does not matter much -->
         </record>
 
     </data>
diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml
index 73f247b9ba7..7efb2849a52 100644
--- a/addons/sale_stock/sale_stock_view.xml
+++ b/addons/sale_stock/sale_stock_view.xml
@@ -39,10 +39,6 @@
                        <button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order"/>
                        <button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
                    </xpath>
-                   <xpath expr="//button[@name='action_button_confirm']" position="after">
-                       <button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight"
-                           attrs="{'invisible': [('invoice_exists', '=', False)]}"/>
-                   </xpath>
                    <xpath expr="//button[@name='action_view_invoice']" position="after">
                        <button name="action_view_delivery" string="View Delivery Order" type="object" class="oe_highlight"
                            attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>                   </xpath>                   
@@ -52,7 +48,9 @@
                     <field name="state" position="replace">
                         <field name="state" widget="statusbar" statusbar_visible="draft,sent,progress,invoiced,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </field>
-
+                   <field name="shop_id" position="replace">
+                        <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/>
+                   </field>
                    <field name="product_id" position="replace">
                        <field name="product_id"
                        context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
@@ -64,9 +62,7 @@
                              name="product_uom_qty" class="oe_inline"
                            on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
                    </field>
-                   <field name="shop_id" position="replace">
-                        <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/>
-                   </field>
+
                    <field name='invoiced' position="after">
                        <field name="shipped"/>
                        <field name="invoice_exists" invisible="1"/>