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

[Ferdinand]

fixed some bugs

[Ferdinand (office-chricar)]

forgot to push the changes

[Ferdinand (office-chricar)]

please merge ASAP as bzr merge from trunk needs always very time consuming manual review of xml files

unified layout for PO/SO/Picking/Invoice
unified logic for SO/PO (payment_term, scheduled date)

review: Needs Resubmitting

[Fabien (Open ERP) (fp-tinyerp)]

Why did you removed this ?
   <field name="context">{'contact_display': 'partner',

We need this.

review: Needs Fixing

[Ferdinand (office-chricar)]

> Review: Needs Fixing
> Why did you removed this ?
> <field name="context">{'contact_display': 'partner',
>
>
> We need this.
We need to display partner AND address and
as we can not have address_id twice
so I have added in stock.py

 'partner_id':
fields.related('picking_id','address_id','partner_id',type='many2one',
relation="res.partner", string="Partner"),

and display (a few lines later)
partner_id and adress_id

hope that is OK
--
regards
Ferdinand Gassauer
ChriCar Beteiligungs- und Beratungs- GmbH
Official OpenERP Partner

[Ferdinand (office-chricar)]

We need to display partner AND address and
as we can not have address_id twice
so I have added in stock.py

 'partner_id':
fields.related('picking_id','address_id','partner_id',type='many2one',
relation="res.partner", string="Partner"),

and display (a few lines later)
partner_id and adress_id

hope that is OK

review: Needs Resubmitting

[Ferdinand (office-chricar)]

please see also
https://blueprints.launchpad.net/openobject-addons/+spec/invoice-navigation

[Ferdinand (office-chricar)]

@Fabien
well I will create a address_display_id instead and keep the original address_id functionality

[Ferdinand (office-chricar)]

stock view uses again
name="address_id" context="{'contact_display':'partner'}"
and partner_id displays partner name (which as missing)

review: Needs Resubmitting

[Ferdinand (office-chricar)]

improved layout merged with r 3541

please let me know if you ever want to accept these layout changes - it costs about 2-3 hours to check conflicts each time.

review: Needs Resubmitting

[Jay Vora (Serpent Consulting Services) (jayvora)]

Hello,
<button name="195" type="action" string="Re-Open" states="paid" icon="gtk-convert"/>

It has always to be the reference of action, not an id directly.

Thanks.

review: Needs Fixing

[Ferdinand (office-chricar)]

As I said in mail on expert list
* the branch trunk_layout as it is needs fixing -
** layout changes (combined relocation of fields AND changes of field attributes) are not (well) handled by bzr merge / bzr emerge
* it last worked with r 3541

I will not be able to do much before weekend or beginning of next week.

=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2010-05-26 08:28:37 +0000
+++ account/account_invoice_view.xml	2010-05-27 21:44:29 +0000
@@ -140,31 +140,38 @@
             <field name="type">form</field>
             <field name="priority">2</field>
             <field name="arch" type="xml">
-                <form string="Supplier invoice">
+            <form string="Supplier invoice">
                     <group col="6" colspan="4">
-                        <field domain="[('type', '=', 'purchase')]" name="journal_id"/>
                         <field name="number" readonly="1"/>
-                        <field name="type" invisible="1"/>
-                        <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)"/>
-                        <newline/>
-                        <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,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,company_id)" context="{'default_customer': 0}" colspan="4"/>
+                        <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id" colspan="4"/>
+
+
+<newline/>
+                        <field name="type" />
                         <field name="period_id" groups="base.group_user"/>
-                        <group colspan="2" col="1" groups="base.group_user">
-                            <label align="0.0" string="(keep empty to use the current period)"/>
-                        </group>
+                        <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)"/>
                     </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="base.group_user"/>
+                          <group col="6" colspan="4">
+                           <field domain="[('type', '=', 'purchase')]" name="journal_id" colspan="4" />
+
+                            <field name="payment_term" widget="selection"/>
+                           <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="base.group_user" colspan="4"/>
+                            <field name="date_due"/>
+                            <field name="name" colspan="4" />
+                            <field name="reconciled"/>
                             <field name="reference_type" nolabel="1" size="0"/>
-                            <field name="reference" nolabel="1"/>
-                            <field name="date_due"/>
-                            <field name="check_total" required="2"/>
+                            <field name="reference" nolabel="1" colspan="3"/>
+
+                            </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)"/>
@@ -194,8 +201,10 @@
                                 <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="gtk-apply"/>
                                 <field name="amount_untaxed"/>
                                 <label string="" colspan="2"/>
+
+
                                 <field name="amount_tax"/>
-                                <field name="reconciled"/>
+                            <field name="check_total" required="2"/>
                                 <field name="amount_total"/>
                                 <field name="state"/>
                                 <field name="residual"/>
@@ -203,26 +212,29 @@
                                     <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-apply"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                                    <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
+                                    <button name="195" type="action" string="Re-Open" states="paid" icon="gtk-convert"/>
                                 </group>
                             </group>
                         </page>
                         <page string="Other Info">
-                            <field domain="[('partner_id', '=', partner_id)]" name="partner_bank" on_change="onchange_partner_bank(partner_bank)"/>
-
-                            <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"/>
+                           <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id" groups="base.group_extended"/>
+
+                            <field colspan="4" domain="[('partner_id', '=', partner_id)]" name="partner_bank" on_change="onchange_partner_bank(partner_bank)"/>
+
+
                             <newline/>
                             <field name="origin" groups="base.group_extended"/>
-                            <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id" groups="base.group_extended"/>
+                            
+                            <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                             <field name="move_id"/>
+
                             <separator colspan="4" string="Additional Information"/>
                             <field colspan="4" name="comment" nolabel="1"/>
+
+
                         </page>
                         <page string="Payments" groups="base.group_extended">
-                            <field name="payment_ids" colspan="4" nolabel="1" >
+                            <field name="payment_ids" colspan="4" nolabel="1">
                                 <tree string="Payments">
                                     <field name="date"/>
                                     <field name="ref"/>
@@ -246,29 +258,33 @@
             <field name="model">account.invoice</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Invoice">
+            <form string="Customer Invoice">
                     <group colspan="4" col="6">
-                        <field name="journal_id" groups="base.group_user"/>
-                        <field name="number"/>
-                        <field name="type" invisible="1"/>
-                        <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)"/>
-                        <newline/>
-                        <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,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="number" readonly="1"/>
                         <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="[('customer','=', 1)]"  on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" groups="base.group_user" context="{'default_supplier': 0}" colspan="4"/>
+                        <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id" colspan="4"/>
+                       <newline/>
+                       <field name="type" />
                         <field name="period_id" groups="base.group_user"/>
-                        <group colspan="2" col="1" groups="base.group_user">
-                            <label align="0.0" string="(keep empty to use the current period)"/>
-                        </group>
+                        <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)"/>
                     </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="base.group_user"/>
-                            <field name="name"/>
+                         <group colspan="4" col="6">
+
+                            <field name="journal_id" groups="base.group_user" colspan="4"/>
                             <field name="payment_term" widget="selection"/>
+<newline/>
+                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', company_id),('journal_id','=',journal_id)]" name="account_id" groups="base.group_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">
@@ -286,7 +302,7 @@
                                 <field name="amount_untaxed"/>
                                 <label string="" colspan="2"/>
                                 <field name="amount_tax"/>
-                                <field name="reconciled"/>
+                                <label string="" colspan="2"/>
                                 <field name="amount_total"/>
                                 <field name="state"/>
                                 <field name="residual"/>
@@ -295,21 +311,16 @@
                                     <button name="invoice_open" states="draft,proforma2" string="Create" icon="gtk-execute"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
+                                    <button name="195" type="action" string="Re-Open" states="paid" icon="gtk-convert"/>
                                 </group>
                             </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 name="user_id"/>
                             <newline/>
-                            <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank"
-                                groups="base.group_extended"/>
+                            <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank" groups="base.group_extended"/>
                             <field name="origin"/>
-                            <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"
-                                groups="base.group_extended"/>
+                            <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id" groups="base.group_extended"/>
                             <field name="move_id" groups="base.group_user"/>
                             <separator colspan="4" string="Additionnal Information"/>
                             <field colspan="4" name="comment" nolabel="1"/>

=== modified file 'account/invoice.py'
--- account/invoice.py	2010-05-26 08:28:37 +0000
+++ account/invoice.py	2010-05-27 21:44:29 +0000
@@ -288,7 +288,8 @@
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True,readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True),
-        'check_total': fields.float('Total', digits_compute=dp.get_precision('Account'), states={'open':[('readonly',True)],'close':[('readonly',True)]}),
+        'check_total': fields.float('Total', digits_compute=dp.get_precision('Account'), states={'open':[('readonly',True)],'close':[('readonly',True)]},
+                 help="Total amount on invoice"),
         'reconciled': fields.function(_reconciled, method=True, string='Paid/Reconciled', type='boolean',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 50), # Check if we can remove ?

=== modified file 'delivery/delivery_view.xml'
--- delivery/delivery_view.xml	2010-05-12 11:43:48 +0000
+++ delivery/delivery_view.xml	2010-05-27 21:44:29 +0000
@@ -139,8 +139,8 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
-                <field name="address_id" position="after">
-                    <field name="carrier_id"/>
+                <field name="backorder_id" position="after">
+                    <field name="carrier_id" colspan="4"/>
                     <field name="weight"/>
                 </field>
             </field>
@@ -152,7 +152,8 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_in_form"/>
             <field name="arch" type="xml">
-                <field name="type" position="after">
+                <field name="backorder_id" position="after">
+                    <field name="carrier_id" colspan="4"/>
                     <field name="weight"/>
                 </field>
             </field>
@@ -164,7 +165,8 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
-                <field name="type" position="after">
+                <field name="backorder_id" position="after">
+                    <field name="carrier_id" colspan="4"/>
                     <field name="weight"/>
                 </field>
             </field>
@@ -176,8 +178,8 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_delivery_form"/>
             <field name="arch" type="xml">
-                <field name="address_id" position="after">
-                    <field name="carrier_id"/>
+                <field name="backorder_id" position="after">
+                    <field name="carrier_id" colspan="4"/>
                     <field name="weight"/>
                 </field>
             </field>

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2010-05-26 08:28:37 +0000
+++ purchase/purchase.py	2010-05-27 21:44:29 +0000
@@ -141,6 +141,15 @@
     def _invoiced(self, cursor, user, ids, name, arg, context=None):
         res = {}
         for purchase in self.browse(cursor, user, ids, context=context):
+            if purchase.invoice_id:
+                res[purchase.id] = True
+            else:
+                res[purchase.id] = False
+        return res
+
+    def _paid(self, cursor, user, ids, name, arg, context=None):
+        res = {}
+        for purchase in self.browse(cursor, user, ids, context=context):
             if purchase.invoice_id.reconciled:
                 res[purchase.id] = purchase.invoice_id.reconciled
             else:
@@ -161,6 +170,7 @@
             help="Put an address if you want to deliver directly from the supplier to the customer." \
                 "In this case, it will remove the warehouse link and set the customer location."
         ),
+        'partner_order_id': fields.many2one('res.partner.address', 'Ordering Contact', readonly=True,  states={'draft': [('readonly', False)]}, help="The name and address of the contact who accepted the order or quotation."),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', states={'posted':[('readonly',True)]}),
         'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')]),
         'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
@@ -172,7 +182,8 @@
         'picking_ids': fields.one2many('stock.picking', 'purchase_id', 'Picking List', readonly=True, help="This is the list of picking list that have been generated for this purchase"),
         'shipped':fields.boolean('Received', readonly=True, select=True),
         'shipped_rate': fields.function(_shipped_rate, method=True, string='Received', type='float'),
-        'invoiced': fields.function(_invoiced, method=True, string='Invoiced & Paid', type='boolean'),
+        'invoiced': fields.function(_invoiced, method=True, string='Invoiced', type='boolean'),
+        'paid': fields.function(_paid, method=True, string='Paid', type='boolean'),
         'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
         'invoice_method': fields.selection([('manual','Manual'),('order','From Order'),('picking','From Picking')], 'Invoicing Control', required=True,
             help="From Order: a draft invoice will be pre-generated based on the purchase order. The accountant " \
@@ -184,19 +195,20 @@
         'amount_untaxed': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Untaxed Amount',
             store={
                 'purchase.order.line': (_get_order, None, 10),
-            }, multi="sums"),
+            }, multi="sums",help="Calculated net"),
         'amount_tax': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Taxes',
             store={
                 'purchase.order.line': (_get_order, None, 10),
-            }, multi="sums"),
+            }, multi="sums",help="Calculated tax"),
         'amount_total': fields.function(_amount_all, method=True, digits_compute= dp.get_precision('Purchase Price'), string='Total',
             store={
                 'purchase.order.line': (_get_order, None, 10),
-            }, multi="sums"),
+            }, multi="sums",help="Calculated total"),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
         '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': lambda *a: time.strftime('%Y-%m-%d'),
@@ -250,12 +262,13 @@
     def onchange_partner_id(self, cr, uid, ids, part):
         
         if not part:
-            return {'value':{'partner_address_id': False, 'fiscal_position': False}}
-        addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['default'])
+            return {'value':{'partner_address_id': False, 'partner_order_id': False, 'payment_term': False, 'fiscal_position': False}}
+        addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['default','contact'])
         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_payment_term and part.property_payment_term.id or False
+        return {'value':{'partner_address_id': addr['default'],'partner_order_id': addr['contact'], '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')})
@@ -358,7 +371,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-05-26 08:28:37 +0000
+++ purchase/purchase_view.xml	2010-05-27 21:44:29 +0000
@@ -66,23 +66,32 @@
             <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="date_order" select="1"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id)" required="1" select="1" domain="[('supplier','=', 1)]" colspan="4"/>
+                        <field name="partner_ref"/>
+                        <field domain="[('partner_id','=',partner_id)]" name="partner_address_id" colspan="4"/>
+<!--
+                       <label colspan="2" align="0.0" string="Missing Customer reference date"/>
+-->
                         <field name="origin"/>
-                        <field name="shipped"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </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"/>
-                            <field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/>
-                            <field name="partner_ref"/>
+                         <group col="6" colspan="4">
+                          <field name="dest_address_id" on_change="onchange_dest_address_id(dest_address_id)" colspan="4"/>
+                          <field name="shipped_rate" widget="progressbar"/>
+                          <field domain="[('partner_id','=',partner_id)]" name="partner_order_id" colspan="4"/>
+                          <field name="invoiced_rate" widget="progressbar"/>
+                          <field name="warehouse_id" on_change="onchange_warehouse_id(warehouse_id)" widget="selection"/>
+                          <field name="minimum_planned_date"/>
+                          <field name="paid"/>
+                          <field domain="[('type','=','purchase')]" name="pricelist_id" groups="base.group_extended"/>
+                          <field name="payment_term" widget="selection"/>
+                       </group>
                             <newline/>
                             <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">
@@ -120,8 +129,7 @@
                         <page string="Delivery &amp; Invoices" groups="account.group_account_user">
                             <group colspan="2" col="2" groups="base.group_extended">
                                 <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"/>
                             </group>
                             <group colspan="2" col="2">
@@ -230,8 +238,9 @@
                             <field colspan="4" name="name"/>
                             <field name="date_planned" widget="date"/>
                             <field name="price_unit"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="company_id" invisible="1"/>
                             <field name="price_subtotal" readonly="1"/>
+                            <field colspan="4" name="taxes_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
                         </page>
                         <page string="Notes">
                             <field colspan="4" name="notes" nolabel="1"/>

=== modified file 'sale/__openerp__.py'
--- sale/__openerp__.py	2010-05-26 08:28:37 +0000
+++ sale/__openerp__.py	2010-05-27 21:44:29 +0000
@@ -60,7 +60,7 @@
         'stock_view.xml',
 #        'process/sale_process.xml',
     ],
-    'demo_xml': ['sale_demo.xml'],
+    'demo_xml': [],
     'test': [
              'test/shipping_manual_sale_order.yml',
              'test/prepaid_sale_order.yml',

=== modified file 'sale/sale.py'
--- sale/sale.py	2010-05-26 08:28:37 +0000
+++ sale/sale.py	2010-05-27 21:44:29 +0000
@@ -160,7 +160,19 @@
         for sale in self.browse(cursor, user, ids, context=context):
             res[sale.id] = True
             for invoice in sale.invoice_ids:
-                if invoice.state != 'paid':
+                    break
+            if not sale.invoice_ids:
+                res[sale.id] = False
+        return 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:
@@ -204,6 +216,23 @@
             result[line.order_id.id] = True
         return result.keys()
 
+    def _minimum_planned_date(self, cr, uid, ids, field_name, arg, context):
+        res={}
+        sale_obj=self.browse(cr, uid, ids, context=context)
+        for sale in sale_obj:
+            res[sale.id] = False
+            if sale.order_line:
+                #min_date=sale.order_line[0].date_planned
+                min_date=''
+                for line in sale.order_line:
+                    if line.date_planned and ( not min_date or line.date_planned < min_date):
+                        min_date=line.date_planned
+                if not min_date:
+                    min_date=datetime.now()
+                res[sale.id]=min_date
+        return res
+
+
     _columns = {
         'name': fields.char('Order Reference', size=64, required=True, select=True),
         'shop_id': fields.many2one('sale.shop', 'Shop', required=True, readonly=True, states={'draft': [('readonly', False)]}),
@@ -220,7 +249,7 @@
             ('done', 'Done'),
             ('cancel', 'Cancelled')
             ], 'Order State', readonly=True, help="Gives the state of the quotation or sale order. The exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). The 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
-        'date_order': fields.date('Ordered Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'date_order': fields.date('Date Ordered', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'create_date': fields.date('Creation Date', readonly=True),
         'date_confirm': fields.date('Confirmation Date', readonly=True),
         'user_id': fields.many2one('res.users', 'Salesman', states={'draft': [('readonly', False)]}, select=True),
@@ -252,7 +281,9 @@
         'shipped': fields.boolean('Picked', readonly=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',
+        'invoiced': fields.function(_invoiced, method=True, string='Invoiced',
+            fnct_search=_invoiced_search, type='boolean'),
+        'paid': fields.function(_paid, method=True, string='Paid',
             fnct_search=_invoiced_search, type='boolean'),
         'note': fields.text('Notes', translate=True),
 
@@ -279,6 +310,7 @@
         'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
         'company_id': fields.many2one('res.company','Company',select=1),
+        'minimum_planned_date':fields.function(_minimum_planned_date,  method=True,store=True, string='Expected Date', type='datetime', help="This is computed as the minimum scheduled date of all sale order lines' products."),
     }
     _defaults = {
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'sale.order', context=c),
@@ -842,6 +874,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),
+        'date_planned': fields.datetime('Scheduled date', ),
     }
     _order = 'sequence, id'
     _defaults = {

=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml	2010-05-26 08:28:37 +0000
+++ sale/sale_view.xml	2010-05-27 21:44:29 +0000
@@ -95,69 +95,59 @@
             <field name="model">sale.order</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales order">
+            <form string="Sales order">
                     <group col="6" colspan="4">
                         <field name="name"/>
+                        <field name="date_order"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id)" required="1" select="1" domain="[('customer','=', 1)]" colspan="4"/>
                         <field name="client_order_ref"/>
-                        <field name="shipped"/>
-                        <field name="date_order"/>
-                        <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="base.group_extended"/>
-                        <field name="invoiced"/>
+                        <field domain="[('partner_id','=',partner_id)]" name="partner_invoice_id" colspan="4"/>
+           <label colspan="2" align="0.0" string="Missing Customer reference date"/>
+
                     </group>
                     <notebook colspan="4">
                         <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"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id"/>
-                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended" 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"/>
+                      <group col="6" colspan="4">
+                            <field domain="[('partner_id','=',partner_id)]" name="partner_shipping_id" colspan="4"/>
+                            <field name="picked_rate" widget="progressbar"/>
+                            <field domain="[('partner_id','=',partner_id)]" name="partner_order_id" colspan="4"/>
+                            <field name="invoiced_rate" widget="progressbar"/>
+                            <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="base.group_extended"/>
+                            <field name="minimum_planned_date"/>
+                            <field name="paid"/>
                             <newline/>
+                            <field domain="[('type','=','sale')]" name="pricelist_id" groups="base.group_extended"/>
+                            <field name="payment_term" widget="selection"/> 
+                      </group>
                             <field colspan="4" mode="tree,form,graph" name="order_line" nolabel="1" widget="one2many_list">
                                 <form string="Sale Order Lines">
                                     <notebook>
                                         <page string="Order Line">
-                                            <field colspan="4"
-                                                context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
-                                                name="product_id"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order, product_packaging, parent.fiscal_position)"
-                                                />
-                                            <field
-                                                context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
-                                                name="product_uom_qty"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position, True)"
-                                                />
-                                            <field name="product_uom"
-                                                on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"
-                                                widget="selection"/>
-                                            <field
-                                                name="product_packaging"
-                                                context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position)"
-                                                domain="[('product_id','=',product_id)]"
-                                                groups="base.group_extended"/>
+                                            <field colspan="4" context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom" name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, parent.date_order, product_packaging, parent.fiscal_position)" select="1"/>
+                                            <field context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom" name="product_uom_qty" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position, True)" select="1"/>
+                                            <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order)"/>
+                                            <field name="product_packaging" context="partner_id=parent.partner_id,quantity=product_uom_qty,pricelist=parent.pricelist_id,shop=parent.shop_id,uom=product_uom" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], False, parent.date_order, product_packaging, parent.fiscal_position)" domain="[('product_id','=',product_id)]" groups="base.group_extended"/>
 
-                                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                            <field name="type" groups="base.group_extended"/>
                                             <field colspan="4" name="name"/>
                                             <field name="price_unit"/>
                                             <field name="discount"/>
-                                            <field name="type" groups="base.group_extended"/>
+                                            <field name="price_subtotal"/>
+                                            <newline/>
+                                            <field name="date_planned"/>
                                             <field name="delay" groups="base.group_extended"/>
+                                            <field name="company_id" invisible="1"/>
                                             <newline/>
                                             <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
+<!-- FIXME Make invoice defined on order line ????
                                             <group colspan="4" col="5" groups="base.group_extended">
                                                 <separator colspan="5" string="States"/>
-                                                <field name="state"/>
+                                                <field name="state" readonly="1"/>
                                                 <field name="invoiced"/>
-                                                <button colspan="1"
-                                                    name="%(action_view_sale_order_line_make_invoice)d"
-                                                    states="confirmed"
-                                                    string="Make Invoice"
-                                                    type="action"
-                                                    icon="gtk-print" />
+                                                <button colspan="1" name="368" states="confirmed" string="Make Invoice" type="action" icon="gtk-print"/>
                                             </group>
+-->
                                         </page>
                                         <page groups="base.group_extended" string="Extra Info">
                                             <field name="th_weight"/>
@@ -177,6 +167,7 @@
                                     </notebook>
                                 </form>
                                 <tree string="Sales order lines">
+                                    <field name="date_planned"/>
                                     <field colspan="4" name="name"/>
                                     <field name="product_uom_qty" string="Qty"/>
                                     <field name="product_uom" string="UoM"/>
@@ -222,10 +213,9 @@
                                 <field groups="base.group_extended" name="origin"/>
                             </group>
                             <group colspan="2" col="2" groups="base.group_extended">
-                                <separator string="Conditions" colspan="2"/>
-                                <field name="payment_term" widget="selection"/>
+                                <separator string="Accounting" colspan="2"/>
+<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"/>
                                 <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"/>
@@ -343,6 +333,7 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Sales order lines">
+                    <field name="date_planned"/>
                     <field name="order_id"/>
                     <field name="order_partner_id"/>
                     <field name="product_id"/>

=== modified file 'sale/stock_view.xml'
--- sale/stock_view.xml	2010-04-16 09:16:25 +0000
+++ sale/stock_view.xml	2010-05-27 21:44:29 +0000
@@ -12,5 +12,13 @@
                 </field>
             </field>
         </record>
+
+        <act_window
+            domain="[('sale_id', '=', active_id)]"
+            id="act_sale_order_2_stock_picking"
+            name="Picking"
+            res_model="stock.picking"
+            src_model="sale.order"/>
+
     </data>
 </openerp>

=== removed directory 'smtpclient'
=== removed directory 'smtpclient/i18n'
=== removed file 'smtpclient/i18n/fr.po'
--- smtpclient/i18n/fr.po	2010-05-26 08:28:37 +0000
+++ smtpclient/i18n/fr.po	1970-01-01 00:00:00 +0000
@@ -1,871 +0,0 @@
-# French translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-11-26 06:00+0000\n"
-"PO-Revision-Date: 2010-05-22 09:14+0000\n"
-"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\n"
-"Language-Team: French <[e-mail]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-23 03:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: smtpclient
-#: field:email.smtpclient.queue,bcc:0
-msgid "BCC to"
-msgstr "Copie cachée à"
-
-#. module: smtpclient
-#: view:email.smtpclient:0
-msgid "__number__ for Invoice / Sales Number"
-msgstr "__number__ pour la facture / Numéro de vente"
-
-#. module: smtpclient
-#: field:email.smtpclient,ssl:0
-msgid "Use SSL?"
-msgstr "Utiliser SSL?"
-
-#. module: smtpclient
-#: view:email.smtpclient:0
-msgid "Start Server"
-msgstr "Démarrer le serveur"
-
-#. module: smtpclient
-#: model:ir.actions.wizard,name:smtpclient.wizard_email_verifycode
-msgid "Verify Server"
-msgstr "Vérifier le serveur"
-
-#. module: smtpclient
-#: field:email.smtpclient,priority:0
-msgid "Server Priority"
-msgstr "Priorité du serveur"
-
-#. module: smtpclient
-#: help:email.sendcode,init,emailto:0
-msgid "Enter the address Email where you want to get the Verification Code"
-msgstr ""
-"Saisir l'adresse email à laquelle vous voulez envoyer le code de vérification"
-
-#. module: smtpclient
-#: selection:email.smtpclient,auth_type:0
-msgid "Other Mail Servers"
-msgstr "Autres serveurs de courrier"
-
-#. module: smtpclient
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de modèle invalide pour la définition de l'action"
-
-#. module: smtpclient
-#: field:email.smtpclient.queue,to:0
-msgid "Mail to"
-msgstr "Envoyer par email à"
-
-#. module: smtpclient
-#: code:addons/smtpclient/smtpclient.py:0
-#, python-format
-msgid "Message Error!"
-msgstr "Erreur de message!"
-
-#. module: smtpclient
-#: field:email.smtpclient,name:0
-msgid "Server Name"
-msgstr "Nom du serveur"
-
-#. module: smtpclient
-#: field:email.smtpclient,header_ids:0
-msgid "Default Headers"
-msgstr "Entêtes de courrier par défaut"
-
-#. module: smtpclient
-#: wizard_button:email.testemail,init,send:0
-msgid "Send Email"
-msgstr "Envoyer un email"
-
-#. module: smtpclient
-#: field:res.company.address,company_id:0
-msgid "Company"
-msgstr "Société"
-
-#. module: smtpclient
-#: view:email.smtpclient:0
-msgid "Set to Draft"
-msgstr "Mettre en brouillon"
-
-#. module: smtpclient
-#: code:addons/smtpclient/wizard/verifycode.py:0
-#, python-format
-msgid "Server already verified!"
-msgstr "Serveur déjà vérifié!"
-
-#. module: smtpclient
-#: code:addons/smtpclient/wizard/sendcode.py:0
-#: code:addons/smtpclient/wizard/testemail.py:0
-#, python-format
-msgid "Verification Failed. Please check the Server Configuration!"
-msgstr ""
-"Échec de vérification. Merci de vérifier le serveur de configuration!"
-
-#. module: smtpclient
-#: code:addons/smtpclient/smtpclient.py:0
-#, python-format
-msgid "SMTP Server Error!"
-msgstr "Erreur du serveur SMTP!"
-
-#. module: smtpclient
-#: field:email.smtpclient,auth_type:0
-#: field:email.smtpclient,type:0
-msgid "Server Type"
-msgstr "Type de serveur"
-
-#. module: smtpclient
-#: field:email.smtpclient,from_email:0
-msgid "Email From"
-msgstr "Email de"
-
-#. module: smtpclient
-#: view:email.smtpclient:0
-msgid "User Information"
-msgstr "Information utilisateur"
-
-#. module: smtpclient
-#: code:addons/smtpclient/smtpclient.py:0
-#, python-format
-msgid "OpenERP SMTP server Email Registration Code!"
-msgstr "Code d'enregistrement email du serveur SMTP OpenERP!"
-
-#. module: smtpclient
-#: model:ir.model,name:smtpclient.model_report_smtp_server
-#: view:report.smtp.server:0
-msgid "Server Statistics"
-msgstr "Statistiques du serveur"
-
-#. module: smtpclient
-#: view:email.smtpclient:0
-msgid "Messages"
-msgstr "Messages"
-
-#. module: smtpclient
-#: selection:email.smtpclient,type:0
-#: selection:res.company.address,name:0
-msgid "Sale"
-msgstr "Vente"
-
-#. module: smtpclient
-#: field:email.headers,value:0
-msgid "Value"
-msgstr "Valeur"
-
-#. module: smtpclient
-#: view:email.smtpclient:0
-msgid "Access Permission"
-msgstr "Permission d'accès"
-
-#. module: smtpclient
-#: model:ir.model,name:smtpclient.model_email_headers
-msgid "Email Headers"
-msgstr "Entêtes de courrier"
-
-#. module: smtpclient
-#: field:email.smtpclient,delete_queue:0
-msgid "Queue Option"
-msgstr "Option de file d'attente"
-
-#. module: smtpclient
-#: code:addons/smtpclient/smtpclient.py:0
-#, python-format
-msgid "Please configure Email Server Messages [Verification / Test]"
-msgstr ""
-"Merci de configurer les messages du serveur email [Vérification / Test]"
-
-#. module: smtpclient
-#: code:addons/smtpclient/wizard/verifycode.py:0
-#, python-format
-msgid "Verification failed. Invalid Verification Code!"
-msgstr "Échec de vérification. Code de vérification non valide!"
-
-#. module: smtpclient
-#: model:ir.actions.act_window,name:smtpclient.act_mail_server_2_mail_history
-msgid "Email History"
-msgstr "Historique des emails"
-
-#. module: smtpclient
-#: view:email.smtpclient.history:0
-msgid "Server History"
-msgstr "Historique du serveur"
-
-#. module: smtpclient
-#: selection:email.smtpclient,auth_type:0
-msgid "Yahoo!!! Server"
-msgstr "Serveur Yahoo!"
-
-#. module: smtpclient
-#: view:email.smtpclient:0
-#: field:email.smtpclient,test_email:0
-msgid "Test Message"
-msgstr "Message de test"
-
-#. module: smtpclient
-#: field:report.smtp.server,server_id:0
-msgid "Server ID"
-msgstr "ID du serveur"
-
-#. module: smtpclient
-#: help:email.smtpclient,delete_queue_period:0
-msgid "delete emails/contents from email queue after specified no of days"
-msgstr ""
-"effacer les emails/contenu placé en attente après le nombre de jours spécifié"
-
-#. module: smtpclient
-#: field:report.smtp.server,no:0
-msgid "Total No."
-msgstr "Nombre total"
-
-#. module: smtpclient
-#: help:email.smtpclient,process_id:0
-msgid "Mail Transport Agent Process"
-msgstr "Processus d'agent de transport email"
-
-#. module: smtpclient
-#: view:email.smtpclient:0
-msgid "__user__ for User Name"
-msgstr "__user__ pour le nom d'utilisateur"
-
-#. module: smtpclient
-#: field:email.smtpclient,date_create:0
-msgid "Date Create"
-msgstr "Date de création"
-
-#. module: smtpclient
-#: field:email.smtpclient,state:0
-msgid "Server Status"
-msgstr "État du serveur"
-
-#. module: smtpclient
-#: field:email.smtpclient.queue,error:0
-msgid "Last Error"
-msgstr "Dernière erreur"
-
-#. module: smtpclient
-#: wizard_view:email.sendcode,init:0
-#: wizard_button:email.sendcode,init,send:0
-msgid "Send Code"
-msgstr "Envoyer un code"
-
-#. module: smtpclient
-#: field:email.smtpclient.queue,name:0
-msgid "Subject"
-msgstr "Sujet"
-
-#. module: smtpclient
-#: code:addons/smtpclient/smtpclient.py:0
-#, python-format
-msgid "Read Error!"
-msgstr "Erreur de lecture!"
-
-#. module: smtpclient
-#: code:addons/smtpclient/smtpclient.py:0
-#, python-format
-msgid "Unable to read Server Settings"
-msgstr "Impossible de lire les paramètres du serveur"
-
-#. module: smtpclient
-#: field:email.smtpclient,server_statistics:0
-msgid "Statistics"
-msgstr "Statistiques"
-
-#. module: smtpclient
-#: wizard_view:email.testemail,init:0
-msgid "Test Email"
-msgstr "Email de test"
-
-#. module: smtpclient
-#: field:email.smtpclient.history,server_id:0
-msgid "Smtp Server"
-msgstr "Serveur SMTP"
-
-#. module: smtpclient
-#: field:res.company,addresses:0
-msgid "Email Addresses"
-msgstr "Adresses email"
-
-#. module: smtpclient
-#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_history_tree
-#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_server_history
-msgid "Email Server History"
-msgstr "Historique du serveur email"
-
-#. module: smtpclient
-#: selection:email.smtpclient.queue,state:0
-msgid "Waiting"
-msgstr "En attente"
-
-#. module: smtpclient
-#: help:email.testemail,init,emailto:0
-msgid "Enter the address Email where you want to get the Test Email"
-msgstr ""
-"Saisir l'adresse email à laquelle vous voulez recevoir l'email de test"
-
-#. module: smtpclient
-#: selection:email.smtpclient,state:0
-msgid "Not Verified"
-msgstr "Non vérifié"
-
-#. module: smtpclient
-#: field:email.smtpclient.history,email:0
-msgid "Email"
-msgstr "Email"
-
-#. module: smtpclient
-#: selection:email.smtpclient.queue,state:0
-msgid "Sent"
-msgstr "Envoyé"
-
-#. module: smtpclient
-#: field:email.smtpclient.history,user_id:0
-msgid "Username"
-msgstr "Nom d'utilisateur"
-
-#. module: smtpclient
-#: field:res.company.address,name:0
-msgid "Address Type"
-msgstr "Type d'adresse"
-
-#. module: smtpclient
-#: view:email.smtpclient:0
-msgid "Permission"
-msgstr "Permission"
-
-#. module: smtpclient
-#: view:email.smtpclient.queue:0
-msgid "Message with All Headers"
-msgstr "Message avec entêtes complètes"
-
-#. module: smtpclient
-#: view:email.smtpclient:0
-msgid "Message Headers"
-msgstr "Entêtes de message"
-
-#. module: smtpclient
-#: field:ir.actions.server,report_id:0
-msgid "Report"
-msgstr "Rapport"
-
-#. module: smtpclient
-#: view:email.smtpclient:0
-msgid "Other Information"
-msgstr "Autre information"
-
-#. module: smtpclient
-#: view:email.smtpclient:0
-msgid "Configuration"
-msgstr "Configuration"
-
-#. module: smtpclient
-#: constraint:ir.cron:0
-msgid "Invalid arguments"
-msgstr "Paramètres non valides"
-
-#. module: smtpclient
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue !"
-
-#. module: smtpclient
-#: view:email.smtpclient:0
-#: field:email.smtpclient,disclaimers:0
-msgid "Disclaimers"
-msgstr "Avertissement de responsabilité limitée"
-
-#. module: smtpclient
-#: field:report.smtp.server,name:0
-msgid "Server"
-msgstr "Serveur"
-
-#. module: smtpclient
-#: view:res.company:0
-msgid "SMTP Settings"
-msgstr "Paramètres SMTP"
-
-#. module: smtpclient
-#: help:email.smtpclient,body:0
-msgid ""
-"The message text that will be send along with the email which is send "
-"through this server"
-msgstr "Le message texte qui sera envoyé avec l'email envoyé par ce serveur"
-
-#. module: smtpclient
-#: model:ir.actions.wizard,name:smtpclient.wizard_email_testemail
-msgid "Send Test Email"
-msgstr "Envoyer email de test"
-
-#. module: smtpclient
-#: model:ir.model,name:smtpclient.model_email_smtpclient_queue
-msgid "Email Queue"
-msgstr "File d'attente email"
-
-#. module: smtpclient
-#: view:email.smtpclient:0
-msgid "Server Information"
-msgstr "Information sur le serveur"
-
-#. module: smtpclient
-#: help:email.verifycode,init,code:0
-msgid "Enter the verification code thay you get in your verification Email"
-msgstr ""
-"Saisir le code de vérification que vous avez reçu dans votre email de "
-"vérification"
-
-#. module: smtpclient
-#: model:ir.model,name:smtpclient.model_email_smtpclient_history
-msgid "Email Client History"
-msgstr "Historique du client email"
-
-#. module: smtpclient
-#: selection:email.smtpclient,delete_queue:0
-msgid "Never Delete Message"
-msgstr "Ne jamais effacer le message"
-
-#. module: smtpclient
-#: code:addons/smtpclient/smtpclient.py:0
-#, python-format
-msgid "OpenERP Test Email!"
-msgstr "Email de test OpenERP!"
-
-#. module: smtpclient
-#: view:email.smtpclient:0
-#: field:email.smtpclient,body:0
-#: view:email.smtpclient.queue:0
-#: field:email.smtpclient.queue,serialized_message:0
-msgid "Message"
-msgstr "Message"
-
-#. module: smtpclient
-#: field:email.smtpclient,process_id:0
-msgid "MTA Process"
-msgstr "Processus MTA"
-
-#. module: smtpclient
-#: field:email.headers,server_id:0
-#: view:email.smtpclient:0
-#: field:email.smtpclient,server:0
-#: field:email.smtpclient.queue,server_id:0
-#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_smtp_server
-msgid "SMTP Server"
-msgstr "Serveur SMTP"
-
-#. module: smtpclient
-#: selection:email.smtpclient,auth_type:0
-msgid "Google Server"
-msgstr "Serveur Google"
-
-#. module: smtpclient
-#: selection:email.smtpclient,state:0
-msgid "Verified"
-msgstr "Vérifié"
-
-#. module: smtpclient
-#: help:email.smtpclient,priority:0
-msgid ""
-"Priority between 0 to 10, will be used to define the MTA process priotiry"
-msgstr ""
-"Priorité de 0 à 10, utilisé pour définir les priorités des processus MTA"
-
-#. module: smtpclient
-#: field:email.smtpclient,port:0
-msgid "SMTP Port"
-msgstr "Port SMTP"
-
-#. module: smtpclient
-#: code:addons/smtpclient/smtpclient.py:0
-#, python-format
-msgid "Email TO Address not Defined !"
-msgstr "Adresse d'envoi non définie!"
-
-#. module: smtpclient
-#: code:addons/smtpclient/smtpclient.py:0
-#, python-format
-msgid "SMTP Server Error !"
-msgstr "Erreur de serveur SMTP!"
-
-#. module: smtpclient
-#: field:email.smtpclient,auth:0
-msgid "Use Auth"
-msgstr "Utiliser l'authentification"
-
-#. module: smtpclient
-#: field:email.smtpclient,pstate:0
-msgid "Server Statue"
-msgstr "État du serveur"
-
-#. module: smtpclient
-#: field:email.smtpclient,user:0
-msgid "User Name"
-msgstr "Nom d'utilisateur"
-
-#. module: smtpclient
-#: field:email.smtpclient,verify_email:0
-msgid "Verify Message"
-msgstr "Vérifiez le message"
-
-#. module: smtpclient
-#: model:ir.model,name:smtpclient.model_email_smtpclient
-#: model:ir.module.module,shortdesc:smtpclient.module_meta_information
-msgid "Email Client"
-msgstr "Client email"
-
-#. module: smtpclient
-#: view:email.smtpclient:0
-msgid "Disclaimers Message"
-msgstr "Message sur la limitation de garantie"
-
-#. module: smtpclient
-#: view:email.smtpclient:0
-msgid "__code__ for Verification Code"
-msgstr "__code__ pour le Code de Vérification"
-
-#. module: smtpclient
-#: selection:email.smtpclient.queue,state:0
-msgid "Queued"
-msgstr "File d'attente"
-
-#. module: smtpclient
-#: field:email.smtpclient.history,date_create:0
-#: field:email.smtpclient.queue,date_create:0
-msgid "Date"
-msgstr "Date"
-
-#. module: smtpclient
-#: field:email.smtpclient.queue,cc:0
-msgid "CC to"
-msgstr "En copie à"
-
-#. module: smtpclient
-#: model:email.smtpclient,verify_email:smtpclient.email_smtpclient_sendmailserver0
-msgid ""
-"Verification Message. This is the code\n"
-"__code__ \n"
-"you must copy in the OpenERP Email Server (Verify Server wizard).\n"
-"Created by user __user__"
-msgstr ""
-"Message de vérification. Ceci est le code\n"
-"__code__ \n"
-"que vous devez saisir dans le serveur email OpenERP (assistant Vérification "
-"du Serveur).\n"
-"Créé par utilisateur __utilisateur__"
-
-#. module: smtpclient
-#: view:email.smtpclient.queue:0
-#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_queue_tree
-#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_smtp_server_queue
-msgid "Message Queue"
-msgstr "File d'attente des messages"
-
-#. module: smtpclient
-#: selection:email.smtpclient,type:0
-#: selection:res.company.address,name:0
-msgid "Default"
-msgstr "Défaut"
-
-#. module: smtpclient
-#: selection:email.smtpclient,delete_queue:0
-msgid "Delete Content After"
-msgstr "Effacer le contenu après"
-
-#. module: smtpclient
-#: code:addons/smtpclient/smtpclient.py:0
-#, python-format
-msgid "You have no permission to access SMTP Server : %s "
-msgstr "Vous n'avez aucune permission d'accès au serveur SMTP : %s "
-
-#. module: smtpclient
-#: field:email.smtpclient,active:0
-msgid "Active"
-msgstr "Actif"
-
-#. module: smtpclient
-#: model:ir.actions.act_window,name:smtpclient.act_mail_server_2_mail_queue
-msgid "Message Queus"
-msgstr "File d'attente des messages"
-
-#. module: smtpclient
-#: code:addons/smtpclient/wizard/sendcode.py:0
-#: code:addons/smtpclient/wizard/testemail.py:0
-#: code:addons/smtpclient/wizard/verifycode.py:0
-#: view:email.smtpclient.queue:0
-#: selection:email.smtpclient.queue,state:0
-#, python-format
-msgid "Error"
-msgstr "Erreur"
-
-#. module: smtpclient
-#: code:addons/smtpclient/smtpclient.py:0
-#, python-format
-msgid "Server Error!"
-msgstr "Erreur serveur !"
-
-#. module: smtpclient
-#: selection:email.smtpclient,delete_queue:0
-msgid "Clear All After"
-msgstr "Tout effacer après"
-
-#. module: smtpclient
-#: code:addons/smtpclient/smtpclient.py:0
-#, python-format
-msgid ""
-"Please verify Email Server, without verification you can not send Email(s)."
-msgstr ""
-"Merci de vérifier votre serveur email, sans vérification vous ne pouvez pas "
-"envoyer d'email(s)."
-
-#. module: smtpclient
-#: field:email.smtpclient,history_line:0
-#: field:report.smtp.server,history:0
-msgid "History"
-msgstr "Historique"
-
-#. module: smtpclient
-#: field:email.smtpclient.queue,priority:0
-msgid "Message Priority"
-msgstr "Priorité du message"
-
-#. module: smtpclient
-#: field:ir.actions.server,file_ids:0
-msgid "Attachments"
-msgstr "Fichiers attachés"
-
-#. module: smtpclient
-#: view:email.smtpclient:0
-msgid "__name__ for Customer Name"
-msgstr "__name__ pour le Nom du Client"
-
-#. module: smtpclient
-#: view:email.smtpclient.queue:0
-msgid "General"
-msgstr "Général"
-
-#. module: smtpclient
-#: field:email.headers,key:0
-msgid "Header"
-msgstr "Entête"
-
-#. module: smtpclient
-#: code:addons/smtpclient/smtpclient.py:0
-#, python-format
-msgid ""
-"Verification Message. This is the code\n"
-"\n"
-"__code__\n"
-"\n"
-"you must copy in the OpenERP Email Server (Verify Server wizard).\n"
-"\n"
-"Created by user __user__"
-msgstr ""
-"Message de vérification. Voici le code\n"
-"\n"
-"__code__\n"
-"\n"
-"Vous devez le copier dans le serveur de couriel d'Open ERP (Assistant de "
-"vérification).\n"
-"\n"
-"Créer par l'utilisateur __user__"
-
-#. module: smtpclient
-#: selection:res.company.address,name:0
-msgid "Invoice"
-msgstr "Facture"
-
-#. module: smtpclient
-#: wizard_view:email.verifycode,init:0
-#: wizard_button:email.verifycode,init,check:0
-msgid "Verify Code"
-msgstr "Code de vérification"
-
-#. module: smtpclient
-#: wizard_button:email.sendcode,init,end:0
-#: wizard_button:email.testemail,init,end:0
-#: wizard_button:email.verifycode,init,end:0
-msgid "Cancel"
-msgstr "Annuler"
-
-#. module: smtpclient
-#: field:email.smtpclient,delete_queue_period:0
-msgid "Delete after"
-msgstr "Effacer après"
-
-#. module: smtpclient
-#: code:addons/smtpclient/smtpclient.py:0
-#, python-format
-msgid "Server is not Verified, Please Verify the Server !"
-msgstr "Le serveur n'est pas vérifié, merci de vérifier le serveur!"
-
-#. module: smtpclient
-#: field:email.smtpclient.history,resource_id:0
-msgid "Resource ID"
-msgstr "ID de la ressource"
-
-#. module: smtpclient
-#: code:addons/smtpclient/smtpclient.py:0
-#, python-format
-msgid "SMTP Data Error !"
-msgstr "Erreur de données SMTP !"
-
-#. module: smtpclient
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Le nom de l'objet doit commencer par x_ et ne doit pas contenir de "
-"caractères spéciaux !"
-
-#. module: smtpclient
-#: selection:email.smtpclient,delete_queue:0
-msgid "Delete when Email Sent"
-msgstr "Effacer une fois l'email envoyé"
-
-#. module: smtpclient
-#: selection:email.smtpclient,type:0
-msgid "Account"
-msgstr "Compte"
-
-#. module: smtpclient
-#: model:ir.module.module,description:smtpclient.module_meta_information
-msgid ""
-"Email Client module that provides:\n"
-"    Sending Email\n"
-"    Use Multiple Server\n"
-"    Multi Threading\n"
-"    Multi Attachment\n"
-"    "
-msgstr ""
-"Module de client email qui permet d' :\n"
-"    Envoyer des emails\n"
-"    Utiliser plusieurs serveurs\n"
-"    Utiliser plusieurs files d'envoi (multi-threading)\n"
-"    Envoyer plusieurs fichiers attachés\n"
-"    "
-
-#. module: smtpclient
-#: selection:email.smtpclient,type:0
-msgid "Stock"
-msgstr "Stock"
-
-#. module: smtpclient
-#: field:email.smtpclient.history,name:0
-msgid "Description"
-msgstr "Description"
-
-#. module: smtpclient
-#: field:email.smtpclient,code:0
-#: wizard_field:email.verifycode,init,code:0
-msgid "Verification Code"
-msgstr "Code de vérifcation"
-
-#. module: smtpclient
-#: selection:email.smtpclient,pstate:0
-msgid "Stop"
-msgstr "Arrêter"
-
-#. module: smtpclient
-#: field:email.smtpclient.queue,body:0
-msgid "Email Text"
-msgstr "Texte de l'email"
-
-#. module: smtpclient
-#: selection:res.company.address,name:0
-msgid "Delivery"
-msgstr "Livraison"
-
-#. module: smtpclient
-#: selection:email.smtpclient,pstate:0
-msgid "Running"
-msgstr "En cours"
-
-#. module: smtpclient
-#: view:email.smtpclient.queue:0
-msgid "Last Error occured"
-msgstr "Dernière erreur apparu"
-
-#. module: smtpclient
-#: selection:email.smtpclient,state:0
-msgid "Waiting for Verification"
-msgstr "En attente de vérification"
-
-#. module: smtpclient
-#: field:email.smtpclient,password:0
-msgid "Password"
-msgstr "Mot de passe"
-
-#. module: smtpclient
-#: field:email.smtpclient,users_id:0
-msgid "Users Allowed"
-msgstr "Utilisateurs authorisés"
-
-#. module: smtpclient
-#: code:addons/smtpclient/wizard/sendcode.py:0
-#, python-format
-msgid "Verification Code Already Generated !"
-msgstr "Génération du code de vérification déjà effectuée!"
-
-#. module: smtpclient
-#: wizard_field:email.sendcode,init,emailto:0
-#: field:email.smtpclient,email:0
-#: wizard_field:email.testemail,init,emailto:0
-#: view:res.company:0
-#: field:res.company.address,email:0
-msgid "Email Address"
-msgstr "Adresse courriel"
-
-#. module: smtpclient
-#: view:email.smtpclient:0
-msgid "Verification Message"
-msgstr "Message de vérification"
-
-#. module: smtpclient
-#: view:email.smtpclient:0
-msgid "Stop Server"
-msgstr "Arrêter le serveur"
-
-#. module: smtpclient
-#: model:ir.ui.menu,name:smtpclient.menu_smtpclient_administration_server
-msgid "Email Servers"
-msgstr "Serveurs email"
-
-#. module: smtpclient
-#: model:ir.actions.wizard,name:smtpclient.wizard_email_sendcode
-msgid "Send Verification Code"
-msgstr "Envoyer le code de vérification"
-
-#. module: smtpclient
-#: field:email.smtpclient.history,model:0
-msgid "Model"
-msgstr "Modèle"
-
-#. module: smtpclient
-#: model:ir.actions.act_window,name:smtpclient.action_email_smtpclient_tree
-#: field:ir.actions.server,email_server:0
-msgid "Email Server"
-msgstr "Serveur de couriel"
-
-#. module: smtpclient
-#: code:addons/smtpclient/smtpclient.py:0
-#, python-format
-msgid "Permission Error!"
-msgstr "Erreur de permission !"
-
-#. module: smtpclient
-#: model:ir.model,name:smtpclient.model_res_company_address
-msgid "res.company.address"
-msgstr "res.company.address"
-
-#. module: smtpclient
-#: field:email.smtpclient.queue,state:0
-msgid "Message Status"
-msgstr "État du message"

=== modified file 'stock/stock.py'
--- stock/stock.py	2010-05-26 08:40:33 +0000
+++ stock/stock.py	2010-05-27 21:44:29 +0000
@@ -516,7 +516,9 @@
         'move_lines': fields.one2many('stock.move', 'picking_id', 'Internal Moves', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
         'delivery_line':fields.one2many('stock.delivery', 'picking_id', 'Delivery lines', readonly=True),
         'auto_picking': fields.boolean('Auto-Picking'),
-        'address_id': fields.many2one('res.partner.address', 'Partner', help="Address of partner"),
+        'address_id': fields.many2one('res.partner.address', 'Address',
+                      help="Shipping address - changing it also changes the partner"),
+        'partner_id': fields.related('address_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", readonly = True, help="Partner for shipping and invoice",store=True),
         'invoice_state': fields.selection([
             ("invoiced", "Invoiced"),
             ("2binvoiced", "To Be Invoiced"),

=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml	2010-05-26 08:40:33 +0000
+++ stock/stock_view.xml	2010-05-27 21:44:29 +0000
@@ -599,18 +599,21 @@
             <field name="model">stock.picking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Picking list">
-                    <group colspan="4" col="6">
+            <form string="Outgoing Form">
+                   <group colspan="4" col="6">
 
-                        <field name="name" readonly="1"/>
 <!--                    <field name="address_id" context="{'contact_display' : 'partner'}" groups="base.group_extended"/>-->
-                        <field name="origin"/>
 
-                        <field name="backorder_id" groups="base.group_extended" readonly="1"/>
-                        <field name="date"/>
-                        <field name="min_date"/>
+                        <field name="min_date"  select="1"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="partner_id" colspan="4"/>
                         <field name="type"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="address_id" context="{'contact_display':'partner'}" colspan="4"/>
+                        <field name="move_type"/>
+                        <field name="origin" readonly="1"/>
+                        <field name="date" select="1" />
+                        <field name="backorder_id" groups="base.group_extended" readonly="1"/>  
+
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
@@ -627,16 +630,9 @@
                                     <field name="date_planned"/>
                                     <field name="date_expected" string="Date Expected"/>
                                     <field name="state"/>
-                                    <button
-                                        name="%(stock.track_line)d"
-                                        string="Split in production lots"
-                                           type="action" icon="gtk-justify-fill"
-                                           states="draft,waiting,confirmed,assigned" />
+                                    <button name="266" string="Split in production lots" type="action" icon="gtk-justify-fill" states="draft,waiting,confirmed,assigned"/>
 
-                                    <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" />
+                                    <button name="265" string="Scrap Products" type="action" icon="gtk-convert" context="{'scrap': True}" states="draft,waiting,confirmed,assigned"/>
                                 </tree>
                                 <form string="Stock Moves">
                                     <notebook colspan="4">
@@ -654,16 +650,12 @@
                                             <field name="date_planned"/>
                                              <field name="date_expected" string="Date Expected"/>                                            
                                             <field name="address_id" context="{'contact_display':'partner'}"/>
-                                            <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
-                                            <field name="prodlot_id" groups="base.group_extended"
-                                                context="{'location_id':location_id, 'product_id':product_id}"
-                                                domain="[('product_id','=?',product_id)]"
-                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+                                            <field name="prodlot_id" groups="base.group_extended" context="{'location_id':location_id, 'product_id':product_id}" domain="[('product_id','=?',product_id)]" on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                                             <field groups="base.group_extended" name="tracking_id"/>
                                             <newline/>
                                             <label/>
-                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
-                                            <button name="%(move_scrap)d" string="Scrap Move Line" type="action" icon="gtk-justify-fill"/>
+                                            <button name="266" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                                            <button name="265" string="Scrap Move Line" type="action" icon="gtk-justify-fill"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
                                             <group colspan="2">
@@ -684,7 +676,7 @@
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                <button name="%(action_partial_picking)d" states="assigned" string="Validate" type="action" icon="gtk-apply"/>
+                                <button name="267" states="assigned" string="Validate" type="action" icon="gtk-apply"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -692,12 +684,10 @@
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                         <page string="Other info" groups="base.group_extended">
+                            <field name="invoice_state" string="Invoice Control"/>
                             <field name="active"/>
+                            <field name="date_done"/>
                             <field name="auto_picking"/>
-                            <field name="invoice_state"/>
-                            <field name="date_done"/>
-                            <newline/>
-                            <field name="move_type"/>
                         </page>
                     </notebook>
                 </form>
@@ -754,15 +744,16 @@
             <field name="model">stock.picking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Picking list">
+            <form string="Delivery Form">
                     <group col="6" colspan="4">
                         <field name="name" readonly="1"/>
-                        <field name="address_id"/>
-                        <field name="origin"/>
-                        <field name="backorder_id" groups="base.group_extended" readonly="1"/>
-                        <field name="date" />
                         <field name="min_date"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="partner_id" colspan="4"/>
+                        <field name="address_id" context="{'contact_display':'partner'}" colspan="4"/>
+                        <field name="origin" readonly="1"/>
+                        <field name="date" select="1" />
+                        <field name="backorder_id" groups="base.group_extended" readonly="1"/>  
                     </group>
                         <notebook colspan="4">
                         <page string="General Information">
@@ -779,16 +770,8 @@
                                     <field name="date_planned"/>
                                      <field name="date_expected" string="Date Expected"/>                                    
                                     <field name="state"/>
-                                    <button
-                                           name="%(stock.track_line)d"
-                                           string="Split in production lots"
-                                           type="action" icon="gtk-justify-fill"
-                                           groups="base.group_extended"
-                                           states="draft,waiting,confirmed,assigned" />
-                                       <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" />
+                                    <button name="266" string="Split in production lots" type="action" icon="gtk-justify-fill" groups="base.group_extended" states="draft,waiting,confirmed,assigned"/>
+                                       <button name="265" string="Scrap Products" type="action" icon="gtk-convert" context="{'scrap': True}" states="draft,waiting,confirmed,assigned"/>
                                 </tree>
                                 <form string="Stock Moves">
                                     <notebook colspan="4">
@@ -805,11 +788,7 @@
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
                                              <field name="date_expected"  string="Date Expected"/>                                            
-                                            <field groups="base.group_extended" name="product_packaging"  domain="[('product_id','=',product_id)]"/>
-                                            <field name="prodlot_id" groups="base.group_extended"
-                                                context="{'location_id':location_id, 'product_id':product_id}"
-                                                domain="[('product_id','=?',product_id)]"
-                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+                                            <field name="prodlot_id" groups="base.group_extended" context="{'location_id':location_id, 'product_id':product_id}" domain="[('product_id','=?',product_id)]" on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                                             <field groups="base.group_extended" name="tracking_id"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
@@ -831,7 +810,7 @@
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                <button name="%(action_partial_picking)d" states="assigned" string="Products Sent" type="action" icon="gtk-go-forward"/>
+                                <button name="267" states="assigned" string="Products Sent" type="action" icon="gtk-go-forward"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -839,12 +818,12 @@
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
                         <page string="Other info" groups="base.group_extended">
-                            <field name="auto_picking"/>
+                            <field name="invoice_state" string="Invoice Control"/>
                             <field name="active"/>
-                            <newline/>
-                            <field name="date"/>
                             <field name="date_done"/>
-                            <field name="move_type"/>
+                            <field name="auto_picking"/>
+                            <field name="type"/>
+
                         </page>
                     </notebook>
                 </form>
@@ -864,12 +843,12 @@
                         <filter icon="terp-stock" string="Back Order" domain="[('backorder_id','!=',False)]" help="Back Order"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="address_id"/>
-                        <field name="origin"/>
+                        <field name="partner_id" select="1"/>
+                        <field name="address_id" context="{'contact_display':'partner'}" select="1"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="10">
-                        <filter string="Partner" icon="terp-stock" domain="[]"  context="{'group_by':'address_id'}"/>
+                        <filter string="Partner" icon="terp-stock" domain="[]"  context="{'group_by':'partner_id'}"/>
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-stock" domain="[]" context="{'group_by':'date'}"/>
                     </group>
@@ -884,7 +863,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','delivery')]</field>
+<!-- FIXME
             <field name="context">{'contact_display': 'partner',"search_default_available":1}</field>
+-->
+            <field name="context">{"search_default_available":1}</field>
             <field name="search_view_id" ref="view_stock_delivery_filter"/>
         </record>
         <record id="action_picking_tree_delivery_view1" model="ir.actions.act_window.view">
@@ -917,7 +899,8 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
-                    <field name="address_id"/>
+                    <field name="partner_id"/>
+                    <field name="address_id" context="{'contact_display':'partner'}"/>
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
                     <field name="date"/>
@@ -934,15 +917,18 @@
             <field name="model">stock.picking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Picking list">
+            <form string="Outgoing Picking list">
                     <group col="6" colspan="4">
-                        <field name="address_id"/>
+                        <field name="name" readonly="1"/>
                         <field name="min_date"/>
-                        <field name="name" readonly="1"/>
-                        <field name="invoice_state"/>
-                        <field name="backorder_id" readonly="1"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="partner_id" colspan="4"/>
+                        <field name="invoice_state" string="Invoice Control"/>
+                        <field name="address_id" context="{'contact_display':'partner'}" colspan="4"/>
+                        <field name="move_type"/>
                         <field name="origin" readonly="1"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="date" select="1" />
+                        <field name="backorder_id" readonly="1"/>                      
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
@@ -959,16 +945,8 @@
                                     <field name="date_planned"/>
                                      <field name="date_expected" string="Date Expected"/>                                    
                                     <field name="state"/>
-                                    <button
-                                           name="%(stock.track_line)d"
-                                           string="Split in production lots"
-                                           type="action" icon="gtk-justify-fill"
-                                           states="draft,waiting,confirmed,assigned" />
-                                       <button
-                                           name="%(stock.move_scrap)d"
-                                           string="Scrap Products" type="action"
-                                           icon="gtk-convert"
-                                           states="draft,waiting,confirmed,assigned" />
+                                    <button name="266" string="Split in production lots" type="action" icon="gtk-justify-fill" states="draft,waiting,confirmed,assigned"/>
+                                   <button name="265" string="D" type="action" icon="gtk-convert" states="draft,waiting,confirmed,assigned"/>
                                 </tree>
                                 <form string="Stock Moves">
                                     <notebook colspan="4">
@@ -977,7 +955,7 @@
                                             <field name="location_id" domain="[('usage','=','internal')]"/>
                                             <field name="location_dest_id" domain="[('usage','&lt;&gt;','view')]"/>
                                             <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id, parent.address_id)"/>
-                                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" />
+                                            <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                             <field name="product_uom"/>
                                             <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                             <field groups="product.group_uos" name="product_uos_qty"/>
@@ -985,20 +963,17 @@
                                             <field invisible="1" name="date"/>
                                             <field name="date_planned"/>
                                              <field name="date_expected"  string="Date Expected"/>                                            
-                                            <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
-                                            <field name="prodlot_id" groups="base.group_extended"
-                                                context="{'location_id':location_id, 'product_id':product_id}"
-                                                domain="[('product_id','=?',product_id)]"
-                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+                                            <field name="prodlot_id" select="1" groups="base.group_extended" context="{'location_id':location_id, 'product_id':product_id}" domain="[('product_id','=?',product_id)]" on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+                                            <field name="prodlot_id" groups="base.group_extended"/>
                                             <field groups="base.group_extended" name="tracking_id"/>
                                             <label/>
-                                            <button name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                                            <button name="266" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
                                             <group colspan="2">
-                                                <button name="force_assign" states="confirmed" string="Force Availability" type="object"  icon="gtk-jump-to"/>
-                                                <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object"  icon="gtk-no"/>
-                                                <button name="action_cancel" states="assigned" string="Cancel" type="object"  icon="gtk-cancel"/>
+                                                <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
+                                                <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-no"/>
+                                                <button name="action_cancel" states="assigned" string="Cancel" type="object" icon="gtk-cancel"/>
                                             </group>
                                         </page>
                                         <page string="Return Picking History">
@@ -1013,7 +988,7 @@
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-apply"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                <button name="%(action_partial_picking)d" states="assigned" string="Picking Done" type="action" icon="gtk-execute"/>
+                                <button name="267" states="assigned" string="Picking Done" type="action" icon="gtk-execute"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -1022,14 +997,15 @@
                         </page>
                         <page string="Other info" groups="base.group_extended">
                             <field name="active"/>
+                            <field name="date_done"/>
                             <field name="auto_picking"/>
+                            <field name="type"/>
                             <newline/>
-                            <field name="date"/>
-                            <field name="date_done"/>
-                            <field name="move_type"/>
+
                         </page>
                     </notebook>
                 </form>
+            
             </field>
         </record>
 
@@ -1044,14 +1020,14 @@
                         <filter icon="terp-stock" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Orders"/>
                         <separator orientation="vertical"/>
 
-                        <field name="name"/>
-                        <field name="address_id" />
+                        <field name="partner_id" select="1"/>
+                        <field name="address_id" context="{'contact_display':'partner'}" select="1"/>
 <!--                        <field name="company_id" widget="selection"/>-->
 
                    </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
-                        <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
+                        <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-stock" domain="[]"  context="{'group_by':'min_date'}"/>
@@ -1067,7 +1043,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','out')]</field>
+<!--
             <field name="context">{'contact_display': 'partner'}</field>
+-->
             <field name="search_view_id" ref="view_picking_out_search"/>
         </record>
         <record id="action_picking_tree_out_view1_waiting" model="ir.actions.act_window.view">
@@ -1096,7 +1074,8 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state in ('draft');grey:state in ('done');red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
-                    <field name="address_id"/>
+                    <field name="partner_id"/>
+                    <field name="address_id" context="{'contact_display':'partner'}"/>
                     <field name="backorder_id" groups="base.group_extended"/>
                     <field name="origin"/>
                     <field name="date"/>
@@ -1113,18 +1092,19 @@
             <field name="model">stock.picking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Input Picking List">
+            <form string="Incoming Picking List">
                     <group colspan="4" col="6">
-
+                        <field name="name" select="1" readonly="1"/>
                         <field name="name" readonly="1"/>
-                        <field name="address_id" on_change="onchange_partner_in(address_id)" context="{'contact_display':'partner'}" />
-                        <field name="origin"/>
-                        <field name="backorder_id" readonly="1" groups="base.group_extended"/>
-                        <field name="date"/>
-                        <field name="type"/>
                         <field name="min_date" readonly="1"/>
-                        <field name="invoice_state" string="Invoice Control"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <field name="partner_id" colspan="4"/>
+                        <field name="address_id" context="{'contact_display':'partner'}" on_change="onchange_partner_in(address_id)" colspan="4"/>
+                        <field name="move_type"/>
+                        <field name="origin" readonly="1"/>
+                        <field name="date" select="1" />
+                        <field name="backorder_id" groups="base.group_extended" readonly="1"/>    
+
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
@@ -1136,15 +1116,8 @@
                                     <field name="location_dest_id"/>
                                     <field name="prodlot_id" groups="base.group_extended"/>
                                     <field name="state"/>
-                                    <button
-                                           name="%(stock.track_line)d"
-                                           string="Split in production lots"
-                                           type="action" icon="gtk-justify-fill"
-                                           states="draft,waiting,confirmed,assigned" />
-                                       <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned" />
+                                    <button name="266" string="Split in production lots" type="action" icon="gtk-justify-fill" states="draft,waiting,confirmed,assigned"/>
+                                       <button name="265" string="Scrap Products" type="action" icon="gtk-convert" context="{'scrap': True}" states="draft,waiting,confirmed,assigned"/>
                                 </tree>
                                 <form string="Stock Moves">
                                     <notebook colspan="4">
@@ -1164,14 +1137,11 @@
                                             <newline/>
                                             <field groups="base.group_extended" name="product_packaging" domain="[('product_id','=',product_id)]"/>
                                             <newline/>
-                                            <field name="prodlot_id" groups="base.group_extended"
-                                                context="{'location_id':location_id, 'product_id':product_id}"
-                                                domain="[('product_id','=?',product_id)]"
-                                                on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
+                                            <field name="prodlot_id" select="1" groups="base.group_extended" context="{'location_id':location_id, 'product_id':product_id}" domain="[('product_id','=?',product_id)]" on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
                                             <field groups="base.group_extended" name="tracking_id"/>
                                             <newline/>
                                             <label/>
-                                            <button groups="base.group_extended" name="%(track_line)d" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
+                                            <button groups="base.group_extended" name="266" string="Split in production lots" type="action" icon="gtk-justify-fill"/>
                                             <separator colspan="4" string="Move State"/>
                                             <field name="state"/>
                                             <group colspan="2">
@@ -1188,7 +1158,7 @@
                             </field>
                             <group col="7" colspan="4">
                                 <label colspan="5"/>
-                                <button name="%(act_stock_picking_move_wizard)d" string="Unreceived Products" type="action" states="draft" icon="gtk-redo"/>
+                                <button name="288" string="Unreceived Products" type="action" states="draft" icon="gtk-redo"/>
                             </group>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
@@ -1196,13 +1166,21 @@
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-media-play"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
-                                <button name="%(action_partial_picking)d" states="assigned" string="Products Received" type="action" icon="gtk-ok"/>
+                                <button name="267" states="assigned" string="Products Received" type="action" icon="gtk-ok"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>
                         </page>
+                        <page string="Other info" groups="base.group_extended">
+                            <field name="invoice_state" string="Invoice Control"/>                            
+                            <field name="active"/>
+                            <field name="date_done"/>
+                            <field name="auto_picking"/>
+                            <field name="type"/>
+                        </page>
+
                     </notebook>
                 </form>
             </field>
@@ -1220,14 +1198,13 @@
                         <filter icon="terp-stock" string="Back Order" domain="[('backorder_id', '!=', False)]" help="Has Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
-                        <field name="address_id"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company" />
+                        <field name="partner_id" select="1"/>
+                        <field name="address_id" context="{'contact_display':'partner'}" select="1"/>
                     </group>
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter icon="terp-stock" name="state" string="State" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical" />
-                        <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <separator orientation="vertical" />
                         <filter string="Order Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-stock" domain="[]"  context="{'group_by':'min_date'}"/>
@@ -1246,7 +1223,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','in')]</field>
+<!--
             <field name="context">{'contact_display': 'partner',"search_default_available":1}</field>
+-->
+            <field name="context">{"search_default_available":1}</field>
             <field name="search_view_id" ref="view_picking_in_search"/>
         </record>
         <record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
@@ -1285,7 +1265,6 @@
                     <newline/>
                     <group expand="1" string="Group By..." colspan="4" col="8">
                         <filter string="State" icon="terp-stock" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Partner" icon="terp-stock" domain="[]" context="{'group_by':'address_id'}"/>
                         <filter string="Order Date" icon="terp-stock" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-stock" domain="[]"  context="{'group_by':'min_date'}"/>
                         <filter string="Origin" icon="terp-stock" domain="[]" context="{'group_by':'origin'}"/>
@@ -1301,7 +1280,10 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','internal')]</field>
+<!--
             <field name="context">{'contact_display': 'partner',"search_default_confirmed":1}</field>
+-->
+            <field name="context">{"search_default_confirmed":1}</field>
             <field name="search_view_id" ref="view_picking_internal_search"/>
         </record>
         <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" groups="base.group_extended" sequence="2"/>