[MERGE]: Merge with lp:openobject-trunk-dev-addons2

[odoo/odoo.git] / addons / sale / sale_view.xml

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c06b844..e4fd963 100644 (file)
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -49,11 +49,8 @@
             <field name="help">If you have more than one shops reselling your company products, you can create and manage them from here. Whenever you will record a new quotation or sale order, it has to be linked to a shop. The shop also defines the warehouse from which the products will be delivered for each particular sale.</field>
         </record>
 
-        <menuitem id="menu_config_sale"
-            parent="base.menu_base_config"
-            name="Sales" groups="base.group_extended"/>
         <menuitem action="action_shop_form" id="menu_action_shop_form"
-            parent="menu_config_sale" sequence="0" />
+            parent="base.menu_sale_config_sales" sequence="0" />
 
         <record id="view_sale_order_calendar" model="ir.ui.view">
             <field name="name">sale.order.calendar</field>
@@ -107,10 +104,10 @@
                     <group col="6" colspan="4">
                         <field name="name"/>
                         <field name="date_order"/>
-                        <field name="shipped"/>
-                        <field name="client_order_ref"/>
-                        <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection"/>
                         <field name="invoiced"/>
+                        <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection"/>
+                        <field name="client_order_ref"/>
+                        <field name="shipped"/>
                     </group>
                     <notebook colspan="5">
                         <page string="Sales Order">
@@ -207,9 +204,9 @@
                             <group col="13" colspan="4">
                                 <field name="state"/>
                                 <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
-                                <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="gtk-apply"/>
-                                <button name="ship_recreate" states="shipping_except" string="Recreate Procurement" icon="gtk-ok"/>
-                                <button name="ship_corrected" states="shipping_except" string="Procurement Corrected" icon="gtk-apply"/>
+                                <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
+                                <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
+                                <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
                                 <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
                                 <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
                                 <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
@@ -220,9 +217,9 @@
                             </group>
                         </page>
                         <page string="Other Information">
-                            <group colspan="2" col="2" groups="base.group_extended" name="logistics">
-                                <separator string="Logistics" colspan="2"/>
-                                <field name="incoterm"/>
+                            <group colspan="2" col="2" groups="base.group_extended" name="logistic">
+                                <separator string="Logistic" colspan="2"/>
+                                <field name="incoterm" widget="selection"/>
                                 <field name="picking_policy" required="True"/>
                                 <field name="order_policy" on_change="shipping_policy_change(order_policy)"/>
                                 <field name="invoice_quantity" attrs="{'readonly':[('order_policy','=','prepaid'),('order_policy','=','picking')]}"/>