From 8936bfb42bf1eb03e1aa64d94bc3b0ce7095c50d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 28 Oct 2008 23:50:40 +0100
Subject: [PATCH] improve

bzr revid: fp@tinyerp.com-20081028225040-di0ljh2qtmmjj521
---
 addons/account/account_invoice_view.xml |  6 +++---
 addons/account/report/invoice.rml       |  4 ++--
 addons/sale/process/sale_process.xml    | 14 +++++++-------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 1c4ef5546c7..3cd02de1927 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -239,6 +239,9 @@
                         <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term)" select="1"/>
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                         <field name="currency_id" on_change="onchange_currency_id(currency_id)" select="2"/>
+                        <field name="date_invoice" on_change="onchange_payment_term_date_invoice(payment_term, date_invoice)" select="1"/>
+                        <field name="period_id"/>
+                        <label align="0.0" colspan="2" string="(keep empty to use the current period)"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Invoice">
@@ -284,9 +287,6 @@
                             <field name="origin" select="2"/>
                             <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"/>
                             <field name="move_id"/>
-                            <field name="date_invoice" on_change="onchange_payment_term_date_invoice(payment_term, date_invoice)" select="1"/>
-                            <field name="period_id"/>
-                            <label align="0.0" colspan="2" string="(keep empty to use the current period)"/>
                             <separator colspan="4" string="Additionnal Information"/>
                             <field colspan="4" name="comment" nolabel="1"/>
                         </page>
diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml
index 717f9a14c2e..98b6e2c7c97 100644
--- a/addons/account/report/invoice.rml
+++ b/addons/account/report/invoice.rml
@@ -411,7 +411,7 @@
           <blockTable colWidths="120.0,91.0,29.0" style="Table_eclu_Taxes_Total">
             <tr>
               <td>
-                <para style="terp_default_Bold_9">Total (excl. taxes):</para>
+                <para style="terp_default_Bold_9">Net Total:</para>
               </td>
               <td>
                 <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]]</para>
@@ -443,7 +443,7 @@
           <blockTable colWidths="119.0,93.0,28.0" style="Table_Total_Include_Taxes">
             <tr>
               <td>
-                <para style="terp_default_Bold_9">Total (inclu. taxes):</para>
+                <para style="terp_default_Bold_9">Total:</para>
               </td>
               <td>
                 <para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]]</para>
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index a2e246a8967..b403aecef57 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -66,7 +66,7 @@
             <field eval="'Packing List'" name="name"/>
             <field eval="'The worker have to pack the requested products.'" name="note"/>
             <field name="process_id" ref="process_process_salesworkflow0"/>
-            <field eval="'object.state in ('assigned', 'confirmed')'" name="model_states"/>
+            <field name="model_states">object.state in ('assigned', 'confirmed')</field>
         </record>
 
         <record id="process_node_deliveryorder0" model="process.node">
@@ -76,7 +76,7 @@
             <field eval="'Delivery Order'" name="name"/>
             <field eval="'The delivery order document, when boxes leaves the warehouse.'" name="note"/>
             <field name="process_id" ref="process_process_salesworkflow0"/>
-            <field eval="'object.state in ('done')'" name="model_states"/>
+            <field name="model_states">object.state in ('done')</field>
         </record>
 
         <record id="process_node_invoice0" model="process.node">
@@ -107,7 +107,7 @@
         <record id="process_condition_conditionafterdelivery0" model="process.condition">
             <field name="model_id" ref="sale.model_sale_order"/>
             <field name="node_id" ref="process_node_invoiceafterdelivery0"/>
-            <field eval="'object.order_policy=='postpaid''" name="model_states"/>
+            <field name="model_states">object.order_policy=='postpaid'</field>
             <field eval="'condition_after_delivery'" name="name"/>
         </record>
         
@@ -139,7 +139,7 @@
         <record id="process_transition_packing0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="'Packing'" name="name"/>
-            <field eval="'Packing list is created when 'Assign' is being clicked after confirming the sale order. This transaction moves the sale order to packing list.'" name="note"/>
+            <field eval="'Packing list is created when the Assign button is being clicked after confirming the sale order. This transaction moves the sale order to packing list.'" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/>
             <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/>
         </record>
@@ -147,7 +147,7 @@
         <record id="process_transition_deliver0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="'Deliver'" name="name"/>
-            <field eval="'Confirming the packing list moves them to delivery order. This can be done by clicking on 'Validate' button.'" name="note"/>
+            <field eval="'Confirming the packing list moves them to delivery order. This can be done by clicking on the Validate button.'" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_deliveryorder0"/>
             <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/>
         </record>
@@ -155,7 +155,7 @@
         <record id="process_transition_invoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="'Invoice'" name="name"/>
-            <field eval="'Invoice is created when 'Create Invoice' is being clicked after confirming the sale order. This transaction moves the sale order to invoices.'" name="note"/>
+            <field eval="'Invoice is created when Create Invoice is being clicked after confirming the sale order. This transaction moves the sale order to invoices.'" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_invoice0"/>
             <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/>
             <field eval="[(6,0,[ref('sale.trans_wait_invoice_invoice_manual')])]" name="transition_ids"/>
@@ -164,7 +164,7 @@
         <record id="process_transition_invoiceafterdelivery0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="'Invoice after delivery'" name="name"/>
-            <field eval="'When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it will automatic create after delivery.'" name="note"/>
+            <field eval="'When you select Shipping Ploicy = Automatic Invoice after delivery , it will automatic create after delivery.'" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_invoiceafterdelivery0"/>
             <field model="process.node" name="source_node_id" ref="process_node_deliveryorder0"/>
         </record>