[IMP] Quotation form view fields moved

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 1849d0f..d8ed802 100644 (file)
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -116,6 +116,8 @@
                             <field name="date_order"/>
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
                             <field name="currency_id" invisible="1"/>
+                            <field name="validity_date"/>
+                            <field name="payment_term" options="{'no_create': True}"/>
                         </group>
                     </group>
                     <notebook>
@@ -210,10 +212,8 @@
                                     <field name="section_id" options="{'no_create': True}" groups="base.group_multi_salesteams"/>
                                     <field groups="base.group_no_one" name="origin"/>
                                     <field name="client_order_ref"/>
-                                    <field name="validity_date"/>
                                 </group>
                                 <group name="sale_pay">
-                                    <field name="payment_term" options="{'no_create': True}"/>
                                     <field name="fiscal_position" options="{'no_create': True}"
                                         on_change="onchange_fiscal_position(fiscal_position, order_line, context)"/>
                                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>

diff --git a/addons/website_quote/views/website_quotation_backend.xml b/addons/website_quote/views/website_quotation_backend.xml
index c61b3cf..acfc427 100644 (file)
--- a/addons/website_quote/views/website_quotation_backend.xml
+++ b/addons/website_quote/views/website_quotation_backend.xml
@@ -41,8 +41,10 @@
                         </field>
                     </page>
                 </xpath>
+                <xpath expr="//field[@name='payment_term']" position="after">
+                    <field name="template_id" on_change="onchange_template_id(template_id, partner_id, fiscal_position)"/>                    
+                </xpath>
                 <xpath expr="//field[@name='client_order_ref']" position="after">
-                    <field name="template_id" on_change="onchange_template_id(template_id, partner_id, fiscal_position)"/>
                     <field name="website_description" invisible="1"/>
                 </xpath>
             </field>