diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index b0671e501ae..80a406bb0b7 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -457,7 +457,7 @@ class account_invoice(osv.osv):
             invoice_addr_id = res['invoice']
             p = self.pool.get('res.partner').browse(cr, uid, partner_id)
             if company_id:
-                if p.property_account_receivable.company_id.id != company_id and p.property_account_payable.company_id.id != company_id:
+                if (p.property_account_receivable.company_id and (p.property_account_receivable.company_id.id != company_id)) and (p.property_account_payable.company_id and (p.property_account_payable.company_id.id != company_id)):
                     property_obj = self.pool.get('ir.property')
                     rec_pro_id = property_obj.search(cr,uid,[('name','=','property_account_receivable'),('res_id','=','res.partner,'+str(partner_id)+''),('company_id','=',company_id)])
                     pay_pro_id = property_obj.search(cr,uid,[('name','=','property_account_payable'),('res_id','=','res.partner,'+str(partner_id)+''),('company_id','=',company_id)])
@@ -958,9 +958,14 @@ class account_invoice(osv.osv):
             })
 
             date = inv.date_invoice or time.strftime('%Y-%m-%d')
-            part = inv.partner_id.id
 
-            line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, part, date, context=ctx)),iml)
+            #if the chosen partner is not a company and has a parent company, use the parent for the journal entries 
+            #because you want to invoice 'Agrolait, accounting department' but the journal items are for 'Agrolait'
+            part = inv.partner_id
+            if part.parent_id and not part.is_company:
+                part = part.parent_id
+
+            line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, part.id, date, context=ctx)),iml)
 
             line = self.group_lines(cr, uid, iml, line, inv)
 
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 1ccc06926d8..5c5a25880cb 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -61,7 +61,7 @@
                         <group>
                             <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)" groups="account.group_account_user"/>
                             <field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
-                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
+                            <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                             <field name="company_id" groups="base.group_multi_company" readonly="1"/>
                         </group>
                     </group>
@@ -95,7 +95,7 @@
                         <field name="name"/>
                         <field name="sequence"/>
                         <field name="account_id" groups="account.group_account_user"/>
-                        <field name="account_analytic_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" groups="analytic.group_analytic_accounting"/>
+                        <field name="account_analytic_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" groups="analytic.group_analytic_accounting"/>
                         <field name="manual"/>
                         <field name="amount"/>
                         <field name="base" readonly="0"/>
@@ -199,7 +199,7 @@
                                         domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '!=', 'view')]"
                                         on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"
-                                        domain="[('type','!=','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]"/>
+                                        domain="[('type','!=','view'), ('company_id', '=', parent.company_id)]"/>
                                     <field name="quantity"/>
                                     <field name="uos_id" groups="product.group_uom"
                                         on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
@@ -229,7 +229,7 @@
                                     <tree editable="bottom" string="Taxes">
                                         <field name="name"/>
                                         <field name="account_id" groups="account.group_account_invoice"/>
-                                        <field name="account_analytic_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" groups="analytic.group_analytic_accounting"/>
+                                        <field name="account_analytic_id" domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" groups="analytic.group_analytic_accounting"/>
                                         <field name="base" on_change="base_change(base,parent.currency_id,parent.company_id,parent.date_invoice)" readonly="1"/>
                                         <field name="amount" on_change="amount_change(amount,parent.currency_id,parent.company_id,parent.date_invoice)"/>
 
@@ -354,7 +354,7 @@
                                         domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '!=', 'view')]"
                                         on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"
-                                        domain="[('type','!=','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]"/>
+                                        domain="[('type','!=','view'), ('company_id', '=', parent.company_id)]"/>
                                     <field name="quantity"/>
                                     <field name="uos_id" groups="product.group_uom"
                                         on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 302a74c27af..00fad390282 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -166,28 +166,35 @@ class account_move_line(osv.osv):
                 del data[f]
         return data
 
+    def _prepare_analytic_line(self, cr, uid, obj_line, context=None):
+        """
+        Prepare the values given at the create() of account.analytic.line upon the validation of a journal item having
+        an analytic account. This method is intended to be extended in other modules.
+
+        :param obj_line: browse record of the account.move.line that triggered the analytic line creation
+        """
+        return {'name': obj_line.name,
+                'date': obj_line.date,
+                'account_id': obj_line.analytic_account_id.id,
+                'unit_amount': obj_line.quantity,
+                'product_id': obj_line.product_id and obj_line.product_id.id or False,
+                'product_uom_id': obj_line.product_uom_id and obj_line.product_uom_id.id or False,
+                'amount': (obj_line.credit or  0.0) - (obj_line.debit or 0.0),
+                'general_account_id': obj_line.account_id.id,
+                'journal_id': obj_line.journal_id.analytic_journal_id.id,
+                'ref': obj_line.ref,
+                'move_id': obj_line.id,
+                'user_id': uid,
+               }
+
     def create_analytic_lines(self, cr, uid, ids, context=None):
         acc_ana_line_obj = self.pool.get('account.analytic.line')
         for obj_line in self.browse(cr, uid, ids, context=context):
             if obj_line.analytic_account_id:
                 if not obj_line.journal_id.analytic_journal_id:
                     raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (obj_line.journal_id.name, ))
-                amt = (obj_line.credit or  0.0) - (obj_line.debit or 0.0)
-                vals_lines = {
-                    'name': obj_line.name,
-                    'date': obj_line.date,
-                    'account_id': obj_line.analytic_account_id.id,
-                    'unit_amount': obj_line.quantity,
-                    'product_id': obj_line.product_id and obj_line.product_id.id or False,
-                    'product_uom_id': obj_line.product_uom_id and obj_line.product_uom_id.id or False,
-                    'amount': amt,
-                    'general_account_id': obj_line.account_id.id,
-                    'journal_id': obj_line.journal_id.analytic_journal_id.id,
-                    'ref': obj_line.ref,
-                    'move_id': obj_line.id,
-                    'user_id': uid
-                }
-                acc_ana_line_obj.create(cr, uid, vals_lines)
+                vals_line = self._prepare_analytic_line(cr, uid, obj_line, context=context)
+                acc_ana_line_obj.create(cr, uid, vals_line)
         return True
 
     def _default_get_move_form_hook(self, cursor, user, data):
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index f7d64f43405..7732d8d8cb0 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1227,6 +1227,7 @@
             <field name="model">account.move.line</field>
             <field name="arch" type="xml">
                 <search string="Search Journal Items">
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('ref','ilike',self)]" string="Move"/>
                     <field name="date"/>
                     <filter icon="terp-document-new" string="Unbalanced" domain="[('state','=','draft')]" help="Unbalanced Journal Items"/>
                     <separator/>
@@ -1717,8 +1718,8 @@
             <field name="search_view_id" ref="view_model_search"/>
         </record>
         <menuitem
-            action="action_model_form" id="menu_action_model_form" sequence="5"
-            parent="account.menu_configuration_misc"/>
+            action="action_model_form" name="Models" id="menu_action_model_form" sequence="5"
+            parent="account.menu_finance_recurrent_entries"/>
 
         <!--
             # Payment Terms
@@ -2064,7 +2065,7 @@
         <menuitem
             id="account_template_folder"
             name="Templates"
-            parent="menu_finance_accounting"
+            parent="account_account_menu"
             groups="account.group_account_manager"/>
         <menuitem
             id="account_template_taxes"
@@ -2083,28 +2084,23 @@
             <field name="model">account.account.template</field>
             <field name="arch" type="xml">
                 <form string="Account Template" version="7.0">
-                    <notebook>
-                        <page string="General Information">
-                            <group col="4">
-                                <field name="name"/>
-                                <field name="code"/>
-                                <newline/>
-                                <field name="parent_id"/>
-                                <field name="shortcut"/>
-                                <field name="type"/>
-                                <field name="user_type"/>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="code"/>
+                        <newline/>
+                        <field name="parent_id"/>
+                        <field name="shortcut"/>
+                        <field name="type"/>
+                        <field name="user_type"/>
 
-                                <field name="currency_id" groups="base.group_multi_currency"/>
-                                <field name="reconcile"/>
-                                <field name="chart_template_id"/>
-                            </group>
-                            <separator string="Default Taxes"/>
-                            <field name="tax_ids"/>
-                        </page>
-                        <page string="Notes">
-                            <field name="note"/>
-                        </page>
-                    </notebook>
+                        <field name="currency_id" groups="base.group_multi_currency"/>
+                        <field name="reconcile"/>
+                        <field name="chart_template_id"/>
+                    </group>
+                    <separator string="Default Taxes"/>
+                    <field name="tax_ids"/>
+                    <separator string="Notes"/>
+                    <field name="note" placeholder="Internal notes..."/>
                 </form>
             </field>
         </record>
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index a70b9528661..66a866c2e40 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-24 10:58+0000\n"
-"Last-Translator: Eric Vernichon <evernichon@fiefmanage.ch>\n"
+"PO-Revision-Date: 2012-11-26 11:52+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:54+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:23+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:41
@@ -3399,8 +3399,8 @@ msgid ""
 "The quantity is not a legal requirement but is very useful for some reports."
 msgstr ""
 "La quantité facultative correspondant à cette ligne, par exemple le nombre "
-"de produits vendus. La quantité n'est pas obligatoire en droit, mais elle "
-"est très utile dans certains rapports."
+"d'articles vendus. La quantité n'est pas obligatoire en droit, mais elle est "
+"très utile dans certains rapports."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -4096,7 +4096,7 @@ msgstr "Continuer"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,categ_id:0
 msgid "Category of Product"
-msgstr "Catégorie de produit"
+msgstr "Catégorie de produits"
 
 #. module: account
 #: code:addons/account/account.py:987
@@ -4142,6 +4142,7 @@ msgstr "Détail"
 #: help:account.config.settings,default_purchase_tax:0
 msgid "This purchase tax will be assigned by default on new products."
 msgstr ""
+"Cette taxe d'achat sera attribuée par défaut à tous les nouveaux produits."
 
 #. module: account
 #: report:account.invoice:0
@@ -4769,9 +4770,9 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft supplier invoices."
 msgstr ""
-"Les coûts analytiques (feuilles de temps, dépenses, achats, ...) proviennent "
-"des comptes analytiques. Cela permet d'éditer des factures fournisseurs en "
-"état \"brouillon\"."
+"Les coûts analytiques (feuilles de temps, achats de certains articles, ...) "
+"proviennent des comptes analytiques. Cela permet d'éditer des factures "
+"fournisseurs en état \"brouillon\"."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4828,7 +4829,7 @@ msgstr ""
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,product_uom_id:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Unité de mesure d'article"
 
 #. module: account
 #: field:res.company,paypal_account:0
@@ -5600,7 +5601,7 @@ msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
 msgstr ""
-"Cochez cette case si le prix que vous utilisez pour le produit et les "
+"Cochez cette case si le prix que vous utilisez pour l'article et les "
 "factures inclut cette taxe."
 
 #. module: account
@@ -6121,7 +6122,7 @@ msgstr "Lignes d'abonnement"
 #. module: account
 #: field:account.entries.report,quantity:0
 msgid "Products Quantity"
-msgstr "Quantité de produits"
+msgstr "Quantité d'articles"
 
 #. module: account
 #: view:account.entries.report:0
@@ -9686,7 +9687,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "Product Information"
-msgstr "Information du produit"
+msgstr "Information de l'article"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -9743,7 +9744,7 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft invoices."
 msgstr ""
-"Les coûts analytiques (feuilles de temps, quelques produits achetés, ...) "
+"Les coûts analytiques (feuilles de temps, certains articles achetés, ...) "
 "viennent des comptes analytiques. Ils génèrent des brouillons de facture."
 
 #. module: account
@@ -10626,7 +10627,7 @@ msgstr "Factures fournisseur"
 #: field:report.account.sales,product_id:0
 #: field:report.account_type.sales,product_id:0
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move
@@ -11237,7 +11238,7 @@ msgstr "novembre"
 #. module: account
 #: help:account.invoice.line,account_id:0
 msgid "The income or expense account related to the selected product."
-msgstr "Le compte de revenu ou de dépense associé au produit sélectionné."
+msgstr "Le compte de revenu ou de dépense associé à l'article sélectionné."
 
 #. module: account
 #: view:account.config.settings:0
@@ -11478,7 +11479,7 @@ msgstr "Plan comptable analytiques"
 #. module: account
 #: field:account.chart.template,property_account_expense:0
 msgid "Expense Account on Product Template"
-msgstr "Compte de Dépense sur les Modèles de Produits"
+msgstr "Compte de dépense sur les modèles d'article"
 
 #. module: account
 #: help:accounting.report,label_filter:0
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index e3345068a85..449810103b2 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-26 04:41+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po
index 652d8d41bfe..38502ad287f 100644
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-24 12:49+0000\n"
+"PO-Revision-Date: 2012-11-26 15:09+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:57+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -310,7 +310,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_next:0
 msgid "Next credit note number"
-msgstr ""
+msgstr "Neste kredit notat nummer."
 
 #. module: account
 #: help:account.config.settings,module_account_voucher:0
@@ -731,7 +731,7 @@ msgstr "Hovedsekvensen må være anderledes en gjeldende"
 #: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not configured properly."
-msgstr ""
+msgstr "Dagens valuta er ikke riktig konfigurert."
 
 #. module: account
 #: field:account.journal,profit_account_id:0
@@ -763,6 +763,10 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"Ingen tidsskriftet elementer funnet.\n"
+"</ p>\n"
+"            "
 
 #. module: account
 #: code:addons/account/account.py:1606
@@ -826,7 +830,7 @@ msgstr "Debitorkonti"
 #. module: account
 #: view:account.config.settings:0
 msgid "Configure your company bank accounts"
-msgstr ""
+msgstr "Konfigurer bedriftens bankkonto."
 
 #. module: account
 #: constraint:account.move.line:0
@@ -964,7 +968,7 @@ msgstr "Kontoanalyse Journal"
 #. module: account
 #: view:account.invoice:0
 msgid "Send by Email"
-msgstr ""
+msgstr "Send med e-post."
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -984,12 +988,12 @@ msgstr "J.C./Move name"
 #. module: account
 #: view:account.account:0
 msgid "Account Code and Name"
-msgstr ""
+msgstr "Konto kode og navn."
 
 #. module: account
 #: model:mail.message.subtype,name:account.mt_invoice_new
 msgid "created"
-msgstr ""
+msgstr "Opprettet."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -1052,7 +1056,7 @@ msgstr "Forfall"
 #. module: account
 #: field:account.config.settings,purchase_journal_id:0
 msgid "Purchase journal"
-msgstr ""
+msgstr "Kjøp journal."
 
 #. module: account
 #: code:addons/account/account.py:1374
@@ -1168,7 +1172,7 @@ msgstr "Kode"
 #. module: account
 #: view:account.config.settings:0
 msgid "Features"
-msgstr ""
+msgstr "Funksjoner."
 
 #. module: account
 #: code:addons/account/account.py:2323
@@ -1257,7 +1261,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice:0
 msgid "Refund "
-msgstr ""
+msgstr "Tilbakebetaling. "
 
 #. module: account
 #: help:account.config.settings,company_footer:0
@@ -1320,7 +1324,7 @@ msgstr "Periodestart"
 #. module: account
 #: view:account.tax:0
 msgid "Refunds"
-msgstr ""
+msgstr "Tilbakebetaling."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -1390,7 +1394,7 @@ msgstr "Utgående valutakurs"
 #. module: account
 #: field:account.config.settings,chart_template_id:0
 msgid "Template"
-msgstr ""
+msgstr "Mal."
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1565,7 +1569,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,sale_sequence_prefix:0
 msgid "Invoice sequence"
-msgstr ""
+msgstr "Faktura sekvens."
 
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
@@ -1588,7 +1592,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice Status"
-msgstr ""
+msgstr "Fakturastatus."
 
 #. module: account
 #: view:account.invoice.report:0
@@ -1864,7 +1868,7 @@ msgstr "Regnskapsåret sekvens"
 #. module: account
 #: field:account.config.settings,group_analytic_accounting:0
 msgid "Analytic accounting"
-msgstr ""
+msgstr "Analytisk regnskap."
 
 #. module: account
 #: report:account.overdue:0
@@ -2049,7 +2053,7 @@ msgstr ""
 #. module: account
 #: model:account.journal.view,name:account.account_journal_bank_view
 msgid "Bank/Cash Journal View"
-msgstr ""
+msgstr "Bank/kontanter journal vis."
 
 #. module: account
 #: report:account.journal.period.print.sale.purchase:0
@@ -2084,7 +2088,7 @@ msgstr ""
 #. module: account
 #: view:account.period:0
 msgid "Duration"
-msgstr ""
+msgstr "Varighet."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2143,7 +2147,7 @@ msgstr "Utkast kontoutdrag"
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
-msgstr ""
+msgstr "Betal dine leverandører med sjekk."
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
@@ -2154,7 +2158,7 @@ msgstr "Kreditbeløp"
 #: field:account.bank.statement,message_ids:0
 #: field:account.invoice,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Meldinger."
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -2298,7 +2302,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,currency_id:0
 msgid "Default company currency"
-msgstr ""
+msgstr "Standard selskapet valuta."
 
 #. module: account
 #: field:account.invoice,move_id:0
@@ -2351,7 +2355,7 @@ msgstr "Gyldig"
 #: field:account.bank.statement,message_follower_ids:0
 #: field:account.invoice,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Følgere."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_journal
diff --git a/addons/account/test/account_validate_account_move.yml b/addons/account/test/account_validate_account_move.yml
index df58da6dfea..188df14c234 100644
--- a/addons/account/test/account_validate_account_move.yml
+++ b/addons/account/test/account_validate_account_move.yml
@@ -32,8 +32,8 @@
     import time
     date = self._get_date(cr, uid, {'lang': u'en_US', 'normal_view': False, 'active_model': 'ir.ui.menu',
       'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'journal_id': 1, 'view_mode': False,
-      'visible_id': 1, 'period_id': 6, 'tz': False, 'active_ids': [ref('menu_eaction_account_moves_sale')],
-      'search_default_posted': 0, 'active_id': ref('menu_eaction_account_moves_sale')})
+      'visible_id': 1, 'period_id': 6, 'tz': False, 'active_ids': [ref('menu_action_account_moves_all')],
+      'search_default_posted': 0, 'active_id': ref('menu_action_account_moves_all')})
     partner = self.onchange_partner_id(cr, uid, [], False, ref('base.res_partner_12'), ref('account.cash'), debit=0, credit=2000, date=date, journal=False)
     account = self.onchange_account_id(cr, uid, [], account_id=ref('account.a_recv'), partner_id= ref('base.res_partner_12'))
     vals = {
@@ -62,11 +62,11 @@
   !python {model: account.move.line}: |
     ids = self._balance_search(cr, uid, self, 'balance', [('balance', '=', 2000.0)], None, {'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu',
     'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'view_mode': False, 'visible_id': 1,
-    'active_ids': [ref('menu_eaction_account_moves_sale')], 'search_default_posted': 0, 'active_id': ref('menu_eaction_account_moves_sale')})
+    'active_ids': [ref('menu_action_account_moves_all')], 'search_default_posted': 0, 'active_id': ref('menu_action_account_moves_all')})
     bal = self._balance(cr, uid, ids[0][2], 'balance', None,{'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu',
       'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'view_mode': False,
-      'visible_id': 1, 'active_ids': [ref('menu_eaction_account_moves_sale')], 'search_default_posted': 0,
-      'active_id': ref('menu_eaction_account_moves_sale')})
+      'visible_id': 1, 'active_ids': [ref('menu_action_account_moves_all')], 'search_default_posted': 0,
+      'active_id': ref('menu_action_account_moves_all')})
     assert bal, 'Balance has not been computed correctly'
 -
   I check that Initially account move state is "Draft"
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index 17250e74c9d..5d80cf319c5 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -12,51 +12,5 @@
             </field>
         </record>
 
-        <record id="action_account_moves_sale" model="ir.actions.act_window">
-            <field name="name">Journal Items</field>
-            <field name="res_model">account.move.journal</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_account_move_journal_form"/>
-            <field name="context">{'journal_type':'sale','view_mode':False}</field>
-            <field name="target">new</field>
-            <field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a customer invoice, select the journal and the period in the search toolbar. Then, start by recording the entry line of the income account. OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account receivable".</field>
-        </record>
-        <menuitem action="action_account_moves_sale" sequence="16" id="menu_eaction_account_moves_sale"
-            parent="menu_finance_receivables" icon="STOCK_JUSTIFY_FILL" groups="group_account_user,group_account_manager"/>
-
-        <record id="action_account_moves_purchase" model="ir.actions.act_window">
-            <field name="name">Journal Items</field>
-            <field name="res_model">account.move.journal</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_account_move_journal_form"/>
-            <field name="context">{'journal_type':'purchase','view_mode':False}</field>
-            <field name="target">new</field>
-            <field name="help">This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part "Account Payable".</field>
-        </record>
-        <menuitem action="action_account_moves_purchase"
-            id="menu_eaction_account_moves_purchase"
-            parent="menu_finance_payables"
-            icon="STOCK_JUSTIFY_FILL"
-            sequence="16"
-            groups="group_account_user,group_account_manager"/>
-
-        <record id="action_account_moves_bank" model="ir.actions.act_window">
-            <field name="name">Journal Items</field>
-            <field name="res_model">account.move.journal</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_account_move_journal_form"/>
-            <field name="context">{'journal_type':'bank','view_mode':False}</field>
-            <field name="target">new</field>
-            <field name="help">This view is used by accountants in order to record entries massively in OpenERP. Journal items are created by OpenERP if you use Bank Statements, Cash Registers, or Customer/Supplier payments.</field>
-        </record>
-
-        <menuitem
-            action="action_account_moves_bank"
-            icon="STOCK_JUSTIFY_FILL"
-            id="menu_action_account_moves_bank"
-            parent="account.menu_finance_bank_and_cash"
-            sequence="16"
-            groups="group_account_user,group_account_manager"
-        />
     </data>
 </openerp>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 7e3e70af202..8d1445f0f90 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -19,18 +19,6 @@
             </field>
         </record>
 
-        <record id="action_view_account_use_model" model="ir.actions.act_window">
-            <field name="name">Manual Recurring</field>
-            <field name="res_model">account.use.model</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-               <field name="view_id" ref="view_account_use_model"/>
-               <field name="target">new</field>
-               <field name="context">{'model_line':'model_line'}</field>
-        </record>
-
-        <menuitem name="Manual Recurring" action="action_view_account_use_model" id="menu_action_manual_recurring" sequence="10" parent="account.menu_finance_recurrent_entries"/>
-
         <record id="view_account_use_model_create_entry" model="ir.ui.view">
             <field name="name">account.use.model.create.entry.form</field>
             <field name="model">account.use.model</field>
diff --git a/addons/account_accountant/i18n/es_MX.po b/addons/account_accountant/i18n/es_MX.po
index f7a849fa097..3a4633fac40 100644
--- a/addons/account_accountant/i18n/es_MX.po
+++ b/addons/account_accountant/i18n/es_MX.po
@@ -1,39 +1,24 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-26 08:18+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"PO-Revision-Date: 2012-11-26 08:57+0000\n"
+"Last-Translator: Alejandro Negrin [ Vauxoo ] ..:: http://www.vauxoo.com ::.. "
+"<anegrinm@gmail.com>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:54+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_accountant
-#: model:ir.module.module,description:account_accountant.module_meta_information
-msgid ""
-"\n"
-"This module gives the admin user the access to all the accounting features "
-"like the journal\n"
-"items and the chart of accounts.\n"
-"    "
-msgstr ""
-"\n"
-"Este módulo proporciona al usuario admin el acceso a todas las "
-"funcionalidades de contabilidad como\n"
-"los asientos y el plan contable.\n"
-"    "
-
-#. module: account_accountant
-#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
-msgid "Accountant"
-msgstr "Contable"
+#: model:ir.actions.client,name:account_accountant.action_client_account_menu
+msgid "Open Accounting Menu"
+msgstr "Menú Contabilidad"
diff --git a/addons/account_chart/i18n/es_MX.po b/addons/account_chart/i18n/es_MX.po
index 756487edb46..b497704369f 100644
--- a/addons/account_chart/i18n/es_MX.po
+++ b/addons/account_chart/i18n/es_MX.po
@@ -1,28 +1,29 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_chart
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-26 07:52+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2012-11-26 07:17+0000\n"
+"Last-Translator: Alejandro Negrin [ Vauxoo ] ..:: http://www.vauxoo.com ::.. "
+"<anegrinm@gmail.com>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:43+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
 msgid "Remove minimal account chart"
-msgstr "Elimina plan contable mínimo"
+msgstr "Eliminar plan contable mínimo"
 
 #. module: account_chart
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
-msgstr "Planes contables"
+msgstr "Catálogos de cuentas"
diff --git a/addons/base_report_designer/i18n/zh_CN.po b/addons/base_report_designer/i18n/zh_CN.po
index fb4cf02c367..431a39bfe02 100644
--- a/addons/base_report_designer/i18n/zh_CN.po
+++ b/addons/base_report_designer/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-05-10 17:33+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 02:28+0000\n"
+"Last-Translator: Joshua Jan(SHINEIT) <popkar77@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -175,7 +175,7 @@ msgstr "取消"
 #. module: base_report_designer
 #: view:base.report.sxw:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 86edff46920..67c6354fd3b 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -202,9 +202,7 @@ class base_stage(object):
 
     def case_escalate(self, cr, uid, ids, context=None):
         """ Escalates case to parent level """
-        cases = self.browse(cr, uid, ids, context=context)
-        cases[0].state # fill browse record cache, for _action having old and new values
-        for case in cases:
+        for case in self.browse(cr, uid, ids, context=context):
             data = {'active': True}
             if case.section_id.parent_id:
                 data['section_id'] = case.section_id.parent_id.id
@@ -215,8 +213,6 @@ class base_stage(object):
                 raise osv.except_osv(_('Error!'), _("You are already at the top level of your sales-team category.\nTherefore you cannot escalate furthermore."))
             self.write(cr, uid, [case.id], data, context=context)
             case.case_escalate_send_note(case.section_id.parent_id, context=context)
-        cases = self.browse(cr, uid, ids, context=context)
-        self._action(cr, uid, cases, 'escalate', context=context)
         return True
 
     def case_open(self, cr, uid, ids, context=None):
@@ -256,8 +252,7 @@ class base_stage(object):
 
     def case_set(self, cr, uid, ids, new_state_name=None, values_to_update=None, new_stage_id=None, context=None):
         """ Generic method for setting case. This methods wraps the update
-            of the record, as well as call to _action and browse_record
-            case setting to fill the cache.
+            of the record.
 
             :params new_state_name: the new state of the record; this method
                                     will call ``stage_set_with_state_name``
@@ -271,7 +266,6 @@ class base_stage(object):
                      update when writing values to the record.
         """
         cases = self.browse(cr, uid, ids, context=context)
-        cases[0].state # fill browse record cache, for _action having old and new values
         # 1. update the stage
         if new_state_name:
             self.stage_set_with_state_name(cr, uid, cases, new_state_name, context=context)
@@ -280,13 +274,14 @@ class base_stage(object):
         # 2. update values
         if values_to_update:
             self.write(cr, uid, ids, values_to_update, context=context)
-        # 3. call _action for base action rule
-        if new_state_name:
-            self._action(cr, uid, cases, new_state_name, context=context)
-        elif not (new_stage_id is None):
-            new_state_name = self.read(cr, uid, ids, ['state'], context=context)[0]['state']
-        self._action(cr, uid, cases, new_state_name, context=context)
         return True
+    
+    def write(self, cr, uid, ids, vals, context=None):
+        res = super(base_stage,self).write(cr, uid, ids, vals, context)
+        if vals.get('stage_id'):
+            for case in self.browse(cr, uid, ids, context=context):
+                self._action(cr, uid, case, case.stage_id.state, context=context)
+        return res
 
     def _action(self, cr, uid, cases, state_to, scrit=None, context=None):
         if context is None:
diff --git a/addons/contacts/i18n/es.po b/addons/contacts/i18n/es.po
new file mode 100644
index 00000000000..c4f38f1f584
--- /dev/null
+++ b/addons/contacts/i18n/es.po
@@ -0,0 +1,37 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-27 01:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a contact in your address book.\n"
+"          </p><p>\n"
+"            OpenERP helps you easily track all activities related to\n"
+"            a customer; discussions, history of business opportunities,\n"
+"            documents, etc.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr ""
diff --git a/addons/crm/crm_action_rule_demo.xml b/addons/crm/crm_action_rule_demo.xml
index 83f5681f311..14a9761e102 100644
--- a/addons/crm/crm_action_rule_demo.xml
+++ b/addons/crm/crm_action_rule_demo.xml
@@ -43,7 +43,7 @@ Thanks,
         </record>
 
         <record id="filter_draft_lead" model="ir.filters">
-            <field name="name">Filter on leads which are draft.</field>
+            <field name="name">Draft Leads</field>
             <field name="model_id">crm.lead</field>
             <field name="domain">[('state','=','draft')]</field>
             <field name="user_id" eval="False"/>
@@ -62,7 +62,7 @@ Thanks,
         </record>
 
         <record id="filter_usa_lead" model="ir.filters">
-            <field name="name">Filter on leads which come from USA.</field>
+            <field name="name">Leads from USA</field>
             <field name="model_id">crm.lead</field>
             <field name="domain">[('country_id','=','United States')]</field>
             <field name="user_id" eval="False"/>
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 8c787b94c84..eb43573d8bc 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -127,6 +127,8 @@ class crm_phonecall(base_state, osv.osv):
                 section_id = call.section_id and call.section_id.id or False
             if not user_id:
                 user_id = call.user_id and call.user_id.id or False
+            if not schedule_time:
+                schedule_time = call.date
             vals = {
                     'name' : call_summary,
                     'user_id' : user_id or False,
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index 9aa02343620..0351bdc1344 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-26 04:41+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:23+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 93abc967b8e..00a071fa954 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -15,20 +15,6 @@
                 </field>
         </record>
 
-        <record id="view_partners_form_crm3" model="ir.ui.view">
-                <field name="name">view.res.partner.search.crm.inherited3</field>
-                <field name="model">res.partner</field>
-                <field name="inherit_id" ref="base.view_res_partner_filter"/>
-                <field eval="18" name="priority"/>
-                <field name="arch" type="xml">
-                    <xpath expr="//group[@string='Group By...']" position="after">
-                        <group string="Display">
-                            <filter string="Show Sales Team" context="{'invisible_section': False}"/>
-                        </group>
-                    </xpath>
-                </field>
-        </record>
-
         <!-- open meetings related to given partner -->
         <record id="crm_meeting_partner" model="ir.actions.act_window">
             <field name="name">Meetings</field>
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 087eb433bca..5abfcabbc71 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -2,12 +2,6 @@
 <openerp>
     <data>
 
-        <!-- Top menu item -->
-        <menuitem name="Project"
-            id="base.menu_main_pm"
-            groups="base.group_sale_salesman"
-            sequence="40"/>
-
         <menuitem id="base.menu_aftersale" name="After-Sale Services"
             groups="base.group_sale_salesman"
             parent="base.menu_base_partner" sequence="2" />
@@ -50,8 +44,6 @@
             parent="base.menu_aftersale" action="crm_case_categ_claim0" sequence="1"/>
 
         <!-- Claim Stages -->
-        <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
-        <menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1"/>
         <menuitem id="menu_claim_stage_view" name="Stages" action="crm_claim_stage_act" parent="menu_config_claim" sequence="20"/>
 
     </data>
diff --git a/addons/crm_todo/i18n/zh_CN.po b/addons/crm_todo/i18n/zh_CN.po
index 818ef79a218..68a2aeeccbc 100644
--- a/addons/crm_todo/i18n/zh_CN.po
+++ b/addons/crm_todo/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-17 03:58+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-27 02:01+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
@@ -30,7 +30,7 @@ msgstr "时间箱"
 #. module: crm_todo
 #: view:crm.lead:0
 msgid "Lead"
-msgstr ""
+msgstr "线索"
 
 #. module: crm_todo
 #: view:crm.lead:0
@@ -77,7 +77,7 @@ msgstr "取消"
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_crm_lead
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "线索/商机"
 
 #. module: crm_todo
 #: field:project.task,lead_id:0
diff --git a/addons/delivery/i18n/zh_CN.po b/addons/delivery/i18n/zh_CN.po
index 3f5d03bd30c..c028b40ab6e 100644
--- a/addons/delivery/i18n/zh_CN.po
+++ b/addons/delivery/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-02 01:52+0000\n"
-"Last-Translator: Joshua Jan(SHINEIT) <popkar77@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 03:04+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:23+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -29,7 +29,7 @@ msgstr "由post送货"
 #. module: delivery
 #: view:delivery.grid.line:0
 msgid " in Function of "
-msgstr ""
+msgstr " 在功能 "
 
 #. module: delivery
 #: view:delivery.carrier:0
@@ -64,7 +64,7 @@ msgstr "体积"
 #. module: delivery
 #: view:delivery.carrier:0
 msgid "Zip"
-msgstr ""
+msgstr "邮政编码"
 
 #. module: delivery
 #: field:delivery.grid,line_ids:0
@@ -100,12 +100,23 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击 定义一个新的运输方法 \n"
+"              </p><p>\n"
+"                每个承运商人 (比如：UPS，顺风)可以几种运输方法 \n"
+"               (例如：UPS Express, UPS Standard ) ，每种方法可\n"
+"               以有一个定价规则.\n"
+"              </p><p>\n"
+"                在销售订单（基于报价单）或者发票（基于发运单），\n"
+"                这些方法可以根据你的设置自动计算运输价格；\n"
+"              </p>\n"
+"            "
 
 #. module: delivery
 #: code:addons/delivery/delivery.py:221
 #, python-format
 msgid "No line matched this product or order in the chosen delivery grid."
-msgstr ""
+msgstr "在选择运输网络里，没有一行匹配这个产品或者订单。"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree4
@@ -145,6 +156,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击 为指定区域创建运输价格表.\n"
+"              </p><p>\n"
+"                运输价格表允许 根据产品的重量和其他条件，计算运输的成本和销售价格.\n"
+"               你能为每种运输方法定义几种价格表:为每个国家，或者在特定国家根据邮政编码的定义的一个区域.\n"
+"              </p>\n"
+"            "
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -164,7 +182,7 @@ msgstr "金额"
 #. module: delivery
 #: view:sale.order:0
 msgid "Add in Quote"
-msgstr ""
+msgstr "添加引用"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
@@ -217,7 +235,7 @@ msgstr "网络定义"
 #: code:addons/delivery/stock.py:89
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "警告！"
 
 #. module: delivery
 #: field:delivery.grid.line,operator:0
@@ -237,14 +255,14 @@ msgstr "销售订单"
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_picking_out
 msgid "Delivery Orders"
-msgstr ""
+msgstr "送货单"
 
 #. module: delivery
 #: view:sale.order:0
 msgid ""
 "If you don't 'Add in Quote', the exact price will be computed when invoicing "
 "based on delivery order(s)."
-msgstr ""
+msgstr "如果你没有“添加引用”，当基于送货单开票时，将计算精确的价格。"
 
 #. module: delivery
 #: field:delivery.carrier,partner_id:0
@@ -293,7 +311,7 @@ msgstr "免费送货的订单金额，以公司本位币显示"
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
 msgid "Free If Order Total Amount Is More Than"
-msgstr ""
+msgstr "当订单总额多于 时，免费"
 
 #. module: delivery
 #: field:delivery.grid.line,grid_id:0
@@ -409,7 +427,7 @@ msgstr "条件"
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You must assign a serial number for this product."
-msgstr ""
+msgstr "你必须为这个产品指定序列号"
 
 #. module: delivery
 #: field:delivery.grid.line,standard_price:0
@@ -419,7 +437,7 @@ msgstr "成本价"
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You cannot move products from or to a location of the type view."
-msgstr ""
+msgstr "你不能从视图类型的库位移动"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
@@ -474,7 +492,7 @@ msgstr "订单号必须在一个公司范围内唯一"
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_picking_in
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "入库"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -484,7 +502,7 @@ msgstr "<="
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product."
-msgstr ""
+msgstr "您企图为不一样的产品创建批号"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -558,7 +576,7 @@ msgstr "承运方"
 #: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
 #: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
 msgid "Delivery Methods"
-msgstr ""
+msgstr "运输方法"
 
 #. module: delivery
 #: field:sale.order,id:0
@@ -589,7 +607,7 @@ msgstr "销售价格"
 #. module: delivery
 #: view:stock.picking.out:0
 msgid "Print Delivery Order"
-msgstr ""
+msgstr "打印送货单"
 
 #. module: delivery
 #: view:delivery.grid:0
diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index 3ed3756a733..24da03bf1d8 100644
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -31,10 +31,10 @@ class sale_order(osv.osv):
         'id': fields.integer('ID', readonly=True,invisible=True),
     }
 
-    def onchange_partner_id(self, cr, uid, ids, part):
-        result = super(sale_order, self).onchange_partner_id(cr, uid, ids, part)
+    def onchange_partner_id(self, cr, uid, ids, part, context=None):
+        result = super(sale_order, self).onchange_partner_id(cr, uid, ids, part, context=context)
         if part:
-            dtype = self.pool.get('res.partner').browse(cr, uid, part).property_delivery_carrier.id
+            dtype = self.pool.get('res.partner').browse(cr, uid, part, context=context).property_delivery_carrier.id
             result['value']['carrier_id'] = dtype
         return result
 
diff --git a/addons/document/i18n/nb.po b/addons/document/i18n/nb.po
index 7858ff1dde4..4a9ea425402 100644
--- a/addons/document/i18n/nb.po
+++ b/addons/document/i18n/nb.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-20 17:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-26 14:59+0000\n"
+"Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -41,7 +41,7 @@ msgstr ""
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage."
-msgstr ""
+msgstr "Katalog må ha en overordnede eller en lagringsplass."
 
 #. module: document
 #: view:document.directory:0
@@ -54,6 +54,8 @@ msgid ""
 "Field to be used as name on resource directories. If empty, the \"name\" "
 "will be used."
 msgstr ""
+"Feltet for å bli brukt som navn på ressurs kataloger. Hvis tomt, vil "
+"\"navn\" benyttes."
 
 #. module: document
 #: view:document.directory:0
@@ -64,7 +66,7 @@ msgstr "Grupper etter ..."
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content_type
 msgid "Directory Content Type"
-msgstr ""
+msgstr "Katalog Innholdstype."
 
 #. module: document
 #: view:document.directory:0
@@ -142,7 +144,7 @@ msgstr "Filtrere på mine dokumenter."
 #: view:ir.attachment:0
 #: field:ir.attachment,index_content:0
 msgid "Indexed Content"
-msgstr ""
+msgstr "Indeksert innhold."
 
 #. module: document
 #: help:document.directory,resource_find_all:0
@@ -150,6 +152,8 @@ msgid ""
 "If true, all attachments that match this resource will  be located. If "
 "false, only ones that have this as parent."
 msgstr ""
+"Hvis sant, vil alle vedlegg som samsvarer denne ressursen bli plassert. Hvis "
+"falsk, eneste som har dette som overordnede."
 
 #. module: document
 #: view:document.directory:0
@@ -273,7 +277,7 @@ msgstr "Innholdstype"
 #. module: document
 #: view:ir.attachment:0
 msgid "Modification"
-msgstr ""
+msgstr "Endring."
 
 #. module: document
 #: view:document.directory:0
@@ -288,7 +292,7 @@ msgstr "Type"
 #: code:addons/document/document_directory.py:234
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopi)"
 
 #. module: document
 #: help:document.directory,ressource_type_id:0
@@ -306,7 +310,7 @@ msgstr ""
 #. module: document
 #: constraint:document.directory:0
 msgid "Error! You cannot create recursive directories."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive kataloger."
 
 #. module: document
 #: field:document.directory,resource_field:0
@@ -316,7 +320,7 @@ msgstr "Felt navn."
 #. module: document
 #: field:document.directory,dctx_ids:0
 msgid "Context fields"
-msgstr ""
+msgstr "Kontekst felt."
 
 #. module: document
 #: field:ir.attachment,store_fname:0
@@ -347,13 +351,13 @@ msgstr "Utvidelse"
 #. module: document
 #: field:document.directory,content_ids:0
 msgid "Virtual Files"
-msgstr ""
+msgstr "Virtuelle filer."
 
 #. module: document
 #: code:addons/document/document_storage.py:635
 #, python-format
 msgid "Error at doc write!"
-msgstr ""
+msgstr "Feil på doc skrive!"
 
 #. module: document
 #: view:document.directory:0
@@ -394,12 +398,12 @@ msgstr "Siste endring bruker."
 #: model:ir.actions.act_window,name:document.action_view_files_by_user_graph
 #: view:report.document.user:0
 msgid "Files by User"
-msgstr ""
+msgstr "Filene etter bruker."
 
 #. module: document
 #: view:ir.attachment:0
 msgid "on"
-msgstr ""
+msgstr "på."
 
 #. module: document
 #: field:document.directory,domain:0
@@ -455,11 +459,12 @@ msgstr "Definere ord i sammenheng, for alle underordnede kataloger og filer."
 msgid ""
 "If not checked, media is currently offline and its contents not available"
 msgstr ""
+"Hvis det ikke er merket, er media offline og dens innhold ikke tilgjengelig."
 
 #. module: document
 #: field:report.document.user,user:0
 msgid "unknown"
-msgstr ""
+msgstr "Ukjent."
 
 #. module: document
 #: view:document.directory:0
@@ -505,12 +510,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:document.open_board_document_manager
 #: model:ir.ui.menu,name:document.menu_reports_document
 msgid "Knowledge"
-msgstr ""
+msgstr "Kunnskap."
 
 #. module: document
 #: view:document.storage:0
 msgid "Document Storage"
-msgstr ""
+msgstr "Dokument lager."
 
 #. module: document
 #: view:document.configuration:0
@@ -552,7 +557,7 @@ msgstr ""
 #: code:addons/document/static/src/js/document.js:6
 #, python-format
 msgid "Attachment(s)"
-msgstr ""
+msgstr "Vedlegg(s)"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -562,7 +567,7 @@ msgstr "August"
 #. module: document
 #: view:ir.attachment:0
 msgid "My Document(s)"
-msgstr ""
+msgstr "Mine dokumenter."
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -648,7 +653,7 @@ msgstr "Katalogen Navnet må være unikt!"
 #. module: document
 #: view:ir.attachment:0
 msgid "Attachments"
-msgstr ""
+msgstr "Vedlegg."
 
 #. module: document
 #: field:document.directory,create_uid:0
@@ -690,17 +695,17 @@ msgstr "Underordnede"
 #. module: document
 #: view:board.board:0
 msgid "Files by user"
-msgstr ""
+msgstr "Filer av bruker."
 
 #. module: document
 #: selection:document.storage,type:0
 msgid "External file storage"
-msgstr ""
+msgstr "Ekstern fillagring."
 
 #. module: document
 #: help:document.storage,path:0
 msgid "For file storage, the root path of the storage"
-msgstr ""
+msgstr "For fil lagring, rotbanen Av lagring."
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -752,7 +757,7 @@ msgstr "ir.vedlegg"
 #. module: document
 #: view:report.document.user:0
 msgid "Users File"
-msgstr ""
+msgstr "Brukerens fil."
 
 #. module: document
 #: view:document.directory:0
@@ -795,7 +800,7 @@ msgstr "Navn"
 #. module: document
 #: sql_constraint:document.storage:0
 msgid "The storage path must be unique!"
-msgstr ""
+msgstr "Lagrings stien må være unik!"
 
 #. module: document
 #: view:document.directory:0
@@ -805,7 +810,7 @@ msgstr "Felter"
 #. module: document
 #: help:document.storage,readonly:0
 msgid "If set, media is for reading only"
-msgstr ""
+msgstr "Hvis innstilt, er media for lesing bare."
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -821,7 +826,7 @@ msgstr "# av filer."
 #. module: document
 #: view:document.storage:0
 msgid "Search Document Storage"
-msgstr ""
+msgstr "Søk dokument lagring."
 
 #. module: document
 #: view:document.directory:0
@@ -837,7 +842,7 @@ msgstr ""
 #: code:addons/document/static/src/js/document.js:17
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #. module: document
 #: field:document.directory.content,sequence:0
@@ -847,7 +852,7 @@ msgstr "Sekvens"
 #. module: document
 #: field:document.directory.content,name:0
 msgid "Content Name"
-msgstr ""
+msgstr "Innhold navn."
 
 #. module: document
 #: field:report.document.user,datas_fname:0
@@ -857,7 +862,7 @@ msgstr "Filnavn"
 #. module: document
 #: selection:document.storage,type:0
 msgid "Internal File storage"
-msgstr ""
+msgstr "Intern Fillagring."
 
 #. module: document
 #: view:document.configuration:0
@@ -886,7 +891,7 @@ msgstr "Lagringsmedium"
 #. module: document
 #: field:document.directory.content,extension:0
 msgid "Document Type"
-msgstr ""
+msgstr "Dokumenttype."
 
 #~ msgid "Files per Month"
 #~ msgstr "Filer per måned."
diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index 48b41f94500..ec7b13d123a 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -11,10 +11,9 @@
                 <attribute name="string">Knowledge Application Configuration</attribute>
             </form>
             <group string="res_config_contents" position="replace">
-                <group string="Configure Directories">
-                    <label string="OpenERP's Document Management System supports mapping virtual folders with documents. The virtual folder of a document can be used to manage the files attached to the document, or to print and download any report. This tool will create directories automatically according to modules installed."/>
-                    <label align="0.0" string="When executing this wizard, it will configure your directories automatically according to modules installed."/>
-                </group>
+                <separator string="Configure Directories"/>
+                <p>OpenERP's Document Management System supports mapping virtual folders with documents. The virtual folder of a document can be used to manage the files attached to the document, or to print and download any report. This tool will create directories automatically according to modules installed.</p>
+                <p>When executing this wizard, it will configure your directories automatically according to modules installed.</p>
             </group>
           </data>
         </field>
diff --git a/addons/event/i18n/nl.po b/addons/event/i18n/nl.po
index e1b4749955d..5d6e4d7f374 100644
--- a/addons/event/i18n/nl.po
+++ b/addons/event/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-24 21:29+0000\n"
+"PO-Revision-Date: 2012-11-26 20:16+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:44+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:23+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: event
 #: view:event.event:0
@@ -61,7 +61,7 @@ msgstr ""
 #: code:addons/event/event.py:305
 #, python-format
 msgid "Event has been <b>cancelled</b>."
-msgstr ""
+msgstr "Evenement is <b>geannuleerd</b>"
 
 #. module: event
 #: field:event.registration,date_open:0
@@ -112,12 +112,12 @@ msgstr "Bedrijf"
 #: field:event.event,email_confirmation_id:0
 #: field:event.type,default_email_event:0
 msgid "Event Confirmation Email"
-msgstr ""
+msgstr "Evenement bevestign e-mail"
 
 #. module: event
 #: field:event.type,default_registration_max:0
 msgid "Default Maximum Registration"
-msgstr ""
+msgstr "Standaard maximum registraties"
 
 #. module: event
 #: help:event.event,message_unread:0
@@ -139,7 +139,7 @@ msgstr "Evenementregistratie"
 #. module: event
 #: model:ir.module.category,description:event.module_category_event_management
 msgid "Helps you manage your Events."
-msgstr ""
+msgstr "Helpt u ik het beheersen van evenementen."
 
 #. module: event
 #: view:report.event.registration:0
@@ -349,7 +349,7 @@ msgstr "Georganiseerd door"
 #. module: event
 #: view:event.event:0
 msgid "Register with this event"
-msgstr ""
+msgstr "Registreer voor dit benemend."
 
 #. module: event
 #: help:event.type,default_email_registration:0
@@ -424,7 +424,7 @@ msgstr "Aanmaakdatum"
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id:0
 msgid "Event Responsible"
-msgstr ""
+msgstr "Evenement verantwoordelijke."
 
 #. module: event
 #: view:event.event:0
@@ -477,7 +477,7 @@ msgstr "Spreker welke een speech zal geven tijdens het evenement"
 #: code:addons/event/event.py:457
 #, python-format
 msgid "Registration has been <b>created</b>."
-msgstr ""
+msgstr "Registratie is <b>aangemaakt</b>."
 
 #. module: event
 #: view:event.event:0
@@ -488,7 +488,7 @@ msgstr "Annuleer evenement"
 #: code:addons/event/event.py:398
 #, python-format
 msgid "State set to Done"
-msgstr ""
+msgstr "Status ingesteld op 'Gereed'"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
@@ -509,7 +509,7 @@ msgstr "Onbevestigde inschrijvingen"
 #. module: event
 #: model:ir.actions.client,name:event.action_client_event_menu
 msgid "Open Event Menu"
-msgstr ""
+msgstr "Open menu Evenementen"
 
 #. module: event
 #: view:report.event.registration:0
@@ -546,7 +546,7 @@ msgstr " # aantal voorlopige inschrijvingen"
 #: field:event.event,email_registration_id:0
 #: field:event.type,default_email_registration:0
 msgid "Registration Confirmation Email"
-msgstr ""
+msgstr "Registratie bevestiging e-mail"
 
 #. module: event
 #: view:report.event.registration:0
@@ -557,12 +557,12 @@ msgstr "Maand"
 #. module: event
 #: field:event.registration,date_closed:0
 msgid "Attended Date"
-msgstr ""
+msgstr "Datum deelname"
 
 #. module: event
 #: view:event.event:0
 msgid "Finish Event"
-msgstr ""
+msgstr "Evenement einde"
 
 #. module: event
 #: model:ir.actions.server,name:event.actions_server_event_event_unread
@@ -599,13 +599,13 @@ msgstr ""
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
-msgstr ""
+msgstr "Vink dit aan als het contactpersoon een spreker is."
 
 #. module: event
 #: code:addons/event/event.py:116
 #, python-format
 msgid "No Tickets Available!"
-msgstr ""
+msgstr "Geen tickets beschikbaar."
 
 #. module: event
 #: help:event.event,state:0
@@ -686,7 +686,7 @@ msgstr "Evenementen in de 'Nieuw' status"
 #: code:addons/event/event.py:404
 #, python-format
 msgid "State set to Cancel"
-msgstr ""
+msgstr "Status ingesteld op 'Geannuleerd'"
 
 #. module: event
 #: view:event.event:0
@@ -797,7 +797,7 @@ msgstr ""
 #. module: event
 #: view:event.event:0
 msgid "(confirmed:"
-msgstr ""
+msgstr "(bevestigd:"
 
 #. module: event
 #: view:event.registration:0
@@ -865,13 +865,13 @@ msgstr "Email instellingen"
 #. module: event
 #: field:event.type,default_registration_min:0
 msgid "Default Minimum Registration"
-msgstr ""
+msgstr "Standaard minimaal aantal registraties."
 
 #. module: event
 #: code:addons/event/event.py:368
 #, python-format
 msgid "Registration confirmed."
-msgstr ""
+msgstr "Registratie bevestigd."
 
 #. module: event
 #: field:event.event,address_id:0
@@ -894,7 +894,7 @@ msgstr ""
 #. module: event
 #: view:event.event:0
 msgid "Attended the Event"
-msgstr ""
+msgstr "Was aanwezig bij dit evenement."
 
 #. module: event
 #: constraint:event.event:0
@@ -921,7 +921,7 @@ msgstr "Afgerond"
 #. module: event
 #: view:report.event.registration:0
 msgid "Show Confirmed Registrations"
-msgstr ""
+msgstr "Toon bevestigde registraties."
 
 #. module: event
 #: view:event.confirm:0
@@ -931,7 +931,7 @@ msgstr "Annuleren"
 #. module: event
 #: field:event.registration,reply_to:0
 msgid "Reply-to Email"
-msgstr ""
+msgstr "Antwoord aan e-mail."
 
 #. module: event
 #: code:addons/event/event.py:114
@@ -948,7 +948,7 @@ msgstr ""
 #. module: event
 #: view:event.registration:0
 msgid "Set To Unconfirmed"
-msgstr ""
+msgstr "Stel in op 'Onbevestigd'"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index bba1fc22e07..8d46bcb225c 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name' : 'Email Gateway',
     'version' : '1.0',
-    'depends' : ['base', 'mail'],
+    'depends' : ['mail'],
     'author' : 'OpenERP SA',
     'category': 'Tools',
     'description': """
diff --git a/addons/fetchmail/i18n/zh_CN.po b/addons/fetchmail/i18n/zh_CN.po
index 42576af409f..9a3c37cedb2 100644
--- a/addons/fetchmail/i18n/zh_CN.po
+++ b/addons/fetchmail/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-23 16:03+0000\n"
+"PO-Revision-Date: 2012-11-27 03:49+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -96,7 +96,7 @@ msgstr "本地服务器"
 #. module: fetchmail
 #: field:fetchmail.server,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_fetchmail_server
@@ -116,7 +116,7 @@ msgstr "SSL"
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_fetchmail_config_settings
 msgid "fetchmail.config.settings"
-msgstr ""
+msgstr "fetchmail.config.settings"
 
 #. module: fetchmail
 #: field:fetchmail.server,date:0
@@ -184,6 +184,8 @@ msgid ""
 "Here is what we got instead:\n"
 " %s."
 msgstr ""
+"这里被替换为:\n"
+" %s."
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -226,7 +228,7 @@ msgstr "是否应该下载附件。如果不勾这里，收到的邮件会在被
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_mail_mail
 msgid "Outgoing Mails"
-msgstr ""
+msgstr "发出邮件"
 
 #. module: fetchmail
 #: field:fetchmail.server,priority:0
diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po
index 2d92e5cc0c5..efee5a9bb02 100644
--- a/addons/hr/i18n/hr.po
+++ b/addons/hr/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-25 19:55+0000\n"
+"PO-Revision-Date: 2012-11-26 20:53+0000\n"
 "Last-Translator: Lovro Lazarin <lovro.lazarin@slobodni-programi.hr>\n"
 "Language-Team: <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-26 04:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 "Language: hr\n"
 
 #. module: hr
@@ -258,7 +258,7 @@ msgstr "Žensko"
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_form
 msgid "Categories of Employees"
-msgstr ""
+msgstr "Kategorije radnika"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -289,7 +289,7 @@ msgstr "Lokacija ureda"
 #. module: hr
 #: field:hr.job,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Pratitelji"
 
 #. module: hr
 #: view:hr.employee:0
@@ -310,6 +310,9 @@ msgid ""
 "image, with aspect ratio preserved. Use this field anywhere a small image is "
 "required."
 msgstr ""
+"Mala fotografija radnika. Fotografija je automatski prilagođena na dimenzije "
+"64x64px, omjer dimenzija je pritom očuvan. Koristite ovo polje gdje je "
+"potrebna mala slika."
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -319,12 +322,12 @@ msgstr "Datum rođenja"
 #. module: hr
 #: help:hr.job,no_of_recruitment:0
 msgid "Number of new employees you expect to recruit."
-msgstr ""
+msgstr "Broj novih radnika koje planirate zaposliti."
 
 #. module: hr
 #: model:ir.actions.client,name:hr.action_client_hr_menu
 msgid "Open HR Menu"
-msgstr ""
+msgstr "Otvori HR meni"
 
 #. module: hr
 #: help:hr.job,message_summary:0
@@ -332,6 +335,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Sadrži sažetak konverzacije (broj poruka,..). Ovaj sažetak je u html formatu "
+"da bi mogao biti ubačen u kanban pogled."
 
 #. module: hr
 #: help:hr.config.settings,module_account_analytic_analysis:0
@@ -339,6 +344,8 @@ msgid ""
 "This installs the module account_analytic_analysis, which will install sales "
 "management too."
 msgstr ""
+"Ovo instalira modul account_analytic_analysis, koji će također instalirati "
+"upravljanje prodajom."
 
 #. module: hr
 #: view:board.board:0
@@ -355,7 +362,7 @@ msgstr "Posao"
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "Current Number of Employees"
-msgstr ""
+msgstr "Trenutni broj radnika"
 
 #. module: hr
 #: field:hr.department,member_ids:0
@@ -370,13 +377,14 @@ msgstr "Konfiguracija"
 #. module: hr
 #: field:hr.config.settings,module_hr_expense:0
 msgid "Manage employees expenses"
-msgstr ""
+msgstr "Upravljaj troškovima radnika"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
 msgid ""
 "Expected number of employees for this job position after new recruitment."
 msgstr ""
+"Očekivani broj radnika za ovo radno mjesto nakon novog procesa zapošljavanja."
 
 #. module: hr
 #: view:hr.employee:0
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index c5e8824bb53..939270dbaf6 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-10-25 16:29+0000\n"
-"Last-Translator: fenshuajiang <openerp@126.com>\n"
+"PO-Revision-Date: 2012-11-27 04:57+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:13+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -24,7 +24,7 @@ msgstr "系统用户"
 #. module: hr
 #: field:hr.config.settings,module_hr_timesheet_sheet:0
 msgid "Allow timesheets validation by managers"
-msgstr ""
+msgstr "允许管理人员核准工时单"
 
 #. module: hr
 #: field:hr.job,requirements:0
@@ -58,12 +58,12 @@ msgid ""
 "Medium-sized photo of the employee. It is automatically resized as a "
 "128x128px image, with aspect ratio preserved. Use this field in form views "
 "or some kanban views."
-msgstr ""
+msgstr "员工的中等尺寸照片。保留纵横比例，自动缩放为128x128px的图片。这个字段用在表单视图和某些看板视图。"
 
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Time Tracking"
-msgstr ""
+msgstr "考勤跟踪"
 
 #. module: hr
 #: view:hr.employee:0
@@ -84,7 +84,7 @@ msgstr "这个工作岗位上现有的员工人数"
 #. module: hr
 #: field:hr.config.settings,module_hr_evaluation:0
 msgid "Organize employees periodic evaluation"
-msgstr ""
+msgstr "组织员工定期评估"
 
 #. module: hr
 #: view:hr.department:0
@@ -105,12 +105,12 @@ msgstr "工作Email"
 msgid ""
 "This field holds the image used as photo for the employee, limited to "
 "1024x1024px."
-msgstr ""
+msgstr "这个字段保存员工的照片，限制为 1024x1024px"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_holidays:0
 msgid "This installs the module hr_holidays."
-msgstr ""
+msgstr "为此要安装模块 hr_holidays."
 
 #. module: hr
 #: view:hr.job:0
@@ -125,7 +125,7 @@ msgstr "正在招聘"
 #. module: hr
 #: field:hr.job,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未读信息"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -143,32 +143,32 @@ msgstr "招聘人数"
 #. module: hr
 #: field:res.users,employee_ids:0
 msgid "Related employees"
-msgstr ""
+msgstr "相关的员工"
 
 #. module: hr
 #: constraint:hr.employee.category:0
 msgid "Error! You cannot create recursive Categories."
-msgstr ""
+msgstr "错误！你不能创建递归的分类。"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_recruitment:0
 msgid "This installs the module hr_recruitment."
-msgstr ""
+msgstr "为此要安装模块hr_recruitment."
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Birth"
-msgstr ""
+msgstr "生日"
 
 #. module: hr
 #: field:hr.employee,last_login:0
 msgid "Latest Connection"
-msgstr ""
+msgstr "最近连接时间"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Launch Recruitement"
-msgstr ""
+msgstr "开始招聘"
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
@@ -193,22 +193,22 @@ msgstr "已婚"
 #. module: hr
 #: field:hr.job,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Talent Management"
-msgstr ""
+msgstr "人才管理"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_timesheet_sheet:0
 msgid "This installs the module hr_timesheet_sheet."
-msgstr ""
+msgstr "为此要安装模块hr_timesheet_sheet."
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Mobile:"
-msgstr ""
+msgstr "手机："
 
 #. module: hr
 #: view:hr.employee:0
@@ -218,7 +218,7 @@ msgstr "职位"
 #. module: hr
 #: help:hr.job,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "如果要求你关注新消息，勾选此项"
 
 #. module: hr
 #: field:hr.employee,color:0
@@ -235,7 +235,7 @@ msgstr "系统用户的员工字段（包括他的权限）。"
 #. module: hr
 #: field:hr.employee,image_medium:0
 msgid "Medium-sized photo"
-msgstr ""
+msgstr "中等尺寸图片"
 
 #. module: hr
 #: field:hr.employee,identification_id:0
@@ -251,7 +251,7 @@ msgstr "女性"
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_form
 msgid "Categories of Employees"
-msgstr ""
+msgstr "员工分类"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -282,7 +282,7 @@ msgstr "办公地点"
 #. module: hr
 #: field:hr.job,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "关注者"
 
 #. module: hr
 #: view:hr.employee:0
@@ -302,7 +302,7 @@ msgid ""
 "Small-sized photo of the employee. It is automatically resized as a 64x64px "
 "image, with aspect ratio preserved. Use this field anywhere a small image is "
 "required."
-msgstr ""
+msgstr "小尺寸的员工照片。保留纵横比，自动缩放为64x64px。用在任何需要小图片的场合"
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -317,21 +317,21 @@ msgstr "您计划招聘的新员工数。"
 #. module: hr
 #: model:ir.actions.client,name:hr.action_client_hr_menu
 msgid "Open HR Menu"
-msgstr ""
+msgstr "打开 人力资源 菜单"
 
 #. module: hr
 #: help:hr.job,message_summary:0
 msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
-msgstr ""
+msgstr "保留复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
 
 #. module: hr
 #: help:hr.config.settings,module_account_analytic_analysis:0
 msgid ""
 "This installs the module account_analytic_analysis, which will install sales "
 "management too."
-msgstr ""
+msgstr "为此要安装模块 account_analytic_analysis, 也将安装销售管理"
 
 #. module: hr
 #: view:board.board:0
@@ -348,7 +348,7 @@ msgstr "职务"
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "Current Number of Employees"
-msgstr ""
+msgstr "当前员工数量"
 
 #. module: hr
 #: field:hr.department,member_ids:0
@@ -363,7 +363,7 @@ msgstr "设置"
 #. module: hr
 #: field:hr.config.settings,module_hr_expense:0
 msgid "Manage employees expenses"
-msgstr ""
+msgstr "管理员工的费用"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
@@ -374,7 +374,7 @@ msgstr "新的招聘后这个工作岗位上期望的员工人数"
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
-msgstr ""
+msgstr "电话:"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -389,7 +389,7 @@ msgstr "上级分类"
 #. module: hr
 #: sql_constraint:res.users:0
 msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID必须是每个提供者唯一的"
 
 #. module: hr
 #: view:hr.department:0
@@ -425,6 +425,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击定义个一个新的工作岗位.\n"
+"              </p><p>\n"
+"               工作岗位用来定义工作和他们的要求。\n"
+"                你能跟踪跟踪每个工作岗位员工数，并且根据你未来的计划跟进变化。\n"
+"              </p><p>\n"
+"                你能附加一个调查表到工作岗位. 用在招聘流程中评估这个岗位的申请人.\n"
+"              </p>\n"
+"            "
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -437,26 +446,28 @@ msgid ""
 "$('.oe_employee_picture').load(function() { if($(this).width() > "
 "$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
 msgstr ""
+"$('.oe_employee_picture').load(function() { if($(this).width() > "
+"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_evaluation:0
 msgid "This installs the module hr_evaluation."
-msgstr ""
+msgstr "为此要安装模块 hr_evaluation."
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error! You cannot create recursive hierarchy of Employee(s)."
-msgstr ""
+msgstr "错误！，你不能创建递归的员工层次"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_attendance:0
 msgid "This installs the module hr_attendance."
-msgstr ""
+msgstr "为此要安装模块 hr_attendance."
 
 #. module: hr
 #: field:hr.employee,image_small:0
 msgid "Smal-sized photo"
-msgstr ""
+msgstr "小尺寸照片"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -467,12 +478,12 @@ msgstr "员工分类"
 #. module: hr
 #: field:hr.employee,category_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "标签"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_contract:0
 msgid "This installs the module hr_contract."
-msgstr ""
+msgstr "为此要安装模块hr_contract."
 
 #. module: hr
 #: view:hr.employee:0
@@ -482,7 +493,7 @@ msgstr "相关用户"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: hr
 #: field:hr.employee.category,name:0
@@ -492,12 +503,12 @@ msgstr "分类"
 #. module: hr
 #: view:hr.job:0
 msgid "Stop Recruitment"
-msgstr ""
+msgstr "停止招聘"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_attendance:0
 msgid "Install attendances feature"
-msgstr ""
+msgstr "安装 出勤率特性"
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
@@ -527,7 +538,7 @@ msgstr "联系信息"
 #. module: hr
 #: field:hr.config.settings,module_hr_holidays:0
 msgid "Manage holidays, leaves and allocation requests"
-msgstr ""
+msgstr "管理假期、请假和分配请求"
 
 #. module: hr
 #: field:hr.department,child_ids:0
@@ -554,12 +565,12 @@ msgstr "员工合约"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Contracts"
-msgstr ""
+msgstr "合同列表"
 
 #. module: hr
 #: help:hr.job,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "消息和通信历史"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
@@ -569,12 +580,12 @@ msgstr "员工号"
 #. module: hr
 #: field:hr.job,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "是一个关注者"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_recruitment:0
 msgid "Manage the recruitment process"
-msgstr ""
+msgstr "管理招聘流程"
 
 #. module: hr
 #: view:hr.employee:0
@@ -584,12 +595,12 @@ msgstr "生效"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Human Resources Management"
-msgstr ""
+msgstr "人力资源管理"
 
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Install your country's payroll"
-msgstr ""
+msgstr "安装你所在国家的工资表"
 
 #. module: hr
 #: field:hr.employee,bank_account_id:0
@@ -604,7 +615,7 @@ msgstr "公司"
 #. module: hr
 #: field:hr.job,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -627,21 +638,29 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击 添加新的员工.\n"
+"              </p><p>\n"
+"                在OpenERP员工界面快速浏览一下，你\n"
+"                能很容易看到你需要的每人的信息：\n"
+"                包括 联系人数据、工作岗位、可用性等等.\n"
+"              </p>\n"
+"            "
 
 #. module: hr
 #: view:hr.employee:0
 msgid "HR Settings"
-msgstr ""
+msgstr "人力资源设置"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Citizenship & Other Info"
-msgstr ""
+msgstr "国籍和其他信息"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You cannot create recursive departments."
-msgstr ""
+msgstr "错误！你不能创建递归的部门"
 
 #. module: hr
 #: sql_constraint:res.users:0
@@ -656,7 +675,7 @@ msgstr "工作地址"
 #. module: hr
 #: view:hr.employee:0
 msgid "Public Information"
-msgstr ""
+msgstr "公开信息"
 
 #. module: hr
 #: field:hr.employee,marital:0
@@ -681,7 +700,7 @@ msgstr "相片"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -700,13 +719,13 @@ msgstr ""
 #. module: hr
 #: help:hr.config.settings,module_hr_timesheet:0
 msgid "This installs the module hr_timesheet."
-msgstr ""
+msgstr "为此要安装模块hr_timesheet."
 
 #. module: hr
 #: field:hr.job,message_comment_ids:0
 #: help:hr.job,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "评论和电子邮件"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.view_department_form_installer
@@ -745,13 +764,13 @@ msgstr "办公手机"
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Recruitement in Progress"
-msgstr ""
+msgstr "招聘进行中"
 
 #. module: hr
 #: field:hr.config.settings,module_account_analytic_analysis:0
 msgid ""
 "Allow invoicing based on timesheets (the sale application will be installed)"
-msgstr ""
+msgstr "允许基于计工单开票（销售应用模块将被安装）"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -771,7 +790,7 @@ msgstr "家庭地址"
 #. module: hr
 #: field:hr.config.settings,module_hr_timesheet:0
 msgid "Manage timesheets"
-msgstr ""
+msgstr "管理计工单"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -802,12 +821,12 @@ msgstr "在职"
 #. module: hr
 #: help:hr.config.settings,module_hr_payroll:0
 msgid "This installs the module hr_payroll."
-msgstr ""
+msgstr "为此要安装模块 hr_payroll."
 
 #. module: hr
 #: field:hr.config.settings,module_hr_contract:0
 msgid "Record contracts per employee"
-msgstr ""
+msgstr "记录每个员工的联系人"
 
 #. module: hr
 #: view:hr.department:0
@@ -822,7 +841,7 @@ msgstr "国籍"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Additional Features"
-msgstr ""
+msgstr "附加特性"
 
 #. module: hr
 #: field:hr.employee,notes:0
@@ -875,23 +894,23 @@ msgstr "部门名称"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting_timesheet
 msgid "Reports"
-msgstr ""
+msgstr "报表"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_payroll:0
 msgid "Manage payroll"
-msgstr ""
+msgstr "管理工资单"
 
 #. module: hr
 #: view:hr.config.settings:0
 #: model:ir.actions.act_window,name:hr.action_human_resources_configuration
 msgid "Configure Human Resources"
-msgstr ""
+msgstr "配置人力资源"
 
 #. module: hr
 #: selection:hr.job,state:0
 msgid "No Recruitment"
-msgstr ""
+msgstr "没有招聘"
 
 #. module: hr
 #: help:hr.employee,ssnid:0
@@ -911,7 +930,7 @@ msgstr "登录名"
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Total Forecasted Employees"
-msgstr ""
+msgstr "预计员工数合计"
 
 #. module: hr
 #: help:hr.job,state:0
@@ -923,7 +942,7 @@ msgstr ""
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "用户"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_job
@@ -964,12 +983,12 @@ msgstr "每个公司里的任一职位名称都必须唯一"
 #. module: hr
 #: help:hr.config.settings,module_hr_expense:0
 msgid "This installs the module hr_expense."
-msgstr ""
+msgstr "为此要安装模块hr_expense."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_config_settings
 msgid "hr.config.settings"
-msgstr ""
+msgstr "hr.config.settings"
 
 #. module: hr
 #: field:hr.department,manager_id:0
@@ -981,7 +1000,7 @@ msgstr "经理"
 #. module: hr
 #: constraint:res.users:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -996,7 +1015,7 @@ msgstr "下属"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "接受"
 
 #~ msgid "Group name"
 #~ msgstr "组名"
diff --git a/addons/hr/static/src/css/hr.css b/addons/hr/static/src/css/hr.css
index 78dfc946436..16657394736 100644
--- a/addons/hr/static/src/css/hr.css
+++ b/addons/hr/static/src/css/hr.css
@@ -38,7 +38,7 @@
 }
 
 .oe_employee_details {
-  width: 220px;
+  width: 210px;
   font-size: 13px;
   padding: 2px 5px;
   color: #4c4c4c;
diff --git a/addons/hr_contract/i18n/zh_CN.po b/addons/hr_contract/i18n/zh_CN.po
index d369df7d501..5f26a837eef 100644
--- a/addons/hr_contract/i18n/zh_CN.po
+++ b/addons/hr_contract/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-01-23 10:05+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 03:09+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:10+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
@@ -102,7 +102,7 @@ msgstr "合同类型"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Exam"
-msgstr ""
+msgstr "体检"
 
 #. module: hr_contract
 #: field:hr.contract,date_end:0
@@ -162,7 +162,7 @@ msgstr "工作安排"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Salary and Advantages"
-msgstr ""
+msgstr "工资和机会"
 
 #. module: hr_contract
 #: field:hr.contract,job_id:0
@@ -172,7 +172,7 @@ msgstr "职务名称"
 #. module: hr_contract
 #: constraint:hr.contract:0
 msgid "Error! Contract start-date must be less than contract end-date."
-msgstr ""
+msgstr "错误！联系人开始日期必须小于结束日期"
 
 #. module: hr_contract
 #: field:hr.employee,manager:0
@@ -197,7 +197,7 @@ msgstr "签证号"
 #. module: hr_contract
 #: field:hr.employee,vehicle_distance:0
 msgid "Home-Work Dist."
-msgstr ""
+msgstr "家里和工作场所的距离"
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -207,7 +207,7 @@ msgstr "出生地"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Trial Period Duration"
-msgstr ""
+msgstr "试用期"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -227,7 +227,7 @@ msgstr "体检日期"
 #. module: hr_contract
 #: constraint:hr.employee:0
 msgid "Error! You cannot create recursive hierarchy of Employee(s)."
-msgstr ""
+msgstr "错误！，你不能创建递归的员工层次"
 
 #. module: hr_contract
 #: view:hr.contract.type:0
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 21744d2df3f..1914d30ec05 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -303,7 +303,7 @@
         <menuitem parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/>
 
         <record model="ir.actions.act_window" id="request_approve_holidays">
-            <field name="name">Requests Approve</field>
+            <field name="name">Requests to Approve</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="context">{'default_type': 'remove', 'search_default_approve':1}</field>
diff --git a/addons/hr_payroll_account/i18n/zh_CN.po b/addons/hr_payroll_account/i18n/zh_CN.po
index 1e019539dce..5abc6d371d5 100644
--- a/addons/hr_payroll_account/i18n/zh_CN.po
+++ b/addons/hr_payroll_account/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-02-15 05:24+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-27 03:05+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: hr_payroll_account
 #: field:hr.salary.rule,account_credit:0
@@ -103,7 +103,7 @@ msgstr "设置错误!"
 #. module: hr_payroll_account
 #: constraint:hr.contract:0
 msgid "Error! Contract start-date must be less than contract end-date."
-msgstr ""
+msgstr "错误！联系人开始日期必须小于结束日期"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_salary_rule
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index 216541501b1..9e5337492d9 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -195,7 +195,7 @@ class account_analytic_account(osv.osv):
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
     _columns = {
-        'use_timesheets': fields.boolean('Use Timesheets', help="Check this field if this project manages timesheets"),
+        'use_timesheets': fields.boolean('Timesheets', help="Check this field if this project manages timesheets"),
     }
 
     def on_change_template(self, cr, uid, ids, template_id, context=None):
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index b3ec10e59c2..58dca6bd2d5 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -127,31 +127,6 @@
             </field>
         </record>
 
-        <!-- Menus -->
-        <record id="action_hr_analytic_timesheet_open_tree" model="ir.actions.act_window">
-            <field name="name">Invoice Tasks Work</field>
-            <field name="res_model">account.analytic.line</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[]</field>
-            <field name="context">{'search_default_to_invoice': 1}</field>
-            <field name="search_view_id" ref="account.view_account_analytic_line_filter"/>            
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to add some tasks work to be invoiced.
-              </p><p>
-                This list shows every task you can invoice to the customer.
-                Select the lines and invoice from the '<i>more...</i>' contextual
-                menu to generate invoices automatically.
-              </p>
-            </field>
-        </record>
-        <menuitem
-            action="action_hr_analytic_timesheet_open_tree"
-            id="menu_hr_analytic_timesheet_tree"
-            parent="account.menu_finance_periodical_processing_billing"
-            sequence="1"/>
-
         <record id="view_hr_timesheet_invoice_factor_search" model="ir.ui.view">
             <field name="name">hr_timesheet_invoice.factor.search</field>
             <field name="model">hr_timesheet_invoice.factor</field>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 2b9e3f60665..3fd7cca9b3b 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -62,11 +62,7 @@ class account_analytic_line(osv.osv):
         if data is None:
             data = {}
 
-        account_ids = {}
-        for line in self.pool.get('account.analytic.line').browse(cr, uid, ids, context=context):
-            account_ids[line.account_id.id] = True
-
-        account_ids = account_ids.keys() #data['accounts']
+        account_ids = [line.account_id.id for line in self.pool.get('account.analytic.line').browse(cr, uid, ids, context=context)]
         for account in analytic_account_obj.browse(cr, uid, account_ids, context=context):
             partner = account.partner_id
             if (not partner) or not (account.pricelist_id):
diff --git a/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml b/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
index 4390c7c6ed1..7ac7330f2d3 100644
--- a/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
+++ b/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
@@ -54,16 +54,10 @@
             <div t-if="widget.accounts.length == 0">
                 <div class="oe_view_nocontent">
                     <p class="oe_view_nocontent_create">
-                        Click to add projects/analytic accounts you worked on.
+                        Click to add projects, contracts or analytic accounts.
                     </p><p>
                         You will be able to register your working hours and
                         activities.
-                    </p><p>
-                        By default, you record timesheets on analytic accounts.
-                        But if an analytic account represents a customer
-                        contract, you can change the type of the analytic
-                        account to 'Contract or Project' to setup the invoicing
-                        options.
                     </p>
                 </div>
             </div>
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index a382948e15c..6ba34554a61 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -68,20 +68,20 @@ class idea_idea(osv.osv):
 
     def idea_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, { 'state': 'cancel' })
-        self.message_post(cr, uid, ids, body=_('Idea canceled.'), context=context)
+        self.message_post(cr, uid, ids, body=_('Idea has been refused.'), context=context)
         return True
 
     def idea_open(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state': 'open'}, context=context)
-        self.message_post(cr, uid, ids, body=_('Idea accepted.'), context=context)
+        self.message_post(cr, uid, ids, body=_('Idea has been opened.'), context=context)
         return True
 
     def idea_close(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state': 'close'}, context=context)
-        self.message_post(cr, uid, ids, body=_('Idea closed.'), context=context)
+        self.message_post(cr, uid, ids, body=_('Idea has been accepted.'), context=context)
         return True
 
     def idea_draft(self, cr, uid, ids, context={}):
         self.write(cr, uid, ids, {'state': 'draft'}, context=context)
-        self.message_post(cr, uid, ids, body=_('Idea reset to draft.'), context=context)
+        self.message_post(cr, uid, ids, body=_('Idea has been created.'), context=context)
         return True
diff --git a/addons/knowledge/i18n/zh_CN.po b/addons/knowledge/i18n/zh_CN.po
index 79f07d510e7..52b9795996f 100644
--- a/addons/knowledge/i18n/zh_CN.po
+++ b/addons/knowledge/i18n/zh_CN.po
@@ -8,52 +8,52 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-01-13 19:01+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-11-26 13:46+0000\n"
+"Last-Translator: hifly <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Documents"
-msgstr ""
+msgstr "文档"
 
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_knowledge_config_settings
 msgid "knowledge.config.settings"
-msgstr ""
+msgstr "knowledge.config.settings"
 
 #. module: knowledge
 #: help:knowledge.config.settings,module_document_webdav:0
 msgid ""
 "Access your documents in OpenERP through WebDAV.\n"
 "                This installs the module document_webdav."
-msgstr ""
+msgstr "在OpenERP中，通过WebDAV访问你的文档。"
 
 #. module: knowledge
 #: help:knowledge.config.settings,module_document_page:0
 msgid "This installs the module document_page."
-msgstr ""
+msgstr "安装模块document_page."
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
 msgid "Collaborative Content"
-msgstr "协作编辑"
+msgstr "协作内容"
 
 #. module: knowledge
 #: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: view:knowledge.config.settings:0
 msgid "Configure Knowledge"
-msgstr ""
+msgstr "配置知识库"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Knowledge and Documents Management"
-msgstr ""
+msgstr "知识和文档管理"
 
 #. module: knowledge
 #: help:knowledge.config.settings,module_document:0
@@ -63,16 +63,19 @@ msgid ""
 "and a document dashboard.\n"
 "                This installs the module document."
 msgstr ""
+"这是一个完整的文档管理系统，\n"
+"包含：用户认证，全文搜索（目前不支持pptx和docx）和一个文档控制台。\n"
+"需要安装document模块。"
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document_page:0
 msgid "Create static web pages"
-msgstr ""
+msgstr "创建静态页面"
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document_ftp:0
 msgid "Share repositories (FTP)"
-msgstr ""
+msgstr "共享库(FTP)"
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document:0
diff --git a/addons/l10n_ch/invoice.py b/addons/l10n_ch/invoice.py
index 9e8d3f0d57b..3a65e9a0d2b 100644
--- a/addons/l10n_ch/invoice.py
+++ b/addons/l10n_ch/invoice.py
@@ -67,7 +67,7 @@ class account_invoice(osv.osv):
     _columns = {
         ### BVR reference type BVR or FREE
         'reference_type': fields.selection(_get_reference_type,
-            'Reference Type', required=True),
+            'Payment Reference', required=True),
         ### Partner bank link between bank and partner id
         'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',
             help='The partner bank account to pay\nKeep empty to use the default'
diff --git a/addons/lunch/i18n/zh_CN.po b/addons/lunch/i18n/zh_CN.po
index 5bda76a47db..924c50893d6 100644
--- a/addons/lunch/i18n/zh_CN.po
+++ b/addons/lunch/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-05-10 18:07+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-26 13:13+0000\n"
+"Last-Translator: youring <youring@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -26,17 +26,17 @@ msgstr "分类"
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_order_by_supplier_form
 msgid "Today's Orders by Supplier"
-msgstr ""
+msgstr "今天的餐单（按供餐单位分类）"
 
 #. module: lunch
 #: view:lunch.order:0
 msgid "My Orders"
-msgstr ""
+msgstr "我的订餐单"
 
 #. module: lunch
 #: selection:lunch.order,state:0
 msgid "Partially Confirmed"
-msgstr ""
+msgstr "部分已确认"
 
 #. module: lunch
 #: view:lunch.cashmove:0
@@ -47,13 +47,13 @@ msgstr "分组..."
 #. module: lunch
 #: field:lunch.alert,sunday:0
 msgid "Sunday"
-msgstr ""
+msgstr "周日"
 
 #. module: lunch
 #: field:lunch.order.line,supplier:0
 #: field:lunch.product,supplier:0
 msgid "Supplier"
-msgstr ""
+msgstr "供餐单位"
 
 #. module: lunch
 #: view:lunch.order.line:0
@@ -73,7 +73,7 @@ msgstr ""
 #. module: lunch
 #: field:lunch.alert,friday:0
 msgid "Friday"
-msgstr ""
+msgstr "周五"
 
 #. module: lunch
 #: view:lunch.validation:0
@@ -95,12 +95,12 @@ msgstr "日"
 #: view:lunch.order.line:0
 #: selection:lunch.order.line,state:0
 msgid "Received"
-msgstr ""
+msgstr "已接收"
 
 #. module: lunch
 #: view:lunch.order.line:0
 msgid "By Supplier"
-msgstr ""
+msgstr "按供餐单位"
 
 #. module: lunch
 #: model:ir.actions.act_window,help:lunch.action_lunch_order_tree
@@ -121,13 +121,13 @@ msgstr ""
 #. module: lunch
 #: view:lunch.order.line:0
 msgid "Not Received"
-msgstr ""
+msgstr "未收到"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_order_by_supplier_form
 #: model:ir.ui.menu,name:lunch.menu_lunch_control_suppliers
 msgid "Orders by Supplier"
-msgstr ""
+msgstr "订餐单（按供餐单位分）"
 
 #. module: lunch
 #: view:lunch.validation:0
@@ -167,14 +167,14 @@ msgstr "品种列表"
 #. module: lunch
 #: view:lunch.order.line:0
 msgid "By Date"
-msgstr ""
+msgstr "按日期"
 
 #. module: lunch
 #: selection:lunch.order,state:0
 #: view:lunch.order.line:0
 #: selection:lunch.order.line,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "已取消"
 
 #. module: lunch
 #: view:lunch.cashmove:0
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index 9b91c519348..b095c54247f 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -21,7 +21,7 @@
             <field name="interval_type">weeks</field>
             <field name="numbercall">-1</field>
             <field eval="False" name="doall" />
-            <field eval="'ir.module.module'" name="model" />
+            <field eval="'publisher_warranty.contract'" name="model" />
             <field eval="'update_notification'" name="function" />
             <field eval="'(None,)'" name="args" />
             <field name="priority">1000</field>
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 1721b3df1d4..09d7afe6d3d 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -80,8 +80,7 @@
             <field name="tag">mail.wall</field>
             <field name="context">{
               'default_model': 'res.users', 
-              'default_res_id': uid, 
-              'search_default_message_read': True
+              'default_res_id': uid
             }</field>
             <field name="params" eval="&quot;{
                 'domain': ['|', ('notification_ids.partner_id.user_ids', 'in', [uid]), ('author_id.user_ids', 'in', [uid])],
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index ebf362559aa..2d3f56913e1 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-05-24 17:38+0000\n"
+"PO-Revision-Date: 2012-11-26 14:52+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:40+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:23+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: mrp
 #: field:mrp.bom,product_uos:0
 #: field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
-msgstr "UdV du produit"
+msgstr "UdV de l'article"
 
 #~ msgid "Product UoM"
 #~ msgstr "UdM du produit"
@@ -86,7 +86,7 @@ msgstr "Coût horaire"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Scrap Products"
-msgstr "Rebuts"
+msgstr "Mettre au rebut"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -107,7 +107,7 @@ msgstr "Rechercher une nomenclature"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct1
 msgid "For stockable products and consumables"
-msgstr "Pour les produits stockables et les consommables"
+msgstr "Pour les articles stockables et les consommables"
 
 #. module: mrp
 #: help:mrp.bom,message_unread:0
@@ -197,13 +197,13 @@ msgid ""
 "In case the Supply method of the product is Produce, the system creates a "
 "production order."
 msgstr ""
-"Dans le cas où la méthode de fourniture de ce produit est \"Produire\", le "
+"Dans le cas où la méthode de fourniture de cet article est \"Produire\", le "
 "système crée un ordre de fabrication."
 
 #. module: mrp
 #: field:change.production.qty,product_qty:0
 msgid "Product Qty"
-msgstr "Qté de Produit"
+msgstr "Qté d'articles"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -271,7 +271,7 @@ msgstr ""
 #: view:mrp.production:0
 #: field:mrp.production,move_created_ids2:0
 msgid "Produced Products"
-msgstr "Produits produis"
+msgstr "Articles produits"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -342,7 +342,7 @@ msgstr "Erreur ! Vous ne pouvez pas créer de nomenclature récursive."
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You must assign a serial number for this product."
-msgstr ""
+msgstr "Vous devez attribuer un numéro de série pour cet article."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
@@ -352,7 +352,7 @@ msgstr "Utilisation du poste de charge"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
 msgid "Procurement of stockable Product"
-msgstr "Approvisionnement de produit stocké"
+msgstr "Approvisionnement d'article stockable"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_production_action
@@ -399,12 +399,12 @@ msgstr ""
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
 msgid "Work Center Product"
-msgstr "Produit pour les postes de charges"
+msgstr "Article de poste de charge"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Confirm Production"
-msgstr "Confirmer la Production"
+msgstr "Confirmer la production"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockproduct0
@@ -413,7 +413,7 @@ msgid ""
 "quantity and the products parameters."
 msgstr ""
 "Le système crée un ordre (de fabrication ou d'achat), en fonction de la "
-"quantité vendue et des paramètres des produits."
+"quantité vendue et des paramètres des articles."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
@@ -429,7 +429,7 @@ msgstr ""
 #: field:mrp.production,product_qty:0
 #: field:mrp.production.product.line,product_qty:0
 msgid "Product Quantity"
-msgstr "Quantité de produit"
+msgstr "Quantité d'article"
 
 #. module: mrp
 #: help:mrp.production,picking_id:0
@@ -522,7 +522,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
-msgstr "le produit est de type Service"
+msgstr "L'article est de type \"service\""
 
 #. module: mrp
 #: sql_constraint:res.company:0
@@ -572,7 +572,7 @@ msgstr ""
 #: view:mrp.production:0
 #: field:mrp.production,move_created_ids:0
 msgid "Products to Produce"
-msgstr "Produits à produire"
+msgstr "Articles à produire"
 
 #. module: mrp
 #: view:mrp.config.settings:0
@@ -598,7 +598,7 @@ msgstr "Valeur du stock"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
 msgid "Product BoM Structure"
-msgstr "Structure de la Nomenclature des Produits"
+msgstr "Structure de la nomemclature"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -677,7 +677,7 @@ msgstr "Gamme matière"
 #: field:mrp.production,move_lines2:0
 #: report:mrp.production.order:0
 msgid "Consumed Products"
-msgstr "Produits consommés"
+msgstr "Articles consommés"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
@@ -690,7 +690,7 @@ msgstr "Occupation du poste de charge"
 #: code:addons/mrp/procurement.py:44
 #, python-format
 msgid "No BoM defined for this product !"
-msgstr "Pas de nomenclature définie pour ce produit !"
+msgstr "Pas de nomenclature définie pour cet article !"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
@@ -757,8 +757,8 @@ msgstr ""
 #: constraint:mrp.bom:0
 msgid "BoM line product should not be same as BoM product."
 msgstr ""
-"la ligne de nomemclature de produit ne doit pas être la même que la "
-"nomemclature du produit."
+"L'article de la ligne de la nomenclature ne devrait pas être le même article "
+"que celui de la nomenclature."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -858,7 +858,7 @@ msgstr ""
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
-msgstr "Nom du Produit"
+msgstr "Nom de l'article"
 
 #. module: mrp
 #: help:mrp.bom,product_efficiency:0
@@ -922,7 +922,7 @@ msgstr ""
 "En fonction de la méthode de fourniture du service, l'approvisionnement va "
 "générer un appel d'offres pour une commande de sous-traitance, ou va "
 "attendre jusqu'à ce que le service soit effectué (= la livraison des "
-"produits)."
+"articles)."
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -1016,8 +1016,8 @@ msgstr "Type de Nomenclature"
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
 msgstr ""
-"L'approvisionnement '%s' possède une exception : pas de nomenclature définie "
-"pour ce produit !"
+"L'approvisionnement \"%s\" rencontre un incident : pas de nomenclature "
+"définie pour cet article !"
 
 #. module: mrp
 #: view:mrp.property:0
@@ -1042,7 +1042,7 @@ msgid ""
 "manufacturing order."
 msgstr ""
 "Vous devez d'abord annuler les mouvements de stock internes attachés à cet "
-"ordre de production."
+"ordre de fabrication."
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_minimumstockrule0
@@ -1062,7 +1062,7 @@ msgstr "Coût total de %s %s"
 #: model:process.node,name:mrp.process_node_stockproduct1
 #: model:process.process,name:mrp.process_process_stockableproductprocess0
 msgid "Stockable Product"
-msgstr "Produit Stockable"
+msgstr "Article stockable"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
@@ -1138,7 +1138,7 @@ msgstr "Nom de la nomenclature"
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product."
-msgstr ""
+msgstr "Vous tentez d'assigner un lot qui n'appartient pas au même article."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_manufacturing_open
@@ -1172,7 +1172,7 @@ msgstr "Nom"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Production Order N° :"
-msgstr "Ordre de Production N° :"
+msgstr "Ordre de production n°"
 
 #. module: mrp
 #: field:mrp.product.produce,mode:0
@@ -1229,7 +1229,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
-msgstr "Ordres de fabrication en attente de produits"
+msgstr "Ordres de fabrication en attente d'articles"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1305,8 +1305,8 @@ msgid ""
 "The system waits for the products to be available in the stock. These "
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
-"Le système attend que les produits soient disponibles en stock. Typiquement, "
-"les approvisionnements de ces produits sont traités manuellement ou avec une "
+"Le système attend que les articles soient disponibles en stock. Typiquement, "
+"les approvisionnements de ces articles sont traités manuellement ou avec une "
 "règle de stock minimum."
 
 #. module: mrp
@@ -1343,7 +1343,7 @@ msgstr "Sélectionner l'unité de temps"
 #: model:ir.ui.menu,name:mrp.menu_mrp_product_form
 #: view:mrp.config.settings:0
 msgid "Products"
-msgstr ""
+msgstr "Articles"
 
 #. module: mrp
 #: view:report.workcenter.load:0
@@ -1363,8 +1363,8 @@ msgid ""
 "will be automatically pre-completed."
 msgstr ""
 "Une gamme présente tous les postes de charge utilisés, en temps et/ou en "
-"cycles. Si une gamme est initialisée, la table des ordres de fabrication "
-"(postes de charge) sera automatiquement pré-remplie."
+"cycles. Si une gamme est indiquée, le troisième onglet des ordres de "
+"fabrication (postes de charge) sera automatiquement pré-remplie."
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:521
@@ -1379,10 +1379,10 @@ msgid ""
 "maxi quantity. It's available in the Inventory management menu and "
 "configured by product."
 msgstr ""
-"La règle du stock minimum est une règle de gestion automatique des "
+"Une règle de stock minimum est une règle de gestion automatique des "
 "approvisionnements, basée sur des quantités minimum et maximum. Cette règle "
 "est disponible dans le menu de gestion des stocks, et paramétrable pour "
-"chaque produit."
+"chaque article."
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:187
@@ -1422,7 +1422,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_product_line
 msgid "Production Scheduled Product"
-msgstr "Produit géré en Plan Directeur"
+msgstr "Produits dont la fabrication est prévue."
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:204
@@ -1453,8 +1453,8 @@ msgid ""
 "In case the Supply method of the product is Buy, the system creates a "
 "purchase order."
 msgstr ""
-"Dans le cas où la méthode de fourniture est \"Acheter\", le système va créer "
-"un ordre d'achat."
+"Dans le cas où la méthode de fourniture de l'article est \"Acheter\", le "
+"système va créer un ordre d'achat."
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_action
@@ -1476,6 +1476,22 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour créer une nouvelle propriété.\n"
+"              </p><p>\n"
+"                Dans OpenERP, les propriétés permettent de choisir le bonne "
+"nomenclature\n"
+"                pour fabriquer un article lorsque celui-ci peut être "
+"assemblé de plusieurs\n"
+"                manières.  Vous pouvez assigner plusieurs\n"
+"                propriétés à chaque nomenclature. Lorsqu'un vendeur\n"
+"                créer une commande de vente, il peut lui faire correspondre "
+"plusieurs propriétés\n"
+"                et OpenERP choisira automatiquement la nomenclature à "
+"utiliser en fonction\n"
+"                des besoins.\n"
+"              </p>\n"
+"            "
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
@@ -1491,7 +1507,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp.action_view_mrp_product_price_wizard
 #: view:mrp.product_price:0
 msgid "Product Cost Structure"
-msgstr "Structure de Coût du Produit"
+msgstr "Structure de coût d'article"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:139
@@ -1529,7 +1545,7 @@ msgstr "Compte Horaire"
 #: field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Unité de mesure d'article"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1609,7 +1625,7 @@ msgstr "Informations supplémentaires"
 #. module: mrp
 #: model:ir.model,name:mrp.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr "Modifier les quantités de produit"
+msgstr "Modifier les quantités d'articles"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
@@ -1699,7 +1715,7 @@ msgstr "Capacité par Cycle"
 #: report:mrp.production.order:0
 #: field:mrp.production.product.line,product_id:0
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1715,12 +1731,12 @@ msgstr "Emplacement de matière première"
 #. module: mrp
 #: view:mrp.product_price:0
 msgid "Print Cost Structure of Product."
-msgstr "Imprimer la structure des coûts du produit"
+msgstr "Imprimer la structure des coûts de l'article"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Consume Products"
-msgstr "Produits consommés"
+msgstr "Consommer les articles"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
@@ -1765,7 +1781,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.production,product_uos:0
 msgid "Product UoS"
-msgstr "UdV du produit"
+msgstr "UdV de l'article"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -1780,7 +1796,7 @@ msgid ""
 "operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
-"La liste des opérations (liste des postes de charge) pour produire le "
+"La liste des opérations (liste des postes de charge) pour fabriquer le "
 "produit fini. La gamme est principalement utilisée pour calculer les coûts "
 "des postes de charge pendant les opérations et pour planifier leur charge "
 "future en fonction du planning de production."
@@ -1844,11 +1860,11 @@ msgid ""
 "the quantity selected and it will finish the production order when total "
 "ordered quantities are produced."
 msgstr ""
-"Le mode \"Consommer seulement\" ne fera que consommer les produits dans les "
-"quantités spécifiées.\n"
-"Le mode \"Consommer & Produire\" consommera et produira les produits dans "
-"les quantités spécifiées et terminera l'ordre de production dès que les "
-"quantités totales planifiées auront été produites."
+"Le mode \"Consommer seulement\" ne fera que consommer les articles dans les "
+"quantités indiquées.\n"
+"Le mode \"Consommer & produire\" consommera et produira les articles dans "
+"les quantités indiquées et terminera l'ordre de fabrication dès que les "
+"quantités totales prévues auront été produites."
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
@@ -1901,8 +1917,8 @@ msgid ""
 "are products themselves) can also have their own Bill of Material (multi-"
 "level)."
 msgstr ""
-"La nomenclature est la décomposition du produits. Les composants (qui sont "
-"eux-mêmes des produits) peuvent aussi avoir leur propre nomenclature (multi-"
+"La nomenclature est la décomposition du articles. Les composants (qui sont "
+"eux-mêmes des articles) peuvent aussi avoir leur propre nomenclature (multi-"
 "niveaux)"
 
 #. module: mrp
@@ -1931,7 +1947,7 @@ msgstr "Temps pour 1 cycle (en heures)"
 #: model:process.node,name:mrp.process_node_production0
 #: model:process.node,name:mrp.process_node_productionorder0
 msgid "Production Order"
-msgstr "Ordre de Production"
+msgstr "Ordre de fabrication"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productminimumstockrule0
@@ -2005,7 +2021,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.bom,product_uos_qty:0
 msgid "Product UOS Qty"
-msgstr "Qté du produit en UdV"
+msgstr "Qté d'articles en UdV"
 
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
@@ -2020,7 +2036,7 @@ msgid ""
 "orders."
 msgstr ""
 "La variation hebdomadaire du stock vous permet de tracer l’évolution liée a "
-"l'activité de production, aux réceptions produits et aux livraisons."
+"l'activité de production, aux réceptions et aux livraisons."
 
 #. module: mrp
 #: view:mrp.product.produce:0
@@ -2056,7 +2072,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
 msgid "Product Rounding"
-msgstr "Arrondi de produit"
+msgstr "Arrondi d'article"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -2123,13 +2139,13 @@ msgstr "Ordre d'approvisionnement"
 #. module: mrp
 #: help:mrp.bom,product_rounding:0
 msgid "Rounding applied on the product quantity."
-msgstr "Arrondi appliqué sur la quantité des produits."
+msgstr "Arrondi appliqué sur la quantité des articles."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
 msgid "Assignment from Production or Purchase Order."
 msgstr ""
-"Affectation à partir d'un ordre de fabrication ou d'un bon de commande."
+"Affectation à partir d'un ordre de fabrication ou d'une commande d'achat."
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
@@ -2149,6 +2165,21 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour créer une nomenclature. \n"
+"              </p><p>\n"
+"                Les nomenclatures permettent de définir la liste des "
+"matières\n"
+"                premières nécessaires pour fabriquer un produit fini, grâce "
+"à un ordre\n"
+"                de fabrication ou un kit d'article.\n"
+"              </p><p>\n"
+"                OpenERP utilise les nomenclatures pour proposer "
+"automatiquement\n"
+"                des ordres de fabrication en fonction des besoins "
+"d'approvisionnement.\n"
+"              </p>\n"
+"            "
 
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
@@ -2279,7 +2310,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
 msgid "Product type is Stockable or Consumable."
-msgstr "Le type produit est stockable ou consommable."
+msgstr "Le type d'article est stockable ou consommable."
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -2289,7 +2320,7 @@ msgstr "Production démarrée"
 #. module: mrp
 #: model:process.node,name:mrp.process_node_procureproducts0
 msgid "Procure Products"
-msgstr "Approvisionner les produits"
+msgstr "Approvisionner les articles"
 
 #. module: mrp
 #: field:mrp.product.produce,product_qty:0
@@ -2348,8 +2379,8 @@ msgid ""
 "Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
 "promotion of stock."
 msgstr ""
-"L'UdV (unité de Vente) du produit est l'unité de mesure pour la facturation "
-"et la valorisation du stock"
+"L'UdV (unité de vente) de l'article est l'unité de mesure pour la "
+"facturation et la valorisation du stock."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -2371,7 +2402,7 @@ msgstr "Approvisionnements en exception"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
-msgstr "Prix produit"
+msgstr "Prix article"
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -2382,7 +2413,7 @@ msgstr "Changer la quantité"
 #: view:change.production.qty:0
 #: model:ir.actions.act_window,name:mrp.action_change_production_qty
 msgid "Change Product Qty"
-msgstr "Changer la Qté de Produits"
+msgstr "Changer la qté. d'articles"
 
 #. module: mrp
 #: field:mrp.routing,note:0
@@ -2394,7 +2425,7 @@ msgstr "Description"
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
-msgstr "Tableau de bord de production"
+msgstr "Tableau de bord de fabrication"
 
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:68
@@ -2405,7 +2436,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
-msgstr "Le moyen d’approvisionnement dépend du type de produit"
+msgstr "Le moyen d’approvisionnement dépend du type d'article"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.open_board_manufacturing
@@ -2466,8 +2497,8 @@ msgid ""
 "Depending on the chosen method to supply the stockable products, the "
 "procurement order creates a RFQ, a production order, ... "
 msgstr ""
-"Selon la méthode de fourniture choisie pour les produits suivis en stock, "
-"l'approvisionnement générera un appel d'offres, un ordre de fabrication, ... "
+"Selon la méthode de fourniture choisie pour les articles stockables, "
+"l'approvisionnement génére un appel d'offres, un ordre de fabrication, ... "
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
@@ -2512,7 +2543,7 @@ msgid ""
 "Specify quantity of products to produce or buy. Report of Cost structure "
 "will be displayed base on this quantity."
 msgstr ""
-"Spécifie la quantité de produits à fabriquer ou à acheter. Le rapport sur la "
+"Spécifie la quantité d'articles à fabriquer ou à acheter. Le rapport sur la "
 "structure du coût de revient sera basé sur cette quantité."
 
 #. module: mrp
@@ -2548,7 +2579,7 @@ msgstr ""
 #: field:mrp.production,move_lines:0
 #: report:mrp.production.order:0
 msgid "Products to Consume"
-msgstr "Produits à consommer"
+msgstr "Articles à consommer"
 
 #~ msgid "Change Qty"
 #~ msgstr "Changer la quantité"
diff --git a/addons/mrp_byproduct/i18n/fr.po b/addons/mrp_byproduct/i18n/fr.po
index 6eec68e5dfb..f615e3e76ee 100644
--- a/addons/mrp_byproduct/i18n/fr.po
+++ b/addons/mrp_byproduct/i18n/fr.po
@@ -7,15 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-01-13 02:28+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2012-11-26 13:58+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -53,8 +52,8 @@ msgstr "Ordre de fabrication"
 #: constraint:mrp.bom:0
 msgid "BoM line product should not be same as BoM product."
 msgstr ""
-"Le produit de la ligne de la nomenclature ne devrait pas être le même "
-"produit que celui de la nomenclature."
+"L'article de la ligne de la nomenclature ne devrait pas être le même article "
+"que celui de la nomenclature."
 
 #. module: mrp_byproduct
 #: sql_constraint:mrp.bom:0
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index d79620ce93c..905a1b5642f 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -115,10 +115,10 @@ class mrp_repair(osv.osv):
         return result.keys()
 
     _columns = {
-        'name': fields.char('Repair Reference',size=24, required=True),
+        'name': fields.char('Repair Reference',size=24, required=True, states={'confirmed':[('readonly',True)]}),
         'product_id': fields.many2one('product.product', string='Product to Repair', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'partner_id' : fields.many2one('res.partner', 'Partner', select=True, help='Choose partner for whom the order will be invoiced and delivered.'),
-        'address_id': fields.many2one('res.partner', 'Delivery Address', domain="[('parent_id','=',partner_id)]"),
+        'partner_id' : fields.many2one('res.partner', 'Partner', select=True, help='Choose partner for whom the order will be invoiced and delivered.', states={'confirmed':[('readonly',True)]}),
+        'address_id': fields.many2one('res.partner', 'Delivery Address', domain="[('parent_id','=',partner_id)]", states={'confirmed':[('readonly',True)]}),
         'default_address_id': fields.function(_get_default_address, type="many2one", relation="res.partner"),
         'prodlot_id': fields.many2one('stock.production.lot', 'Lot Number', select=True, states={'draft':[('readonly',False)]},domain="[('product_id','=',product_id)]"),
         'state': fields.selection([
@@ -137,10 +137,10 @@ class mrp_repair(osv.osv):
             \n* The \'To be Invoiced\' status is used to generate the invoice before or after repairing done. \
             \n* The \'Done\' status is set when repairing is completed.\
             \n* The \'Cancelled\' status is used when user cancel repair order.'),
-        'location_id': fields.many2one('stock.location', 'Current Location', select=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'location_dest_id': fields.many2one('stock.location', 'Delivery Location', readonly=True, states={'draft':[('readonly',False)]}),
+        'location_id': fields.many2one('stock.location', 'Current Location', select=True, readonly=True, states={'draft':[('readonly',False)], 'confirmed':[('readonly',True)]}),
+        'location_dest_id': fields.many2one('stock.location', 'Delivery Location', readonly=True, states={'draft':[('readonly',False)], 'confirmed':[('readonly',True)]}),
         'move_id': fields.many2one('stock.move', 'Move',required=True, domain="[('product_id','=',product_id)]", readonly=True, states={'draft':[('readonly',False)]}),
-        'guarantee_limit': fields.date('Warranty Expiration', help="The warranty expiration limit is computed as: last move date + warranty defined on selected product. If the current date is below the warranty expiration limit, each operation and fee you will add will be set as 'not to invoiced' by default. Note that you can change manually afterwards."),
+        'guarantee_limit': fields.date('Warranty Expiration', help="The warranty expiration limit is computed as: last move date + warranty defined on selected product. If the current date is below the warranty expiration limit, each operation and fee you will add will be set as 'not to invoiced' by default. Note that you can change manually afterwards.", states={'confirmed':[('readonly',True)]}),
         'operations' : fields.one2many('mrp.repair.line', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', help='Pricelist of the selected partner.'),
         'partner_invoice_id':fields.many2one('res.partner', 'Invoicing Address'),
@@ -156,7 +156,7 @@ class mrp_repair(osv.osv):
         'internal_notes': fields.text('Internal Notes'),
         'quotation_notes': fields.text('Quotation Notes'),
         'company_id': fields.many2one('res.company', 'Company'),
-        'deliver_bool': fields.boolean('Deliver', help="Check this box if you want to manage the delivery once the product is repaired and create a picking with selected product. Note that you can select the locations in the Info tab, if you have the extended view."),
+        'deliver_bool': fields.boolean('Deliver', help="Check this box if you want to manage the delivery once the product is repaired and create a picking with selected product. Note that you can select the locations in the Info tab, if you have the extended view.", states={'confirmed':[('readonly',True)]}),
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'repaired': fields.boolean('Repaired', readonly=True),
         'amount_untaxed': fields.function(_amount_untaxed, string='Untaxed Amount',
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index d3a55ab32c1..bef6affc151 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -46,9 +46,9 @@
                         <group>
                             <field name="product_id" on_change="onchange_product_id(product_id)" domain="[('type','!=','service')]"/>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id,address_id)" attrs="{'required':[('invoice_method','!=','none')]}"/>
-                            <field name="address_id"  attrs="{'readonly':[('deliver_bool','=', False)]}" groups="sale.group_delivery_invoice_address"/>
+                            <field name="address_id" groups="sale.group_delivery_invoice_address"/>
                             <field name="move_id" on_change="onchange_move_id(product_id, move_id)" context="{'default_product_id':product_id}"/>
-                            <field name="location_id" attrs="{'readonly':[('deliver_bool','=', False)], 'required':[('deliver_bool','=', True)]}" groups="stock.group_locations"/>
+                            <field name="location_id" attrs="{'required':[('deliver_bool','=', True)]}" groups="stock.group_locations"/>
                             <field name="prodlot_id" on_change="onchange_lot_id(prodlot_id,product_id)" groups="stock.group_production_lot" string="Serial Number"/>
                         </group>
                         <group>
@@ -109,9 +109,13 @@
                         <group class="oe_subtotal_footer oe_right">
                             <field name="amount_untaxed" sum="Untaxed amount"/>
                             <field name="amount_tax"/>
-                            <field name="amount_total" sum="Total amount" class="oe_subtotal_footer_separator"/>
+                            <div class="oe_subtotal_footer_separator oe_inline">
+                                <label for="amount_total" />
+                                <button name="button_dummy"
+                                    states="draft" string="(update)" type="object" class="oe_edit_only oe_link"/>
+                            </div>
+                            <field name="amount_total" nolabel="1" sum="Total amount" class="oe_subtotal_footer_separator"/>
                         </group>
-                        <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
                         <div class="oe_clear"/>
                     </page>
                     <page string="Invoicing">
@@ -173,7 +177,7 @@
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             </group>
                             <group>
-                                <field name="location_dest_id" attrs="{'readonly':[('deliver_bool','=', False)], 'required':[('deliver_bool','=', True)]}" groups="stock.group_locations"/>
+                                <field name="location_dest_id" attrs="{'required':[('deliver_bool','=', True)]}" groups="stock.group_locations"/>
                             </group>
                         </group>
                     </page>
diff --git a/addons/note/i18n/zh_CN.po b/addons/note/i18n/zh_CN.po
index d6b2ecc3686..af393cfa67b 100644
--- a/addons/note/i18n/zh_CN.po
+++ b/addons/note/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-25 09:14+0000\n"
-"Last-Translator: Joshua Jan(SHINEIT) <popkar77@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 01:57+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-26 04:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: note
 #: sql_constraint:res.users:0
@@ -288,7 +288,7 @@ msgstr "错误：无效的(EAN)条码"
 #. module: note
 #: field:base.config.settings,group_note_fancy:0
 msgid "Use fancy layouts for notes"
-msgstr "为便签使用花式布局"
+msgstr "为便签使用拟物化布局"
 
 #. module: note
 #: field:note.stage,user_id:0
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 91c51e87ad9..8623765199b 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -11,9 +11,9 @@
                         <attribute name="string">Install Outlook Plug-In</attribute>
                     </form>
                     <xpath expr="//footer" position="replace">
-                    <footer>
-                        <button string="Close" special="Cancel" class="oe_highlight"/>
-                    </footer>
+                       <footer>
+                            <button string="Close" class="oe_link" special="cancel" />
+                       </footer>
                     </xpath>
                     <xpath expr="//separator[@string='title']" position="after" version="7.0">
                         <group>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 3774a369437..31fa27a644f 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -11,9 +11,9 @@
                         <attribute name="string">Install Thunderbird Plug-In</attribute>
                     </form>
                     <xpath expr="//footer" position="replace">
-                    <footer>
-                        <button string="Close" special="Cancel" class="oe_highlight"/>
-                    </footer>
+                       <footer>
+                            <button string="Close" class="oe_link" special="cancel" />
+                       </footer>
                     </xpath>
                     <xpath expr="//separator[@string='title']" position="after">
                         <group>
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index b7fa1085380..5ac6d6a29e0 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -618,9 +618,10 @@ class pos_order(osv.osv):
         return session_ids and session_ids[0] or False
 
     def _default_pricelist(self, cr, uid, context=None):
-        res = self.pool.get('sale.shop').search(cr, uid, [], context=context)
-        if res:
-            shop = self.pool.get('sale.shop').browse(cr, uid, res[0], context=context)
+        session_ids = self._default_session(cr, uid, context) 
+        if session_ids:
+            session_record = self.pool.get('pos.session').browse(cr, uid, session_ids, context=context)
+            shop = self.pool.get('sale.shop').browse(cr, uid, session_record.config_id.shop_id.id, context=context)
             return shop.pricelist_id and shop.pricelist_id.id or False
         return False
 
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 3e4dda3791c..5f55bff40f3 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -30,7 +30,7 @@
                         <field name="name"/>
                         <field name="date_order"/>
                         <field name="session_id" required="1"/>
-                        <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_customer':1}" attrs="{'readonly': [('state','=','invoiced')]}"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id, context)" context="{'search_default_customer':1}" attrs="{'readonly': [('state','=','invoiced')]}"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Products">
@@ -1060,7 +1060,7 @@
             <field name="arch" type="xml">
                 <form string="Ean13 Generator" version="7.0">  
                     <p class="oe_grey">
-                        Enter a reference for this product, it will be converted
+                        Enter a reference, it will be converted
                         automatically to a valid EAN number.
                     </p>
                     <group>
diff --git a/addons/point_of_sale/res_users.py b/addons/point_of_sale/res_users.py
index f1c613d5f06..2573e39040a 100644
--- a/addons/point_of_sale/res_users.py
+++ b/addons/point_of_sale/res_users.py
@@ -19,7 +19,7 @@ class res_users(osv.osv):
 
     def edit_ean(self, cr, uid, ids, context):
         return {
-            'name': "Edit Ean",
+            'name': "Edit EAN",
             'type': 'ir.actions.act_window',
             'view_type': 'form',
             'view_mode': 'form',
diff --git a/addons/point_of_sale/res_users_view.xml b/addons/point_of_sale/res_users_view.xml
index 89daeaa29a1..11d37324ec9 100644
--- a/addons/point_of_sale/res_users_view.xml
+++ b/addons/point_of_sale/res_users_view.xml
@@ -23,7 +23,7 @@
                     <group>
                         <field name="pos_config" />
                         <field name="ean13" />
-                        <button name="edit_ean" type="object" string="Edit" />
+                        <button name="edit_ean" type="object" string="Edit EAN" class="oe_edit_only" />
                     </group>
                 </page>
             </notebook>
diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js
index 782aac8c101..55e75ebcf42 100644
--- a/addons/point_of_sale/static/src/js/devices.js
+++ b/addons/point_of_sale/static/src/js/devices.js
@@ -202,7 +202,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
          *     {
          *          quantity:           (number) the number of items, or the weight, 
          *          unit_name:          (string) the name of the item's unit (kg, dozen, ...)
-         *          list_price:         (number) the price of one unit of the item before discount
+         *          price:              (number) the price of one unit of the item before discount
          *          discount:           (number) the discount on the product in % [0,100] 
          *          product_name:       (string) the name of the product
          *          price_with_tax:     (number) the price paid for this orderline, tax included
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 3adbd19b161..f533fa760ab 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -342,7 +342,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
             this.pos = options.pos;
             this.order = options.order;
             this.product = options.product;
-            this.price   = options.product.get('list_price');
+            this.price   = options.product.get('price');
             this.quantity = 1;
             this.discount = 0;
             this.type = 'unit';
@@ -396,11 +396,11 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
             return this.product;
         },
         // return the base price of this product (for this orderline)
-        get_list_price: function(){
+        get_price: function(){
             return this.price;
         },
         // changes the base price of the product for this orderline
-        set_list_price: function(price){
+        set_price: function(price){
             this.price = price;
             this.trigger('change');
         },
@@ -434,7 +434,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
         export_as_JSON: function() {
             return {
                 qty: this.get_quantity(),
-                price_unit: this.get_list_price(),
+                price_unit: this.get_price(),
                 discount: this.get_discount(),
                 product_id: this.get_product().get('id'),
             };
@@ -444,7 +444,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
             return {
                 quantity:           this.get_quantity(),
                 unit_name:          this.get_unit().name,
-                list_price:         this.get_list_price(),
+                price:              this.get_price(),
                 discount:           this.get_discount(),
                 product_name:       this.get_product().get('name'),
                 price_with_tax :    this.get_price_with_tax(),
@@ -589,7 +589,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 line.set_quantity(options.quantity);
             }
             if(options.price !== undefined){
-                line.set_list_price(options.price);
+                line.set_price(options.price);
             }
 
             var last_orderline = this.getLastOrderline();
@@ -625,7 +625,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
         },
         getDiscountTotal: function() {
             return (this.get('orderLines')).reduce((function(sum, orderLine) {
-                return sum + (orderLine.get_list_price() * (orderLine.get_discount()/100) * orderLine.get_quantity());
+                return sum + (orderLine.get_price() * (orderLine.get_discount()/100) * orderLine.get_quantity());
             }), 0);
         },
         getTotalTaxExcluded: function() {
diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index 87c541aea81..dd7f55efc37 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -535,7 +535,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         },
         get_product_price: function(){
             var product = this.get_product();
-            return (product ? product.get('list_price') : 0) || 0;
+            return (product ? product.get('price') : 0) || 0;
         },
         get_product_weight: function(){
             return this.weight || 0;
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index 0d7a6cacff2..135c00f198d 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -184,8 +184,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                     order.getSelectedLine().set_quantity(val);
                 }else if( mode === 'discount'){
                     order.getSelectedLine().set_discount(val);
-                }else if( mode === 'list_price'){
-                    order.getSelectedLine().set_list_price(val);
+                }else if( mode === 'price'){
+                    order.getSelectedLine().set_price(val);
                 }
         	} else {
         	    this.pos.get('selectedOrder').destroy();
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 85397c4686a..33935b85d12 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -85,7 +85,7 @@
             <button class="input-button number-char">7</button>
             <button class="input-button number-char">8</button>
             <button class="input-button number-char">9</button>
-            <button class="mode-button" data-mode='list_price'>Price</button>
+            <button class="mode-button" data-mode='price'>Price</button>
             <br />
             <button class="input-button" id="numpad-minus" >+/-</button>
             <button class="input-button number-char">0</button>
@@ -387,12 +387,12 @@
                     <img src='' /> <!-- the product thumbnail -->
                     <t t-if="!widget.model.get('to_weight')">
                         <span class="price-tag">
-                            <t t-esc="widget.format_currency(widget.model.get('list_price'))"/>
+                            <t t-esc="widget.format_currency(widget.model.get('price'))"/>
                         </span>
                     </t>
                     <t t-if="widget.model.get('to_weight')">
                         <span class="price-tag">
-                            <t t-esc="widget.format_currency(widget.model.get('list_price'))+'/Kg'"/>
+                            <t t-esc="widget.format_currency(widget.model.get('price'))+'/Kg'"/>
                         </span>
                     </t>
                 </div>
@@ -510,7 +510,7 @@
                         </em>
                         <t t-esc="widget.model.get_unit().name" />
                         at
-                        <t t-esc="widget.format_currency(widget.model.get_list_price())" />
+                        <t t-esc="widget.format_currency(widget.model.get_price())" />
                         /
                         <t t-esc="widget.model.get_unit().name" />
                     </li>
@@ -584,7 +584,7 @@
                         <t t-esc="order.get_quantity().toFixed(0)"/>
                     </td>
                     <td class="pos-right-align">
-                        <t t-esc="widget.format_currency(order.get_list_price() * (1 - order.get_discount()/100) * order.get_quantity().toFixed(2))"/>
+                        <t t-esc="widget.format_currency(order.get_price() * (1 - order.get_discount()/100) * order.get_quantity().toFixed(2))"/>
                     </td>
                 </tr>
             </table>
diff --git a/addons/portal_claim/i18n/zh_CN.po b/addons/portal_claim/i18n/zh_CN.po
new file mode 100644
index 00000000000..f313dde96d1
--- /dev/null
+++ b/addons/portal_claim/i18n/zh_CN.po
@@ -0,0 +1,42 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-11-27 02:00+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: portal_claim
+#: model:ir.actions.act_window,help:portal_claim.crm_case_categ_claim0
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to register a new claim. \n"
+"              </p><p>\n"
+"                You can track your claims from this menu and the action we\n"
+"                will take.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击 登记一个新的索赔。 \n"
+"              </p><p>\n"
+"                从这个菜单，你能跟踪你的索赔和我们需要采取的行动。\n"
+"              </p>\n"
+"            "
+
+#. module: portal_claim
+#: model:ir.actions.act_window,name:portal_claim.crm_case_categ_claim0
+#: model:ir.ui.menu,name:portal_claim.portal_after_sales_claims
+msgid "Claims"
+msgstr "索赔"
diff --git a/addons/portal_project/i18n/es.po b/addons/portal_project/i18n/es.po
new file mode 100644
index 00000000000..b27a53a0700
--- /dev/null
+++ b/addons/portal_project/i18n/es.po
@@ -0,0 +1,23 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-11-26 22:11+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: portal_project
+#: model:ir.ui.menu,name:portal_project.portal_services_tasks
+msgid "Tasks"
+msgstr "Tareas"
diff --git a/addons/portal_project/i18n/sv.po b/addons/portal_project/i18n/sv.po
new file mode 100644
index 00000000000..e0c00f8bdc4
--- /dev/null
+++ b/addons/portal_project/i18n/sv.po
@@ -0,0 +1,23 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-11-26 22:11+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: portal_project
+#: model:ir.ui.menu,name:portal_project.portal_services_tasks
+msgid "Tasks"
+msgstr ""
diff --git a/addons/portal_sale/i18n/es.po b/addons/portal_sale/i18n/es.po
new file mode 100644
index 00000000000..0af1ca7d47c
--- /dev/null
+++ b/addons/portal_sale/i18n/es.po
@@ -0,0 +1,432 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"PO-Revision-Date: 2012-11-26 22:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: portal_sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.product_normal_action
+msgid "There are no public products."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_picking_tree
+msgid "You don't have any delivery order."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: portal_sale
+#: model:res.groups,name:portal_sale.group_payment_options
+msgid "View Online Payment Options"
+msgstr ""
+
+#. module: portal_sale
+#: field:account.config.settings,group_payment_options:0
+msgid "Show payment buttons to employees too"
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,subject:portal_sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"\n"
+"    <%\n"
+"    action = 'portal_sale.portal_action_invoices'\n"
+"    object.partner_id.signup_prepare()\n"
+"    signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+"    %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    You can access the invoice document and pay online via our Customer "
+"Portal:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
+"    % endif\n"
+"    \n"
+"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+"    <% \n"
+"    comp_name = quote(object.company_id.name)\n"
+"    inv_number = quote(object.number)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    inv_amount = quote(str(object.residual))\n"
+"    cur_name = quote(object.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
+"\" \\\n"
+"                 "
+"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
+"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
+"                 "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: portal_sale
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid ""
+"Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers "
+"who are accessing\n"
+"their documents through the portal."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,report_name:portal_sale.email_template_edi_invoice
+msgid ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "You don't have any sale order."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,subject:portal_sale.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.product_normal_action
+#: model:ir.ui.menu,name:portal_sale.portal_products
+msgid "Products"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.portal_action_invoices
+msgid "You don't have any invoice."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_quotations_portal
+#: model:ir.ui.menu,name:portal_sale.portal_quotations
+msgid "Quotations"
+msgstr ""
+
+#. module: portal_sale
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: portal_sale
+#: field:account.invoice,portal_payment_options:0
+#: field:sale.order,portal_payment_options:0
+msgid "Portal Payment Options"
+msgstr ""
+
+#. module: portal_sale
+#: help:account.config.settings,group_payment_options:0
+msgid ""
+"Show online payment options on Sale Orders and Customer Invoices to "
+"employees. If not checked, these options are only visible to portal users."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_quotations_portal
+msgid "You don't have any quotation."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.portal_action_invoices
+#: model:ir.ui.menu,name:portal_sale.portal_invoices
+msgid "Invoices"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.portal_action_vouchers
+#: model:ir.ui.menu,name:portal_sale.portal_payments
+msgid "Refunds/Payments"
+msgstr ""
+
+#. module: portal_sale
+#: view:account.config.settings:0
+msgid "Configure payment acquiring methods"
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <%\n"
+"    action = 'portal_sale.action_quotations_portal' if object.state in "
+"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
+"    object.partner_id.signup_prepare()\n"
+"    signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+"    %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    You can access this document and pay online via our Customer Portal:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
+"    % endif\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state != 'draft':\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.residual))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.portal_action_vouchers
+msgid "You don't have any refunds or payments."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_orders_portal
+#: model:ir.ui.menu,name:portal_sale.portal_sales_orders
+msgid "Sale Orders"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_picking_tree
+#: model:ir.ui.menu,name:portal_sale.portal_delivery
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: portal_sale
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
diff --git a/addons/portal_sale/i18n/fi.po b/addons/portal_sale/i18n/fi.po
new file mode 100644
index 00000000000..80468bccfb1
--- /dev/null
+++ b/addons/portal_sale/i18n/fi.po
@@ -0,0 +1,432 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"PO-Revision-Date: 2012-11-26 22:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: portal_sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.product_normal_action
+msgid "There are no public products."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_picking_tree
+msgid "You don't have any delivery order."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: portal_sale
+#: model:res.groups,name:portal_sale.group_payment_options
+msgid "View Online Payment Options"
+msgstr ""
+
+#. module: portal_sale
+#: field:account.config.settings,group_payment_options:0
+msgid "Show payment buttons to employees too"
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,subject:portal_sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"\n"
+"    <%\n"
+"    action = 'portal_sale.portal_action_invoices'\n"
+"    object.partner_id.signup_prepare()\n"
+"    signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+"    %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    You can access the invoice document and pay online via our Customer "
+"Portal:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
+"    % endif\n"
+"    \n"
+"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+"    <% \n"
+"    comp_name = quote(object.company_id.name)\n"
+"    inv_number = quote(object.number)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    inv_amount = quote(str(object.residual))\n"
+"    cur_name = quote(object.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
+"\" \\\n"
+"                 "
+"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
+"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
+"                 "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: portal_sale
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid ""
+"Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers "
+"who are accessing\n"
+"their documents through the portal."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,report_name:portal_sale.email_template_edi_invoice
+msgid ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "You don't have any sale order."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,subject:portal_sale.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.product_normal_action
+#: model:ir.ui.menu,name:portal_sale.portal_products
+msgid "Products"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.portal_action_invoices
+msgid "You don't have any invoice."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_quotations_portal
+#: model:ir.ui.menu,name:portal_sale.portal_quotations
+msgid "Quotations"
+msgstr ""
+
+#. module: portal_sale
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: portal_sale
+#: field:account.invoice,portal_payment_options:0
+#: field:sale.order,portal_payment_options:0
+msgid "Portal Payment Options"
+msgstr ""
+
+#. module: portal_sale
+#: help:account.config.settings,group_payment_options:0
+msgid ""
+"Show online payment options on Sale Orders and Customer Invoices to "
+"employees. If not checked, these options are only visible to portal users."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_quotations_portal
+msgid "You don't have any quotation."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.portal_action_invoices
+#: model:ir.ui.menu,name:portal_sale.portal_invoices
+msgid "Invoices"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.portal_action_vouchers
+#: model:ir.ui.menu,name:portal_sale.portal_payments
+msgid "Refunds/Payments"
+msgstr ""
+
+#. module: portal_sale
+#: view:account.config.settings:0
+msgid "Configure payment acquiring methods"
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <%\n"
+"    action = 'portal_sale.action_quotations_portal' if object.state in "
+"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
+"    object.partner_id.signup_prepare()\n"
+"    signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+"    %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    You can access this document and pay online via our Customer Portal:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
+"    % endif\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state != 'draft':\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.residual))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.portal_action_vouchers
+msgid "You don't have any refunds or payments."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_orders_portal
+#: model:ir.ui.menu,name:portal_sale.portal_sales_orders
+msgid "Sale Orders"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_picking_tree
+#: model:ir.ui.menu,name:portal_sale.portal_delivery
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: portal_sale
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
diff --git a/addons/portal_sale/i18n/pl.po b/addons/portal_sale/i18n/pl.po
new file mode 100644
index 00000000000..a8fb5ab9036
--- /dev/null
+++ b/addons/portal_sale/i18n/pl.po
@@ -0,0 +1,432 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"PO-Revision-Date: 2012-11-26 22:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish <pl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: portal_sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.product_normal_action
+msgid "There are no public products."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_picking_tree
+msgid "You don't have any delivery order."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: portal_sale
+#: model:res.groups,name:portal_sale.group_payment_options
+msgid "View Online Payment Options"
+msgstr ""
+
+#. module: portal_sale
+#: field:account.config.settings,group_payment_options:0
+msgid "Show payment buttons to employees too"
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,subject:portal_sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"\n"
+"    <%\n"
+"    action = 'portal_sale.portal_action_invoices'\n"
+"    object.partner_id.signup_prepare()\n"
+"    signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+"    %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    You can access the invoice document and pay online via our Customer "
+"Portal:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
+"    % endif\n"
+"    \n"
+"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+"    <% \n"
+"    comp_name = quote(object.company_id.name)\n"
+"    inv_number = quote(object.number)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    inv_amount = quote(str(object.residual))\n"
+"    cur_name = quote(object.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
+"\" \\\n"
+"                 "
+"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
+"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
+"                 "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: portal_sale
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid ""
+"Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers "
+"who are accessing\n"
+"their documents through the portal."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,report_name:portal_sale.email_template_edi_invoice
+msgid ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "You don't have any sale order."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,subject:portal_sale.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.product_normal_action
+#: model:ir.ui.menu,name:portal_sale.portal_products
+msgid "Products"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.portal_action_invoices
+msgid "You don't have any invoice."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_quotations_portal
+#: model:ir.ui.menu,name:portal_sale.portal_quotations
+msgid "Quotations"
+msgstr ""
+
+#. module: portal_sale
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: portal_sale
+#: field:account.invoice,portal_payment_options:0
+#: field:sale.order,portal_payment_options:0
+msgid "Portal Payment Options"
+msgstr ""
+
+#. module: portal_sale
+#: help:account.config.settings,group_payment_options:0
+msgid ""
+"Show online payment options on Sale Orders and Customer Invoices to "
+"employees. If not checked, these options are only visible to portal users."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_quotations_portal
+msgid "You don't have any quotation."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.portal_action_invoices
+#: model:ir.ui.menu,name:portal_sale.portal_invoices
+msgid "Invoices"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.portal_action_vouchers
+#: model:ir.ui.menu,name:portal_sale.portal_payments
+msgid "Refunds/Payments"
+msgstr ""
+
+#. module: portal_sale
+#: view:account.config.settings:0
+msgid "Configure payment acquiring methods"
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <%\n"
+"    action = 'portal_sale.action_quotations_portal' if object.state in "
+"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
+"    object.partner_id.signup_prepare()\n"
+"    signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+"    %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    You can access this document and pay online via our Customer Portal:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
+"    % endif\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state != 'draft':\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.residual))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.portal_action_vouchers
+msgid "You don't have any refunds or payments."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_orders_portal
+#: model:ir.ui.menu,name:portal_sale.portal_sales_orders
+msgid "Sale Orders"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_picking_tree
+#: model:ir.ui.menu,name:portal_sale.portal_delivery
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: portal_sale
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
diff --git a/addons/portal_sale/i18n/sv.po b/addons/portal_sale/i18n/sv.po
new file mode 100644
index 00000000000..fbd6142b1be
--- /dev/null
+++ b/addons/portal_sale/i18n/sv.po
@@ -0,0 +1,432 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"PO-Revision-Date: 2012-11-26 22:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: portal_sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.product_normal_action
+msgid "There are no public products."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_picking_tree
+msgid "You don't have any delivery order."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: portal_sale
+#: model:res.groups,name:portal_sale.group_payment_options
+msgid "View Online Payment Options"
+msgstr ""
+
+#. module: portal_sale
+#: field:account.config.settings,group_payment_options:0
+msgid "Show payment buttons to employees too"
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,subject:portal_sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"\n"
+"    <%\n"
+"    action = 'portal_sale.portal_action_invoices'\n"
+"    object.partner_id.signup_prepare()\n"
+"    signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+"    %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    You can access the invoice document and pay online via our Customer "
+"Portal:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
+"    % endif\n"
+"    \n"
+"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+"    <% \n"
+"    comp_name = quote(object.company_id.name)\n"
+"    inv_number = quote(object.number)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    inv_amount = quote(str(object.residual))\n"
+"    cur_name = quote(object.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
+"\" \\\n"
+"                 "
+"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
+"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
+"                 "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: portal_sale
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid ""
+"Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers "
+"who are accessing\n"
+"their documents through the portal."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,report_name:portal_sale.email_template_edi_invoice
+msgid ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "You don't have any sale order."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,subject:portal_sale.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.product_normal_action
+#: model:ir.ui.menu,name:portal_sale.portal_products
+msgid "Products"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.portal_action_invoices
+msgid "You don't have any invoice."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_quotations_portal
+#: model:ir.ui.menu,name:portal_sale.portal_quotations
+msgid "Quotations"
+msgstr ""
+
+#. module: portal_sale
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: portal_sale
+#: field:account.invoice,portal_payment_options:0
+#: field:sale.order,portal_payment_options:0
+msgid "Portal Payment Options"
+msgstr ""
+
+#. module: portal_sale
+#: help:account.config.settings,group_payment_options:0
+msgid ""
+"Show online payment options on Sale Orders and Customer Invoices to "
+"employees. If not checked, these options are only visible to portal users."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_quotations_portal
+msgid "You don't have any quotation."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.portal_action_invoices
+#: model:ir.ui.menu,name:portal_sale.portal_invoices
+msgid "Invoices"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.portal_action_vouchers
+#: model:ir.ui.menu,name:portal_sale.portal_payments
+msgid "Refunds/Payments"
+msgstr ""
+
+#. module: portal_sale
+#: view:account.config.settings:0
+msgid "Configure payment acquiring methods"
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <%\n"
+"    action = 'portal_sale.action_quotations_portal' if object.state in "
+"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
+"    object.partner_id.signup_prepare()\n"
+"    signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+"    %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    You can access this document and pay online via our Customer Portal:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
+"    % endif\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state != 'draft':\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.residual))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.portal_action_vouchers
+msgid "You don't have any refunds or payments."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_orders_portal
+#: model:ir.ui.menu,name:portal_sale.portal_sales_orders
+msgid "Sale Orders"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_picking_tree
+#: model:ir.ui.menu,name:portal_sale.portal_delivery
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: portal_sale
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
diff --git a/addons/procurement/i18n/fr.po b/addons/procurement/i18n/fr.po
index 1a3ad053f64..8d98151863a 100644
--- a/addons/procurement/i18n/fr.po
+++ b/addons/procurement/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2011-01-14 01:05+0000\n"
-"Last-Translator: Quentin THEURET <Unknown>\n"
+"PO-Revision-Date: 2012-11-26 13:32+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
@@ -33,10 +33,10 @@ msgid ""
 "under 0. You should probably not use this option, we suggest using a MTO "
 "configuration on products."
 msgstr ""
-"Déclenche un approvisionnement automatique pour tous les produits qui ont un "
+"Déclenche un approvisionnement automatique pour tous les articles qui ont un "
 "stock virtuel inférieur à 0. Vous ne devriez normalement pas utiliser cette "
 "option, nous vous suggérons d'utiliser une configuration de type "
-"\"Production sur commande\" sur les produits."
+"\"Production sur commande\" sur les articles."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -47,13 +47,13 @@ msgstr "Grouper par..."
 #: help:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Draft procurement of the product and location of that orderpoint"
 msgstr ""
-"Brouillon d'approvisionnement du produit et localisation de son origine"
+"Brouillon d'approvisionnement de l'article et localisation de son origine"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:290
 #, python-format
 msgid "No supplier defined for this product !"
-msgstr "Aucun fournisseur défini pour ce produit !"
+msgstr "Aucun fournisseur défini pour cet article !"
 
 #. module: procurement
 #: view:product.product:0
@@ -158,7 +158,7 @@ msgstr ""
 "Vous pouvez définir vos règles de stock minimal, pour qu'OpenERP puisse "
 "créer automatiquement les brouillons d'ordres de fabrication ou les demandes "
 "de devis, selon le niveau de stock. Une fois que le niveau de stock virtuel "
-"d'un produit (= stock disponible moins toutes les commandes confirmées et "
+"d'un article (= stock disponible moins toutes les commandes confirmées et "
 "les allocations) est en-dessous de la quantité minimale, OpenERP va générer "
 "une demande d'approvisionnement pour augmenter le stock jusqu'à la quantité "
 "maximale."
@@ -178,7 +178,7 @@ msgstr ""
 #. module: procurement
 #: view:product.product:0
 msgid "Products"
-msgstr ""
+msgstr "Articles"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -379,7 +379,7 @@ msgstr "Plage de planification (en jours)"
 #. module: procurement
 #: view:make.procurement:0
 msgid "Ask New Products"
-msgstr "Demander de Nouveaux Produits"
+msgstr "Demander de nouveaux articles"
 
 #. module: procurement
 #: field:make.procurement,date_planned:0
@@ -441,6 +441,23 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour créer un ordre d'approvisionnement.\n"
+"              </p><p>\n"
+"                Un ordre d'approvisionnement permet d'enregistrer le besoin "
+"d'un article\n"
+"                précis à un emplacement précis. Les ordres "
+"d'approvisionnements sont généralement\n"
+"                créés automatiquement depuis les ventes, les règles de flux "
+"tirés ou\n"
+"                les règles de stock minimum.\n"
+"              </p><p>\n"
+"                Lorsqu'un ordre d'approvisionnement est confirmé, il crée\n"
+"                automatiquement les opérations nécessaire pour répondre au "
+"besoin : proposition\n"
+"                de commande d'achat, ordre de fabrication, etc.\n"
+"              </p>\n"
+"            "
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,qty_multiple:0
@@ -568,14 +585,14 @@ msgstr ""
 #: help:procurement.orderpoint.compute,automatic:0
 msgid "If the stock of a product is under 0, it will act like an orderpoint"
 msgstr ""
-"Si le stock d'un produit est négatif, cela sera considéré comme un point de "
+"Si le stock d'un article est négatif, cela sera considéré comme un point de "
 "commande"
 
 #. module: procurement
 #: field:procurement.order,product_uom:0
 #: field:stock.warehouse.orderpoint,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Unité de mesure d'article"
 
 #. module: procurement
 #: constraint:stock.warehouse.orderpoint:0
@@ -684,7 +701,7 @@ msgstr "Actif"
 #. module: procurement
 #: model:process.node,name:procurement.process_node_procureproducts0
 msgid "Procure Products"
-msgstr "Approvisionner les produits"
+msgstr "Approvisionner les articles"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:336
@@ -703,7 +720,7 @@ msgstr ""
 #. module: procurement
 #: constraint:stock.move:0
 msgid "You must assign a serial number for this product."
-msgstr ""
+msgstr "Vous devez attribuer un numéro de série pour cet article."
 
 #. module: procurement
 #: field:procurement.order,date_planned:0
@@ -767,7 +784,7 @@ msgstr "Nom de l'approvisionnement."
 #: code:addons/procurement/procurement.py:297
 #, python-format
 msgid "No default supplier defined for this product"
-msgstr "Pas de fournisseur par défaut défini pour ce produit"
+msgstr "Pas de fournisseur par défaut défini pour cet article"
 
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
@@ -941,12 +958,12 @@ msgstr "Date planifiée"
 #: field:procurement.order,product_id:0
 #: field:stock.warehouse.orderpoint,product_id:0
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: procurement
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product."
-msgstr ""
+msgstr "Vous tentez d'assigner un lot qui n'appartient pas au même article."
 
 #. module: procurement
 #: view:procurement.order:0
@@ -1001,7 +1018,7 @@ msgstr "Réservation"
 #. module: procurement
 #: model:process.node,note:procurement.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
-msgstr "Le moyen d’approvisionnement dépend du type de produit"
+msgstr "Le moyen d’approvisionnement dépend du type de produit."
 
 #. module: procurement
 #: view:product.product:0
@@ -1047,7 +1064,7 @@ msgstr ""
 #. module: procurement
 #: field:procurement.order,product_uos:0
 msgid "Product UoS"
-msgstr "UdV du produit"
+msgstr "UdV de l'article"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_product_template
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index a1a034d636e..f3f1876a431 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-05-10 18:23+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-26 14:06+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:04+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #~ msgid "Second UoM"
 #~ msgstr "UdM secondaire"
@@ -74,7 +74,7 @@ msgstr "Entrant"
 #. module: product
 #: view:product.product:0
 msgid "Product Name"
-msgstr ""
+msgstr "Nom de l'article"
 
 #. module: product
 #: view:product.template:0
@@ -152,8 +152,8 @@ msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
-"La conversion d'unité de mesure (UdM) du produit %s en UdM %s  par défaut "
-"n'est pas possible car elles appartiennent à deux catégories différentes !"
+"La conversion d'unité de mesure (UdM) de l'article %s dans l'UdM par défaut "
+"%s n'est pas possible car elles appartiennent à deux catégories différentes !"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_dozen
@@ -192,10 +192,10 @@ msgid ""
 "and the reception of goods for this product and for the default supplier. It "
 "is used by the scheduler to order requests based on reordering delays."
 msgstr ""
-"C'est le temps moyen entre la confirmation de la commande du client et la "
-"réception des marchandises pour ce produit et pour le fournisseur par "
-"défaut. C'est utilisé par le planificateur pour ordonner les requètes sur "
-"base des délais de réordonnement."
+"C'est le temps moyen entre la confirmation de la commande d'achat et la "
+"réception des marchandises pour cet article et pour le fournisseur par "
+"défaut. Le planificateur utilise cette information pour choisir l'ordre des "
+"requêtes."
 
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
@@ -217,13 +217,13 @@ msgstr "Liste de prix de vente"
 #: view:product.template:0
 #: field:product.template,type:0
 msgid "Product Type"
-msgstr "Type de produit"
+msgstr "Type d'article"
 
 #. module: product
 #: code:addons/product/product.py:410
 #, python-format
 msgid "Products: "
-msgstr "Produits: "
+msgstr "Articles : "
 
 #. module: product
 #: constraint:decimal.precision:0
@@ -245,7 +245,7 @@ msgstr ""
 #. module: product
 #: model:product.category,name:product.product_category_all
 msgid "All products"
-msgstr "Tous les produits"
+msgstr "Tous les articles"
 
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
@@ -300,6 +300,8 @@ msgstr "Colisage"
 msgid ""
 "If unchecked, it will allow you to hide the product without removing it."
 msgstr ""
+"En décochant cette case, il est possible de masquer l'article sans le "
+"supprimer."
 
 #. module: product
 #: view:product.product:0
@@ -348,7 +350,7 @@ msgstr "État"
 #. module: product
 #: help:product.template,categ_id:0
 msgid "Select category for the current product"
-msgstr "Sélectionnez la catégorie du produit actuel"
+msgstr "Sélectionnez la catégorie de l'article actuel"
 
 #. module: product
 #: field:product.product,outgoing_qty:0
@@ -389,7 +391,7 @@ msgstr ""
 #. module: product
 #: field:product.template,product_manager:0
 msgid "Product Manager"
-msgstr "Responsable produit"
+msgstr "Responsable article"
 
 #. module: product
 #: model:product.template,name:product.product_product_7_product_template
@@ -399,12 +401,12 @@ msgstr ""
 #. module: product
 #: field:product.supplierinfo,product_name:0
 msgid "Supplier Product Name"
-msgstr "Nom du produit chez le fournisseur"
+msgstr "Nom de l'article chez le fournisseur"
 
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price Search"
-msgstr "Chercher des prix de produits"
+msgstr "Recherche de prix d'articles"
 
 #. module: product
 #: view:product.template:0
@@ -437,7 +439,7 @@ msgstr "Quantité"
 #: view:product.price_list:0
 msgid "Calculate Product Price per Unit Based on Pricelist Version."
 msgstr ""
-"Calculer le prix du produit par unité selon cette version de liste de prix"
+"Calculer le prix de l'article par unité selon cette version de liste de prix"
 
 #. module: product
 #: help:product.pricelist.item,product_id:0
@@ -567,7 +569,7 @@ msgstr ""
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
 msgid "Product uom categ"
-msgstr "Catégorie d'UdM du produit"
+msgstr "Catégorie d'UdM d'article"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_box
@@ -607,8 +609,8 @@ msgid ""
 "1 or several supplier(s) can be linked to a product. All information stands "
 "in the product form."
 msgstr ""
-"Un ou plusieurs fournisseurs peuvent être associés à un produit. Toutes les "
-"informations figurent dans le formulaire du produit."
+"Un ou plusieurs fournisseurs peuvent être associés à un article. Toutes les "
+"informations figurent dans le formulaire de l'article."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -634,7 +636,7 @@ msgstr "Vue"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_template_action_tree
 msgid "Product Templates"
-msgstr "Modèles des produits"
+msgstr "Modèles d'articles"
 
 #. module: product
 #: field:product.category,parent_left:0
@@ -697,7 +699,7 @@ msgstr "Prix de base"
 #. module: product
 #: help:product.supplierinfo,name:0
 msgid "Supplier of this product"
-msgstr "Fournisseur de ce produit"
+msgstr "Fournisseur de cet article"
 
 #. module: product
 #: help:product.pricelist.version,active:0
@@ -800,7 +802,7 @@ msgstr "Accessoires"
 #. module: product
 #: model:process.transition,name:product.process_transition_supplierofproduct0
 msgid "Supplier of the product"
-msgstr "Fournisseur du produit"
+msgstr "Fournisseur de l'article"
 
 #. module: product
 #: model:product.template,name:product.product_product_28_product_template
@@ -929,7 +931,7 @@ msgstr ""
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
 #: view:product.category:0
 msgid "Product Categories"
-msgstr "Catégories de produits"
+msgstr "Catégories d'articles"
 
 #. module: product
 #: sql_constraint:res.currency:0
@@ -964,7 +966,7 @@ msgstr "Le code de l'unité de transport"
 #. module: product
 #: view:product.price.type:0
 msgid "Products Price Type"
-msgstr "Type de prix produit"
+msgstr "Type de prix d'article"
 
 #. module: product
 #: field:product.product,message_is_follower:0
@@ -979,7 +981,7 @@ msgstr "Supplément prix de la variante"
 #. module: product
 #: model:ir.model,name:product.model_product_supplierinfo
 msgid "Information about a product supplier"
-msgstr "Information sur le fournisseur du produit"
+msgstr "Information sur le fournisseur de l'article"
 
 #. module: product
 #: help:product.uom,factor_inv:0
@@ -1021,7 +1023,7 @@ msgid ""
 "automatic computation of the purchase order planning."
 msgstr ""
 "Délai (en jours) entre la confirmation du bon de commande et la réception "
-"des produits dans votre entrepôt. Sert au planificateur à calculer le "
+"des articles dans votre entrepôt. Sert au planificateur à calculer le "
 "planning des achats automatiquement."
 
 #. module: product
@@ -1036,7 +1038,7 @@ msgstr ""
 #. module: product
 #: selection:product.template,type:0
 msgid "Stockable Product"
-msgstr "Produit stockable"
+msgstr "Article stockable"
 
 #. module: product
 #: field:product.packaging,code:0
@@ -1202,7 +1204,7 @@ msgstr ""
 #: help:product.category,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of product categories."
-msgstr "Donne l'ordre d'affichage d'une liste de catégories de produit."
+msgstr "Donne l'ordre d'affichage d'une liste de catégories d'articles."
 
 #. module: product
 #: field:product.uom,factor:0
@@ -1218,7 +1220,7 @@ msgstr "Largeur"
 #. module: product
 #: help:product.price.type,field:0
 msgid "Associated field in the product form."
-msgstr "Champs associé dans le formulaire du produit"
+msgstr "Champ associé dans le formulaire de l'article"
 
 #. module: product
 #: view:product.product:0
@@ -1236,7 +1238,7 @@ msgstr "Date d'édition"
 #. module: product
 #: field:product.template,uos_id:0
 msgid "Unit of Sale"
-msgstr "Unité secondaire"
+msgstr "Unité de vente"
 
 #. module: product
 #: field:product.product,message_unread:0
@@ -1299,7 +1301,7 @@ msgstr ""
 #: model:ir.ui.menu,name:product.prod_config_main
 #: view:product.product:0
 msgid "Products"
-msgstr "Produits"
+msgstr "Articles"
 
 #. module: product
 #: model:product.template,description:product.product_product_32_product_template
@@ -1387,7 +1389,7 @@ msgid ""
 "This supplier's product code will be used when printing a request for "
 "quotation. Keep empty to use the internal one."
 msgstr ""
-"Le code du produit chez le fournisseur sera utilisé lors de l'édition d'un "
+"Le code de l'article chez le fournisseur sera utilisé lors de l'édition d'un "
 "appel d'offre. Laissez le champ vide si vous voulez utiliser le code interne."
 
 #. module: product
@@ -1506,7 +1508,7 @@ msgstr "cm"
 #. module: product
 #: model:ir.model,name:product.model_product_uom
 msgid "Product Unit of Measure"
-msgstr "Unité de mesure du produit"
+msgstr "Unité de mesure d'article"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_pricelist_action
@@ -1619,7 +1621,7 @@ msgstr "Le code EAN de l'unité du colis"
 #. module: product
 #: help:product.supplierinfo,product_uom:0
 msgid "This comes from the product form."
-msgstr "A pour origine le formulaire du produit"
+msgstr "A pour origine le formulaire de l'article"
 
 #. module: product
 #: field:product.packaging,weight_ul:0
@@ -1634,7 +1636,7 @@ msgstr ""
 #. module: product
 #: field:product.price.type,field:0
 msgid "Product Field"
-msgstr "Champ produit"
+msgstr "Champ article"
 
 #. module: product
 #: model:product.template,description:product.product_product_5_product_template
@@ -1693,7 +1695,7 @@ msgstr "Liste de prix publique"
 #. module: product
 #: field:product.supplierinfo,product_code:0
 msgid "Supplier Product Code"
-msgstr "Code du produit chez le fournisseur"
+msgstr "Code de l'article chez le fournisseur"
 
 #. module: product
 #: help:product.pricelist,active:0
@@ -1721,7 +1723,7 @@ msgstr "Colis par couche"
 #: field:product.supplierinfo,product_id:0
 #: model:res.request.link,name:product.req_link_product
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: product
 #: view:product.product:0
@@ -1737,7 +1739,7 @@ msgstr "Poids brut"
 #: help:product.packaging,qty:0
 msgid "The total number of products you can put by pallet or box."
 msgstr ""
-"Le nombre total de produits que vous pouvez mettre dans une palette ou dans "
+"Le nombre total d'articles que vous pouvez mettre dans une palette ou dans "
 "une boite."
 
 #. module: product
@@ -1749,7 +1751,7 @@ msgstr "Variantes"
 #: model:ir.actions.act_window,name:product.product_category_action
 #: model:ir.ui.menu,name:product.menu_products_category
 msgid "Products by Category"
-msgstr "Produits par catégorie"
+msgstr "Articles par catégorie"
 
 #. module: product
 #: model:product.template,name:product.product_product_16_product_template
@@ -1764,7 +1766,7 @@ msgstr ""
 #. module: product
 #: help:product.supplierinfo,sequence:0
 msgid "Assigns the priority to the list of product supplier."
-msgstr "Affecte la priorité du fournisseur du produit dans la liste."
+msgstr "Affecte la priorité du fournisseur de l'article dans la liste."
 
 #. module: product
 #: constraint:product.pricelist.item:0
@@ -1791,7 +1793,7 @@ msgstr "Méthode d'arrondi"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_label
 msgid "Products Labels"
-msgstr "Étiquettes de produits"
+msgstr "Étiquettes d'articles"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_big_box
@@ -1845,7 +1847,7 @@ msgstr "La taille du colis"
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price List"
-msgstr "Listes de prix"
+msgstr "Listes de prix d'articles"
 
 #. module: product
 #: field:product.pricelist,company_id:0
@@ -1871,7 +1873,7 @@ msgstr "Unité de mesure par défaut"
 #: code:addons/product/pricelist.py:375
 #, python-format
 msgid "Partner section of the product form"
-msgstr "Section partenaire dans le formulaire produit"
+msgstr "Section partenaire dans le formulaire article"
 
 #. module: product
 #: help:product.price.type,name:0
@@ -1881,12 +1883,12 @@ msgstr "Nom de ce type de prix"
 #. module: product
 #: model:product.category,name:product.product_category_3
 msgid "Other Products"
-msgstr "Autres produits"
+msgstr "Autres articles"
 
 #. module: product
 #: model:product.template,description:product.product_product_9_product_template
 msgid "This product is configured with example of push/pull flows"
-msgstr "Ce produit est paramétré avec un exemple de flux tiré / flux poussé"
+msgstr "Cet article est paramétré avec un exemple de flux tiré / flux poussé"
 
 #. module: product
 #: field:product.product,message_ids:0
@@ -2235,8 +2237,9 @@ msgid ""
 "This supplier's product name will be used when printing a request for "
 "quotation. Keep empty to use the internal one."
 msgstr ""
-"Le nom du produit chez le fournisseur sera utilisé lors de l'impression d'un "
-"appel d'offre. Laissez le champ vide si vous voulez utiliser le nom interne."
+"Le nom de l'article chez le fournisseur sera utilisé lors de l'impression "
+"d'un appel d'offre. Laissez le champ vide si vous voulez utiliser le nom "
+"interne."
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_pricelist_action_for_purchase
@@ -2367,7 +2370,7 @@ msgstr "Type de catégorie"
 #. module: product
 #: model:process.node,note:product.process_node_product0
 msgid "Creation of the product"
-msgstr "Création du produit"
+msgstr "Création de l'article"
 
 #. module: product
 #: field:pricelist.partnerinfo,name:0
@@ -2421,7 +2424,7 @@ msgstr ""
 #: view:product.product:0
 #: model:res.groups,name:product.group_product_variant
 msgid "Product Variant"
-msgstr "Variante de produit"
+msgstr "Variante d'article"
 
 #. module: product
 #: model:product.template,name:product.product_product_6_product_template
@@ -2462,7 +2465,7 @@ msgstr ""
 #: field:product.product,product_tmpl_id:0
 #: view:product.template:0
 msgid "Product Template"
-msgstr "Modèle de produit"
+msgstr "Modèle d'article"
 
 #. module: product
 #: field:product.template,cost_method:0
@@ -2474,7 +2477,7 @@ msgstr "Méthode de coût"
 #: model:ir.model,name:product.model_product_category
 #: field:product.pricelist.item,categ_id:0
 msgid "Product Category"
-msgstr "Catégorie de produits"
+msgstr "Catégorie d'articles"
 
 #. module: product
 #: model:product.template,description:product.product_product_19_product_template
@@ -2502,7 +2505,7 @@ msgid ""
 "Gives the different ways to package the same product. This has no impact on "
 "the picking order and is mainly used if you use the EDI module."
 msgstr ""
-"Indique les différentes façons d'emballer un même produit. Ceci n'a pas "
+"Indique les différentes façons d'emballer un même article. Ceci n'a pas "
 "d'impact sur les ordres de préparation, et sert principalement si vous "
 "activez le module d'EDI."
 
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index b9872322dab..c29f198992b 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-26 03:32+0000\n"
+"PO-Revision-Date: 2012-11-27 04:56+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-26 04:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -24,7 +24,7 @@ msgstr "层数"
 #. module: product
 #: help:product.pricelist.item,base:0
 msgid "Base price for computation."
-msgstr ""
+msgstr "计算的基准价格"
 
 #. module: product
 #: help:product.product,seller_qty:0
@@ -92,12 +92,12 @@ msgstr "规则名称"
 #: help:product.template,list_price:0
 msgid ""
 "Base price to compute the customer price. Sometimes called the catalog price."
-msgstr ""
+msgstr "计算客户报价的基准价格。也叫目录价格"
 
 #. module: product
 #: model:product.template,name:product.product_product_3_product_template
 msgid "PC Assemble SC234"
-msgstr ""
+msgstr "PC 组装 SC234"
 
 #. module: product
 #: help:product.product,message_summary:0
@@ -226,7 +226,7 @@ msgstr "供应商名称,价格,产品编码,..."
 msgid ""
 "Error! You cannot define a rounding factor for the company's main currency "
 "that is smaller than the decimal precision of 'Account'."
-msgstr ""
+msgstr "错误！公司本位币的舍入系数不能定义得小于”科目“的小数位数"
 
 #. module: product
 #: help:product.product,outgoing_qty:0
@@ -241,13 +241,18 @@ msgid ""
 "Otherwise, this includes goods leaving any Stock Location with 'internal' "
 "type."
 msgstr ""
+"计划发出的产品数量。\n"
+"当与单个库位相关时，包括了在这个库位里的货物数量，以及任意的子库位。\n"
+"当与单个仓库相关时，包括存储在这个仓库的库位里的货物数量，以及任意的子库位。\n"
+"当与单个商店相关时，包括存储在这个商店所属仓库的库位里的货物数量，以及任意的子库位。\n"
+"否则，这是存储在任何“内部”类型库位的货物。"
 
 #. module: product
 #: model:product.template,description_sale:product.product_product_42_product_template
 msgid ""
 "Office Editing Software with word processing, spreadsheets, presentations, "
 "graphics, and databases..."
-msgstr ""
+msgstr "办公室编辑软件，字处理、电子表格、演示文稿、图片处理和数据库"
 
 #. module: product
 #: field:product.product,seller_id:0
@@ -268,7 +273,7 @@ msgstr "包装"
 #: help:product.product,active:0
 msgid ""
 "If unchecked, it will allow you to hide the product without removing it."
-msgstr ""
+msgstr "如果不选中，允许你隐藏这个产品而无需删除。"
 
 #. module: product
 #: view:product.product:0
@@ -280,12 +285,12 @@ msgstr "类别"
 #. module: product
 #: model:product.uom,name:product.product_uom_litre
 msgid "Litre"
-msgstr ""
+msgstr "升"
 
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
-msgstr ""
+msgstr "便携式电脑 E5023"
 
 #. module: product
 #: help:product.packaging,ul_qty:0
@@ -440,9 +445,10 @@ msgid ""
 "type."
 msgstr ""
 "预测数量（计算公式是 在手数量-发货数量+收货数量）\n"
-"当与单个库位相关时，包括了在这个库位里的货物数量，或者任意的子库位。\n"
-"当与单个仓库相关时，包括存储在这个仓库的库位里的货物数量，或者任意的子库位。\n"
-"当与单个商店相关时，包括存储在这个商店所属仓库的库位里的货物数量，或者任意的子库位。"
+"当与单个库位相关时，包括了在这个库位里的货物数量，以及任意的子库位。\n"
+"当与单个仓库相关时，包括存储在这个仓库的库位里的货物数量，以及任意的子库位。\n"
+"当与单个商店相关时，包括存储在这个商店所属仓库的库位里的货物数量，以及任意的子库位。\n"
+"否则，这是存储在任何“内部”类型库位的货物。"
 
 #. module: product
 #: field:product.packaging,height:0
@@ -466,6 +472,8 @@ msgid ""
 "Measure for this category:\n"
 "1 * (reference unit) = ratio * (this unit)"
 msgstr ""
+"本计量单位和参考计量单位相比，大或者小的倍数。\n"
+"1*（参考单位=比率*（本单位）"
 
 #. module: product
 #: model:ir.model,name:product.model_pricelist_partnerinfo
@@ -500,7 +508,7 @@ msgstr "销售&采购"
 #. module: product
 #: model:product.template,name:product.product_product_44_product_template
 msgid "GrapWorks Software"
-msgstr ""
+msgstr "GrapWorks 软件"
 
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_wtime
@@ -510,7 +518,7 @@ msgstr "工作时间"
 #. module: product
 #: model:product.template,name:product.product_product_42_product_template
 msgid "Office Suite"
-msgstr ""
+msgstr "办公套件"
 
 #. module: product
 #: field:product.template,mes_type:0
@@ -520,7 +528,7 @@ msgstr "计量类型"
 #. module: product
 #: model:product.template,name:product.product_product_32_product_template
 msgid "Headset standard"
-msgstr ""
+msgstr "标准耳机"
 
 #. module: product
 #: help:product.product,incoming_qty:0
@@ -535,13 +543,19 @@ msgid ""
 "Otherwise, this includes goods arriving to any Stock Location with "
 "'internal' type."
 msgstr ""
+"计划到达的产品数量\n"
+"\n"
+"当与单个库位相关时，包括了在这个库位里的货物数量，以及任意的子库位。\n"
+"当与单个仓库相关时，包括存储在这个仓库的库位里的货物数量，以及任意的子库位。\n"
+"当与单个商店相关时，包括存储在这个商店所属仓库的库位里的货物数量，以及任意的子库位。\n"
+"否则，这是存储在任何“内部”类型库位的货物。"
 
 #. module: product
 #: constraint:product.template:0
 msgid ""
 "Error: The default Unit of Measure and the purchase Unit of Measure must be "
 "in the same category."
-msgstr ""
+msgstr "错误：默认的计量单位和采购计量单位必须是相同的类别"
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
@@ -556,7 +570,7 @@ msgstr "箱子 20x20x40"
 #. module: product
 #: field:product.template,warranty:0
 msgid "Warranty"
-msgstr ""
+msgstr "质保"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -568,17 +582,17 @@ msgstr "价格计算"
 msgid ""
 "You provided an invalid \"EAN13 Barcode\" reference. You may use the "
 "\"Internal Reference\" field instead."
-msgstr ""
+msgstr "你提供了一个错误的  \"EAN13 条码\" 编号。你可能要用 “编号”字段替代。"
 
 #. module: product
 #: model:res.groups,name:product.group_purchase_pricelist
 msgid "Purchase Pricelists"
-msgstr ""
+msgstr "采购价格表"
 
 #. module: product
 #: model:product.template,name:product.product_product_5_product_template
 msgid "PC Assemble + Custom (PC on Demand)"
-msgstr ""
+msgstr "pc组装和定制（PC需求）"
 
 #. module: product
 #: model:process.transition,note:product.process_transition_supplierofproduct0
@@ -596,12 +610,12 @@ msgstr "包装宽度"
 #: code:addons/product/product.py:359
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
-msgstr ""
+msgstr "计量单位类别不一致"
 
 #. module: product
 #: model:product.template,name:product.product_product_36_product_template
 msgid "Blank DVD-RW"
-msgstr ""
+msgstr "空白 DVD-RW"
 
 #. module: product
 #: selection:product.category,type:0
@@ -621,19 +635,19 @@ msgstr "左父项"
 #. module: product
 #: help:product.pricelist.item,price_max_margin:0
 msgid "Specify the maximum amount of margin over the base price."
-msgstr ""
+msgstr "指定基于基准价格的最大利润"
 
 #. module: product
 #: constraint:product.pricelist.item:0
 msgid ""
 "Error! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
 "Item!"
-msgstr ""
+msgstr "错误！你不能在价格表项目里指派这个主价格表作为其它价格表"
 
 #. module: product
 #: view:product.price_list:0
 msgid "or"
-msgstr ""
+msgstr "或"
 
 #. module: product
 #: constraint:product.packaging:0
@@ -649,12 +663,12 @@ msgstr "最小数量"
 #. module: product
 #: model:product.template,name:product.product_product_12_product_template
 msgid "Mouse, Wireless"
-msgstr ""
+msgstr "无线鼠标"
 
 #. module: product
 #: model:product.template,name:product.product_product_22_product_template
 msgid "Processor Core i5 2.70 Ghz"
-msgstr ""
+msgstr "酷睿i5 处理器 2.70 Ghz"
 
 #. module: product
 #: model:ir.model,name:product.model_product_price_type
@@ -687,12 +701,12 @@ msgstr "在复制一个版本时它设为不生效. 这样旧版本日期是不
 #. module: product
 #: model:product.template,name:product.product_product_18_product_template
 msgid "HDD SH-2"
-msgstr ""
+msgstr "硬盘 SH-2"
 
 #. module: product
 #: model:product.template,name:product.product_product_17_product_template
 msgid "HDD SH-1"
-msgstr ""
+msgstr "硬盘 SH-1"
 
 #. module: product
 #: field:product.supplierinfo,name:0
@@ -706,6 +720,8 @@ msgid ""
 "period (usually every year). \n"
 "Average Price: The cost price is recomputed at each incoming shipment."
 msgstr ""
+"标准价格：这个成本价格是在会计区间结束时手动更新的 （通常是每年）\n"
+"平均价格：这个成本价是每一次入库时重新计算的"
 
 #. module: product
 #: field:product.product,qty_available:0
@@ -720,12 +736,12 @@ msgstr "价格名称"
 #. module: product
 #: help:product.product,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "如果要求你关注新消息，勾选此项"
 
 #. module: product
 #: model:product.category,name:product.product_category_1
 msgid "Saleable"
-msgstr ""
+msgstr "可销售"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.action_product_price_list
@@ -739,17 +755,17 @@ msgstr "价格表"
 #. module: product
 #: field:product.product,virtual_available:0
 msgid "Forecasted Quantity"
-msgstr ""
+msgstr "预测数量"
 
 #. module: product
 #: view:product.product:0
 msgid "Purchase"
-msgstr ""
+msgstr "采购"
 
 #. module: product
 #: model:product.template,name:product.product_product_33_product_template
 msgid "Headset USB"
-msgstr ""
+msgstr "USB 耳机"
 
 #. module: product
 #: view:product.template:0
@@ -759,7 +775,7 @@ msgstr "供应商"
 #. module: product
 #: model:res.groups,name:product.group_sale_pricelist
 msgid "Sales Pricelists"
-msgstr ""
+msgstr "销售价格表"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -779,14 +795,14 @@ msgstr "产品的供应商"
 #. module: product
 #: model:product.template,name:product.product_product_28_product_template
 msgid "External Hard disk"
-msgstr ""
+msgstr "外置硬盘"
 
 #. module: product
 #: help:product.template,standard_price:0
 msgid ""
 "Cost price of the product used for standard stock valuation in accounting "
 "and used as a base price on purchase orders."
-msgstr ""
+msgstr "产品的成本价格用来给财务进行库存核算，并用做采购订单的基准价格"
 
 #. module: product
 #: field:product.category,child_id:0
@@ -855,7 +871,7 @@ msgstr "业务伙伴"
 #. module: product
 #: model:product.template,description:product.product_product_27_product_template
 msgid "Custom Laptop based on customer's requirement."
-msgstr ""
+msgstr "基于客户要求定制便携式计算机。"
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
@@ -865,12 +881,12 @@ msgstr "价格舍入"
 #. module: product
 #: model:product.template,name:product.product_product_1_product_template
 msgid "On Site Monitoring"
-msgstr ""
+msgstr "现成监测"
 
 #. module: product
 #: view:product.template:0
 msgid "days"
-msgstr ""
+msgstr "天数"
 
 #. module: product
 #: model:process.node,name:product.process_node_supplier0
@@ -889,7 +905,7 @@ msgstr "货币"
 #. module: product
 #: model:product.template,name:product.product_product_46_product_template
 msgid "Datacard"
-msgstr ""
+msgstr "数据卡"
 
 #. module: product
 #: help:product.template,uos_coeff:0
@@ -897,6 +913,8 @@ msgid ""
 "Coefficient to convert default Unit of Measure to Unit of Sale\n"
 " uos = uom * coeff"
 msgstr ""
+"从默认计量单位转换（UoM）到销售单位（UoS）的系数。\n"
+"UoS = UoM * 系数"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
@@ -908,7 +926,7 @@ msgstr "产品类别"
 #. module: product
 #: sql_constraint:res.currency:0
 msgid "The currency code must be unique per company!"
-msgstr ""
+msgstr "每个公司的货币代码必须唯一"
 
 #. module: product
 #: view:product.template:0
@@ -918,7 +936,7 @@ msgstr "需求与货位"
 #. module: product
 #: model:product.template,name:product.product_product_20_product_template
 msgid "Motherboard I9P57"
-msgstr ""
+msgstr "主板 I9P57"
 
 #. module: product
 #: field:product.packaging,weight:0
@@ -943,7 +961,7 @@ msgstr "产品价格类型"
 #. module: product
 #: field:product.product,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "是一个关注者"
 
 #. module: product
 #: field:product.product,price_extra:0
@@ -962,6 +980,8 @@ msgid ""
 "Measure in this category:\n"
 "1 * (this unit) = ratio * (reference unit)"
 msgstr ""
+"本计量单位大于参考计量单位 的倍数。\n"
+"1*（本单位）=比率*（参考单位）"
 
 #. module: product
 #: view:product.template:0
@@ -979,7 +999,7 @@ msgstr "您不能拥有两个重复的价格表版本."
 msgid ""
 "Specify the minimum quantity that needs to be bought/sold for the rule to "
 "apply."
-msgstr ""
+msgstr "指定 使用这条规则的需要的买卖的最小数量"
 
 #. module: product
 #: help:product.pricelist.version,date_start:0
@@ -1109,17 +1129,17 @@ msgstr "价格额外费用"
 #: field:product.product,code:0
 #: field:product.product,default_code:0
 msgid "Internal Reference"
-msgstr ""
+msgstr "内部单号"
 
 #. module: product
 #: model:product.template,name:product.product_product_8_product_template
 msgid "USB Keyboard, QWERTY"
-msgstr ""
+msgstr "USB 键盘， QWERTY"
 
 #. module: product
 #: model:product.category,name:product.product_category_9
 msgid "Softwares"
-msgstr ""
+msgstr "软件"
 
 #. module: product
 #: field:product.product,packaging:0
@@ -1141,12 +1161,12 @@ msgstr "名称"
 #. module: product
 #: model:product.category,name:product.product_category_4
 msgid "Computers"
-msgstr ""
+msgstr "电脑"
 
 #. module: product
 #: help:product.product,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "消息和通信历史"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_kgm
@@ -1166,7 +1186,7 @@ msgstr "km"
 #. module: product
 #: field:product.template,standard_price:0
 msgid "Cost"
-msgstr ""
+msgstr "成本"
 
 #. module: product
 #: help:product.category,sequence:0
@@ -1211,13 +1231,13 @@ msgstr "销售单位"
 #. module: product
 #: field:product.product,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未读信息"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "Unit of Measure Categories"
-msgstr ""
+msgstr "计量单位类别"
 
 #. module: product
 #: help:product.product,seller_id:0
@@ -1233,7 +1253,7 @@ msgstr "服务"
 #. module: product
 #: help:product.product,ean13:0
 msgid "International Article Number used for product identification."
-msgstr ""
+msgstr "国际物品编码用于产品标识"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_category_action
@@ -1247,6 +1267,10 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                这是你所有产品根据类别进行的分类列表。你能单击分类 获得关联到这个类别极其子类的所有产品列表。\n"
+"              </p>\n"
+"            "
 
 #. module: product
 #: code:addons/product/product.py:359
@@ -1257,6 +1281,7 @@ msgid ""
 "you may deactivate this product from the 'Procurements' tab and create a new "
 "one."
 msgstr ""
+"新的计量单位'%s'的类别 '%s'必须跟老单位 '%s' 相同。如果你要改变计量单位，你要'需求'标签停用这个产品 ，并且创建一个新的。"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_normal_action
@@ -1273,7 +1298,7 @@ msgstr "产品"
 #: model:product.template,description:product.product_product_32_product_template
 msgid ""
 "Hands free headset for laptop PC with in-line microphone and headphone plug."
-msgstr ""
+msgstr "用于带有内置麦克风和耳机插孔的便携计算机的免提耳机。"
 
 #. module: product
 #: help:product.packaging,rows:0
@@ -1283,7 +1308,7 @@ msgstr "层板或箱子的层数"
 #. module: product
 #: help:product.pricelist.item,price_min_margin:0
 msgid "Specify the minimum amount of margin over the base price."
-msgstr ""
+msgstr "指定基于基准价格的最大利润"
 
 #. module: product
 #: field:product.template,weight_net:0
@@ -1301,7 +1326,7 @@ msgstr "垫板尺寸"
 msgid ""
 "This field holds the image used as image for the product, limited to "
 "1024x1024px."
-msgstr ""
+msgstr "该字段保存产品的图片，限制到  1024x1024px."
 
 #. module: product
 #: field:product.template,seller_ids:0
@@ -1313,28 +1338,28 @@ msgstr "业务伙伴列表"
 msgid ""
 "Specify a product category if this rule only applies to products belonging "
 "to this category or its children categories. Keep empty otherwise."
-msgstr ""
+msgstr "指定一个产品分类 ，规则只被应用在与这个分类以及它的子类一致的产品上。其它情况留空"
 
 #. module: product
 #: view:product.product:0
 msgid "Inventory"
-msgstr ""
+msgstr "盘点"
 
 #. module: product
 #: code:addons/product/product.py:736
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (副本)"
 
 #. module: product
 #: model:product.template,name:product.product_product_2_product_template
 msgid "On Site Assistance"
-msgstr ""
+msgstr "现场协助"
 
 #. module: product
 #: model:product.template,name:product.product_product_39_product_template
 msgid "Toner Cartridge"
-msgstr ""
+msgstr "碳粉匣"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -1359,7 +1384,7 @@ msgstr "这是供应商的产品代码，将用于打印询价单。如果使用
 #. module: product
 #: model:product.template,name:product.product_product_43_product_template
 msgid "Zed+ Antivirus"
-msgstr ""
+msgstr "Zed+反病毒"
 
 #. module: product
 #: field:product.pricelist.item,price_version_id:0
@@ -1393,7 +1418,7 @@ msgstr "毛重使用公斤"
 #. module: product
 #: model:product.template,name:product.product_product_37_product_template
 msgid "Printer, All-in-one"
-msgstr ""
+msgstr "打印机一体机"
 
 #. module: product
 #: view:product.template:0
@@ -1403,7 +1428,7 @@ msgstr "产品需求"
 #. module: product
 #: model:product.template,name:product.product_product_23_product_template
 msgid "Processor AMD 8-Core"
-msgstr ""
+msgstr "AMD 8核处理器"
 
 #. module: product
 #: view:product.product:0
@@ -1414,7 +1439,7 @@ msgstr "重量"
 #. module: product
 #: view:product.product:0
 msgid "Description for Quotations"
-msgstr ""
+msgstr "报价单说明"
 
 #. module: product
 #: help:pricelist.partnerinfo,price:0
@@ -1436,7 +1461,7 @@ msgstr "分组"
 #. module: product
 #: field:product.product,image_medium:0
 msgid "Medium-sized image"
-msgstr ""
+msgstr "中等尺寸图片"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -1449,7 +1474,7 @@ msgstr "单件"
 #: code:addons/product/product.py:588
 #, python-format
 msgid "Product has been <b>created</b>."
-msgstr ""
+msgstr "产品<b>被创建 </b>"
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
@@ -1459,7 +1484,7 @@ msgstr "开始日期"
 #. module: product
 #: model:product.template,name:product.product_product_38_product_template
 msgid "Ink Cartridge"
-msgstr ""
+msgstr "墨盒"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_cm
@@ -1485,6 +1510,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击 增加一个价格表版本.\n"
+"              </p><p>\n"
+"                这里能有多于一个价格表版本，每个必须在指定的区间里生效。\n"
+"                一些版本的示例： 主价格，2010，2011，夏季销售 等等.\n"
+"              </p>\n"
+"            "
 
 #. module: product
 #: help:product.template,uom_po_id:0
@@ -1496,7 +1528,7 @@ msgstr "采购单默认使用的计量单位。必须与默认计量单位位于
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price"
-msgstr ""
+msgstr "产品价格"
 
 #. module: product
 #: model:product.template,description:product.product_product_26_product_template
@@ -1506,6 +1538,11 @@ msgid ""
 "Hi-Speed 234Q Processor\n"
 "QWERTY keyboard"
 msgstr ""
+"17寸显示器\n"
+"6GB 内存\n"
+"高速处理器 234Q \n"
+"\n"
+"QWERTY 键盘"
 
 #. module: product
 #: field:product.uom,rounding:0
@@ -1515,18 +1552,18 @@ msgstr "舍入精度"
 #. module: product
 #: view:product.product:0
 msgid "Consumable products"
-msgstr ""
+msgstr "消耗性产品"
 
 #. module: product
 #: model:product.template,name:product.product_product_21_product_template
 msgid "Motherboard A20Z7"
-msgstr ""
+msgstr "主板 A20Z7"
 
 #. module: product
 #: model:product.template,description:product.product_product_1_product_template
 #: model:product.template,description_sale:product.product_product_1_product_template
 msgid "This type of service include basic monitoring of products."
-msgstr ""
+msgstr "这种服务类型包括基本的产品监测"
 
 #. module: product
 #: help:product.pricelist.version,date_end:0
@@ -1616,7 +1653,7 @@ msgstr "所有库存操作的默认计量单位"
 #. module: product
 #: view:product.product:0
 msgid "Sales"
-msgstr ""
+msgstr "销售"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_uom_categ_form_action
@@ -1643,7 +1680,7 @@ msgstr ""
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Smaller than the reference Unit of Measure"
-msgstr ""
+msgstr "小于参考计量单位"
 
 #. module: product
 #: model:product.pricelist,name:product.list0
@@ -1727,7 +1764,7 @@ msgstr "赋予供应商在其列表中的优先级"
 #. module: product
 #: constraint:product.pricelist.item:0
 msgid "Error! The minimum margin should be lower than the maximum margin."
-msgstr ""
+msgstr "错误！最小利润要小于最大利润"
 
 #. module: product
 #: model:res.groups,name:product.group_uos
@@ -2050,6 +2087,11 @@ msgid ""
 "Otherwise, this includes goods stored in any Stock Location with 'internal' "
 "type."
 msgstr ""
+"产品的当前数量\n"
+"当与单个库位相关时，包括了在这个库位里的货物数量，以及任意的子库位。\n"
+"当与单个仓库相关时，包括存储在这个仓库的库位里的货物数量，以及任意的子库位。\n"
+"当与单个商店相关时，包括存储在这个商店所属仓库的库位里的货物数量，以及任意的子库位。\n"
+"否则，这是存储在任何“内部”类型库位的货物。"
 
 #. module: product
 #: help:product.template,type:0
diff --git a/addons/product_expiry/i18n/nl.po b/addons/product_expiry/i18n/nl.po
index fd7ef97894f..249d8ba3904 100644
--- a/addons/product_expiry/i18n/nl.po
+++ b/addons/product_expiry/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2011-01-17 09:07+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2012-11-26 20:18+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:21+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
@@ -72,7 +72,7 @@ msgstr ""
 #. module: product_expiry
 #: sql_constraint:product.product:0
 msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Fout! Einddatum kan niet voor de begindatum liggen."
 
 #. module: product_expiry
 #: field:product.product,removal_time:0
@@ -89,7 +89,7 @@ msgstr ""
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
 msgid "Serial Number"
-msgstr ""
+msgstr "Serienummer"
 
 #. module: product_expiry
 #: help:product.product,alert_time:0
@@ -109,6 +109,8 @@ msgid ""
 "You provided an invalid \"EAN13 Barcode\" reference. You may use the "
 "\"Internal Reference\" field instead."
 msgstr ""
+"U gebruikte een verkeerde \"EAN13 Barcode\" referentie. Hiervoor in de "
+"plaats kunt u de interne referentie gebruiken."
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_pain_product_template
diff --git a/addons/project/i18n/pt.po b/addons/project/i18n/pt.po
index d93f9f4c346..64e3373a835 100644
--- a/addons/project/i18n/pt.po
+++ b/addons/project/i18n/pt.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2010-11-27 14:37+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-11-26 10:00+0000\n"
+"Last-Translator: Daniel Reis (SECURITAS SA) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:35+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:23+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: project
 #: view:project.project:0
 msgid "Email Interface"
-msgstr ""
+msgstr "Interface de email"
 
 #. module: project
 #: help:account.analytic.account,use_tasks:0
@@ -106,7 +106,7 @@ msgstr "Tarefa está Concluída"
 #. module: project
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "Falso"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
@@ -136,7 +136,7 @@ msgstr ""
 #: code:addons/project/project.py:1416
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Aviso!"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner
@@ -146,7 +146,7 @@ msgstr "Parceiro"
 #. module: project
 #: field:project.config.settings,group_manage_delegation_task:0
 msgid "Allow task delegation"
-msgstr ""
+msgstr "Permitir delegação de tarefas"
 
 #. module: project
 #: field:project.task.delegate,planned_hours:0
@@ -174,7 +174,7 @@ msgstr ""
 #. module: project
 #: model:ir.actions.client,name:project.action_client_project_menu
 msgid "Open Project Menu"
-msgstr ""
+msgstr "Abrir menu de projeto"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_project_task_user_tree
@@ -195,7 +195,7 @@ msgstr "Título da tarefa de validação"
 #. module: project
 #: model:res.groups,name:project.group_delegate_task
 msgid "Task Delegation"
-msgstr ""
+msgstr "Delegar tarefa"
 
 #. module: project
 #: constraint:account.analytic.account:0
@@ -212,12 +212,12 @@ msgstr "Tempo Planeado"
 #. module: project
 #: selection:project.project,privacy_visibility:0
 msgid "Public"
-msgstr ""
+msgstr "Público"
 
 #. module: project
 #: model:project.category,name:project.project_category_01
 msgid "Contact's suggestion"
-msgstr ""
+msgstr "Sugestão do contacto"
 
 #. module: project
 #: help:project.config.settings,group_time_work_estimation_tasks:0
@@ -256,7 +256,7 @@ msgstr "Templates do projeto"
 #. module: project
 #: field:project.project,analytic_account_id:0
 msgid "Contract/Analytic"
-msgstr ""
+msgstr "Contrato/Analítica"
 
 #. module: project
 #: view:project.config.settings:0
@@ -273,12 +273,12 @@ msgstr "Delegar tarefa do projeto"
 #: code:addons/project/project.py:551
 #, python-format
 msgid "Project has been <b>created</b>."
-msgstr ""
+msgstr "Projeto foi <b>criado</b>"
 
 #. module: project
 #: view:project.config.settings:0
 msgid "Support"
-msgstr ""
+msgstr "Suporte"
 
 #. module: project
 #: view:project.project:0
@@ -288,7 +288,7 @@ msgstr "Membro"
 #. module: project
 #: view:project.task:0
 msgid "Cancel Task"
-msgstr ""
+msgstr "Calcelar tarefa"
 
 #. module: project
 #: help:project.project,members:0
@@ -323,7 +323,7 @@ msgstr "Agosto"
 #: code:addons/project/project.py:1305
 #, python-format
 msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
+msgstr "Tarefa foi <b>delegada</b> a <em>%s</em>"
 
 #. module: project
 #: view:project.project:0
@@ -369,7 +369,7 @@ msgstr ""
 #: field:project.project,message_summary:0
 #: field:project.task,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumo"
 
 #. module: project
 #: view:project.project:0
@@ -405,7 +405,7 @@ msgstr "Utilizador delegado deve ser especificado"
 #. module: project
 #: view:project.project:0
 msgid "Project(s) Manager"
-msgstr ""
+msgstr "Gestor(es) do projeto"
 
 #. module: project
 #: selection:project.project,state:0
@@ -437,7 +437,7 @@ msgstr "Reavaliar a tarefa"
 #: code:addons/project/project.py:1294
 #, python-format
 msgid "Stage changed to <b>%s</b>."
-msgstr ""
+msgstr "Etapa alterada para <b>%s</b>"
 
 #. module: project
 #: view:project.task:0
@@ -462,22 +462,22 @@ msgstr "Codifique as suas horas de trabalho."
 #. module: project
 #: field:project.project,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Alias"
 
 #. module: project
 #: view:project.task:0
 msgid "oe_kanban_text_red"
-msgstr ""
+msgstr "oe_kanban_text_red"
 
 #. module: project
 #: view:project.task:0
 msgid "Delegation"
-msgstr ""
+msgstr "Delegação"
 
 #. module: project
 #: constraint:res.partner:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Erro: Código EAN inválido"
 
 #. module: project
 #: view:res.partner:0
@@ -487,7 +487,7 @@ msgstr "Para mudar para o estado aberto"
 #. module: project
 #: view:project.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Aplicar"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
@@ -502,7 +502,7 @@ msgstr "Voltar a incluir a descrição da tarefa na tarefa do utilizador"
 #. module: project
 #: view:project.project:0
 msgid "Project Settings"
-msgstr ""
+msgstr "Definições de Projeto"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -684,7 +684,7 @@ msgstr "Nova tarefa"
 #. module: project
 #: field:project.config.settings,module_project_issue_sheet:0
 msgid "Invoice working time on issues"
-msgstr ""
+msgstr "Faturar trabalho em incidentes"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
@@ -736,7 +736,7 @@ msgstr "Data da Criação"
 #. module: project
 #: view:project.project:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Diversos"
 
 #. module: project
 #: view:project.task:0
@@ -775,7 +775,7 @@ msgstr "Fases"
 #: view:project.project:0
 #: view:project.task:0
 msgid "Delete"
-msgstr ""
+msgstr "Remover"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -816,12 +816,12 @@ msgstr "CONFIRA: %s"
 #. module: project
 #: view:project.project:0
 msgid "Close Project"
-msgstr ""
+msgstr "Fechar projeto"
 
 #. module: project
 #: field:project.project,tasks:0
 msgid "Task Activities"
-msgstr ""
+msgstr "Atividades da tarefa"
 
 #. module: project
 #: field:project.project,effective_hours:0
@@ -838,7 +838,7 @@ msgstr ""
 #. module: project
 #: field:account.analytic.account,company_uom_id:0
 msgid "unknown"
-msgstr ""
+msgstr "desconhecido"
 
 #. module: project
 #: field:project.project,message_is_follower:0
@@ -861,7 +861,7 @@ msgstr "Filtros Avançados..."
 #. module: project
 #: model:ir.ui.menu,name:project.menu_tasks_config
 msgid "GTD"
-msgstr ""
+msgstr "GTD"
 
 #. module: project
 #: help:project.task,state:0
@@ -903,13 +903,13 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "10"
-msgstr ""
+msgstr "10"
 
 #. module: project
 #: code:addons/project/project.py:560
 #, python-format
 msgid "Project has been <b>canceled</b>."
-msgstr ""
+msgstr "Projeto foi <b>cancelado</b>"
 
 #. module: project
 #: help:project.project,analytic_account_id:0
@@ -936,12 +936,12 @@ msgstr "Cancelar"
 #: code:addons/project/project.py:563
 #, python-format
 msgid "Project has been <b>closed</b>."
-msgstr ""
+msgstr "Projeto foi <b>fechado</b>"
 
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
-msgstr ""
+msgstr "Outras informações"
 
 #. module: project
 #: view:project.task.delegate:0
@@ -998,7 +998,7 @@ msgstr "Comum a todos os projetos"
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1054,7 +1054,7 @@ msgstr ""
 #: code:addons/project/project.py:554
 #, python-format
 msgid "Project has been <b>opened</b>."
-msgstr ""
+msgstr "Projeto foi <b>aberto</b>"
 
 #. module: project
 #: view:project.project:0
@@ -1100,7 +1100,7 @@ msgstr "Tarefas Delegadas"
 #: view:project.task:0
 #: field:project.task,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens por ler"
 
 #. module: project
 #: view:project.task:0
@@ -1142,7 +1142,7 @@ msgstr "Mostrar apenas tarefas com prazo"
 #. module: project
 #: model:project.category,name:project.project_category_04
 msgid "Usability"
-msgstr ""
+msgstr "Usabilidade"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1159,7 +1159,7 @@ msgstr "Concluído por"
 #: code:addons/project/project.py:174
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Ação inválida!"
 
 #. module: project
 #: help:project.task.type,state:0
@@ -1177,7 +1177,7 @@ msgstr "Informação Extra"
 #. module: project
 #: view:project.task:0
 msgid "Edit..."
-msgstr ""
+msgstr "Editar..."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1188,7 +1188,7 @@ msgstr "# de tarefas"
 #. module: project
 #: field:project.project,doc_count:0
 msgid "Number of documents attached"
-msgstr ""
+msgstr "N.º de documentos anexos"
 
 #. module: project
 #: field:project.task,priority:0
@@ -1267,7 +1267,7 @@ msgstr "Horas em Atraso"
 #. module: project
 #: view:project.project:0
 msgid "Team"
-msgstr ""
+msgstr "Equipa"
 
 #. module: project
 #: help:project.config.settings,time_unit:0
@@ -1339,7 +1339,7 @@ msgstr "Baixo"
 #: model:mail.message.subtype,name:project.mt_task_closed
 #: selection:project.project,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Fechado"
 
 #. module: project
 #: view:project.project:0
@@ -1358,7 +1358,7 @@ msgstr "Pendente"
 #. module: project
 #: field:project.task,categ_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Marcas"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_history
@@ -1432,7 +1432,7 @@ msgstr ""
 #: code:addons/project/project.py:213
 #, python-format
 msgid "Attachments"
-msgstr ""
+msgstr "Anexos"
 
 #. module: project
 #: view:project.task:0
@@ -1465,7 +1465,7 @@ msgstr "Abrir"
 #. module: project
 #: field:project.project,privacy_visibility:0
 msgid "Privacy / Visibility"
-msgstr ""
+msgstr "Privacidade / visibilidade"
 
 #. module: project
 #: view:project.task:0
@@ -1506,7 +1506,7 @@ msgstr "Gestor"
 #. module: project
 #: view:project.task:0
 msgid "Very Important"
-msgstr ""
+msgstr "Muito importante"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1517,7 +1517,7 @@ msgstr "Total de Horas"
 #. module: project
 #: model:ir.model,name:project.model_project_config_settings
 msgid "project.config.settings"
-msgstr ""
+msgstr "project.config.settings"
 
 #. module: project
 #: view:project.project:0
@@ -1552,7 +1552,7 @@ msgstr "Horas Gastas"
 #: model:ir.actions.server,name:project.actions_server_project_task_unread
 #: model:ir.actions.server,name:project.actions_server_project_unread
 msgid "Mark unread"
-msgstr ""
+msgstr "Marcar como não lido"
 
 #. module: project
 #: help:project.config.settings,module_pad:0
@@ -1596,7 +1596,7 @@ msgstr ""
 #. module: project
 #: field:project.task,total_hours:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
@@ -1649,7 +1649,7 @@ msgstr "Projetos pendentes"
 #. module: project
 #: view:project.task:0
 msgid "Remaining"
-msgstr ""
+msgstr "Restante"
 
 #. module: project
 #: field:project.task,progress:0
@@ -1688,7 +1688,7 @@ msgstr ""
 #. module: project
 #: model:ir.ui.menu,name:project.menu_task_types_view
 msgid "Task Stages"
-msgstr ""
+msgstr "Etapas das Tarefas"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -1704,7 +1704,7 @@ msgstr "Erro! Não pode atribuir uma escaltion ao mesmo projeto!"
 #: field:project.project,message_ids:0
 #: field:project.task,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Mensagens"
 
 #. module: project
 #: field:project.project,color:0
@@ -1767,7 +1767,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Documents"
-msgstr ""
+msgstr "Documentos"
 
 #. module: project
 #: constraint:res.company:0
@@ -1784,7 +1784,7 @@ msgstr "# de dias"
 #: field:project.project,message_follower_ids:0
 #: field:project.task,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: project
 #: model:mail.message.subtype,name:project.mt_project_new
@@ -1913,7 +1913,7 @@ msgstr "Tarefas do Projeto"
 #: code:addons/project/project.py:1298
 #, python-format
 msgid "Task has been <b>created</b>."
-msgstr ""
+msgstr "Tarefa foi <b>criada</b>"
 
 #. module: project
 #: field:account.analytic.account,use_tasks:0
@@ -1937,14 +1937,14 @@ msgstr "Dezembro"
 #: model:mail.message.subtype,name:project.mt_project_canceled
 #: model:mail.message.subtype,name:project.mt_task_canceled
 msgid "Canceled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: project
 #: view:project.config.settings:0
 #: view:project.task.delegate:0
 #: view:project.task.reevaluate:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: project
 #: help:project.config.settings,module_project_mrp:0
@@ -1966,7 +1966,7 @@ msgstr "Tempo estimado para fechar esta tarefa pelo utilizador delegado"
 #. module: project
 #: model:project.category,name:project.project_category_03
 msgid "Experiment"
-msgstr ""
+msgstr "Experimental"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1985,7 +1985,7 @@ msgstr "Estado Kanban"
 #: code:addons/project/project.py:1301
 #, python-format
 msgid "Task has been set as <b>draft</b>."
-msgstr ""
+msgstr "Tarefa passou para  <b>rascunho</b>"
 
 #. module: project
 #: field:project.config.settings,module_project_timesheet:0
@@ -2032,7 +2032,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_config_settings
 #: view:project.config.settings:0
 msgid "Configure Project"
-msgstr ""
+msgstr "Configurar projeto"
 
 #. module: project
 #: field:project.project,message_comment_ids:0
@@ -2040,7 +2040,7 @@ msgstr ""
 #: field:project.task,message_comment_ids:0
 #: help:project.task,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Comentários e emails"
 
 #. module: project
 #: view:project.task.history.cumulative:0
diff --git a/addons/project_long_term/i18n/nl.po b/addons/project_long_term/i18n/nl.po
index 63b2cb2f3b9..7dbe133cf85 100644
--- a/addons/project_long_term/i18n/nl.po
+++ b/addons/project_long_term/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-05-10 17:54+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-26 20:20+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: project_long_term
 #: field:account.analytic.account,use_phases:0
@@ -168,7 +168,7 @@ msgstr "Einddatum"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_account_analytic_account
 msgid "Analytic Account"
-msgstr ""
+msgstr "Kostenplaats"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_end:0
@@ -211,7 +211,7 @@ msgstr "Berekening gebaseerd op gerelateerde taken"
 #: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopie)"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_start:0
@@ -221,7 +221,7 @@ msgstr "Minimum startdatum"
 #. module: project_long_term
 #: constraint:account.analytic.account:0
 msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Fout! Het is niet toegestaan om recursieve kostenplaatsen te maken."
 
 #. module: project_long_term
 #: help:project.phase,state:0
@@ -272,7 +272,7 @@ msgstr "Project taken"
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
 msgid "Tasks"
-msgstr ""
+msgstr "Taken"
 
 #. module: project_long_term
 #: help:project.phase,user_ids:0
@@ -314,7 +314,7 @@ msgstr "Begindatum"
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "or"
-msgstr ""
+msgstr "of"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -341,7 +341,7 @@ msgstr "In afwachting"
 #: view:project.phase:0
 #: field:project.phase,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: project_long_term
 #: view:project.user.allocation:0
@@ -363,7 +363,7 @@ msgstr "Project taken berekenen"
 #. module: project_long_term
 #: field:project.compute.phases,target_project:0
 msgid "Action"
-msgstr ""
+msgstr "Actie"
 
 #. module: project_long_term
 #: view:project.phase:0
diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po
index ab55b86ef7b..c73170b9615 100644
--- a/addons/purchase/i18n/fr.po
+++ b/addons/purchase/i18n/fr.po
@@ -7,15 +7,21 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-05-24 17:54+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2012-11-26 15:00+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:23+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
+#: model:process.node,name:purchase.process_node_packinglist0
+#: model:process.node,name:purchase.process_node_productrecept0
+msgid "Incoming Products"
+msgstr "Réceptions par articles"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -141,7 +147,7 @@ msgid ""
 "computes the supplier price for the selected products/quantities."
 msgstr ""
 "La liste de prix fixe la devise utilisée pour le bon de commande. Elle "
-"calcule également le prix fournisseur pour les quantités et/ou produits "
+"calcule également le prix fournisseur pour les quantités et/ou articles "
 "sélectionnés."
 
 #. module: purchase
@@ -160,13 +166,6 @@ msgstr "Commande du jour"
 msgid "If checked new messages require your attention."
 msgstr ""
 
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
-#: model:process.node,name:purchase.process_node_packinglist0
-#: model:process.node,name:purchase.process_node_productrecept0
-msgid "Incoming Products"
-msgstr "Produits entrants"
-
 #. module: purchase
 #: view:purchase.order:0
 msgid "Reference"
@@ -304,6 +303,8 @@ msgstr "Approbation"
 msgid ""
 "Allows you to select and maintain different units of measure for products."
 msgstr ""
+"Permet de choisir et de gérer différentes unités de mesures pour les "
+"articles."
 
 #. module: purchase
 #: help:purchase.order,minimum_planned_date:0
@@ -311,8 +312,8 @@ msgid ""
 "This is computed as the minimum scheduled date of all purchase order lines' "
 "products."
 msgstr ""
-"Elle est calculée comme la date planifiée minimum de tous les lignes de "
-"produit de la commande d'achat."
+"Elle est calculée comme la date prévue minimum de tous articles des lignes "
+"de la commande d'achat."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:252
@@ -429,7 +430,7 @@ msgstr ""
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You must assign a serial number for this product."
-msgstr ""
+msgstr "Vous devez attribuer un numéro de série pour cet article."
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -450,7 +451,7 @@ msgstr ""
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
 msgid "A pick list is generated to track the incoming products."
-msgstr "Un bon de transfert est enregistré pour suivre les produits entrants"
+msgstr "Un bon de transfert est enregistré pour suivre les articles entrants"
 
 #. module: purchase
 #: sql_constraint:stock.picking:0
@@ -915,7 +916,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
 msgid "Product Categories"
-msgstr "Catégories de produits"
+msgstr "Catégories d'articles"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1114,7 +1115,7 @@ msgid ""
 "In case there is no supplier for this product, the buyer can fill the form "
 "manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
-"Dans le cas où il n'y a pas de fournisseur pour ce produit, l'acheteur peut "
+"Dans le cas où il n'y a pas de fournisseur pour cet article, l'acheteur peut "
 "remplir lui-même le formulaire et le confirmer : la demande de prix devient "
 "un bon de commande confirmé."
 
@@ -1254,7 +1255,7 @@ msgstr "Taxes"
 #: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
 #: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
 msgid "Products"
-msgstr "Produits"
+msgstr "Articles"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_move
@@ -1277,7 +1278,7 @@ msgstr "Validé par"
 #: view:purchase.report:0
 #: field:purchase.report,price_standard:0
 msgid "Products Value"
-msgstr "Valeur des produits"
+msgstr "Valeur des articles"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1345,7 +1346,7 @@ msgstr "Juillet"
 #. module: purchase
 #: model:process.node,name:purchase.process_node_packinginvoice0
 msgid "Outgoing Products"
-msgstr "Produits à expédier"
+msgstr "Articles à expédier"
 
 #. module: purchase
 #: view:product.product:0
@@ -1393,7 +1394,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Receive Products"
-msgstr "Réception de produits"
+msgstr "Réception par article"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -1426,7 +1427,7 @@ msgstr "Etat de l'ordre d'achat."
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Unité de mesure d'article"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_pricelist_version_action
@@ -1647,7 +1648,7 @@ msgstr "Factures fournisseur"
 #: view:purchase.report:0
 #: field:purchase.report,product_id:0
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder0
@@ -1663,7 +1664,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
 msgid "Products by Category"
-msgstr "Produits par catégorie"
+msgstr "Articles par catégorie"
 
 #. module: purchase
 #: help:purchase.order.line,state:0
@@ -1980,7 +1981,7 @@ msgstr ""
 #: code:addons/purchase/purchase.py:971
 #, python-format
 msgid "The selected supplier only sells this product by %s"
-msgstr "Le fournisseur sélectionné peut seulement vendre ce produit par %s"
+msgstr "Le fournisseur sélectionné peut seulement vendre cet article par %s"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_invoicefrompurchaseorder0
@@ -2255,17 +2256,17 @@ msgid ""
 "\n"
 " "
 msgstr ""
-" Veuillez noter que:\n"
+" Veuillez noter que :\n"
 "\n"
-"Les commandes seront fusionnées seulement si:\n"
-" * Les bons de commande sont à l'état 'Brouillon' \n"
+"Les commandes seront fusionnées seulement si :\n"
+" * Les bons de commande sont à l'état \"Brouillon\"\n"
 " * Les bons de commande sont pour le même fournisseur\n"
 " * les bons de commande sont pour le même emplacement et la même liste de "
 "prix \n"
 "\n"
 "Les lignes seront fusionnées seulement si:\n"
-" * les lignes de commandes sont exactement les mêmes sauf pour le produit, "
-"la quantité et l'unité. \n"
+" * les lignes de commandes sont exactement les mêmes sauf pour l'article, la "
+"quantité et l'unité. \n"
 " "
 
 #. module: purchase
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index 661e95f3648..31d364dc5b1 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/addons/purchase/i18n/zh_CN.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-23 16:20+0000\n"
+"PO-Revision-Date: 2012-11-26 14:14+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:23+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
 msgid "Analytic Accounting for Purchases"
-msgstr ""
+msgstr "采购的辅助核算"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: purchase
 #: view:board.board:0
@@ -39,6 +39,8 @@ msgid ""
 "Example: Product: this product is deprecated, do not purchase more than 5.\n"
 "                Supplier: don't forget to ask for an express delivery."
 msgstr ""
+"允许在产品上配置通知，当用户要采购一个给定产品或者给定的供应商时，通知将被触发。\n"
+"例如：产品：该产品被弃用，不要采购多于 5个。"
 
 #. module: purchase
 #: model:email.template,body_html:purchase.email_template_edi_purchase
@@ -122,6 +124,84 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
+"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
+"</p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.validator.email "
+"or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 
 #. module: purchase
 #: model:product.pricelist,name:purchase.list0
@@ -131,7 +211,7 @@ msgstr "默认采购价格表"
 #. module: purchase
 #: report:purchase.order:0
 msgid "Tel :"
-msgstr ""
+msgstr "电话[不能有空格]"
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
@@ -149,12 +229,12 @@ msgstr "天"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Day"
-msgstr ""
+msgstr "今天的订单"
 
 #. module: purchase
 #: help:purchase.order,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "如果要求你关注新消息，勾选此项"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
@@ -178,7 +258,7 @@ msgstr "辅助核算项"
 msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
-msgstr ""
+msgstr "保留复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:956
@@ -187,7 +267,7 @@ msgstr ""
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "警告！"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:556
@@ -225,6 +305,11 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                当开票方式是“基于收到的货物量”时，这里能跟踪所有采购订单的入库, 即使你还没有收到供应商的发票。\n"
+"                你能基于这些入库单生成一个供应商发票。\n"
+"              </p>\n"
+"            "
 
 #. module: purchase
 #: view:purchase.report:0
@@ -236,7 +321,7 @@ msgstr "均价"
 #: code:addons/purchase/purchase.py:813
 #, python-format
 msgid "Invoice <b>paid</b>."
-msgstr ""
+msgstr "发票 <b>已经支付</b>."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -270,12 +355,12 @@ msgstr "运货地址:"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Confirm Order"
-msgstr ""
+msgstr "确认订单"
 
 #. module: purchase
 #: field:purchase.config.settings,module_warning:0
 msgid "Alerts by products or supplier"
-msgstr ""
+msgstr "根据产品或者供应商的警报"
 
 #. module: purchase
 #: field:purchase.order,name:0
@@ -287,7 +372,7 @@ msgstr "单号"
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Invoicing Process"
-msgstr ""
+msgstr "开发票过程"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
@@ -298,7 +383,7 @@ msgstr "审批"
 #: help:purchase.config.settings,group_uom:0
 msgid ""
 "Allows you to select and maintain different units of measure for products."
-msgstr ""
+msgstr "允许你选择和维护产品的不同计量单位"
 
 #. module: purchase
 #: help:purchase.order,minimum_planned_date:0
@@ -311,7 +396,7 @@ msgstr "计算所有采购订单明细产品的最小计划日期"
 #: code:addons/purchase/purchase.py:252
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
-msgstr ""
+msgstr "要删除采购订单，你必须先取消它"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
@@ -326,7 +411,7 @@ msgstr "已核准的采购单"
 #. module: purchase
 #: model:email.template,subject:purchase.email_template_edi_purchase
 msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
+msgstr "${object.company_id.name} 订单 (编号 ${object.name or 'n/a' })"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -336,7 +421,7 @@ msgstr "总未完税金额"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
 msgid "Unit of Measure Categories"
-msgstr ""
+msgstr "计量单位类别"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -347,14 +432,14 @@ msgstr "分类"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Quotation "
-msgstr ""
+msgstr "报价单 "
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:793
 #, python-format
 msgid ""
 "Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
+msgstr "报价单 <em>%s</em> <b>被转换为</b> 采购订单 %s %s."
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
@@ -371,7 +456,7 @@ msgstr "一旦买方确认根据采购订单开发票，一个采购订单生成
 #: field:purchase.order.line,state:0
 #: view:purchase.report:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -381,7 +466,7 @@ msgstr "8月"
 #. module: purchase
 #: view:product.product:0
 msgid "to"
-msgstr ""
+msgstr "到"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -397,7 +482,7 @@ msgstr "采购订单"
 #: help:account.config.settings,group_analytic_account_for_purchases:0
 #: help:purchase.config.settings,group_analytic_account_for_purchases:0
 msgid "Allows you to specify an analytic account on purchase orders."
-msgstr ""
+msgstr "允许在采购订单指定一个辅助核算科目"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_invoice_pending
@@ -414,11 +499,20 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            单击创建一个发票草稿.\n"
+"          </p><p>\n"
+"            用这个菜单来控制从供应商哪里收到的发票的.\n"
+"           根据你的设置，Openerp从你的采购单或者入库单生成一个草稿发票。\n"
+"          </p><p>\n"
+"            一旦你收到了供应商发票，你能用它跟你的草稿发票对比，并且核准.\n"
+"          </p>\n"
+"        "
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You must assign a serial number for this product."
-msgstr ""
+msgstr "你必须为这个产品指定序列号"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -429,12 +523,12 @@ msgstr "10月"
 #: code:addons/purchase/purchase.py:820
 #, python-format
 msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
+msgstr "采购订单r <em>%s</em> <b>被取消</b>."
 
 #. module: purchase
 #: field:purchase.order,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -471,7 +565,7 @@ msgstr "数量"
 #: code:addons/purchase/purchase.py:802
 #, python-format
 msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
+msgstr "发运 <em>%s</em> <b>已排程</b> 为%s."
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
@@ -481,7 +575,7 @@ msgstr "财务结构"
 #. module: purchase
 #: field:purchase.config.settings,default_invoice_method:0
 msgid "Default invoicing control method"
-msgstr ""
+msgstr "默认的发票控制方法"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_picking_in
@@ -505,6 +599,13 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    单击 这儿记录供应商发票.\n"
+"                </p><p>\n"
+"                    供应商发票能根据采购单订单或者入库单预先生成。\n"
+"                   根据Openerp 的单据草稿，允许你控制从供应商处收到的发票\n"
+"                </p>\n"
+"            "
 
 #. module: purchase
 #: view:purchase.order:0
@@ -528,13 +629,13 @@ msgstr "采购订单明细"
 msgid ""
 "Put an address if you want to deliver directly from the supplier to the "
 "customer. Otherwise, keep empty to deliver to your own company."
-msgstr ""
+msgstr "如果你要直接从供应商发货给给客户，输入一个地址。否则，发给你自己公司的时候，留空。"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:807
 #, python-format
 msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
+msgstr "发票草稿  %s %s is <b>等待核准</b>."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
@@ -550,6 +651,8 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"当开票方式是“基于采购单行”，这里能跟踪采购订单的所有行 ，以及哪些还没有收到供应商发票。你能基于这个列表生成一个供应商发票草稿。\n"
+"            "
 
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
@@ -566,7 +669,7 @@ msgstr "凭证簿"
 msgid ""
 "Error: The default Unit of Measure and the purchase Unit of Measure must be "
 "in the same category."
-msgstr ""
+msgstr "错误：默认的计量单位和采购计量单位必须是相同的类别"
 
 #. module: purchase
 #: view:board.board:0
@@ -593,19 +696,19 @@ msgstr "公司名必须唯一！"
 #: view:product.product:0
 #: field:product.template,purchase_ok:0
 msgid "Can be Purchased"
-msgstr ""
+msgstr "可被采购"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
 msgid "Incoming  Products"
-msgstr ""
+msgstr "入库产品"
 
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
 #: view:purchase.order.line_invoice:0
 msgid "or"
-msgstr ""
+msgstr "或"
 
 #. module: purchase
 #: field:res.company,po_lead:0
@@ -615,7 +718,7 @@ msgstr "采购提前时间"
 #. module: purchase
 #: constraint:res.partner:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
@@ -628,7 +731,7 @@ msgstr "如果采购订单的发票控制是“来自订单”发票是自动生
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "接受"
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
@@ -645,12 +748,12 @@ msgstr "询价单(RFQ) 必须先得到采购经理审批后才能发给供应商
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
-msgstr ""
+msgstr "客户地址"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "RFQ Sent"
-msgstr ""
+msgstr "发送询价单"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -670,7 +773,7 @@ msgstr "供应商"
 #: code:addons/purchase/purchase.py:491
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
-msgstr ""
+msgstr "定义这个公司的费用科目: \"%s\" (id:%d)."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_packinginvoice0
@@ -703,12 +806,12 @@ msgstr "草稿状态的采购单"
 #. module: purchase
 #: view:product.product:0
 msgid "Suppliers"
-msgstr ""
+msgstr "供应商"
 
 #. module: purchase
 #: view:product.product:0
 msgid "To Purchase"
-msgstr ""
+msgstr "采购"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_form_action
@@ -726,11 +829,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击创建一个 将被转换为采购订单的报价单。\n"
+"              </p><p>\n"
+"                使用这个菜单根据编号，供应商，产品等等来搜索采购订单。\n"
+"                对每个采购订单，你能跟踪相关的供应商的讨论，产品接收的\n"
+"               控制和供应商发票的控制。\n"
+"              </p>\n"
+"            "
 
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Invoices and Receptions"
-msgstr ""
+msgstr "发票和入库单"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -742,12 +853,12 @@ msgstr "# 明细"
 #: code:addons/purchase/wizard/purchase_line_invoice.py:110
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "为产品: \"%s\" (id:%d) 定义费用科目。"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "(update)"
-msgstr ""
+msgstr "（更新）"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -764,7 +875,7 @@ msgstr "这表示装箱单已完成"
 #: code:addons/purchase/purchase.py:555
 #, python-format
 msgid "Unable to cancel this purchase order."
-msgstr ""
+msgstr "不能取消这个采购订单"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
@@ -794,7 +905,7 @@ msgstr "订单明细"
 msgid ""
 "Unique number of the purchase order, computed automatically when the "
 "purchase order is created."
-msgstr ""
+msgstr "采购订单的唯一编号，当采购订单被创建时自动生成。"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
@@ -822,7 +933,7 @@ msgstr "价格表"
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Draft PO"
-msgstr ""
+msgstr "采购订单草稿"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
@@ -842,7 +953,7 @@ msgstr "订单日期"
 #. module: purchase
 #: field:purchase.config.settings,group_uom:0
 msgid "Manage different units of measure for products"
-msgstr ""
+msgstr "管理产品的不同计量单位"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
@@ -874,7 +985,7 @@ msgstr "询价单:"
 #: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice
 msgid "On Incoming Shipments"
-msgstr ""
+msgstr "收到的供货量"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -890,7 +1001,7 @@ msgstr "库存调拨"
 #: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "Draft Purchase Order created"
-msgstr ""
+msgstr "采购单草稿被创建"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
@@ -900,7 +1011,7 @@ msgstr "产品分类"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Send Request for Quotation"
-msgstr ""
+msgstr "发送询价单"
 
 #. module: purchase
 #: help:purchase.order,invoiced:0
@@ -910,12 +1021,12 @@ msgstr "这表明发票已支付"
 #. module: purchase
 #: field:purchase.order,notes:0
 msgid "Terms and Conditions"
-msgstr ""
+msgstr "条款和条件"
 
 #. module: purchase
 #: field:purchase.order,currency_id:0
 msgid "unknown"
-msgstr ""
+msgstr "未知"
 
 #. module: purchase
 #: help:purchase.order,date_order:0
@@ -925,7 +1036,7 @@ msgstr "单据的创建日期"
 #. module: purchase
 #: field:purchase.order,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "是一个关注者"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
@@ -967,12 +1078,12 @@ msgstr "你确信要合并这些订单吗？"
 #. module: purchase
 #: field:account.config.settings,module_purchase_analytic_plans:0
 msgid "Use multiple analytic accounts on orders"
-msgstr ""
+msgstr "在订单上使用多个辅助核算科目"
 
 #. module: purchase
 #: view:product.product:0
 msgid "will be created in order to subcontract the job"
-msgstr ""
+msgstr "将被创建为了分包此项工作"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
@@ -992,7 +1103,7 @@ msgstr "审核日期"
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Supplier Features"
-msgstr ""
+msgstr "供应商特征"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1003,7 +1114,7 @@ msgstr "数量"
 #. module: purchase
 #: model:res.groups,name:purchase.group_delivery_invoice_address
 msgid "Addresses in Purchase Orders"
-msgstr ""
+msgstr "在采购订单的地址"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
@@ -1019,7 +1130,7 @@ msgstr "取消"
 #: field:purchase.order,message_comment_ids:0
 #: help:purchase.order,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "评论和电子邮件"
 
 #. module: purchase
 #: sql_constraint:purchase.order:0
@@ -1040,7 +1151,7 @@ msgstr "询价单"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Month"
-msgstr ""
+msgstr "本月的订单"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1058,33 +1169,33 @@ msgstr "审批日期"
 #: code:addons/purchase/purchase.py:789
 #, python-format
 msgid "Request for quotation <b>created</b>."
-msgstr ""
+msgstr "询价单<b>被创建</b>."
 
 #. module: purchase
 #: view:product.product:0
 msgid "a draft purchase order"
-msgstr ""
+msgstr "一个采购订单草稿"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product."
-msgstr ""
+msgstr "您企图为不一样的产品创建批号"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Year"
-msgstr ""
+msgstr "本年的订单"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 msgid "RFQs and Purchases"
-msgstr ""
+msgstr "询价单和采购"
 
 #. module: purchase
 #: field:account.config.settings,group_analytic_account_for_purchases:0
 #: field:purchase.config.settings,group_analytic_account_for_purchases:0
 msgid "Analytic accounting for purchases"
-msgstr ""
+msgstr "采购的辅助核算"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
@@ -1100,28 +1211,30 @@ msgid ""
 "amount.\n"
 "                This installs the module purchase_double_validation."
 msgstr ""
+"对超过最小数量的采购，提供一个双重核准机制。\n"
+"要安装模块 purchase_double_validation"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_mail_mail
 msgid "Outgoing Mails"
-msgstr ""
+msgstr "发出邮件"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:420
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
-msgstr ""
+msgstr "你不能确认没有任何明细的采购订单"
 
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "消息和通信历史"
 
 #. module: purchase
 #: field:purchase.order,warehouse_id:0
 #: field:stock.picking.in,warehouse_id:0
 msgid "Destination Warehouse"
-msgstr ""
+msgstr "目标仓库"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:956
@@ -1129,7 +1242,7 @@ msgstr ""
 msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
-msgstr ""
+msgstr "选择的计量单位不属于产品的计量单位相同的分类。"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
@@ -1140,13 +1253,13 @@ msgstr "计量单位"
 #. module: purchase
 #: field:purchase.config.settings,group_purchase_pricelist:0
 msgid "Manage pricelist per supplier"
-msgstr ""
+msgstr "管理每个供应商的价格表"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:816
 #, python-format
 msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
+msgstr "采购订单被设置为“草稿”"
 
 #. module: purchase
 #: view:board.board:0
@@ -1157,12 +1270,12 @@ msgstr "采购控制台"
 #: code:addons/purchase/purchase.py:549
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
-msgstr ""
+msgstr "首先取消这个采购订单相关的入库单"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approve Order"
-msgstr ""
+msgstr "批准订单"
 
 #. module: purchase
 #: help:purchase.report,date:0
@@ -1190,7 +1303,7 @@ msgstr "采购订单统计"
 #: view:purchase.order:0
 #: field:purchase.order,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未读信息"
 
 #. module: purchase
 #: view:purchase.order.line_invoice:0
@@ -1205,7 +1318,7 @@ msgstr "设为草稿"
 #. module: purchase
 #: field:purchase.config.settings,group_purchase_delivery_address:0
 msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
+msgstr "允许收入产品和开票为不同的地址"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -1215,7 +1328,7 @@ msgstr "备注"
 #. module: purchase
 #: field:purchase.config.settings,module_purchase_requisition:0
 msgid "Manage purchase requisitions"
-msgstr ""
+msgstr "管理采购请求"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1240,7 +1353,7 @@ msgstr "库存调拨"
 #: code:addons/purchase/purchase.py:252
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "非法的动作"
 
 #. module: purchase
 #: field:purchase.order,validator:0
@@ -1268,7 +1381,7 @@ msgstr "询价单"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Source"
-msgstr ""
+msgstr "来源"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_picking
@@ -1289,12 +1402,12 @@ msgstr "采购订单的发票已开"
 #. module: purchase
 #: selection:purchase.config.settings,default_invoice_method:0
 msgid "Pre-generate draft invoices based on purchase orders"
-msgstr ""
+msgstr "基于采购订单预先生成发票草稿"
 
 #. module: purchase
 #: help:product.template,purchase_ok:0
 msgid "Specify if the product can be selected in a purchase order line."
-msgstr ""
+msgstr "如果在采购订单行选择产品，指定"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
@@ -1326,20 +1439,20 @@ msgid ""
 "                        The delivery order will be ready after having "
 "received the\n"
 "                        products."
-msgstr ""
+msgstr "购买所需数量的供应商"
 
 #. module: purchase
 #: view:product.product:0
 msgid ""
 "a draft\n"
 "                        purchase order"
-msgstr ""
+msgstr "一个草稿"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:307
 #, python-format
 msgid "Please create Invoices."
-msgstr ""
+msgstr "请创建发票"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_procurement_order
@@ -1360,7 +1473,7 @@ msgstr "3月"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Receive Invoice"
-msgstr ""
+msgstr "收到的发票"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1387,7 +1500,7 @@ msgstr "等待会计复核。"
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_config_settings
 msgid "purchase.config.settings"
-msgstr ""
+msgstr "purchase.config.settings"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_approvepurchaseorder0
@@ -1398,7 +1511,7 @@ msgstr "采购订单状态"
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "产品计量单位"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_pricelist_version_action
@@ -1414,6 +1527,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击 增加一个价格表版本.\n"
+"              </p><p>\n"
+"                这里能有多于一个价格表版本，每个必须在指定的区间里生效。\n"
+"                一些版本的示例： 主价格，2010，2011，夏季销售 等等.\n"
+"              </p>\n"
+"            "
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
@@ -1440,12 +1560,12 @@ msgstr "出仓产品要开发票"
 #: code:addons/purchase/purchase.py:481
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
-msgstr ""
+msgstr "为公司 \"%s\" (id:%d)  定义采购账簿。"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Order "
-msgstr ""
+msgstr "采购订单 "
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -1456,12 +1576,12 @@ msgstr "手工发票"
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
 #: view:purchase.config.settings:0
 msgid "Configure Purchases"
-msgstr ""
+msgstr "配置采购"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Untaxed"
-msgstr ""
+msgstr "未完税"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
@@ -1472,7 +1592,7 @@ msgstr "生成装箱单"
 #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
 msgid "On Purchase Order Lines"
-msgstr ""
+msgstr "在采购订单明细"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1484,17 +1604,17 @@ msgstr "增值税:"
 msgid ""
 "This is the list of incoming shipments that have been generated for this "
 "purchase order."
-msgstr ""
+msgstr "这是为这个采购订单的生成的到货清单"
 
 #. module: purchase
 #: field:purchase.config.settings,module_purchase_double_validation:0
 msgid "Force two levels of approvals"
-msgstr ""
+msgstr "强制两级批准"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
 msgid "Price Types"
-msgstr ""
+msgstr "计价基础"
 
 #. module: purchase
 #: help:purchase.order,date_approve:0
@@ -1524,7 +1644,7 @@ msgstr "发票"
 #. module: purchase
 #: view:product.product:0
 msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+msgstr "当你卖出这个产品时，Openerp 将触发"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
@@ -1548,6 +1668,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击创建询价单\n"
+"              </p><p>\n"
+"                报价单包括了你和供应商讨论与价格的历史。  \n"
+"                一旦确定，询价单被转换成为采购订单.\n"
+"              </p><p>\n"
+"                根据库存的需要，采购订单的更多事务将被被自动创建。\n"
+"              </p>\n"
+"            "
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
@@ -1578,7 +1707,7 @@ msgstr "合并采购订单"
 #. module: purchase
 #: field:purchase.config.settings,module_purchase_analytic_plans:0
 msgid "Use multiple analytic accounts on purchase orders"
-msgstr ""
+msgstr "在采购订单使用多个辅助核算科目"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management
@@ -1601,7 +1730,7 @@ msgstr "手动更正"
 #. module: purchase
 #: field:purchase.config.settings,group_costing_method:0
 msgid "Compute product cost price based on average cost"
-msgstr ""
+msgstr "基于平均成本计算产品成本"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:337
@@ -1630,7 +1759,7 @@ msgstr "确认"
 #. module: purchase
 #: report:purchase.order:0
 msgid "TIN :"
-msgstr ""
+msgstr "TIN :"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
@@ -1649,16 +1778,20 @@ msgid ""
 "* The 'Cancelled' status is set automatically when user cancel purchase "
 "order."
 msgstr ""
+" *当采购单在草稿状态时，自动设置为“草稿”。\n"
+"*当采购单确认为确认状态时，设置为“确认”。\n"
+"*当采购订单完成后，自动设置为“完成”\n"
+"*当用户取消了采购订单后，自动设置为“已经取消”"
 
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoice Received"
-msgstr ""
+msgstr "收到的发票"
 
 #. module: purchase
 #: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
 msgid "Mark unread"
-msgstr ""
+msgstr "标记为未读"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
@@ -1703,6 +1836,8 @@ msgid ""
 "lines on a purchase order between several accounts and analytic plans.\n"
 "                This installs the module purchase_analytic_plans."
 msgstr ""
+"允许用户维护几个分析计划。让你 在几个科目和分析计划之间分割采购订单行 。\n"
+"这要安装模块 purchase_analytic_plans"
 
 #. module: purchase
 #: field:purchase.order,location_id:0
@@ -1714,12 +1849,12 @@ msgstr "目的地"
 #. module: purchase
 #: field:purchase.order,dest_address_id:0
 msgid "Customer Address (Direct Delivery)"
-msgstr ""
+msgstr "客户地址（直接发运）"
 
 #. module: purchase
 #: model:ir.actions.client,name:purchase.action_client_purchase_menu
 msgid "Open Purchase Menu"
-msgstr ""
+msgstr "打开采购菜单"
 
 #. module: purchase
 #: field:purchase.order,company_id:0
@@ -1771,7 +1906,7 @@ msgstr "收货分析"
 #. module: purchase
 #: field:purchase.order,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
@@ -1796,7 +1931,7 @@ msgstr "采购订单"
 #: code:addons/purchase/wizard/purchase_line_invoice.py:109
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误!"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1813,6 +1948,9 @@ msgid ""
 "paid and received, the status becomes 'Done'. If a cancel action occurs in "
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
+"采购订单或者询价单的状态。一个询价单是采购订单的“草稿”状态。然后这个采购单被用户确认后，状态切换为“已经确认”。\r\n"
+"供应商确认这个订单后，改变状态到“批准”。当采购订单被支付和收货以后，状态变成“完成”。\r\n"
+"如果在开票或者收货过程中出现了 “取消”操作，状态变成了“异常”。"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_packinginvoice0
@@ -1831,13 +1969,13 @@ msgstr "已取消"
 #. module: purchase
 #: field:res.partner,purchase_order_count:0
 msgid "# of Purchase Order"
-msgstr ""
+msgstr "采购订单号"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:810
 #, python-format
 msgid "Shipment <b>received</b>."
-msgstr ""
+msgstr "装运货物 <b>已经收到</b>."
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1847,14 +1985,14 @@ msgstr "电话:"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Resend Purchase Order"
-msgstr ""
+msgstr "重发采购订单"
 
 #. module: purchase
 #: help:purchase.config.settings,group_purchase_delivery_address:0
 msgid ""
 "Allows you to specify different delivery and invoice addresses on a purchase "
 "order."
-msgstr ""
+msgstr "允许在采购订单给运输和发票指定不同的地址。"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1900,7 +2038,7 @@ msgstr "装箱单生成供应商发票。采购订单控制发票，发票是基
 #. module: purchase
 #: field:purchase.order,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "关注者"
 
 #. module: purchase
 #: help:purchase.config.settings,module_purchase_requisition:0
@@ -1912,6 +2050,8 @@ msgid ""
 "            to one supplier or if you want a purchase requisition to "
 "negotiate with several suppliers."
 msgstr ""
+"当你要从几个供应商给一组产品询价时，使用采购申请单。\n"
+"                可为每个产品进行配置，如果只有一个供应商就直接询价，如果有多个供应商，就要进行采购谈判。"
 
 #. module: purchase
 #: field:purchase.order.line,invoice_lines:0
@@ -1921,7 +2061,7 @@ msgstr "发票明细"
 #. module: purchase
 #: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
 msgid "Mark read"
-msgstr ""
+msgstr "标记为已读"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
@@ -1934,7 +2074,7 @@ msgstr "采购分析使您轻松检查和分析您公司的采购日志和特性
 #. module: purchase
 #: model:email.template,report_name:purchase.email_template_edi_purchase
 msgid "RFQ_${(object.name or '').replace('/','_')}"
-msgstr ""
+msgstr "RFQ_${(object.name or '').replace('/','_')}"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:971
@@ -1963,7 +2103,7 @@ msgid ""
 "Allows to manage different prices based on rules per category of Supplier.\n"
 "                Example: 10% for retailers, promotion of 5 EUR on this "
 "product, etc."
-msgstr ""
+msgstr "允许给不同类别的供应商按规则管理不同的基础价格。例如：零售10%折扣，这个产品优惠5欧元，等等。"
 
 #. module: purchase
 #: code:addons/purchase/edi/purchase_order.py:132
@@ -1975,7 +2115,7 @@ msgstr "EDI 价格表 (%s)"
 #: view:purchase.report:0
 #: field:purchase.report,product_uom:0
 msgid "Reference Unit of Measure"
-msgstr ""
+msgstr "参考计量单位"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -2017,7 +2157,7 @@ msgstr "采购的产品"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Incoming Shipments & Invoices"
-msgstr ""
+msgstr "收货发货及开票"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -2069,7 +2209,7 @@ msgstr "11月"
 #. module: purchase
 #: help:purchase.config.settings,group_costing_method:0
 msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+msgstr "允许你基于平均成本计算产品成本"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -2084,7 +2224,7 @@ msgstr "1月"
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You cannot move products from or to a location of the type view."
-msgstr ""
+msgstr "你不能从视图类型的库位移动"
 
 #. module: purchase
 #: help:purchase.order,invoice_method:0
@@ -2095,13 +2235,16 @@ msgid ""
 "Bases on incoming shipments: let you create an invoice when receptions are "
 "validated."
 msgstr ""
+"基于采购订单行: 在”发票管理>基于采购订单行”你可以单独为每个订单行开票。\n"
+"基于订单: 生成一个发票草稿供你以后确认。\n"
+"基于收货: 收货后根据收货手动开票"
 
 #. module: purchase
 #: help:purchase.order,origin:0
 msgid ""
 "Reference of the document that generated this purchase order request; a sale "
 "order or an internal procurement request."
-msgstr ""
+msgstr "生成这张采购订单需求、销售订单或内部请购的单据参考号。"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
@@ -2121,7 +2264,7 @@ msgstr "询价单号"
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Invoicing Settings"
-msgstr ""
+msgstr "开票设置"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
@@ -2131,7 +2274,7 @@ msgstr "按用户每月的订单总金额"
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Based on incoming shipments"
-msgstr ""
+msgstr "基于收货量"
 
 #. module: purchase
 #: help:purchase.order,partner_ref:0
@@ -2139,7 +2282,7 @@ msgid ""
 "Reference of the sale order or quotation sent by your supplier. It's mainly "
 "used to do the matching when you receive the products as this reference is "
 "usually written on the delivery order sent by your supplier."
-msgstr ""
+msgstr "销售单或者供应商发送的报价单的参考编号。主要 用于根据这个参考号(通常写在供应商送来的发运单上面) 查找对应的产品。"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:974
@@ -2147,7 +2290,7 @@ msgstr ""
 msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
 "purchase less."
-msgstr ""
+msgstr "这个选择的供应商有最小数量设置  %s %s ， 你不应该购买更少。"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -2170,7 +2313,7 @@ msgstr "2月"
 #: model:ir.actions.act_window,name:purchase.action_invoice_pending
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
 msgid "On Draft Invoices"
-msgstr ""
+msgstr "在草稿发票上"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
@@ -2196,7 +2339,7 @@ msgstr "总金额"
 #. module: purchase
 #: model:ir.model,name:purchase.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "产品模板"
 
 #. module: purchase
 #: view:purchase.order.group:0
@@ -2226,7 +2369,7 @@ msgstr ""
 #. module: purchase
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
-msgstr ""
+msgstr "当你卖 服务给客户时"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2253,7 +2396,7 @@ msgstr "年"
 #. module: purchase
 #: selection:purchase.config.settings,default_invoice_method:0
 msgid "Based on purchase order lines"
-msgstr ""
+msgstr "基于采购订单行"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.act_res_partner_2_purchase_order
@@ -2270,6 +2413,12 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                   这供应商没有采购订单。单击创建 一个新的询价单。\n"
+"                </p><p>\n"
+"                    询价单是采购流程的第一步，一旦转换为采购订单，你就能控制产品的入库和供应商发票。\n"
+"                </p>\n"
+"            "
 
 #. module: purchase
 #: view:purchase.report:0
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index ad7563140b2..97ef98bb8cd 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -175,8 +175,8 @@ class purchase_order(osv.osv):
             help="Put an address if you want to deliver directly from the supplier to the customer. " \
                 "Otherwise, keep empty to deliver to your own company."
         ),
-        'warehouse_id': fields.many2one('stock.warehouse', 'Destination Warehouse', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}),
-        'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')]),
+        'warehouse_id': fields.many2one('stock.warehouse', 'Destination Warehouse'),
+        'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')], states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]} ),
         '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."),
         'currency_id': fields.related('pricelist_id', 'currency_id', type="many2one", relation="res.currency", readonly=True, required=True),
         'state': fields.selection(STATE_SELECTION, 'Status', readonly=True, help="The status of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' status. Then the order has to be confirmed by the user, the status switch to 'Confirmed'. Then the supplier must confirm the order to change the status to 'Approved'. When the purchase order is paid and received, the status becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the status becomes in exception.", select=True),
@@ -189,7 +189,7 @@ class purchase_order(osv.osv):
         'shipped_rate': fields.function(_shipped_rate, string='Received', type='float'),
         'invoiced': fields.function(_invoiced, string='Invoice Received', type='boolean', help="It indicates that an invoice has been paid"),
         'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
-        'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Based on incoming shipments')], 'Invoicing Control', required=True,
+        'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Based on incoming shipments')], 'Invoicing Control', required=True,states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]},
             help="Based on Purchase Order lines: place individual lines in 'Invoice Control > Based on P.O. lines' from where you can selectively create an invoice.\n" \
                 "Based on generated invoice: create a draft invoice you can validate later.\n" \
                 "Bases on incoming shipments: let you create an invoice when receptions are validated."
@@ -214,13 +214,13 @@ class purchase_order(osv.osv):
         '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),
+        'company_id': fields.many2one('res.company','Company',required=True,select=1, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}),
         'journal_id': fields.many2one('account.journal', 'Journal'),
     }
     _defaults = {
         'date_order': fields.date.context_today,
         'state': 'draft',
-        'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order'),
+        'name': lambda obj, cr, uid, context: '/',
         'shipped': 0,
         'invoice_method': 'order',
         'invoiced': 0,
@@ -237,6 +237,8 @@ class purchase_order(osv.osv):
     _order = "name desc"
 
     def create(self, cr, uid, vals, context=None):
+        if vals.get('name','/')=='/':
+            vals['name'] = self.pool.get('ir.sequence').get(cr, uid, 'purchase.order') or '/'
         order =  super(purchase_order, self).create(cr, uid, vals, context=context)
         if order:
             self.create_send_note(cr, uid, [order], context=context)
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 4c7aea1caac..4f8fc34b038 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -262,8 +262,7 @@
                                 <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                             </group>
                             <div class="oe_clear"/>
-                            <label for="notes"/>
-                            <field name="notes" class="oe_inline"/>
+                            <field name="notes" class="oe_inline" placeholder="Terms and conditions..."/>
                         </page>
                         <page string="Incoming Shipments &amp; Invoices">
                             <group>
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index 66fd58060b8..495c8790e7b 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<document filename="Request for Quotation.pdf">
-  <template title="Request for Quotation" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
+<document filename="requestforquotation.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="18.0" y1="42.0" width="535" height="758"/>
+      <frame id="first" x1="23.0" y1="43.0" width="530" height="799"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,7 +10,11 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_Address_Detail">
+    <blockTableStyle id="Tableau1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
@@ -33,6 +37,7 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -69,30 +74,26 @@
     <images/>
   </stylesheet>
   <story>
-  <pto>
-  <pto_header>
-    <blockTable colWidths="371.0,98.0,61.0" repeatRows="1" style="Table_Product_Header_Title">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Description</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Expected Date</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Qty</para>
-        </td>
-      </tr>
-    </blockTable>
-  </pto_header>
     <para style="terp_default_9">[[repeatIn(objects,'order')]]</para>
     <para style="terp_default_9">[[ setLang(order.partner_id.lang) ]]</para>
-    <blockTable colWidths="250.0,59.0,221.0" style="Table_Address_Detail">
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="250.0,59.0,221.0" style="Tableau1">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Expected Delivery address:</para>
-          <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id.name) or (order.warehouse_id and order.warehouse_id.name) or '']]</para>
-          <para style="terp_default_9">[[ order.dest_address_id and display_address(order.dest_address_id) ]] </para>
+          <blockTable colWidths="250.0" style="Tableau2">
+            <tr>
+              <td>
+                <para style="terp_default_Bold_9">Expected Delivery address:</para>
+                <para style="terp_default_9">[[ (order.dest_address_id and order.dest_address_id.name) or (order.warehouse_id and order.warehouse_id.name) or '']]</para>
+                <para style="P1">[[ order.dest_address_id and display_address(order.dest_address_id) ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
         </td>
         <td>
           <para style="terp_default_9">
@@ -100,18 +101,18 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ (order.partner_id.title and order.partner_id.title.name) or '' ]] [[ order.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ display_address(order.partner_id) ]] </para>
+          <para style="terp_default_9">[[ (order .partner_id and order.partner_id.title and order.partner_id.title.name) or '' ]] [[ (order .partner_id and order.partner_id.name) or '' ]] </para>
+          <para style="terp_default_9">[[ order.partner_id and display_address(order .partner_id) ]] </para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">Tel.: [[ (order.partner_id.phone) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">Fax: [[ (order.partner_id.fax) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">TVA: [[ (order.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Tel.: [[ (order.partner_id and order.partner_id.phone) or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax: [[ (order.partner_id and order.partner_id.fax) or removeParentNode('para') ]]</para>
+          <para style="P1">TVA: [[ (order.partner_id and order.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_8">
+    <para style="Standard">
       <font color="white"> </font>
     </para>
     <para style="terp_header">Request for Quotation : [[order.name]]</para>
@@ -132,7 +133,7 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_2">[[repeatIn(order.order_line,'order_line')]]</para>
+      <para style="terp_default_9">[[ repeatIn(order.order_line,'order_line') ]]</para>
       <blockTable colWidths="370.0,100.0,39.0,20.0" style="Table_Product_Line">
         <tr>
           <td>
@@ -148,6 +149,11 @@
             <para style="terp_default_Right_9">[[ (order_line.product_uom and order_line.product_uom.name) or '' ]]</para>
           </td>
         </tr>
+        <tr>
+          <td>
+            <para style="terp_default_8_italic">[[ format(order_line.notes or removeParentNode('tr')) ]]</para>
+          </td>
+        </tr>
       </blockTable>
     </section>
     <para style="terp_default_9">
@@ -165,6 +171,5 @@
       <font color="white"> </font>
     </para>
     <para style="terp_default_9">[[ user.signature or '' ]]</para>
-  </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/sale/i18n/es_MX.po b/addons/sale/i18n/es_MX.po
index 31f2e32d4a9..45d58f973d0 100644
--- a/addons/sale/i18n/es_MX.po
+++ b/addons/sale/i18n/es_MX.po
@@ -1,52 +1,57 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* sale
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-18 01:15+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"PO-Revision-Date: 2012-11-26 08:55+0000\n"
+"Last-Translator: Alejandro Negrin [ Vauxoo ] ..:: http://www.vauxoo.com ::.. "
+"<anegrinm@gmail.com>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:21+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Ventas por comercial últimos 90 días"
-
-#. module: sale
-#: help:sale.installer,delivery:0
-msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Le permite calcular los costos de envío en sus presupuestos."
-
-#. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
 msgstr ""
-"Si no dispone de suficientes existencias para enviarlo todo de una vez, "
-"¿acepta envíos parciales o no?"
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Dirección de envío para el pedido de venta actual."
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+"Las lineas del pedido de venta que están confirmadas, realizadas o con el "
+"estado de excepción aún no han sido facturadas"
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "UdV"
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-msgid "Quantity"
-msgstr "Cantidad"
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr "Vendedor"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Tarifa para el pedido de venta actual."
 
 #. module: sale
 #: view:sale.report:0
@@ -56,117 +61,78 @@ msgstr "Día"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
-msgstr "Cancelar pedido"
+msgstr "Cancelar el pedido"
 
 #. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Configure Sales Order Logistics"
-msgstr "Configurar logística pedidos de venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "El presupuesto '%s' ha sido convertido a un pedido de venta."
+msgid "Incorrect Data"
+msgstr "Datos incorrectos"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Payment Before Delivery"
-msgstr "Pago antes del envío"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:102
 #, python-format
-msgid "Warning !"
-msgstr "¡Aviso!"
+msgid "The value of Advance Amount must be positive."
+msgstr "El  importe tiene que ser valor positivo"
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "VAT"
-msgstr "IVA"
+msgid "Tax"
+msgstr "Impuesto"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "Genera órdenes de abastecimiento para cada línea de pedido de venta."
+#: help:sale.order,state:0
+msgid ""
+"Gives the status of the quotation or sales order.              \n"
+"The exception status is automatically set when a cancel operation occurs     "
+"          in the invoice validation (Invoice Exception) or in the picking "
+"list process (Shipping Exception).\n"
+"The 'Waiting Schedule' status is set when the invoice is confirmed           "
+"    but waiting for the scheduler to run on the order date."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "All at Once"
-msgstr "Todo a la vez"
-
-#. module: sale
-#: field:sale.order,project_id:0
 #: view:sale.report:0
 #: field:sale.report,analytic_account_id:0
 #: field:sale.shop,project_id:0
 msgid "Analytic Account"
-msgstr "Cuenta analítica"
+msgstr "Cuenta Analítica"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+#: help:sale.order,message_summary:0
 msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
-"Esta es una lista de todas las líneas de pedidos de venta a facturar. Puede "
-"facturar pedidos de venta parcialmente, por líneas de pedido. No necesita "
-"esta lista si factura desde albaranes de salida o si factura pedidos de "
-"venta completos."
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Orden de abastecimiento"
 
 #. module: sale
 #: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Cantidad"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Línea del pedido"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
 msgstr ""
-"Los pedidos de ventas le ayudan a gestionar presupuestos y pedidos de sus "
-"clientes. OpenERP sugiere que comience por crear un presupuesto. Una vez "
-"esté confirmado, el presupuesto se convertirá en un pedido de venta. OpenERP "
-"puede gestionar varios tipos de productos de forma que un pedido de venta "
-"puede generar tareas, órdenes de entrega, órdenes de fabricación, compras, "
-"etc. Según la configuración del pedido de venta, se generará una factura en "
-"borrador de manera que sólo hay que confirmarla cuando se quiera facturar a "
-"su cliente."
 
 #. module: sale
-#: help:sale.order,invoice_quantity:0
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
+"Allows to manage different prices based on rules per category of customers.\n"
+"Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
-"El pedido de venta creará automáticamente la proposición de la factura "
-"(factura borrador). Las cantidades pedidas y entregadas pueden no ser las "
-"mismas. Debe elegir si desea que su factura se base en las cantidades "
-"pedidas o entregadas. Si el producto es un servicio, las cantidades enviadas "
-"son las horas dedicadas a las tareas asociadas."
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
@@ -174,17 +140,20 @@ msgid "Default Payment Term"
 msgstr "Plazo de pago por defecto"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-msgid "Configure Picking Policy for Sales Order"
-msgstr "Configurar la política envío para pedidos de venta"
+#: code:addons/sale/sale.py:696
+#, python-format
+msgid "Invoice <b>paid</b>."
+msgstr "Factura pagada"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Estado"
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr "Permite el uso de diferentes unidades de medida"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr "Porcentaje"
 
 #. module: sale
 #: report:sale.order:0
@@ -192,29 +161,42 @@ msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forzar asignación"
+#: code:addons/sale/sale.py:807
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+"Por favor define una cuenta de ingreso para este producto: \"%s\" (id:%d)."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Precio Total"
 
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
 msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
 
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "Mis pedidos de venta"
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Ordered Quantities"
-msgstr "Cantidades pedidas"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Ventas por comercial"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Movimientos de inventario"
+msgstr "Cantidad solicitada"
 
 #. module: sale
 #: field:sale.order,name:0
@@ -225,21 +207,36 @@ msgstr "Referencia del pedido"
 #. module: sale
 #: view:sale.order:0
 msgid "Other Information"
-msgstr "Otra información"
+msgstr "Otra Información"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr "¡Advertencia!"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr "Proceso de Facturación"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Dates"
-msgstr "Fechas"
+msgid "Sales Order done"
+msgstr "Pedidos de Venta confirmados"
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Presupuestos y pedidos"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
 msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
-"La factura se crea de forma automática si la política de facturación es "
-"\"Facturar desde el albarán\" o \"Facturar pedido después del envío\"."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
@@ -247,39 +244,26 @@ msgid "Sales Make Invoice"
 msgstr "Ventas. Realizar factura"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Recrear albarán"
+#: code:addons/sale/sale.py:293
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "¡Advertencia de la lista de precios!"
 
 #. module: sale
 #: field:sale.order.line,discount:0
 msgid "Discount (%)"
 msgstr "Descuento (%)"
 
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Estos días por razones de seguridad se añaden a los que promete a los "
-"clientes."
-
 #. module: sale
 #: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Tablero responsable ventas"
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mis presupuestos"
 
 #. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Empaquetado"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Desde un pedido de venta"
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
 
 #. module: sale
 #: field:sale.shop,name:0
@@ -287,91 +271,75 @@ msgid "Shop Name"
 msgstr "Nombre tienda"
 
 #. module: sale
-#: code:addons/sale/sale.py:1014
-#, python-format
-msgid "No Customer Defined !"
-msgstr "¡No se ha definido un cliente!"
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "Cotización "
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr "Avance de %s %%"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders_exception
 msgid "Sales in Exception"
 msgstr "Ventas en excepción"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Cambiar a borrador"
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Conditions"
-msgstr "Condiciones"
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Estado"
 
 #. module: sale
-#: help:sale.order,order_policy:0
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_orders
 msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay Before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Shipping & Manual Invoice' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-"  - The 'Invoice On Order After Delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice From The Picking' choice is used to create an invoice "
-"during the picking process."
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"La política de envío se utiliza para sincronizar las operaciones de envío y "
-"facturación.\n"
-"  -La opción 'Pagar antes del envío' primero generará la factura y más tarde "
-"el albarán después del pago de dicha factura.\n"
-"  -La opción 'Envío y factura manual' creará el albarán directamente y "
-"esperará a que un usuario haga clic manualemente sobre el botón 'Facturar' "
-"para generar la factura en el estado borrador.\n"
-"  -La opción 'Facturar pedido después del envío' generará la factura en "
-"estado borrador basándose en el pedido de venta después de que todas los "
-"albaranes hayan sido realizados.\n"
-"  -La opción 'Facturar desde albarán' se utiliza para crear una factura "
-"durante el proceso de preparación del pedido."
-
-#. module: sale
-#: code:addons/sale/sale.py:939
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"¡No hay ninguna cuenta de categoría de ingresos definida en las propiedades "
-"por defecto de la categoría del producto o la posición fiscal no está "
-"definida!"
-
-#. module: sale
-#: view:sale.installer:0
-msgid "Configure"
-msgstr "Configurar"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Está intentando asignar un lote que no es del mismo producto"
-
-#. module: sale
-#: code:addons/sale/sale.py:620
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "Modo no válido para test_state"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "June"
 msgstr "Junio"
 
-#. module: sale
-#: code:addons/sale/sale.py:584
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "¡No se puede cancelar este pedido de venta!"
-
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
 msgid "Sales Orders Statistics"
@@ -388,22 +356,41 @@ msgid "October"
 msgstr "Octubre"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: sale
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr "Ver factura"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
+msgstr "Avance de  %s %s"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Quotations"
-msgstr "Presupuestos"
+msgstr "Cotizaciones"
 
 #. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Tarifa para el pedido de venta actual."
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Cantidad"
 
 #. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Delivery Order Only"
-msgstr "Sólo orden de entrega"
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
+msgstr "Dirección de entrega para este pedido"
 
 #. module: sale
 #: report:sale.order:0
@@ -411,18 +398,9 @@ msgid "TVA :"
 msgstr "IVA :"
 
 #. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Número de días entre la confirmación del pedido y el envío de los productos "
-"al cliente."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Fecha presupuesto"
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septiembre"
 
 #. module: sale
 #: field:sale.order,fiscal_position:0
@@ -430,77 +408,35 @@ msgid "Fiscal Position"
 msgstr "Posición fiscal"
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Número paquetes"
-
-#. module: sale
-#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "In Progress"
 msgstr "En proceso"
 
+#. module: sale
+#: code:addons/sale/sale.py:701
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr "Borrador de factura %s %s <b>en espera de aprobación</b>."
+
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
 msgid ""
 "The salesman confirms the quotation. The state of the sales order becomes "
 "'In progress' or 'Manual in progress'."
 msgstr ""
-"El comercial confirma el presupuesto. El estado del pedido de venta se "
+"El vendedor confirma el presupuesto. El estado del pedido de venta se "
 "convierte 'En proceso' o 'Manual en proceso'."
 
 #. module: sale
-#: code:addons/sale/sale.py:971
+#: code:addons/sale/sale.py:864
 #, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Debe cancelar primero los movimientos de stock asociados a esta línea de "
-"pedido de venta."
-
-#. module: sale
-#: code:addons/sale/sale.py:1042
-#, python-format
-msgid "(n/a)"
-msgstr "(n/a)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Seleccione un producto del tipo de servicio que se llama 'Producto "
-"avanzado'. Puede que tenga que crearlo y configurarlo como un valor por "
-"defecto para este campo."
+msgid "You cannot cancel a sale order line that has already been invoiced."
+msgstr "No puedes cancelar un pedido que ha sido facturado"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"No puede realizar un anticipo de un pedido de venta que está definido como "
-"'Factura automática después envío'."
-
-#. module: sale
-#: view:sale.order:0
-#: field:sale.order,note:0
-#: view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Notas"
+msgstr "Tel :"
 
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
@@ -508,20 +444,74 @@ msgid "Invoice address for current sales order."
 msgstr "Dirección de facturación para el pedido de venta actual."
 
 #. module: sale
-#: view:sale.installer:0
-msgid "Enhance your core Sales Application with additional functionalities."
-msgstr "Optimizar su aplicación de ventas con funcionalidades adicionales."
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
 
 #. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
+msgstr "Antes de la entrega"
+
+#. module: sale
+#: code:addons/sale/sale.py:824
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr "Direcciones en Pedidos de Venta"
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
+msgstr "Contrato"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr "Habilitar Facturación de líneas de pedido de venta"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Periodo (mes) del pedido de venta"
+
+#. module: sale
+#: code:addons/sale/sale.py:492
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"No puede agrupar ventas con diferentes monedas para el mismo cliente."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr "ó"
+
+#. module: sale
+#: constraint:res.partner:0
+msgid "Error: Invalid ean code"
+msgstr "Error: Código EAN no válido"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
 #: field:sale.order,invoiced_rate:0
 #: field:sale.order.line,invoiced:0
 msgid "Invoiced"
 msgstr "Facturado"
 
 #. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Orden de entrega"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
 
 #. module: sale
 #: field:sale.order,date_confirm:0
@@ -531,12 +521,12 @@ msgstr "Fecha confirmación"
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
-msgstr "Ubicación empresa"
+msgstr "Empresa Asociada"
 
 #. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique !"
-msgstr "¡La referencia del pedido debe ser única!"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr "Orden de Facturación"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -548,75 +538,76 @@ msgstr "Marzo"
 msgid "The total amount."
 msgstr "El importe total."
 
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
 msgid "Subtotal"
-msgstr "Subtotal"
+msgstr "Sub-Total"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
 msgid "Invoice address :"
-msgstr "Dirección de factura :"
+msgstr "Dirección de factura:"
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-"Para cada línea de pedido de venta, se crea una orden de abastecimiento para "
-"suministrar el producto vendido."
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr "Unidad de Medida "
 
 #. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
 msgstr ""
-"Incoterm, que significa 'Términos de Comercio Internacional', implica una "
-"serie de condiciones de venta que se utilizan en la transacción comercial."
 
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
 msgid "Invoice Address"
-msgstr "Dirección de factura"
+msgstr "Dirección de facturación"
 
 #. module: sale
 #: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Buscar líneas no facturadas"
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Líneas de pedidos de ventas relacionadas con un pedido de venta mío"
 
 #. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
 msgid "Quotation / Order"
-msgstr "Presupuesto / Pedido"
+msgstr "Cotización / Pedido"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,nbr:0
 msgid "# of Lines"
-msgstr "# de líneas"
+msgstr "Nº de líneas"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Ventas. Abrir factura"
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
 msgstr "Línea pedido de venta"
 
 #. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Setup your sales workflow and default values."
-msgstr "Configurar su flujo de ventas y valores por defecto."
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr "Un empleado puede tener diferentes roles por contrato"
 
 #. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
+#: view:sale.order:0
+msgid "Print"
+msgstr "Imprimir"
 
 #. module: sale
 #: report:sale.order:0
@@ -624,30 +615,35 @@ msgid "Order N°"
 msgstr "Pedido Nº"
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
 msgstr "Líneas del pedido"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Base imponible"
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
+msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Líneas a facturar"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Cantidad (UdM)"
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
 
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
-msgstr "Fecha creación"
+msgstr "Fecha de Creación"
+
+#. module: sale
+#: code:addons/sale/sale.py:693
+#, python-format
+msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+msgstr ""
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -664,14 +660,6 @@ msgstr "Total :"
 msgid "My Sales"
 msgstr "Mis ventas"
 
-#. module: sale
-#: code:addons/sale/sale.py:290
-#: code:addons/sale/sale.py:966
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Invalid action !"
-msgstr "¡Acción no válida!"
-
 #. module: sale
 #: field:sale.order,pricelist_id:0
 #: field:sale.report,pricelist_id:0
@@ -680,36 +668,106 @@ msgid "Pricelist"
 msgstr "Tarifa"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "Nº de ctdad"
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' status is set when the related sales order in draft status.    "
+"                 \n"
+"* The 'Confirmed' status is set when the related sales order is confirmed.   "
+"                  \n"
+"* The 'Exception' status is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' status is set when the sales order line has been picked.        "
+"             \n"
+"* The 'Cancelled' status is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1005
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
+#, python-format
+msgid "Configuration Error!"
+msgstr "¡Error de configuración!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Email"
+msgstr "Enviar por correo-e"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Hora"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Order Date"
-msgstr "Fecha pedido"
+msgstr "Fecha de pedido"
 
 #. module: sale
 #: view:sale.order.line:0
-#: field:sale.report,shipped:0
 msgid "Shipped"
 msgstr "Enviado"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Todos los presupuestos"
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice On Order After Delivery"
-msgstr "Facturar pedido después de envío"
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Septiembre"
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr "Crear y mostrar factura"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Fecha presupuesto"
+
+#. module: sale
+#: code:addons/sale/sale.py:624
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr "No puede confirmar un pedido de venta sin líneas."
+
+#. module: sale
+#: code:addons/sale/sale.py:987
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Tiene que seleccionar una tarifa o un cliente en el formulario del pedido."
 
 #. module: sale
 #: view:sale.report:0
@@ -717,72 +775,48 @@ msgstr "Septiembre"
 msgid "Category of Product"
 msgstr "Categoría de producto"
 
+#. module: sale
+#: code:addons/sale/sale.py:589
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr "¡No se pudo cancelar este pedido de vetas!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Volver a crear factura"
+
+#. module: sale
+#: code:addons/sale/sale.py:263
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Taxes :"
 msgstr "Impuestos :"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Movimientos de stock"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr "Bajo demanda"
 
 #. module: sale
-#: view:sale.report:0
-msgid "  Year  "
-msgstr "  Año  "
+#: field:sale.order,currency_id:0
+msgid "unknown"
+msgstr "desconocido"
 
 #. module: sale
-#: field:sale.order,state:0
-#: field:sale.report,state:0
-msgid "Order State"
-msgstr "Estado del pedido"
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Es un Seguidor"
 
 #. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "¿Desea crear la(s) factura(s)?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Ventas por mes"
-
-#. module: sale
-#: code:addons/sale/sale.py:970
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "¡No se puede cancelar línea pedido de venta!"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Días seguridad"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Abastecimiento de material vendido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Crear factura final"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Dirección de envío"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"Indica que el pedido de venta ha sido entregado. Este campo se actualiza "
-"sólo después que el planificador(es) se ha ejecutado."
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Fecha"
 
 #. module: sale
 #: view:sale.report:0
@@ -790,79 +824,37 @@ msgid "Extended Filters..."
 msgstr "Filtros extendidos..."
 
 #. module: sale
-#: model:ir.module.module,description:sale.module_meta_information
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Excepción"
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
 msgid ""
-"\n"
-"    The base module to manage quotations and sales orders.\n"
-"\n"
-"    * Workflow with validation steps:\n"
-"        - Quotation -> Sales order -> Invoice\n"
-"    * Invoicing methods:\n"
-"        - Invoice on order (before or after shipping)\n"
-"        - Invoice on delivery\n"
-"        - Invoice on timesheets\n"
-"        - Advance invoice\n"
-"    * Partners preferences (shipping, invoicing, incoterm, ...)\n"
-"    * Products stocks and prices\n"
-"    * Delivery methods:\n"
-"        - all at once, multi-parcel\n"
-"        - delivery costs\n"
-"    * Dashboard for salesman that includes:\n"
-"    * Your open quotations\n"
-"    * Top 10 sales of the month\n"
-"    * Cases statistics\n"
-"    * Graph of sales by product\n"
-"    * Graph of cases of the month\n"
-"    "
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
-"\n"
-"    El módulo base para gestionar presupuestos y pedidos de venta.\n"
-"\n"
-"    * Flujo de trabajo con etapas de validación:\n"
-"        - Presupuesto -> Pedido de venta -> Factura\n"
-"    * Métodos de facturación:\n"
-"        - Factura del pedido (antes o después del envío)\n"
-"        - Factura del albarán\n"
-"        - Factura de la hoja de servicios\n"
-"        - Avanzar factura\n"
-"    * Preferencias de los clientes (envío, facturación, incoterm, ...)\n"
-"    * Existencias de los productos y precios\n"
-"    * Formas de envío:\n"
-"        - Todo a la vez, En varios paquetes\n"
-"        - Gastos de envío\n"
-"    * El tablero para el comercial incluye:\n"
-"    * Sus presupuestos abiertos\n"
-"    * Las 10 mejores ventas del mes\n"
-"    * Estadísticas de casos\n"
-"    * Gráfico de las ventas por producto\n"
-"    * Gráfico de los casos por mes\n"
-"    "
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Tienda ventas"
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure notification on products and trigger them when a user "
+"wants to sale a given product or a given customer.\n"
+"Example: Product: this product is deprecated, do not purchase more than 5.\n"
+"                Supplier: don't forget to ask for an express delivery."
+msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Compañías"
+#: code:addons/sale/sale.py:1000
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "¡No se ha encontrado una linea de tarifa válida!"
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Noviembre"
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Historial"
-
-#. module: sale
-#: field:sale.config.picking_policy,picking_policy:0
-msgid "Picking Default Policy"
-msgstr "Política de empaquetado por defecto"
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr "Mostrar margenes en pedidos de venta"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -872,8 +864,8 @@ msgid ""
 "example)."
 msgstr ""
 "Esta es la lista de facturas que han sido generadas para este pedido de "
-"venta. El mismo pedido de venta puede haber sido facturado varias veces "
-"(línea a línea, por ejemplo)."
+"venta. El mismo pedido de venta puede haber sido facturado varias veces (Ej, "
+"por linea de pedido)."
 
 #. module: sale
 #: report:sale.order:0
@@ -881,141 +873,92 @@ msgid "Your Reference"
 msgstr "Su referencia"
 
 #. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-"El nombre y la dirección del contacto que ha solicitado el pedido o "
-"presupuesto."
-
-#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You cannot cancel a sales order line that has already been invoiced !"
-msgstr ""
-"¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
-
-#. module: sale
-#: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Qty"
-msgstr "Ctdad"
+msgstr "Cantidad"
 
 #. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Referencias"
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Mis líneas de pedidos de venta"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
-#: model:process.transition.action,name:sale.process_transition_action_cancel1
-#: model:process.transition.action,name:sale.process_transition_action_cancel2
 #: view:sale.advance.payment.inv:0
 #: view:sale.make.invoice:0
+#: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.order.line.make.invoice:0
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: sale
-#: field:sale.installer,sale_order_dates:0
-msgid "Sales Order Dates"
-msgstr "Fechas en pedidos de venta"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "¡La referencia del pedido debe ser única por compañía!"
 
 #. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Excepción"
+#: code:addons/sale/sale.py:997
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
 msgstr "Crear factura"
 
 #. module: sale
-#: field:sale.installer,sale_margin:0
-msgid "Margins in Sales Orders"
-msgstr "Márgenes en pedidos de venta"
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Referencia de pedido"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Total sin impuestos"
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calcular"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Ventas por empresa"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Contacto del pedido"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Abrir factura"
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-#: view:sale.order.line:0
 msgid "Price"
 msgstr "Precio"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_installer
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "Sales Application Configuration"
-msgstr "Configuración aplicaciones de ventas"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Precio total"
+#: view:sale.order:0
+msgid "Quotation Number"
+msgstr "Número de Cotización"
 
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "on order"
 msgstr "bajo pedido"
 
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Basado en las cantidades enviadas o pedidas."
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Albarán relacionado"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Nombre"
-
 #. module: sale
 #: report:sale.order:0
 msgid "Shipping address :"
 msgstr "Dirección de envío :"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Ventas por cliente últimos 90 días"
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
 
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
@@ -1023,45 +966,60 @@ msgid "Draft state of sales order"
 msgstr "Estado borrador del pedido de venta"
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Crear orden de entrega"
+#: code:addons/sale/sale.py:681
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
 
 #. module: sale
-#: field:sale.installer,delivery:0
-msgid "Delivery Costs"
-msgstr "Costes de envío"
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "New Copy of Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1028
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:909
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Included"
-msgstr "Total impuestos incluidos"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Crear albarán"
+msgstr "Total (impuestos incluidos)"
 
 #. module: sale
 #: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Ventas por categoría de producto"
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Partial Delivery"
-msgstr "Envío parcial"
+msgid "Ordered date of the sales order"
+msgstr "Fecha ordenada de los pedidos de venta"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_confirmquotation0
 msgid "Confirm Quotation"
-msgstr "Confirmar presupuesto"
+msgstr "Confirmar Cotización"
 
 #. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Referencia del documento que ha generado esta solicitud de pedido de venta."
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr "Líneas de pedido a facturar"
 
 #. module: sale
 #: view:sale.order:0
@@ -1071,15 +1029,14 @@ msgid "Group By..."
 msgstr "Agrupar por..."
 
 #. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Volver a Crear factura"
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr "Detalles de Producto"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Albaranes a facturar"
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr "Detalles del contrato"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1087,79 +1044,79 @@ msgstr "Albaranes a facturar"
 msgid "Waiting Schedule"
 msgstr "Esperando fecha planificada"
 
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr "Unidad de medida"
+
 #. module: sale
 #: field:sale.order.line,type:0
 msgid "Procurement Method"
 msgstr "Método abastecimiento"
 
 #. module: sale
-#: view:sale.config.picking_policy:0
-#: view:sale.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Albarán"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Order date"
-msgstr "Fecha pedido"
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr "Mensajes sin leer"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Documento del movimiento a la salida o al cliente."
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Validar"
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Pedido de venta"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Confirmar pedido"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Crear orden abastecimiento"
-
-#. module: sale
-#: view:sale.order:0
 #: field:sale.order,amount_tax:0
 #: field:sale.order.line,tax_id:0
 msgid "Taxes"
 msgstr "Impuestos"
 
 #. module: sale
-#: field:sale.order,order_policy:0
-msgid "Shipping Policy"
-msgstr "Política de facturación"
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Pedidos preparados para ser facturados"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
 
 #. module: sale
 #: help:sale.order,create_date:0
 msgid "Date on which sales order is created."
 msgstr "Fecha en la que se crea el pedido de venta."
 
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Movimiento stock"
-
 #. module: sale
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "Create Invoices"
-msgstr "Crear facturas"
+msgstr "Crear Facturas"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Información extra"
+#: code:addons/sale/sale.py:263
+#: code:addons/sale/sale.py:864
+#: code:addons/sale/sale.py:1028
+#, python-format
+msgid "Invalid Action!"
+msgstr "¡Acción inválida!"
 
 #. module: sale
 #: report:sale.order:0
@@ -1169,7 +1126,7 @@ msgstr "Fax :"
 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
 msgid "Advance Amount"
-msgstr "Importe avanzado"
+msgstr ""
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -1177,28 +1134,36 @@ msgid "Shipped Quantities"
 msgstr "Cantidades enviadas"
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Factura basada en pedidos de venta"
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Albarán"
-
-#. module: sale
-#: code:addons/sale/sale.py:387
-#: code:addons/sale/sale.py:920
-#: code:addons/sale/sale.py:938
+#: code:addons/sale/sale.py:294
 #, python-format
-msgid "Error !"
-msgstr "¡Error!"
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Si cambia la tarifa de este pedido (y eventualmente la moneda), los precios "
+"existentes en las líneas del pedido no se actualizarán."
 
 #. module: sale
-#: code:addons/sale/sale.py:570
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "¡No se puede cancelar el pedido de venta!"
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Realizar facturas"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr "Número de pedido de venta"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "A facturar"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Año ordenado de los pedidos de venta"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1206,9 +1171,16 @@ msgid "July"
 msgstr "Julio"
 
 #. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Abastecimiento"
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1222,15 +1194,20 @@ msgid "Group the invoices"
 msgstr "Agrupar las facturas"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Enviar & Factura manual"
+#: code:addons/sale/sale.py:685
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1051
-#, python-format
-msgid "Picking Information !"
-msgstr "¡Información albarán!"
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr "Gestión de contratos"
 
 #. module: sale
 #: view:sale.report:0
@@ -1238,49 +1215,26 @@ msgstr "¡Información albarán!"
 msgid "Month"
 msgstr "Mes"
 
-#. module: sale
-#: model:ir.module.module,shortdesc:sale.module_meta_information
-msgid "Sales Management"
-msgstr "Ventas"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice From The Picking"
-msgstr "Factura desde el albarán"
-
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
 msgid "To be reviewed by the accountant."
-msgstr "Para ser revisado por el contable."
+msgstr "Para ser revisado por el contador"
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,uom_name:0
-msgid "Reference UoM"
-msgstr "Referencia UdM"
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crear facturas"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
 msgid "Sale OrderLine Make_invoice"
-msgstr "Venta Línea_pedido Realizar_factura"
-
-#. module: sale
-#: help:sale.config.picking_policy,step:0
-msgid ""
-"By default, OpenERP is able to manage complex routing and paths of products "
-"in your warehouse and partner locations. This will configure the most common "
-"and simple methods to deliver products to the customer in one or two "
-"operations by the worker."
 msgstr ""
-"Por defecto, OpenERP es capaz de gestionar complejas rutas y caminos de los "
-"productos en su almacén y en las ubicaciones de otras empresas. Esto "
-"configurará los métodos más comunes y sencillos para entregar los productos "
-"al cliente en una o dos operaciones realizadas por el trabajador."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
 msgid "Old Quotations"
-msgstr "Presupuestos antiguos"
+msgstr "Cotizaciones anteriores"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1294,17 +1248,12 @@ msgstr "Pagado"
 msgid "Sales Analysis"
 msgstr "Análisis de ventas"
 
-#. module: sale
-#: field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Propiedades"
-
 #. module: sale
 #: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0
+#: view:sale.order:0
 #: selection:sale.report,state:0
 msgid "Quotation"
-msgstr "Presupuesto"
+msgstr "Cotización"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoice0
@@ -1313,65 +1262,182 @@ msgid ""
 "is 'Shipping and Manual in Progress'. The invoice is created automatically "
 "if the shipping policy is 'Payment before Delivery'."
 msgstr ""
-"El comercial crea una factura manualmente si la política de facturación del "
+"El vendedor crea una factura manualmente, si la política de facturación del "
 "pedido de venta es \"Envío y Factura manual\". La factura se crea de forma "
 "automática si la política de facturación es 'Pago antes del envío'."
 
 #. module: sale
-#: help:sale.config.picking_policy,order_policy:0
+#: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
-"You can generate invoices based on sales orders or based on shippings."
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state != 'draft':\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
-"Puede generar facturas basadas en pedidos de venta o basadas en envíos."
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr "Líneas de pedido de venta confirmadas, pero no entregadas aún"
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice).                                              You have to choose  "
+"if you want your invoice based on ordered "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:431
+#, python-format
+msgid "Customer Invoices"
+msgstr "Facturas de cliente"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
 #: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Sales"
 msgstr "Ventas"
 
+#. module: sale
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 #: field:sale.order.line,price_unit:0
 msgid "Unit Price"
-msgstr "Precio unidad"
+msgstr "Precio unitario"
 
 #. module: sale
+#: view:sale.order:0
 #: selection:sale.order,state:0
 #: view:sale.order.line:0
 #: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Done"
-msgstr "Realizado"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_installer
-msgid "sale.installer"
-msgstr "venta.instalador"
+msgstr "Completado"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
+#: view:sale.order:0
 msgid "Invoice"
 msgstr "Factura"
 
-#. module: sale
-#: code:addons/sale/sale.py:1014
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"¡Debe seleccionar un cliente en el formulario de ventas!\n"
-"Introduzca un cliente antes de seleccionar un producto."
-
-#. module: sale
-#: selection:sale.config.picking_policy,step:0
-msgid "Picking List & Delivery Order"
-msgstr "Albarán y Orden de entrega"
-
 #. module: sale
 #: field:sale.order,origin:0
 msgid "Source Document"
@@ -1382,38 +1448,15 @@ msgstr "Documento origen"
 msgid "To Do"
 msgstr "Para hacer"
 
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Política de envío"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Documento del movimiento al cliente."
-
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax."
-msgstr "El importe sin impuestos."
-
-#. module: sale
-#: code:addons/sale/sale.py:571
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-"Debe primero cancelar todos los albaranes relacionados con este pedido de "
-"venta."
+msgstr "Importe antes de impuestos"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_advance_payment_inv
 msgid "Sales Advance Payment Invoice"
-msgstr "Ventas. Anticipo pago factura"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
+msgstr ""
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1424,42 +1467,37 @@ msgid "Product"
 msgstr "Producto"
 
 #. module: sale
-#: model:ir.ui.menu,name:sale.menu_invoiced
-msgid "Invoicing"
-msgstr "Facturación"
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order lines"
+msgstr "Generar factura basado en pedidos de venta"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Cancelar asignación"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: help:sale.order,state:0
+#: help:sale.order,order_policy:0
 msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the date 'Ordered Date'."
+"On demand: A draft invoice can be created from the sales order when needed. "
+"\n"
+"On delivery order: A draft invoice can be created from the delivery order "
+"when the products have been delivered. \n"
+"Before delivery: A draft invoice is created from the sales order and must be "
+"paid before the products can be delivered."
 msgstr ""
-"Indica el estado del presupuesto o pedido de venta. \n"
-"El estado de excepción se establece automáticamente cuando se produce una "
-"operación de cancelación en la validación de factura (excepción de factura) "
-"o en el procesado del albarán (excepción de envío). \n"
-"El estado 'Esperando planificación' se establece cuando se confirma la "
-"factura, pero está esperando que el planificador la active en la fecha de "
-"\"Fecha pedido\"."
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Volumen mensual"
 
 #. module: sale
 #: field:sale.order,invoice_quantity:0
 msgid "Invoice on"
-msgstr "Facturar las"
+msgstr "Facturar"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -1472,32 +1510,29 @@ msgid "Product UoS"
 msgstr "UdV del producto"
 
 #. module: sale
-#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "Manual en proceso"
 
 #. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "UdM del producto"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logística"
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr "Marcar como no leido"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Order"
-msgstr "Pedido"
+msgstr "Pedidos"
 
 #. module: sale
-#: code:addons/sale/sale.py:921
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-"No se ha definido una cuenta de ingresos para este producto: \"%s\" (id:%d)"
+#: view:sale.order:0
+msgid "Confirm Sale"
+msgstr "Confirmar venta"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Desde un pedido de venta"
 
 #. module: sale
 #: view:sale.order:0
@@ -1514,33 +1549,28 @@ msgid ""
 msgstr ""
 "En función del control de facturación de los pedidos de venta, la factura "
 "puede estar basada en las cantidades entregadas o pedidas. Por lo tanto, un "
-"pedido de venta puede generar una factura o un albarán tan pronto como sea "
-"confirmado por el comercial."
+"pedido de venta puede generar una factura o salida de almacén tan pronto "
+"como sea confirmado por el vendedor."
 
 #. module: sale
-#: code:addons/sale/sale.py:1116
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr "Algunas líneas de pedido"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
 msgstr ""
-"¡Prevé vender %.2f %s pero sólo %.2f %s están disponibles!\n"
-"El stock real es %.2f %s. (sin reservas)"
 
 #. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Estados"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contenidos"
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr "Descuentos en líneas de pedido"
 
 #. module: sale
 #: field:sale.order,client_order_ref:0
 msgid "Customer Reference"
-msgstr "Referencia cliente"
+msgstr "Referencia del cliente"
 
 #. module: sale
 #: field:sale.order,amount_total:0
@@ -1549,47 +1579,59 @@ msgid "Total"
 msgstr "Total"
 
 #. module: sale
-#: code:addons/sale/sale.py:388
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"No se ha definido un diario de ventas para esta compañía: \"%s\" (id:%d)"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
+#: view:sale.advance.payment.inv:0
 msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
 msgstr ""
-"Dependiendo de la configuración de la ubicación de salida, el movimiento "
-"entre la zona de salida y el cliente se realiza a través de la orden de "
-"entrega de forma manual o automática."
 
 #. module: sale
-#: code:addons/sale/sale.py:1165
-#, python-format
-msgid "Cannot delete a sales order line which is %s !"
-msgstr "¡No se puede eliminar una línea de pedido de venta que está %s!"
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Tablero de ventas"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Realizar facturas"
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Para facturar"
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
 
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
 msgstr "Fecha en la que se confirma el pedido de venta."
 
+#. module: sale
+#: code:addons/sale/sale.py:590
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
 #. module: sale
 #: field:sale.order,company_id:0
 #: field:sale.order.line,company_id:0
@@ -1616,96 +1658,112 @@ msgid "Invoice Exception"
 msgstr "Excepción de factura"
 
 #. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-"Esta es la lista de albaranes que han sido generados para este pedido de "
-"venta."
+#: code:addons/sale/sale.py:909
+#, python-format
+msgid "No Customer Defined !"
+msgstr "¡No se ha definido un cliente!"
 
 #. module: sale
-#: help:sale.installer,sale_margin:0
-msgid ""
-"Gives the margin of profitability by calculating the difference between Unit "
-"Price and Cost Price."
-msgstr ""
-"Indica el margen de rentabilidad mediante el cálculo de la diferencia entre "
-"el precio unitario y el precio de coste."
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
+msgstr "Dirección de entrega"
 
 #. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Crear facturas"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr "Pedido a facturar"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr "Detalles de almacén"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr "Informes"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: sale
+#: code:addons/sale/sale.py:350
+#: code:addons/sale/sale.py:491
+#: code:addons/sale/sale.py:624
+#: code:addons/sale/sale.py:806
+#: code:addons/sale/sale.py:823
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Net Total :"
 msgstr "Total neto :"
 
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"From stock: When needed, the product is taken from the stock or we wait for "
+"replenishment.\n"
+"On order: When needed, the product is purchased or produced."
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,state:0
 #: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Cancelled"
-msgstr "Cancelado"
+msgstr "Cancelado/a"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Buscar líneas no facturadas"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr "Cotizaciones enviadas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "Asistente de creación de correo-e"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form
 #: field:sale.order,shop_id:0
 #: view:sale.report:0
 #: field:sale.report,shop_id:0
 msgid "Shop"
 msgstr "Tienda"
 
-#. module: sale
-#: view:sale.report:0
-msgid "   Month   "
-msgstr "   Mes   "
-
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
 msgstr "Fecha confirmación"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/sale.py:351
 #, python-format
-msgid "Warning"
-msgstr "Aviso"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Ventas por mes"
-
-#. module: sale
-#: code:addons/sale/sale.py:1045
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"\n"
-"EAN: %s Quantity: %s Type of ul: %s"
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
 msgstr ""
-"Ha seleccionado una cantidad de %d unidades.\n"
-"Pero no es compatible con el embalaje seleccionado.\n"
-"Aquí tiene una propuesta de cantidades acordes con este embalaje:\n"
-"\n"
-"EAN: %s Cantidad: %s Tipo de ul: %s"
 
 #. module: sale
+#: code:addons/sale/sale.py:273
+#: code:addons/sale/sale.py:610
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
 #: model:res.request.link,name:sale.req_link_sale_order
 #: view:sale.order:0
-#: field:stock.picking,sale_id:0
+#, python-format
 msgid "Sales Order"
-msgstr "Pedido de venta"
+msgstr "Pedidos de Venta"
 
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
@@ -1713,86 +1771,113 @@ msgid "Quantity (UoS)"
 msgstr "Cantidad (UdV)"
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"El albarán se crea tan pronto como se confirma el pedido de venta, a la vez "
-"que la orden de abastecimiento. Representa la asignación de los componentes "
-"del pedido de venta. Hay un albarán por línea del pedido de venta que "
-"evoluciona con la disponibilidad de los componentes."
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr "Pedidos de venta que están en estado 'Realizado'"
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Confirmed"
 msgstr "Confirmado"
 
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr "Términos y condiciones"
+
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No puede crear compañías recursivas."
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr "Seguidores"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Ventas por categoría de producto últimos 90 días"
-
-#. module: sale
-#: view:sale.order:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Líneas de factura"
 
 #. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr "Marcar como leido"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
 msgstr "Líneas pedido de ventas"
 
 #. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Tiempo inicial entrega"
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
 
 #. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Configuración"
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
 
 #. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Complete Delivery"
-msgstr "Envío completo"
+#: code:addons/sale/edi/sale_order.py:139
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "Tarifa EDI (%s)"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
+msgstr "En proceso de entrega"
 
 #. module: sale
 #: view:sale.report:0
-msgid "    Month-1    "
-msgstr "    Mes-1    "
+msgid "Reference Unit of Measure"
+msgstr "Referencia de unidad de medida"
 
 #. module: sale
-#: help:sale.config.picking_policy,picking_policy:0
+#: model:ir.actions.act_window,help:sale.action_quotations
 msgid ""
-"The Shipping Policy is used to configure per order if you want to deliver as "
-"soon as possible when one product is available or you wait that all products "
-"are available.."
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"La política de envío se utiliza para configurar el pedido si debe entregarse "
-"tan pronto como sea posible cuando un producto está disponible o debe "
-"esperar a que todos los productos están disponibles."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:111
@@ -1809,14 +1894,17 @@ msgstr ""
 "\"cancelada\".\n"
 "2. La línea del pedido de venta está facturada."
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr "Lineas del pedido de venta realizadas"
+
 #. module: sale
 #: field:sale.order.line,th_weight:0
 msgid "Weight"
 msgstr "Peso"
 
 #. module: sale
-#: view:sale.open.invoice:0
-#: view:sale.order:0
 #: field:sale.order,invoice_ids:0
 msgid "Invoices"
 msgstr "Facturas"
@@ -1827,40 +1915,16 @@ msgid "December"
 msgstr "Diciembre"
 
 #. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-#: field:sale.installer,config_logo:0
-msgid "Image"
-msgstr "Imagen"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
 msgstr ""
-"Se crea automáticamente una orden de abastecimiento tan pronto como se "
-"confirma un pedido de venta o se paga la factura. Provoca la compra y la "
-"producción de productos según las reglas y los parámetros del pedido de "
-"venta. "
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Uninvoiced"
 msgstr "No facturada"
 
-#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
-#: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
-#: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Comercial"
-
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorder0
 msgid "Drives procurement and invoicing"
@@ -1869,22 +1933,18 @@ msgstr "Genera abastecimiento y facturación"
 #. module: sale
 #: field:sale.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr "Base imponible"
+msgstr "Base"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0
-#: view:sale.order:0
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
 #, python-format
 msgid "Advance Invoice"
-msgstr "Avanzar factura"
+msgstr "Anticipo de factura"
 
 #. module: sale
-#: code:addons/sale/sale.py:591
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "El pedido de venta '%s' ha sido cancelado."
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1892,27 +1952,9 @@ msgid "Draft"
 msgstr "Borrador"
 
 #. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' state is set when the related sales order in draft state.      "
-"               \n"
-"* The 'Confirmed' state is set when the related sales order is confirmed.    "
-"                 \n"
-"* The 'Exception' state is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' state is set when the sales order line has been picked.         "
-"            \n"
-"* The 'Cancelled' state is set when a user cancel the sales order related."
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sale orders"
 msgstr ""
-"* El estado 'Borrador' se establece cuando se crea el pedido de venta.\n"
-"* El estado 'Confirmado' se establece cuando se confirma el pedido de "
-"venta.\n"
-"* El estado 'Excepción' se establece cuando el pedido de venta tiene una "
-"excepción.\n"
-"* El estado 'Realizado' se establece cuando las líneas del pedido de venta "
-"se han enviado.\n"
-"* El estado 'Cancelado' se establece cuando un usuario cancela el pedido de "
-"venta."
 
 #. module: sale
 #: help:sale.order,amount_tax:0
@@ -1921,65 +1963,51 @@ msgstr "El importe de los impuestos."
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "Albaranes"
+msgid "Sale Order "
+msgstr "Pedido de venta "
 
 #. module: sale
-#: field:sale.config.picking_policy,progress:0
-#: field:sale.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso configuración"
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "Líneas del pedido de venta para ser facturadas"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-msgid "Product sales"
-msgstr "Ventas de producto"
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "Plantillas de correo electrónico"
 
 #. module: sale
-#: field:sale.order,date_order:0
-msgid "Ordered Date"
-msgstr "Fecha pedido"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order
 #: view:sale.order:0
 msgid "Sales Orders"
 msgstr "Pedidos de ventas"
 
 #. module: sale
-#: selection:sale.config.picking_policy,picking_policy:0
-msgid "Direct Delivery"
-msgstr "Envío directo"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Tiendas de venta"
 
 #. module: sale
-#: field:sale.installer,sale_journal:0
-msgid "Invoicing journals"
-msgstr "Diarios de facturación"
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr "Comentarios y correos-e"
 
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
-msgstr "Producto avanzado"
-
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped Qty"
-msgstr "Ctdad enviada"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "¡La factura ha sido creada correctamente!"
-
-#. module: sale
-#: code:addons/sale/sale.py:585
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
 msgstr ""
-"Primero debe cancelar todas las facturas relacionadas con este pedido de "
-"venta."
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de líneas de ventas."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1987,25 +2015,26 @@ msgid "January"
 msgstr "Enero"
 
 #. module: sale
-#: view:sale.installer:0
-msgid "Configure Your Sales Management Application"
-msgstr "Configurar su aplicación de gestión de ventas"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
 msgid "Sales Order in Progress"
 msgstr "Pedidos de ventas en proceso"
 
 #. module: sale
-#: field:sale.installer,sale_layout:0
-msgid "Sales Order Layout Improvement"
-msgstr "Mejora plantilla pedido de venta"
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#: code:addons/sale/sale.py:689
 #, python-format
-msgid "Error"
-msgstr "Error"
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referencia del documento que ha generado esta solicitud de pedido de venta."
 
 #. module: sale
 #: view:sale.report:0
@@ -2014,18 +2043,14 @@ msgid "Commitment Delay"
 msgstr "Retraso realización"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
-msgstr ""
-"Una orden de abastecimiento para cada línea del pedido de venta y para cada "
-"uno de los componentes."
+#: field:sale.report,state:0
+msgid "Order Status"
+msgstr "Estado del pedido"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Asignar"
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
@@ -2035,19 +2060,12 @@ msgstr "Fecha pedido"
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
-msgstr "Pedido de venta confirmado a factura."
+msgstr "Pedidos de venta confirmados para factura."
 
 #. module: sale
-#: code:addons/sale/sale.py:290
-#, python-format
-msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr "¡No se puede eliminar pedido(s) de venta que ya está confirmado!"
-
-#. module: sale
-#: code:addons/sale/sale.py:316
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "El pedido de venta '%s' ha sido cambiado a estado borrador."
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Pedidos de venta sin confirmar"
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -2055,50 +2073,21 @@ msgid "from stock"
 msgstr "desde stock"
 
 #. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr "Política de envío por defecto"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Entregado"
-
-#. module: sale
-#: code:addons/sale/sale.py:1115
+#: code:addons/sale/sale.py:989
 #, python-format
-msgid "Not enough stock !"
-msgstr "¡No hay stock suficiente!"
+msgid "No Pricelist ! : "
+msgstr "¡No hay tarifa! "
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Debe asignar un lote de producción para este producto"
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
+msgid "Sale Orders"
+msgstr "Pedidos de venta"
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Layout Sequence"
-msgstr "Secuencia plantilla"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
 msgstr ""
-"Si tiene más de una tienda donde vende los productos de su compañía, puede "
-"crearlas y gestionarlas desde aquí. Cada vez que codifique un nuevo "
-"presupuesto o pedido de venta, debe estar vinculado a una tienda. La tienda "
-"también define desde que almacén serán entregados los productos para cada "
-"venta."
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2109,7 +2098,7 @@ msgstr "Indica que una factura ha sido pagada."
 #: report:sale.order:0
 #: field:sale.order.line,name:0
 msgid "Description"
-msgstr "Descripción"
+msgstr "Descripción"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2117,10 +2106,15 @@ msgid "May"
 msgstr "Mayo"
 
 #. module: sale
-#: help:sale.installer,sale_order_dates:0
-msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
-"Añade fechas de realización, solicitud y efectivo en pedidos de venta."
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "¿Desea crear la(s) factura(s)?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Number"
+msgstr "Número de pedido"
 
 #. module: sale
 #: view:sale.order:0
@@ -2139,29 +2133,19 @@ msgstr "Anticipo"
 msgid "February"
 msgstr "Febrero"
 
-#. module: sale
-#: help:sale.installer,sale_journal:0
-msgid ""
-"Allows you to group and invoice your delivery orders according to different "
-"invoicing types: daily, weekly, etc."
-msgstr ""
-"Permite agrupar y facturar sus albaranes de acuerdo a diferentes tipos de "
-"facturación: diaria, semanal, etc."
-
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Abril"
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Contabilidad"
-
-#. module: sale
-#: field:sale.config.picking_policy,step:0
-msgid "Steps To Deliver a Sales Order"
-msgstr "Pasos para entregar un pedido de venta"
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
@@ -2170,9 +2154,19 @@ msgid "Search Sales Order"
 msgstr "Buscar pedido de venta"
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Solicitud pedido de venta"
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "¡Error! No puede crear miembros asociados recursivamente."
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
 
 #. module: sale
 #: report:sale.order:0
@@ -2181,12 +2175,9 @@ msgid "Payment Term"
 msgstr "Plazo de pago"
 
 #. module: sale
-#: help:sale.installer,sale_layout:0
-msgid ""
-"Provides some features to improve the layout of the Sales Order reports."
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
 msgstr ""
-"Proporciona algunas funcionalidades para mejorar la plantilla de los "
-"informes de pedidos de ventas."
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2197,9 +2188,9 @@ msgid ""
 "having invoiced yet. If you want to analyse your turnover, you should use "
 "the Invoice Analysis report in the Accounting application."
 msgstr ""
-"Este informe realiza un análisis de sus presupuestos y pedidos de venta. El "
+"Este informe realiza un análisis de sus cotizaciones y pedidos de venta. El "
 "análisis verifica los ingresos de sus ventas y las ordena por diferentes "
-"grupos de criterios (comercial, empresa, producto, etc.). Utilice este "
+"grupos de criterios (vendedor, empresa, producto, etc.). Utilice este "
 "informe para realizar un análisis sobre sus ventas todavía no facturadas. Si "
 "desea analizar sus ingresos, debería utilizar el informe de análisis de "
 "facturas en la aplicación de Contabilidad."
@@ -2207,10 +2198,9 @@ msgstr ""
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
-msgstr "Presupuesto Nº"
+msgstr "Cotización Nº"
 
 #. module: sale
-#: field:sale.order,picked_rate:0
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Enviada"
@@ -2219,447 +2209,4 @@ msgstr "Enviada"
 #: view:sale.report:0
 #: field:sale.report,year:0
 msgid "Year"
-msgstr "Año"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Facturar desde albaranes"
-
-#~ msgid "Configure Sale Order Logistic"
-#~ msgstr "Configurar la logística de los pedidos de venta"
-
-#~ msgid "Recreate Procurement"
-#~ msgstr "Recrear abastecimiento"
-
-#~ msgid "Steps To Deliver a Sale Order"
-#~ msgstr "Pasos para entregar un pedido de venta"
-
-#~ msgid "You invoice has been successfully created !"
-#~ msgstr "¡Su factura ha sido creada correctamente!"
-
-#~ msgid "Automatic Declaration"
-#~ msgstr "Declaración automática"
-
-#~ msgid ""
-#~ "This is the list of picking list that have been generated for this invoice"
-#~ msgstr "Ésta es la lista de albaranes que se han generado para esta factura"
-
-#~ msgid "Delivery, from the warehouse to the customer."
-#~ msgstr "Entrega, desde el almacén hasta el cliente."
-
-#~ msgid "After confirming order, Create the invoice."
-#~ msgstr "Después de confirmar el pedido, crear la factura."
-
-#~ msgid ""
-#~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
-#~ "is, quotation is moved to  sale order."
-#~ msgstr ""
-#~ "Cuando presiona el botón Confirmar, el estado Borrador cambia a Manual. es "
-#~ "decir, el presupuesto cambia a pedido de venta."
-
-#~ msgid "Manual Designation"
-#~ msgstr "Designación manual"
-
-#~ msgid "Invoice after delivery"
-#~ msgstr "Facturar después del envío"
-
-#~ msgid "Origin"
-#~ msgstr "Origen"
-
-#~ msgid "Outgoing Products"
-#~ msgstr "Productos salientes"
-
-#~ msgid "Reference"
-#~ msgstr "Referencia"
-
-#~ msgid "Procurement is created after confirmation of sale order."
-#~ msgstr "El abastecimiento es creado después de confirmar un pedido de venta."
-
-#~ msgid "Procure Method"
-#~ msgstr "Método abastecimiento"
-
-#~ msgid "Net Price"
-#~ msgstr "Precio neto"
-
-#~ msgid "My sales order in progress"
-#~ msgstr "Mis pedidos de ventas en proceso"
-
-#~ msgid ""
-#~ "The sale order will automatically create the invoice proposition (draft "
-#~ "invoice). Ordered and delivered quantities may not be the same. You have to "
-#~ "choose if you invoice based on ordered or shipped quantities. If the product "
-#~ "is a service, shipped quantities means hours spent on the associated tasks."
-#~ msgstr ""
-#~ "El pedido de venta creará automáticamente la propuesta de factura (factura "
-#~ "borrador). Las cantidades pedidas y las cantidades enviadas pueden no ser "
-#~ "las mismas. Tiene que decidir si factura basado en cantidades pedidas o "
-#~ "enviadas. Si el producto es un servicio, cantidades enviadas significa horas "
-#~ "dedicadas a las tareas asociadas."
-
-#, python-format
-#~ msgid ""
-#~ "You cannot make an advance on a sale order that is defined as 'Automatic "
-#~ "Invoice after delivery'."
-#~ msgstr ""
-#~ "No puede hacer un anticipo en un pedido de venta definido como 'Factura "
-#~ "automática después del envío'."
-
-#~ msgid "All Sales Order"
-#~ msgstr "Todos los pedidos de ventas"
-
-#~ msgid "Sale Shop"
-#~ msgstr "Tienda de ventas"
-
-#~ msgid ""
-#~ "Packing list is created when 'Assign' is being clicked after confirming the "
-#~ "sale order. This transaction moves the sale order to packing list."
-#~ msgstr ""
-#~ "Se crea un albarán cuando presione 'Asigna' después de haber confirmado el "
-#~ "pedido de venta. Esta transacción convierte el pedido de venta a albarán."
-
-#~ msgid "My sales order waiting Invoice"
-#~ msgstr "Mis pedidos de ventas esperarando facturación"
-
-#~ msgid ""
-#~ "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
-#~ "will automatic create after delivery."
-#~ msgstr ""
-#~ "Cuando selecciona una política de envío = 'Factura automática después del "
-#~ "envío', la creará automáticamente después del envío."
-
-#~ msgid "Manual Description"
-#~ msgstr "Descripción manual"
-
-#, python-format
-#~ msgid "You must first cancel all invoices attached to this sale order."
-#~ msgstr ""
-#~ "Primero debe cancelar todas las facturas asociadas a este pedido de venta."
-
-#~ msgid "Sale Order Procurement"
-#~ msgstr "Abastecimiento pedido de venta"
-
-#~ msgid "Packing"
-#~ msgstr "Empaquetado/Albarán"
-
-#~ msgid "Invoice on Order After Delivery"
-#~ msgstr "Facturar pedido después del envío"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Error: UOS must be in a different category than the UOM"
-#~ msgstr "Error: La UdV debe estar en una categoría diferente que la UdM"
-
-#~ msgid "Sales orders"
-#~ msgstr "Pedidos de ventas"
-
-#~ msgid "Payment accounts"
-#~ msgstr "Cuentas de pago"
-
-#~ msgid "Draft Invoice"
-#~ msgstr "Factura borrador"
-
-#~ msgid "Draft customer invoice, to be reviewed by accountant."
-#~ msgstr "Factura de cliente borrador, para ser revisada por un contable."
-
-#~ msgid "Sales Order To Be Invoiced"
-#~ msgstr "Pedidos de ventas a facturar"
-
-#~ msgid "Procurement for each line"
-#~ msgstr "Abastecimiento para cada línea"
-
-#~ msgid "My Quotations"
-#~ msgstr "Mis presupuestos"
-
-#~ msgid "Manages the delivery and invoicing progress"
-#~ msgstr "Gestiona el progreso de envío y facturación"
-
-#, python-format
-#~ msgid "Could not cancel sale order !"
-#~ msgstr "¡No puede cancelar el pedido de venta!"
-
-#~ msgid "Canceled"
-#~ msgstr "Cancelado"
-
-#~ msgid "Order Ref"
-#~ msgstr "Ref. pedido"
-
-#~ msgid ""
-#~ "In sale order , procuerement for each line and it comes into the procurement "
-#~ "order"
-#~ msgstr ""
-#~ "En un pedido de venta, abastecer para cada línea y se convierte en la orden "
-#~ "de abastecimiento"
-
-#~ msgid "Uninvoiced Lines"
-#~ msgstr "Líneas no facturadas"
-
-#~ msgid "Sales Process"
-#~ msgstr "Proceso de ventas"
-
-#~ msgid ""
-#~ "Error: The default UOM and the purchase UOM must be in the same category."
-#~ msgstr ""
-#~ "Error: La UdM por defecto y la UdM de compra deben estar en la misma "
-#~ "categoría."
-
-#~ msgid "My sales in shipping exception"
-#~ msgstr "Mis ventas en excepción de envío"
-
-#~ msgid "Sales Configuration"
-#~ msgstr "Configuración de ventas"
-
-#~ msgid "Procurement Corrected"
-#~ msgstr "Abastecimiento corregido"
-
-#~ msgid "Sale Procurement"
-#~ msgstr "Abastecimiento de venta"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "Our Salesman"
-#~ msgstr "Nuestro comercial"
-
-#~ msgid "Create Advance Invoice"
-#~ msgstr "Crear anticipo factura"
-
-#~ msgid "One procurement for each product."
-#~ msgstr "Un abastecimiento por cada producto."
-
-#~ msgid "Sale Order"
-#~ msgstr "Pedido de venta"
-
-#~ msgid "Sale Pricelists"
-#~ msgstr "Tarifas de venta"
-
-#~ msgid ""
-#~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
-#~ "the sale order. This transaction moves the sale order to invoices."
-#~ msgstr ""
-#~ "Se crea la factura cuando presione 'Crear factura' después de haber "
-#~ "confirmado el pedido de venta. Esta transacción convierte el pedido de venta "
-#~ "a facturas."
-
-#~ msgid "Make Invoice"
-#~ msgstr "Crear factura"
-
-#~ msgid "Sales order lines"
-#~ msgstr "Líneas del pedido de ventas"
-
-#~ msgid "Sequence"
-#~ msgstr "Secuencia"
-
-#~ msgid "Packing OUT is created for stockable products."
-#~ msgstr "Se crea un albarán de salida OUT para productos almacenables."
-
-#~ msgid "Other data"
-#~ msgstr "Otros datos"
-
-#~ msgid ""
-#~ "Confirming the packing list moves them to delivery order. This can be done "
-#~ "by clicking on 'Validate' button."
-#~ msgstr ""
-#~ "Al confirmar el albarán se convierte en una orden de entrega. Esto se puede "
-#~ "realizar haciendo clic en el botón 'Validar'."
-
-#~ msgid "Advance Payment"
-#~ msgstr "Pago anticipado"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Confirm sale order and Create invoice."
-#~ msgstr "Confirmar pedido de venta y crear factura."
-
-#~ msgid "Packing List & Delivery Order"
-#~ msgstr "Albarán & Orden de entrega"
-
-#~ msgid "Sale Order Lines"
-#~ msgstr "Líneas del pedido de venta"
-
-#~ msgid "Do you really want to create the invoices ?"
-#~ msgstr "¿Realmente desea crear las facturas?"
-
-#~ msgid "Invoice based on packing lists"
-#~ msgstr "Factura basada en albaranes"
-
-#~ msgid "Set Default"
-#~ msgstr "Establecer por defecto"
-
-#~ msgid "Sales order"
-#~ msgstr "Pedido de venta"
-
-#~ msgid "Quotation (A sale order in draft state)"
-#~ msgstr "Presupuesto (un pedido de venta en estado borrador)"
-
-#~ msgid "Sale Invoice"
-#~ msgstr "Factura de venta"
-
-#~ msgid "Open Advance Invoice"
-#~ msgstr "Abrir anticipo factura"
-
-#~ msgid "Deliver"
-#~ msgstr "Enviar"
-
-#, python-format
-#~ msgid "Could not cancel this sale order !"
-#~ msgstr "¡No se puede cancelar este pedido de venta!"
-
-#~ msgid "Sale Order Line"
-#~ msgstr "Línea pedido de venta"
-
-#~ msgid "Make invoices"
-#~ msgstr "Realizar facturas"
-
-#~ msgid ""
-#~ "The name and address of the contact that requested the order or quotation."
-#~ msgstr ""
-#~ "El nombre y la dirección del contacto que solicita el pedido o presupuesto."
-
-#~ msgid "Purchase Pricelists"
-#~ msgstr "Tarifas de compra"
-
-#, python-format
-#~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
-#~ msgstr ""
-#~ "¡No se puede eliminar pedido(s) de venta que ya está(n) confirmado(s)!"
-
-#~ msgid "New Quotation"
-#~ msgstr "Nuevo presupuesto"
-
-#~ msgid "Total amount"
-#~ msgstr "Importe total"
-
-#~ msgid "Configure Picking Policy for Sale Order"
-#~ msgstr "Configurar política de envío para el pedido de venta"
-
-#~ msgid "Payment Terms"
-#~ msgstr "Plazos de pago"
-
-#~ msgid "Invoice Corrected"
-#~ msgstr "Factura corregida"
-
-#~ msgid "Delivery Delay"
-#~ msgstr "Demora de entrega"
-
-#~ msgid "Related invoices"
-#~ msgstr "Facturas relacionadas"
-
-#~ msgid ""
-#~ "This is the list of invoices that have been generated for this sale order. "
-#~ "The same sale order may have been invoiced in several times (by line for "
-#~ "example)."
-#~ msgstr ""
-#~ "Ésta es la lista de facturas que se han generado para este pedido de venta. "
-#~ "El mismo pedido puede haberse facturado varias veces (por ejemplo por cada "
-#~ "línea)."
-
-#~ msgid "Error: Invalid ean code"
-#~ msgstr "Error: Código EAN erróneo"
-
-#~ msgid "My Sales Order"
-#~ msgstr "Mis pedidos de ventas"
-
-#~ msgid "Sale Order line"
-#~ msgstr "Línea pedido de venta"
-
-#~ msgid "Packing Default Policy"
-#~ msgstr "Forma de envío por defecto"
-
-#~ msgid "Packing Policy"
-#~ msgstr "Forma de envío"
-
-#~ msgid "Payment Accounts"
-#~ msgstr "Cuentas de pago"
-
-#~ msgid "Related Packing"
-#~ msgstr "Albarán relacionado"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#, python-format
-#~ msgid "You cannot cancel a sale order line that has already been invoiced !"
-#~ msgstr ""
-#~ "¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
-
-#, python-format
-#~ msgid "You must first cancel all packing attached to this sale order."
-#~ msgstr ""
-#~ "Debe primero cancelar todos los albaranes asociados a este pedido de venta."
-
-#, python-format
-#~ msgid ""
-#~ "You have to select a customer in the sale form !\n"
-#~ "Please set one customer before choosing a product."
-#~ msgstr ""
-#~ "¡Debe seleccionar un cliente en el formulario de venta!\n"
-#~ "Por favor, seleccione un cliente antes de elegir un producto."
-
-#~ msgid "Invoice from the Packing"
-#~ msgstr "Facturar desde el albarán"
-
-#~ msgid "Customer Ref"
-#~ msgstr "Ref. cliente"
-
-#~ msgid ""
-#~ "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 packing 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 'Date Ordered'."
-#~ msgstr ""
-#~ "Indica el estado del presupuesto o pedido de venta. El estado de excepción "
-#~ "se establece automáticamente cuando se produce una cancelación en la "
-#~ "validación de la factura (Excepción de factura) o en el procesado del "
-#~ "albarán (Excepción de envío). El estado 'Esperando planificación' se "
-#~ "establece cuando se confirma la factura pero se espera a que el planificador "
-#~ "procese el pedido en la fecha 'Fecha del pedido'."
-
-#~ msgid ""
-#~ "By default, Open ERP is able to manage complex routing and paths of products "
-#~ "in your warehouse and partner locations. This will configure the most common "
-#~ "and simple methods to deliver products to the customer in one or two "
-#~ "operations by the worker."
-#~ msgstr ""
-#~ "Por defecto, OpenERP puede gestionar rutas complejas y rutas de productos en "
-#~ "su almacén y en las ubicaciones de empresas. Esta opción le configurará los "
-#~ "métodos más comunes y sencillos para enviar productos al cliente en una o "
-#~ "dos operaciones hechas por el trabajador."
-
-#~ msgid ""
-#~ "This Configuration step use to set default picking policy when make sale "
-#~ "order"
-#~ msgstr ""
-#~ "Este paso fija la política de empaquetado por defecto cuando se crea un "
-#~ "pedido de venta"
-
-#~ msgid ""
-#~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-#~ "  - The 'Pay before delivery' choice will first generate the invoice and "
-#~ "then generate the packing order after the payment of this invoice.\n"
-#~ "  - The 'Shipping & Manual Invoice' will create the packing order directly "
-#~ "and wait for the user to manually click on the 'Invoice' button to generate "
-#~ "the draft invoice.\n"
-#~ "  - The 'Invoice on Order Ater Delivery' choice will generate the draft "
-#~ "invoice based on sale order after all packing lists have been finished.\n"
-#~ "  - The 'Invoice from the packing' choice is used to create an invoice "
-#~ "during the packing process."
-#~ msgstr ""
-#~ "La política de facturación se utiliza para sincronizar la factura y las "
-#~ "operaciones de envío.\n"
-#~ "  - La opción 'Pago antes del envío' primero genera la factura y luego "
-#~ "genera el albarán después del pago de esta factura.\n"
-#~ "  - La opción 'Envío '& Factura manual' creará el albarán directamente y "
-#~ "esperará a que el usuario haga clic manualmente en el botón 'Factura' para "
-#~ "generar la factura borrador.\n"
-#~ "  - La opción 'Factura según pedido después envío' generará la factura "
-#~ "borrador basada en el pedido de venta después de que todos los albaranes se "
-#~ "hayan procesado.\n"
-#~ "  - La opción 'Factura desde albarán' se utiliza para crear una factura "
-#~ "durante el proceso de los albaranes."
+msgstr ""
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index 26e722930c8..49e6ca59751 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/sale/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-05-10 17:37+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-26 12:14+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:02+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #, python-format
 #~ msgid ""
@@ -167,6 +167,8 @@ msgid ""
 "Allows to manage different prices based on rules per category of customers.\n"
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
+"Permet de gérer différents prix selon des règles par catégories de clients.\n"
+"Exemple : 10% pour les revendeurs, promotion de 5€ sur cet article, etc."
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
@@ -199,6 +201,7 @@ msgstr "Rem.(%)"
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
+"Veuillez définir un compte de revenu pour cet article : \"%s\" (id. : %d)"
 
 #. module: sale
 #: view:sale.report:0
@@ -803,13 +806,13 @@ msgid ""
 msgstr ""
 "Vous devez sélectionner une liste de prix ou un client dans le formulaire de "
 "vente !\n"
-"Sélectionnez-en un avant de choisir un produit."
+"Sélectionnez-en un avant de choisir un article."
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,categ_id:0
 msgid "Category of Product"
-msgstr "Catégorie de produits"
+msgstr "Catégorie d'article"
 
 #. module: sale
 #: code:addons/sale/sale.py:589
@@ -1499,7 +1502,7 @@ msgstr "Facture de paiement d'avance"
 #: view:sale.report:0
 #: field:sale.report,product_id:0
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: sale
 #: field:sale.config.settings,group_invoice_so_lines:0
@@ -1542,7 +1545,7 @@ msgstr "Date de commande"
 #. module: sale
 #: field:sale.order.line,product_uos:0
 msgid "Product UoS"
-msgstr "UdV du produit"
+msgstr "UdV de l'article"
 
 #. module: sale
 #: selection:sale.report,state:0
@@ -2036,7 +2039,7 @@ msgstr ""
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
-msgstr "Produit avancé"
+msgstr "Article d'avance"
 
 #. module: sale
 #: help:sale.order.line,sequence:0
@@ -2223,7 +2226,7 @@ msgid ""
 msgstr ""
 "Ce rapport analyse vos devis et commandes clients. Il vérifie les revenus "
 "liés aux ventes et les classifie selon différents critères (vendeur, "
-"partenaire, produit, etc.). Vous pouvez utiliser ce rapport pour analyser "
+"partenaire, article, etc.). Vous pouvez utiliser ce rapport pour analyser "
 "vos ventes non encore facturées. Si vous souhaitez analyser votre chiffre "
 "d'affaires, vous devriez utiliser le rapport \"Analyse des factures "
 "clients\" dans l'application comptabilité."
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 382fe093907..18947d5d7b4 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -295,12 +295,16 @@ class sale_order(osv.osv):
         }
         return {'warning': warning, 'value': value}
 
-    def onchange_partner_id(self, cr, uid, ids, part):
+    def onchange_partner_id(self, cr, uid, ids, part, context=None):
         if not part:
             return {'value': {'partner_invoice_id': False, 'partner_shipping_id': False,  'payment_term': False, 'fiscal_position': False}}
 
-        addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['delivery', 'invoice', 'contact'])
-        part = self.pool.get('res.partner').browse(cr, uid, part)
+        part = self.pool.get('res.partner').browse(cr, uid, part, context=context)
+        #if the chosen partner is not a company and has a parent company, use the parent to choose the delivery, the 
+        #invoicing addresses and all the fields related to the partner.
+        if part.parent_id and not part.is_company:
+            part = part.parent_id
+        addr = self.pool.get('res.partner').address_get(cr, uid, [part.id], ['delivery', 'invoice', 'contact'])
         pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
         payment_term = part.property_payment_term and part.property_payment_term.id or False
         fiscal_position = part.property_account_position and part.property_account_position.id or False
@@ -355,7 +359,7 @@ class sale_order(osv.osv):
             'type': 'out_invoice',
             'reference': order.client_order_ref or order.name,
             'account_id': order.partner_id.property_account_receivable.id,
-            'partner_id': order.partner_id.id,
+            'partner_id': order.partner_invoice_id.id,
             'journal_id': journal_ids[0],
             'invoice_line': [(6, 0, lines)],
             'currency_id': order.pricelist_id.currency_id.id,
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 419047dbbd2..98c810aac87 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -190,7 +190,7 @@
                     </h1>
                     <group>
                         <group>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": True}'/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id, context)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": True}'/>
                             <field name="partner_invoice_id" groups="sale.group_delivery_invoice_address" context="{'default_type':'invoice'}"/>
                             <field name="partner_shipping_id" groups="sale.group_delivery_invoice_address" context="{'default_type':'delivery'}"/>
                             <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index f442cbe0a8e..8458684cd72 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -65,7 +65,7 @@ class sale_order_line_make_invoice(osv.osv_memory):
                 'type': 'out_invoice',
                 'reference': "P%dSO%d" % (order.partner_id.id, order.id),
                 'account_id': a,
-                'partner_id': order.partner_id.id,
+                'partner_id': order.partner_invoice_id.id,
                 'invoice_line': [(6, 0, lines)],
                 'currency_id' : order.pricelist_id.currency_id.id,
                 'comment': order.note,
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 9ea2215fe0f..338118679de 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -139,7 +139,7 @@ class sale_advance_payment_inv(osv.osv_memory):
                 'type': 'out_invoice',
                 'reference': False,
                 'account_id': sale.partner_id.property_account_receivable.id,
-                'partner_id': sale.partner_id.id,
+                'partner_id': sale.partner_invoice_id.id,
                 'invoice_line': [(0, 0, inv_line_values)],
                 'currency_id': sale.pricelist_id.currency_id.id,
                 'comment': '',
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index 9951773f36a..3ae8e912efe 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -87,10 +87,10 @@ class sale(osv.osv):
         result.update(invoice_type_id=order.invoice_type_id and order.invoice_type_id.id or False)
         return result
 
-    def onchange_partner_id(self, cr, uid, ids, part):
-        result = super(sale, self).onchange_partner_id(cr, uid, ids, part)
+    def onchange_partner_id(self, cr, uid, ids, part, context=None):
+        result = super(sale, self).onchange_partner_id(cr, uid, ids, part, context=context)
         if part:
-            itype = self.pool.get('res.partner').browse(cr, uid, part).property_invoice_type
+            itype = self.pool.get('res.partner').browse(cr, uid, part, context=context).property_invoice_type
             if itype:
                 result['value']['invoice_type_id'] = itype.id
         return result
diff --git a/addons/sale_stock/i18n/zh_CN.po b/addons/sale_stock/i18n/zh_CN.po
index 97f2b8f648b..c470b3d36ff 100644
--- a/addons/sale_stock/i18n/zh_CN.po
+++ b/addons/sale_stock/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-25 10:11+0000\n"
+"PO-Revision-Date: 2012-11-26 15:38+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-26 04:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: sale_stock
 #: constraint:stock.move:0
@@ -32,7 +32,7 @@ msgstr "允许销售员 使用菜单“按已交付数量开票”  根据发运
 #: code:addons/sale_stock/sale_stock.py:470
 #, python-format
 msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
+msgstr "发运单 <em>%s</em> <b>被排程</b> 为 %s."
 
 #. module: sale_stock
 #: model:process.node,name:sale_stock.process_node_deliveryorder0
@@ -44,7 +44,7 @@ msgstr "送货单"
 msgid ""
 "Allows you to specify different delivery and invoice addresses on a sale "
 "order."
-msgstr ""
+msgstr "在销售订单，你可以指定不一样的发运和开票地址。"
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:569
@@ -89,7 +89,7 @@ msgstr "审核"
 #, python-format
 msgid ""
 "You must first cancel all delivery order(s) attached to this sales order."
-msgstr ""
+msgstr "你必须先取消这个销售订单附加的所有发运单。"
 
 #. module: sale_stock
 #: model:process.transition,name:sale_stock.process_transition_saleprocurement0
@@ -125,7 +125,7 @@ msgstr "运送方式"
 msgid ""
 "You cannot make an advance on a sales order                      that is "
 "defined as 'Automatic Invoice after delivery'."
-msgstr ""
+msgstr "你不能给定义为“发运后开票的”销售单进行预付款操作。"
 
 #. module: sale_stock
 #: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
@@ -160,12 +160,12 @@ msgid ""
 "                You can define your own carrier and delivery grids for "
 "prices.\n"
 "                This installs the module delivery."
-msgstr ""
+msgstr "允许你在销售订单和提货单添加运输方法。"
 
 #. module: sale_stock
 #: field:sale.config.settings,group_sale_delivery_address:0
 msgid "Allow a different address for delivery and invoicing "
-msgstr ""
+msgstr "允许不一样的发运和开票地址。 "
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:571
@@ -314,7 +314,7 @@ msgstr "基于发运单生产发票"
 #: code:addons/sale_stock/sale_stock.py:473
 #, python-format
 msgid "Order <b>delivered</b>."
-msgstr ""
+msgstr "订单 <b>已经交付</b>."
 
 #. module: sale_stock
 #: field:sale.config.settings,module_delivery:0
@@ -336,7 +336,7 @@ msgstr "打包装"
 msgid ""
 "International Commercial Terms are a series of predefined commercial terms "
 "used in international transactions."
-msgstr ""
+msgstr "国际商业条款是一系列预定义的用于国际贸易的商业条款。"
 
 #. module: sale_stock
 #: field:sale.config.settings,default_picking_policy:0
@@ -362,13 +362,13 @@ msgstr "采购已下销售单的物料"
 #: help:sale.order,picking_policy:0
 msgid ""
 "Pick 'Deliver each product when available' if you allow partial delivery."
-msgstr ""
+msgstr "如果你允许部分交付， 选择‘每个产品可用时发运’"
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:206
 #, python-format
 msgid "Cannot cancel sales order!"
-msgstr ""
+msgstr "不能取消销售订单！"
 
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_sale_shop
@@ -424,6 +424,8 @@ msgid ""
 "lines.\n"
 "                This installs the modules project_timesheet and project_mrp."
 msgstr ""
+"让你为特定时间和人员 传输项目管理的任务条目到工时单，进行创建、编辑和删除之一的操作。并自动从需求单明细创建项目任务。\n"
+"为此要安装模块project_timesheet 和project_mrp。"
 
 #. module: sale_stock
 #: sql_constraint:stock.picking:0
@@ -454,7 +456,7 @@ msgstr "没足够的库存！： "
 msgid ""
 "Number of days between the order confirmation and the shipping of the "
 "products to the customer"
-msgstr ""
+msgstr "订单被确认和产品交付给客户之间的天数"
 
 #. module: sale_stock
 #: help:sale.config.settings,default_picking_policy:0
@@ -462,7 +464,7 @@ msgid ""
 "Sales order by default will be configured to deliver all products at once "
 "instead of delivering each product when it is available. This may have an "
 "impact on the shipping price."
-msgstr ""
+msgstr "销售订单默认被配置为  当每个产品可用后，一次性发运所有的产品。这可能会影响运输价格。"
 
 #. module: sale_stock
 #: model:process.node,note:sale_stock.process_node_deliveryorder0
@@ -488,6 +490,8 @@ msgid ""
 "In order to delete a confirmed sales order, you must cancel it.\n"
 "To do so, you must first cancel related picking for delivery orders."
 msgstr ""
+"为了删除已经确认的销售单，你必须取消它。\n"
+"要做到这点，你必须首先取消发运单关联的提货单。"
 
 #. module: sale_stock
 #: field:sale.order.line,number_packages:0
@@ -517,7 +521,7 @@ msgstr "允许你用 属性 来标记销售订单 明细"
 #. module: sale_stock
 #: field:sale.config.settings,task_work:0
 msgid "Prepare invoices based on task's activities"
-msgstr ""
+msgstr "基于任务的进展准备发票"
 
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
diff --git a/addons/stock/i18n/es_MX.po b/addons/stock/i18n/es_MX.po
index 07b68884ebf..c9a7e8288ae 100644
--- a/addons/stock/i18n/es_MX.po
+++ b/addons/stock/i18n/es_MX.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-09-27 04:54+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-26 15:37+0000\n"
+"Last-Translator: Alejandro Negrin [ Vauxoo ] ..:: http://www.vauxoo.com ::.. "
+"<anegrinm@gmail.com>\n"
 "Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:23+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -24,7 +25,7 @@ msgstr ""
 #: field:stock.move.split,line_exist_ids:0
 #: field:stock.move.split,line_ids:0
 msgid "Serial Numbers"
-msgstr ""
+msgstr "Números de Serie"
 
 #. module: stock
 #: help:stock.config.settings,group_product_variant:0
@@ -37,7 +38,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
 msgid "Stock move Split lines"
-msgstr ""
+msgstr "Dividir líneas de movimientos de inventario"
 
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
@@ -48,14 +49,12 @@ msgid ""
 "value for all products in this category. It can also directly be set on each "
 "product"
 msgstr ""
-"Cuando en el campo Valoración inventario se tiene seleccionado Tiempo real "
-"(automatizado) , la contrapartida de los asientos contables para todos los "
-"movimientos de inventario entrantes, se mostrarán en esta cuenta contable, a "
-"menos de que exista un conjunto de valoración cuenta específica en la "
-"ubicación de destino. En el caso de que el producto es un servicio, se "
-"deberá de seleccionar la cuenta de gastos. Este es el valor por defecto para "
-"todos los productos en esta categoría. También puede directamente establecer "
-"en cada producto."
+"Cuando se realiza una valorización de inventario en tiempo real, la "
+"contrapartida para todos los movimientos de entrada serán imputados en esta "
+"cuenta, a menos que se haya establecido una cuenta de valorización "
+"específica en la ubicación fuente. Éste es el valor por defecto para todos "
+"los productos en esta categoría. También se puede establecer directamente en "
+"cada producto."
 
 #. module: stock
 #: view:stock.picking.out:0
@@ -85,7 +84,7 @@ msgstr ""
 #: view:stock.tracking:0
 #, python-format
 msgid "Upstream Traceability"
-msgstr ""
+msgstr "Trazabilidad hacia arriba"
 
 #. module: stock
 #: code:addons/stock/stock.py:1448
@@ -96,28 +95,28 @@ msgstr ""
 #. module: stock
 #: field:product.product,track_outgoing:0
 msgid "Track Outgoing Lots"
-msgstr ""
+msgstr "Seguimiento de lotes salientes"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
 #: model:ir.ui.menu,name:stock.menu_report_stock_line_date
 msgid "Last Product Inventories"
-msgstr ""
+msgstr "Último inventario de productos"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Today"
-msgstr ""
+msgstr "Hoy"
 
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
 msgid "Revision Number"
-msgstr ""
+msgstr "Número de revisión"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Orders processed Today or planned for Today"
-msgstr ""
+msgstr "Pedidos procesados hoy o planificados para hoy"
 
 #. module: stock
 #: view:stock.partial.move.line:0
@@ -126,7 +125,7 @@ msgstr ""
 #: view:stock.partial.picking.line:0
 #: view:stock.return.picking.memory:0
 msgid "Product Moves"
-msgstr ""
+msgstr "Movimientos productos"
 
 #. module: stock
 #: code:addons/stock/stock.py:2589
@@ -138,7 +137,7 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_inventory_control
 msgid "Inventory Control"
-msgstr ""
+msgstr "Control de inventario"
 
 #. module: stock
 #: help:stock.production.lot,ref:0
@@ -146,18 +145,20 @@ msgid ""
 "Internal reference number in case it differs from the manufacturer's serial "
 "number"
 msgstr ""
+"Número interno de referencia en caso de que sea diferente del número de "
+"serie del fabricante."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:59
 #, python-format
 msgid "You cannot perform this operation on more than one Stock Inventories."
-msgstr ""
+msgstr "No puedes realizar esta operación en más de un Inventario de Stock."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_change_product_qty.py:92
 #, python-format
 msgid "Quantity cannot be negative."
-msgstr ""
+msgstr "La cantidad no puede ser negativa"
 
 #. module: stock
 #: view:stock.picking:0
@@ -187,19 +188,19 @@ msgstr ""
 #: field:stock.return.picking.memory,quantity:0
 #: field:stock.split.into,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Cantidad"
 
 #. module: stock
 #: view:report.stock.move:0
 #: field:report.stock.move,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_inventory_form
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form
 msgid "Physical Inventories"
-msgstr ""
+msgstr "Inventarios físicos"
 
 #. module: stock
 #: selection:stock.location.product,type:0
@@ -211,24 +212,24 @@ msgstr ""
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
-msgstr ""
+msgstr "Diario de inventario"
 
 #. module: stock
 #: code:addons/stock/stock.py:1449
 #, python-format
 msgid "Products have been <b>received</b>."
-msgstr ""
+msgstr "Los productos han sido <b>recibidos/<b>."
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
-msgstr ""
+msgstr "Entrada"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_move.py:223
 #, python-format
 msgid "Unable to assign all lots to this move!"
-msgstr ""
+msgstr "¡No es posible asignar todos los lotes a este movimiento!"
 
 #. module: stock
 #: help:stock.move,partner_id:0
@@ -236,28 +237,30 @@ msgid ""
 "Optional address where goods are to be delivered, specifically used for "
 "allotment"
 msgstr ""
+"Dirección opcional cuando las mercancías deben ser entregadas, utilizado "
+"específicamente para lotificación"
 
 #. module: stock
 #: model:ir.actions.server,name:stock.action_partial_move_server
 msgid "Deliver/Receive Products"
-msgstr ""
+msgstr "Enviar/Recibir productos"
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:134
 #, python-format
 msgid "You cannot delete any record!"
-msgstr ""
+msgstr "¡No puede eliminar ningún registro!"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Delivery orders to invoice"
-msgstr ""
+msgstr "Ordenes de envío a facturar"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Assigned Delivery Orders"
-msgstr ""
+msgstr "Ordenes de envío asignadas"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_change_standard_price.py:107
@@ -270,7 +273,7 @@ msgstr ""
 #: selection:stock.picking.in,invoice_state:0
 #: selection:stock.picking.out,invoice_state:0
 msgid "Not Applicable"
-msgstr ""
+msgstr "No aplicable"
 
 #. module: stock
 #: help:stock.change.product.qty,message_unread:0
@@ -283,13 +286,13 @@ msgstr ""
 #. module: stock
 #: help:stock.tracking,serial:0
 msgid "Other reference or serial number"
-msgstr ""
+msgstr "Otra referencia o número de serie."
 
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Origin"
-msgstr ""
+msgstr "Origen"
 
 #. module: stock
 #: view:board.board:0
@@ -300,7 +303,7 @@ msgstr ""
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Non Inv"
-msgstr ""
+msgstr "No facturado"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_traceability.py:54
@@ -308,7 +311,7 @@ msgstr ""
 #: view:stock.tracking:0
 #, python-format
 msgid "Downstream Traceability"
-msgstr ""
+msgstr "Trazabilidad hacia abajo"
 
 #. module: stock
 #: view:stock.move:0
@@ -318,18 +321,18 @@ msgstr ""
 #: field:stock.picking.out,name:0
 #: view:stock.production.lot:0
 msgid "Reference"
-msgstr ""
+msgstr "Referencia"
 
 #. module: stock
 #: code:addons/stock/stock.py:1619
 #, python-format
 msgid "Products to Process"
-msgstr ""
+msgstr "Productos a procesar"
 
 #. module: stock
 #: view:stock.move:0
 msgid "New Pack"
-msgstr ""
+msgstr "Nuevo paquete"
 
 #. module: stock
 #: help:stock.fill.inventory,set_stock_zero:0
@@ -337,16 +340,18 @@ msgid ""
 "If checked, all product quantities will be set to zero to help ensure a real "
 "physical inventory is done"
 msgstr ""
+"Si se selecciona, todas las cantidades de producto se configuran a cero para "
+"ayudar a realizar un inventario físico real."
 
 #. module: stock
 #: view:product.product:0
 msgid "Forecasted:"
-msgstr ""
+msgstr "Planeado"
 
 #. module: stock
 #: view:stock.partial.move:0
 msgid "_Validate"
-msgstr ""
+msgstr "_Validar"
 
 #. module: stock
 #: help:stock.change.product.qty,message_summary:0
@@ -377,12 +382,12 @@ msgstr ""
 #: code:addons/stock/wizard/stock_return_picking.py:198
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "¡Advertencia!"
 
 #. module: stock
 #: field:stock.invoice.onshipping,group:0
 msgid "Group by partner"
-msgstr ""
+msgstr "Agrupar por empresa"
 
 #. module: stock
 #: help:stock.picking,move_type:0
@@ -402,7 +407,7 @@ msgstr ""
 #: field:stock.picking.in,partner_id:0
 #: field:stock.picking.out,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: stock
 #: field:stock.config.settings,module_claim_from_delivery:0
@@ -412,28 +417,28 @@ msgstr ""
 #. module: stock
 #: selection:stock.return.picking,invoice_state:0
 msgid "No invoicing"
-msgstr ""
+msgstr "No facturación"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Stock moves that have been processed"
-msgstr ""
+msgstr "Movimientos de existencias que han sido procesados"
 
 #. module: stock
 #: field:stock.inventory.line.split,use_exist:0
 #: field:stock.move.split,use_exist:0
 msgid "Existing Serial Numbers"
-msgstr ""
+msgstr "Números de serie existentes"
 
 #. module: stock
 #: model:res.groups,name:stock.group_inventory_valuation
 msgid "Manage Inventory valuation"
-msgstr ""
+msgstr "Administrar valoración de inventario"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_suppliers
 msgid "Suppliers"
-msgstr ""
+msgstr "Proveedores"
 
 #. module: stock
 #: help:stock.incoterms,code:0
diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index a9b0589d965..8c93bad2c13 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-05-10 17:19+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-26 17:09+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:37+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:23+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
@@ -24,7 +24,7 @@ msgstr "Quantité (UdV)"
 #. module: stock
 #: field:stock.move,product_uos:0
 msgid "Product UOS"
-msgstr "UdV du produit"
+msgstr "UdV de l'article"
 
 #~ msgid "Product UOM"
 #~ msgstr "UdM du produit"
@@ -63,8 +63,8 @@ msgstr ""
 "Si la valorisation du stock est faite en temps réel, les écritures de "
 "contrepartie de tous les mouvements de stock entrants seront passées sur ce "
 "compte, sauf si un compte particulier est précisé pour l'emplacement source. "
-"C'est la valeur par défaut pour tous les produits de cette catégorie. Il est "
-"également possible de la préciser directement sur chaque produit."
+"C'est la valeur par défaut pour tous les articles de cette catégorie. Il est "
+"également possible de la préciser directement sur chaque article."
 
 #. module: stock
 #: view:stock.picking.out:0
@@ -111,7 +111,7 @@ msgstr "Suivre les lots sortants"
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
 #: model:ir.ui.menu,name:stock.menu_report_stock_line_date
 msgid "Last Product Inventories"
-msgstr "Derniers inventaires des produits"
+msgstr "Derniers inventaires des articles"
 
 #. module: stock
 #: view:stock.move:0
@@ -135,7 +135,7 @@ msgstr "Ordres traités du jour ou planifiés pour aujourd'hui"
 #: view:stock.partial.picking.line:0
 #: view:stock.return.picking.memory:0
 msgid "Product Moves"
-msgstr "Mouvements du produit"
+msgstr "Mouvements de stock"
 
 #. module: stock
 #: code:addons/stock/stock.py:2589
@@ -254,7 +254,7 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.server,name:stock.action_partial_move_server
 msgid "Deliver/Receive Products"
-msgstr "Livrer/recevoir des produits"
+msgstr "Livrer/recevoir des articles"
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:78
@@ -309,7 +309,7 @@ msgstr "Origine"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_stock_incoming_product_delay
 msgid "Incoming Products"
-msgstr "Produits entrants"
+msgstr "Réceptions par articles"
 
 #. module: stock
 #: view:report.stock.lines.date:0
@@ -338,7 +338,7 @@ msgstr "Référence"
 #: code:addons/stock/stock.py:1619
 #, python-format
 msgid "Products to Process"
-msgstr "Produits à traiter"
+msgstr "Articles à traiter"
 
 #. module: stock
 #: view:stock.move:0
@@ -351,7 +351,7 @@ msgid ""
 "If checked, all product quantities will be set to zero to help ensure a real "
 "physical inventory is done"
 msgstr ""
-"Si cette case est cochée, toutes les quantités du produit seront mises à "
+"Si cette case est cochée, toutes les quantités de l'article seront mises à "
 "zéro pour s'assurer qu'un inventaire physique est réellement effectué."
 
 #. module: stock
@@ -567,8 +567,8 @@ msgid ""
 "When real-time inventory valuation is enabled on a product, this account "
 "will hold the current value of the products."
 msgstr ""
-"Quand la valorisation en temps réel est activée sur un produit, ce compte "
-"donnera la valorisation actuelle des produits."
+"Quand la valorisation en temps réel est activée sur un article, ce compte "
+"donnera la valorisation actuelle des articles."
 
 #. module: stock
 #: field:stock.config.settings,group_stock_tracking_lot:0
@@ -587,7 +587,7 @@ msgstr ""
 #: code:addons/stock/product.py:196
 #, python-format
 msgid "Products: "
-msgstr "Produits: "
+msgstr "Articles : "
 
 #. module: stock
 #: field:report.stock.inventory,location_type:0
@@ -738,7 +738,7 @@ msgstr "Information complémentaire"
 #: report:lot.stock.overview:0
 #: report:lot.stock.overview_all:0
 msgid "Location / Product"
-msgstr "Emplacement / produit"
+msgstr "Emplacement / article"
 
 #. module: stock
 #: field:stock.move,partner_id:0
@@ -854,6 +854,8 @@ msgid ""
 "Forces to specify a Serial Number for all moves containing this product and "
 "coming from a Supplier Location"
 msgstr ""
+"Force à préciser un numéro de série pour tous les mouvements contenant cet "
+"article et provenant d'un emplacement fournisseur"
 
 #. module: stock
 #: help:stock.config.settings,group_uos:0
@@ -976,7 +978,7 @@ msgstr "Adresse du dépôt"
 #: view:stock.move:0
 #: view:stock.move.scrap:0
 msgid "Scrap Products"
-msgstr "Rebuts"
+msgstr "Mettre au rebut"
 
 #. module: stock
 #: view:product.product:0
@@ -1048,7 +1050,7 @@ msgstr "Mouvement automatique"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_change_product_qty
 msgid "Change Product Quantity"
-msgstr "Changer la quantité de produit"
+msgstr "Changer la quantité d'articles"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
@@ -1083,7 +1085,7 @@ msgstr "Emplacement d'inventaire"
 #. module: stock
 #: constraint:stock.move:0
 msgid "You must assign a serial number for this product."
-msgstr ""
+msgstr "Vous devez attribuer un numéro de série pour cet article."
 
 #. module: stock
 #: code:addons/stock/stock.py:2326
@@ -1289,7 +1291,7 @@ msgstr ""
 #. module: stock
 #: field:product.template,property_stock_production:0
 msgid "Production Location"
-msgstr "Emplacement Production"
+msgstr "Emplacement de production"
 
 #. module: stock
 #: code:addons/stock/product.py:121
@@ -1346,16 +1348,16 @@ msgid ""
 "                      "
 msgstr ""
 "* \"Emplacement Fournisseur\" : emplacement virtuel représentant l'origine "
-"des produits reçus d'un fournisseur\n"
+"des articles reçus d'un fournisseur\n"
 "                       \n"
 "* \"Vue\" : emplacement virtuel servant à donner une vision hiérarchisée de "
-"votre entrepôt, en regroupant les produits des emplacements enfants. Ne peut "
-"pas contenir de produit directement\n"
+"votre entrepôt, en regroupant les articles des emplacements enfants. Ne peut "
+"pas contenir d'articles directement\n"
 "                       \n"
 "* \"Emplacement interne\" : emplacement physique dans votre entrepôt\n"
 "                       \n"
 "* \"Emplacement client\": emplacement virtuel représentant la destination "
-"des produits envoyés à un client\n"
+"des articles envoyés à un client\n"
 "                       \n"
 "* \"Inventaire\": emplacement virtuel servant de contrepartie aux mouvements "
 "servant à corriger les niveaux des stocks lors des inventaires physiques\n"
@@ -1602,7 +1604,7 @@ msgid ""
 "Technical field used to record the product cost set by the user during a "
 "picking confirmation (when average price costing method is used)"
 msgstr ""
-"Champ technique utilisé pour enregistrer le coût du produit défini par "
+"Champ technique utilisé pour enregistrer le coût de l'article défini par "
 "l'utilisateur lors de la confirmation de l'opération de manutention (quand "
 "la valorisation se fait sur le prix moyen)"
 
@@ -2003,7 +2005,7 @@ msgstr "Livraison de marchandise"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
 msgid "Product Categories"
-msgstr "Catégories de produits"
+msgstr "Catégories d'articles"
 
 #. module: stock
 #: view:stock.move:0
@@ -2278,7 +2280,7 @@ msgstr "Remplir l'inventaire"
 #. module: stock
 #: view:stock.return.picking:0
 msgid "Provide the quantities of the returned products."
-msgstr "Indiquez les quantités des produits retournés."
+msgstr "Indiquez les quantités des articles retournés."
 
 #. module: stock
 #: view:product.product:0
@@ -2331,7 +2333,7 @@ msgid ""
 msgstr ""
 "L'analyse des mouvements vous permet de contrôler et d'analyser les "
 "mouvements de stock de la société. Ce rapport vous permet d'analyser les "
-"différents chemins suivis par vos produits et les performances de la gestion "
+"différents chemins suivis par vos articles et les performances de la gestion "
 "des stocks."
 
 #. module: stock
@@ -2583,6 +2585,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Cliquez pour créer un mouvement de stock.\n"
+"              </p><p>\n"
+"                Ce menu vous offre une traçabilité complète\n"
+"                des opérations concernant un article particulier. Vous "
+"pouvez filtrer par article\n"
+"                pour voir les mouvements passés ou prévus pour cet article.\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: view:stock.location:0
@@ -2750,7 +2761,7 @@ msgstr ""
 #: view:stock.partial.move:0
 #: view:stock.picking:0
 msgid "Products"
-msgstr "Produits"
+msgstr "Articles"
 
 #. module: stock
 #: view:stock.inventory.line:0
@@ -2789,13 +2800,13 @@ msgstr "Méthode de livraison"
 #: help:stock.picking.in,location_dest_id:0
 #: help:stock.picking.out,location_dest_id:0
 msgid "Location where the system will stock the finished products."
-msgstr "L'emplacement ou le système stockera les produits finis"
+msgstr "Emplacement où le système stockera les produits finis."
 
 #. module: stock
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_stock_outgoing_product_delay
 msgid "Outgoing Products"
-msgstr "Produits à expédier"
+msgstr "Articles à expédier"
 
 #. module: stock
 #: code:addons/stock/stock.py:2320
@@ -2848,10 +2859,10 @@ msgid ""
 "current inventory value, and the stock input and stock output account will "
 "hold the counterpart moves for incoming and outgoing products."
 msgstr ""
-"Quand la valorisation en temps réel est activée sur un produit, le système "
+"Quand la valorisation en temps réel est activée sur un article, le système "
 "génère automatiquement les écritures comptables correspondant aux mouvements "
-"de stock. Le compte de variation d'inventaire défini dans la catégorie de "
-"produits représente la valorisation actuelle du stock, et les comptes "
+"de stock. Le compte de variation d'inventaire défini dans la catégorie "
+"d'articles représente la valorisation actuelle du stock, et les comptes "
 "d'entrée et de sortie de stock contiennent les contreparties des mouvements "
 "de stock entrants et sortants."
 
@@ -3010,10 +3021,10 @@ msgid ""
 "need this report in order to ensure that the stock of each product is "
 "controlled at least once a year."
 msgstr ""
-"Affichez les derniers inventaires validés sur vos produits et triez-les "
+"Affichez les derniers inventaires validés sur vos articles et triez-les "
 "facilement avec des critères de filtrage. Si vous faites souvent des "
-"inventaires partiels, vous avez besoin de ce rapport pour s'assurer que le "
-"stock de chaque produit est contrôlé une fois par an."
+"inventaires partiels, vous avez besoin de ce rapport pour vous assurer que "
+"le stock de chaque article est contrôlé une fois par an."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
@@ -3093,7 +3104,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_partial_picking.py:99
 #, python-format
 msgid "Receive Products"
-msgstr "Réception par produit"
+msgstr "Réception par article"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:101
@@ -3106,7 +3117,7 @@ msgstr "Livrer les produits"
 #. module: stock
 #: view:stock.location.product:0
 msgid "View Stock of Products"
-msgstr "Voir les stocks produits"
+msgstr "Voir les stocks des articles"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -3143,7 +3154,7 @@ msgstr "Décocher le champ \"Actif\" cache le colis sans le supprimer."
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Product Lots Filter"
-msgstr "Filtre sur les lots de produit"
+msgstr "Filtre sur les numéros de série"
 
 #. module: stock
 #: view:stock.inventory.merge:0
@@ -3352,7 +3363,7 @@ msgid ""
 "If checked, products contained in child locations of selected location will "
 "be included as well."
 msgstr ""
-"Si coché, les produits contenus dans les emplacement fils de l'emplacement "
+"Si coché, les articles contenus dans les emplacement fils de l'emplacement "
 "sélectionné seront également inclus."
 
 #. module: stock
@@ -3612,7 +3623,7 @@ msgstr ""
 #: field:stock.report.tracklots,product_id:0
 #: field:stock.return.picking.memory,product_id:0
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_inventory_form
@@ -3665,7 +3676,7 @@ msgstr "Hauteur (Z)"
 #: model:ir.model,name:stock.model_stock_move_consume
 #: view:stock.move.consume:0
 msgid "Consume Products"
-msgstr "Produits consommés"
+msgstr "Consommer les articles"
 
 #. module: stock
 #: field:stock.location,parent_right:0
@@ -3702,7 +3713,7 @@ msgstr "Valeur Totale"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
 msgid "Products by Category"
-msgstr "Produits par catégorie"
+msgstr "Articles par catégorie"
 
 #. module: stock
 #: selection:stock.picking,state:0
@@ -3732,7 +3743,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
 #: model:ir.model,name:stock.model_stock_location_product
 msgid "Products by Location"
-msgstr "Produits par emplacement"
+msgstr "Articles par emplacement"
 
 #. module: stock
 #: view:stock.config.settings:0
@@ -3955,7 +3966,7 @@ msgstr "Société"
 #: field:stock.move.consume,product_uom:0
 #: field:stock.move.scrap,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Unité de mesure d'article"
 
 #. module: stock
 #: code:addons/stock/stock.py:1426
@@ -4253,7 +4264,7 @@ msgstr "Coût unitaire pour cette ligne de produit"
 #: view:report.stock.move:0
 #: field:report.stock.move,categ_id:0
 msgid "Product Category"
-msgstr "Catégorie de produits"
+msgstr "Catégorie d'articles"
 
 #. module: stock
 #: code:addons/stock/stock.py:1407
@@ -4319,7 +4330,7 @@ msgstr "Journal d'enchainement"
 #: code:addons/stock/stock.py:773
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
-msgstr "Pas encore de stock, impossible de réserver les produits."
+msgstr "Pas encore de stock, impossible de réserver les articles."
 
 #. module: stock
 #: view:report.stock.move:0
@@ -4385,7 +4396,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_product_template
 msgid "Product Template"
-msgstr "Modèle de produit"
+msgstr "Modèle d'article"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -4407,7 +4418,7 @@ msgstr "Valeur du stock virtuel"
 #: view:stock.picking.in:0
 #: view:stock.picking.out:0
 msgid "Return Products"
-msgstr "Retourner les produits"
+msgstr "Retourner les articles"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -4439,7 +4450,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_reception_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_in
 msgid "Incoming  Products"
-msgstr ""
+msgstr "Articles entrants"
 
 #. module: stock
 #: view:product.product:0
@@ -4680,6 +4691,8 @@ msgstr "Janvier"
 #: constraint:stock.move:0
 msgid "You cannot move products from or to a location of the type view."
 msgstr ""
+"Il  est impossible de déplacer des articles depuis ou vers un emplacement de "
+"type \"vue\"."
 
 #. module: stock
 #: help:stock.config.settings,group_stock_production_lot:0
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index f7708f607dd..7c5a257ea64 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-25 16:52+0000\n"
+"PO-Revision-Date: 2012-11-26 08:33+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-26 04:40+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:23+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -333,7 +333,7 @@ msgstr "如果勾选，所有产品数量将设为零以确保实物盘点操作
 #. module: stock
 #: view:product.product:0
 msgid "Forecasted:"
-msgstr ""
+msgstr "预测："
 
 #. module: stock
 #: view:stock.partial.move:0
@@ -348,7 +348,7 @@ msgstr "审核（_V）"
 msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
-msgstr ""
+msgstr "保留复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
 
 #. module: stock
 #: code:addons/stock/stock.py:773
@@ -381,7 +381,7 @@ msgstr "按业务伙伴分组"
 #: help:stock.picking.in,move_type:0
 #: help:stock.picking.out,move_type:0
 msgid "It specifies goods to be deliver partially or all at once"
-msgstr ""
+msgstr "指定货物是部分发运还是一次性发运所有的"
 
 #. module: stock
 #: model:ir.model,name:stock.model_res_partner
@@ -399,7 +399,7 @@ msgstr "业务伙伴"
 #. module: stock
 #: field:stock.config.settings,module_claim_from_delivery:0
 msgid "Allow claim on deliveries"
-msgstr ""
+msgstr "允许在发运单上索赔"
 
 #. module: stock
 #: selection:stock.return.picking,invoice_state:0
@@ -415,12 +415,12 @@ msgstr "库存调拨已经被处理"
 #: field:stock.inventory.line.split,use_exist:0
 #: field:stock.move.split,use_exist:0
 msgid "Existing Serial Numbers"
-msgstr ""
+msgstr "系列号已经存在"
 
 #. module: stock
 #: model:res.groups,name:stock.group_inventory_valuation
 msgid "Manage Inventory valuation"
-msgstr ""
+msgstr "管理库存核算"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_suppliers
@@ -451,7 +451,7 @@ msgstr "内部库位"
 #. module: stock
 #: view:stock.move:0
 msgid "Split in Serial Number"
-msgstr ""
+msgstr "分开为不同系列号"
 
 #. module: stock
 #: view:stock.location:0
@@ -471,7 +471,7 @@ msgstr "滞后天数"
 #. module: stock
 #: selection:stock.picking.out,state:0
 msgid "Ready to Deliver"
-msgstr ""
+msgstr "准备发运"
 
 #. module: stock
 #: model:ir.model,name:stock.model_action_traceability
@@ -509,7 +509,7 @@ msgstr "入库数量"
 #. module: stock
 #: model:ir.actions.client,name:stock.action_client_warehouse_menu
 msgid "Open Warehouse Menu"
-msgstr ""
+msgstr "打开仓库菜单"
 
 #. module: stock
 #: field:stock.warehouse,lot_output_id:0
@@ -525,7 +525,7 @@ msgstr "分拆到"
 #. module: stock
 #: field:stock.config.settings,module_product_expiry:0
 msgid "Expiry date on serial numbers"
-msgstr ""
+msgstr "系列号上的过期日期"
 
 #. module: stock
 #: field:stock.move,price_currency_id:0
@@ -535,7 +535,7 @@ msgstr "平均价格使用的币别"
 #. module: stock
 #: view:product.product:0
 msgid "Stock and Expected Variations"
-msgstr ""
+msgstr "库存和预期的变动"
 
 #. module: stock
 #: help:product.category,property_stock_valuation_account_id:0
@@ -547,7 +547,7 @@ msgstr "在进行产品实时库存核算时，此科目记录产品的当前估
 #. module: stock
 #: field:stock.config.settings,group_stock_tracking_lot:0
 msgid "Track serial number on logistic units (pallets)"
-msgstr ""
+msgstr "跟踪在物流单元（货盘）上的系列号"
 
 #. module: stock
 #: help:product.template,sale_delay:0
@@ -555,7 +555,7 @@ msgid ""
 "The average delay in days between the confirmation of the customer order and "
 "the delivery of the finished products. It's the time you promise to your "
 "customers."
-msgstr ""
+msgstr "在客户订单确认和完工产品交付之间的平均的延期日子。这是你承诺给客户的日期。"
 
 #. module: stock
 #: code:addons/stock/product.py:196
@@ -572,7 +572,7 @@ msgstr "库位类型"
 #. module: stock
 #: view:stock.config.settings:0
 msgid "Location & Warehouse"
-msgstr ""
+msgstr "库位和仓库"
 
 #. module: stock
 #: help:report.stock.move,type:0
@@ -596,6 +596,12 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击创建 内部移库请求。 \n"
+"              </p><p>\n"
+"                许多操作是根据你预定的物流规则由OpenERP自动准备好的，但是你也能手工记录仓库移库.\n"
+"              </p>\n"
+"            "
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
@@ -606,7 +612,7 @@ msgstr "标签"
 #: code:addons/stock/stock.py:1444
 #, python-format
 msgid "Back order <em>%s</em> has been <b>created</b>."
-msgstr ""
+msgstr "未交付清单<em>%s</em> 已经被 <b>创建</b>."
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_move
@@ -617,24 +623,24 @@ msgstr "调拨统计"
 #: help:stock.config.settings,group_uom:0
 msgid ""
 "Allows you to select and maintain different units of measure for products."
-msgstr ""
+msgstr "允许你选择和维护产品的不同计量单位"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_tracklots
 msgid "Stock report by logistic serial number"
-msgstr ""
+msgstr "根据物流系列号的库存报表"
 
 #. module: stock
 #: help:product.product,track_outgoing:0
 msgid ""
 "Forces to specify a Serial Number for all moves containing this product and "
 "going to a Customer Location"
-msgstr ""
+msgstr "强制给所有包含将要进入客户库位的这个产品的移库指定一个系列号"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
 msgid "Receive/Deliver Products"
-msgstr ""
+msgstr "接收发送产品"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
@@ -669,7 +675,7 @@ msgstr "包装"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list_in
 msgid "Receipt Slip"
-msgstr ""
+msgstr "入库单"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_move.py:214
@@ -1664,7 +1670,7 @@ msgstr "拆分"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list_out
 msgid "Delivery Slip"
-msgstr ""
+msgstr "出库单"
 
 #. module: stock
 #: view:stock.move:0
@@ -4700,7 +4706,7 @@ msgstr "目标库位"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
 msgid "Picking Slip"
-msgstr ""
+msgstr "领货单"
 
 #. module: stock
 #: help:stock.move,product_packaging:0
@@ -4951,7 +4957,7 @@ msgstr "选项: 如果是连锁那会引发库存调拨."
 #. module: stock
 #: view:stock.picking.out:0
 msgid "Print Delivery Slip"
-msgstr ""
+msgstr "打印出库单"
 
 #. module: stock
 #: view:report.stock.inventory:0
diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py
index 29a53fba7a2..711abbf6259 100644
--- a/addons/stock/report/picking.py
+++ b/addons/stock/report/picking.py
@@ -29,7 +29,13 @@ class picking(report_sxw.rml_parse):
         super(picking, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
+            'get_product_desc':self.get_product_desc
         })
+    def get_product_desc(self,move_line):
+        desc = move_line.product_id.name
+        if move_line.product_id.default_code:
+            desc = '[' + move_line.product_id.default_code + ']' + ' ' + desc
+        return desc
 
 report_sxw.report_sxw('report.stock.picking.list','stock.picking','addons/stock/report/picking.rml',parser=picking)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 5f395c9f005..ecc682dceda 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -162,12 +162,14 @@
           <para style="terp_default_Bold_9">Customer Address : [[ (picking.type == 'out' or removeParentNode('para')) and '' ]]</para>
           <para style="terp_default_Bold_9">Warehouse Address : [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]]</para>
           <para style="terp_default_9">[[ (picking.partner_id and picking.partner_id.id and picking.partner_id.title.name) or '' ]] [[ picking.partner_id and picking.partner_id.id and picking.partner_id.name ]]</para>
-          <para style="terp_default_9">[[ picking.partner_id and display_address(picking.partner_id,'delivery') ]]</para>
+          <para style="terp_default_9">[[ picking.partner_id and display_address(picking.partner_id) ]]</para>
+          <para style="terp_default_9">[[ picking.partner_id.phone or picking.partner_id.email or removeParentNode('para')]]</para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Contact Address :</para>
           <para style="terp_default_9">[[ picking.partner_id and picking.partner_id.title.name or '' ]] [[ picking.partner_id and picking.partner_id.name or '' ]]</para>
-          <para style="terp_default_9">[[ picking.partner_id and display_address(picking.partner_id,'default') ]] </para>
+          <para style="terp_default_9">[[ picking.partner_id and display_address(picking.partner_id) ]] </para>
+          <para style="terp_default_9">[[ picking.partner_id.phone or picking.partner_id.email or removeParentNode('para')]]</para>
         </td>
       </tr>
     </blockTable>
@@ -189,7 +191,7 @@
     <para style="terp_default_5cm_Above_Space">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="100.0,100.0,108.0,107.0,109.0" style="Header_Order_Reference_Tbl">
+    <blockTable colWidths="100.0,154.0,161.0,109.0" style="Header_Order_Reference_Tbl">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Journal</para>
@@ -198,17 +200,14 @@
           <para style="terp_tblheader_General_Centre">Order(Origin)</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Recipient</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Expected Shipping Date </para>
+          <para style="terp_tblheader_General_Centre">Schedule Date</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Weight</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="100.0,100.0,108.0,107.0,109.0" style="Content_Order_Reference_Table">
+    <blockTable colWidths="100.0,154.0,162.0,109.0" style="Content_Order_Reference_Table">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ picking.stock_journal_id.name]]</para>
@@ -216,9 +215,6 @@
         <td>
           <para style="terp_default_Centre_8">[[ picking.origin or '']]</para>
         </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ (picking.partner_id and picking.partner_id.title.name) or '' ]] [[ (picking.partner_id and picking.partner_id.name) or '' ]] </para>
-        </td>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(picking.min_date,date_time = True) ]]</para>
         </td>
@@ -236,7 +232,7 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Lot</para>
+          <para style="terp_tblheader_Details_Centre">Serial Number</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">Status</para>
@@ -255,7 +251,7 @@
       <blockTable colWidths="256.0,74.0,58.0,60.0,73.0" style="Move_Line_Contect_Assign_State">
         <tr>
           <td>
-            <para style="terp_default_9"><font face="Helvetica" size="9.0">[ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ]</font> [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']] </para>
+            <para style="terp_default_9"><font face="Helvetica" size="9.0">[[ get_product_desc(move_lines) ]] </font></para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
@@ -280,7 +276,7 @@
       <blockTable colWidths="256.0,74.0,57.0,61.0,72.0" style="Table1">
         <tr>
           <td>
-            <para style="terp_default_9"><font face="Helvetica" size="9.0">[ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ]</font> [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']]</para>
+            <para style="terp_default_9"><font face="Helvetica" size="9.0">[[ get_product_desc(move_lines) ]] </font></para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]]</para>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 859cda8ce94..9040c678778 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -730,7 +730,7 @@ class stock_picking(osv.osv):
                 model,view_id = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_out_form')
         return super(stock_picking,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
 
-    def onchange_partner_in(self, cr, uid, context=None, partner_id=None):
+    def onchange_partner_in(self, cr, uid, ids, partner_id=None, context=None):
         return {}
 
     def action_explode(self, cr, uid, moves, context=None):
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index bfd086679ea..ad28fce8686 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1198,7 +1198,7 @@
         <record id="view_move_form" model="ir.ui.view">
             <field name="name">stock.move.form</field>
             <field name="model">stock.move</field>
-            <field eval="4" name="priority"/>
+            <field eval="1" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Stock Moves" version="7.0">
                 <header>
@@ -1247,7 +1247,7 @@
                             <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
                             <field name="date" groups="base.group_no_one"/>
                         </group>
-                        <group string="Tracability"
+                        <group string="Traceability"
                             groups="stock.group_tracking_lot">
                             <label for="tracking_id" groups="stock.group_tracking_lot"/>
                             <div groups="stock.group_tracking_lot">
@@ -1307,6 +1307,7 @@
                                 <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
                             </div>
                             <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
+                            <field name="partner_id"/>
                             </group>
                             <group>
                                 <field name="create_date" invisible="1"/>
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index 98f599da48b..14f7f16ac5b 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -23,7 +23,7 @@
                             <field name="quantity" />
                             <field name="product_uom" groups="product.group_uom"/>
                             <field name="tracking" invisible="1"/>
-                            <field name="prodlot_id" domain="[('product_id', '=', product_id)]" invisible="context.get('hide_tracking',False)" attrs="{'required':[('tracking','=',True)]}" groups="stock.group_production_lot"/>
+                            <field name="prodlot_id" context="{'default_product_id':product_id}" domain="[('product_id', '=', product_id)]" invisible="context.get('hide_tracking',False)" attrs="{'required':[('tracking','=',True)]}" groups="stock.group_production_lot"/>
                             <!-- Removed as this feature is not logic: price must be updated upon reception of invoice -->
                             <field name="update_cost" invisible="1"/>
                             <field name="cost"  invisible="1"/>
diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index 9e6c2a0a2b8..fee5259c4dc 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -55,13 +55,13 @@ res_partner()
 
 class sale_order(osv.osv):
     _inherit = 'sale.order'
-    def onchange_partner_id(self, cr, uid, ids, part):
+    def onchange_partner_id(self, cr, uid, ids, part, context=None):
         if not part:
             return {'value':{'partner_invoice_id': False, 'partner_shipping_id':False, 'payment_term' : False}}
         warning = {}
         title = False
         message = False
-        partner = self.pool.get('res.partner').browse(cr, uid, part)
+        partner = self.pool.get('res.partner').browse(cr, uid, part, context=context)
         if partner.sale_warn != 'no-message':
             if partner.sale_warn == 'block':
                 raise osv.except_osv(_('Alert for %s !') % (partner.name), partner.sale_warn_msg)
@@ -72,7 +72,7 @@ class sale_order(osv.osv):
                     'message': message,
             }
 
-        result =  super(sale_order, self).onchange_partner_id(cr, uid, ids, part)
+        result =  super(sale_order, self).onchange_partner_id(cr, uid, ids, part, context=context)
 
         if result.get('warning',False):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
@@ -149,7 +149,7 @@ account_invoice()
 class stock_picking(osv.osv):
     _inherit = 'stock.picking'
 
-    def onchange_partner_in(self, cr, uid, context, partner_id=None):
+    def onchange_partner_in(self, cr, uid, ids, partner_id=None, context=None):
         if not partner_id:
             return {}
         partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
@@ -165,7 +165,7 @@ class stock_picking(osv.osv):
                 'title': title,
                 'message': message
             }
-        result =  super(stock_picking, self).onchange_partner_in(cr, uid, context, partner_id)
+        result =  super(stock_picking, self).onchange_partner_in(cr, uid, ids, partner_id, context)
         if result.get('warning',False):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
@@ -179,7 +179,7 @@ stock_picking()
 class stock_picking_in(osv.osv):
     _inherit = 'stock.picking.in'
 
-    def onchange_partner_in(self, cr, uid, context, partner_id=None):
+    def onchange_partner_in(self, cr, uid, ids, partner_id=None, context=None):
         if not partner_id:
             return {}
         partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
@@ -195,7 +195,7 @@ class stock_picking_in(osv.osv):
                 'title': title,
                 'message': message
             }
-        result =  super(stock_picking_in, self).onchange_partner_in(cr, uid, context, partner_id)
+        result =  super(stock_picking_in, self).onchange_partner_in(cr, uid, ids, partner_id, context)
         if result.get('warning',False):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
@@ -205,7 +205,7 @@ class stock_picking_in(osv.osv):
 class stock_picking_out(osv.osv):
     _inherit = 'stock.picking.out'
 
-    def onchange_partner_in(self, cr, uid, context, partner_id=None):
+    def onchange_partner_in(self, cr, uid, ids, partner_id=None, context=None):
         if not partner_id:
             return {}
         partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
@@ -221,7 +221,7 @@ class stock_picking_out(osv.osv):
                 'title': title,
                 'message': message
             }
-        result =  super(stock_picking_out, self).onchange_partner_in(cr, uid, context, partner_id)
+        result =  super(stock_picking_out, self).onchange_partner_in(cr, uid, ids, partner_id, context)
         if result.get('warning',False):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']