Merge lp:~openerp-commiter/openobject-addons/chricar_trunk_stock_SoPo_account_project_mrp_crm into lp:openobject-addons

[Ferdinand]

unified layout according to proposed specs (accounting experts) for crm related forms

please merge after
https://code.launchpad.net/~openerp-commiter/openobject-addons/chricar_trunk_stock_SoPo_account_project_mrp

[qdp (OpenERP) (qdp)]

Hello Ferdinand,

i think that something went wrong with your branches, all your branches related to SOPO seems to share the same diff.

Besides, there are not onyl changes related to xml changes (but also in .py files).

And i must admit that even if the 2 above points would be fixed i'm not sure we would accept this branch. You certainly have noticed that we improved a lot the usability in v6 and, due to our slowness, your suggestion are probably deprecated now.

But thank you a lot for your interest and contribution,
Quentin

review: Disapprove

=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2010-09-01 03:33:18 +0000
+++ account/account_invoice_view.xml	2010-09-07 06:36:14 +0000
@@ -147,31 +147,36 @@
             <field name="priority">2</field>
             <field name="arch" type="xml">
                 <form string="Supplier invoice">
-                    <group col="8" colspan="4">
-                        <field domain="[('type', '=', 'purchase')]" name="journal_id"/>
+
+                    <group col="6" colspan="4">
                         <field name="number" readonly="1"/>
-                        <field name="type" invisible="1"/>
-                        <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
-                        <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
-                        <newline/>
-                        <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
-                        <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
-                        <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
-                        <newline/>
                         <field name="date_invoice"/>
+                        <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
+                        <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}" colspan="4"/>
+<field name="reference_type" nolabel="1" size="0"/>
+                            <field name="reference" nolabel="1"/>
+                        <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id" colspan="4"/>
+                        <newline/>
+                        <field name="type" />
                         <field name="period_id" groups="account.group_account_user"/>
-                        <group colspan="2" col="1" groups="account.group_account_user">
-                            <label align="0.0" string="(keep empty to use the current period)"/>
-                        </group>
-                    </group>
+                       <group col="4" colspan="2">
+                        <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" widget="selection"/>
+                        <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
+                       </group>
+                      </group>
+
                     <notebook colspan="4">
                         <page string="Invoice">
-                           <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="account.group_account_user"/>
-                            <field name="reference_type" nolabel="1" size="0"/>
-                            <field name="reference" nolabel="1"/>
-                            <field name="date_due"/>
-                            <field name="check_total" required="2"/>
-                            <field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1">
+                          <group col="6" colspan="4">
+                           <field domain="[('type', '=', 'purchase')]" name="journal_id"/>
+                           <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
+                           <field name="payment_term" widget="selection"/>
+                           <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="account.group_account_user" colspan="4"/>
+                           <field name="date_due"/>
+                           <field name="name" colspan="4"/>
+                           <field name="reconciled"/>
+                          </group>
+                          <field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1">
                                 <tree string="Invoice lines">
                                     <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
                                     <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)"/>
@@ -202,7 +207,7 @@
                                 <field name="amount_untaxed"/>
                                 <label string="" colspan="2"/>
                                 <field name="amount_tax"/>
-                                <field name="reconciled"/>
+                                <field name="check_total" required="2" string="Vendor Total"/>
                                 <field name="amount_total"/>
                                 <field name="state"/>
                                 <field name="residual"/>
@@ -216,16 +221,11 @@
                             </group>
                         </page>
                         <page string="Other Info">
-                            <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
-
-                            <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
-                            <newline/>
-                            <field name="payment_term" widget="selection"/>
-                            <field name="name"/>
-                            <newline/>
+                          <field domain="[('partner_id','=',partner_id)]" name="address_contact_id" groups="base.group_extended" colspan="4"/>
+                             <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)" colspan="4"/>
+                             <field name="user_id"/>
                             <field name="origin" groups="base.group_extended"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="address_contact_id" groups="base.group_extended"/>
-                            <field name="user_id"/>
+
                             <field name="move_id" groups="account.group_account_user"/>
                             <separator colspan="4" string="Additional Information"/>
                             <field colspan="4" name="comment" nolabel="1"/>
@@ -255,29 +255,33 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invoice">
-                    <group colspan="4" col="8">
-                    <field name="journal_id" groups="base.group_user"/>
-                    <field name="number"/>
-                    <field name="type" invisible="1"/>
-                    <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
-                    <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
-                    <newline/>
-                    <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user"/>
-                    <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
-                    <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
-                    <newline/>
-                    <field name="date_invoice"/>
-                    <field name="period_id" groups="account.group_account_user"/>
-                    <group colspan="2" col="1" groups="account.group_account_user">
-                        <label align="0.0" string="(keep empty to use the current period)"/>
-                    </group>
+                    <group colspan="4" col="6">
+                       <field name="number"/>
+                       <field name="date_invoice"/>
+                       <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
+                       <newline/>
+                       <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user" colspan="4"/>
+                       <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id" colspan="4"/>
+                       <newline/>
+                       <field name="type" />
+                       <field name="period_id" groups="account.group_account_user"/>
+                       <group colspan="2" col="4">
+                         <field name="currency_id" on_change="onchange_currency_id(currency_id, company_id)" width="50" widget="selection"/>
+                         <button name="549" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
+                       </group>
                     </group>
                     <notebook colspan="4">
                         <page string="Invoice">
-                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="account.group_account_user"/>
-                            <field name="name"/>
+                         <group col="6" colspan="4">
+                            <field name="journal_id" groups="base.group_user"/>
+                            <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                             <field name="payment_term" widget="selection"/>
-                            <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list"/>
+                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="account.group_account_user" colspan="4"/>
+                            <field name="date_due"/>
+                            <field name="name" colspan="4"/>
+                            <field name="reconciled"/>
+                         </group>
+                           <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list"/>
                             <group col="1" colspan="2">
                                 <field name="tax_line" nolabel="1">
                                     <tree editable="bottom" string="Taxes">
@@ -294,7 +298,7 @@
                                 <field name="amount_untaxed"/>
                                 <label string="" colspan="2"/>
                                 <field name="amount_tax"/>
-                                <field name="reconciled"/>
+                                <label align="0.0" string="" colspan="2"/>
                                 <field name="amount_total"/>
                                 <field name="state"/>
                                 <field name="residual"/>
@@ -310,16 +314,10 @@
                             </group>
                         </page>
                         <page string="Other Info">
-                            <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection"  groups="base.group_multi_company"/>
-                            <newline/>
-                            <field name="date_due"/>
+                            <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id" groups="base.group_extended"/>
+                            <field colspan="4" domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id" groups="base.group_extended"/>
                             <field name="user_id"/>
-                            <newline/>
-                            <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"
-                                groups="base.group_extended"/>
                             <field name="origin"/>
-                            <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"
-                                groups="base.group_extended"/>
                             <field name="move_id" groups="account.group_account_user"/>
                             <separator colspan="4" string="Additional Information"/>
                             <field colspan="4" name="comment" nolabel="1"/>
 
=== modified file 'account/account_view.xml'
--- account/account_view.xml	2010-09-03 07:24:13 +0000
+++ account/account_view.xml	2010-09-07 06:36:14 +0000
@@ -121,7 +121,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_account_period_search" model="ir.ui.view">
             <field name="name">account.period.search</field>
             <field name="model">account.period</field>
@@ -137,7 +137,7 @@
                 </search>
             </field>
         </record>
-        
+
         <record id="action_account_period_form" model="ir.actions.act_window">
             <field name="name">Periods</field>
             <field name="res_model">account.period</field>
@@ -157,14 +157,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account">
-                    <group col="6" colspan="4">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="parent_id"/>
-                    <field name="type" select="1"/>
-                    <field name="user_type" select="1"/>
+                    <group col="6" colspan="6">
+                       <field name="code" select="1"/>
+                       <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                       <field name="name" select="1" colspan="6"/>
+                       <field name="parent_id"  colspan="6"/>
+                       <field name="type" select="1"/>
+                       <field name="user_type" select="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
 
=== modified file 'account/project/project_view.xml'
--- account/project/project_view.xml	2010-09-01 15:09:45 +0000
+++ account/project/project_view.xml	2010-09-07 06:36:14 +0000
@@ -71,16 +71,16 @@
             <field name="arch" type="xml">
                 <form string="Analytic account">
                     <group colspan="4" col="6">
-                        <field name="name" select="1" colspan="4"/>
                         <field name="code" select="1"/>
-                        <field name="parent_id" on_change="on_change_parent(parent_id)" groups="base.group_extended"/>
                         <field name="company_id" select="2" widget="selection" groups="base.group_multi_company"/>
+                        <field name="name" select="1" colspan="6"/>
+                        <field name="parent_id" on_change="on_change_parent(parent_id)" groups="base.group_extended" colspan="6"/>
                         <field name="type" select="2"/>
-                        <field name="company_currency_id" select="2"/>
+                        <field name="company_currency_id"   select="2" widget="selection" />
                     </group>
                     <notebook colspan="4">
                         <page string="Account Data">
-                            <field name="partner_id" select="1"/>
+                            <field name="partner_id" select="1" colspan="4"/>
                             <newline/>
                             <field name="date_start"/>
                             <field name="date" select="2"/>
 
=== modified file 'account_tax_include/account_tax_include_view.xml'
--- account_tax_include/account_tax_include_view.xml	2010-08-12 20:45:13 +0000
+++ account_tax_include/account_tax_include_view.xml	2010-09-07 06:36:14 +0000
@@ -21,7 +21,7 @@
             <field name="model">account.invoice</field>
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
-                <field name="payment_term" position="after">
+                <field name="invoice_line" position="before">
                     <field name="price_type"/>
                 </field>
             </field>
 
=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml	2010-09-03 11:44:46 +0000
+++ mrp/mrp_view.xml	2010-09-07 06:36:14 +0000
@@ -297,6 +297,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Bill of Material">
+
                     <group colspan="4" col="6">
                         <field name="product_id" on_change="onchange_product_id(product_id, name)" select="1"/>
                         <field name="name" select="1"/>
@@ -562,27 +563,24 @@
                     <group colspan="4" col="6">
                         <field name="name" string="Reference"/>
                         <field name="date_planned"/>
+                           <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+
+                        <field name="product_id" on_change="product_id_change(product_id)" colspan="4"/>
                         <field name="origin"/>
-                        <field name="product_id" on_change="product_id_change(product_id)"/>
                         <field name="product_qty"/>
-                        <group colspan="2" col="3">
                         <field name="product_uom"/>
                         <button type="action"
                             name="%(mrp.action_change_production_qty)d"
                             string="Change Qty" states="ready,confirmed" />
-                        </group>
-                        <label string="" colspan="2"/>
+                        <newline/>
                         <field name="product_uos_qty" groups="product.group_uos"/>
-                        <group colspan="2" col="3" groups="product.group_uos">
-                            <field name="product_uos"/>
-                            <label string=""/>
-                        </group>
+                        <field name="product_uos"/>
                     </group>
 
                     <notebook colspan="4">
                         <page string="Consumed Products">
-                            <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)" />
-                            <field name="routing_id" groups="base.group_extended" select="1"/>
+                            <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)" colspan="4"/>
+                            <field name="routing_id" groups="base.group_extended" select="1" colspan="4"/>
                             <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
                             <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                             <separator string="" colspan="4"/>
 
=== modified file 'procurement/procurement_view.xml'
--- procurement/procurement_view.xml	2010-08-18 06:30:58 +0000
+++ procurement/procurement_view.xml	2010-09-07 06:36:14 +0000
@@ -45,8 +45,9 @@
                     <notebook colspan="4">
                     <page string="Procurement Details">
                         <separator colspan="4" string="Product &amp; Location"/>
-                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                        <field name="location_id" domain="[('usage','=','internal')]"/>
+                        <field name="product_id" on_change="onchange_product_id(product_id)" colspan="4"/>
+			<field name="location_id" domain="[('usage','=','internal')]"/>
+			<newline/>
                         <field name="product_qty"/>
                         <field name="product_uom" widget="selection"/>
 
 
=== modified file 'project/project.py'
--- project/project.py	2010-08-27 12:05:25 +0000
+++ project/project.py	2010-09-07 06:36:14 +0000
@@ -416,8 +416,8 @@
                                   help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
                                   \n If the task is over, the states is set to \'Done\'.'),
         'create_date': fields.datetime('Create Date', readonly=True),
-        'date_start': fields.datetime('Starting Date'),
-        'date_end': fields.datetime('Ending Date'),
+        'date_start': fields.datetime('Date Start'),
+        'date_end': fields.datetime('Date End'),
         'date_deadline': fields.date('Deadline'),
         'project_id': fields.many2one('project.project', 'Project', ondelete='cascade',
             help="If you have [?] in the project name, it means there are no analytic account linked to this project."),
 
=== modified file 'project/project_view.xml'
--- project/project_view.xml	2010-08-27 11:36:48 +0000
+++ project/project_view.xml	2010-09-07 06:36:14 +0000
@@ -17,13 +17,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project">
-                    <group colspan="6" col="6">
-                        <field name="name" string="Project Name" select="1"/>
-                        <field name="parent_id" string="Parent Project"/>
-                        <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
+                    <group colspan="4" col="6">
+                        <field name="name" string="Project Name" select="1" colspan="4"/>
+                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <field name="parent_id" string="Parent Project"  colspan="4"/>
+                        <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"  colspan="2"/>
                         <field name="date_start" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                        <field name="progress_rate" widget="progressbar"/>
+                        <field name="progress_rate" widget="progressbar" />
+                            <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" />
+                            <field name="warn_customer"/>
+                            <field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Contact Address" colspan="4"/>
+                            <field name="warn_manager"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Administration">
@@ -39,8 +44,8 @@
                             </group>
                             <group col="2" colspan="2" name="misc">
                                 <separator colspan="2" string="Miscelleanous"/>
-                                <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
-                                <field name="warn_manager"/>
+
+
                             </group>
                             <newline/>
                             <group col="9" colspan="8">
@@ -61,10 +66,6 @@
                             <field colspan="4" name="members" nolabel="1"/>
                         </page>
                         <page groups="base.group_extended" string="Partner Info">
-                            <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Contact Address"/>
-                            <field name="warn_customer"/>
-                            <newline/>
                             <separator colspan="2" string="Mail Header"/>
                             <separator colspan="2" string="Mail Footer"/>
                             <field name="warn_header" nolabel="1" colspan="2"/>
@@ -197,31 +198,31 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Task edition">
-                    <group colspan="6" col="6">
-                        <field name="name" select="1"/>
-                        <field name="project_id" required="1" select="1" domain="[('user_id','=',uid)]"/>
-                        <field name="total_hours" widget="float_time"/>
-                        <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                     <group colspan="4" col="6">
+                        <field name="project_id" required="1" select="1" domain="[('user_id','=',uid)]" colspan="4"/>
+                        <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
+                        <field name="name" select="1" colspan="4"/>
                         <field name="user_id" select="1" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                        <field name="date_start"  attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                        <field name="date_end"  attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
                         <field name="progress" widget="progressbar"/>
+                        <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                        <field name="total_hours" widget="float_time"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Information">
-                            <group col="2" colspan="2">
-                                <field
-                                    name="planned_hours"
-                                    widget="float_time"
-                                    attrs="{'readonly':[('state','!=','draft')]}"
-                                    on_change="onchange_planned(planned_hours, effective_hours)"/>
-                                <field name="effective_hours" widget="float_time"/>
-                            </group>
-                            <group col="3" colspan="2">
+                            <group colspan="4" col="6">
+                                <field name="partner_id" colspan="6" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
+                                <field name="planned_hours"
+                                       widget="float_time"
+                                       attrs="{'readonly':[('state','!=','draft')]}"
+                                       on_change="onchange_planned(planned_hours, effective_hours)"/>
                                 <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/>
                                 <button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
-
+                                <newline/>
+                                <field name="effective_hours" widget="float_time"/>
                                 <field name="delay_hours" widget="float_time"/>
                             </group>
-
                             <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
                             <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['draft','done'])]}">
                                 <tree string="Task Work" editable="top">
@@ -268,13 +269,9 @@
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Dates" colspan="2"/>
-                                <field name="date_start"/>
-                                <field name="date_end"/>
                                 <field name="create_date"/>
                             </group>
                             <separator string="Miscelleanous" colspan="4"/>
-                            <field name="partner_id"/>
-                            <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                             <group col="4" colspan="2">
                                 <field name="type_id" widget="selection" readonly="1"/>
                                 <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
 
=== modified file 'purchase/partner.py'
--- purchase/partner.py	2010-06-29 09:13:12 +0000
+++ purchase/partner.py	2010-09-07 06:36:14 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -27,13 +27,21 @@
     _columns = {
         'property_product_pricelist_purchase': fields.property(
           'product.pricelist',
-          type='many2one', 
-          relation='product.pricelist', 
+          type='many2one',
+          relation='product.pricelist',
           domain=[('type','=','purchase')],
-          string="Purchase Pricelist", 
+          string="Purchase Pricelist",
           method=True,
           view_load=True,
           help="This pricelist will be used, instead of the default one, for purchases from the current partner"),
+       'property_purchase_payment_term': fields.property(
+            'account.payment.term',
+            type='many2one',
+            relation='account.payment.term',
+            string ='Purchase Payment Term',
+            method=True,
+            view_load=True,
+            help="This purchase payment term will be used instead of the default one for the current partner"),
     }
 res_partner()
 
 
=== modified file 'purchase/partner_view.xml'
--- purchase/partner_view.xml	2010-06-12 16:50:46 +0000
+++ purchase/partner_view.xml	2010-09-07 06:36:14 +0000
@@ -17,5 +17,19 @@
             </field>
         </record>
 
+        <record id="view_partner_term_property_form" model="ir.ui.view">
+            <field name="name">res.partner.account.term.property.form.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_partner_property_form"/>
+            <field name="priority">36</field>
+            <field name="arch" type="xml">
+	         <field name="property_account_payable" position="after">
+	              <field name="property_purchase_payment_term"/>
+                 </field>
+            </field>
+        </record>
+
+
     </data>
 </openerp>
 
=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2010-09-03 09:38:12 +0000
+++ purchase/purchase.py	2010-09-07 06:36:14 +0000
@@ -208,6 +208,7 @@
         'product_id': fields.related('order_line','product_id', type='many2one', relation='product.product', string='Product'),
         'create_uid':  fields.many2one('res.users', 'Responsible'),
         'company_id': fields.many2one('res.company','Company',required=True,select=1),
+	'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
     }
     _defaults = {
         'date_order': time.strftime('%Y-%m-%d'),
@@ -260,12 +261,13 @@
     def onchange_partner_id(self, cr, uid, ids, part):
 
         if not part:
-            return {'value':{'partner_address_id': False, 'fiscal_position': False}}
+	    return {'value':{'partner_address_id': False,  'payment_term': False,'fiscal_position': False}}
         addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['default'])
         part = self.pool.get('res.partner').browse(cr, uid, part)
         pricelist = part.property_product_pricelist_purchase.id
         fiscal_position = part.property_account_position and part.property_account_position.id or False
-        return {'value':{'partner_address_id': addr['default'], 'pricelist_id': pricelist, 'fiscal_position': fiscal_position}}
+	payment_term = part.property_purchase_payment_term and part.property_purchase_payment_term.id or False
+	return {'value':{'partner_address_id': addr['default'], 'pricelist_id': pricelist,  'payment_term': payment_term, 'fiscal_position': fiscal_position}}
 
     def wkf_approve_order(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state': 'approved', 'date_approve': time.strftime('%Y-%m-%d')})
@@ -378,7 +380,7 @@
                 'origin': o.name,
                 'invoice_line': il,
                 'fiscal_position': o.partner_id.property_account_position.id,
-                'payment_term': o.partner_id.property_payment_term and o.partner_id.property_payment_term.id or False,
+		'payment_term': o.payment_term.id,
                 'company_id': o.company_id.id,
             }
             inv_id = self.pool.get('account.invoice').create(cr, uid, inv, {'type':'in_invoice'})
 
=== modified file 'purchase/purchase_view.xml'
--- purchase/purchase_view.xml	2010-08-25 15:03:33 +0000
+++ purchase/purchase_view.xml	2010-09-07 06:36:14 +0000
@@ -87,24 +87,28 @@
             <field name="model">purchase.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Purchase Order">
+            <form string="Purchase Order">
                     <group col="6" colspan="4">
                         <field name="name"/>
                         <field name="date_order"/>
-                        <field name="invoiced"/>
-                        <newline/>
-                        <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('supplier','=', 1)]" colspan="4"/>
                         <field name="partner_ref"/>
-                        <field name="shipped"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="partner_address_id"  colspan="4"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Purchase Order">
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('supplier','=', 1)]"/>
-                            <field name="partner_address_id"/>
+                         <group col="6" colspan="4">
+                           <field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)" colspan="4"/>
+                           <field name="shipped"/>
+                            <newline/>
+                            <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
+                           <field name="minimum_planned_date"/>
+                           <field name="invoiced"/>
+                           <newline/>
                             <field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/>
-                            <field name="origin" groups="base.group_extended"/>
-                            <newline/>
+                          <field name="payment_term" widget="selection"/>
+                       </group>
                             <field colspan="4" name="order_line" nolabel="1" mode="tree,form">
                                 <tree colors="red:date_planned&lt;=current_date;black:date_planned&gt;current_date" string="Purchase Order Lines">
                                     <field name="date_planned"/>
@@ -138,9 +142,8 @@
                         <page string="Delivery &amp; Invoices" groups="base.group_extended">
                             <group colspan="2" col="2">
                                 <separator string="Delivery" colspan="2"/>
-                                <field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)"/>
-                                <field name="minimum_planned_date"/>
                                 <field name="location_id"/>
+                                <field name="origin" groups="base.group_extended"/>
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Invoice Control" colspan="2"/>
 
=== modified file 'sale/sale.py'
--- sale/sale.py	2010-09-03 04:58:47 +0000
+++ sale/sale.py	2010-09-07 06:36:14 +0000
@@ -165,6 +165,7 @@
                 res[sale.id] = False
         return res
 
+
     def _invoiced_search(self, cursor, user, obj, name, args, context=None):
         if context is None:
             context = {}
@@ -175,6 +176,92 @@
         for arg in args:
             if arg[1] == '=':
                 if arg[2]:
+                    clause += 'AND inv.state = \'open\''
+                else:
+                    clause += 'AND inv.state <> \'open\''
+                    no_invoiced = True
+        cursor.execute('SELECT rel.order_id ' \
+                'FROM sale_order_invoice_rel AS rel, account_invoice AS inv ' \
+                'WHERE rel.invoice_id = inv.id ' + clause)
+        res = cursor.fetchall()
+        if no_invoiced:
+            cursor.execute('SELECT sale.id ' \
+                    'FROM sale_order AS sale ' \
+                    'WHERE sale.id NOT IN ' \
+                        '(SELECT rel.order_id ' \
+                        'FROM sale_order_invoice_rel AS rel)')
+            res.extend(cursor.fetchall())
+        if not res:
+            return [('id', '=', 0)]
+        return [('id', 'in', [x[0] for x in res])]
+
+    def _paid(self, cursor, user, ids, name, arg, context=None):
+        if context is None:
+            context = {}
+        res = {}
+        for sale in self.browse(cursor, user, ids, context=context):
+            res[sale.id] = True
+            for invoice in sale.invoice_ids:
+                if invoice.reconciled != True:
+                    res[sale.id] = False
+                    break
+            if not sale.invoice_ids:
+                res[sale.id] = False
+        return res
+
+    def _paid_search(self, cursor, user, obj, name, args, context=None):
+        if context is None:
+            context = {}
+        if not len(args):
+            return []
+        clause = ''
+        no_invoiced = False
+        for arg in args:
+            if arg[1] == '=':
+                if arg[2]:
+                    clause += 'AND inv.state = \'open\''
+                else:
+                    clause += 'AND inv.state <> \'open\''
+                    no_invoiced = True
+        cursor.execute('SELECT rel.order_id ' \
+                'FROM sale_order_invoice_rel AS rel, account_invoice AS inv ' \
+                'WHERE rel.invoice_id = inv.id ' + clause)
+        res = cursor.fetchall()
+        if no_invoiced:
+            cursor.execute('SELECT sale.id ' \
+                    'FROM sale_order AS sale ' \
+                    'WHERE sale.id NOT IN ' \
+                        '(SELECT rel.order_id ' \
+                        'FROM sale_order_invoice_rel AS rel)')
+            res.extend(cursor.fetchall())
+        if not res:
+            return [('id', '=', 0)]
+        return [('id', 'in', [x[0] for x in res])]
+
+    def _paid(self, cursor, user, ids, name, arg, context=None):
+        if context is None:
+            context = {}
+        res = {}
+        for sale in self.browse(cursor, user, ids, context=context):
+            res[sale.id] = True
+            for invoice in sale.invoice_ids:
+                if invoice.reconciled != True:
+                    res[sale.id] = False
+                    break
+            if not sale.invoice_ids:
+                res[sale.id] = False
+        return res
+
+    def _paid_search(self, cursor, user, obj, name, args, context=None):
+        if context is None:
+            context = {}
+        if not len(args):
+            return []
+        clause = ''
+        no_invoiced = False
+        for arg in args:
+            if arg[1] == '=':
+                if arg[2]:
                     clause += 'AND inv.state = \'paid\''
                 else:
                     clause += 'AND inv.state <> \'paid\''
@@ -250,8 +337,10 @@
         'shipped': fields.boolean('Picked', readonly=True, help="It indicates that a picking has been done. It will be set to True if the ordered quantities are available and the picking is done. If the ordered quantities are not available it generates a Purchase/Manufacturing order. Unless its Picking and Purchase/Manufacturing order are not in the done state it wont be set to True"),
         'picked_rate': fields.function(_picked_rate, method=True, string='Picked', type='float'),
         'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
-        'invoiced': fields.function(_invoiced, method=True, string='Paid',
-            fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid"),
+        'invoiced': fields.function(_invoiced, method=True, string='Invoiced',
+            fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been invoiced"),
+        'paid': fields.function(_invoiced, method=True, string='Paid',
+            fnct_search=_paid_search, type='boolean', help="It indicates that an invoice has been paid"),  
         'note': fields.text('Notes'),
 
         'amount_untaxed': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Sale Price'), string='Untaxed Amount',
@@ -276,7 +365,7 @@
         'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.", required=True),
         'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
-        'company_id': fields.related('shop_id','company_id',type='many2one',relation='res.company',string='Company',store=True)
+        'company_id': fields.related('shop_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
     }
     _defaults = {
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'sale.order', context=c),
@@ -290,6 +379,8 @@
         'partner_invoice_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['invoice'])['invoice'],
         'partner_order_id': lambda self, cr, uid, context: context.get('partner_id', False) and  self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['contact'])['contact'],
         'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'],
+
+
     }
     _order = 'name desc'
 
@@ -800,7 +891,7 @@
         'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, states={'draft':[('readonly',False)]}),
         'name': fields.char('Description', size=256, required=True, select=True, readonly=True, states={'draft':[('readonly',False)]}),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sale order lines."),
-        'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the the shipping of the products to the customer", readonly=True, states={'draft':[('readonly',False)]}),
+        'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation and the shipping of the products to the customer", readonly=True, states={'draft':[('readonly',False)]}),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
         'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
         'invoiced': fields.boolean('Invoiced', readonly=True),
@@ -830,6 +921,7 @@
         'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer'),
         'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', string='Salesman'),
         'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True, states={'draft':[('readonly',False)]}),
+
     }
     _order = 'sequence, id'
     _defaults = {
 
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml	2010-09-03 06:17:18 +0000
+++ sale/sale_view.xml	2010-09-07 06:36:14 +0000
@@ -102,21 +102,27 @@
                     <group col="6" colspan="4">
                         <field name="name"/>
                         <field name="date_order"/>
-                        <field name="shipped"/>
+                        <field name="company_id" groups="base.group_multi_company" readonly="1"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id)" required="1" colspan="4"/>
                         <field name="client_order_ref"/>
-                        <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection"/>
-                        <field name="invoiced"/>
+                        <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id"  colspan="4"/>
+                        <newline/>
                     </group>
                     <notebook colspan="5">
                         <page string="Sale Order">
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" required="1"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="partner_order_id"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" groups="base.group_extended"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id" groups="base.group_extended"/>
+                          <group col="6" colspan="4">
+                            <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id" colspan="4"/>
+			    <field name="shipped"/>
+			    <!-- FIXME here we should see the contact - base_contact issue? -->
+                            <field domain="[('partner_id','=',partner_id)]" name="partner_order_id" colspan="4"/>
+                            <field name="invoiced"/>
+                            <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection"/>
+                            <label align="0.0" string="(Expected date)" colspan="2"/>
+                            <field name="paid"/>
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended"/>
-                            <field name="project_id"
-                                context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"
-                                groups="base.group_extended" domain="[('parent_id','!=',False)]" />
+                           <field name="payment_term" widget="selection"/>
+                           <label align="0.0" string="backorder" colspan="2"/>
+                          </group>
                             <newline/>
                             <field colspan="4" mode="tree,form,graph" name="order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sale Order Lines">
@@ -143,11 +149,11 @@
                                                 domain="[('product_id','=',product_id)]"
                                                 groups="base.group_extended"/>
 
-                                            <field name="company_id" groups="base.group_multi_company" readonly="1"/>
+
                                             <field colspan="4" name="name"/>
                                             <field name="price_unit"/>
                                             <field name="discount"/>
-                                            <field name="type" groups="base.group_extended"/>
+					    <field name="type" groups="base.group_extended"/>
                                             <field name="delay" groups="base.group_extended"/>
                                             <newline/>
                                             <separator colspan="5" string="Taxes"/>
@@ -228,9 +234,10 @@
                             </group>
                             <group colspan="2" col="2" groups="base.group_extended">
                                 <separator string="Conditions" colspan="2"/>
-                                <field name="payment_term" widget="selection"/>
+                                <field name="project_id"
+                                context="{'partner_id':partner_id, 'contact_id':partner_order_id, 'pricelist_id':pricelist_id, 'default_name':name}"
+                                groups="base.group_extended" domain="[('parent_id','!=',False)]" />
                                 <field name="fiscal_position" widget="selection"/>
-                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                             </group>
                             <group colspan="2" col="2" groups="base.group_extended">
                                 <separator string="Dates" colspan="2"/>
 
=== modified file 'sale/stock_view.xml'
--- sale/stock_view.xml	2010-08-25 19:07:01 +0000
+++ sale/stock_view.xml	2010-09-07 06:36:14 +0000
@@ -7,25 +7,37 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
-                <field name="active" position="after">
+                <field name="backorder_id" position="after">
                     <field name="sale_id"/>
                 </field>
             </field>
         </record>
-        
+
         <!-- Adding Sale Order Reference to outgoing picking -->
-        
+
         <record id="stock_picking_out_inherit_sale" model="ir.ui.view">
             <field name="name">Outgoing picking Inherited</field>
             <field name="model">stock.picking</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
-                <field name="move_type" position="after">
+                <field name="backorder_id" position="after">
                     <field name="sale_id"/>
                 </field>
             </field>
         </record>
 
+	<!--
+	see https://bugs.launchpad.net/openobject-server/+bug/601480
+	-->
+        <act_window
+            domain="[('sale_id', '=', active_id),('type','=','out')]"
+            id="act_purchase_order_2_stock_picking"
+	    view_id="view.picking.out.tree"
+            name="Outgoing Orders"
+            res_model="stock.picking"
+            src_model="sale.order"
+            context="{'contact_display': 'partner'}" />
+
     </data>
 </openerp>
 
=== modified file 'sale_order_dates/sale_order_dates_view.xml'
--- sale_order_dates/sale_order_dates_view.xml	2010-06-30 10:31:08 +0000
+++ sale_order_dates/sale_order_dates_view.xml	2010-09-07 06:36:14 +0000
@@ -11,11 +11,21 @@
                 <field name="date_confirm" position="after">
                     <field name="commitment_date"/>
                     <field name="effective_date"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_sale_orderfor_a" model="ir.ui.view">
+            <field name="name">sale.order.form.inherit5a</field>
+            <field name="model">sale.order</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="view_sale_orderfor"/>
+            <field name="arch" type="xml">
+                <field name="partner_invoice_id" position="after">
                     <field name="requested_date"/>
                 </field>
             </field>
         </record>
 
-
     </data>
 </openerp>
 
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml	2010-09-03 06:17:18 +0000
+++ stock/stock_view.xml	2010-09-07 06:36:14 +0000
@@ -564,17 +564,21 @@
             <field name="name">stock.picking.form</field>
             <field name="model">stock.picking</field>
             <field name="type">form</field>
+            <field eval="12" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Picking list">
                     <group colspan="4" col="6">
                         <field name="name" readonly="1"/>
+                        <field name="date"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="address_id" required="1" colspan="4"/>
                         <field name="origin"/>
+                        <newline/>
+                        <field name="min_date"/>
                         <field name="backorder_id" groups="base.group_extended" readonly="1"/>
-                        <field name="date"/>
-                        <field name="min_date"/>
-                        <field name="type"/>
+                        <newline/>
+                        <field name="type" readonly="1"/>
                         <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
@@ -741,14 +745,15 @@
                 <form string="Picking list">
                     <group col="6" colspan="4" attrs="{'readonly': [('state','not in',['draft','auto'])]}">
                         <field name="name" readonly="1"/>
-                        <field name="address_id" required="1"/>
+                        <field name="date"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="address_id" required="1" colspan="4"/>
                         <field name="origin"/>
+                        <field name="min_date"/>
                         <field name="backorder_id" groups="base.group_extended" readonly="1"/>
-                        <field name="date" />
-                        <field name="min_date"/>
+                        <newline/>
+                        <field name="type" readonly="1"/>
                         <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        <field name="type" invisible="1"/>
                     </group>
                         <notebook colspan="4">
                         <page string="General Information">
@@ -830,7 +835,7 @@
                                         </page>
  										<page string="Return Picking History">
                                             <field name="move_stock_return_history" nolabel="1"/>
-                                        </page>                                  
+                                        </page>
                                     </notebook>
                                 </form>
                             </field>
@@ -944,16 +949,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Picking list">
-                    <group col="6" colspan="4">
-                        <field name="address_id" required="1" />
+                   <group col="6" colspan="4">
+                        <field name="name" readonly="1"/>
+                        <field name="date"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="address_id" required="1" colspan="4"/>
+                        <field name="origin" readonly="1"/>
                         <field name="min_date"/>
-                        <field name="name" readonly="1"/>
+                        <field name="backorder_id" readonly="1"/>
+                        <newline/>
+                        <field name="type" readonly="1"/>
+                        <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                         <field name="invoice_state"/>
-                        <field name="backorder_id" readonly="1"/>
-                        <field name="origin" readonly="1"/>
-                        <field name="type" invisible="1"/>
-                        <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
@@ -1143,15 +1150,15 @@
                 <form string="Input Picking List">
                     <group colspan="4" col="6">
                         <field name="name" readonly="1"/>
-                        <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" required="1" />
+                        <field name="date"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" required="1" colspan="4"/>
                         <field name="origin"/>
+                        <field name="min_date" readonly="1"/>
                         <field name="backorder_id" readonly="1" groups="base.group_extended"/>
-                        <field name="date"/>
-                        <field name="type"/>
-                        <field name="min_date" readonly="1"/>
+                        <field name="type" readonly="1"/>
+                        <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
                         <field name="invoice_state" string="Invoice Control"/>
-                        <field name="stock_journal_id" groups="base.group_extended" widget="selection"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
@@ -1221,7 +1228,7 @@
                                         <page string="Return Picking History">
                                                     <field name="move_stock_return_history" nolabel="1"/>
                                                 </page>
-                                        
+
                                     </notebook>
                                 </form>
                             </field>
@@ -1444,7 +1451,7 @@
                         </page>
                         <page string="Return Picking History">
                             <field name="move_stock_return_history" nolabel="1"/>
-                        </page>                        
+                        </page>
                     </notebook>
                     <group col="6" colspan="4">
                         <field name="state"/>
@@ -1604,7 +1611,7 @@
                         </page>
            				<page string="Return Picking History">
                             <field name="move_stock_return_history" nolabel="1"/>
-                         </page>                        
+                         </page>
                     </notebook>
                 </form>
             </field>
@@ -1744,7 +1751,7 @@
             <field name="name">Products</field>
             <field eval="'ir.actions.act_window,%d'%act_product_location_open" name="value"/>
             <field eval="True" name="object"/>
-        </record>    
+        </record>
 
 
         <record id="ir_act_product_location_open" model="ir.values">
@@ -1753,7 +1760,7 @@
             <field name="name">Open Products</field>
             <field eval="'ir.actions.act_window,%d'%action_view_stock_location_product" name="value"/>
             <field eval="True" name="object"/>
-        </record>  
+        </record>
 
         <!-- Graph Views -->
         <!--  Products To Received Vs Planned -->