diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index e92d766cece..3b0b9747c21 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 d3697b13ea9..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)"/>
 
@@ -292,7 +292,7 @@
                 <form string="Invoice" version="7.0">
                 <header>
                     <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
-                    <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
+                    <button name="invoice_print" string="Print" type="object" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
                     <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" groups="base.group_user"/>
                     <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" groups="base.group_user"/>
                     <button name="invoice_open" states="draft" string="Validate" class="oe_highlight" groups="base.group_user"/>
@@ -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..73b1e82e244 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-27 20:06+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-28 04:40+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
@@ -2395,7 +2399,7 @@ msgstr "Avgiftsdefinisjon"
 #: view:account.config.settings:0
 #: model:ir.actions.act_window,name:account.action_account_config
 msgid "Configure Accounting"
-msgstr ""
+msgstr "konfigurere regnskap."
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
@@ -2416,7 +2420,7 @@ msgstr ""
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
 #, python-format
 msgid "Good job!"
-msgstr ""
+msgstr "Bra jobba!"
 
 #. module: account
 #: field:account.config.settings,module_account_asset:0
@@ -2511,7 +2515,7 @@ msgstr "Åpne poster"
 #. module: account
 #: field:account.config.settings,purchase_refund_sequence_next:0
 msgid "Next supplier credit note number"
-msgstr ""
+msgstr "Neste leverandør kredit notat nummer."
 
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
@@ -2551,12 +2555,12 @@ msgstr "Konto for avgifter"
 #: code:addons/account/account_cash_statement.py:256
 #, python-format
 msgid "You do not have rights to open this %s journal !"
-msgstr ""
+msgstr "Du har ikke rett til å åpne denne %s journalen !"
 
 #. module: account
 #: model:res.groups,name:account.group_supplier_inv_check_total
 msgid "Check Total on supplier invoices"
-msgstr ""
+msgstr "Sjekk total på leverandør fakturaer."
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2777,7 +2781,7 @@ msgstr "skattemessige posisjoner"
 #: code:addons/account/account_move_line.py:592
 #, python-format
 msgid "You cannot create journal items on a closed account %s %s."
-msgstr ""
+msgstr "Du kan ikke opprette journal elementer på en lukket konto% s% s."
 
 #. module: account
 #: field:account.period.close,sure:0
@@ -2812,7 +2816,7 @@ msgstr "Kunde fakturakladd"
 #. module: account
 #: view:product.category:0
 msgid "Account Properties"
-msgstr ""
+msgstr "Konto egenskaper."
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -2822,7 +2826,7 @@ msgstr "Avstemming av partner"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Fin. Account"
-msgstr ""
+msgstr "Fin. Konto."
 
 #. module: account
 #: field:account.tax,tax_code_id:0
@@ -2899,7 +2903,7 @@ msgstr "EXJ"
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Create Credit Note"
-msgstr ""
+msgstr "Opprett kredit notat."
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
@@ -2997,7 +3001,7 @@ msgstr "Kontodimensjon"
 #: field:account.config.settings,default_purchase_tax:0
 #: field:account.config.settings,purchase_tax:0
 msgid "Default purchase tax"
-msgstr ""
+msgstr "Standard omsetnings skatt."
 
 #. module: account
 #: view:account.account:0
@@ -3171,7 +3175,7 @@ msgstr "Kommuniksjonstype"
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "Konto og periode må tilhøre samme selskap."
 
 #. module: account
 #: constraint:res.currency:0
@@ -3209,7 +3213,7 @@ msgstr "Avskrivningsbeløp"
 #: field:account.bank.statement,message_unread:0
 #: field:account.invoice,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Uleste meldinger."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:44
@@ -3218,12 +3222,14 @@ msgid ""
 "Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
 "Forma' state."
 msgstr ""
+"Valgt faktura (e) kan ikke bekreftes som de ikke er i \"Kladd\" eller \"pro-"
+"forma 'tilstand."
 
 #. module: account
 #: code:addons/account/account.py:1114
 #, python-format
 msgid "You should choose the periods that belong to the same company."
-msgstr ""
+msgstr "Du bør velge de periodene som tilhører samme selskap."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -3236,17 +3242,17 @@ msgstr "Salg pr. konto"
 #: code:addons/account/account.py:1471
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
-msgstr ""
+msgstr "Du kan ikke slette en publisert bilagsregistrering \"% s\"."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Accounting Period"
-msgstr ""
+msgstr "Regnskaps periode."
 
 #. module: account
 #: field:account.config.settings,sale_journal_id:0
 msgid "Sale journal"
-msgstr ""
+msgstr "Salgs journal."
 
 #. module: account
 #: code:addons/account/account.py:2323
@@ -3342,7 +3348,7 @@ msgstr "Obligatorisk"
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
 msgid "Only One Chart Template Available"
-msgstr ""
+msgstr "Bare en diagram mal tilgjengelig."
 
 #. module: account
 #: view:account.chart.template:0
@@ -3355,7 +3361,7 @@ msgstr "Kostnadskonto"
 #: field:account.bank.statement,message_summary:0
 #: field:account.invoice,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Oppsummering."
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -3477,7 +3483,7 @@ msgstr "Velg regnskapsår"
 #: view:account.config.settings:0
 #: view:account.installer:0
 msgid "Date Range"
-msgstr ""
+msgstr "Dato område."
 
 #. module: account
 #: view:account.period:0
@@ -3529,7 +3535,7 @@ msgstr ""
 #: code:addons/account/account.py:2650
 #, python-format
 msgid "There is no parent code for the template account."
-msgstr ""
+msgstr "Det er ingen overordnede kode for denne malen kontoen."
 
 #. module: account
 #: help:account.chart.template,code_digits:0
@@ -3613,12 +3619,12 @@ msgstr "Elektonisk fil"
 #. module: account
 #: constraint:res.partner:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Feil: Ugyldig ean kode."
 
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
-msgstr ""
+msgstr "Selskapet har en konto plan."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -3634,7 +3640,7 @@ msgstr "Konto Partner ledger"
 #: code:addons/account/account_invoice.py:1321
 #, python-format
 msgid "%s <b>created</b>."
-msgstr ""
+msgstr "%s <b>Opprettet</b>."
 
 #. module: account
 #: help:account.journal.column,sequence:0
@@ -3644,7 +3650,7 @@ msgstr "Gir sekvensen for å merke kolonne."
 #. module: account
 #: view:account.period:0
 msgid "Account Period"
-msgstr ""
+msgstr "Konto periode."
 
 #. module: account
 #: help:account.account,currency_id:0
@@ -3672,7 +3678,7 @@ msgstr "Kontoplanmal"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Transactions"
-msgstr ""
+msgstr "Transaksjoner."
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
@@ -3847,6 +3853,10 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration/Journals/Journals."
 msgstr ""
+"Kan ikke finne noen konto journal of% s for denne bedriften.\n"
+"\n"
+"Du kan opprette en i menyen:\n"
+"Konfigurasjon / Tidsskrifter / tidsskrifter."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_unreconcile
@@ -3886,7 +3896,7 @@ msgstr "år"
 #. module: account
 #: field:account.config.settings,date_start:0
 msgid "Start date"
-msgstr ""
+msgstr "Starts dato."
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -3934,7 +3944,7 @@ msgstr "Kontoplan"
 #: view:cash.box.out:0
 #: model:ir.actions.act_window,name:account.action_cash_box_out
 msgid "Take Money Out"
-msgstr ""
+msgstr "Ta ut penger."
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -4055,7 +4065,7 @@ msgstr "Detaljert"
 #. module: account
 #: help:account.config.settings,default_purchase_tax:0
 msgid "This purchase tax will be assigned by default on new products."
-msgstr ""
+msgstr "Kjøpet skatt vil bli tildelt som standard på nye produkter."
 
 #. module: account
 #: report:account.invoice:0
@@ -4083,7 +4093,7 @@ msgstr "(Hvis du ikke velger periode vil alle åpne perioder bli valgt)"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_cashbox_line
 msgid "account.journal.cashbox.line"
-msgstr ""
+msgstr "konto.journal.Pengeboks.linje."
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -4223,7 +4233,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,group_check_supplier_invoice_total:0
 msgid "Check the total of supplier invoices"
-msgstr ""
+msgstr "Sjekk totalen av leverandør fakturaer."
 
 #. module: account
 #: view:account.tax:0
@@ -4310,7 +4320,7 @@ msgstr "Multiplikasjonsfaktor Skatt kode"
 #. module: account
 #: field:account.config.settings,complete_tax_set:0
 msgid "Complete set of taxes"
-msgstr ""
+msgstr "Fullfør sett av skatter."
 
 #. module: account
 #: field:account.account,name:0
@@ -4338,7 +4348,7 @@ msgstr ""
 #. module: account
 #: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "paid"
-msgstr ""
+msgstr "Betalt."
 
 #. module: account
 #: field:account.move.line,date:0
@@ -4372,7 +4382,7 @@ msgstr "Standardkoder"
 #: help:account.bank.statement,message_ids:0
 #: help:account.invoice,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meldinger og kommunikasjon historie."
 
 #. module: account
 #: help:account.journal,analytic_journal_id:0
@@ -4413,7 +4423,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:1236
 #, python-format
 msgid "You cannot use an inactive account."
-msgstr ""
+msgstr "Du kan ikke bruke en inaktiv konto."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -4481,7 +4491,7 @@ msgstr "tittel"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft credit note"
-msgstr ""
+msgstr "Opprett en kladd kredit notat."
 
 #. module: account
 #: view:account.invoice:0
@@ -4513,7 +4523,7 @@ msgstr "Eiendeler"
 #. module: account
 #: view:account.config.settings:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Regnskap & Finans."
 
 #. module: account
 #: view:account.invoice.confirm:0
@@ -4540,7 +4550,7 @@ msgstr "(Faktura må settes ikke-avstemt før den kan åpnes)"
 #. module: account
 #: field:account.tax,account_analytic_collected_id:0
 msgid "Invoice Tax Analytic Account"
-msgstr ""
+msgstr "Faktura skatt analytisk konto."
 
 #. module: account
 #: field:account.chart,period_from:0
@@ -4701,6 +4711,8 @@ msgid ""
 "Error!\n"
 "You cannot create recursive Tax Codes."
 msgstr ""
+"Feil!\n"
+"Du kan ikke opprette rekursive skatte koder."
 
 #. module: account
 #: constraint:account.period:0
@@ -4708,6 +4720,8 @@ msgid ""
 "Error!\n"
 "The duration of the Period(s) is/are invalid."
 msgstr ""
+"Feil!\n"
+"Varigheten av perioden (e) er / er ugyldig."
 
 #. module: account
 #: field:account.entries.report,month:0
@@ -4723,7 +4737,7 @@ msgstr "Måned"
 #. module: account
 #: field:account.config.settings,purchase_sequence_prefix:0
 msgid "Supplier invoice sequence"
-msgstr ""
+msgstr "Leverandør faktura sekvens."
 
 #. module: account
 #: code:addons/account/account_invoice.py:571
@@ -4855,7 +4869,7 @@ msgstr "Vis modus"
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
-msgstr ""
+msgstr "Balansert."
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
@@ -4873,7 +4887,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "Sett dine regnskaps tillegg."
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart
@@ -4964,7 +4978,7 @@ msgstr "Navnet på perioden må være unikt per selskap!"
 #. module: account
 #: help:wizard.multi.charts.accounts,currency_id:0
 msgid "Currency as per company's country."
-msgstr ""
+msgstr "Valuta som per selskapets land."
 
 #. module: account
 #: view:account.tax:0
@@ -5005,6 +5019,8 @@ msgid ""
 "Error!\n"
 "You cannot create an account which has parent account of different company."
 msgstr ""
+"Feil!\n"
+"Du kan ikke opprette en konto som har overordnede hensyn til ulike selskap."
 
 #. module: account
 #: code:addons/account/account_invoice.py:615
@@ -5136,7 +5152,7 @@ msgstr "Annulert faktura"
 #. module: account
 #: view:account.invoice:0
 msgid "My Invoices"
-msgstr ""
+msgstr "Mine fakturaer."
 
 #. module: account
 #: selection:account.bank.statement,state:0
@@ -5146,7 +5162,7 @@ msgstr "Ny"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Sale Tax"
-msgstr ""
+msgstr "Selg skatt."
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
@@ -5221,7 +5237,7 @@ msgstr "SAJ"
 #. module: account
 #: constraint:account.analytic.line:0
 msgid "You cannot create analytic line on view account."
-msgstr ""
+msgstr "Du kan ikke opprette en analytisk linje på vis konto."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -5261,7 +5277,7 @@ msgstr ""
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "or"
-msgstr ""
+msgstr "Eller."
 
 #. module: account
 #: view:account.invoice.report:0
@@ -5354,7 +5370,7 @@ msgstr ""
 #: field:account.invoice,message_comment_ids:0
 #: help:account.invoice,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Kommentarer og E-poster."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5389,7 +5405,7 @@ msgstr "Aktiv"
 #: view:account.bank.statement:0
 #: field:account.journal,cash_control:0
 msgid "Cash Control"
-msgstr ""
+msgstr "Kontant kontroll."
 
 #. module: account
 #: field:account.analytic.balance,date2:0
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index 9b54647e726..a70fdf38f3c 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -7,14 +7,14 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                    <page string="Accounting" groups="account.group_account_user">
+                    <page string="Accounting" groups="account.group_account_invoice">
                         <group name="properties">
                             <group>
-                                <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/>
+                                <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="account.group_account_user"/>
                                 <field name="taxes_id" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}" widget="many2many_tags"/>
                             </group>
                             <group>
-                                <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" />
+                                <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" groups="account.group_account_user"/>
                                 <field name="supplier_taxes_id" colspan="2" widget="many2many_tags"/>
                             </group>
                         </group>
diff --git a/addons/account/report/account_central_journal.py b/addons/account/report/account_central_journal.py
index a42712f40d7..ebb8012f5e7 100644
--- a/addons/account/report/account_central_journal.py
+++ b/addons/account/report/account_central_journal.py
@@ -103,6 +103,6 @@ class journal_print(report_sxw.rml_parse, common_report_header):
             return True
         return data['form']['amount_currency']
 
-report_sxw.report_sxw('report.account.central.journal', 'account.journal.period', 'addons/account/report/account_central_journal.rml', parser=journal_print, header='internal')
+report_sxw.report_sxw('report.account.central.journal', 'account.journal.period', 'addons/account/report/account_central_journal.rml', parser=journal_print, header='external')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index fa2d071695b..68eaedb20a6 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -102,11 +102,11 @@ class account_invoice_report(osv.osv):
         'due_delay': fields.float('Avg. Due Delay', readonly=True, group_operator="avg"),
     }
     _order = 'date desc'
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'account_invoice_report')
-        cr.execute("""
-            create or replace view account_invoice_report as (
-                 select min(ail.id) as id,
+
+
+    def _select(self):
+        select_str = """
+            SELECT min(ail.id) as id,
                     ai.date_invoice as date,
                     to_char(ai.date_invoice, 'YYYY') as year,
                     to_char(ai.date_invoice, 'MM') as month,
@@ -183,15 +183,30 @@ class account_invoice_report(osv.osv):
                          where a.id=ai.id)
                        ELSE 1
                        END) / cr.rate as residual
-                from account_invoice_line as ail
+        """
+        return select_str
+
+    def _where(self):
+        where_str = """
+            WHERE cr.id in (select id from res_currency_rate cr2  where (cr2.currency_id = ai.currency_id)
+                and ((ai.date_invoice is not null and cr.name <= ai.date_invoice) or (ai.date_invoice is null and cr.name <= NOW())) order by name desc limit 1)
+        """
+        return where_str
+
+    def _from(self):
+        from_str = """
+            FROM account_invoice_line as ail
                 left join account_invoice as ai ON (ai.id=ail.invoice_id)
                 left join product_product pr on (pr.id=ail.product_id)
                 left join product_template pt on (pt.id=pr.product_tmpl_id)
                 left join product_uom u on (u.id=ail.uos_id),
                 res_currency_rate cr
-                where cr.id in (select id from res_currency_rate cr2  where (cr2.currency_id = ai.currency_id)
-                and ((ai.date_invoice is not null and cr.name <= ai.date_invoice) or (ai.date_invoice is null and cr.name <= NOW())) order by name desc limit 1)
-                group by ail.product_id,
+        """
+        return from_str
+
+    def _group_by(self):
+        group_by_str = """
+            GROUP BY ail.product_id,
                     ai.date_invoice,
                     ai.id,
                     cr.rate,
@@ -218,8 +233,15 @@ class account_invoice_report(osv.osv):
                     ai.amount_total,
                     u.uom_type,
                     u.category_id
-            )
-        """)
+        """
+        return group_by_str
+
+    def init(self, cr):
+        # self._table = account_invoice_report
+        tools.drop_view_if_exists(cr, self._table)
+        cr.execute("CREATE or REPLACE VIEW %s as (%s %s %s %s)" % (
+                    self._table, 
+                    self._select(), self._from(), self._where(), self._group_by()))
 
 account_invoice_report()
 
diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py
index 2669a3d174c..45472fc7e45 100644
--- a/addons/account/report/account_journal.py
+++ b/addons/account/report/account_journal.py
@@ -195,7 +195,7 @@ class journal_print(report_sxw.rml_parse, common_report_header):
             return 'Reference Number'
         return 'Date'
 
-report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print, header='internal')
-report_sxw.report_sxw('report.account.journal.period.print.sale.purchase', 'account.journal.period', 'addons/account/report/account_journal_sale_purchase.rml', parser=journal_print, header='internal')
+report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print, header='external')
+report_sxw.report_sxw('report.account.journal.period.print.sale.purchase', 'account.journal.period', 'addons/account/report/account_journal_sale_purchase.rml', parser=journal_print, header='external')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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_automatic_reconcile_view.xml b/addons/account/wizard/account_automatic_reconcile_view.xml
index 7840f5a9719..fc3e431ca37 100644
--- a/addons/account/wizard/account_automatic_reconcile_view.xml
+++ b/addons/account/wizard/account_automatic_reconcile_view.xml
@@ -56,6 +56,9 @@
                         <field name="reconciled"/>
                         <field name="unreconciled"/>
                     </group>
+                    <footer>
+                        <button string="Close" class="oe_highlight" special="cancel"/>
+                    </footer>
                 </form>
              </field>
          </record>
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_accountant/i18n/nl_BE.po b/addons/account_accountant/i18n/nl_BE.po
index 7240f08569a..2a5ef937b6e 100644
--- a/addons/account_accountant/i18n/nl_BE.po
+++ b/addons/account_accountant/i18n/nl_BE.po
@@ -8,19 +8,19 @@ 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: 2010-12-17 09:40+0000\n"
-"Last-Translator: Niels Huylebroeck <Unknown>\n"
+"PO-Revision-Date: 2012-11-27 13:16+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@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-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
 msgid "Open Accounting Menu"
-msgstr ""
+msgstr "Menu Boekhouding openen"
 
 #~ msgid "Accountant"
 #~ msgstr "Accountant"
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 0fffde30719..06e2fd2bb18 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -296,11 +296,14 @@ class account_analytic_account(osv.osv):
     def _timesheet_ca_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
         lines_obj = self.pool.get('account.analytic.line')
         res = {}
+        inv_ids = []
         for account in self.browse(cr, uid, ids, context=context):
             res[account.id] = 0.0
             line_ids = lines_obj.search(cr, uid, [('account_id','=', account.id), ('invoice_id','!=',False), ('to_invoice','!=', False), ('journal_id.type', '=', 'general')], context=context)
             for line in lines_obj.browse(cr, uid, line_ids, context=context):
-                res[account.id] += line.invoice_id.amount_untaxed
+                if line.invoice_id not in inv_ids:
+                    inv_ids.append(line.invoice_id)
+                    res[account.id] += line.invoice_id.amount_untaxed
         return res
 
     def _remaining_ca_calc(self, cr, uid, ids, name, arg, context=None):
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index fd32edba0a1..be2a504658f 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -60,14 +60,13 @@
                                     or view
                                 </span>
 
-                                <span attrs="{'invisible': [('fix_price_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
+                                <span attrs="{'invisible': ['|',('fix_price_to_invoice','&lt;&gt;',0.0 ),('partner_id','=',False)]}" class="oe_grey">
                                     No order to invoice, create
-                                </span>
                                 <button name="%(action_sales_order)d" string="Sale Orders"
                                     type="action"
                                     class="oe_link"
                                     context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}"
-                                    />
+                                    /></span>
                             </td>
                         </tr><tr>
                             <td class="oe_timesheet_grey">
diff --git a/addons/account_analytic_analysis/i18n/es_MX.po b/addons/account_analytic_analysis/i18n/es_MX.po
index ba7a0cc051d..bf7c124bb91 100644
--- a/addons/account_analytic_analysis/i18n/es_MX.po
+++ b/addons/account_analytic_analysis/i18n/es_MX.po
@@ -1,91 +1,46 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_analytic_analysis
+# 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:14+0000\n"
-"PO-Revision-Date: 2011-01-13 09:42+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\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:52+0000\n"
+"PO-Revision-Date: 2012-11-27 23:22+0000\n"
+"Last-Translator: OscarAlca <oscarolar@hotmail.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:25+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_invoiced:0
-msgid ""
-"Number of hours that can be invoiced plus those that already have been "
-"invoiced."
-msgstr ""
-"Número de horas que pueden ser facturadas más aquellas que ya han sido "
-"facturadas."
+#: view:account.analytic.account:0
+msgid "No order to invoice, create"
+msgstr "No existe orden a facturar"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,remaining_ca:0
-msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
-msgstr ""
-"Calculado usando la fórmula: Precio máx. factura - Importe facturado."
+#: view:account.analytic.account:0
+msgid "Group By..."
+msgstr "Agrupar por..."
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,remaining_hours:0
-msgid "Computed using the formula: Maximum Quantity - Hours Tot."
-msgstr "Calculado utilizando la fórmula: Cantidad máxima - Horas totales."
+#: view:account.analytic.account:0
+msgid "To Invoice"
+msgstr "Para facturar"
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
-#, python-format
-msgid "AccessError"
-msgstr "Error de acceso"
+#: view:account.analytic.account:0
+msgid "Remaining"
+msgstr "Restante"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,last_invoice_date:0
-msgid "Date of the last invoice created for this analytic account."
-msgstr "Fecha de la última factura creada para esta cuenta analítica."
-
-#. module: account_analytic_analysis
-#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
-msgid ""
-"\n"
-"This module is for modifying account analytic view to show\n"
-"important data to project manager of services companies.\n"
-"Adds menu to show relevant information to each manager..\n"
-"\n"
-"You can also view the report of account analytic summary\n"
-"user-wise as well as month wise.\n"
-msgstr ""
-"\n"
-"Este módulo modifica la vista de cuenta analítica para mostrar\n"
-"datos importantes para el director de proyectos en empresas de servicios.\n"
-"Añade menú para mostrar información relevante para cada director.\n"
-"\n"
-"También puede ver el informe del resumen contable analítico\n"
-"a nivel de usuario, así como a nivel mensual.\n"
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
-msgstr "Fecha última factura"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,theorical_margin:0
-msgid "Computed using the formula: Theorial Revenue - Total Costs"
-msgstr "Calculado usando la fórmula: Ingresos teóricos - Costes totales"
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,real_margin_rate:0
-msgid "Real Margin Rate (%)"
-msgstr "Tasa de margen real (%)"
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,ca_theorical:0
-msgid "Theoretical Revenue"
-msgstr "Ingresos teóricos"
+#: view:account.analytic.account:0
+msgid "Contracts in progress"
+msgstr "Contratos en progreso"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -93,59 +48,13 @@ msgid ""
 "If invoice from the costs, this is the date of the latest work or cost that "
 "have been invoiced."
 msgstr ""
-"Si factura a partir de los costes, ésta es la fecha del último trabajo o "
-"coste que se ha facturado."
-
-#. module: account_analytic_analysis
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
-msgid "Billing"
-msgstr "Facturación"
+"Si factura a partir de los costos, ésta es la fecha del último trabajo o "
+"costo que se ha facturado."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
 msgid "Date of Last Cost/Work"
-msgstr "Fecha del último coste/trabajo"
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,total_cost:0
-msgid "Total Costs"
-msgstr "Costes totales"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,hours_quantity:0
-msgid ""
-"Number of hours you spent on the analytic account (from timesheet). It "
-"computes on all journal of type 'general'."
-msgstr ""
-"Cantidad de horas que dedica a la cuenta analítica (desde horarios). Calcula "
-"en todos los diarios del tipo 'general'."
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,remaining_hours:0
-msgid "Remaining Hours"
-msgstr "Horas restantes"
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,theorical_margin:0
-msgid "Theoretical Margin"
-msgstr "Márgen teórico"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,ca_theorical:0
-msgid ""
-"Based on the costs you had on the project, what would have been the revenue "
-"if all these costs have been invoiced at the normal sale price provided by "
-"the pricelist."
-msgstr ""
-"Basado en los costes que tenía en el proyecto, lo que habría sido el "
-"ingreso si todos estos costes se hubieran facturado con el precio de venta "
-"normal proporcionado por la tarifa."
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,user_ids:0
-#: field:account_analytic_analysis.summary.user,user:0
-msgid "User"
-msgstr "Usuario"
+msgstr "Fecha del último costo/trabajo"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_to_invoice:0
@@ -153,71 +62,194 @@ msgid "Uninvoiced Amount"
 msgstr "Importe no facturado"
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,real_margin:0
-msgid "Computed using the formula: Invoiced Amount - Total Costs."
-msgstr "Calculado utilizando la fórmula: Importe facturado - Costes totales."
+#: view:account.analytic.account:0
+msgid ""
+"When invoicing on timesheet, OpenERP uses the\n"
+"                            pricelist of the contract which uses the price\n"
+"                            defined on the product related to each employee "
+"to\n"
+"                            define the customer invoice price rate."
+msgstr ""
+"Cuando se factura la Hoja de trabajo, OpenERP usa la\n"
+"                            lista de precios del contracto que a su vez usa "
+"el precio\n"
+"                           definido en el producto relacionado a cada "
+"empleado para\n"
+"                            definir el precio de la factura del cliente."
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,hours_qtt_non_invoiced:0
-msgid "Uninvoiced Hours"
-msgstr "Horas no facturadas"
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,last_worked_date:0
-msgid "Date of the latest work done on this account."
-msgstr "Fecha del último trabajo realizado en esta cuenta."
-
-#. module: account_analytic_analysis
-#: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
-msgid "report_account_analytic"
-msgstr "Informes contabilidad analítica"
-
-#. module: account_analytic_analysis
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
-msgid "Hours Summary by User"
-msgstr "Resumen de horas por usuario"
+#: view:account.analytic.account:0
+msgid "⇒ Invoice"
+msgstr "Facturar"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
 msgstr "Importe facturado"
 
-#. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:533
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:704
-#, python-format
-msgid "You try to bypass an access rule (Document type: %s)."
-msgstr "Ha intentado saltarse una regla de acceso (tipo de documento: %s)."
-
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
 msgid "Date of Last Invoiced Cost"
-msgstr "Fecha del último coste facturado"
+msgstr "Fecha del último costo facturado"
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,hours_qtt_invoiced:0
-msgid "Invoiced Hours"
-msgstr "Horas facturadas"
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,real_margin:0
-msgid "Real Margin"
-msgstr "Margen real"
-
-#. module: account_analytic_analysis
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
-msgstr ""
-"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
-"seleccionada"
+#: help:account.analytic.account,fix_price_to_invoice:0
+msgid "Sum of quotations for this contract."
+msgstr "Suma de las cotizaciones para este contrato"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."
 msgstr "Importe total facturado al cliente para esta cuenta."
 
+#. module: account_analytic_analysis
+#: help:account.analytic.account,timesheet_ca_invoiced:0
+msgid "Sum of timesheet lines invoiced for this contract."
+msgstr ""
+"Suma de las lineas de la hoja de trabajo facturadas para este contrato."
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,revenue_per_hour:0
+msgid "Computed using the formula: Invoiced Amount / Total Time"
+msgstr "Calculado utilizando la fórmula: Importe facturado / Tiempo total"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Contracts not assigned"
+msgstr "No tiene contratos asignados"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Contracts that are not assigned to an account manager."
+msgstr "Contratos que no han sido asignados a un gerente de cuenta"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new contract.\n"
+"              </p><p>\n"
+"                You will find here the contracts to be renewed because the\n"
+"                end date is passed or the working effort is higher than the\n"
+"                maximum authorized one.\n"
+"              </p><p>\n"
+"                OpenERP automatically sets contracts to be renewed in a "
+"pending\n"
+"                state. After the negociation, the salesman should close or "
+"renew\n"
+"                pending contracts.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click para definir un nuevo contrato.\n"
+"              </p><p>\n"
+"                Aquí encontrará  los contratos que serán renovados a los que "
+"\n"
+"                la fecha ha expirado o la cantidad de trabajo es mayor que "
+"el \n"
+"                máximo autorizado.\n"
+"              </p><p>\n"
+"                OpenERP cambia automaticamente los contratos a ser renovados "
+"a estado pendiente.\n"
+"                Despues de negociar, el vendedor deve cerrar o renovar "
+"contratos pendientes.\n"
+"              </p>\n"
+"            "
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "End Date"
+msgstr "Fecha de término"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid ""
+"Number of time (hours/days) (from journal of type 'general') that can be "
+"invoiced if you invoice based on analytic account."
+msgstr ""
+"Número de tiempo(horas/días) (desde diario de tipo 'general') que pueden ser "
+"facturados si su factura está basada en cuentas analíticas"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_hours_to_invoice:0
+msgid "Computed using the formula: Maximum Time - Total Invoiced Time"
+msgstr "Calculado usando la formula: Tiempo Máximo - Tiempo total facturado"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Expected"
+msgstr "Esperado"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta Analítica"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,theorical_margin:0
+msgid "Computed using the formula: Theoretical Revenue - Total Costs"
+msgstr "Calculado utilizando la formula: Ingresos Teóricos - Costos totales"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_invoiced:0
+msgid "Invoiced Time"
+msgstr "Tiempo facturado"
+
+#. module: account_analytic_analysis
+#: constraint:account.analytic.account:0
+msgid "Error! You cannot create recursive analytic accounts."
+msgstr "Error! No es posible crear cuentas analíticas recursivas."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin_rate:0
+msgid "Real Margin Rate (%)"
+msgstr "Tasa de margen real (%)"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_hours:0
+msgid "Computed using the formula: Maximum Time - Total Worked Time"
+msgstr ""
+"Calculado utilizando la formula: Tiempo Maximo - Tiempo Total Trabajado"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_quantity:0
+msgid ""
+"Number of time you spent on the analytic account (from timesheet). It "
+"computes quantities on all journal of type 'general'."
+msgstr ""
+"Cantidad de tiempo que utilizaste en la cuenta analítica (Hoja de trabajo). "
+"Calcula cantidades en todos los diarios de tipo 'General'."
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Nothing to invoice, create"
+msgstr "Nada por facturar"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Template of Contract"
+msgstr "Plantilla de contrato"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_quantity:0
+msgid "Total Worked Time"
+msgstr "Tiempo total trabajado"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,real_margin:0
+msgid "Real Margin"
+msgstr "Margen real"
+
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
 msgid "Hours summary by month"
@@ -229,18 +261,346 @@ msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
 msgstr "Calcula utilizando la fórmula: (Margen real / Costes totales) * 100."
 
 #. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid ""
-"Number of hours (from journal of type 'general') that can be invoiced if you "
-"invoice based on analytic account."
-msgstr ""
-"Número de horas (desde diario de tipo 'general') que pueden ser facturadas "
-"si factura basado en contabilidad analítica."
+#: view:account.analytic.account:0
+msgid "or view"
+msgstr "o vista"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
-msgid "Analytic accounts"
-msgstr "Cuentas analíticas"
+msgid "Parent"
+msgstr "Padre"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,month_ids:0
+#: field:account_analytic_analysis.summary.month,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
+msgid "Time & Materials to Invoice"
+msgstr "Tiempo y materiales a facturar."
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue_all
+msgid "Contracts"
+msgstr "Contratos"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,total_cost:0
+msgid ""
+"Total of costs for this account. It includes real costs (from invoices) and "
+"indirect costs, like time spent on timesheets."
+msgstr ""
+"Costos totales para esta cuenta. Incluye costos reales (desde facturas) y "
+"costos indirectos, como el tiempo empleado en hojas de trabajo (horarios)."
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid ""
+"The contracts to be renewed because the deadline is passed or the working "
+"hours are higher than the allocated hours"
+msgstr ""
+"El contrato necesita ser renovado porque la fecha de finalización ha "
+"terminado o las horas trabajadas son más que las asignadas"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Pending contracts to renew with your customer"
+msgstr "Contratos pendientes para renovar con el cliente"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Timesheets"
+msgstr "Hojas de trabajo"
+
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:452
+#, python-format
+msgid "Sale Order Lines of %s"
+msgstr "Lineas de venta para %s"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,is_overdue_quantity:0
+msgid "Overdue Quantity"
+msgstr "Cantidad sobrepasada"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,ca_theorical:0
+msgid "Theoretical Revenue"
+msgstr "Ingresos teóricos"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "To Renew"
+msgstr "Para renovar"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid ""
+"A contract in OpenERP is an analytic account having a partner set on it."
+msgstr ""
+"Un contrato en OpenERP es una cuenta analítica que tiene un cliente asignado."
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order
+msgid "Sales Orders"
+msgstr "Orden de Venta"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_invoice_date:0
+msgid "If invoice from the costs, this is the date of the latest invoiced."
+msgstr "Si factura desde costos, esta es la fecha de lo último facturado"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,ca_theorical:0
+msgid ""
+"Based on the costs you had on the project, what would have been the revenue "
+"if all these costs have been invoiced at the normal sale price provided by "
+"the pricelist."
+msgstr ""
+"Basado en los costes que tenía en el proyecto, lo que habría sido el "
+"ingreso si todos estos costes se hubieran facturado con el precio de venta "
+"normal proporcionado por la lista de precios."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,user_ids:0
+#: field:account_analytic_analysis.summary.user,user:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,help:account_analytic_analysis.template_of_contract_action
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click here to create a template of contract.\n"
+"                </p><p>\n"
+"                    Templates are used to prefigure contract/project that \n"
+"                    can be selected by the salespeople to quickly configure "
+"the\n"
+"                    terms and conditions of the contract.\n"
+"                </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click aquí para crear una plantilla de contrato.\n"
+"                </p><p>\n"
+"                    Las plantillas son utilizadas para pre-configurar "
+"contratos/proyectos que \n"
+"                    que pueden ser seleccionados por los agentes de ventas "
+"para configurar rápidamente los\n"
+"                    términos y condiciones del contrato.\n"
+"                </p>\n"
+"            "
+
+#. module: account_analytic_analysis
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
+msgid "Hours Summary by User"
+msgstr "Resumen de horas por usuario"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Contract"
+msgstr "Contrato"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,hours_qtt_invoiced:0
+msgid ""
+"Number of time (hours/days) that can be invoiced plus those that already "
+"have been invoiced."
+msgstr ""
+"Cantidad de tiempo(horas/días) que pueden ser facturadas más las que ya han "
+"sido facturadas."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,revenue_per_hour:0
+msgid "Revenue per Time (real)"
+msgstr "Beneficio por tiempo(real)"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue_all
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click to create a new contract.\n"
+"                </p><p>\n"
+"                    Use contracts to follow tasks, issues, timesheets or "
+"invoicing based on\n"
+"                    work done, expenses and/or sales orders. OpenERP will "
+"automatically manage\n"
+"                    the alerts for the renewal of the contracts to the right "
+"salesperson.\n"
+"                </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Click aquí para crear un nuevo contrato.\n"
+"                </p><p>\n"
+"                    Use contratos para dar seguimiento a tareas, problemas, "
+"hojas de trabajo o facturacion basada en \n"
+"                    trabajos realizados, gastos y/o ordenes de venta. "
+"OpenERP maneja automáticamente alertas\n"
+"                    para la renovación de contratos a la persona de ventas "
+"indicada.\n"
+"                </p>\n"
+"            "
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,toinvoice_total:0
+msgid "Total to Invoice"
+msgstr "Total a facturar"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Sale Orders"
+msgstr "Pedidos de venta"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Open"
+msgstr "Abierta"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,invoiced_total:0
+msgid "Total Invoiced"
+msgstr "Total Facturado"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_ca:0
+msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
+msgstr ""
+"Calculado usando la fórmula: Precio máx. factura - Importe facturado."
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
+msgstr "Ultima fecha de factura"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,help:account_analytic_analysis.action_hr_tree_invoiced_all
+msgid ""
+"<p>\n"
+"                You will find here timesheets and purchases you did for\n"
+"                contracts that can be reinvoiced to the customer.  If you "
+"want\n"
+"                to record new activities to invoice, you should use the "
+"timesheet\n"
+"                menu instead.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p>\n"
+"                Encontrara aqui las hojas de trabajo y compras que ha "
+"realizado para\n"
+"                contratos que pueden ser refacturados al cliente. Si desea "
+"agregar \n"
+"                nuevas lineas para facturar, debe utilizar el menú de hoja "
+"de trabajo.\n"
+"              </p>\n"
+"            "
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_non_invoiced:0
+msgid "Uninvoiced Time"
+msgstr "Tiempo sin facturar"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,total_cost:0
+msgid "Total Costs"
+msgstr "Costos totales"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,remaining_total:0
+msgid ""
+"Expectation of remaining income for this contract. Computed as the sum of "
+"remaining subtotals which, in turn, are computed as the maximum between "
+"'(Estimation - Invoiced)' and 'To Invoice' amounts"
+msgstr ""
+"Expectativa de ingresos restantes para este contrato. Calculado como la suma "
+"de los subtotales restantes que, a su vez, se calculan como el máximo entre "
+"'(Estimación - facturado)' y cantidades 'a facturar'"
+
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue
+msgid "Contracts to Renew"
+msgstr "Contratos a renovar"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,toinvoice_total:0
+msgid " Sum of everything that could be invoiced for this contract."
+msgstr " Suma de todo lo que puede ser facturado en este contrato."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,theorical_margin:0
+msgid "Theoretical Margin"
+msgstr "Márgen teórico"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,remaining_total:0
+msgid "Total Remaining"
+msgstr "Total restante"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,real_margin:0
+msgid "Computed using the formula: Invoiced Amount - Total Costs."
+msgstr "Calculado utilizando la fórmula: Importe facturado - Costos totales."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,hours_qtt_est:0
+msgid "Estimation of Hours to Invoice"
+msgstr "Estimacion de horas a facturar."
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,fix_price_invoices:0
+msgid "Fixed Price"
+msgstr "Precio fijo"
+
+#. module: account_analytic_analysis
+#: help:account.analytic.account,last_worked_date:0
+msgid "Date of the latest work done on this account."
+msgstr "Fecha del último trabajo realizado en esta cuenta."
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Contracts Having a Partner"
+msgstr "Contratos que tiene una empresa"
+
+#. module: account_analytic_analysis
+#: field:account.analytic.account,est_total:0
+msgid "Total Estimation"
+msgstr "Estimación Total"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
@@ -253,128 +613,29 @@ msgid ""
 "If invoice from analytic account, the remaining amount you can invoice to "
 "the customer based on the total costs."
 msgstr ""
-"Si factura basado en contabilidad analítica, el importe restante que puede "
-"facturar al cliente basado en los costes totales."
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,revenue_per_hour:0
-msgid "Computed using the formula: Invoiced Amount / Hours Tot."
-msgstr "Calculado utilizando la fórmula: Importe facturado / Horas totales."
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,revenue_per_hour:0
-msgid "Revenue per Hours (real)"
-msgstr "Ingresos por horas (real)"
+"Si factura desde contabilidad analítica, el importe restante que puede "
+"facturar al cliente basado en los costos totales."
 
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,unit_amount:0
 #: field:account_analytic_analysis.summary.user,unit_amount:0
 msgid "Total Time"
-msgstr "Tiempo total"
+msgstr "Tiempo Total"
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,month_ids:0
-#: field:account_analytic_analysis.summary.month,month:0
-msgid "Month"
-msgstr "Mes"
+#: field:account.analytic.account,invoice_on_timesheets:0
+msgid "On Timesheets"
+msgstr "En hojas de trabajo"
 
 #. module: account_analytic_analysis
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
+#: field:account.analytic.account,fix_price_to_invoice:0
+#: field:account.analytic.account,remaining_hours:0
+#: field:account.analytic.account,remaining_hours_to_invoice:0
+#: field:account.analytic.account,timesheet_ca_invoiced:0
+msgid "Remaining Time"
+msgstr "Tiempo restante"
 
 #. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
-msgid "Overpassed Accounts"
-msgstr "Cuentas caducadas"
-
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
-msgid "All Uninvoiced Entries"
-msgstr "Todas las entradas no facturadas"
-
-#. module: account_analytic_analysis
-#: field:account.analytic.account,hours_quantity:0
-msgid "Hours Tot"
-msgstr "Horas totales"
-
-#. module: account_analytic_analysis
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#. module: account_analytic_analysis
-#: help:account.analytic.account,total_cost:0
-msgid ""
-"Total of costs for this account. It includes real costs (from invoices) and "
-"indirect costs, like time spent on timesheets."
-msgstr ""
-"Costes totales para esta cuenta. Incluye costes reales (desde facturas) y "
-"costes indirectos, como el tiempo empleado en hojas de servicio (horarios)."
-
-#~ msgid "Hours summary by user"
-#~ msgstr "Resumen de horas por usuario"
-
-#~ msgid "All Analytic Accounts"
-#~ msgstr "Todas las cuentas analíticas"
-
-#~ msgid "My Current Accounts"
-#~ msgstr "Mis cuentas actuales"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Theorical Revenue"
-#~ msgstr "Ingresos teóricos"
-
-#~ 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 "New Analytic Account"
-#~ msgstr "Nueva cuenta analítica"
-
-#~ msgid "Theorical Margin"
-#~ msgstr "Margen teórico"
-
-#~ msgid "Current Analytic Accounts"
-#~ msgstr "Cuentas analíticas actuales"
-
-#~ msgid "Invoicing"
-#~ msgstr "Facturación"
-
-#~ msgid "My Pending Accounts"
-#~ msgstr "Mis cuentas pendientes"
-
-#~ msgid "My Uninvoiced Entries"
-#~ msgstr "Mis entradas no facturadas"
-
-#~ msgid "My Accounts"
-#~ msgstr "Mis cuentas"
-
-#~ msgid "Analytic Accounts"
-#~ msgstr "Cuentas analíticas"
-
-#~ msgid "Financial Project Management"
-#~ msgstr "Gestión de proyectos financieros"
-
-#~ msgid "Pending Analytic Accounts"
-#~ msgstr "Cuentas analíticas pendientes"
-
-#~ msgid ""
-#~ "Modify account analytic view to show\n"
-#~ "important data for project manager of services companies.\n"
-#~ "Add menu to show relevant information for each manager."
-#~ msgstr ""
-#~ "Modifica la vista de cuenta analítica para mostrar\n"
-#~ "datos importantes para el director de proyectos en empresas de servicios.\n"
-#~ "Añade menú para mostrar información relevante para cada director."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
+#: view:account.analytic.account:0
+msgid "Total"
+msgstr "Total"
diff --git a/addons/account_analytic_default/i18n/es_MX.po b/addons/account_analytic_default/i18n/es_MX.po
index 2de02ed6c80..b49ba52c5ec 100644
--- a/addons/account_analytic_default/i18n/es_MX.po
+++ b/addons/account_analytic_default/i18n/es_MX.po
@@ -1,38 +1,21 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_analytic_default
+# 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"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-26 08:03+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:52+0000\n"
+"PO-Revision-Date: 2012-11-27 23:44+0000\n"
+"Last-Translator: OscarAlca <oscarolar@hotmail.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:29+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: account_analytic_default
-#: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
-msgid "Account Analytic Default"
-msgstr "Cuenta analítica por defecto"
-
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid ""
-"select a partner which will use analytical account specified in analytic "
-"default (eg. create new cutomer invoice or Sale order if we select this "
-"partner, it will automatically take this as an analytical account)"
-msgstr ""
-"Seleccione una empresa que utilizará esta cuenta analítica como la cuenta "
-"analítica por defecto (por ejemplo, al crear nuevas facturas de cliente o "
-"pedidos de venta, si se selecciona esta empresa, automáticamente se "
-"utilizará esta cuenta analítica)."
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -41,16 +24,6 @@ msgstr ""
 msgid "Analytic Rules"
 msgstr "Reglas analíticas"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,analytic_id:0
-msgid "Analytical Account"
-msgstr "Cuenta analítica"
-
-#. module: account_analytic_default
-#: view:account.analytic.default:0
-msgid "Current"
-msgstr "Actual"
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Group By..."
@@ -58,13 +31,13 @@ msgstr "Agrupar por..."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
-msgid "Default end date for this Analytical Account"
-msgstr "Fecha final por defecto para esta cuenta analítica."
+msgid "Default end date for this Analytic Account."
+msgstr "Fecha final default para esta Cuenta Analítica."
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
-msgstr "Albarán"
+msgstr "Lista de Movimientos."
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -72,21 +45,15 @@ msgid "Conditions"
 msgstr "Condiciones"
 
 #. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
+#: help:account.analytic.default,partner_id:0
 msgid ""
-"select a company which will use analytical account specified in analytic "
-"default (eg. create new cutomer invoice or Sale order if we select this "
-"company, it will automatically take this as an analytical account)"
+"Select a partner which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sale order if we select this "
+"partner, it will automatically take this as an analytic account)"
 msgstr ""
-"Seleccione una compañía que utilizará esta cuenta analítica como la cuenta "
-"analítica por defecto (por ejemplo, al crear nuevas facturas de cliente o "
-"pedidos de venta, si se selecciona esta compañía, automáticamente se "
-"utilizará esta cuenta analítica)."
-
-#. module: account_analytic_default
-#: help:account.analytic.default,date_start:0
-msgid "Default start date for this Analytical Account"
-msgstr "Fecha inicial por defecto para esta cuenta analítica."
+"Seleccione la empresa que utilizara la cuenta analítica especificada por "
+"defecto.(ej. crea una nueva factura de cliente u Orden de venta si "
+"seleccionamos esta empresa, este automáticamente toma esta cuenta analítica)"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -116,65 +83,57 @@ msgstr "Usuario"
 msgid "Entries"
 msgstr "Asientos"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid ""
+"Select a product which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sale order if we select this "
+"product, it will automatically take this as an analytic account)"
+msgstr ""
+"Seleccione el producto que utilizara la cuenta espeficifcada por defecto "
+"(ej. crea una nueva factura de cliente u orden de venta si seleccionamos "
+"este producto, este, automáticamente tomara esto como una cuenta analítica)"
+
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
 msgstr "Fecha final"
 
-#. module: account_analytic_default
-#: help:account.analytic.default,user_id:0
-msgid ""
-"select a user which will use analytical account specified in analytic default"
-msgstr ""
-"Seleccione un usuario que utilizará esta cuenta analítica como la cuenta "
-"analítica por defecto."
-
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
 #: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
 msgid "Analytic Defaults"
-msgstr "Análisis: Valores por defecto"
+msgstr "Valores analíticos por defecto"
 
 #. module: account_analytic_default
-#: model:ir.module.module,description:account_analytic_default.module_meta_information
-msgid ""
-"\n"
-"Allows to automatically select analytic accounts based on criterions:\n"
-"* Product\n"
-"* Partner\n"
-"* User\n"
-"* Company\n"
-"* Date\n"
-"    "
-msgstr ""
-"\n"
-"Permite seleccionar automáticamente cuentas analíticas según estos "
-"criterios:\n"
-"* Producto\n"
-"* Empresa\n"
-"* Usuario\n"
-"* Compañía\n"
-"* Fecha\n"
-"    "
-
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid ""
-"select a product which will use analytical account specified in analytic "
-"default (eg. create new cutomer invoice or Sale order if we select this "
-"product, it will automatically take this as an analytical account)"
-msgstr ""
-"Seleccione un producto que utilizará esta cuenta analítica como la cuenta "
-"analítica por defecto (por ejemplo, al crear nuevas facturas de cliente o "
-"pedidos de venta, si se selecciona este producto, automáticamente se "
-"utilizará esta cuenta analítica)."
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr "Referencia debe ser única por compañía!"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid ""
+"Select a company which will use analytic account specified in analytic "
+"default (e.g. create new customer invoice or Sale order if we select this "
+"company, it will automatically take this as an analytic account)"
+msgstr ""
+"Seleccione una compañía que utilizara la cuenta analítica espeficificada por "
+"defecto (ej. crea una nueva factura de cliente u orden de venta si "
+"selecciona esta compañía, este, automáticamente la toma como una cuenta "
+"analítica)"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,user_id:0
+msgid ""
+"Select a user which will use analytic account specified in analytic default."
+msgstr "Seleccione un usuario que utilizara la cuenta analítica por defecto."
+
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
 msgid "Invoice Line"
@@ -184,7 +143,12 @@ msgstr "Línea de factura"
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
-msgstr "Cuenta analítica"
+msgstr "Cuenta Analítica"
+
+#. module: account_analytic_default
+#: help:account.analytic.default,date_start:0
+msgid "Default start date for this Analytic Account."
+msgstr "Fecha inicial por defecto para esta Cuenta Analítica."
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -213,22 +177,4 @@ msgstr ""
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "Línea pedido de venta"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ 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 "Seq"
-#~ msgstr "Secuencia"
-
-#~ msgid "Analytic Distributions"
-#~ msgstr "Distribuciones analíticas"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
+msgstr "Línea de Orden de venta"
diff --git a/addons/account_analytic_default/i18n/nl_BE.po b/addons/account_analytic_default/i18n/nl_BE.po
index 0c9fa6be3e2..6dab7d0e1ed 100644
--- a/addons/account_analytic_default/i18n/nl_BE.po
+++ b/addons/account_analytic_default/i18n/nl_BE.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-07-27 12:58+0000\n"
+"PO-Revision-Date: 2012-11-27 13:19+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <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:10+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -31,7 +31,7 @@ msgstr "Groeperen op..."
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
 msgid "Default end date for this Analytic Account."
-msgstr ""
+msgstr "Standaard einddatum voor deze analytische rekening"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
@@ -50,6 +50,9 @@ msgid ""
 "default (e.g. create new customer invoice or Sale order if we select this "
 "partner, it will automatically take this as an analytic account)"
 msgstr ""
+"Kies een relatie voor wie de standaard analytische rekening van toepassing "
+"is (vb. maak een nieuwe verkoopfactuur of -order, en kies deze relatie; de "
+"analytische rekening wordt automatisch voorgesteld)"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -86,6 +89,9 @@ msgid ""
 "default (e.g. create new customer invoice or Sale order if we select this "
 "product, it will automatically take this as an analytic account)"
 msgstr ""
+"Kies een product waarvoor de standaard analytische rekening van toepassing "
+"is (vb. maak een nieuwe verkoopfactuur of -order, en kies dit product; de "
+"analytische rekening wordt automatisch voorgesteld)"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
@@ -116,12 +122,16 @@ msgid ""
 "default (e.g. create new customer invoice or Sale order if we select this "
 "company, it will automatically take this as an analytic account)"
 msgstr ""
+"Kies een bedrijf waarvoor de standaard analytische rekening van toepassing "
+"is (vb. maak een nieuwe verkoopfactuur of -order, en kies dit bedrijf; de "
+"analytische rekening wordt automatisch voorgesteld)"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
 "Select a user which will use analytic account specified in analytic default."
 msgstr ""
+"Kies een gebruiker die de analytische standaardrekening zal gebruiken."
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
@@ -137,7 +147,7 @@ msgstr "Analytische rekening"
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
-msgstr ""
+msgstr "Standaard begindatum voor deze analytische rekening."
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
diff --git a/addons/account_analytic_default/i18n/zh_CN.po b/addons/account_analytic_default/i18n/zh_CN.po
index 9113d020291..185508ddcab 100644
--- a/addons/account_analytic_default/i18n/zh_CN.po
+++ b/addons/account_analytic_default/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-02-08 03:53+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-27 16:42+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-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -31,7 +31,7 @@ msgstr "分组..."
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
 msgid "Default end date for this Analytic Account."
-msgstr ""
+msgstr "辅助核算项的默认结束日期"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
@@ -137,7 +137,7 @@ msgstr "辅助核算项"
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
-msgstr ""
+msgstr "辅助核算项的默认开始日期"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
diff --git a/addons/account_analytic_plans/i18n/es_MX.po b/addons/account_analytic_plans/i18n/es_MX.po
index 2838f67fb03..e2f05df843c 100644
--- a/addons/account_analytic_plans/i18n/es_MX.po
+++ b/addons/account_analytic_plans/i18n/es_MX.po
@@ -1,32 +1,33 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_analytic_plans
+# 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"
-"POT-Creation-Date: 2011-01-03 16:56+0000\n"
-"PO-Revision-Date: 2011-01-12 18:12+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\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:52+0000\n"
+"PO-Revision-Date: 2012-11-28 00:35+0000\n"
+"Last-Translator: OscarAlca <oscarolar@hotmail.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:25+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid ""
 "This distribution model has been saved.You will be able to reuse it later."
 msgstr ""
-"Este modelo de distribución ha sido guardado. Lo podrá reutilizar más tarde."
+"Este modelo de distribución ha sido guardado. Podrá utilizarlo después."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,plan_id:0
 msgid "Plan Id"
-msgstr "Id plan"
+msgstr "Id del plan"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -51,11 +52,6 @@ msgstr "Analítica cruzada"
 msgid "Analytic Plan"
 msgstr "Plan analítico"
 
-#. module: account_analytic_plans
-#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
-msgid "Multiple-plans management in Analytic Accounting"
-msgstr "Gestión de múltiples planes en contabilidad analítica"
-
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,journal_id:0
 #: view:account.crossovered.analytic:0
@@ -69,12 +65,6 @@ msgstr "Diario analítico"
 msgid "Analytic Plan Line"
 msgstr "Línea de plan analítico"
 
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:60
-#, python-format
-msgid "User Error"
-msgstr "Error de usuario"
-
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
 msgid "Analytic Plan Instance"
@@ -85,11 +75,6 @@ msgstr "Instancia de plan analítico"
 msgid "Ok"
 msgstr "Aceptar"
 
-#. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid "You can not create move line on closed account."
-msgstr "No puede crear una línea de movimiento en una cuenta cerrada."
-
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,plan_id:0
 msgid "Model's Plan"
@@ -98,17 +83,26 @@ msgstr "Plan del modelo"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account2_ids:0
 msgid "Account2 Id"
-msgstr "Id cuenta2"
+msgstr "Id de cuenta2"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account_ids:0
 msgid "Account Id"
-msgstr "Id cuenta"
+msgstr "Id de cuenta"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:221
+#: code:addons/account_analytic_plans/account_analytic_plans.py:234
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Amount"
-msgstr "Importe"
+msgstr "Monto"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -123,7 +117,7 @@ msgstr "¡Valor haber o debe erróneo en el asiento contable!"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
 msgid "Account6 Id"
-msgstr "Id cuenta6"
+msgstr "Id de cuenta6"
 
 #. module: account_analytic_plans
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
@@ -136,9 +130,24 @@ msgid "Bank Statement Line"
 msgstr "Línea extracto bancario"
 
 #. module: account_analytic_plans
-#: field:account.analytic.plan.instance.line,analytic_account_id:0
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "¡Estructura de comunicación BBA no válida!"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "There is no analytic plan defined."
+msgstr "No hay plan analítico definido."
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+"¡La fecha de su asiento no está en el periodo definido! Usted debería "
+"cambiar la fecha o borrar esta restricción del diario."
 
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
@@ -148,20 +157,12 @@ msgstr "¡El código del diario debe ser único por compañía!"
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,ref:0
 msgid "Analytic Account Reference"
-msgstr "Referencia cuenta analítica"
-
-#. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid ""
-"You can not create move line on receivable/payable account without partner"
-msgstr ""
-"No puede crear una línea de movimiento en una cuenta a cobrar/a pagar sin "
-"una empresa."
+msgstr "Referencia de cuenta analítica"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "Línea pedido de venta"
+msgstr "Línea de Orden de venta"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47
@@ -182,20 +183,20 @@ msgstr "Imprimir"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
+#: field:account.analytic.line,percentage:0
 msgid "Percentage"
 msgstr "Porcentaje"
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:201
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
 #, python-format
-msgid "A model having this name and code already exists !"
-msgstr "¡Ya existe un modelo con este nombre y código!"
+msgid "There are no analytic lines related to account %s."
+msgstr "No hay lineas analíticas relacionadas a la cuenta %s"
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
-#, python-format
-msgid "No analytic plan defined !"
-msgstr "¡No se ha definido un plan analítico!"
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Cuenta Analítica"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,rate:0
@@ -230,18 +231,31 @@ msgid "Analytic Plan Lines"
 msgstr "Líneas de plan analítico"
 
 #. module: account_analytic_plans
-#: constraint:account.bank.statement.line:0
-msgid ""
-"The amount of the voucher must be the same amount as the one on the "
-"statement line"
+#: constraint:account.move.line:0
+msgid "Account and Period must belong to the same company."
+msgstr "La cuenta y el periodo deben pertenecer a la misma compañía."
+
+#. module: account_analytic_plans
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
 msgstr ""
-"El importe del recibo debe ser el mismo importe que el de la línea del "
-"extracto"
+"El diario y periodo seleccionados tienen que pertenecer a la misma compañía"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice_line
 msgid "Invoice Line"
-msgstr "Línea factura"
+msgstr "Línea de factura"
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+"La cuenta seleccionada en su asiento fuerza a tener una moneda secundaria. "
+"Debería eliminar la moneda secundaria de la cuenta o asignar al diario una "
+"vista multi-moneda"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -249,9 +263,9 @@ msgid "Currency"
 msgstr "Moneda"
 
 #. module: account_analytic_plans
-#: field:account.crossovered.analytic,date1:0
-msgid "Start Date"
-msgstr "Fecha inicial"
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
+msgstr "No puede crear una linea analitica a una cuenta de vista."
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -261,7 +275,12 @@ msgstr "Compañía"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account5_ids:0
 msgid "Account5 Id"
-msgstr "Id cuenta5"
+msgstr "Id de cuenta5"
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on closed account."
+msgstr "No puedes crear elementos de diario en cuentas cerradas."
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
@@ -276,14 +295,14 @@ msgstr "Cuenta principal"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "To Date"
-msgstr "Hasta fecha"
+msgstr "Hasta la Fecha"
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:321
-#: code:addons/account_analytic_plans/account_analytic_plans.py:462
+#: code:addons/account_analytic_plans/account_analytic_plans.py:342
+#: code:addons/account_analytic_plans/account_analytic_plans.py:486
 #, python-format
-msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr "¡Debe definir un diario analítico en el diario '%s'!"
+msgid "You have to define an analytic journal on the '%s' journal."
+msgstr "Tiene que definir un diario analitico en el diario '%s'"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,empty_line:0
@@ -295,82 +314,16 @@ msgstr "No mostrar líneas vacías"
 msgid "analytic.plan.create.model.action"
 msgstr "analitica.plan.crear.modelo.accion"
 
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Línea analítica"
+
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
 msgstr "Cuenta analítica:"
 
-#. module: account_analytic_plans
-#: model:ir.module.module,description:account_analytic_plans.module_meta_information
-msgid ""
-"This module allows to use several analytic plans, according to the general "
-"journal,\n"
-"so that multiple analytic lines are created when the invoice or the entries\n"
-"are confirmed.\n"
-"\n"
-"For example, you can define the following analytic structure:\n"
-"  Projects\n"
-"      Project 1\n"
-"          SubProj 1.1\n"
-"          SubProj 1.2\n"
-"      Project 2\n"
-"  Salesman\n"
-"      Eric\n"
-"      Fabien\n"
-"\n"
-"Here, we have two plans: Projects and Salesman. An invoice line must\n"
-"be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
-"Fabien. The amount can also be split. The following example is for\n"
-"an invoice that touches the two subproject and assigned to one salesman:\n"
-"\n"
-"Plan1:\n"
-"    SubProject 1.1 : 50%\n"
-"    SubProject 1.2 : 50%\n"
-"Plan2:\n"
-"    Eric: 100%\n"
-"\n"
-"So when this line of invoice will be confirmed, it will generate 3 analytic "
-"lines,\n"
-"for one account entry.\n"
-"The analytic plan validates the minimum and maximum percentage at the time "
-"of creation\n"
-"of distribution models.\n"
-"        "
-msgstr ""
-"Este módulo permite utilizar varios planes analíticos, de acuerdo con el "
-"diario general,\n"
-"para crear múltiples líneas analíticas cuando la factura o los asientos\n"
-"sean confirmados.\n"
-"\n"
-"Por ejemplo, puede definir la siguiente estructura de analítica:\n"
-"  Proyectos\n"
-"      Proyecto 1\n"
-"          Subproyecto 1,1\n"
-"          Subproyecto 1,2\n"
-"      Proyecto 2\n"
-"  Comerciales\n"
-"      Eduardo\n"
-"      Marta\n"
-"\n"
-"Aquí, tenemos dos planes: Proyectos y Comerciales. Una línea de factura "
-"debe\n"
-"ser capaz de escribir las entradas analíticas en los 2 planes: Subproyecto "
-"1.1 y\n"
-"Eduardo. La cantidad también se puede dividir. El siguiente ejemplo es para\n"
-"una factura que implica a los dos subproyectos y asignada a un comercial:\n"
-"\n"
-"Plan1:\n"
-"    Subproyecto 1.1: 50%\n"
-"    Subproyecto 1.2: 50%\n"
-"Plan2:\n"
-"    Eduardo: 100%\n"
-"\n"
-"Así, cuando esta línea de la factura sea confirmada, generará 3 líneas "
-"analíticas para un asiento contable.\n"
-"El plan analítico valida el porcentaje mínimo y máximo en el momento de "
-"creación de los modelos de distribución.\n"
-"        "
-
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account Reference:"
@@ -379,7 +332,7 @@ msgstr "Referencia cuenta analítica:"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,name:0
 msgid "Plan Name"
-msgstr "Nombre de plan"
+msgstr "Nombre del plan"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan,default_instance_id:0
@@ -394,12 +347,7 @@ msgstr "Elementos diario"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account1_ids:0
 msgid "Account1 Id"
-msgstr "Id cuenta1"
-
-#. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid "Company must be same for its related account and period."
-msgstr "La compañía debe ser la misma para la cuenta y periodo relacionados."
+msgstr "Id de cuenta1"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,min_required:0
@@ -411,14 +359,6 @@ msgstr "Mínimo permitido (%)"
 msgid "Root account of this plan."
 msgstr "Cuenta principal de este plan."
 
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:201
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
-#, python-format
-msgid "Error"
-msgstr "Error"
-
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Save This Distribution as a Model"
@@ -430,10 +370,9 @@ msgid "Quantity"
 msgstr "Cantidad"
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
-#, python-format
-msgid "Please put a name and a code before saving the model !"
-msgstr "¡Introduzca un nombre y un código antes de guardar el modelo!"
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "¡El número de factura debe ser único por compañía!"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
@@ -441,11 +380,11 @@ msgid "Print Crossovered Analytic"
 msgstr "Imprimir analítica cruzada"
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:321
-#: code:addons/account_analytic_plans/account_analytic_plans.py:462
+#: code:addons/account_analytic_plans/account_analytic_plans.py:342
+#: code:addons/account_analytic_plans/account_analytic_plans.py:486
 #, python-format
 msgid "No Analytic Journal !"
-msgstr "¡No diario analítico!"
+msgstr "¡No hay diario analítico!"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
@@ -455,7 +394,7 @@ msgstr "Extracto bancario"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
 msgid "Account3 Id"
-msgstr "Id cuenta3"
+msgstr "Id de cuenta3"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice
@@ -471,28 +410,28 @@ msgstr "Cancelar"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
 msgid "Account4 Id"
-msgstr "Id cuenta4"
+msgstr "Id de cuenta4"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:234
+#, python-format
+msgid "The total should be between %s and %s."
+msgstr "El total debe estar entre %s y %s"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
 msgid "Analytic Distribution Lines"
 msgstr "Líneas de distribución analítica"
 
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:214
-#, python-format
-msgid "The Total Should be Between %s and %s"
-msgstr "El total debería estar entre %s y %s"
-
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "at"
-msgstr "a las"
+msgstr "en"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Account Name"
-msgstr "Nombre de cuenta"
+msgstr "Nombre de la cuenta"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
@@ -504,11 +443,6 @@ msgstr "Línea de distribución analítica"
 msgid "Distribution Code"
 msgstr "Código de distribución"
 
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "%"
-msgstr "%"
-
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "100.00%"
@@ -530,6 +464,16 @@ msgstr "Distribución analítica"
 msgid "Journal"
 msgstr "Diario"
 
+#. module: account_analytic_plans
+#: constraint:account.journal:0
+msgid ""
+"Configuration error!\n"
+"The currency chosen should be shared by the default accounts too."
+msgstr ""
+"¡Error de confuguración!\n"
+"La moneda seleccionada también tiene que ser la que está en las cuentas por "
+"defecto."
+
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
 msgid "analytic.plan.create.model"
@@ -543,7 +487,37 @@ msgstr "Fecha final"
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
 msgid "Distribution Models"
-msgstr "Modelos distribución"
+msgstr "Modelos de distribución"
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on an account of type view."
+msgstr "No puede crear elementos de diario en una cuenta de tipo vista."
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
+#, python-format
+msgid "User Error!"
+msgstr "¡Error de usuario!"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#, python-format
+msgid "Please put a name and a code before saving the model."
+msgstr "Por favor ponga un nombre y código antes de guardar el modelo."
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date1:0
+msgid "Start Date"
+msgstr "Fecha inicial"
+
+#. module: account_analytic_plans
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line."
+msgstr ""
+"El monto del comprobante debe ser el mismo que esta en la linea de asiento."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
@@ -556,120 +530,13 @@ msgid "The name of the journal must be unique per company !"
 msgstr "¡El nombre del diaro debe ser único por compañía!"
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:214
-#, python-format
-msgid "Value Error"
-msgstr "Valor erróneo"
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
+msgid "or"
+msgstr "ó"
 
 #. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid "You can not create move line on view account."
-msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista."
-
-#~ 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 "Currency:"
-#~ msgstr "Moneda:"
-
-#~ msgid "Select Information"
-#~ msgstr "Seleccionar información"
-
-#~ msgid "Analytic Account Ref."
-#~ msgstr "Ref. cuenta analítica"
-
-#~ msgid "Create Model"
-#~ msgstr "Crear modelo"
-
-#~ msgid "to"
-#~ msgstr "hasta"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "OK"
-#~ msgstr "Aceptar"
-
-#~ msgid "Period from"
-#~ msgstr "Período desde"
-
-#~ msgid "Printing date:"
-#~ msgstr "Fecha impresión:"
-
-#~ msgid "Analytic Distribution's models"
-#~ msgstr "Modelos de distribución analítica"
-
-#~ msgid ""
-#~ "This distribution model has been saved. You will be able to reuse it later."
-#~ msgstr ""
-#~ "Este modelo de distribución ha sido guardado. Más tarde podrá reutilizarlo."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid ""
-#~ "This module allows to use several analytic plans, according to the general "
-#~ "journal,\n"
-#~ "so that multiple analytic lines are created when the invoice or the entries\n"
-#~ "are confirmed.\n"
-#~ "\n"
-#~ "For example, you can define the following analytic structure:\n"
-#~ "  Projects\n"
-#~ "      Project 1\n"
-#~ "          SubProj 1.1\n"
-#~ "          SubProj 1.2\n"
-#~ "      Project 2\n"
-#~ "  Salesman\n"
-#~ "      Eric\n"
-#~ "      Fabien\n"
-#~ "\n"
-#~ "Here, we have two plans: Projects and Salesman. An invoice line must\n"
-#~ "be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
-#~ "Fabien. The amount can also be split. The following example is for\n"
-#~ "an invoice that touches the two subproject and assigned to one salesman:\n"
-#~ "\n"
-#~ "Plan1:\n"
-#~ "    SubProject 1.1 : 50%\n"
-#~ "    SubProject 1.2 : 50%\n"
-#~ "Plan2:\n"
-#~ "    Eric: 100%\n"
-#~ "\n"
-#~ "So when this line of invoice will be confirmed, it will generate 3 analytic "
-#~ "lines,\n"
-#~ "for one account entry.\n"
-#~ "        "
-#~ msgstr ""
-#~ "Este módulo permite utilizar varios planes analíticos, de acuerdo con el "
-#~ "diario general,\n"
-#~ "para que crea múltiples líneas analíticas cuando la factura o los asientos\n"
-#~ "sean confirmados.\n"
-#~ "\n"
-#~ "Por ejemplo, puede definir la siguiente estructura de analítica:\n"
-#~ "  Proyectos\n"
-#~ "      Proyecto 1\n"
-#~ "          Subproyecto 1,1\n"
-#~ "          Subproyecto 1,2\n"
-#~ "      Proyecto 2\n"
-#~ "  Comerciales\n"
-#~ "      Eduardo\n"
-#~ "      Marta\n"
-#~ "\n"
-#~ "Aquí, tenemos dos planes: Proyectos y Comerciales. Una línea de factura "
-#~ "debe\n"
-#~ "ser capaz de escribir las entradas analíticas en los 2 planes: Subproyecto "
-#~ "1.1 y\n"
-#~ "Eduardo. La cantidad también se puede dividir. El siguiente ejemplo es para\n"
-#~ "una factura que implica a los dos subproyectos y asignada a un comercial:\n"
-#~ "\n"
-#~ "Plan1:\n"
-#~ "    Subproyecto 1.1: 50%\n"
-#~ "    Subproyecto 1.2: 50%\n"
-#~ "Plan2:\n"
-#~ "    Eduardo: 100%\n"
-#~ "\n"
-#~ "Así, cuando esta línea de la factura sea confirmada, generará 3 líneas "
-#~ "analíticas para un asiento contable.\n"
-#~ "        "
+#: code:addons/account_analytic_plans/account_analytic_plans.py:221
+#, python-format
+msgid "A model with this name and code already exists."
+msgstr "Un modelo con este código y nombre ya existe."
diff --git a/addons/account_anglo_saxon/i18n/es_MX.po b/addons/account_anglo_saxon/i18n/es_MX.po
index def75b4c77c..ae8e2eb2dee 100644
--- a/addons/account_anglo_saxon/i18n/es_MX.po
+++ b/addons/account_anglo_saxon/i18n/es_MX.po
@@ -1,44 +1,60 @@
-# 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: 2011-01-12 11:29+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 00:37+0000\n"
+"Last-Translator: OscarAlca <oscarolar@hotmail.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:45+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: account_anglo_saxon
-#: view:product.category:0
-msgid " Accounting Property"
-msgstr " Propiedades de contabilidad"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
-msgid "Order Reference must be unique !"
-msgstr "¡La referencia del pedido debe ser única!"
+msgid "Order Reference must be unique per Company!"
+msgstr "¡La referencia del pedido debe ser única por compañía!"
+
+#. module: account_anglo_saxon
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "¡El número de factura debe ser único por compañía!"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr "Categoría de producto"
+
+#. module: account_anglo_saxon
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr "¡La referencia debe ser única por compañía!"
 
 #. module: account_anglo_saxon
 #: constraint:product.category:0
-msgid "Error ! You can not create recursive categories."
-msgstr "¡Error! No puede crear categorías recursivas."
+msgid "Error ! You cannot create recursive categories."
+msgstr "¡Error! No puede crear categorías recursivas"
+
+#. module: account_anglo_saxon
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "¡Estructura de comunicación BBA no válida!"
 
 #. module: account_anglo_saxon
 #: constraint:product.template:0
 msgid ""
-"Error: The default UOM and the purchase UOM must be in the same category."
+"Error: The default Unit of Measure and the purchase Unit of Measure must be "
+"in the same category."
 msgstr ""
-"Error: La UdM por defecto y la UdM de compra deben estar en la misma "
-"categoría."
+"Error:  La unidad de medida por defecto y la unidad de medida de compra "
+"deben ser de la misma categoría."
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
@@ -48,23 +64,13 @@ msgstr "Línea de factura"
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_purchase_order
 msgid "Purchase Order"
-msgstr "Pedido de compra"
+msgstr "Orden de Compra"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_template
 msgid "Product Template"
 msgstr "Plantilla de producto"
 
-#. module: account_anglo_saxon
-#: model:ir.model,name:account_anglo_saxon.model_product_category
-msgid "Product Category"
-msgstr "Categoría de producto"
-
-#. module: account_anglo_saxon
-#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
-msgid "Stock Accounting for Anglo Saxon countries"
-msgstr "Contabilidad de stocks para países anglo-sajones"
-
 #. module: account_anglo_saxon
 #: field:product.category,property_account_creditor_price_difference_categ:0
 #: field:product.template,property_account_creditor_price_difference:0
@@ -79,43 +85,7 @@ msgstr "Factura"
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_stock_picking
 msgid "Picking List"
-msgstr "Albarán"
-
-#. module: account_anglo_saxon
-#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
-msgid ""
-"This module will support the Anglo-Saxons accounting methodology by\n"
-"    changing the accounting logic with stock transactions. The difference "
-"between the Anglo-Saxon accounting countries\n"
-"    and the Rhine or also called Continental accounting countries is the "
-"moment of taking the Cost of Goods Sold versus Cost of Sales.\n"
-"    Anglo-Saxons accounting does take the cost when sales invoice is "
-"created, Continental accounting will take the cost at the moment the goods "
-"are shipped.\n"
-"    This module will add this functionality by using a interim account, to "
-"store the value of shipped goods and will contra book this interim account\n"
-"    when the invoice is created to transfer this amount to the debtor or "
-"creditor account.\n"
-"    Secondly, price differences between actual purchase price and fixed "
-"product standard price are booked on a separate account"
-msgstr ""
-"Este módulo soporta la metodología de la contabilidad anglo-sajona mediante\n"
-"    el cambio de la lógica contable con las transacciones de inventario. La "
-"diferencia entre contabilidad de países anglo-sajones\n"
-"    y el RHINE o también llamada contabilidad de países continentales es el "
-"momento de considerar los costes de las mercancías vendidas respecto al "
-"coste de las ventas.\n"
-"    La contabilidad anglosajona tiene en cuenta el coste cuando se crea la "
-"factura de venta, la contabilidad continental tiene en cuenta ese coste en "
-"el momento de que las mercancías son enviadas.\n"
-"    Este modulo añade esta funcionalidad usando una cuenta provisional, para "
-"guardar el valor de la mercancía enviada y anota un contra asiento a esta "
-"cuenta provisional\n"
-"    cuando se crea la factura para transferir este importe a la cuenta "
-"deudora o acreedora.\n"
-"    Secundariamente, las diferencias de precios entre el actual precio de "
-"compra y el precio estándar fijo del producto son registrados en cuentas "
-"separadas."
+msgstr "Lista de Movimientos."
 
 #. module: account_anglo_saxon
 #: help:product.category,property_account_creditor_price_difference_categ:0
@@ -125,38 +95,4 @@ msgid ""
 "and cost price."
 msgstr ""
 "Esta cuenta se utilizará para valorar la diferencia de precios entre el "
-"precio de compra y precio de coste."
-
-#~ msgid "Stock Account"
-#~ msgstr "Cuenta de Valores"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML Inválido para la Arquitectura de la Vista!"
-
-#~ msgid ""
-#~ "This module will support the Anglo-Saxons accounting methodology by \n"
-#~ "    changing the accounting logic with stock transactions. The difference "
-#~ "between the Anglo-Saxon accounting countries \n"
-#~ "    and the Rhine or also called Continental accounting countries is the "
-#~ "moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
-#~ "    Anglo-Saxons accounting does take the cost when sales invoice is "
-#~ "created, Continental accounting will take the cost at he moment the goods "
-#~ "are shipped.\n"
-#~ "    This module will add this functionality by using a interim account, to "
-#~ "store the value of shipped goods and will contra book this interim account \n"
-#~ "    when the invoice is created to transfer this amount to the debtor or "
-#~ "creditor account."
-#~ msgstr ""
-#~ "Éste módulo soportará la metodología de contabilización Anglosajona \n"
-#~ "    cambiando la lógica de contabilización con transacciones de acciones. La "
-#~ "diferencia entre los países de contabilización Anglosajona \n"
-#~ "    y el Rin o también llamados países de contabilización Continental es el "
-#~ "momento de tomar el Costo de Bienes Vendidos contra el Costo de Ventas. \n"
-#~ "    La contabilización Anglosajona toma el costo cuando la factura de ventas "
-#~ "es creada, la contabilización Continental tomará el costo en el momento en "
-#~ "que los bienes son enviados.\n"
-#~ "    Éste módulo agregará esta funcionalidad usando una cuenta provisional, "
-#~ "para almacenar el valor de los bienes enviados y devolverá esta cuenta "
-#~ "provisional \n"
-#~ "    cuando la factura sea creada para transferir esta cantidad al deudor o "
-#~ "acreedor de la cuenta."
+"precio de compra y precio de costo."
diff --git a/addons/account_anglo_saxon/i18n/nl_BE.po b/addons/account_anglo_saxon/i18n/nl_BE.po
index dfb2e1cd7b0..99f28458554 100644
--- a/addons/account_anglo_saxon/i18n/nl_BE.po
+++ b/addons/account_anglo_saxon/i18n/nl_BE.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-03-01 17:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-27 13:28+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@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:19+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
@@ -53,6 +53,8 @@ msgid ""
 "Error: The default Unit of Measure and the purchase Unit of Measure must be "
 "in the same category."
 msgstr ""
+"Fout: de standaardmaateenheid moet tot dezelfde categorie behoren als de "
+"aankoopmaateenheid."
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
diff --git a/addons/account_anglo_saxon/i18n/zh_CN.po b/addons/account_anglo_saxon/i18n/zh_CN.po
index 101c89f7956..155f6e9099e 100644
--- a/addons/account_anglo_saxon/i18n/zh_CN.po
+++ b/addons/account_anglo_saxon/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-08 14:34+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-27 16:41+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:19+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
@@ -52,7 +52,7 @@ msgstr "BBA传输结构有误！"
 msgid ""
 "Error: The default Unit of Measure and the purchase Unit of Measure must be "
 "in the same category."
-msgstr ""
+msgstr "错误：默认的计量单位和采购计量单位必须是相同的类别"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
diff --git a/addons/account_asset/i18n/es_MX.po b/addons/account_asset/i18n/es_MX.po
index 66cedb8b82c..7684caf86dc 100644
--- a/addons/account_asset/i18n/es_MX.po
+++ b/addons/account_asset/i18n/es_MX.po
@@ -1,332 +1,274 @@
-# 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: 2009-11-24 12:54+0000\n"
-"PO-Revision-Date: 2011-07-12 12:04+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 00:58+0000\n"
+"Last-Translator: OscarAlca <oscarolar@hotmail.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:59+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_asset
-#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
-#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
-msgid "Open Assets"
-msgstr "Activos abiertos"
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr "Activos en estado borrador y abierto"
 
 #. module: account_asset
-#: field:account.asset.property,method_end:0
-#: field:account.asset.property.history,method_end:0
+#: field:account.asset.category,method_end:0
+#: field:account.asset.history,method_end:0
+#: field:asset.modify,method_end:0
 msgid "Ending date"
 msgstr "Fecha final"
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Depreciation board"
-msgstr "cuadro de drepeciación"
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr "Valor residual"
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr "Cuenta gastos amortización"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr "Calcular activo"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr "Importe bruto"
 
 #. module: account_asset
 #: view:account.asset.asset:0
-#: field:account.asset.asset,name:0
-#: field:account.asset.board,asset_id:0
-#: field:account.asset.property,asset_id:0
-#: field:account.invoice.line,asset_id:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0
 #: field:account.move.line,asset_id:0
-#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: view:asset.asset.report:0
+#: field:asset.asset.report,asset_id:0
 #: model:ir.model,name:account_asset.model_account_asset_asset
-#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
 msgid "Asset"
 msgstr "Activo"
 
 #. module: account_asset
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo inválido en la definición de acción."
+#: help:account.asset.asset,prorata:0
+#: help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr ""
+"Indica que el primer asiento de depreciación para este activo tiene que ser "
+"hecho desde la fecha de compra en vez de desde el 1 de enero"
 
 #. module: account_asset
-#: selection:account.asset.property,method:0
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
 msgid "Linear"
 msgstr "Lineal"
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Change duration"
-msgstr "Cambiar duración"
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr "Compañía"
 
 #. module: account_asset
-#: field:account.asset.asset,child_ids:0
-msgid "Child assets"
-msgstr "Activos hijos"
+#: view:asset.modify:0
+msgid "Modify"
+msgstr "Modificar"
 
 #. module: account_asset
-#: field:account.asset.board,value_asset:0
-msgid "Asset Value"
-msgstr "valor de activos"
+#: selection:account.asset.asset,state:0
+#: view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr "En ejecución"
 
 #. module: account_asset
-#: wizard_field:account.asset.modify,init,name:0
+#: field:account.asset.depreciation.line,amount:0
+msgid "Depreciation Amount"
+msgstr "Importe de depreciación"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr "Análisis activos"
+
+#. module: account_asset
+#: field:asset.modify,name:0
 msgid "Reason"
 msgstr "Razón"
 
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr "Factor degresivo"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr "Categorías de activo"
+
 #. module: account_asset
 #: view:account.asset.asset:0
-#: field:account.asset.asset,entry_ids:0
-#: wizard_field:account.asset.compute,asset_compute,move_ids:0
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
 msgid "Entries"
 msgstr "Asientos"
 
 #. module: account_asset
-#: wizard_view:account.asset.compute,asset_compute:0
-msgid "Generated entries"
-msgstr "Asientos generados"
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr "Líneas de depreciación"
 
 #. module: account_asset
-#: wizard_field:account.asset.modify,init,method_delay:0
-#: field:account.asset.property,method_delay:0
-#: field:account.asset.property.history,method_delay:0
-msgid "Number of interval"
-msgstr "Numero de intervalo"
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr "Es el importe que prevee tener que no puede depreciar"
 
 #. module: account_asset
-#: wizard_button:account.asset.compute,asset_compute,asset_open:0
-msgid "Open entries"
-msgstr "Abrir asientos"
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr "Fecha de depreciación"
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You cannot create recursive assets."
+msgstr "¡Error! No puede crear activos recursivos."
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr "Importe asentado"
 
 #. module: account_asset
 #: view:account.asset.asset:0
-#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list
-#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list
-#: model:ir.ui.menu,name:account_asset.menu_finance_Assets
-#: model:ir.ui.menu,name:account_asset.menu_finance_config_Assets
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
 msgid "Assets"
 msgstr "Activos"
 
 #. module: account_asset
-#: selection:account.asset.property,method:0
-msgid "Progressive"
-msgstr "Progresivo"
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr "Cuenta de amortización"
 
 #. module: account_asset
-#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_draft
-#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_draft
-msgid "Draft Assets"
-msgstr "Activos en estado borrador"
-
-#. module: account_asset
-#: wizard_view:account.asset.modify,init:0
-#: wizard_field:account.asset.modify,init,note:0
-#: view:account.asset.property.history:0
+#: view:account.asset.asset:0
+#: view:account.asset.category:0
+#: view:account.asset.history:0
+#: view:asset.modify:0
+#: field:asset.modify,note:0
 msgid "Notes"
 msgstr "Notas"
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Change history"
-msgstr "Cambio histórico"
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr "Asiento de amortización"
+
+#. module: account_asset
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "¡Valor haber o debe erróneo en el asiento contable!"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr "# de líneas de amortización"
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+msgid "Number of Months in a Period"
+msgstr "Numero de meses en un periodo."
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr "Activos en estado borrador"
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr "Fecha final"
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr "Referencia"
+
+#. module: account_asset
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "¡Estructura de comunicación BBA no válida!"
 
 #. module: account_asset
 #: view:account.asset.asset:0
-msgid "Depreciation entries"
-msgstr "Asiento de dotación a la amortización"
+msgid "Account Asset"
+msgstr "Cuenta de activo"
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Methods"
-msgstr "Métodos"
+#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
+#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
+msgid "Compute Assets"
+msgstr "Calcular amortizaciones"
 
 #. module: account_asset
-#: wizard_view:account.asset.modify,init:0
-msgid "Asset properties to modify"
-msgstr "Propiedades de activos para modificar"
-
-#. module: account_asset
-#: field:account.asset.asset,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
-
-#. module: account_asset
-#: wizard_field:account.asset.modify,init,method_period:0
-#: field:account.asset.property,method_period:0
-#: field:account.asset.property.history,method_period:0
-msgid "Period per interval"
-msgstr "Período por intervalo"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Depreciation duration"
-msgstr "Plazo de amortización"
-
-#. module: account_asset
-#: field:account.asset.property,account_analytic_id:0
-msgid "Analytic account"
-msgstr "Cuenta analítica"
-
-#. module: account_asset
-#: field:account.asset.property,state:0
-msgid "State"
-msgstr "Provincia"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Depreciation methods"
-msgstr "Metodos de drepreciación"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Other information"
-msgstr "Otra información"
-
-#. module: account_asset
-#: field:account.asset.board,value_asset_cumul:0
-msgid "Cumul. value"
-msgstr "Valor acumulado"
-
-#. module: account_asset
-#: view:account.asset.property:0
-msgid "Assets methods"
-msgstr "metodos activos"
-
-#. module: account_asset
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML no válido para la estructura de la vista!"
-
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_asset_property
-msgid "Asset property"
-msgstr "Propiedad del activo"
-
-#. module: account_asset
-#: wizard_view:account.asset.compute,asset_compute:0
-#: wizard_view:account.asset.compute,init:0
-#: wizard_button:account.asset.compute,init,asset_compute:0
-#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
-#: model:ir.ui.menu,name:account_asset.menu_wizard_asset_compute
-msgid "Compute assets"
-msgstr "Calcular activos"
-
-#. module: account_asset
-#: wizard_view:account.asset.modify,init:0
-#: wizard_button:account.asset.modify,init,asset_modify:0
-#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
-msgid "Modify asset"
-msgstr "Modificar activo"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Confirm asset"
-msgstr "Confirmar activo"
-
-#. module: account_asset
-#: view:account.asset.property.history:0
-#: model:ir.model,name:account_asset.model_account_asset_property_history
-msgid "Asset history"
-msgstr "Histórico del activo"
-
-#. module: account_asset
-#: field:account.asset.property,date:0
-msgid "Date created"
-msgstr "Fecha de creación"
-
-#. module: account_asset
-#: model:ir.module.module,description:account_asset.module_meta_information
-msgid ""
-"Financial and accounting asset management.\n"
-"    Allows to define\n"
-"    * Asset category. \n"
-"    * Assets.\n"
-"    *Asset usage period and property.\n"
-"    "
-msgstr ""
-"Gestión financiera y contable de activos.\n"
-"  Permite definir\n"
-"  * Categorías de activo. \n"
-"  * Activos.\n"
-"  * Período y propiedades del activo usado.\n"
-"    "
-
-#. module: account_asset
-#: field:account.asset.board,value_gross:0
-#: field:account.asset.property,value_total:0
-msgid "Gross value"
-msgstr "Valor bruto"
-
-#. module: account_asset
-#: selection:account.asset.property,method_time:0
-msgid "Ending period"
-msgstr "Período final"
-
-#. module: account_asset
-#: field:account.asset.board,name:0
-msgid "Asset name"
-msgstr "nombre de activos"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Accounts information"
-msgstr "información de cuentas"
-
-#. module: account_asset
-#: field:account.asset.asset,note:0
-#: field:account.asset.category,note:0
-#: field:account.asset.property.history,note:0
-msgid "Note"
-msgstr "Nota"
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr "Longitud de periodo"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0
-#: selection:account.asset.property,state:0
+#: view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
 msgid "Draft"
 msgstr "Borrador"
 
 #. module: account_asset
-#: field:account.asset.property,type:0
-msgid "Depr. method type"
-msgstr "Tipo de método de amortización"
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr "Fecha de compra del activo"
 
 #. module: account_asset
-#: field:account.asset.property,account_asset_id:0
-msgid "Asset account"
-msgstr "cuenta de activos"
-
-#. module: account_asset
-#: field:account.asset.property.history,asset_property_id:0
-msgid "Method"
-msgstr "Método"
-
-#. module: account_asset
-#: selection:account.asset.asset,state:0
-msgid "Normal"
-msgstr "Normal"
-
-#. module: account_asset
-#: field:account.asset.property,method_progress_factor:0
-msgid "Progressif factor"
-msgstr "Factor de progresión"
-
-#. module: account_asset
-#: field:account.asset.asset,localisation:0
-msgid "Localisation"
-msgstr "Localización"
-
-#. module: account_asset
-#: field:account.asset.property,method:0
-msgid "Computation method"
-msgstr "metodo de computación"
-
-#. module: account_asset
-#: field:account.asset.property,method_time:0
-msgid "Time method"
-msgstr "Método temporal"
+#: help:account.asset.asset,method_number:0
+msgid "Calculates Depreciation within specified interval"
+msgstr "Calcula la amortización en el periodo especificado"
 
 #. module: account_asset
 #: field:account.asset.asset,active:0
@@ -334,201 +276,543 @@ msgid "Active"
 msgstr "Activo"
 
 #. module: account_asset
-#: field:account.asset.property.history,user_id:0
-msgid "User"
-msgstr "Usuario"
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr "Cambiar duración"
 
 #. module: account_asset
-#: field:account.asset.asset,property_ids:0
-msgid "Asset method name"
-msgstr "Nombre de método de asiento"
+#: view:account.asset.category:0
+msgid "Analytic Information"
+msgstr "Información analítica"
 
 #. module: account_asset
-#: field:account.asset.asset,date:0
-#: field:account.asset.property.history,date:0
-msgid "Date"
-msgstr "Fecha"
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr "Cuenta analítica"
 
 #. module: account_asset
-#: field:account.asset.board,value_net:0
-msgid "Net value"
-msgstr "Valor neto"
+#: field:account.asset.asset,method:0
+#: field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr "Método de cálculo"
 
 #. module: account_asset
-#: wizard_view:account.asset.close,init:0
-#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
-msgid "Close asset"
-msgstr "Activo cerrado"
+#: help:account.asset.asset,method_period:0
+msgid "State here the time during 2 depreciations, in months"
+msgstr "Ponga aquí el tiempo entre 2 amortizaciones, en meses"
 
 #. module: account_asset
-#: field:account.asset.property,history_ids:0
-msgid "History"
-msgstr "Historia"
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr ""
+"Prorata temporis puede ser aplicado solo para método de tiempo \"numero de "
+"amortizaciones\""
 
 #. module: account_asset
-#: field:account.asset.property,account_actif_id:0
-msgid "Depreciation account"
-msgstr "Cuenta de amortización"
+#: help:account.asset.history,method_time:0
+msgid ""
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+"El método usado para calcular las fechas número de líneas de depreciación\n"
+"Número de depreciaciones: Ajusta el número de líneas de depreciación y el "
+"tiempo entre 2 depreciaciones\n"
+"Fecha de fin: Escoja un tiempo entre 2 amortizaciones y la fecha de "
+"depreciación no irá más allá."
 
 #. module: account_asset
-#: field:account.asset.asset,period_id:0
-#: wizard_field:account.asset.compute,init,period_id:0
-msgid "Period"
-msgstr "Período"
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+"¡La fecha de su asiento no está en el periodo definido! Usted debería "
+"cambiar la fecha o borrar esta restricción del diario."
 
 #. module: account_asset
-#: model:ir.actions.act_window,name:account_asset.action_account_asset_category_form
-#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_category_form
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr "Tiempo en meses entre 2 depreciaciones"
+
+#. module: account_asset
+#: view:asset.modify:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_modify
+#: model:ir.model,name:account_asset.model_asset_modify
+msgid "Modify Asset"
+msgstr "Modificar activo"
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr "Valor de salvaguarda"
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0
+#: view:account.asset.category:0
+#: field:account.invoice.line,asset_category_id:0
+#: view:asset.asset.report:0
 msgid "Asset Category"
 msgstr "Categoría de activo"
 
 #. module: account_asset
-#: wizard_button:account.asset.close,init,end:0
-#: wizard_button:account.asset.compute,init,end:0
-#: wizard_button:account.asset.modify,init,end:0
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr "Activos en estado cerrado"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "Account and Period must belong to the same company."
+msgstr "La cuenta y el periodo deben pertenecer a la misma compañía."
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr "Activo padre"
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr "Histórico del activo"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr "Buscar categoría de activo"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Línea de factura"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+"La cuenta seleccionada en su asiento fuerza a tener una moneda secundaria. "
+"Debería eliminar la moneda secundaria de la cuenta o asignar al diario una "
+"vista multi-moneda"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr "Tabla de amortización"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Elementos diario"
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr "Importe no asentado"
+
+#. module: account_asset
+#: field:account.asset.asset,method_time:0
+#: field:account.asset.category,method_time:0
+#: field:account.asset.history,method_time:0
+msgid "Time Method"
+msgstr "Método de tiempo"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+#: view:asset.modify:0
+msgid "or"
+msgstr "ó"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on closed account."
+msgstr "No puedes crear elementos de diario en cuentas cerradas."
+
+#. module: account_asset
+#: field:account.asset.asset,note:0
+#: field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+msgstr ""
+"Escoja el método a usar en el cálculo del importe de las líneas de "
+"amortización\n"
+"  * Lineal: calculado en base a: valor bruto / número de depreciaciones\n"
+"  * Regresivo: calculado en base a: valor remanente/ factor de regresión"
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+"  * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+"  * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+"Escoja el método a utilizar para calcular las fechas y número de las líneas "
+"de depreciación\n"
+"  * Número de depreciaciones: Establece el número de líneas de depreciación "
+"y el tiempo entre dos depreciaciones.\n"
+"  * Fecha fin: Seleccione el tiempo entre 2 depreciaciones y la fecha de la "
+"depreciación no irá más allá."
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr "Activos en ejecución"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr "Cerrado"
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the status is 'Draft'.\n"
+"If the asset is confirmed, the status goes in 'Running' and the depreciation "
+"lines can be posted in the accounting.\n"
+"You can manually close an asset when the depreciation is over. If the last "
+"line of depreciation is posted, the asset automatically goes in that status."
+msgstr ""
+"Cuando un activo es creado, el estado es 'Borrador'\n"
+"Si el activo es confirmado, el estado cambia a 'En ejecucion' y las lineas "
+"de depreciacion pueden ser asentadas en la contabilidad.\n"
+"Puede cerrar manualmente un activo cuando la depreciacion ha terminado.  Si "
+"la ultima linea de depreciacion es asentade, el activo automaticamente "
+"cambia de estado."
+
+#. module: account_asset
+#: field:account.asset.asset,state:0
+#: field:asset.asset.report,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr "Líneas de amortización asentadas"
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr "Activos hijos"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr "Fecha de depreciación"
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr "Calcular"
+
+#. module: account_asset
+#: view:account.asset.history:0
+msgid "Asset History"
+msgstr "Histórico del activo"
+
+#. module: account_asset
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr "Año"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr "Asistente de confirmación de depreciación de activo"
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Cuenta de activo"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr "Estado del activo"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr "Nombre depreciación"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr "Histórico"
+
+#. module: account_asset
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "¡El número de factura debe ser único por compañía!"
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr "Período"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr "General"
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0
+#: field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr "Tiempo prorateado"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr "Marcar como cerrado"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+#: view:asset.modify:0
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0
-#: wizard_button:account.asset.compute,asset_compute,end:0
-#: selection:account.asset.property,state:0
+#: selection:asset.asset.report,state:0
 msgid "Close"
 msgstr "Cerrar"
 
 #. module: account_asset
-#: selection:account.asset.property,state:0
-msgid "Open"
-msgstr "Abrir"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Método de depreciación"
 
 #. module: account_asset
-#: constraint:ir.model:0
+#: view:asset.modify:0
+msgid "Asset Durations to Modify"
+msgstr "Duraciones de activo para modificar"
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr "Fecha de compra"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr "Regresivo"
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
 msgid ""
-"The Object name must start with x_ and not contain any special character !"
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
 msgstr ""
-"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-"especial!"
+"Escoja el periodo para el que desea asentar automáticamente las líneas de "
+"depreciación para los activos en ejecución"
 
 #. module: account_asset
-#: model:ir.module.module,shortdesc:account_asset.module_meta_information
-msgid "Asset management"
-msgstr "Gestión del activo"
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr "Actual"
 
 #. module: account_asset
-#: view:account.asset.board:0
-#: field:account.asset.property,board_ids:0
-#: model:ir.model,name:account_asset.model_account_asset_board
-msgid "Asset board"
-msgstr "Tablero de activos"
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Amount to Depreciate"
+msgstr "Importe a depreciar"
 
 #. module: account_asset
-#: field:account.asset.asset,state:0
-msgid "Global state"
-msgstr "Estado global"
+#: field:account.asset.asset,name:0
+msgid "Asset Name"
+msgstr "Nombre del activo."
 
 #. module: account_asset
-#: selection:account.asset.property,method_time:0
-msgid "Delay"
-msgstr "Retrasar"
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr "Omitir estado borrador"
 
 #. module: account_asset
-#: wizard_view:account.asset.close,init:0
-msgid "General information"
-msgstr "Información general"
+#: view:account.asset.category:0
+msgid "Depreciation Dates"
+msgstr "Fechas de depreciación"
 
 #. module: account_asset
-#: field:account.asset.property,journal_analytic_id:0
-msgid "Analytic journal"
-msgstr "Diario analítico"
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr "Moneda"
 
 #. module: account_asset
-#: field:account.asset.property,name:0
-msgid "Method name"
-msgstr "Nombre del método"
-
-#. module: account_asset
-#: field:account.asset.property,journal_id:0
+#: field:account.asset.category,journal_id:0
 msgid "Journal"
 msgstr "Diario"
 
 #. module: account_asset
-#: field:account.asset.property.history,name:0
+#: field:account.asset.history,name:0
 msgid "History name"
-msgstr "Nombre histórico"
+msgstr "Nombre del histórico"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr "el importe ya ha sido depreciado"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr "Asentado"
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"<p>\n"
+"            From this report, you can have an overview on all depreciation. "
+"The\n"
+"            tool search can also be used to personalise your Assets reports "
+"and\n"
+"            so, match this analysis to your needs;\n"
+"          </p>\n"
+"        "
+msgstr ""
+"<p>\n"
+"            Desde este reporte, puede tener un panorama de toda la "
+"depreciación, la \n"
+"            herramienta búsqueda puede ser utilizada para personalizar sus "
+"reportes de activos, asi\n"
+"            que utilice esta herramienta de acuerdo a sus necesidades.\n"
+"          </p>\n"
+"        "
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross Value"
+msgstr "Valor bruto"
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on an account of type view."
+msgstr "No puede crear elementos de diario en una cuenta de tipo vista."
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr ""
+"Valide si desea confirmar automáticamente el activo de esta categoría cuando "
+"es creado desde una factura."
 
 #. module: account_asset
 #: view:account.asset.asset:0
-msgid "Close method"
-msgstr "Método cerrado"
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
 
 #. module: account_asset
-#: field:account.asset.property,entry_asset_ids:0
-msgid "Asset Entries"
-msgstr "Asientos de activo"
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr "Línea de depreciación del activo"
 
 #. module: account_asset
-#: field:account.asset.asset,category_id:0
 #: view:account.asset.category:0
-#: field:account.asset.category,name:0
+#: field:asset.asset.report,asset_category_id:0
 #: model:ir.model,name:account_asset.model_account_asset_category
 msgid "Asset category"
 msgstr "Categoría de activo"
 
 #. module: account_asset
-#: view:account.asset.asset:0
-msgid "Depreciation"
-msgstr "Amortización"
+#: view:asset.asset.report:0
+#: field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr "Importe de las líneas de amortización"
 
 #. module: account_asset
-#: field:account.asset.asset,code:0
-#: field:account.asset.category,code:0
-msgid "Asset code"
-msgstr "Código de activo"
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr "Movimientos de activos creados"
 
 #. module: account_asset
-#: field:account.asset.asset,value_total:0
-msgid "Total value"
-msgstr "Valor total"
-
-#. module: account_asset
-#: selection:account.asset.asset,state:0
-msgid "View"
-msgstr "Vista"
-
-#. module: account_asset
-#: view:account.asset.asset:0
-msgid "General info"
-msgstr "Información general"
-
-#. module: account_asset
-#: field:account.asset.asset,sequence:0
+#: field:account.asset.depreciation.line,sequence:0
 msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: account_asset
-#: field:account.asset.property,value_residual:0
-msgid "Residual value"
-msgstr "Valor residual"
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr "Establezca aquí el tiempo entre 2 depreciaciones, en meses"
 
 #. module: account_asset
-#: wizard_button:account.asset.close,init,asset_close:0
-msgid "End of asset"
-msgstr "Final de activo"
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr "Número de depreciaciones"
 
 #. module: account_asset
-#: selection:account.asset.property,type:0
-msgid "Direct"
-msgstr "Directo"
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr "Crear asiento"
 
 #. module: account_asset
-#: selection:account.asset.property,type:0
-msgid "Indirect"
-msgstr "Indirecto"
-
-#. module: account_asset
-#: field:account.asset.asset,parent_id:0
-msgid "Parent asset"
-msgstr "Activo padre"
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr "Confirmar activo"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
diff --git a/addons/account_asset/i18n/nl_BE.po b/addons/account_asset/i18n/nl_BE.po
index ca2ee6748ae..7736ca427f0 100644
--- a/addons/account_asset/i18n/nl_BE.po
+++ b/addons/account_asset/i18n/nl_BE.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-07-27 13:02+0000\n"
+"PO-Revision-Date: 2012-11-27 13:35+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@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-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -160,7 +160,7 @@ msgstr "Afschrijvingsdatum"
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid "Error ! You cannot create recursive assets."
-msgstr ""
+msgstr "U kunt niet dezelfde investeringen maken."
 
 #. module: account_asset
 #: field:asset.asset.report,posted_value:0
@@ -210,7 +210,7 @@ msgstr "# afschrijvingslijnen"
 #. module: account_asset
 #: field:account.asset.asset,method_period:0
 msgid "Number of Months in a Period"
-msgstr ""
+msgstr "Aantal maanden in een periode"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -367,7 +367,7 @@ msgstr "Afschrijvingen in status gesloten"
 #. module: account_asset
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "De rekening en de periode moeten tot dezelfde firma behoren."
 
 #. module: account_asset
 #: field:account.asset.asset,parent_id:0
@@ -427,12 +427,12 @@ msgstr "Tijdmethode"
 #: view:asset.depreciation.confirmation.wizard:0
 #: view:asset.modify:0
 msgid "or"
-msgstr ""
+msgstr "of"
 
 #. module: account_asset
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "U kunt geen boekingen doen op een afgesloten rekening."
 
 #. module: account_asset
 #: field:account.asset.asset,note:0
@@ -489,12 +489,18 @@ msgid ""
 "You can manually close an asset when the depreciation is over. If the last "
 "line of depreciation is posted, the asset automatically goes in that status."
 msgstr ""
+"Als een investering wordt gemaakt, is de status 'Concept'.\n"
+"Als de investering wordt bevestigd, verandert de status in 'Lopend'; de "
+"afschrijvingslijnen kunnen worden geboekt.\n"
+"U kunt een investering manueel afsluiten als deze volledig is afgeschreven. "
+"Als de laatste lijn van de afschrijving is geboekt, gaat een investering "
+"automatisch in deze status."
 
 #. module: account_asset
 #: field:account.asset.asset,state:0
 #: field:asset.asset.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_asset
 #: field:account.asset.asset,partner_id:0
@@ -541,7 +547,7 @@ msgstr "Berekenen"
 #. module: account_asset
 #: view:account.asset.history:0
 msgid "Asset History"
-msgstr ""
+msgstr "Activahistoriek"
 
 #. module: account_asset
 #: field:asset.asset.report,name:0
@@ -662,7 +668,7 @@ msgstr "Af te schrijven bedrag"
 #. module: account_asset
 #: field:account.asset.asset,name:0
 msgid "Asset Name"
-msgstr ""
+msgstr "Activanaam"
 
 #. module: account_asset
 #: field:account.asset.category,open_asset:0
@@ -713,11 +719,15 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"Dit rapport biedt een overzicht van alle afschrijvingen. De zoekfunctie kan "
+"worden aangepast om het overzicht van uw investeringen te personaliseren, "
+"zodat u de gewenste analyse krijgt.\n"
+"        "
 
 #. module: account_asset
 #: field:account.asset.asset,purchase_value:0
 msgid "Gross Value"
-msgstr ""
+msgstr "Brutowaarde"
 
 #. module: account_asset
 #: field:account.asset.category,name:0
@@ -727,7 +737,7 @@ msgstr "Naam"
 #. module: account_asset
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
-msgstr ""
+msgstr "U kunt geen boekingen doen op een rekening van het type Weergave."
 
 #. module: account_asset
 #: help:account.asset.category,open_asset:0
@@ -770,7 +780,7 @@ msgstr "Gemaakte investeringsboekingen"
 #. module: account_asset
 #: field:account.asset.depreciation.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Volgnummer"
 
 #. module: account_asset
 #: help:account.asset.category,method_period:0
diff --git a/addons/account_bank_statement_extensions/i18n/es_MX.po b/addons/account_bank_statement_extensions/i18n/es_MX.po
new file mode 100644
index 00000000000..2abefb1cd5d
--- /dev/null
+++ b/addons/account_bank_statement_extensions/i18n/es_MX.po
@@ -0,0 +1,390 @@
+# 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: 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-28 01:06+0000\n"
+"Last-Translator: OscarAlca <oscarolar@hotmail.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-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Buscar transacciones bancarias"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr "Id global"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr "CODA"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "Código padre"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "Debe"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
+msgid "Cancel selected statement lines"
+msgstr "Cancelar las líneas seleccionadas"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Value Date"
+msgstr "Fecha valor"
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr "La CC y/o IBAN no es válido"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "Extracto"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
+msgid "Confirm selected statement lines"
+msgstr "Confirma las lineas seleccionadas"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
+msgid "Bank Statement Balances Report"
+msgstr "Informe de balances de extractos bancarios"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr "Cancelación de las líneas"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr "Información del pago por lote"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
+#, python-format
+msgid ""
+"Delete operation not allowed.             Please go to the associated bank "
+"statement in order to delete and/or modify bank statement line."
+msgstr ""
+"Operacion de borrado no permitida. Por favor vaya a el asiento bancario "
+"asociado para poder eliminar y/o modificar lineas de asientos bancarios."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "or"
+msgstr "ó"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr "Confirmar líneas"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr "Transacciones"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr "Tipo:"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr "Diario"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr "Lineas de extracto confirmadas"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr "Transacciones de crédito"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
+msgid "cancel selected statement lines."
+msgstr "Eliminar las lineas de extracto seleccionadas"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr "Numero de contrapartida"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr "Saldo de cierre"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr "Importe global"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr "Transacciones de débito"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr "Las líneas confirmadas no pueden ser modificadas."
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+"\n"
+"Por favor defina el código BIC/Swift del banco para una cuenta de tipo IBAN "
+"para realizar pagos válidos"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr ""
+"¿Estás seguro que quiere cancelar las líneas del extracto bancario "
+"seleccionadas?"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "ISO 20022"
+msgstr "ISO 20022"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr "Manual"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Bank Transaction"
+msgstr "Transacción bancaria"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr "Haber"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr "Monto"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr "Cuenta fin."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr "Moneda de la contrapartida"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr "BIC de la contrapartida"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr "Códigos hijos"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr ""
+"¿Está seguro que desea confirmar las líneas del extracto bancario "
+"seleccionadas?"
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+"Código para identificar las transacciones pertenecientes al mismo nivel "
+"global en un pago por lotes"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr "Líneas de extracto en borrador."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr "Imp. global"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Línea extracto bancario"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line."
+msgstr ""
+"El monto del comprobante debe ser el mismo que esta en la linea de asiento."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr "Nombre de la contrapartida"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "Communication"
+msgstr "Comunicación"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Cuentas bancarias"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+"El diario y periodo seleccionados tienen que pertenecer a la misma compañía"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Extracto bancario"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr "Línea de extracto"
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr "¡El código debe ser único!"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,bank_statement_line_ids:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
+#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
+msgid "Bank Statement Lines"
+msgstr "Líneas de extracto bancario"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
+#, python-format
+msgid "Warning!"
+msgstr "¡Advertencia!"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr "Pagos por lote hijos"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr "Líneas de extracto"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr "Importe total"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr "ID global"
diff --git a/addons/account_budget/i18n/es_MX.po b/addons/account_budget/i18n/es_MX.po
index 46c361de1ea..556834afe50 100644
--- a/addons/account_budget/i18n/es_MX.po
+++ b/addons/account_budget/i18n/es_MX.po
@@ -1,20 +1,29 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_budget
+# 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"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-13 20:28+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\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:52+0000\n"
+"PO-Revision-Date: 2012-11-28 01:18+0000\n"
+"Last-Translator: OscarAlca <oscarolar@hotmail.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:40+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "Select Dates Period"
+msgstr "Seleccione fechas del período"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -32,12 +41,6 @@ msgstr "Confirmado"
 msgid "Budgetary Positions"
 msgstr "Posiciones presupuestarias"
 
-#. module: account_budget
-#: code:addons/account_budget/account_budget.py:119
-#, python-format
-msgid "The General Budget '%s' has no Accounts!"
-msgstr "¡El presupuesto general '%s' no tiene cuentas!"
-
 #. module: account_budget
 #: report:account.budget:0
 msgid "Printed at:"
@@ -80,7 +83,7 @@ msgstr "Borrador"
 #. module: account_budget
 #: report:account.budget:0
 msgid "at"
-msgstr "a las"
+msgstr "en"
 
 #. module: account_budget
 #: view:account.budget.report:0
@@ -109,55 +112,22 @@ msgstr "Validado"
 msgid "Percentage"
 msgstr "Porcentaje"
 
-#. module: account_budget
-#: report:crossovered.budget.report:0
-msgid "to"
-msgstr "hasta"
-
 #. module: account_budget
 #: field:crossovered.budget,state:0
 msgid "Status"
 msgstr "Estado"
 
 #. module: account_budget
-#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
-msgid ""
-"A budget is a forecast of your company's income and expenses expected for a "
-"period in the future. With a budget, a company is able to carefully look at "
-"how much money they are taking in during a given period, and figure out the "
-"best way to divide it among various categories. By keeping track of where "
-"your money goes, you may be less likely to overspend, and more likely to "
-"meet your financial goals. Forecast a budget by detailing the expected "
-"revenue per analytic account and monitor its evolution based on the actuals "
-"realised during that period."
-msgstr ""
-"Un presupuesto es una previsión de los ingresos y gastos esperados por su "
-"compañía en un periodo futuro. Con un presupuesto, una compañía es capaz de "
-"observar minuciosamente cuánto dinero están ingresando en un período "
-"determinado, y pensar en la mejor manera de dividirlo entre varias "
-"categorías. Haciendo el seguimiento de los movimientos de su dinero, tendrá "
-"menos tendencia a un sobregasto, y se aproximará más a sus metas "
-"financieras. Haga una previsión de un presupuesto detallando el ingreso "
-"esperado por cuenta analítica y monitorice su evaluación basándose en los "
-"valores actuales durante ese período."
-
-#. module: account_budget
-#: view:account.budget.crossvered.summary.report:0
-msgid "This wizard is used to print summary of budgets"
-msgstr ""
-"Este asistente es utilizado para imprimir el resúmen de los presupuestos"
-
-#. module: account_budget
-#: report:account.budget:0
-#: report:crossovered.budget.report:0
-msgid "%"
-msgstr "%"
+#: code:addons/account_budget/account_budget.py:119
+#, python-format
+msgid "The Budget '%s' has no accounts!"
+msgstr "¡El presupuesto '%s' no tiene cuentas!"
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Description"
-msgstr "Descripción"
+msgstr "Descripción"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
@@ -169,6 +139,11 @@ msgstr "Moneda"
 msgid "Total :"
 msgstr "Total :"
 
+#. module: account_budget
+#: constraint:account.analytic.account:0
+msgid "Error! You cannot create recursive analytic accounts."
+msgstr "Error! No es posible crear cuentas analíticas recursivas."
+
 #. module: account_budget
 #: field:account.budget.post,company_id:0
 #: field:crossovered.budget,company_id:0
@@ -177,9 +152,9 @@ msgid "Company"
 msgstr "Compañía"
 
 #. module: account_budget
-#: view:crossovered.budget:0
-msgid "To Approve"
-msgstr "Para aprobar"
+#: report:crossovered.budget.report:0
+msgid "to"
+msgstr "hasta"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -229,7 +204,7 @@ msgstr "Fecha final"
 #: model:ir.model,name:account_budget.model_account_budget_analytic
 #: model:ir.model,name:account_budget.model_account_budget_report
 msgid "Account Budget report for analytic account"
-msgstr "Informe presupuesto contable para contabilidad analítica"
+msgstr "Informe de presupuesto contable para contabilidad analítica"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -247,12 +222,6 @@ msgstr "Nombre"
 msgid "Budget Line"
 msgstr "Línea de presupuesto"
 
-#. module: account_budget
-#: view:account.analytic.account:0
-#: view:account.budget.post:0
-msgid "Lines"
-msgstr "Líneas"
-
 #. module: account_budget
 #: report:account.budget:0
 #: view:crossovered.budget:0
@@ -264,10 +233,14 @@ msgid "Budget"
 msgstr "Presupuesto"
 
 #. module: account_budget
-#: code:addons/account_budget/account_budget.py:119
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
+#: view:crossovered.budget:0
+msgid "To Approve Budgets"
+msgstr "Presupuestos por aprobar"
+
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Duration"
+msgstr "Duración"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
@@ -283,7 +256,6 @@ msgstr "Este asistente es utilizado para imprimir el presupuesto"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
-#: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_report
 #: model:ir.actions.report.xml,name:account_budget.report_crossovered_budget
 #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
@@ -294,18 +266,15 @@ msgid "Budgets"
 msgstr "Presupuestos"
 
 #. module: account_budget
-#: constraint:account.analytic.account:0
-msgid ""
-"Error! The currency has to be the same as the currency of the selected "
-"company"
+#: view:account.budget.crossvered.summary.report:0
+msgid "This wizard is used to print summary of budgets"
 msgstr ""
-"¡Error! La divisa tiene que ser la misma que la establecida en la compañía "
-"seleccionada"
+"Este asistente es utilizado para imprimir el resúmen de los presupuestos"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Cancelled"
-msgstr "Cancelado"
+msgstr "Cancelado/a"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -313,10 +282,9 @@ msgid "Approve"
 msgstr "Aprobar"
 
 #. module: account_budget
-#: field:crossovered.budget,date_from:0
-#: field:crossovered.budget.lines,date_from:0
-msgid "Start Date"
-msgstr "Fecha de inicio"
+#: view:crossovered.budget:0
+msgid "To Approve"
+msgstr "Para aprobar"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -345,12 +313,10 @@ msgid "Theoretical Amt"
 msgstr "Importe teórico"
 
 #. module: account_budget
-#: view:account.budget.analytic:0
-#: view:account.budget.crossvered.report:0
-#: view:account.budget.crossvered.summary.report:0
-#: view:account.budget.report:0
-msgid "Select Dates Period"
-msgstr "Seleccione fechas del período"
+#: code:addons/account_budget/account_budget.py:119
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -361,74 +327,54 @@ msgid "Print"
 msgstr "Imprimir"
 
 #. module: account_budget
-#: model:ir.module.module,description:account_budget.module_meta_information
-msgid ""
-"This module allows accountants to manage analytic and crossovered budgets.\n"
-"\n"
-"Once the Master Budgets and the Budgets are defined (in "
-"Accounting/Budgets/),\n"
-"the Project Managers can set the planned amount on each Analytic Account.\n"
-"\n"
-"The accountant has the possibility to see the total of amount planned for "
-"each\n"
-"Budget and Master Budget in order to ensure the total planned is not\n"
-"greater/lower than what he planned for this Budget/Master Budget. Each list "
-"of\n"
-"record can also be switched to a graphical view of it.\n"
-"\n"
-"Three reports are available:\n"
-"    1. The first is available from a list of Budgets. It gives the "
-"spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
-"\n"
-"    2. The second is a summary of the previous one, it only gives the "
-"spreading, for the selected Budgets, of the Analytic Accounts.\n"
-"\n"
-"    3. The last one is available from the Analytic Chart of Accounts. It "
-"gives the spreading, for the selected Analytic Accounts, of the Master "
-"Budgets per Budgets.\n"
-"\n"
-msgstr ""
-"Este módulo permite a los contables gestionar presupuestos analíticos "
-"(costes) y cruzados.\n"
-"\n"
-"Una vez que se han definido los presupuestos principales y los presupuestos "
-"(en Contabilidad/Presupuestos/),\n"
-"los gestores de proyectos pueden establecer el importe previsto en cada "
-"cuenta analítica.\n"
-"\n"
-"El contable tiene la posibilidad de ver el total del importe previsto para "
-"cada\n"
-"presupuesto y presupuesto principal a fin de garantizar el total previsto no "
-"es\n"
-"mayor/menor que lo que había previsto para este presupuesto / presupuesto "
-"principal.\n"
-"Cada lista de datos también puede cambiarse a una vista gráfica de la "
-"misma.\n"
-"\n"
-"Están disponibles tres informes:\n"
-"    1. El primero está disponible desde una lista de presupuestos. "
-"Proporciona la difusión, para estos presupuestos, de las cuentas analíticas "
-"por presupuestos principales.\n"
-"\n"
-"    2. El segundo es un resumen del anterior. Sólo indica la difusión, para "
-"los presupuestos seleccionados, de las cuentas analíticas.\n"
-"\n"
-"    3. El último está disponible desde el plan de cuentas analítico. Indica "
-"la difusión, para las cuentas analíticas seleccionadas, de los presupuestos "
-"principales por presupuestos.\n"
-"\n"
+#: view:account.budget.post:0
+#: view:crossovered.budget:0
+#: field:crossovered.budget.lines,theoritical_amount:0
+msgid "Theoretical Amount"
+msgstr "Importe teórico"
+
+#. module: account_budget
+#: view:account.budget.analytic:0
+#: view:account.budget.crossvered.report:0
+#: view:account.budget.crossvered.summary.report:0
+#: view:account.budget.report:0
+msgid "or"
+msgstr "ó"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
 #: model:ir.model,name:account_budget.model_account_analytic_account
 msgid "Analytic Account"
-msgstr "Cuenta analítica"
+msgstr "Cuenta Analítica"
 
 #. module: account_budget
 #: report:account.budget:0
 msgid "Budget :"
 msgstr "Presupuesto :"
 
+#. module: account_budget
+#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
+msgid ""
+"<p>\n"
+"                A budget is a forecast of your company's income and/or "
+"expenses\n"
+"                expected for a period in the future. A budget is defined on "
+"some\n"
+"                financial accounts and/or analytic accounts (that may "
+"represent\n"
+"                projects, departments, categories of products, etc.)\n"
+"              </p><p>\n"
+"                By keeping track of where your money goes, you may be less\n"
+"                likely to overspend, and more likely to meet your financial\n"
+"                goals. Forecast a budget by detailing the expected revenue "
+"per\n"
+"                analytic account and monitor its evolution based on the "
+"actuals\n"
+"                realised during that period.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
@@ -465,14 +411,10 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #. module: account_budget
-#: model:ir.module.module,shortdesc:account_budget.module_meta_information
-msgid "Budget Management"
-msgstr "Gestión presupuestaria"
-
-#. module: account_budget
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+#: field:crossovered.budget,date_from:0
+#: field:crossovered.budget.lines,date_from:0
+msgid "Start Date"
+msgstr "Fecha inicial"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -480,163 +422,7 @@ msgstr "¡Error! No puede crear cuentas analíticas recursivas."
 msgid "Analysis from"
 msgstr "Análisis desde"
 
-#~ msgid "% performance"
-#~ msgstr "% rendimiento"
-
-#~ 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 "Period"
-#~ msgstr "Período"
-
-#~ msgid "Printing date:"
-#~ msgstr "Fecha impresión:"
-
-#~ msgid "Dotations"
-#~ msgstr "Dotaciones"
-
-#~ msgid "Performance"
-#~ msgstr "Rendimiento"
-
-#~ msgid "From"
-#~ msgstr "Desde"
-
-#~ msgid "Results"
-#~ msgstr "Resultados"
-
-#~ msgid "A/c No."
-#~ msgstr "Núm. de cuenta"
-
-#~ msgid "Period Budget"
-#~ msgstr "Período del presupuesto"
-
-#~ msgid "Budget Analysis"
-#~ msgstr "Análisis presupuestario"
-
-#~ msgid "Validate"
-#~ msgstr "Validar"
-
-#~ msgid "Select Options"
-#~ msgstr "Seleccionar opciones"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Print Summary of Budgets"
-#~ msgstr "Imprimir resumen de presupuestos"
-
-#~ msgid "Spread amount"
-#~ msgstr "Cantidad Extendida"
-
-#~ msgid "Amount"
-#~ msgstr "Importe"
-
-#~ msgid "Total Planned Amount"
-#~ msgstr "Importe total previsto"
-
-#~ msgid "Item"
-#~ msgstr "Item"
-
-#~ msgid "Theoretical Amount"
-#~ msgstr "Importe teórico"
-
-#~ msgid "Fiscal Year"
-#~ msgstr "Ejercicio fiscal"
-
-#~ msgid "Spread"
-#~ msgstr "Extensión"
-
-#~ msgid "Select period"
-#~ msgstr "Seleccionar período"
-
-#~ msgid "Analytic Account :"
-#~ msgstr "Cuenta analítica:"
-
-#, python-format
-#~ msgid "Insufficient Data!"
-#~ msgstr "¡Datos Insuficientes!"
-
-#~ msgid "Print Budget"
-#~ msgstr "Imprimir presupuestos"
-
-#~ msgid "Spreading"
-#~ msgstr "Difusión"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ msgid "Budget Dotation"
-#~ msgstr "Dotación presupuestaria"
-
-#~ msgid "Budget Dotations"
-#~ msgstr "Dotaciones presupuestarias"
-
-#~ msgid "Budget Item Detail"
-#~ msgstr "Detalle de elemento presupuestario"
-
-#, python-format
-#~ msgid "No Dotations or Master Budget Expenses Found on Budget %s!"
-#~ msgstr ""
-#~ "¡No se han encontrado dotaciones o presupuestos principales de gasto en el "
-#~ "presupuesto %s!"
-
-#~ msgid ""
-#~ "This module allows accountants to manage analytic and crossovered budgets.\n"
-#~ "\n"
-#~ "Once the Master Budgets and the Budgets defined (in Financial\n"
-#~ "Management/Budgets/), the Project Managers can set the planned amount on "
-#~ "each\n"
-#~ "Analytic Account.\n"
-#~ "\n"
-#~ "The accountant has the possibility to see the total of amount planned for "
-#~ "each\n"
-#~ "Budget and Master Budget in order to ensure the total planned is not\n"
-#~ "greater/lower than what he planned for this Budget/Master Budget. Each list "
-#~ "of\n"
-#~ "record can also be switched to a graphical view of it.\n"
-#~ "\n"
-#~ "Three reports are available:\n"
-#~ "    1. The first is available from a list of Budgets. It gives the "
-#~ "spreading, for these Budgets, of the Analytic Accounts per Master Budgets.\n"
-#~ "\n"
-#~ "    2. The second is a summary of the previous one, it only gives the "
-#~ "spreading, for the selected Budgets, of the Analytic Accounts.\n"
-#~ "\n"
-#~ "    3. The last one is available from the Analytic Chart of Accounts. It "
-#~ "gives the spreading, for the selected Analytic Accounts, of the Master "
-#~ "Budgets per Budgets.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Este módulo permite a los contables gestionar presupuestos analíticos "
-#~ "(costes) y cruzados.\n"
-#~ "\n"
-#~ "Una vez que se han definido los presupuestos principales y los presupuestos "
-#~ "(en Gestión\n"
-#~ "financiera/Presupuestos/), los gestores de proyecto pueden establecer el "
-#~ "importe previsto en\n"
-#~ "cada cuenta analítica.\n"
-#~ "\n"
-#~ "El contable tiene la posibilidad de ver el total del importe previsto para "
-#~ "cada\n"
-#~ "presupuesto y presupuesto principal a fin de garantizar el total previsto no "
-#~ "es\n"
-#~ "mayor/menor que lo que había previsto para este presupuesto / presupuesto "
-#~ "principal.\n"
-#~ "Cada lista de datos también puede cambiarse a una vista gráfica de la "
-#~ "misma.\n"
-#~ "\n"
-#~ "Están disponibles tres informes:\n"
-#~ "    1. El primero está disponible desde una lista de presupuestos. "
-#~ "Proporciona la difusión, para estos presupuestos, de las cuentas analíticas "
-#~ "por presupuestos principales.\n"
-#~ "\n"
-#~ "    2. El segundo es un resumen del anterior. Sólo indica la difusión, para "
-#~ "los presupuestos seleccionados, de las cuentas analíticas.\n"
-#~ "\n"
-#~ "    3. El último está disponible desde un plan de cuentas analítico. Indica "
-#~ "la difusión, para las cuentas analíticas seleccionadas, de los presupuestos "
-#~ "principales por presupuestos.\n"
-#~ "\n"
+#. module: account_budget
+#: view:crossovered.budget:0
+msgid "Draft Budgets"
+msgstr "Presupuestos borrador"
diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po
index 0e28897fdf9..b0831fd0495 100644
--- a/addons/account_budget/i18n/tr.po
+++ b/addons/account_budget/i18n/tr.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-01-10 23:08+0000\n"
+"PO-Revision-Date: 2012-11-27 22:05+0000\n"
 "Last-Translator: Ahmet Altınışık <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:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -141,7 +141,7 @@ msgstr "Toplam :"
 #. module: account_budget
 #: constraint:account.analytic.account:0
 msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Hata! Birbirini çağıran analitik hesaplar oluşturamazsın."
 
 #. module: account_budget
 #: field:account.budget.post,company_id:0
@@ -239,7 +239,7 @@ msgstr "Bütçeleri Onaylama"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Duration"
-msgstr ""
+msgstr "Süre"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
@@ -337,7 +337,7 @@ msgstr "Teorik Tutar"
 #: view:account.budget.crossvered.summary.report:0
 #: view:account.budget.report:0
 msgid "or"
-msgstr ""
+msgstr "veya"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
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/account_payment/i18n/zh_CN.po b/addons/account_payment/i18n/zh_CN.po
index 746fef7b511..6192b43088c 100644
--- a/addons/account_payment/i18n/zh_CN.po
+++ b/addons/account_payment/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-10-30 15:45+0000\n"
+"PO-Revision-Date: 2012-11-27 10:37+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:07+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -28,6 +28,12 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击创建一个付款单。\n"
+"              </p><p>\n"
+"                付款单是一个支付请求，从你公司付款供应商或者给客户退款.\n"
+"              </p>\n"
+"            "
 
 #. module: account_payment
 #: field:payment.line,currency:0
@@ -125,7 +131,7 @@ msgstr "填充付款声明"
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误!"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -207,6 +213,9 @@ msgid ""
 " Once the bank is confirmed the status is set to 'Confirmed'.\n"
 " Then the order is paid the status is 'Done'."
 msgstr ""
+"一个付款单的初始状态是'草稿'.\n"
+" 一旦银行确认，状态被设置为'确定'.\n"
+" 然后付款单被支付后，状态成为'完成'."
 
 #. module: account_payment
 #: view:payment.order:0
@@ -232,7 +241,7 @@ msgstr "已安排"
 #. module: account_payment
 #: view:account.bank.statement:0
 msgid "Import Payment Lines"
-msgstr ""
+msgstr "导入付款明细"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -271,7 +280,7 @@ msgstr "选择付款单选项“固定”由你指定一个指定的日期，“
 #. module: account_payment
 #: field:payment.order,date_created:0
 msgid "Creation Date"
-msgstr ""
+msgstr "创建日期"
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -339,7 +348,7 @@ msgstr "业务伙伴"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "科目和会计周期必须属于同一个公司"
 
 #. module: account_payment
 #: field:payment.line,bank_statement_line_id:0
@@ -395,7 +404,7 @@ msgstr "付款帐户填充声明"
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "There is no partner defined on the entry line."
-msgstr ""
+msgstr "这个凭证行没有定义合作伙伴"
 
 #. module: account_payment
 #: help:payment.mode,name:0
@@ -427,7 +436,7 @@ msgstr "草稿"
 #: view:payment.order:0
 #: field:payment.order,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: account_payment
 #: help:payment.line,communication2:0
@@ -479,7 +488,7 @@ msgstr "搜索"
 #. module: account_payment
 #: field:payment.order,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "负责人"
 
 #. module: account_payment
 #: field:payment.line,date:0
@@ -494,7 +503,7 @@ msgstr "合计:"
 #. module: account_payment
 #: field:payment.order,date_done:0
 msgid "Execution Date"
-msgstr ""
+msgstr "执行日期"
 
 #. module: account_payment
 #: view:account.payment.populate.statement:0
@@ -617,7 +626,7 @@ msgstr "讯息2"
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "预定日期"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
@@ -678,7 +687,7 @@ msgstr "名称"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
-msgstr ""
+msgstr "你不能在视图类型的科目创建账目项目"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -715,19 +724,19 @@ msgstr "建立付款"
 #. module: account_payment
 #: field:payment.order,date_prefered:0
 msgid "Preferred Date"
-msgstr ""
+msgstr "计划时间"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 #: view:account.payment.populate.statement:0
 #: view:payment.order.create:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "你不能在关闭的科目创建账目项目"
 
 #. module: account_payment
 #: help:payment.mode,bank_id:0
diff --git a/addons/account_sequence/i18n/nl_BE.po b/addons/account_sequence/i18n/nl_BE.po
index d0ee611c96e..9bdf0b61ed2 100644
--- a/addons/account_sequence/i18n/nl_BE.po
+++ b/addons/account_sequence/i18n/nl_BE.po
@@ -8,19 +8,19 @@ 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-07-27 13:19+0000\n"
+"PO-Revision-Date: 2012-11-27 13:36+0000\n"
 "Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@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:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "U kunt geen boekingen doen op een afgesloten rekening."
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
@@ -116,7 +116,7 @@ msgstr "Naam"
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
-msgstr ""
+msgstr "U kunt geen boekingen doen op een rekening van het type Weergave."
 
 #. module: account_sequence
 #: constraint:account.journal:0
@@ -124,6 +124,8 @@ msgid ""
 "Configuration error!\n"
 "The currency chosen should be shared by the default accounts too."
 msgstr ""
+"Configuratiefout.\n"
+"De gekozen munt moet door de standaardrekeningen worden gedeeld."
 
 #. module: account_sequence
 #: sql_constraint:account.move.line:0
@@ -135,6 +137,8 @@ msgstr "Verkeerde credit– of debetwaarde in de boeking."
 msgid ""
 "You cannot create more than one move per period on a centralized journal."
 msgstr ""
+"U kunt niet meer dan één boeking per periode doen in een gecentraliseerd "
+"dagboek."
 
 #. module: account_sequence
 #: field:account.journal,internal_sequence_id:0
@@ -144,7 +148,7 @@ msgstr "Intern volgnummer"
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "De rekening en de periode moeten tot dezelfde firma behoren."
 
 #. module: account_sequence
 #: help:account.sequence.installer,prefix:0
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 4dd9431736b..4dc753deedc 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -174,7 +174,7 @@
             <field name="view_id" ref="view_voucher_form"/>
             <field name="act_window_id" ref="action_voucher_list"/>
         </record>
-        <menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6"/>
+        <menuitem action="action_voucher_list" id="menu_encode_entries_by_voucher" parent="account.menu_finance_entries" sequence="6" groups="base.group_no_one"/>
 
         <act_window
             id="act_journal_voucher_open"
diff --git a/addons/account_voucher/i18n/nl_BE.po b/addons/account_voucher/i18n/nl_BE.po
index da353da82ae..3524e48d1fc 100644
--- a/addons/account_voucher/i18n/nl_BE.po
+++ b/addons/account_voucher/i18n/nl_BE.po
@@ -7,51 +7,51 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2009-04-10 09:54+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-11-27 13:39+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <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:15+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
 msgid "Reconciliation"
-msgstr ""
+msgstr "Afpunting"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:348
 #, python-format
 msgid "Write-Off"
-msgstr ""
+msgstr "Afschrijving"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Ref"
-msgstr ""
+msgstr "Betalingsreferentie"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Totaalbedrag"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Customer Journal Entries"
-msgstr ""
+msgstr "Openstaande boekingen klanten"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: view:sale.receipt.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Groeperen op..."
 
 #. module: account_voucher
 #: help:account.voucher,writeoff_amount:0
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 0a0ad94c870..121d2d341ae 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -101,7 +101,7 @@
                                     <field name="tax_id" 
                                         on_change="onchange_price(line_cr_ids, tax_id, partner_id)"
                                         widget="selection" nolabel="1"
-					placeholder="Select tax..."
+					placeholder="Tax"
                                         domain="[('type_tax_use','in',('sale','all')), ('parent_id', '=', False)]"/>
                                     <field name="tax_amount" nolabel="1"/>
                                     <div class="oe_subtotal_footer_separator">
@@ -264,7 +264,7 @@
                                     <field name="tax_id" 
                                         on_change="onchange_price(line_dr_ids, tax_id, partner_id)"
                                         widget="selection" nolabel="1"
-					placeholder="Select tax..."
+					placeholder="Tax"
 
                                         domain="[('type_tax_use','in',('purchase','all')), ('parent_id', '=', False)]"
                                         />
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
index 8f24f12808b..35177ee3a66 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
@@ -136,6 +136,7 @@ class account_analytic_account(osv.osv):
             'name': name,
             'view_type': 'form',
             'view_mode': 'tree,form',
+            'context':{'analytic_account':ids[0]},
             'domain' : domain,
             'res_model': 'hr.expense.expense',
             'nodestroy': True,
diff --git a/addons/auth_anonymous/i18n/nl_BE.po b/addons/auth_anonymous/i18n/nl_BE.po
new file mode 100644
index 00000000000..52400d66436
--- /dev/null
+++ b/addons/auth_anonymous/i18n/nl_BE.po
@@ -0,0 +1,30 @@
+# Dutch (Belgium) 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 13:37+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
+"Language-Team: Dutch (Belgium) <nl_BE@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-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: auth_anonymous
+#. openerp-web
+#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
+#, python-format
+msgid "Login"
+msgstr "Aanmelden"
+
+#. module: auth_anonymous
+#: model:res.groups,name:auth_anonymous.group_anonymous
+msgid "Anonymous Group"
+msgstr "Anonieme groep"
diff --git a/addons/auth_anonymous/i18n/zh_CN.po b/addons/auth_anonymous/i18n/zh_CN.po
new file mode 100644
index 00000000000..95afb2638c6
--- /dev/null
+++ b/addons/auth_anonymous/i18n/zh_CN.po
@@ -0,0 +1,30 @@
+# 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:52+0000\n"
+"PO-Revision-Date: 2012-11-27 16:43+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-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: auth_anonymous
+#. openerp-web
+#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
+#, python-format
+msgid "Login"
+msgstr "登录"
+
+#. module: auth_anonymous
+#: model:res.groups,name:auth_anonymous.group_anonymous
+msgid "Anonymous Group"
+msgstr "匿名组"
diff --git a/addons/auth_oauth/auth_oauth_data.xml b/addons/auth_oauth/auth_oauth_data.xml
index c07359a062c..983549f9378 100644
--- a/addons/auth_oauth/auth_oauth_data.xml
+++ b/addons/auth_oauth/auth_oauth_data.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <openerp>
     <data noupdate="1">
-
         <record id="provider_openerp" model="auth.oauth.provider">
-            <field name="name">OpenERP Accounts</field>
+            <field name="name">OpenERP.com Accounts</field>
             <field name="auth_endpoint">https://accounts.openerp.com/oauth2/auth</field>
             <field name="scope">userinfo</field>
             <field name="validation_endpoint">https://accounts.openerp.com/oauth2/tokeninfo</field>
             <field name="data_endpoint"></field>
             <field name="css_class">zocial openerp</field>
-            <field name="body">Sign in with OpenERP account</field>
+            <field name="body">Log in with OpenERP.com</field>
+            <field name="enabled" eval="True"/>
         </record>
         <record id="provider_facebook" model="auth.oauth.provider">
             <field name="name">Facebook Graph</field>
@@ -18,7 +18,7 @@
             <field name="validation_endpoint">https://graph.facebook.com/me/permissions</field>
             <field name="data_endpoint"></field>
             <field name="css_class">zocial facebook</field>
-            <field name="body">Sign in with facebook</field>
+            <field name="body">Log in with facebook</field>
         </record>
         <record id="provider_google" model="auth.oauth.provider">
             <field name="name">Google OAuth2</field>
@@ -27,9 +27,10 @@
             <field name="validation_endpoint">https://www.googleapis.com/oauth2/v1/tokeninfo</field>
             <field name="data_endpoint">https://www.googleapis.com/oauth2/v1/userinfo</field>
             <field name="css_class">zocial google</field>
-            <field name="body">Sign in with google</field>
+            <field name="body">Log in with google</field>
         </record>
-        <!-- <record id="provider_twitter" model="auth.oauth.provider">
+        <!--
+        <record id="provider_twitter" model="auth.oauth.provider">
             <field name="name">Twitter OAuth</field>
             <field name="auth_endpoint">https://api.twitter.com/oauth/request_token</field>
             <field name="scope"></field>
@@ -37,7 +38,7 @@
             <field name="data_endpoint"></field>
             <field name="css_class">zocial twitter</field>
             <field name="body">Sign in with twitter</field>
-        </record> -->
-        
+        </record>
+        -->
     </data>
 </openerp>
diff --git a/addons/auth_oauth/res_users.py b/addons/auth_oauth/res_users.py
index 7e7b3753a4e..b1c7e214f12 100644
--- a/addons/auth_oauth/res_users.py
+++ b/addons/auth_oauth/res_users.py
@@ -45,6 +45,25 @@ class res_users(osv.Model):
             validation.update(data)
         return validation
 
+    def _auth_oauth_signin(self, cr, uid, provider, validation, params, context=None):
+        """ retrieve and sign in the user corresponding to provider and validated access token
+            :param provider: oauth provider id (int)
+            :param validation: result of validation of access token (dict)
+            :param params: oauth parameters (dict)
+            :return: user login (str)
+            :raise: openerp.exceptions.AccessDenied if signin failed
+
+            This method can be overridden to add alternative signin methods.
+        """
+        oauth_uid = validation['user_id']
+        user_ids = self.search(cr, uid, [("oauth_uid", "=", oauth_uid), ('oauth_provider_id', '=', provider)])
+        if not user_ids:
+            raise openerp.exceptions.AccessDenied()
+        assert len(user_ids) == 1
+        user = self.browse(cr, uid, user_ids[0], context=context)
+        user.write({'oauth_access_token': params['access_token']})
+        return user.login
+
     def auth_oauth(self, cr, uid, provider, params, context=None):
         # Advice by Google (to avoid Confused Deputy Problem)
         # if validation.audience != OUR_CLIENT_ID:
@@ -53,39 +72,15 @@ class res_users(osv.Model):
         #   continue with the process
         access_token = params.get('access_token')
         validation = self._auth_oauth_validate(cr, uid, provider, access_token)
-        # required
-        oauth_uid = validation['user_id']
-        if not oauth_uid:
+        # required check
+        if not validation.get('user_id'):
             raise openerp.exceptions.AccessDenied()
-        email = validation.get('email', 'provider_%d_user_%d' % (provider, oauth_uid))
-        login = email
-        # optional
-        name = validation.get('name', email)
-        res = self.search(cr, uid, [("oauth_uid", "=", oauth_uid), ('oauth_provider_id', '=', provider)])
-        if res:
-            assert len(res) == 1
-            user = self.browse(cr, uid, res[0], context=context)
-            login = user.login
-            user.write({'oauth_access_token': access_token})
-        else:
-            # New user if signup module available
-            if not hasattr(self, '_signup_create_user'):
-                raise openerp.exceptions.AccessDenied()
-
-            new_user = {
-                'name': name,
-                'login': login,
-                'user_email': email,
-                'oauth_provider_id': provider,
-                'oauth_uid': oauth_uid,
-                'oauth_access_token': access_token,
-                'active': True,
-            }
-            # TODO pass signup token to allow attach new user to right partner
-            self._signup_create_user(cr, uid, new_user)
-
-        credentials = (cr.dbname, login, access_token)
-        return credentials
+        # retrieve and sign in user
+        login = self._auth_oauth_signin(cr, uid, provider, validation, params, context=context)
+        if not login:
+            raise openerp.exceptions.AccessDenied()
+        # return user credentials
+        return (cr.dbname, login, access_token)
 
     def check_credentials(self, cr, uid, password):
         try:
diff --git a/addons/auth_oauth/static/src/css/auth_oauth.css b/addons/auth_oauth/static/src/css/auth_oauth.css
index ed6130e3123..0489229042a 100644
--- a/addons/auth_oauth/static/src/css/auth_oauth.css
+++ b/addons/auth_oauth/static/src/css/auth_oauth.css
@@ -9,7 +9,6 @@
 }
 
 .openerp a.zocial.openerp {
-    float: right;
     border: 1px solid #222222;
     color: white;
     margin: 0;
diff --git a/addons/auth_oauth/static/src/js/auth_oauth.js b/addons/auth_oauth/static/src/js/auth_oauth.js
index 2aa66877d42..fdf7baf607c 100644
--- a/addons/auth_oauth/static/src/js/auth_oauth.js
+++ b/addons/auth_oauth/static/src/js/auth_oauth.js
@@ -35,27 +35,30 @@ openerp.auth_oauth = function(instance) {
         on_oauth_sign_in: function(ev) {
             ev.preventDefault();
             var index = $(ev.target).data('index');
-            var p = this.oauth_providers[index];
-            var ret = _.str.sprintf('%s//%s/auth_oauth/signin', location.protocol, location.host);
+            var provider = this.oauth_providers[index];
+            var return_url = _.str.sprintf('%s//%s/auth_oauth/signin', location.protocol, location.host);
             if (instance.session.debug) {
-                ret += '?debug';
+                return_url += '?debug';
             }
-            var dbname = self.$("form [name=db]").val();
-            var state_object = {
-                d: dbname,
-                p: p.id
-            };
-            var state = JSON.stringify(state_object);
+            var state = this._oauth_state(provider);
             var params = {
                 response_type: 'token',
-                client_id: p.client_id,
-                redirect_uri: ret,
-                scope: p.scope,
-                state: state,
+                client_id: provider.client_id,
+                redirect_uri: return_url,
+                scope: provider.scope,
+                state: JSON.stringify(state),
             };
-            var url = p.auth_endpoint + '?' + $.param(params);
+            var url = provider.auth_endpoint + '?' + $.param(params);
             window.location = url;
         },
+        _oauth_state: function(provider) {
+            // return the state object sent back with the redirected uri
+            var dbname = this.$("form [name=db]").val();
+            return {
+                d: dbname,
+                p: provider.id,
+            };
+        },
     });
 
 };
diff --git a/addons/auth_oauth_signup/__init__.py b/addons/auth_oauth_signup/__init__.py
new file mode 100644
index 00000000000..bc40c87d118
--- /dev/null
+++ b/addons/auth_oauth_signup/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+import res_users
diff --git a/addons/auth_oauth_signup/__openerp__.py b/addons/auth_oauth_signup/__openerp__.py
new file mode 100644
index 00000000000..1e5767065a4
--- /dev/null
+++ b/addons/auth_oauth_signup/__openerp__.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-2012 OpenERP SA (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+{
+    'name': 'Signup with OAuth2 Authentication',
+    'version': '1.0',
+    'category': 'Hidden',
+    'description': """
+Allow users to sign up through OAuth2 Provider.
+===============================================
+""",
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'depends': ['auth_oauth', 'auth_signup'],
+    'data': [],
+    'js': ['static/src/js/auth_oauth_signup.js'],
+    'css': [],
+    'qweb': [],
+    'installable': True,
+    'auto_install': True,
+}
diff --git a/addons/auth_oauth_signup/res_users.py b/addons/auth_oauth_signup/res_users.py
new file mode 100644
index 00000000000..83400f7c008
--- /dev/null
+++ b/addons/auth_oauth_signup/res_users.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-2012 OpenERP SA (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import logging
+import simplejson
+
+import openerp
+from openerp.osv import osv, fields
+
+_logger = logging.getLogger(__name__)
+
+class res_users(osv.Model):
+    _inherit = 'res.users'
+
+    def _auth_oauth_signin(self, cr, uid, provider, validation, params, context=None):
+        # overridden to use signup method if regular oauth signin fails
+        try:
+            login = super(res_users, self)._auth_oauth_signin(cr, uid, provider, validation, params, context=context)
+
+        except openerp.exceptions.AccessDenied:
+            state = simplejson.loads(params['state'])
+            token = state.get('t')
+            oauth_uid = validation['user_id']
+            email = validation.get('email', 'provider_%d_user_%d' % (provider, oauth_uid))
+            name = validation.get('name', email)
+            values = {
+                'name': name,
+                'login': email,
+                'email': email,
+                'oauth_provider_id': provider,
+                'oauth_uid': oauth_uid,
+                'oauth_access_token': params['access_token'],
+                'active': True,
+            }
+            _, login, _ = self.signup(cr, uid, values, token, context=context)
+
+        return login
diff --git a/addons/auth_oauth_signup/static/src/js/auth_oauth_signup.js b/addons/auth_oauth_signup/static/src/js/auth_oauth_signup.js
new file mode 100644
index 00000000000..6715943af9b
--- /dev/null
+++ b/addons/auth_oauth_signup/static/src/js/auth_oauth_signup.js
@@ -0,0 +1,14 @@
+openerp.auth_oauth_signup = function(instance) {
+
+    // override Login._oauth_state to add the signup token in the state
+    instance.web.Login.include({
+        _oauth_state: function(provider) {
+            var state = this._super.apply(this, arguments);
+            if (this.params.token) {
+                state.t = this.params.token;
+            }
+            return state;
+        },
+    });
+
+};
diff --git a/addons/auth_openid/i18n/tr.po b/addons/auth_openid/i18n/tr.po
index 819e2c90be6..4388e70ee46 100644
--- a/addons/auth_openid/i18n/tr.po
+++ b/addons/auth_openid/i18n/tr.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-09 22:49+0000\n"
+"PO-Revision-Date: 2012-11-27 22:07+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@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-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: auth_openid
 #. openerp-web
@@ -69,7 +69,7 @@ msgstr ""
 #. module: auth_openid
 #: sql_constraint:res.users:0
 msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID her sağlayıcı için tekil olmalı"
 
 #. module: auth_openid
 #: field:res.users,openid_key:0
@@ -79,7 +79,7 @@ msgstr "OpenID Anahtarı"
 #. module: auth_openid
 #: constraint:res.users:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hata: Geçersiz EAN barkodu"
 
 #. module: auth_openid
 #: constraint:res.users:0
@@ -94,7 +94,7 @@ msgstr "OpenID E-posta"
 #. module: auth_openid
 #: model:ir.model,name:auth_openid.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Kullanıcılar"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/auth_reset_password/i18n/tr.po b/addons/auth_reset_password/i18n/tr.po
new file mode 100644
index 00000000000..3feaf33754c
--- /dev/null
+++ b/addons/auth_reset_password/i18n/tr.po
@@ -0,0 +1,83 @@
+# Turkish 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 22:15+0000\n"
+"Last-Translator: Ahmet Altınışık <Unknown>\n"
+"Language-Team: Turkish <tr@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-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: auth_reset_password
+#: model:email.template,body_html:auth_reset_password.reset_password_email
+msgid ""
+"\n"
+"<p>A password reset was requested for the OpenERP account linked to this "
+"email.</p>\n"
+"\n"
+"<p>You may change your password following <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Note: If you did not ask for a password reset, you can safely ignore this "
+"email.</p>"
+msgstr ""
+"\n"
+"<p>Bu epostayla ilişkili OpenERP hesabı için bir parola sıfırlama isteği "
+"istendi.</p>\n"
+"\n"
+"<p>Şifrenizi şu adresten değiştirebilirsiniz.  <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Not: Eğer bu parola değiştirme isteğini siz yapmadıysanız bu mesajı "
+"görmezden gelebilirsiniz. </p>"
+
+#. module: auth_reset_password
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Aynı kullanıcı adı ile iki kullanıcı oluşturamazsınız !"
+
+#. module: auth_reset_password
+#: model:ir.model,name:auth_reset_password.model_res_users
+msgid "Users"
+msgstr "Kullanıcılar"
+
+#. module: auth_reset_password
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr "OAuth UID her sağlayıcı için tekil olmalı"
+
+#. module: auth_reset_password
+#: view:res.users:0
+msgid "Reset Password"
+msgstr "Parolayı Sıfırla"
+
+#. module: auth_reset_password
+#: model:email.template,subject:auth_reset_password.reset_password_email
+msgid "Password reset"
+msgstr "Parola sıfırlandı"
+
+#. module: auth_reset_password
+#: constraint:res.users:0
+msgid "Error: Invalid ean code"
+msgstr "Hata: Geçersiz EAN barkodu"
+
+#. module: auth_reset_password
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Seçilen şirket bu kullanıcı için izin verilen şirketler arasında yok"
+
+#. module: auth_reset_password
+#. openerp-web
+#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7
+#, python-format
+msgid "Reset password"
+msgstr "Parolayı sıfırla"
diff --git a/addons/auth_reset_password/res_users_view.xml b/addons/auth_reset_password/res_users_view.xml
index 9952162ae65..628e95b6ff9 100644
--- a/addons/auth_reset_password/res_users_view.xml
+++ b/addons/auth_reset_password/res_users_view.xml
@@ -7,11 +7,17 @@
             <field name="model">res.users</field>
             <field name="inherit_id" ref="base.view_users_form"/>
             <field name="arch" type="xml">
+                <!-- Reset Password button -->
                 <xpath expr="//sheet/*[1]" position="before">
                     <div class="oe_right oe_button_box">
-                        <button string="Reset Password" type="object" name="action_reset_password"/>
+                        <button string="Reset Password" type="object" name="action_reset_password"
+                            help="Send a special url by email to make the user (re)set their password."/>
                     </div>
                 </xpath>
+                <!-- password is never required; one can use Reset Password -->
+                <field name="new_password" position="attributes">
+                    <attribute name="attrs">{}</attribute>
+                </field>
             </field>
         </record>
 
diff --git a/addons/auth_signup/__openerp__.py b/addons/auth_signup/__openerp__.py
index 9cbeb60638f..235ac047346 100644
--- a/addons/auth_signup/__openerp__.py
+++ b/addons/auth_signup/__openerp__.py
@@ -37,6 +37,5 @@ Allow users to sign up.
         'res_users_view.xml',
     ],
     'js': ['static/src/js/auth_signup.js'],
-    'css' : ['static/src/css/base.css'],
     'qweb': ['static/src/xml/auth_signup.xml'],
 }
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 69ec45b80e5..7dbb19853a2 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -150,8 +150,12 @@ class res_users(osv.Model):
     _inherit = 'res.users'
 
     def _get_state(self, cr, uid, ids, name, arg, context=None):
-        return dict((user.id, 'new' if not user.login_date else 'reset' if user.signup_token else 'active')
-                    for user in self.browse(cr, uid, ids, context))
+        res = {}
+        for user in self.browse(cr, uid, ids, context):
+            res[user.id] = ('reset' if user.signup_valid else
+                            'active' if user.login_date else
+                            'new')
+        return res
 
     _columns = {
         'state': fields.function(_get_state, string='Status', type='selection',
diff --git a/addons/auth_signup/static/src/css/Makefile b/addons/auth_signup/static/src/css/Makefile
deleted file mode 100644
index d6b4f4b2fc8..00000000000
--- a/addons/auth_signup/static/src/css/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-base.css: base.sass
-	sass --trace -t expanded base.sass base.css
-
diff --git a/addons/auth_signup/static/src/css/base.css b/addons/auth_signup/static/src/css/base.css
deleted file mode 100644
index 3f97e7a9301..00000000000
--- a/addons/auth_signup/static/src/css/base.css
+++ /dev/null
@@ -1,10 +0,0 @@
-@charset "utf-8";
-.openerp .oe_login .oe_signup_show {
-  display: none;
-}
-.openerp .oe_login_signup .oe_signup_show {
-  display: block !important;
-}
-.openerp .oe_login_signup .oe_signup_hide {
-  display: none;
-}
diff --git a/addons/auth_signup/static/src/css/base.sass b/addons/auth_signup/static/src/css/base.sass
deleted file mode 100644
index f97665d192c..00000000000
--- a/addons/auth_signup/static/src/css/base.sass
+++ /dev/null
@@ -1,13 +0,0 @@
-@charset "utf-8"
-
-.openerp
-    // Regular login form
-    .oe_login
-        .oe_signup_show
-            display: none
-    // Signup form
-    .oe_login_signup
-        .oe_signup_show
-            display: block !important
-        .oe_signup_hide
-            display: none
diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index 962a54f5920..a6b401a4c7b 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -7,12 +7,15 @@ openerp.auth_signup = function(instance) {
             var self = this;
             var d = this._super();
 
+            self.$(".oe_signup_show").hide();
             // to switch between the signup and regular login form
             this.$('a.oe_signup_signup').click(function(ev) {
                 if (ev) {
                     ev.preventDefault();
                 }
                 self.$el.addClass("oe_login_signup");
+                self.$(".oe_signup_show").show();
+                self.$(".oe_signup_hide").hide();
                 return false;
             });
             this.$('a.oe_signup_back').click(function(ev) {
@@ -20,6 +23,8 @@ openerp.auth_signup = function(instance) {
                     ev.preventDefault();
                 }
                 self.$el.removeClass("oe_login_signup");
+                self.$(".oe_signup_show").hide();
+                self.$(".oe_signup_hide").show();
                 delete self.params.token;
                 return false;
             });
diff --git a/addons/auth_signup/static/src/xml/auth_signup.xml b/addons/auth_signup/static/src/xml/auth_signup.xml
index e63bd5863b0..a51ced3778d 100644
--- a/addons/auth_signup/static/src/xml/auth_signup.xml
+++ b/addons/auth_signup/static/src/xml/auth_signup.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1: -->
+<!-- vim:fdl=1:
+-->
 <templates id="template" xml:space="preserve">
 
     <t t-extend="Login">
@@ -16,12 +17,12 @@
             <li class="oe_signup_show"><input name="confirm_password" type="password"/></li>
         </t>
         <t t-jquery="form ul:first li:has(button[name=submit])" t-operation="replace">
-            <li class="oe_signup_hide"><button name="submit">Log in</button></li>
-            <li class="oe_signup_show"><button name="submit">Sign in</button></li>
-        </t>
-        <t t-jquery="form ul:first li:last" t-operation="after">
-            <li><a class="oe_signup_hide oe_signup_signup" href="#">Sign Up</a></li>
-            <li><a class="oe_signup_show oe_signup_back" href="#">Back to Login</a></li>
+            <li>
+                <button class="oe_signup_hide" name="submit">Log in</button>
+                <button class="oe_signup_show" name="submit">Sign up</button>
+                <a class="oe_signup_hide oe_signup_signup" href="#">Sign Up</a>
+                <a class="oe_signup_show oe_signup_back" href="#">Back to Login</a>
+            </li>
         </t>
     </t>
 
diff --git a/addons/base_crypt/i18n/tr.po b/addons/base_crypt/i18n/tr.po
index 6a0590cfbbe..24ea4a9da7c 100644
--- a/addons/base_crypt/i18n/tr.po
+++ b/addons/base_crypt/i18n/tr.po
@@ -8,19 +8,19 @@ 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: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-27 21:53+0000\n"
+"Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@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:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: base_crypt
 #: constraint:res.users:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hata: Geçersiz EAN barkodu"
 
 #. module: base_crypt
 #: constraint:res.users:0
@@ -30,12 +30,12 @@ msgstr "Seçilen firma bu kullanıcı için izin verilen firmalar arasında yok"
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Kullanıcılar"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
 msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID her sağlayıcı için tekil olmalı"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po
index cab3828f12d..143b96d3c0f 100644
--- a/addons/base_report_designer/i18n/tr.po
+++ b/addons/base_report_designer/i18n/tr.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 18:06+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-27 20:20+0000\n"
+"Last-Translator: Ahmet Altınışık <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:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -180,7 +180,7 @@ msgstr "İptal"
 #. module: base_report_designer
 #: view:base.report.sxw:0
 msgid "or"
-msgstr ""
+msgstr "veya"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
diff --git a/addons/base_report_designer/i18n/zh_CN.po b/addons/base_report_designer/i18n/zh_CN.po
index fb4cf02c367..abee97593ac 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-28 04:41+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/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po
index 39aed5e32b3..209639474fc 100644
--- a/addons/base_vat/i18n/tr.po
+++ b/addons/base_vat/i18n/tr.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:52+0000\n"
-"PO-Revision-Date: 2012-01-23 22:01+0000\n"
+"PO-Revision-Date: 2012-11-27 21:48+0000\n"
 "Last-Translator: Ahmet Altınışık <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:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: base_vat
 #: view:res.partner:0
 msgid "Check Validity"
-msgstr ""
+msgstr "Geçerliliğini Kontrol et"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:147
@@ -60,12 +60,12 @@ msgstr "Hata! Özyinelemeli firmalar oluşturamazsınız."
 #: code:addons/base_vat/base_vat.py:111
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Hata!"
 
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hata: Geçersiz EAN barkodu"
 
 #. module: base_vat
 #: help:res.partner,vat_subjected:0
diff --git a/addons/contacts/i18n/es.po b/addons/contacts/i18n/es.po
new file mode 100644
index 00000000000..f4b3a345289
--- /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-28 04:41+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/contacts/i18n/hu.po b/addons/contacts/i18n/hu.po
new file mode 100644
index 00000000000..9b414baee4e
--- /dev/null
+++ b/addons/contacts/i18n/hu.po
@@ -0,0 +1,37 @@
+# Hungarian 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 23:56+0000\n"
+"Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\n"
+"Language-Team: Hungarian <hu@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-28 04:41+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 "Kapcsolatok"
diff --git a/addons/contacts/i18n/tr.po b/addons/contacts/i18n/tr.po
new file mode 100644
index 00000000000..9b68dbf5ddc
--- /dev/null
+++ b/addons/contacts/i18n/tr.po
@@ -0,0 +1,44 @@
+# Turkish 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 21:52+0000\n"
+"Last-Translator: Ahmet Altınışık <Unknown>\n"
+"Language-Team: Turkish <tr@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-28 04:41+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 ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Adres defterinizden bir carinin  üzerine tıklayın.\n"
+"          </p><p>\n"
+"            OpenERP bir müşteriye ait bütün aktiviteleri takip etmenize\n"
+"            yardım eder; mesela iş fırsatlarını, dökümanları, vs.\n"
+"          </p>\n"
+"        "
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr "Cariler"
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_lead_view.xml b/addons/crm/crm_lead_view.xml
index d06b6232b5e..88b2edcd665 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -210,7 +210,7 @@
                                 <field name="company_id"
                                     groups="base.group_multi_company"
                                     widget="selection" colspan="2"/>
-                                <field name="type_id" widget="selection"/>
+                                <field name="type_id"/>
                                 <field name="channel_id" widget="selection"/>
                                 <field name="referred"/>
                                 <field name="state" groups="base.group_no_one"/>
@@ -498,7 +498,7 @@
                                 </group>
 
                                 <group string="Categorization">
-                                    <field name="type_id" widget="selection"/>
+                                    <field name="type_id" />
                                     <field name="channel_id" widget="selection"/>
                                 </group>
                                 <group string="Mailings">
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index bac33815794..d67174be142 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..40c9d42e153 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-28 04:41+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/decimal_precision/i18n/nl_BE.po b/addons/decimal_precision/i18n/nl_BE.po
index 95078305c13..1da382b14d0 100644
--- a/addons/decimal_precision/i18n/nl_BE.po
+++ b/addons/decimal_precision/i18n/nl_BE.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-03-01 17:22+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-27 13:41+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: Dutch (Belgium) <nl_BE@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-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -28,6 +28,8 @@ msgid ""
 "Error! You cannot define the decimal precision of 'Account' as greater than "
 "the rounding factor of the company's main currency"
 msgstr ""
+"U kunt de decimale precisie voor Rekening niet groter zetten dan de "
+"afrondingsfactor van de standaardmunt van uw bedrijf."
 
 #. module: decimal_precision
 #: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
diff --git a/addons/delivery/i18n/zh_CN.po b/addons/delivery/i18n/zh_CN.po
index 3f5d03bd30c..2920c8bd9ce 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-28 04:40+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/document_webdav/i18n/zh_CN.po b/addons/document_webdav/i18n/zh_CN.po
index 86a4e7ea912..0c7c6a448d5 100644
--- a/addons/document_webdav/i18n/zh_CN.po
+++ b/addons/document_webdav/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-02-10 07:02+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-27 16:44+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:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -30,7 +30,7 @@ msgstr "文档"
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 msgid "Document property"
-msgstr ""
+msgstr "单据属性"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -41,7 +41,7 @@ msgstr "文档属性列表"
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage."
-msgstr ""
+msgstr "目录必须有个上级或者是存储"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -182,7 +182,7 @@ msgstr "创建人"
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 msgid "Document Property"
-msgstr ""
+msgstr "单据属性"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_properties
@@ -192,7 +192,7 @@ msgstr "DAV属性"
 #. module: document_webdav
 #: constraint:document.directory:0
 msgid "Error! You cannot create recursive directories."
-msgstr ""
+msgstr "错误！你不能创建循环目录"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,do_subst:0
diff --git a/addons/edi/i18n/tr.po b/addons/edi/i18n/tr.po
index aea467b0a0f..26e12724682 100644
--- a/addons/edi/i18n/tr.po
+++ b/addons/edi/i18n/tr.po
@@ -8,28 +8,28 @@ 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-09 22:33+0000\n"
+"PO-Revision-Date: 2012-11-27 22:29+0000\n"
 "Last-Translator: Ahmet Altınışık <Unknown>\n"
 "Language-Team: Turkish <tr@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-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:67
 #, python-format
 msgid "Reason:"
-msgstr ""
+msgstr "Neden:"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:60
 #, python-format
 msgid "The document has been successfully imported!"
-msgstr ""
+msgstr "öküman başarılı bir şekilde içeri alındı!"
 
 #. module: edi
 #: sql_constraint:res.company:0
@@ -46,7 +46,7 @@ msgstr "Hata ! kendini çağıran ilişkili üyeler oluşturamazsınız."
 #: code:addons/edi/static/src/js/edi.js:65
 #, python-format
 msgid "Sorry, the document could not be imported."
-msgstr ""
+msgstr "Üzgünüm, Döküman içeri alınamadı."
 
 #. module: edi
 #: constraint:res.company:0
@@ -61,7 +61,7 @@ msgstr "Şirketler"
 #. module: edi
 #: constraint:res.partner:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hata: Geçersiz EAN barkodu"
 
 #. module: edi
 #: sql_constraint:res.currency:0
@@ -78,13 +78,13 @@ msgstr "Döviz"
 #: code:addons/edi/static/src/js/edi.js:71
 #, python-format
 msgid "Document Import Notification"
-msgstr ""
+msgstr "Döküman içeri alma Uyarısı"
 
 #. module: edi
 #: code:addons/edi/models/edi.py:130
 #, python-format
 msgid "Missing application."
-msgstr ""
+msgstr "Kayıp Uygulama"
 
 #. module: edi
 #: code:addons/edi/models/edi.py:131
@@ -114,11 +114,13 @@ msgid ""
 "Error! You cannot define a rounding factor for the company's main currency "
 "that is smaller than the decimal precision of 'Account'."
 msgstr ""
+"Hata! Şirketin ana hesap dövizi için  Muhasebe ondalık hassasiyetinden daha "
+"küçük bir yuvarlama çarpanı seçemezsiniz."
 
 #. module: edi
 #: model:ir.model,name:edi.model_edi_edi
 msgid "EDI Subsystem"
-msgstr ""
+msgstr "EDI altsistemi"
 
 #~ msgid "Partner Addresses"
 #~ msgstr "Cari Adresleri"
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/hu.po b/addons/fetchmail/i18n/hu.po
index 1043991c9a2..6251eb81991 100644
--- a/addons/fetchmail/i18n/hu.po
+++ b/addons/fetchmail/i18n/hu.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: 2011-01-19 14:10+0000\n"
+"PO-Revision-Date: 2012-11-28 00:07+0000\n"
 "Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -24,17 +24,18 @@ msgstr "Megerősítve"
 #. module: fetchmail
 #: field:fetchmail.server,server:0
 msgid "Server Name"
-msgstr ""
+msgstr "Kiszolgálónév"
 
 #. module: fetchmail
 #: field:fetchmail.server,script:0
 msgid "Script"
-msgstr ""
+msgstr "Szkript"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
 msgid "Defines the order of processing, lower values mean higher priority"
 msgstr ""
+"Feldolgozás sorrendjének meghatározása, alacsonyabb érték magasabb prioritás"
 
 #. module: fetchmail
 #: help:fetchmail.server,is_ssl:0
@@ -51,7 +52,7 @@ msgstr ""
 #. module: fetchmail
 #: field:fetchmail.server,is_ssl:0
 msgid "SSL/TLS"
-msgstr ""
+msgstr "SSL/TLS"
 
 #. module: fetchmail
 #: help:fetchmail.server,original:0
@@ -69,7 +70,7 @@ msgstr "POP"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Fetch Now"
-msgstr ""
+msgstr "Letöltés most"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
@@ -95,7 +96,7 @@ msgstr ""
 #. module: fetchmail
 #: field:fetchmail.server,state:0
 msgid "Status"
-msgstr ""
+msgstr "Státusz"
 
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_fetchmail_server
@@ -120,7 +121,7 @@ msgstr ""
 #. module: fetchmail
 #: field:fetchmail.server,date:0
 msgid "Last Fetch Date"
-msgstr ""
+msgstr "Utolsó letöltés időpontja"
 
 #. module: fetchmail
 #: help:fetchmail.server,action_id:0
@@ -137,39 +138,39 @@ msgstr "E-mailek száma"
 #. module: fetchmail
 #: field:fetchmail.server,original:0
 msgid "Keep Original"
-msgstr ""
+msgstr "Eredeti megtartása"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Advanced Options"
-msgstr ""
+msgstr "Haladó beállítások"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 #: field:fetchmail.server,configuration:0
 msgid "Configuration"
-msgstr ""
+msgstr "Beállítás"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
-msgstr ""
+msgstr "Bejövő levelek kiszolgálója"
 
 #. module: fetchmail
 #: code:addons/fetchmail/fetchmail.py:155
 #, python-format
 msgid "Connection test failed!"
-msgstr ""
+msgstr "Csatlakozás teszt nem sikerült!"
 
 #. module: fetchmail
 #: field:fetchmail.server,user:0
 msgid "Username"
-msgstr ""
+msgstr "Felhasználónév"
 
 #. module: fetchmail
 #: help:fetchmail.server,server:0
 msgid "Hostname or IP of the mail server"
-msgstr ""
+msgstr "Levelező szerver hostneve vagy IP címe"
 
 #. module: fetchmail
 #: field:fetchmail.server,name:0
@@ -192,7 +193,7 @@ msgstr ""
 #. module: fetchmail
 #: field:fetchmail.server,action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "Szerverművelet"
 
 #. module: fetchmail
 #: field:mail.mail,fetchmail_server_id:0
@@ -225,7 +226,7 @@ msgstr ""
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_mail_mail
 msgid "Outgoing Mails"
-msgstr ""
+msgstr "Elküldött levelek"
 
 #. module: fetchmail
 #: field:fetchmail.server,priority:0
@@ -245,7 +246,7 @@ msgstr "IMAP"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Server type POP."
-msgstr ""
+msgstr "Szerver típusa: POP3"
 
 #. module: fetchmail
 #: field:fetchmail.server,password:0
@@ -280,7 +281,7 @@ msgstr ""
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Advanced"
-msgstr ""
+msgstr "Speciális"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
diff --git a/addons/fetchmail/i18n/zh_CN.po b/addons/fetchmail/i18n/zh_CN.po
index 42576af409f..9a2ff824da7 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-28 04:41+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/hr_view.xml b/addons/hr/hr_view.xml
index 4464dce30ed..7d27fe456b8 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -9,7 +9,6 @@
             sequence="90"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
-        <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" groups="base.group_no_one" sequence="25"/>
         <menuitem id="menu_hr_reporting_timesheet" name="Reports"
             parent="menu_hr_reporting" sequence="6"/>
 
@@ -228,6 +227,7 @@
                     <field name="department_id"/>
                     <field name="job_id"/>
                     <field name="coach_id" invisible="1"/>
+                    <field name="parent_id" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -288,7 +288,7 @@
         </record>
 
         <record id="open_view_categ_form" model="ir.actions.act_window">
-            <field name="name">Categories of Employees</field>
+            <field name="name">Employee Tags</field>
             <field name="res_model">hr.employee.category</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -297,14 +297,6 @@
         <menuitem action="open_view_categ_form" id="menu_view_employee_category_form"
             parent="hr.menu_hr_configuration" sequence="1" groups="base.group_no_one"/>
 
-        <record id="open_view_categ_tree" model="ir.actions.act_window">
-            <field name="name">Categories Structure</field>
-            <field name="res_model">hr.employee.category</field>
-            <field name="view_type">tree</field>
-            <field name="view_id" ref="view_employee_category_tree"/>
-            <field name="domain">[('parent_id','=',False)]</field>
-        </record>
-
         <record id="hr_employee_normal_action_tree" model="ir.actions.act_window">
             <field name="name">Employees</field>
             <field name="type">ir.actions.act_window</field>
@@ -321,9 +313,6 @@
             <field eval="'ir.actions.act_window,%d'%hr_employee_normal_action_tree" name="value"/>
         </record>
 
-        <menuitem action="open_view_categ_tree"
-            id="menu_view_employee_category_tree" parent="menu_hr_management" groups="base.group_no_one" sequence="2"/>
-
         <record id="view_hr_job_form" model="ir.ui.view">
             <field name="name">hr.job.form</field>
             <field name="model">hr.job</field>
diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po
index 2d92e5cc0c5..7131a0b306b 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-27 21: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-28 04:41+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,18 +377,19 @@ 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
 msgid "Tel:"
-msgstr ""
+msgstr "Tel:"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -396,7 +404,7 @@ msgstr "Nadređena kategorija"
 #. module: hr
 #: sql_constraint:res.users:0
 msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID po dobavljaču mora biti jedinstven"
 
 #. module: hr
 #: view:hr.department:0
@@ -432,6 +440,23 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                            "
+"Kliknite da bi definirali novo radno mjesto.\n"
+"                                                                  </p><p>\n"
+"                                                                            "
+"Radna mjesta se koriste da bi definirali funkciju i zahtjeve za taj posao.\n"
+"                                                                            "
+"Možete voditi evidenciju broja radnika po radnom mjestu i pratit planirani \n"
+"                                                                            "
+"razvoj.\n"
+"                                                                  </p><p>\n"
+"                                                                            "
+"Možete dodati anketu za radno mjesto, koja će se koristiti za ispitivanje \n"
+"                                                                            "
+"kandidata u procesu zapošljavanja.\n"
+"                                                                   </p>\n"
+"            "
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -448,22 +473,22 @@ msgstr ""
 #. module: hr
 #: help:hr.config.settings,module_hr_evaluation:0
 msgid "This installs the module hr_evaluation."
-msgstr ""
+msgstr "Ovo instalira modul hr_evaluation."
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error! You cannot create recursive hierarchy of Employee(s)."
-msgstr ""
+msgstr "Greška! Ne možete kreirati rekurzivnu hijerarhiju radnika."
 
 #. module: hr
 #: help:hr.config.settings,module_hr_attendance:0
 msgid "This installs the module hr_attendance."
-msgstr ""
+msgstr "Ovo instalira modul hr_attendance."
 
 #. module: hr
 #: field:hr.employee,image_small:0
 msgid "Smal-sized photo"
-msgstr ""
+msgstr "Fotografija malih dimenzija"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -474,12 +499,12 @@ msgstr "Kategorija djelatnika"
 #. module: hr
 #: field:hr.employee,category_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Oznake"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_contract:0
 msgid "This installs the module hr_contract."
-msgstr ""
+msgstr "Ovo instalira modul hr_contract."
 
 #. module: hr
 #: view:hr.employee:0
@@ -489,7 +514,7 @@ msgstr "Povezani Korisnik"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "ili"
 
 #. module: hr
 #: field:hr.employee.category,name:0
@@ -499,12 +524,12 @@ msgstr "Kategorija"
 #. module: hr
 #: view:hr.job:0
 msgid "Stop Recruitment"
-msgstr ""
+msgstr "Zaustavi proces zapošljavanja"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_attendance:0
 msgid "Install attendances feature"
-msgstr ""
+msgstr "Instaliraj modul za praćenje prisustva"
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
@@ -534,7 +559,7 @@ msgstr "Kontakt podaci"
 #. module: hr
 #: field:hr.config.settings,module_hr_holidays:0
 msgid "Manage holidays, leaves and allocation requests"
-msgstr ""
+msgstr "Upravljaj godišnjima, izostancima i zahtjevima za slobodne dane"
 
 #. module: hr
 #: field:hr.department,child_ids:0
@@ -561,12 +586,12 @@ msgstr "Ugovor djelatnika"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Contracts"
-msgstr ""
+msgstr "Ugovori"
 
 #. module: hr
 #: help:hr.job,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Poruke i povijest komuniciranja"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
@@ -576,12 +601,12 @@ msgstr "JMBG"
 #. module: hr
 #: field:hr.job,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Sljedbenik"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_recruitment:0
 msgid "Manage the recruitment process"
-msgstr ""
+msgstr "Upravljaj procesom zapošljavanja"
 
 #. module: hr
 #: view:hr.employee:0
@@ -591,12 +616,12 @@ msgstr "Aktivan"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Human Resources Management"
-msgstr ""
+msgstr "Upravljanje ljudskim resursima"
 
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Install your country's payroll"
-msgstr ""
+msgstr "Instaliraj plaće za Vašu državu"
 
 #. module: hr
 #: field:hr.employee,bank_account_id:0
@@ -611,7 +636,7 @@ msgstr "Tvrtke"
 #. module: hr
 #: field:hr.job,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sažetak"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -636,21 +661,33 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                             "
+"Kliknite da bi dodali novog radnika.\n"
+"                                                                    </p><p>\n"
+"                                                                             "
+"Sa samo brzim pogledom na OpenERP karticu s radnikom, možete\n"
+"                                                                             "
+"lako sazanti sve potrebne informacije za svaku osobu;\n"
+"                                                                             "
+"kontakt podaci, radno mjesto, dostupnost, itd.\n"
+"                                                                     </p>\n"
+"            "
 
 #. module: hr
 #: view:hr.employee:0
 msgid "HR Settings"
-msgstr ""
+msgstr "HR postavke (Ljudski resursi)"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Citizenship & Other Info"
-msgstr ""
+msgstr "Državljanstvo i ostale informacije"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You cannot create recursive departments."
-msgstr ""
+msgstr "Greška! Ne možete kreirati rekurzivne odjele."
 
 #. module: hr
 #: sql_constraint:res.users:0
@@ -665,7 +702,7 @@ msgstr "Poslovna adresa"
 #. module: hr
 #: view:hr.employee:0
 msgid "Public Information"
-msgstr ""
+msgstr "Javne informacije"
 
 #. module: hr
 #: field:hr.employee,marital:0
@@ -690,7 +727,7 @@ msgstr "Fotografija"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Cancel"
-msgstr ""
+msgstr "Otkaži"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -705,17 +742,30 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                            "
+"Kliknite da bi kreirali odjel.\n"
+"                                                                      "
+"</p><p>\n"
+"                                                                            "
+"OpenERP odjelska struktura se koristi za upravljanje svim dokumentima \n"
+"                                                                            "
+"vezanih za radnika prema odjelima: troškovi, kontrolne kartice, \n"
+"                                                                            "
+"godišnji i odsustva, zapošljavanja, itd.\n"
+"                                                                      </p>\n"
+"            "
 
 #. module: hr
 #: help:hr.config.settings,module_hr_timesheet:0
 msgid "This installs the module hr_timesheet."
-msgstr ""
+msgstr "Ovo instalira modul hr_timesheet."
 
 #. module: hr
 #: field:hr.job,message_comment_ids:0
 #: help:hr.job,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Komentari i e-pošta."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.view_department_form_installer
@@ -730,6 +780,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                                           "
+"Kliknite da bi definirali novi odjel.\n"
+"                                                                  </p><p>\n"
+"                                                                           "
+"Vaša odjelska struktura se koristi kako bi upravljali svim dokumentima\n"
+"                                                                           "
+"vezanim za radnike po odjelima: troškovi i kontrolne kartice, odsustva i "
+"godišnji,\n"
+"                                                                           "
+"zapošljavanje, itd.\n"
+"                                                                  </p>\n"
+"            "
 
 #. module: hr
 #: view:hr.employee:0
@@ -754,13 +817,15 @@ msgstr "Poslovni mobitel"
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Recruitement in Progress"
-msgstr ""
+msgstr "Zapošljavanje u tijeku"
 
 #. module: hr
 #: field:hr.config.settings,module_account_analytic_analysis:0
 msgid ""
 "Allow invoicing based on timesheets (the sale application will be installed)"
 msgstr ""
+"Dopusti fakturiranje na osnovu kontrolnih kartica (aplikacija za prodaju će "
+"biti instalirana)"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -780,7 +845,7 @@ msgstr "Kućna adresa"
 #. module: hr
 #: field:hr.config.settings,module_hr_timesheet:0
 msgid "Manage timesheets"
-msgstr ""
+msgstr "Upravljaj kontrolnim karticama"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -811,12 +876,12 @@ msgstr "Na poziciji"
 #. module: hr
 #: help:hr.config.settings,module_hr_payroll:0
 msgid "This installs the module hr_payroll."
-msgstr ""
+msgstr "Ovo instalira modul hr_payroll."
 
 #. module: hr
 #: field:hr.config.settings,module_hr_contract:0
 msgid "Record contracts per employee"
-msgstr ""
+msgstr "Zabilježi ugovore po radniku"
 
 #. module: hr
 #: view:hr.department:0
@@ -831,7 +896,7 @@ msgstr "Nacionalnost"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Additional Features"
-msgstr ""
+msgstr "Dodatne opcije"
 
 #. module: hr
 #: field:hr.employee,notes:0
@@ -884,23 +949,23 @@ msgstr "Naziv odjela"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting_timesheet
 msgid "Reports"
-msgstr ""
+msgstr "Izvještaji"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_payroll:0
 msgid "Manage payroll"
-msgstr ""
+msgstr "Upravljaj plaćama"
 
 #. module: hr
 #: view:hr.config.settings:0
 #: model:ir.actions.act_window,name:hr.action_human_resources_configuration
 msgid "Configure Human Resources"
-msgstr ""
+msgstr "Konfiguriraj ljudske resurse"
 
 #. module: hr
 #: selection:hr.job,state:0
 msgid "No Recruitment"
-msgstr ""
+msgstr "Nema zapošljavanja"
 
 #. module: hr
 #: help:hr.employee,ssnid:0
@@ -915,12 +980,12 @@ msgstr "Kreiranje OpenERP korisnika"
 #. module: hr
 #: field:hr.employee,login:0
 msgid "Login"
-msgstr ""
+msgstr "Prijava"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Total Forecasted Employees"
-msgstr ""
+msgstr "Sveukupno predviđeni radnici"
 
 #. module: hr
 #: help:hr.job,state:0
@@ -928,11 +993,13 @@ msgid ""
 "By default 'In position', set it to 'In Recruitment' if recruitment process "
 "is going on for this job position."
 msgstr ""
+"Zadane postavke 'U poziciji', postavite 'U procesu zapošljavanja' ako je "
+"zapošljavanje u tijeku za to radno mjesto."
 
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Korisnici"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_job
@@ -958,6 +1025,33 @@ msgid ""
 "              </div>\n"
 "            "
 msgstr ""
+"<div class=\"oe_empty_custom_dashboard\">\n"
+"                                                                             "
+"       <p>\n"
+"                                                                             "
+"               <b>Ploča ljudskih resursa je prazna.</b>\n"
+"                                                                             "
+"       </p><p>\n"
+"                                                                             "
+"                 Da bi dodali Vaš prvi izvještaj na ploču, idite na bilo "
+"koji meni, promijenite\n"
+"                                                                             "
+"                 pogled na listu ili graf, i kliknite <i>'Dodaj na "
+"ploču'</i> u proširenim\n"
+"                                                                             "
+"                 opcijama pretraživanja.\n"
+"                                                                             "
+"       </p><p>\n"
+"                                                                             "
+"                  Možete filtrirati i grupirati podatke prije nego ih "
+"ubacite u ploču koristeći\n"
+"                                                                             "
+"                  opcije za pretraživanje.\n"
+"                                                                             "
+"       </p>\n"
+"                                                                      "
+"</div>\n"
+"            "
 
 #. module: hr
 #: view:hr.employee:0
@@ -973,7 +1067,7 @@ msgstr "Naziv radnog mjesta mora biti jedinstven po tvrtki"
 #. module: hr
 #: help:hr.config.settings,module_hr_expense:0
 msgid "This installs the module hr_expense."
-msgstr ""
+msgstr "Ovo instalira modul hr_expense."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_config_settings
@@ -990,7 +1084,7 @@ msgstr "Voditelj"
 #. module: hr
 #: constraint:res.users:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Greška: Neispravan barkod!"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -1005,7 +1099,7 @@ msgstr "Podređeni djelatnici"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Primjeni"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index c5e8824bb53..919cbcc678e 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 15:32+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-28 04:41+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
@@ -39,7 +39,7 @@ msgstr "员工信息链接"
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr "社保号"
+msgstr "社会保险号SIN"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr
@@ -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,27 +565,27 @@ 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
 msgid "SSN No"
-msgstr "员工号"
+msgstr "社会保险号SSN"
 
 #. 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
@@ -696,17 +715,25 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击创建部门.\n"
+"              </p><p>\n"
+"                OpenERP 的部门结构 用来管理所有跟部门员工相关\n"
+"                的单据：费用、计工单、请假、假期和招聘等等。\n"
+" \n"
+"              </p>\n"
+"            "
 
 #. 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
@@ -721,6 +748,14 @@ 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
@@ -745,13 +780,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 +806,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 +837,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 +857,7 @@ msgstr "国籍"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Additional Features"
-msgstr ""
+msgstr "附加特性"
 
 #. module: hr
 #: field:hr.employee,notes:0
@@ -875,23 +910,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,19 +946,19 @@ msgstr "登录名"
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Total Forecasted Employees"
-msgstr ""
+msgstr "预计员工数合计"
 
 #. module: hr
 #: help:hr.job,state:0
 msgid ""
 "By default 'In position', set it to 'In Recruitment' if recruitment process "
 "is going on for this job position."
-msgstr ""
+msgstr "默认是'In position', 这个岗位的招聘进程开始后，设置为'In Recruitment'。"
 
 #. 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
@@ -949,6 +984,18 @@ msgid ""
 "              </div>\n"
 "            "
 msgstr ""
+"<div class=\"oe_empty_custom_dashboard\">\n"
+"                  <p>\n"
+"                    <b>人力资源的仪表板是空的.</b>\n"
+"                  </p><p>\n"
+"                    要增加第一个报表到仪表板。\n"
+"                    进入任意菜单，切换为列表视图或者图形视图，\n"
+"                   然后在扩展搜索选项里点击“添加到仪表板”\n"
+"                           </p><p>\n"
+"                   在插入到仪表板之前，你能过滤和分组这些数据.\n"
+"                  </p>\n"
+"              </div>\n"
+"            "
 
 #. module: hr
 #: view:hr.employee:0
@@ -964,12 +1011,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 +1028,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 +1043,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..136facd67d6 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-28 04:41+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_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e0978847acb..de0a9714763 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -305,11 +305,9 @@
                                             'default_subject': 'Reminder to fill up Survey' }"/>
                         </div>
                         <group>
-                            <group col="3" colspan="1">
+                            <group>
                                 <field name="survey_id"/>
-                                <button name="action_print_survey" string="Print Survey" type="object" states="draft" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
                                 <field name="user_to_review_id"/>
-                                <label string=""/>
                                 <field name="user_id" string="Interviewer"/>
                             </group>
                             <group>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index d4b7cbae1ce..e457aa505ef 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -85,7 +85,7 @@
                     </group>
                     <notebook>
                         <page string="Description">
-                            <field name="line_ids" context="{'currency_id': currency_id}">
+                            <field name="line_ids" context="{'currency_id': currency_id, 'default_analytic_account': context.get('analytic_account')}">
                                 <form string="Expense Lines" version="7.0">
                                     <group>
                                         <group>
@@ -211,7 +211,7 @@
             <field name="search_view_id" ref="product.product_search_form_view"/>
         </record>
 
-        <menuitem id="menu_hr_product" name="Type of Expenses" parent="hr.menu_hr_configuration" action="hr_expense_product"/>
+        <menuitem id="menu_hr_product" name="Types of Expenses" parent="hr.menu_hr_configuration" action="hr_expense_product"/>
         <menuitem id="next_id_49" name="Expenses" sequence="15" parent="hr.menu_hr_root"/>
         <menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="next_id_49"/>
 
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 92b1d57ce15..09936d07767 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -79,7 +79,7 @@ class hr_holidays_status(osv.osv):
         'categ_id': fields.many2one('crm.meeting.type', 'Meeting Type',
             help='Once a leave is validated, OpenERP will create a corresponding meeting of this type in the calendar.'),
         'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Department.'),
-        'limit': fields.boolean('Allow to Override Limit', help='If you select this checkbox, the system allows the employees to take more leaves than the available ones for this type.'),
+        'limit': fields.boolean('Allow to Override Limit', help='If you select this check box, the system allows the employees to take more leaves than the available ones for this type and take them into account for the "Remaining Legal Leaves" defined on the employee form.'),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
         'max_leaves': fields.function(_user_left_days, string='Maximum Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
         'leaves_taken': fields.function(_user_left_days, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),
@@ -143,18 +143,18 @@ class hr_holidays(osv.osv):
         'date_from': fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, select=True),
         'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'holiday_status_id': fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
-        'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
+        'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
         'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
-        'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
+        'number_of_days_temp': fields.float('Allocation', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'number_of_days': fields.function(_compute_number_of_days, string='Number of Days', store=True),
         'meeting_id': fields.many2one('crm.meeting', 'Meeting'),
         'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of leaves available for someone", select=True),
         'parent_id': fields.many2one('hr.holidays', 'Parent'),
         'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
         'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
-        'category_id': fields.many2one('hr.employee.category', "Category", help='Category of Employee', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
-        'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Mode', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
+        'category_id': fields.many2one('hr.employee.category', "Employee Tag", help='Category of Employee', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
+        'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Tag')], 'Allocation Mode', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='By Employee: Allocation/Request for individual Employee, By Employee Tag: Allocation/Request for group of employees in category', required=True),
         'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)'),
         'double_validation': fields.related('holiday_status_id', 'double_validation', type='boolean', relation='hr.holidays.status', string='Apply Double Validation'),
     }
@@ -541,7 +541,7 @@ class hr_employee(osv.osv):
         return result
 
     _columns = {
-        'remaining_leaves': fields.function(_get_remaining_days, string='Remaining Legal Leaves', fnct_inv=_set_remaining_days, type="float", help='Total number of legal leaves allocated to this employee, change this value to create allocation/leave requests.'),
+        'remaining_leaves': fields.function(_get_remaining_days, string='Remaining Legal Leaves', fnct_inv=_set_remaining_days, type="float", help='Total number of legal leaves allocated to this employee, change this value to create allocation/leave request. Total based on all the leave types without overriding limit.'),
         'current_leave_state': fields.function(_get_leave_status, multi="leave_status", string="Current Leave Status", type="selection",
             selection=[('draft', 'New'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'),
             ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')]),
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 752d278baed..1914d30ec05 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -146,7 +146,10 @@
                         <group>
                             <field name="name" required="1" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
                             <field name="holiday_status_id" context="{'employee_id':employee_id}"/>
-                            <field name="number_of_days_temp"/>
+                            <label for="number_of_days_temp"/>
+                            <div>
+                                <field name="number_of_days_temp" class="oe_inline"/> days
+                            </div>
                         </group>
                         <group>
                             <field name="holiday_type" on_change="onchange_type(holiday_type)"/>
@@ -176,7 +179,7 @@
                     <field name="department_id" invisible="1"/>
                     <field name="holiday_status_id"/>
                     <field name="name"/>
-                    <field name="number_of_days" string="Number of Days" sum="Remaining Days"/>
+                    <field name="number_of_days" string="Allocated Days" sum="Remaining Days"/>
                     <field name="manager_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <!--field name="type"/-->
@@ -257,12 +260,12 @@
         <menuitem name="Leaves" parent="hr.menu_hr_root" id="menu_open_ask_holidays" sequence="20"/>
 
         <record model="ir.actions.act_window" id="open_ask_holidays">
-            <field name="name">My Leave Requests</field>
+            <field name="name">Leave Requests</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_holiday_new"/>
-            <field name="context">{}</field>
-            <field name="domain">[('type','=','remove'),('employee_id.user_id','=', uid)]</field>
+            <field name="context">{'default_type': 'remove', 'search_default_my_leaves':1}</field>
+            <field name="domain">[('type','=','remove')]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
@@ -297,10 +300,10 @@
             <field name="act_window_id" ref="open_ask_holidays"/>
         </record>
 
-        <menuitem name="My Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/>
+        <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>
@@ -326,11 +329,11 @@
         <menuitem name="Leave Requests to Approve" parent="menu_open_ask_holidays" id="menu_request_approve_holidays" action="request_approve_holidays" groups="base.group_hr_user"/>
 
         <record model="ir.actions.act_window" id="open_allocation_holidays">
-            <field name="name">My Allocation Requests</field>
+            <field name="name">Allocation Requests</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
-            <field name="context">{'default_type':'add'}</field>
-            <field name="domain">[('type','=','add'),('employee_id.user_id','=', uid)]</field>
+            <field name="context">{'default_type':'add', 'search_default_my_leaves':1}</field>
+            <field name="domain">[('type','=','add')]</field>
             <field name="view_id" ref="allocation_leave_new"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
@@ -349,7 +352,7 @@
             <field name="act_window_id" ref="open_allocation_holidays"/>
         </record>
 
-        <menuitem name="My Allocation Requests" parent="menu_open_ask_holidays" id="menu_open_allocation_holidays" action="open_allocation_holidays"/>
+        <menuitem parent="menu_open_ask_holidays" id="menu_open_allocation_holidays" action="open_allocation_holidays"/>
 
         <record model="ir.actions.act_window" id="request_approve_allocation">
             <field name="name">Allocation Requests to Approve</field>
@@ -476,7 +479,7 @@
         </record>
 
         <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
-        <menuitem name="Leave Type" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration" sequence="10"/>
+        <menuitem name="Leaves Types" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration" sequence="10"/>
 
         <!-- Holiday on resource leave -->
         <record id="resource_calendar_leave_form_inherit" model="ir.ui.view">
@@ -541,7 +544,7 @@
                     <group string="Leaves">
                         <label for="remaining_leaves"/>
                         <div>
-                            <field name="remaining_leaves" class="oe_inline"/>
+                            <field name="remaining_leaves" class="oe_inline"/> days
                         </div>
                     </group>
                 </xpath>
diff --git a/addons/hr_payroll_account/i18n/zh_CN.po b/addons/hr_payroll_account/i18n/zh_CN.po
index 1e019539dce..423fb892636 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-28 04:41+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 695d589ee2e..ac799f41364 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -62,16 +62,12 @@ 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):
                 raise osv.except_osv(_('Analytic Account incomplete !'),
-                        _('Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:\n%s.') % (account.name,))
+                        _('Contract incomplete. Please fill in the Customer and Pricelist fields.'))
 
 
 
@@ -106,18 +102,18 @@ class account_analytic_line(osv.osv):
             last_invoice = invoice_obj.create(cr, uid, curr_invoice, context=context2)
             invoices.append(last_invoice)
 
-            cr.execute("SELECT product_id, user_id, to_invoice, sum(unit_amount), product_uom_id, name " \
+            cr.execute("SELECT product_id, user_id, to_invoice, sum(unit_amount), product_uom_id " \
                     "FROM account_analytic_line as line " \
                     "WHERE account_id = %s " \
                         "AND id IN %s AND to_invoice IS NOT NULL " \
-                    "GROUP BY product_id, user_id, to_invoice, product_uom_id, name", (account.id, tuple(ids),))
+                    "GROUP BY product_id, user_id, to_invoice, product_uom_id", (account.id, tuple(ids),))
 
-            for product_id, user_id, factor_id, qty, uom, line_name in cr.fetchall():
+            for product_id, user_id, factor_id, qty, uom in cr.fetchall():
                 if data.get('product'):
                     product_id = data['product'][0]
                 product = product_obj.browse(cr, uid, product_id, context=context2)
                 if not product:
-                    raise osv.except_osv(_('Error!'), _('There is no product defined for the line %s. Please select one or force the product through the wizard.') % (line_name))
+                    raise osv.except_osv(_('Error!'), _('There is no product defined. Please select one or force the product through the wizard.'))
                 factor = invoice_factor_obj.browse(cr, uid, factor_id, context=context2)
                 factor_name = product_obj.name_get(cr, uid, [product_id], context=context2)[0][1]
                 if factor.customer_name:
diff --git a/addons/hr_timesheet_sheet/static/src/js/timesheet.js b/addons/hr_timesheet_sheet/static/src/js/timesheet.js
index efff48d93b8..b5ba7f74101 100644
--- a/addons/hr_timesheet_sheet/static/src/js/timesheet.js
+++ b/addons/hr_timesheet_sheet/static/src/js/timesheet.js
@@ -14,6 +14,7 @@ openerp.hr_timesheet_sheet = function(instance) {
                 date_to: false,
                 date_from: false,
             });
+            this.updating = true;
             this.field_manager.on("field_changed:timesheet_ids", this, this.query_sheets);
             this.field_manager.on("field_changed:date_from", this, function() {
                 this.set({"date_from": instance.web.str_to_date(this.field_manager.get_field_value("date_from"))});
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_be_coda/l10n_be_coda_view.xml b/addons/l10n_be_coda/l10n_be_coda_view.xml
index d5067e7951a..1f014400d3c 100644
--- a/addons/l10n_be_coda/l10n_be_coda_view.xml
+++ b/addons/l10n_be_coda/l10n_be_coda_view.xml
@@ -215,7 +215,7 @@
       <field name="name">account.coda.tree</field>
       <field name="model">account.coda</field>
       <field name="arch" type="xml">
-        <tree string="CODA Files">
+        <tree string="CODA Files" create="false">
           <field name="coda_creation_date"/>
           <field name="name"/>
           <field name="date"/>
@@ -229,7 +229,7 @@
         <field name="name">account.coda.form</field>
         <field name="model">account.coda</field>
         <field name="arch" type="xml">
-            <form string="CODA File" version="7.0">
+            <form string="CODA File" version="7.0" create="false">
                 <sheet>
                     <group col="4">
                         <field name="coda_creation_date"/>
@@ -282,7 +282,7 @@
       <field name="name">coda.bank.statement.list</field>
       <field name="model">coda.bank.statement</field>
       <field name="arch" type="xml">
-        <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end)" string="CODA Bank Statements">
+        <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end)" string="CODA Bank Statements" create="false">
           <field name="name"/>
           <field name="date"/>
           <field name="period_id"/>
@@ -299,7 +299,7 @@
       <field name="name">coda.bank.statement.form</field>
       <field name="model">coda.bank.statement</field>
       <field name="arch" type="xml">
-          <form string="CODA Bank Statement" version="7.0">
+          <form string="CODA Bank Statement" version="7.0" create="false">
               <sheet>
                   <group col="4">
                       <field name="name"/>
@@ -396,7 +396,7 @@
       <field name="name">coda.bank.statement.line.list</field>
       <field name="model">coda.bank.statement.line</field>
       <field name="arch" type="xml">
-        <tree editable="bottom" string="CODA Statement Lines">
+        <tree string="CODA Statement Lines" create="false">
           <field name="sequence" readonly="1" invisible="1"/>
           <field name="coda_bank_account_id" readonly="1"/>
           <field name="date" readonly="1"/>
@@ -418,7 +418,7 @@
       <field name="name">coda.bank.statement.line.form</field>
       <field name="model">coda.bank.statement.line</field>
       <field name="arch" type="xml">
-        <form string="CODA Statement Line" version="7.0">
+        <form string="CODA Statement Line" version="7.0" create="false">
             <group col="4">
                 <field name="statement_id"/>
                 <field name="coda_bank_account_id"/>
diff --git a/addons/l10n_ch/account_invoice.xml b/addons/l10n_ch/account_invoice.xml
index 21d421ca40c..04a3dbe768d 100644
--- a/addons/l10n_ch/account_invoice.xml
+++ b/addons/l10n_ch/account_invoice.xml
@@ -7,7 +7,7 @@
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
                 <field name="partner_id" position="replace">
-                    <field name="partner_id"
+                    <field string="Supplier" name="partner_id"
                         on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id)"
                         />
                 </field>
@@ -21,7 +21,7 @@
             <field name="priority" eval="18"/>
             <field name="arch" type="xml">
                 <field name="partner_bank_id" position="replace">
-                    <field name="partner_bank_id"
+                    <field string="Supplier" name="partner_bank_id"
                         domain="[('partner_id', '=', partner_id)]"
                         on_change="onchange_partner_bank(partner_bank_id)"/>
                 </field>
@@ -33,7 +33,7 @@
             <field name="inherit_id" ref="account.invoice_form"/>
             <field name="arch" type="xml">
                 <field name="partner_bank_id" position="replace">
-                    <field name="partner_bank_id"
+                    <field string="Supplier" name="partner_bank_id"
                         domain="[('partner_id.ref_companies', 'in', [company_id])]"/>
                 </field>
             </field>
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/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 8953beef987..32aedc3fa22 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -389,7 +389,7 @@
             <field name="name">cashmove tree</field>
             <field name="model">lunch.cashmove</field>
             <field name="arch" type="xml">
-                <tree string="cashmove tree">
+                <tree string="cashmove tree" create="false">
                     <field name="date"/>
                     <field name="user_id"/>
                     <field name="description"/>
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/i18n/hu.po b/addons/mail/i18n/hu.po
index b25ca22ef2d..0377a00a8cf 100644
--- a/addons/mail/i18n/hu.po
+++ b/addons/mail/i18n/hu.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-26 12:29+0000\n"
-"Last-Translator: Herczeg Péter <hp@erp-cloud.hu>\n"
+"PO-Revision-Date: 2012-11-28 00:18+0000\n"
+"Last-Translator: Krisztian Eyssen <krisz@eyssen.hu>\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:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: mail
 #: field:res.partner,notification_email_send:0
@@ -29,13 +29,13 @@ msgstr ""
 #. module: mail
 #: model:ir.model,name:mail.model_publisher_warranty_contract
 msgid "publisher_warranty.contract"
-msgstr ""
+msgstr "publisher_warranty.contract"
 
 #. module: mail
 #: field:mail.compose.message,author_id:0
 #: field:mail.message,author_id:0
 msgid "Author"
-msgstr ""
+msgstr "Szerző"
 
 #. module: mail
 #: view:mail.mail:0
@@ -45,12 +45,12 @@ msgstr "Üzenet részletei"
 #. module: mail
 #: help:mail.mail,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Üzenet címzettjei"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Comments"
-msgstr ""
+msgstr "Megjegyzés"
 
 #. module: mail
 #: view:mail.alias:0
@@ -62,7 +62,7 @@ msgstr "Csoportosítás..."
 #: help:mail.compose.message,body:0
 #: help:mail.message,body:0
 msgid "Automatically sanitized HTML contents"
-msgstr ""
+msgstr "Automatikusan letisztított HTML tartalom"
 
 #. module: mail
 #. openerp-web
@@ -94,12 +94,12 @@ msgstr ""
 #. module: mail
 #: view:mail.group:0
 msgid "Group Name"
-msgstr ""
+msgstr "Csoportnév"
 
 #. module: mail
 #: selection:mail.group,public:0
 msgid "Public"
-msgstr ""
+msgstr "Nyilvános"
 
 #. module: mail
 #: view:mail.mail:0
@@ -130,14 +130,14 @@ msgstr ""
 #: field:mail.thread,message_unread:0
 #: field:res.partner,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olvasatlan üzenetek"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/xml/mail.xml:237
 #, python-format
 msgid "show"
-msgstr ""
+msgstr "mutat"
 
 #. module: mail
 #: help:mail.message.subtype,default:0
@@ -154,14 +154,14 @@ msgstr ""
 #. module: mail
 #: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
 msgid "Whole Company"
-msgstr ""
+msgstr "Teljes vállalat"
 
 #. module: mail
 #. openerp-web
 #: code:addons/mail/static/src/js/mail.js:786
 #, python-format
 msgid "Do you really want to delete this message?"
-msgstr ""
+msgstr "Valóban törölni kívánja ezt az üzenetet?"
 
 #. module: mail
 #: view:mail.message:0
@@ -185,7 +185,7 @@ msgstr ""
 #: code:addons/mail/mail_message.py:638
 #, python-format
 msgid "Access Denied"
-msgstr ""
+msgstr "Hozzáférés megtagadva"
 
 #. module: mail
 #: help:mail.group,image_medium:0
@@ -209,7 +209,7 @@ msgstr ""
 #. module: mail
 #: view:mail.mail:0
 msgid "Thread"
-msgstr ""
+msgstr "Szál"
 
 #. module: mail
 #. openerp-web
@@ -251,7 +251,7 @@ msgstr ""
 #: code:addons/mail/static/src/xml/mail.xml:91
 #, python-format
 msgid "uploading"
-msgstr ""
+msgstr "feltöltés"
 
 #. module: mail
 #. openerp-web
@@ -293,7 +293,7 @@ msgstr "Válaszcím"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Email varázsló"
 
 #. module: mail
 #: help:mail.group,message_unread:0
@@ -386,7 +386,7 @@ msgstr ""
 #: selection:mail.compose.message,type:0
 #: selection:mail.message,type:0
 msgid "System notification"
-msgstr ""
+msgstr "Rendszerüzenet"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_partner
@@ -408,7 +408,7 @@ msgstr "Tárgy"
 #. module: mail
 #: field:mail.wizard.invite,partner_ids:0
 msgid "Partners"
-msgstr ""
+msgstr "Partnerek"
 
 #. module: mail
 #: view:mail.mail:0
@@ -437,7 +437,7 @@ msgstr ""
 #. module: mail
 #: model:ir.model,name:mail.model_base_config_settings
 msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"
 
 #. module: mail
 #: field:mail.compose.message,to_read:0
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 1721b3df1d4..a232aa12642 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -67,7 +67,7 @@
                 'read_action': 'read', }&quot;"/>
             <field name="help" type="html">
                 <p>
-                    <b>No todo!</b>
+                    <b>No todo.</b>
                 </p><p>
                     When you process messages in your inbox, you can mark some
                     as <i>todo</i>. From this menu, you can process all your todo.
@@ -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/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index ab45f802371..2b479be709c 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0"?>
 <openerp>
+    <data noupdate="1">
+
+        <record id="action_client_marketing_menu" model="ir.actions.client">
+            <field name="name">Open Marketing Menu</field>
+            <field name="tag">reload</field>
+            <field name="params" eval="{'menu_id': ref('base.marketing_menu')}"/>
+        </record>
+
+        <record id="base.open_menu" model="ir.actions.todo">
+            <field name="action_id" ref="action_client_marketing_menu"/>
+            <field name="state">open</field>
+        </record>
+
+    </data>
     <data>
 
     <menuitem name="Configuration" id="menu_marketing_configuration" parent="base.marketing_menu" sequence="1"/>
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/mrp.py b/addons/mrp/mrp.py
index af1664b1f9e..6a708b7cc64 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -470,7 +470,7 @@ class mrp_production(osv.osv):
         'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Work Centers Utilisation',
             readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection(
-            [('draft', 'New'), ('cancel', 'Cancelled'), ('picking_except', 'Picking Exception'), ('confirmed', 'Waiting Goods'),
+            [('draft', 'New'), ('cancel', 'Cancelled'), ('picking_except', 'Picking Exception'), ('confirmed', 'Awaiting Raw Materials'),
                 ('ready', 'Ready to Produce'), ('in_production', 'Production Started'), ('done', 'Done')],
             string='Status', readonly=True,
             help="When the production order is created the status is set to 'Draft'.\n\
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index c28317066fc..2ed442b1831 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -347,7 +347,7 @@
                 <form string="Bill of Material" version="7.0">
                     <group>
                         <group>
-                            <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>
+                            <field name="product_id" on_change="onchange_product_id(product_id, name, context)" context="{'default_supply_method':'produce'}" class="oe_inline"/>
                             <label for="product_qty" string="Quantity"/>
                             <div>
                                 <field name="product_qty" class="oe_inline"/>
@@ -380,7 +380,7 @@
                         <page string="Components">
                             <field name="bom_lines" widget="one2many_list">
                                 <tree string="Components" editable="bottom">
-                                    <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
+                                    <field name="product_id" context="{'default_supply_method':'produce'}" on_change="onchange_product_id(product_id, name)"/>
                                     <field name="product_qty"/>
                                     <field name="product_uom" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
                                     <field name="name" invisible="1"/>
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..06e15c0c3d4 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-28 04:41+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/note_pad/i18n/zh_CN.po b/addons/note_pad/i18n/zh_CN.po
new file mode 100644
index 00000000000..d4c72370cab
--- /dev/null
+++ b/addons/note_pad/i18n/zh_CN.po
@@ -0,0 +1,28 @@
+# 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 16:45+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-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: note_pad
+#: model:ir.model,name:note_pad.model_note_note
+msgid "Note"
+msgstr "便笺"
+
+#. module: note_pad
+#: field:note.note,note_pad_url:0
+msgid "Pad Url"
+msgstr "Pad Url"
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/db.js b/addons/point_of_sale/static/src/js/db.js
index f8ae9cdb56d..0df57759156 100644
--- a/addons/point_of_sale/static/src/js/db.js
+++ b/addons/point_of_sale/static/src/js/db.js
@@ -213,8 +213,10 @@ function openerp_pos_db(instance, module){
             var stored_products   = this.load('products',{});
             var product_ids  = stored_categories[category_id];
             var list = [];
-            for(var i = 0, len = Math.min(product_ids.length,this.limit); i < len; i++){
-                list.push(stored_products[product_ids[i]]);
+            if (product_ids) {
+                for (var i = 0, len = Math.min(product_ids.length, this.limit); i < len; i++) {
+                    list.push(stored_products[product_ids[i]]);
+                }
             }
             return list;
         },
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..d76276fad8d
--- /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-28 04:41+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..79917ef135e 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 09:28+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-28 04:41+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,12 +999,12 @@ 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
 msgid "First valid date for the version."
-msgstr ""
+msgstr "这个版本的第一个有效期"
 
 #. module: product
 #: help:product.supplierinfo,delay:0
@@ -1002,6 +1022,10 @@ msgid ""
 "512MB RAM\n"
 "HDD SH-1"
 msgstr ""
+"17”LCD 显示器\n"
+"AMD8核处理器\n"
+"512m 内存\n"
+"硬盘 SH-1"
 
 #. module: product
 #: selection:product.template,type:0
@@ -1016,7 +1040,7 @@ msgstr "代码"
 #. module: product
 #: model:product.template,name:product.product_product_27_product_template
 msgid "Laptop Customized"
-msgstr ""
+msgstr "定制便携计算机"
 
 #. module: product
 #: model:ir.model,name:product.model_product_ul
@@ -1026,7 +1050,7 @@ msgstr "运输单位"
 #. module: product
 #: model:product.template,name:product.product_product_35_product_template
 msgid "Blank CD"
-msgstr ""
+msgstr "空白CD"
 
 #. module: product
 #: field:pricelist.partnerinfo,suppinfo_id:0
@@ -1050,6 +1074,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击定义一个新产品\n"
+"              </p><p>\n"
+"                你必须为销售的每一样都定义一个产品。可以是物理产品、消耗品、或者你提供给客户的服务。\n"
+"              </p><p>\n"
+"                产品表单包括下面的信息以简化销售处理：价格、报价事项，会计数据，供应方法等等。\n"
+"               </p>\n"
+"            "
 
 #. module: product
 #: view:product.price_list:0
@@ -1059,7 +1091,7 @@ msgstr "取消"
 #. module: product
 #: model:product.template,description:product.product_product_37_product_template
 msgid "All in one hi-speed printer with fax and scanner."
-msgstr ""
+msgstr "高速打印、传真、扫描一体机"
 
 #. module: product
 #: help:product.supplierinfo,min_qty:0
@@ -1067,7 +1099,7 @@ msgid ""
 "The minimal quantity to purchase to this supplier, expressed in the supplier "
 "Product Unit of Measure if not empty, in the default unit of measure of the "
 "product otherwise."
-msgstr ""
+msgstr "从供应商采购的最小数量，如果不是空的，就按明示的供应商单位。否则就是默认的计量单位。"
 
 #. module: product
 #: view:product.product:0
@@ -1109,17 +1141,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 +1173,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 +1198,7 @@ msgstr "km"
 #. module: product
 #: field:product.template,standard_price:0
 msgid "Cost"
-msgstr ""
+msgstr "成本"
 
 #. module: product
 #: help:product.category,sequence:0
@@ -1211,13 +1243,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 +1265,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 +1279,10 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                这是你所有产品根据类别进行的分类列表。你能单击分类 获得关联到这个类别极其子类的所有产品列表。\n"
+"              </p>\n"
+"            "
 
 #. module: product
 #: code:addons/product/product.py:359
@@ -1257,6 +1293,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 +1310,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 +1320,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 +1338,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 +1350,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 +1396,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 +1430,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 +1440,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,14 +1451,14 @@ msgstr "重量"
 #. module: product
 #: view:product.product:0
 msgid "Description for Quotations"
-msgstr ""
+msgstr "报价单说明"
 
 #. module: product
 #: help:pricelist.partnerinfo,price:0
 msgid ""
 "This price will be considered as a price for the supplier Unit of Measure if "
 "any or the default Unit of Measure of the product otherwise"
-msgstr ""
+msgstr "这个价格是 按照供应商单位考虑的，其他情况是默认单位"
 
 #. module: product
 #: field:product.template,uom_po_id:0
@@ -1436,7 +1473,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 +1486,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 +1496,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 +1522,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 +1540,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 +1550,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,28 +1564,28 @@ 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
 msgid "Last valid date for the version."
-msgstr ""
+msgstr "版本的最后有效日期"
 
 #. module: product
 #: model:product.template,name:product.product_product_19_product_template
 msgid "HDD on Demand"
-msgstr ""
+msgstr "HDD on Demand"
 
 #. module: product
 #: field:product.price.type,active:0
@@ -1560,7 +1609,7 @@ msgstr "价格表名称"
 #. module: product
 #: field:product.product,ean13:0
 msgid "EAN13 Barcode"
-msgstr ""
+msgstr "EAN13 条码"
 
 #. module: product
 #: sql_constraint:product.uom:0
@@ -1570,7 +1619,7 @@ msgstr "计量单位的转换比率不能为 0！"
 #. module: product
 #: model:product.template,name:product.product_product_24_product_template
 msgid "Graphics Card"
-msgstr ""
+msgstr "显卡"
 
 #. module: product
 #: help:product.packaging,ean:0
@@ -1590,7 +1639,7 @@ msgstr "空包装重量"
 #. module: product
 #: model:product.template,name:product.product_product_41_product_template
 msgid "Windows Home Server 2011"
-msgstr ""
+msgstr "Windows Home Server 2011"
 
 #. module: product
 #: field:product.price.type,field:0
@@ -1600,7 +1649,7 @@ msgstr "字段值"
 #. module: product
 #: model:product.template,description:product.product_product_5_product_template
 msgid "Custom computer assembled on order based on customer's requirement."
-msgstr ""
+msgstr "根据客户要求定制组装计算机"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_price_type_action
@@ -1616,7 +1665,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
@@ -1632,18 +1681,25 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击增加一个新的计量单位类别。\n"
+"              </p><p>\n"
+"                属于相同类别的计量单位能互相转换。例如，，在“时间”类别中，你有下列单位: 小时数、天数。\n"
+"\n"
+"              </p>\n"
+"            "
 
 #. module: product
 #: help:pricelist.partnerinfo,min_quantity:0
 msgid ""
 "The minimal quantity to trigger this rule, expressed in the supplier Unit of "
 "Measure if any or in the default Unit of Measure of the product otherrwise."
-msgstr ""
+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
@@ -1659,7 +1715,7 @@ msgstr "供应商产品代码"
 #: help:product.pricelist,active:0
 msgid ""
 "If unchecked, it will allow you to hide the pricelist without removing it."
-msgstr ""
+msgstr "如果不选中，允许你隐藏价格表而无需删除"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -1686,7 +1742,7 @@ msgstr "产品"
 #. module: product
 #: view:product.product:0
 msgid "Price:"
-msgstr ""
+msgstr "价格:"
 
 #. module: product
 #: field:product.template,weight:0
@@ -1712,12 +1768,12 @@ msgstr "产品类别"
 #. module: product
 #: model:product.template,name:product.product_product_16_product_template
 msgid "Computer Case"
-msgstr ""
+msgstr "机箱"
 
 #. module: product
 #: model:product.template,name:product.product_product_9_product_template
 msgid "USB Keyboard, AZERTY"
-msgstr ""
+msgstr "USB键盘， AZERTY"
 
 #. module: product
 #: help:product.supplierinfo,sequence:0
@@ -1727,19 +1783,19 @@ 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
 msgid "Manage Secondary Unit of Measure"
-msgstr ""
+msgstr "管理第二个计量单位"
 
 #. module: product
 #: help:product.uom,rounding:0
 msgid ""
 "The computed quantity will be a multiple of this value. Use 1.0 for a Unit "
 "of Measure that cannot be further split, such as a piece."
-msgstr ""
+msgstr "计算的数量将是这个值的倍数。  不能进一步分割的单位，比如 1 片，使用1.0 。"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -1759,12 +1815,12 @@ msgstr "箱子 30x40x60"
 #. module: product
 #: model:product.template,name:product.product_product_47_product_template
 msgid "Switch, 24 ports"
-msgstr ""
+msgstr "24 口交换机"
 
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Bigger than the reference Unit of Measure"
-msgstr ""
+msgstr "大于参考单位"
 
 #. module: product
 #: model:product.template,name:product.product_product_consultant_product_template
@@ -1775,25 +1831,25 @@ msgstr "服务"
 #. module: product
 #: view:product.template:0
 msgid "Internal Description"
-msgstr ""
+msgstr "内部说明"
 
 #. module: product
 #: model:product.template,name:product.product_product_48_product_template
 msgid "USB Adapter"
-msgstr ""
+msgstr "USB 适配器"
 
 #. module: product
 #: help:product.template,uos_id:0
 msgid ""
 "Sepcify a unit of measure here if invoicing is made in another unit of "
 "measure than inventory. Keep empty to use the default unit of measure."
-msgstr ""
+msgstr "如果制作发票的单位跟库存不一致，指定一个计量单位，留空使用默认单位。"
 
 #. module: product
 #: code:addons/product/product.py:206
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
-msgstr ""
+msgstr "不能改变已有的计量单位'%s'的类别"
 
 #. module: product
 #: help:product.packaging,height:0
@@ -1818,7 +1874,7 @@ msgstr "公司"
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
 msgid "Laptop S3450"
-msgstr ""
+msgstr "便携计算机 S3450"
 
 #. module: product
 #: view:product.product:0
@@ -1849,13 +1905,13 @@ msgstr "此产品已经配置为推/拉流程的例子。"
 #. module: product
 #: field:product.product,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
 #. module: product
 #: code:addons/product/product.py:174
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误!"
 
 #. module: product
 #: field:product.packaging,length:0
@@ -1870,7 +1926,7 @@ msgstr "长度或距离"
 #. module: product
 #: model:product.category,name:product.product_category_8
 msgid "Components"
-msgstr ""
+msgstr "部件"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_type
@@ -1881,7 +1937,7 @@ msgstr "价格表类型"
 #. module: product
 #: model:product.category,name:product.product_category_6
 msgid "External Devices"
-msgstr ""
+msgstr "外置设备"
 
 #. module: product
 #: field:product.product,color:0
@@ -1891,7 +1947,7 @@ msgstr "颜色索引"
 #. module: product
 #: help:product.template,sale_ok:0
 msgid "Specify if the product can be selected in a sales order line."
-msgstr ""
+msgstr "如果产品能在销售单明细在被选择，则指定。"
 
 #. module: product
 #: view:product.product:0
@@ -1922,12 +1978,12 @@ msgstr "原材料"
 #. module: product
 #: model:product.template,name:product.product_product_13_product_template
 msgid "RAM SR5"
-msgstr ""
+msgstr "内存SR5"
 
 #. module: product
 #: model:product.template,name:product.product_product_14_product_template
 msgid "RAM SR2"
-msgstr ""
+msgstr "内存SR2"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_normal_action_puchased
@@ -1949,11 +2005,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\"> \n"
+"               单击定义一个新产品\n"
+"              </p><p>\n"
+"                你必须为采购的每一样都定义一个产品。可以是物理产品、消耗品、或者你从分包商购买的服务。\n"
+"              </p><p>\n"
+"                产品表单包括下面的信息以简化采购处理：价格、采购物流，会计数据，可用的供应商等等。\n"
+"               </p>\n"
+"            "
 
 #. module: product
 #: model:product.template,description_sale:product.product_product_44_product_template
 msgid "Full featured image editing software."
-msgstr ""
+msgstr "全功能图像编辑软件"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_version
@@ -1970,17 +2034,17 @@ msgstr "* ( 1 + "
 #. module: product
 #: model:product.template,name:product.product_product_31_product_template
 msgid "Multimedia Speakers"
-msgstr ""
+msgstr "多媒体喇叭"
 
 #. module: product
 #: field:product.product,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "关注者"
 
 #. module: product
 #: view:product.product:0
 msgid "Sale Conditions"
-msgstr ""
+msgstr "销售条件"
 
 #. module: product
 #: view:product.packaging:0
@@ -1996,7 +2060,7 @@ msgstr "价格表名称"
 #. module: product
 #: view:product.product:0
 msgid "Description for Suppliers"
-msgstr ""
+msgstr "供应商说明"
 
 #. module: product
 #: field:product.supplierinfo,delay:0
@@ -2006,7 +2070,7 @@ msgstr "送货周期"
 #. module: product
 #: view:product.product:0
 msgid "months"
-msgstr ""
+msgstr "月"
 
 #. module: product
 #: help:product.uom,active:0
@@ -2023,7 +2087,7 @@ msgstr "供应商交货提前期"
 #. module: product
 #: model:ir.model,name:product.model_decimal_precision
 msgid "decimal.precision"
-msgstr ""
+msgstr "decimal.precision"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -2035,7 +2099,7 @@ msgstr "箱子"
 msgid ""
 "Specify the fixed amount to add or substract(if negative) to the amount "
 "calculated with the discount."
-msgstr ""
+msgstr "指定固定金额来添加或减去(如果负)，用作折扣来计算金额。"
 
 #. module: product
 #: help:product.product,qty_available:0
@@ -2050,6 +2114,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
@@ -2057,6 +2126,8 @@ msgid ""
 "Consumable: Will not imply stock management for this product. \n"
 "Stockable product: Will imply stock management for this product."
 msgstr ""
+"消耗品：不会为该产品进行库存管理\n"
+"可库存产品：将为该产品进行库存管理"
 
 #. module: product
 #: help:product.pricelist.type,key:0
@@ -2076,6 +2147,12 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\"> \n"
+"               单击定义一个新产品\n"
+"              </p><p>\n"
+"                你必须为买卖的的每一样都定义一个产品。可以是物理产品、消耗品、或者服务。\n"
+"              </p>\n"
+"            "
 
 #. module: product
 #: view:product.product:0
@@ -2092,7 +2169,7 @@ msgstr "包装类型"
 msgid ""
 "A category of the view type is a virtual category that can be used as the "
 "parent of another category to create a hierarchical structure."
-msgstr ""
+msgstr "视图类型的分类是一个可视分类，用来做其它分类的上级，以此建立一个分层结构。"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -2104,14 +2181,14 @@ msgstr "包装"
 msgid ""
 "Specify a template if this rule only applies to one product template. Keep "
 "empty otherwise."
-msgstr ""
+msgstr "如果这条规则只能用于一个产品模版，则指定一个模版。否则留空。"
 
 #. module: product
 #: model:product.template,description:product.product_product_2_product_template
 msgid ""
 "This type of service include assistance for security questions, system "
 "configuration requirements, implementation or special needs."
-msgstr ""
+msgstr "服务类型包括安全问题的辅助，系统配置请求，实施或者特别的需求。"
 
 #. module: product
 #: field:product.product,image:0
@@ -2131,6 +2208,10 @@ msgid ""
 "2GB RAM\n"
 "HDD SH-1"
 msgstr ""
+"19“显示器\n"
+"2GB内存\n"
+"酷睿i5 2.7Ghz  处理器\n"
+"硬盘 SH-1"
 
 #. module: product
 #: view:product.template:0
@@ -2140,17 +2221,17 @@ msgstr "说明"
 #. module: product
 #: model:res.groups,name:product.group_stock_packaging
 msgid "Manage Product Packaging"
-msgstr ""
+msgstr "管理产品包装"
 
 #. module: product
 #: model:product.category,name:product.product_category_2
 msgid "Internal"
-msgstr ""
+msgstr "内置"
 
 #. module: product
 #: model:product.template,name:product.product_product_45_product_template
 msgid "Router R430"
-msgstr ""
+msgstr "路由器R430"
 
 #. module: product
 #: help:product.packaging,sequence:0
@@ -2222,7 +2303,7 @@ msgstr "可变的"
 #: field:product.product,message_comment_ids:0
 #: help:product.product,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "评论和电子邮件"
 
 #. module: product
 #: field:product.template,rental:0
@@ -2242,7 +2323,7 @@ msgstr "最小上浮金额"
 #. module: product
 #: model:res.groups,name:product.group_uom
 msgid "Manage Multiple Units of Measure"
-msgstr ""
+msgstr "管理多个计量单位"
 
 #. module: product
 #: help:product.packaging,weight:0
@@ -2252,7 +2333,7 @@ msgstr "完整包装的重量，指货板或者包装箱"
 #. module: product
 #: view:product.uom:0
 msgid "e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
+msgstr "例如: 1 * (本单位t) = 比例 * (参考单位)"
 
 #. module: product
 #: model:product.template,description:product.product_product_25_product_template
@@ -2262,6 +2343,10 @@ msgid ""
 "Standard-1294P Processor\n"
 "QWERTY keyboard"
 msgstr ""
+"17“显示器\n"
+"4GB内存\n"
+"标准1294P处理器\n"
+"QWERTY键盘"
 
 #. module: product
 #: field:product.category,sequence:0
@@ -2303,7 +2388,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_11_product_template
 msgid "Mouse, Laser"
-msgstr ""
+msgstr "激光鼠标"
 
 #. module: product
 #: view:product.template:0
@@ -2351,22 +2436,22 @@ msgid ""
 "Small-sized image of the product. 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: product
 #: model:product.template,name:product.product_product_40_product_template
 msgid "Windows 7 Professional"
-msgstr ""
+msgstr "Windows 7 专业版"
 
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Reference Unit of Measure for this category"
-msgstr ""
+msgstr "这个类别的参考计量单位"
 
 #. module: product
 #: field:product.supplierinfo,product_uom:0
 msgid "Supplier Unit of Measure"
-msgstr ""
+msgstr "供应商单位"
 
 #. module: product
 #: view:product.product:0
@@ -2377,7 +2462,7 @@ msgstr "产品系列"
 #. module: product
 #: model:product.template,name:product.product_product_6_product_template
 msgid "15” LCD Monitor"
-msgstr ""
+msgstr "15” LCD 显示器"
 
 #. module: product
 #: code:addons/product/pricelist.py:374
@@ -2430,7 +2515,7 @@ msgstr "产品类别"
 #. module: product
 #: model:product.template,description:product.product_product_19_product_template
 msgid "On demand hard-disk having capacity based on requirement."
-msgstr ""
+msgstr "基于需求的硬盘容量要求"
 
 #. module: product
 #: help:product.template,volume:0
@@ -2445,7 +2530,7 @@ msgstr "生命周期结束"
 #. module: product
 #: model:product.template,name:product.product_product_15_product_template
 msgid "RAM SR3"
-msgstr ""
+msgstr "内存Sr3"
 
 #. module: product
 #: help:product.product,packaging:0
@@ -2486,7 +2571,7 @@ msgstr "标价"
 msgid ""
 "Conversion between Units of Measure can only occur if they belong to the "
 "same category. The conversion will be made based on the ratios."
-msgstr ""
+msgstr "计量单位转换只能在同一个类型之间进行。转换基于比例"
 
 #. module: product
 #: constraint:product.category:0
@@ -2499,22 +2584,22 @@ msgid ""
 "Medium-sized image of the product. It is automatically resized as a "
 "128x128px image, with aspect ratio preserved, only when the image exceeds "
 "one of those sizes. Use this field in form views or some kanban views."
-msgstr ""
+msgstr "产品的中等尺寸的图片。保持纵横比例，图像超出尺寸后，自动缩放为128x128px ，这字段通常用于看板视图。"
 
 #. module: product
 #: view:product.uom:0
 msgid "e.g: 1 * (reference unit) = ratio * (this unit)"
-msgstr ""
+msgstr "例如: 1*(参考单位) = 比例 * （本单位）"
 
 #. module: product
 #: help:product.supplierinfo,qty:0
 msgid "This is a quantity which is converted into Default Unit of Measure."
-msgstr ""
+msgstr "这是转换为默认计量单位的值"
 
 #. module: product
 #: sql_constraint:decimal.precision:0
 msgid "Only one value can be defined for each given usage!"
-msgstr ""
+msgstr "每个用途只能定义一个值"
 
 #. module: product
 #: field:product.pricelist.item,price_discount: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/product_margin/i18n/zh_CN.po b/addons/product_margin/i18n/zh_CN.po
index 144ee94149b..c0290a08601 100644
--- a/addons/product_margin/i18n/zh_CN.po
+++ b/addons/product_margin/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: 2010-03-20 09:13+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 11:58+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:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -36,7 +36,7 @@ msgstr "从"
 #: help:product.product,total_cost:0
 msgid ""
 "Sum of Multiplication of Invoice price and quantity of Supplier Invoices "
-msgstr ""
+msgstr "供应商发票的开票价格和数量相乘的合计 "
 
 #. module: product_margin
 #: field:product.margin,to_date:0
@@ -51,7 +51,7 @@ msgstr "日期到"
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnover - Standard price"
-msgstr ""
+msgstr "营业额-标准价格"
 
 #. module: product_margin
 #: field:product.product,date_from:0
@@ -78,7 +78,7 @@ msgstr "产品"
 #. module: product_margin
 #: sql_constraint:product.product:0
 msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "错误!结束日期不能早于开始日期。"
 
 #. module: product_margin
 #: view:product.product:0
@@ -127,7 +127,7 @@ msgstr "已开票数量"
 msgid ""
 "You provided an invalid \"EAN13 Barcode\" reference. You may use the "
 "\"Internal Reference\" field instead."
-msgstr ""
+msgstr "你提供了一个错误的  \"EAN13 条码\" 编号。你可能要用 “编号”字段替代。"
 
 #. module: product_margin
 #: view:product.product:0
@@ -138,7 +138,7 @@ msgstr "总成本"
 #. module: product_margin
 #: help:product.product,normal_cost:0
 msgid "Sum of Multiplication of Cost price and quantity of Supplier Invoices"
-msgstr ""
+msgstr "供应商发票的成本价格和数量相乘的合计"
 
 #. module: product_margin
 #: field:product.product,expected_margin:0
@@ -158,13 +158,13 @@ msgstr "预计利润 / 预计销售 * 100"
 #. module: product_margin
 #: help:product.product,sale_avg_price:0
 msgid "Avg. Price in Customer Invoices."
-msgstr ""
+msgstr "客户发票中的平均价格"
 
 #. module: product_margin
 #: help:product.product,sale_expected:0
 msgid ""
 "Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
+msgstr "客户发票的销售分类价格和数量相乘的汇总"
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
@@ -192,7 +192,7 @@ msgstr "销售差额"
 #: help:product.product,turnover:0
 msgid ""
 "Sum of Multiplication of Invoice price and quantity of Customer Invoices"
-msgstr ""
+msgstr "客户发票的开票价格和数量相乘的汇总"
 
 #. module: product_margin
 #: field:product.product,normal_cost:0
@@ -282,7 +282,7 @@ msgstr "客户发票数量合计"
 #. module: product_margin
 #: view:product.margin:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: product_margin
 #: model:ir.model,name:product_margin.model_product_margin
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_issue_sheet/project_issue_sheet_view.xml b/addons/project_issue_sheet/project_issue_sheet_view.xml
index 4fc12ab0747..fb245a0510a 100644
--- a/addons/project_issue_sheet/project_issue_sheet_view.xml
+++ b/addons/project_issue_sheet/project_issue_sheet_view.xml
@@ -23,7 +23,7 @@
                             <tree editable="top" string="Timesheets">
                                 <field name="name"/>
                                 <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
-                                <field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)"/>
+                                <field name="account_id" invisible="0" domain="[('partner_id', '=', parent.partner_id)]" on_change="on_change_account_id(account_id)" groups="analytic.group_analytic_accounting"/>
                                 <field name="date"/>
                                 <field name="user_id"/>
                                 <field invisible="1" name="journal_id"/>
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/project_long_term/i18n/zh_CN.po b/addons/project_long_term/i18n/zh_CN.po
index 85b8b7bbb5a..f05038ac05d 100644
--- a/addons/project_long_term/i18n/zh_CN.po
+++ b/addons/project_long_term/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:54+0000\n"
-"PO-Revision-Date: 2012-05-10 18:18+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-27 14: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-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: project_long_term
 #: field:account.analytic.account,use_phases:0
@@ -162,7 +162,7 @@ msgstr "结束日期"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_account_analytic_account
 msgid "Analytic Account"
-msgstr ""
+msgstr "辅助核算项"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_end:0
@@ -205,7 +205,7 @@ msgstr "按相关任务计算"
 #: code:addons/project_long_term/project_long_term.py:141
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (副本)"
 
 #. module: project_long_term
 #: field:project.phase,constraint_date_start:0
@@ -215,7 +215,7 @@ msgstr "最早开始时间"
 #. module: project_long_term
 #: constraint:account.analytic.account:0
 msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "错误！你不能递归创建辅助核算项"
 
 #. module: project_long_term
 #: help:project.phase,state:0
@@ -226,6 +226,10 @@ msgid ""
 "           \n"
 " If the phase is over, the status is set to 'Done'."
 msgstr ""
+"阶段被创建，状态是“草稿”，\n"
+"阶段开始，状态是“进行中”，\n"
+"此阶段需要复审，状态是\"待定\"，\n"
+"阶段结束，状态是“完成”。"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
@@ -266,13 +270,13 @@ msgstr "项目任务列表"
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
 msgid "Tasks"
-msgstr ""
+msgstr "任务"
 
 #. module: project_long_term
 #: help:project.phase,user_ids:0
 msgid ""
 "The resources on the project can be computed automatically by the scheduler."
-msgstr ""
+msgstr "这个项目上的资源能被调度程序自动计算。"
 
 #. module: project_long_term
 #: help:project.phase,date_start:0
@@ -306,7 +310,7 @@ msgstr "开始日期"
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_end:0
@@ -321,7 +325,7 @@ msgstr "草稿"
 #. module: project_long_term
 #: field:project.phase,product_uom:0
 msgid "Duration Unit of Measure"
-msgstr ""
+msgstr "持续时间单位"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -333,7 +337,7 @@ msgstr "等待中"
 #: view:project.phase:0
 #: field:project.phase,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: project_long_term
 #: view:project.user.allocation:0
@@ -345,7 +349,7 @@ msgstr "用户"
 #: help:project.phase,product_uom:0
 msgid ""
 "Unit of Measure (Unit of Measure) is the unit of measurement for Duration"
-msgstr ""
+msgstr "单位（单位）是持续时间的单位"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
@@ -355,7 +359,7 @@ msgstr "计算任务计划"
 #. module: project_long_term
 #: field:project.compute.phases,target_project:0
 msgid "Action"
-msgstr ""
+msgstr "动作"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -436,7 +440,7 @@ msgstr "用户"
 #. module: project_long_term
 #: help:account.analytic.account,use_phases:0
 msgid "Check this field if you plan to use phase-based scheduling"
-msgstr ""
+msgstr "如果你计划使用分阶段调度，选中这个字段。"
 
 #. module: project_long_term
 #: view:project.project:0
@@ -493,7 +497,7 @@ msgstr ""
 #. module: project_long_term
 #: field:project.project,phase_count:0
 msgid "Open Phases"
-msgstr ""
+msgstr "开发阶段"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
diff --git a/addons/project_mrp/i18n/zh_CN.po b/addons/project_mrp/i18n/zh_CN.po
index 4654e07817f..385b0db662f 100644
--- a/addons/project_mrp/i18n/zh_CN.po
+++ b/addons/project_mrp/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-02-11 13:58+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-27 14:50+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:08+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
@@ -40,7 +40,7 @@ msgstr "错误！任务结束日期必须大于任务开始日期"
 #: code:addons/project_mrp/project_procurement.py:93
 #, python-format
 msgid "Task created"
-msgstr ""
+msgstr "任务已创建"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
@@ -70,7 +70,7 @@ msgstr "错误！不能创建循环引用的任务"
 #. module: project_mrp
 #: sql_constraint:product.product:0
 msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "错误!结束日期不能早于开始日期。"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_ordertask0
@@ -93,7 +93,7 @@ msgstr "任务"
 #. module: project_mrp
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
-msgstr ""
+msgstr "当你卖 服务给客户时"
 
 #. module: project_mrp
 #: field:product.product,project_id:0
@@ -114,7 +114,7 @@ msgstr "销售订单明细"
 #. module: project_mrp
 #: view:product.product:0
 msgid "False"
-msgstr ""
+msgstr "False"
 
 #. module: project_mrp
 #: view:product.product:0
@@ -125,19 +125,22 @@ msgid ""
 "                        in the project related to the contract of the sale "
 "order."
 msgstr ""
+"将被创建为\n"
+"                   以跟进要做的作业。此任务将显示\n"
+"                   在项目中销售订单有关的合同。"
 
 #. module: project_mrp
 #: code:addons/project_mrp/project_procurement.py:87
 #, python-format
 msgid "Task created."
-msgstr ""
+msgstr "任务已创建"
 
 #. module: project_mrp
 #: constraint:product.product:0
 msgid ""
 "You provided an invalid \"EAN13 Barcode\" reference. You may use the "
 "\"Internal Reference\" field instead."
-msgstr ""
+msgstr "你提供了一个错误的  \"EAN13 条码\" 编号。你可能要用 “编号”字段替代。"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_ordertask0
@@ -162,7 +165,7 @@ msgstr "销售订单"
 #. module: project_mrp
 #: view:project.task:0
 msgid "Order Line"
-msgstr ""
+msgstr "订单明细"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_saleordertask0
@@ -172,7 +175,7 @@ msgstr "在销售订单这事务是销售服务"
 #. module: project_mrp
 #: view:product.product:0
 msgid "a task"
-msgstr ""
+msgstr "一个任务"
 
 #~ msgid "If procure method is Make to order and supply method is produce"
 #~ msgstr "如果采购方式是按单和供应方式是生产"
diff --git a/addons/project_timesheet/i18n/zh_CN.po b/addons/project_timesheet/i18n/zh_CN.po
index c9fb424b3dc..d344a9bd1df 100644
--- a/addons/project_timesheet/i18n/zh_CN.po
+++ b/addons/project_timesheet/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: 2010-03-20 09:53+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 15:29+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:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -24,7 +24,7 @@ msgstr "按用户打印任务"
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group by year of date"
-msgstr ""
+msgstr "按年分组"
 
 #. module: project_timesheet
 #: constraint:project.task:0
@@ -42,7 +42,7 @@ msgstr "有关的时间ID"
 msgid ""
 "You cannot delete a partner which is assigned to project, but you can "
 "uncheck the active box."
-msgstr ""
+msgstr "你不能删除被指派给项目的合作伙伴，但你能不选中“可用”。"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task_work
@@ -54,7 +54,7 @@ msgstr "任务进度"
 #, python-format
 msgid ""
 "You cannot select a Analytic Account which is in Close or Cancelled state."
-msgstr ""
+msgstr "你不能选择关闭或者取消状态的辅助核算项"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -76,7 +76,7 @@ msgstr "十月"
 #: view:project.project:0
 #, python-format
 msgid "Timesheets"
-msgstr ""
+msgstr "计工单"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -87,7 +87,7 @@ msgstr "年"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Billable"
-msgstr ""
+msgstr "应记账"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_account_analytic_overdue
@@ -104,7 +104,7 @@ msgstr ""
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Analytic Account/Project"
-msgstr ""
+msgstr "辅助核算项/项目"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
@@ -119,7 +119,7 @@ msgstr "错误！项目的开始日期必须小于项目的结束日期"
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_account_analytic_overdue
 msgid "Customer Projects"
-msgstr ""
+msgstr "客户项目"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:89
@@ -129,6 +129,8 @@ msgid ""
 "employee.\n"
 "Fill in the HR Settings tab of the employee form."
 msgstr ""
+"请在相关的员工上面定义产品和产品分类属性科目。\n"
+"填在员工表单的人力资源标签。"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_account_analytic_line
@@ -168,22 +170,22 @@ msgstr "项目的签入/签出"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Billable Project"
-msgstr ""
+msgstr "应记账的项目"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_invoicing_contracts
 msgid "Contracts to Renew"
-msgstr ""
+msgstr "要续签的合同"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Hours"
-msgstr ""
+msgstr "小时"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "按月分组"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task
@@ -249,6 +251,11 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                你可以在这里找到为了合同而产生的计工单和采购，并可以由此重开发票给客人。\n"
+"                如果你要记录新的任务到发票，你必须使用计工单菜单替代。\n"
+"              </p>\n"
+"            "
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_timesheettask0
@@ -309,7 +316,7 @@ msgstr "输入你在此任务上花费的工时"
 #: code:addons/project_timesheet/project_timesheet.py:85
 #, python-format
 msgid "Please define employee for user \"%s\". You must create one."
-msgstr ""
+msgstr "请为用户 \"%s\"定义员工。你必须创建一个。"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_res_partner
@@ -320,7 +327,7 @@ msgstr "业务伙伴"
 #: code:addons/project_timesheet/project_timesheet.py:294
 #, python-format
 msgid "Invalid Analytic Account !"
-msgstr ""
+msgstr "无效的辅助核算项"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -349,6 +356,8 @@ msgid ""
 "employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"请在相关的员工上面定义产品和产品分类属性科目。\n"
+"填在员工表单的计工单标签。"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:60
@@ -356,12 +365,12 @@ msgstr ""
 msgid ""
 "<p>Timesheets on this project may be invoiced to %s, according to the terms "
 "defined in the contract.</p>"
-msgstr ""
+msgstr "<p>根据合同的条款，项目的计工单可开票给 %s </p>"
 
 #. module: project_timesheet
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "错误，您不能创建循环引用的会员用户"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
@@ -394,7 +403,7 @@ msgstr "六月"
 #: code:addons/project_timesheet/project_timesheet.py:266
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "非法的动作"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -405,7 +414,7 @@ msgstr "月份"
 #. module: project_timesheet
 #: constraint:res.partner:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:57
@@ -413,7 +422,7 @@ msgstr ""
 msgid ""
 "<p class=\"oe_view_nocontent_create\">Record your timesheets for the project "
 "'%s'.</p>"
-msgstr ""
+msgstr "<p class=\"oe_view_nocontent_create\">记录你为项目所做的计工单 '%s'.</p>"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,timesheet_hrs:0
@@ -426,7 +435,7 @@ msgstr "计工单工时"
 msgid ""
 "Please define journal on the related employee.\n"
 "Fill in the timesheet tab of the employee form."
-msgstr ""
+msgstr "请在相关的员工上定义账簿。填在员工表单的计工单标签。"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
@@ -436,7 +445,7 @@ msgstr "输入计工单"
 #. module: project_timesheet
 #: constraint:account.analytic.line:0
 msgid "You cannot create analytic line on view account."
-msgstr ""
+msgstr "你不能视图科目上面创建辅助核算行。"
 
 #~ msgid "Project Timesheet"
 #~ msgstr "项目时间表"
diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml
index 4190a625fdb..be35fb9d6bc 100644
--- a/addons/purchase/edi/purchase_order_action_data.xml
+++ b/addons/purchase/edi/purchase_order_action_data.xml
@@ -44,7 +44,7 @@
        % if object.partner_ref:
        &nbsp;&nbsp;Your reference: ${object.partner_ref}<br />
        % endif
-       % if object.user_id:
+       % if object.validator:
        &nbsp;&nbsp;Your contact: <a href="mailto:${object.validator.email or ''}?subject=Order%20${object.name}">${object.validator.name}</a>
        % endif
     </p>
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..e21310eb3fb 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-27 12:03+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-28 04:40+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,29 +696,29 @@ 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 "or"
 
 #. module: purchase
 #: field:res.company,po_lead:0
 msgid "Purchase Lead Time"
-msgstr "采购提前时间"
+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..684707ea258 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),
@@ -190,6 +190,7 @@ class purchase_order(osv.osv):
         '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,
+            readonly=True, states={'draft':[('readonly',False)], 'sent':[('readonly',False)]},
             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 +215,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 +238,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)
@@ -412,6 +415,20 @@ class purchase_order(osv.osv):
             'context': ctx,
         }
 
+    def print_quotation(self, cr, uid, ids, context=None):
+        '''
+        This function prints the request for quotation and mark it as sent, so that we can see more easily the next step of the workflow
+        '''
+        assert len(ids) == 1, 'This option should only be used for a single id at a time'
+        wf_service = netsvc.LocalService("workflow")
+        wf_service.trg_validate(uid, 'purchase.order', ids[0], 'send_rfq', cr)
+        datas = {
+                 'model': 'purchase.order',
+                 'ids': ids,
+                 'form': self.read(cr, uid, ids[0], context=context),
+        }
+        return {'type': 'ir.actions.report.xml', 'report_name': 'purchase.quotation', 'datas': datas, 'nodestroy': True}
+
     #TODO: implement messages system
     def wkf_confirm_order(self, cr, uid, ids, context=None):
         todo = []
@@ -1167,4 +1184,13 @@ class product_template(osv.osv):
 
 product_template()
 
+class mail_compose_message(osv.osv):
+    _inherit = 'mail.compose.message'
+    def send_mail(self, cr, uid, ids, context=None):
+        context = context or {}
+        if context.get('default_model') == 'purchase.order' and context.get('default_res_id'):
+            wf_service = netsvc.LocalService("workflow")
+            wf_service.trg_validate(uid, 'purchase.order', context['default_res_id'], 'send_rfq', cr)
+        return super(mail_compose_message, self).send_mail(cr, uid, ids, context=context)
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 4c7aea1caac..9397a95c970 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -198,7 +198,10 @@
             <field name="arch" type="xml">
                 <form string="Purchase Order" version="7.0">
                 <header>
-                    <button name="wkf_send_rfq" states="draft" string="Send Request for Quotation" type="object" context="{'send_rfq':True}" class="oe_highlight"/>
+                    <button name="wkf_send_rfq" states="draft" string="Send by EMail" type="object" context="{'send_rfq':True}" class="oe_highlight"/>
+                    <button name="wkf_send_rfq" states="sent" string="Send by EMail" type="object" context="{'send_rfq':True}"/>
+                    <button name="print_quotation" string="Print" type="object" states="draft" class="oe_highlight" groups="base.group_user"/>
+                    <button name="print_quotation" string="Print" type="object" states="sent" groups="base.group_user"/>
                     <button name="purchase_confirm" states="draft" string="Confirm Order"/>
                     <button name="purchase_confirm" states="sent" string="Confirm Order" class="oe_highlight"/>
                     <button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object" class="oe_highlight"/>
@@ -262,8 +265,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>
@@ -654,7 +656,7 @@
             <field name="inherit_id" ref="account.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='property_account_expense']" position="replace" >
-                     <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
+                     <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" groups="account.group_account_user"/>
                 </xpath>
                 <xpath expr="//field[@name='supplier_taxes_id']" position="replace" >
                      <field name="supplier_taxes_id" colspan="2" widget="many2many_tags" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
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/purchase/res_config.py b/addons/purchase/res_config.py
index 9e781d661f2..13a54031254 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -43,9 +43,6 @@ class purchase_config_settings(osv.osv_memory):
         'group_costing_method':fields.boolean("Compute product cost price based on average cost",
             implied_group='product.group_costing_method',
             help="""Allows you to compute product cost price based on average cost."""),
-        'group_purchase_delivery_address': fields.boolean("Allow a different address for incoming products and invoicing",
-            implied_group='purchase.group_delivery_invoice_address',
-            help="Allows you to specify different delivery and invoice addresses on a purchase order."),
         'module_warning': fields.boolean("Alerts by products or supplier",
             help="""Allow to configure notification on products and trigger them when a user wants to purchase a given product or a given supplier.
 Example: Product: this product is deprecated, do not purchase more than 5.
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index f659d7b437f..7f1cfc64f39 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -54,10 +54,6 @@
                                 <field name="group_uom" class="oe_inline"/>
                                 <label for="group_uom"/>
                             </div>
-                            <div>
-                                <field name="group_purchase_delivery_address" class="oe_inline"/>
-                                <label for="group_purchase_delivery_address"/>
-                            </div>
                             <div>
                                 <field name="group_costing_method" class="oe_inline"/>
                                 <label for="group_costing_method"/>
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index 637a1722c7e..f9a711c1c75 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -15,11 +15,6 @@
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
-    <record id="group_delivery_invoice_address" model="res.groups">
-        <field name="name">Addresses in Purchase Orders</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-
     <record id="group_analytic_accounting" model="res.groups">
         <field name="name">Analytic Accounting for Purchases</field>
         <field name="category_id" ref="base.module_category_hidden"/>
diff --git a/addons/purchase_analytic_plans/i18n/zh_CN.po b/addons/purchase_analytic_plans/i18n/zh_CN.po
index 579e3b5ec62..24efff67fb9 100644
--- a/addons/purchase_analytic_plans/i18n/zh_CN.po
+++ b/addons/purchase_analytic_plans/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: 2010-03-20 09:56+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 14:35+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:36+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
@@ -24,7 +24,7 @@ msgstr "分析控制台"
 #. module: purchase_analytic_plans
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "订单号必须在一个公司范围内唯一"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
diff --git a/addons/purchase_double_validation/i18n/zh_CN.po b/addons/purchase_double_validation/i18n/zh_CN.po
index 5624b39a064..81ebadcc9f8 100644
--- a/addons/purchase_double_validation/i18n/zh_CN.po
+++ b/addons/purchase_double_validation/i18n/zh_CN.po
@@ -8,45 +8,45 @@ 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-10-25 17:31+0000\n"
+"PO-Revision-Date: 2012-11-27 14:37+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:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
 msgid "purchase.config.settings"
-msgstr ""
+msgstr "purchase.config.settings"
 
 #. module: purchase_double_validation
 #: view:purchase.order:0
 msgid "Purchase orders which are not approved yet."
-msgstr ""
+msgstr "尚未核准的采购单"
 
 #. module: purchase_double_validation
 #: field:purchase.config.settings,limit_amount:0
 msgid "limit to require a second approval"
-msgstr ""
+msgstr "限制为需要二次核准"
 
 #. module: purchase_double_validation
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting
 msgid "Purchase Orders Waiting Approval"
-msgstr ""
+msgstr "采购订单等待核准"
 
 #. module: purchase_double_validation
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr ""
+msgstr "待核准"
 
 #. module: purchase_double_validation
 #: help:purchase.config.settings,limit_amount:0
 msgid "Amount after which validation of purchase is required."
-msgstr ""
+msgstr "采购核准后的金额"
 
 #~ msgid "Configure Limit Amount for Purchase"
 #~ msgstr "设置采购的限定金额"
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
index 9e8c0893d30..f5f0367ad4b 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner_view.xml
@@ -7,7 +7,7 @@
             <field name="arch" type="xml">
                 <form string="Purchase Requisition" version="7.0">
                     <group>
-                        <field name="partner_id"/>
+                        <field name="partner_id" context="{'default_supplier': 1, 'default_customer': 0}"/>
                     </group>
                     <footer>
                         <button name="create_order" string="Create Quotation" type="object" class="oe_highlight"/>
diff --git a/addons/report_intrastat/i18n/zh_CN.po b/addons/report_intrastat/i18n/zh_CN.po
index 3c944e6515b..d70700ec43d 100644
--- a/addons/report_intrastat/i18n/zh_CN.po
+++ b/addons/report_intrastat/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: 2010-08-03 07:31+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 13:39+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:02+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -106,7 +106,7 @@ msgstr "发票日期"
 msgid ""
 "Error: The default Unit of Measure and the purchase Unit of Measure must be "
 "in the same category."
-msgstr ""
+msgstr "错误：默认的计量单位和采购计量单位必须是相同的类别"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_webkit/i18n/zh_CN.po b/addons/report_webkit/i18n/zh_CN.po
index a9881e6e75b..34dbc037667 100644
--- a/addons/report_webkit/i18n/zh_CN.po
+++ b/addons/report_webkit/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:54+0000\n"
-"PO-Revision-Date: 2011-07-13 16:29+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-27 15:45+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:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -55,7 +55,7 @@ msgid ""
 "                    position as each object is printed on a separate HTML.   "
 "                                                         but memory and disk "
 "usage is wider"
-msgstr ""
+msgstr "这个模式允许 打印在独立的 HTML中每个对象 更精确的定位。但是内存和硬盘空间占用更多。"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
@@ -72,7 +72,7 @@ msgstr "公司"
 #: code:addons/report_webkit/webkit_report.py:235
 #, python-format
 msgid "Please set a header in company settings."
-msgstr ""
+msgstr "请在公司设置里设定页眉"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
@@ -98,7 +98,7 @@ msgstr "图片名"
 #: model:ir.actions.act_window,name:report_webkit.action_header_webkit
 #: model:ir.ui.menu,name:report_webkit.menu_header_webkit
 msgid "Webkit Headers/Footers"
-msgstr ""
+msgstr "Webkit 页眉/页脚"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
@@ -124,7 +124,7 @@ msgstr "B6 20 125 x 176 毫米"
 #: code:addons/report_webkit/webkit_report.py:177
 #, python-format
 msgid "Webkit error"
-msgstr ""
+msgstr "Webkit 错误"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
@@ -139,7 +139,7 @@ msgstr "B2 17 500 x 707 毫米"
 #: code:addons/report_webkit/webkit_report.py:307
 #, python-format
 msgid "Webkit render!"
-msgstr ""
+msgstr "Webkit 渲染！"
 
 #. module: report_webkit
 #: model:ir.model,name:report_webkit.model_ir_header_img
@@ -149,7 +149,7 @@ msgstr "ir.header_img"
 #. module: report_webkit
 #: field:ir.actions.report.xml,precise_mode:0
 msgid "Precise Mode"
-msgstr ""
+msgstr "精确模式"
 
 #. module: report_webkit
 #: code:addons/report_webkit/webkit_report.py:96
@@ -160,6 +160,10 @@ msgid ""
 "http://code.google.com/p/wkhtmltopdf/downloads/list and set the path in the "
 "ir.config_parameter with the webkit_path key.Minimal version is 0.9.9"
 msgstr ""
+"请安装执行文件在你的系统中（sudo apt-get install "
+"wkhtmltopd）或者从这里下载http://code.google.com/p/wkhtmltopdf/downloads/list 并且用 "
+"webkit_path 键值设置路径在  ir.config_parameter。\r\n"
+"最低版本是0.9.9."
 
 #. module: report_webkit
 #: constraint:res.company:0
@@ -216,7 +220,7 @@ msgstr "报表头"
 #: code:addons/report_webkit/webkit_report.py:95
 #, python-format
 msgid "Wkhtmltopdf library path is not set"
-msgstr ""
+msgstr "Wkhtmltopdf 库的路径没设置"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
@@ -279,7 +283,7 @@ msgstr "B3 18 353 x 500 毫米"
 #. module: report_webkit
 #: field:ir.actions.report.xml,webkit_header:0
 msgid "Webkit Header"
-msgstr ""
+msgstr "Webkit 页眉"
 
 #. module: report_webkit
 #: help:ir.actions.report.xml,webkit_debug:0
@@ -294,7 +298,7 @@ msgstr "图片"
 #. module: report_webkit
 #: view:ir.header_img:0
 msgid "Header Image"
-msgstr ""
+msgstr "页眉图像"
 
 #. module: report_webkit
 #: field:res.company,header_webkit:0
@@ -321,7 +325,7 @@ msgstr "肖像"
 #. module: report_webkit
 #: view:report.webkit.actions:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,orientation:0
@@ -337,7 +341,7 @@ msgstr "B8 22 62 x 88 毫米"
 #: code:addons/report_webkit/webkit_report.py:178
 #, python-format
 msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
-msgstr ""
+msgstr "命令'wkhtmltopdf'失败，错误代码=%s，  消息: %s"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
@@ -383,7 +387,7 @@ msgstr "右边距（毫米）"
 #: code:addons/report_webkit/webkit_report.py:229
 #, python-format
 msgid "Webkit report template not found!"
-msgstr ""
+msgstr "Webkit 报表模版没找到！"
 
 #. module: report_webkit
 #: field:ir.header_webkit,orientation:0
@@ -396,7 +400,7 @@ msgid ""
 "Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. "
 "Install a static version of the library if you experience missing "
 "header/footers on Linux."
-msgstr ""
+msgstr "wkhtmltopdf 执行文件的全路径，要求版本 0.9.9  。如果你在Linux遇到找不到页眉/页脚，安装一个静态库版本，"
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
@@ -416,7 +420,7 @@ msgstr ":B10 16 31 x 44 毫米"
 #. module: report_webkit
 #: view:report.webkit.actions:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: report_webkit
 #: field:ir.header_webkit,css:0
@@ -432,13 +436,13 @@ msgstr "B4 19 250 x 353 毫米"
 #: model:ir.actions.act_window,name:report_webkit.action_header_img
 #: model:ir.ui.menu,name:report_webkit.menu_header_img
 msgid "Webkit Logos"
-msgstr ""
+msgstr "Webkit 标志"
 
 #. module: report_webkit
 #: code:addons/report_webkit/webkit_report.py:173
 #, python-format
 msgid "No diagnosis message was provided"
-msgstr ""
+msgstr "没有诊断信息提供"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
@@ -473,7 +477,7 @@ msgstr "B0 14 1000 x 1414 毫米"
 #. module: report_webkit
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "公司名必须唯一！"
 
 #. module: report_webkit
 #: field:ir.header_img,name:0
@@ -532,12 +536,12 @@ msgstr "ir.actions.report.xml"
 #: code:addons/report_webkit/webkit_report.py:175
 #, python-format
 msgid "The following diagnosis message was provided:\n"
-msgstr ""
+msgstr "下面的诊断信息被提供\n"
 
 #. module: report_webkit
 #: view:ir.header_webkit:0
 msgid "HTML Header"
-msgstr ""
+msgstr "HTML 页眉"
 
 #, python-format
 #~ msgid "Webkit raise an error"
diff --git a/addons/resource/i18n/zh_CN.po b/addons/resource/i18n/zh_CN.po
index 878c62d8b1c..4b826ef6f0d 100644
--- a/addons/resource/i18n/zh_CN.po
+++ b/addons/resource/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:54+0000\n"
-"PO-Revision-Date: 2012-05-10 17:54+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 14:33+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:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -97,7 +97,7 @@ msgstr "请确保已经配置好适当的工作日的工作时间！"
 #: code:addons/resource/resource.py:310
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (副本)"
 
 #. module: resource
 #: view:resource.calendar:0
@@ -131,7 +131,7 @@ msgstr "周五"
 #. module: resource
 #: view:resource.calendar.attendance:0
 msgid "Hours"
-msgstr ""
+msgstr "小时"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
@@ -157,7 +157,7 @@ msgstr "搜索准假工作周期"
 #. module: resource
 #: field:resource.calendar.attendance,date_from:0
 msgid "Starting Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: resource
 #: field:resource.calendar,manager:0
@@ -203,7 +203,7 @@ msgstr "工作时间"
 #. module: resource
 #: help:resource.calendar.attendance,hour_from:0
 msgid "Start and End time of working."
-msgstr ""
+msgstr "工作开始和结束时间。"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
@@ -298,6 +298,8 @@ msgid ""
 "show a load of 100% for this phase by default, but if we put a efficiency of "
 "200%, then his load will only be 50%."
 msgstr ""
+"这个字段描述完成任务的资源的效率。比如：例如： 资源单独投入一个阶段， 5 天 5 个任务指派给他，这一阶段默认情况将显示 "
+"100%的负荷，下，但如果我们把效率设置为 200%，他的负荷将只是 50%。"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
@@ -338,7 +340,7 @@ msgstr "人"
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Duration"
-msgstr ""
+msgstr "持续时间"
 
 #. module: resource
 #: field:resource.calendar.leaves,date_from:0
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/i18n/tr.po b/addons/sale/i18n/tr.po
index d1cb0286f2a..98afc7fe847 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\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:46+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-27 21:47+0000\n"
+"Last-Translator: Ahmet Altınışık <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:03+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -44,7 +44,7 @@ msgstr "Satış Birimi"
 #: view:sale.report:0
 #: field:sale.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Satış Temsülcisi"
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
@@ -66,28 +66,28 @@ msgstr "Siparişi İptal Et"
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
 msgid "Incorrect Data"
-msgstr ""
+msgstr "Hatalı Veri"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:102
 #, python-format
 msgid "The value of Advance Amount must be positive."
-msgstr ""
+msgstr "Avans tutarı pozitif değer olmak zorunda."
 
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Eğer işaretlerseniz yeni mesajlar ilginizi gerektirir."
 
 #. module: sale
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "Yanlış"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
-msgstr ""
+msgstr "Vergi"
 
 #. module: sale
 #: help:sale.order,state:0
@@ -141,17 +141,17 @@ msgstr "Varsayılan Ödeme Şartı"
 #: code:addons/sale/sale.py:696
 #, python-format
 msgid "Invoice <b>paid</b>."
-msgstr ""
+msgstr "Fatura <b>ödendi</b>."
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
-msgstr ""
+msgstr "Farklı ölçü birimleri kullanmaya izin ver"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Percentage"
-msgstr ""
+msgstr "Yüzde"
 
 #. module: sale
 #: report:sale.order:0
@@ -211,17 +211,17 @@ msgstr "Diğer Bilgiler"
 #: code:addons/sale/wizard/sale_make_invoice.py:42
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Uyarı!"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Invoicing Process"
-msgstr ""
+msgstr "Faturalama İşlemi"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order done"
-msgstr ""
+msgstr "Satış siparişi tamamlandı"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -285,7 +285,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Quotation "
-msgstr ""
+msgstr "Teklif "
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:106
@@ -355,12 +355,12 @@ msgstr "Ekim"
 #. module: sale
 #: field:sale.order,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Özet"
 
 #. module: sale
 #: view:sale.order:0
 msgid "View Invoice"
-msgstr ""
+msgstr "Fatura Görüntüle"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:113
@@ -443,7 +443,7 @@ msgstr "Şu anki sipariş için fatura adresi."
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -491,12 +491,12 @@ msgstr ""
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "or"
-msgstr ""
+msgstr "veya"
 
 #. module: sale
 #: constraint:res.partner:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hata: Geçersiz EAN kodu"
 
 #. module: sale
 #: field:sale.order,invoice_exists:0
@@ -589,7 +589,7 @@ msgstr "Öğe #"
 #. module: sale
 #: view:sale.order:0
 msgid "(update)"
-msgstr ""
+msgstr "(güncelle)"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
@@ -604,7 +604,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Print"
-msgstr ""
+msgstr "Yazdır"
 
 #. module: sale
 #: report:sale.order:0
@@ -690,12 +690,12 @@ msgstr ""
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Yapılandırma Hatası!"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
-msgstr ""
+msgstr "E-posta ile Gönder"
 
 #. module: sale
 #: code:addons/sale/res_config.py:89
@@ -799,12 +799,12 @@ msgstr "Vergiler :"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
-msgstr ""
+msgstr "Talep Üzerine"
 
 #. module: sale
 #: field:sale.order,currency_id:0
 msgid "unknown"
-msgstr ""
+msgstr "bilinmeyen"
 
 #. module: sale
 #: field:sale.order,message_is_follower:0
@@ -940,7 +940,7 @@ msgstr "Fiyat"
 #. module: sale
 #: view:sale.order:0
 msgid "Quotation Number"
-msgstr ""
+msgstr "Teklif No"
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -1045,7 +1045,7 @@ msgstr "Bekleyen Planlama"
 #: view:sale.order.line:0
 #: field:sale.report,product_uom:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Ölçü Birimi"
 
 #. module: sale
 #: field:sale.order.line,type:0
@@ -1204,7 +1204,7 @@ msgstr ""
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Contracts Management"
-msgstr ""
+msgstr "Şözleşmelerin Yönetimi"
 
 #. module: sale
 #: view:sale.report:0
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index d7fca82fcd3..4032f45353b 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/i18n/zh_CN.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: 2012-10-25 17:36+0000\n"
+"PO-Revision-Date: 2012-11-27 13:35+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:04+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -42,7 +42,7 @@ msgstr "销售单位"
 #: view:sale.report:0
 #: field:sale.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "销售员"
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
@@ -64,28 +64,28 @@ msgstr "取消订单"
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
 msgid "Incorrect Data"
-msgstr ""
+msgstr "错误的数据"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:102
 #, python-format
 msgid "The value of Advance Amount must be positive."
-msgstr ""
+msgstr "定金必须是正的"
 
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "如果要求你关注新消息，勾选此项"
 
 #. module: sale
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "False"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
-msgstr ""
+msgstr "税"
 
 #. module: sale
 #: help:sale.order,state:0
@@ -110,7 +110,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: sale
 #: view:sale.report:0
@@ -121,7 +121,7 @@ msgstr "数量#"
 #. module: sale
 #: help:sale.config.settings,group_discount_per_so_line:0
 msgid "Allows you to apply some discount per sale order line."
-msgstr ""
+msgstr "允许你为每个销售订单行应用折扣"
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -129,6 +129,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 ""
+"允许基于每种客户类别的规则管理不同的价格。\n"
+"例如: 10%"
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
@@ -139,17 +141,17 @@ msgstr "默认付款条件"
 #: code:addons/sale/sale.py:696
 #, python-format
 msgid "Invoice <b>paid</b>."
-msgstr ""
+msgstr "发票 <b>已经支付</b>."
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
-msgstr ""
+msgstr "允许使用不同的计量单位"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Percentage"
-msgstr ""
+msgstr "百分比"
 
 #. module: sale
 #: report:sale.order:0
@@ -160,7 +162,7 @@ msgstr "折扣(%)"
 #: code:addons/sale/sale.py:807
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "请为这个产品定义收益科目: \"%s\" (id:%d)."
 
 #. module: sale
 #: view:sale.report:0
@@ -209,17 +211,17 @@ msgstr "其它信息"
 #: code:addons/sale/wizard/sale_make_invoice.py:42
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "警告！"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Invoicing Process"
-msgstr ""
+msgstr "开发票过程"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order done"
-msgstr ""
+msgstr "销售订单完成"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -231,7 +233,7 @@ msgstr "报价单或销售订单"
 #: help:sale.config.settings,group_uom:0
 msgid ""
 "Allows you to select and maintain different units of measure for products."
-msgstr ""
+msgstr "允许你选择和维护产品的不同计量单位"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
@@ -283,7 +285,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Quotation "
-msgstr ""
+msgstr "报价单 "
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:106
@@ -353,19 +355,19 @@ msgstr "10月"
 #. module: sale
 #: field:sale.order,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: sale
 #: view:sale.order:0
 msgid "View Invoice"
-msgstr ""
+msgstr "查看发票"
 
 #. 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 ""
+msgstr "预付款：%s %s"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_quotations
@@ -385,7 +387,7 @@ msgstr "数量"
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Delivery address for current sales order."
-msgstr ""
+msgstr "当前销售订单的发运地址"
 
 #. module: sale
 #: report:sale.order:0
@@ -411,7 +413,7 @@ msgstr "处理中"
 #: code:addons/sale/sale.py:701
 #, python-format
 msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+msgstr "发票草稿 %s %s <b>等待核准</b>."
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -424,7 +426,7 @@ msgstr "业务员确认报价单。销售订单的状态变成‘处理中’或
 #: code:addons/sale/sale.py:864
 #, python-format
 msgid "You cannot cancel a sale order line that has already been invoiced."
-msgstr ""
+msgstr "你不能取消已经被开票的销售订单行。"
 
 #. module: sale
 #: report:sale.order:0
@@ -439,12 +441,12 @@ msgstr "当前销售订单的发票地址。"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Before Delivery"
-msgstr ""
+msgstr "发运前"
 
 #. module: sale
 #: code:addons/sale/sale.py:824
@@ -452,22 +454,22 @@ msgstr ""
 msgid ""
 "There is no Fiscal Position defined or Income category account defined for "
 "default properties of Product categories."
-msgstr ""
+msgstr "产品类别的属性中，没有定义财务结构或者 收益类科目。"
 
 #. module: sale
 #: model:res.groups,name:sale.group_delivery_invoice_address
 msgid "Addresses in Sale Orders"
-msgstr ""
+msgstr "销售订单中的地址"
 
 #. module: sale
 #: field:sale.order,project_id:0
 msgid "Contract / Analytic"
-msgstr ""
+msgstr "合同/分析"
 
 #. module: sale
 #: model:res.groups,name:sale.group_invoice_so_lines
 msgid "Enable Invoicing Sale order lines"
-msgstr ""
+msgstr "允许按销售订单行开票"
 
 #. module: sale
 #: view:sale.report:0
@@ -486,7 +488,7 @@ msgstr "你不能对有不同货币结算的同一个业务伙伴的销售订单
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: sale
 #: constraint:res.partner:0
@@ -503,7 +505,7 @@ msgstr "已开票"
 #. module: sale
 #: model:res.groups,name:sale.group_analytic_accounting
 msgid "Analytic Accounting for Sales"
-msgstr ""
+msgstr "销售辅助核算"
 
 #. module: sale
 #: field:sale.order,date_confirm:0
@@ -518,7 +520,7 @@ msgstr "分配给业务伙伴"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
 msgid "Invoice Order"
-msgstr ""
+msgstr "开票订单"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -543,7 +545,7 @@ msgstr "小计"
 #. module: sale
 #: field:sale.config.settings,group_discount_per_so_line:0
 msgid "Allow setting a discount on the sale order lines"
-msgstr ""
+msgstr "允许在销售订单行上设置折扣"
 
 #. module: sale
 #: report:sale.order:0
@@ -553,7 +555,7 @@ msgstr "发票地址:"
 #. module: sale
 #: field:sale.order.line,product_uom:0
 msgid "Unit of Measure "
-msgstr ""
+msgstr "计量单位 "
 
 #. module: sale
 #: field:sale.config.settings,time_unit:0
@@ -584,7 +586,7 @@ msgstr "明细#"
 #. module: sale
 #: view:sale.order:0
 msgid "(update)"
-msgstr ""
+msgstr "（更新）"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
@@ -594,7 +596,7 @@ msgstr "销售订单明细"
 #. module: sale
 #: field:sale.config.settings,module_analytic_user_function:0
 msgid "One employee can have different roles per contract"
-msgstr ""
+msgstr "每个合同里，一个员工能有不同的角色"
 
 #. module: sale
 #: view:sale.order:0
@@ -635,7 +637,7 @@ msgstr "创建日期"
 #: code:addons/sale/sale.py:693
 #, python-format
 msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
-msgstr ""
+msgstr "销售订单 <em>%s</em> 设置为 <b>完成</b>"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -677,7 +679,7 @@ msgstr ""
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:92
 #, python-format
 msgid "There is no income account defined as global property."
-msgstr ""
+msgstr "没有收益科目定义为全局属性"
 
 #. module: sale
 #: code:addons/sale/sale.py:1005
@@ -685,12 +687,12 @@ msgstr ""
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:95
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "设置错误!"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Send by Email"
-msgstr ""
+msgstr "以邮件发送"
 
 #. module: sale
 #: code:addons/sale/res_config.py:89
@@ -794,17 +796,17 @@ msgstr "税:"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Demand"
-msgstr ""
+msgstr "需求"
 
 #. module: sale
 #: field:sale.order,currency_id:0
 msgid "unknown"
-msgstr ""
+msgstr "未知"
 
 #. module: sale
 #: field:sale.order,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "是一个关注者"
 
 #. module: sale
 #: field:sale.order,date_order:0
@@ -933,7 +935,7 @@ msgstr "价格"
 #. module: sale
 #: view:sale.order:0
 msgid "Quotation Number"
-msgstr ""
+msgstr "报价单编号"
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -948,7 +950,7 @@ msgstr "运货地址:"
 #. module: sale
 #: help:account.config.settings,group_analytic_account_for_sales:0
 msgid "Allows you to specify an analytic account on sale orders."
-msgstr ""
+msgstr "允许在销售订单指定一个辅助核算科目"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
@@ -959,28 +961,28 @@ msgstr "销售订单草稿状态"
 #: code:addons/sale/sale.py:681
 #, python-format
 msgid "Quotation for <em>%s</em> <b>created</b>."
-msgstr ""
+msgstr "报价单 <em>%s</em> <b>已创建</b>."
 
 #. module: sale
 #: help:sale.order,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "消息和通信历史"
 
 #. module: sale
 #: view:sale.order:0
 msgid "New Copy of Quotation"
-msgstr ""
+msgstr "新的报价单副本"
 
 #. module: sale
 #: code:addons/sale/sale.py:1028
 #, python-format
 msgid "Cannot delete a sales order line which is in state '%s'."
-msgstr ""
+msgstr "不能删除 '%s'状态的销售订单行。"
 
 #. module: sale
 #: model:res.groups,name:sale.group_mrp_properties
 msgid "Properties on lines"
-msgstr ""
+msgstr "行上的属性"
 
 #. module: sale
 #: code:addons/sale/sale.py:909
@@ -988,7 +990,7 @@ msgstr ""
 msgid ""
 "Before choosing a product,\n"
 " select a customer in the sales form."
-msgstr ""
+msgstr "在挑选产品前，在 销售表单选择一个客户"
 
 #. module: sale
 #: view:sale.order:0
@@ -1009,7 +1011,7 @@ msgstr "确认报价单"
 #: 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 ""
+msgstr "订单行开票"
 
 #. module: sale
 #: view:sale.order:0
@@ -1021,7 +1023,7 @@ msgstr "分组..."
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Product Features"
-msgstr ""
+msgstr "产品特性"
 
 #. module: sale
 #: view:sale.config.settings:0
@@ -1054,7 +1056,7 @@ msgstr "为整个销售单开票"
 #: view:sale.order:0
 #: field:sale.order,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未读信息"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1106,7 +1108,7 @@ msgstr "创建发票"
 #: code:addons/sale/sale.py:1028
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "非法的动作"
 
 #. module: sale
 #: report:sale.order:0
@@ -1140,7 +1142,7 @@ msgstr "生成发票"
 #. module: sale
 #: field:res.partner,sale_order_count:0
 msgid "# of Sales Order"
-msgstr ""
+msgstr "销售订单的 #"
 
 #. module: sale
 #: view:sale.order:0
@@ -1163,12 +1165,12 @@ msgstr "7月"
 msgid ""
 "After clicking 'Show Lines to Invoice', select lines to invoice and create "
 "the invoice from the 'More' dropdown menu."
-msgstr ""
+msgstr "点击“显示要开票的行”"
 
 #. module: sale
 #: help:sale.order,invoice_exists:0
 msgid "It indicates that sale order has at least one invoice."
-msgstr ""
+msgstr "表明销售订单至少有一个发票"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1185,17 +1187,17 @@ msgstr "发票组"
 #: code:addons/sale/sale.py:685
 #, python-format
 msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
-msgstr ""
+msgstr "为 <em>%s</em>的报价单 <b>已经转化为</b>销售订单 %s %s."
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Invoice Sale Order"
-msgstr ""
+msgstr "开发票 销售订单"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Contracts Management"
-msgstr ""
+msgstr "合同管理"
 
 #. module: sale
 #: view:sale.report:0
@@ -1362,7 +1364,7 @@ msgstr ""
 #. module: sale
 #: field:sale.config.settings,group_sale_pricelist:0
 msgid "Use pricelists to adapt your price per customers"
-msgstr ""
+msgstr "为每个客户使用价格表来适配你的价格"
 
 #. module: sale
 #: view:sale.order.line:0
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 187d54ece53..e50c315bc42 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..f248f4735e0 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'])]"/>
@@ -465,8 +465,8 @@
             <field name="arch" type="xml">
                 <form string="Sales Order Lines" version="7.0">
                     <header>
-                        <button name="button_cancel" string="Cancel" type="object" states="confirmed,exception" groups="base.group_user"/>
                         <button name="%(action_view_sale_order_line_make_invoice)d" string="Create Invoice" type="action" attrs="{'invisible': ['|',('invoiced', '=', 1), ('state', 'not in', ('confirmed', 'draft'))]}" class="oe_highlight" groups="base.group_user"/>
+                        <button name="button_cancel" string="Cancel" type="object" states="confirmed,exception" groups="base.group_user"/>
                         <button name="button_done" string="Done" type="object"  attrs="{'invisible': ['|',('invoiced', '=', 0), ('state', 'not in', ('confirmed', 'exception'))]}" class="oe_highlight" groups="base.group_user"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
                     </header>
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index f442cbe0a8e..360c42ceb51 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,
@@ -109,9 +109,30 @@ class sale_order_line_make_invoice(osv.osv_memory):
 
         if not invoices:
             raise osv.except_osv(_('Warning!'), _('Invoice cannot be created for this Sales Order Line due to one of the following reasons:\n1.The state of this sales order line is either "draft" or "cancel"!\n2.The Sales Order Line is Invoiced!'))
-
+        if context.get('open_invoices', False):
+            return self.open_invoices( cr, uid, ids, res, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
+    def open_invoices(self, cr, uid, ids, invoice_ids, context=None):
+        """ open a view on one of the given invoice_ids """
+        ir_model_data = self.pool.get('ir.model.data')
+        form_res = ir_model_data.get_object_reference(cr, uid, 'account', 'invoice_form')
+        form_id = form_res and form_res[1] or False
+        tree_res = ir_model_data.get_object_reference(cr, uid, 'account', 'invoice_tree')
+        tree_id = tree_res and tree_res[1] or False
+ 
+        return {
+            'name': _('Invoice'),
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'account.invoice',
+            'res_id': invoice_ids,
+            'view_id': False,
+            'views': [(form_id, 'form'), (tree_id, 'tree')],
+            'context': {'type': 'out_invoice'},
+            'type': 'ir.actions.act_window',
+        }
+
 sale_order_line_make_invoice()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/wizard/sale_line_invoice.xml b/addons/sale/wizard/sale_line_invoice.xml
index 2eb5d1ae47f..6144ff489f4 100644
--- a/addons/sale/wizard/sale_line_invoice.xml
+++ b/addons/sale/wizard/sale_line_invoice.xml
@@ -7,11 +7,19 @@
             <field name="arch" type="xml">
              <form string="Create invoices" version="7.0">
                 <header>
+                    <separator string="Do you want to invoice the selected sale order lines?" />
+                </header>
+                <p class="oe_grey">
+                    All items in these order lines will be invoiced. You can also invoice a percentage of the sale order 
+                    or a fixed price (for advances) directly from the sale order form if you prefer.
+                </p>
+                <footer>
+                    <button name="make_invoices" string="Create &amp; View Invoice" type="object"
+                        context="{'open_invoices': True}" class="oe_highlight"/>
                     <button name="make_invoices" string="Create Invoices" type="object" class="oe_highlight"/>
                     or
                     <button string="Cancel" class="oe_link" special="cancel" />
-                </header>
-                <separator string="Do you really want to create the invoice(s)?" />
+                </footer>
             </form>
             </field>
         </record>
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_analytic_plans/i18n/zh_CN.po b/addons/sale_analytic_plans/i18n/zh_CN.po
index f9678050a1a..b7187894da0 100644
--- a/addons/sale_analytic_plans/i18n/zh_CN.po
+++ b/addons/sale_analytic_plans/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: 2010-03-20 10:14+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 14:25+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:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -24,12 +24,12 @@ msgstr "分析控制台"
 #. module: sale_analytic_plans
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "订单号必须在一个公司范围内唯一"
 
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "销售订单"
 
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order_line
diff --git a/addons/sale_crm/__init__.py b/addons/sale_crm/__init__.py
index ac44586e7db..cda0cd795a2 100644
--- a/addons/sale_crm/__init__.py
+++ b/addons/sale_crm/__init__.py
@@ -21,5 +21,6 @@
 
 import wizard
 import sale_crm
+import report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 82e267337f9..4ef6b6059f2 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -43,7 +43,8 @@ modules.
         'sale_crm_view.xml',
         'process/sale_crm_process.xml',
         'security/sale_crm_security.xml',
-        'security/ir.model.access.csv'
+        'security/ir.model.access.csv',
+        'report/sale_crm_account_invoice_report_view.xml',
     ],
     'demo': [],
     'test': ['test/sale_crm.yml'],
diff --git a/addons/sale_crm/i18n/zh_CN.po b/addons/sale_crm/i18n/zh_CN.po
index 4fc29c14698..4fbea108bd1 100644
--- a/addons/sale_crm/i18n/zh_CN.po
+++ b/addons/sale_crm/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-08-31 14:59+0000\n"
+"PO-Revision-Date: 2012-11-27 14:27+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:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
@@ -57,7 +57,7 @@ msgstr "商机： %s"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
 #, python-format
 msgid "No addresse(s) defined for this customer."
-msgstr ""
+msgstr "这个客户没有定义地址"
 
 #. module: sale_crm
 #: view:crm.lead:0
@@ -74,19 +74,19 @@ msgstr "销售团队"
 #. module: sale_crm
 #: view:crm.lead:0
 msgid "Create Quotation"
-msgstr ""
+msgstr "创建询价单"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Opportunity has been <b>converted</b> to the quotation <em>%s</em>."
-msgstr ""
+msgstr "商机 <b>被转换</b> 报价单 <em>%s</em>."
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
 #, python-format
 msgid "Insufficient Data!"
-msgstr ""
+msgstr "数据不足！"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
@@ -118,17 +118,17 @@ msgstr "报价"
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
 msgid "Categories"
-msgstr ""
+msgstr "分类"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Mark Won"
-msgstr ""
+msgstr "标记为已赢得"
 
 #~ msgid "Products"
 #~ msgstr "产品"
diff --git a/addons/sale_crm/report/__init__.py b/addons/sale_crm/report/__init__.py
new file mode 100644
index 00000000000..d7c6d373468
--- /dev/null
+++ b/addons/sale_crm/report/__init__.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import sales_crm_account_invoice_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/sale_crm/report/sale_crm_account_invoice_report_view.xml b/addons/sale_crm/report/sale_crm_account_invoice_report_view.xml
new file mode 100644
index 00000000000..41166d56713
--- /dev/null
+++ b/addons/sale_crm/report/sale_crm_account_invoice_report_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    <!-- Update account invoice !-->
+    <record model="ir.ui.view" id="account_invoice_report_tree">
+        <field name="name">account.invoice.report.tree</field>
+        <field name="model">account.invoice.report</field>
+        <field name="inherit_id" ref="account.view_account_invoice_report_tree"/>
+        <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='date']" position="after">
+                    <field name="section_id"/>
+                </xpath>
+            </data>
+        </field>
+    </record>
+
+</data>
+</openerp>
diff --git a/addons/sale_crm/report/sales_crm_account_invoice_report.py b/addons/sale_crm/report/sales_crm_account_invoice_report.py
new file mode 100644
index 00000000000..8e356527536
--- /dev/null
+++ b/addons/sale_crm/report/sales_crm_account_invoice_report.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from osv import fields,osv
+
+class account_invoice_report(osv.osv):
+    _inherit = 'account.invoice.report'
+    _columns = {
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+    }
+
+    def _select(self):
+        return  super(account_invoice_report, self)._select() + ", ai.section_id as section_id"
+
+    def _group_by(self):
+        return super(account_invoice_report, self)._group_by() + ", ai.section_id"
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index 80e9f3b4f42..3bca4053194 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -46,4 +46,19 @@ class sale_order(osv.osv):
 
 sale_order()
 
+class res_users(osv.Model):
+    _inherit = 'res.users'
+    _columns = {
+        'default_section_id': fields.many2one('crm.case.section', 'Default Sales Team'),
+    }
+
+class account_invoice(osv.osv):
+    _inherit = 'account.invoice'
+    _columns = {
+        'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+    }
+    _defaults = {
+        'section_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).default_section_id.id or False,
+    }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 665474c22c0..0b5fce2f5cd 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -46,5 +46,72 @@
             </field>
         </record>
 
+        <!-- Update account invoice list view!-->
+        <record model="ir.ui.view" id="account_invoice_tree">
+            <field name="name">Account Invoice</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_tree"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//field[@name='date_invoice']" position="after">
+                        <field name="section_id" invisible="1"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+        <record id="account_invoice_groupby_inherit" model="ir.ui.view">
+            <field name="name">account.invoice.groupby</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.view_account_invoice_filter"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group/filter[@string='Due Date']" position="after">
+                    <filter string="Sales Team" domain="[]" context="{'group_by':'section_id'}"/>
+                </xpath>
+            </field>
+        </record>
+
+        <!-- Update account invoice !-->
+        <record model="ir.ui.view" id="account_invoice_form">
+            <field name="name">Account Invoice</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//field[@name='user_id']" position="after">
+                        <field name="section_id"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+        <!-- Update user form !-->
+        <record model="ir.ui.view" id="res_user_form">
+            <field name="name">Users Preferences</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//field[@name='email']" position="after">
+                        <field name="default_section_id"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+        <!-- Update Preferences form !-->
+        <record id="view_users_form_preferences" model="ir.ui.view">
+            <field name="name">res.users.preferences.form</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
+            <field name="arch" type="xml">
+            <data>
+                    <xpath expr="//field[@name='company_id']" position="after">
+                        <field name="default_section_id"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/sale_journal/i18n/zh_CN.po b/addons/sale_journal/i18n/zh_CN.po
index 88045b73ddb..6fd99e6bae2 100644
--- a/addons/sale_journal/i18n/zh_CN.po
+++ b/addons/sale_journal/i18n/zh_CN.po
@@ -7,25 +7,25 @@ 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-13 13:39+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 14:24+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:08+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "订单号必须在一个公司范围内唯一"
 
 #. module: sale_journal
 #: help:res.partner,property_invoice_type:0
 msgid ""
 "This invoicing type will be used, by default, to invoice the current partner."
-msgstr ""
+msgstr "这种开票类型已经被使用，默认开票给当前的合作伙伴"
 
 #. module: sale_journal
 #: view:res.partner:0
@@ -69,12 +69,12 @@ msgstr "开发票"
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_stock_picking_in
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "入库"
 
 #. module: sale_journal
 #: help:sale.order,invoice_type_id:0
 msgid "Generate invoice based on the selected option."
-msgstr ""
+msgstr "基于选择的选项生成发票。"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,invoicing_method:0
@@ -116,17 +116,17 @@ msgstr "发票类型对业务伙伴，销售订单和发货订单是有用的。
 #: sql_constraint:stock.picking.in:0
 #: sql_constraint:stock.picking.out:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "编号必须在公司内唯一！"
 
 #. module: sale_journal
 #: field:res.partner,property_invoice_type:0
 msgid "Invoicing Type"
-msgstr ""
+msgstr "开票类型"
 
 #. module: sale_journal
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "错误，您不能创建循环引用的会员用户"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
@@ -138,7 +138,7 @@ msgstr "发票类型"
 #. module: sale_journal
 #: constraint:res.partner:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_res_partner
@@ -153,7 +153,7 @@ msgstr "销售单"
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_stock_picking_out
 msgid "Delivery Orders"
-msgstr ""
+msgstr "送货单"
 
 #~ msgid "Set to Draft"
 #~ msgstr "设为草稿"
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_margin/i18n/zh_CN.po b/addons/sale_margin/i18n/zh_CN.po
index 8b88dcfd3b6..4d08f59b636 100644
--- a/addons/sale_margin/i18n/zh_CN.po
+++ b/addons/sale_margin/i18n/zh_CN.po
@@ -8,19 +8,19 @@ 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-06-28 05:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-27 13:53+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:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "订单号必须在一个公司范围内唯一"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
@@ -32,7 +32,7 @@ msgstr "成本价"
 msgid ""
 "It gives profitability by calculating the difference between the Unit Price "
 "and the cost price."
-msgstr ""
+msgstr "给出在单价和成本价之间计算出来的利润率"
 
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_sale_order
diff --git a/addons/sale_mrp/i18n/zh_CN.po b/addons/sale_mrp/i18n/zh_CN.po
index bbf77983511..0c1d519114e 100644
--- a/addons/sale_mrp/i18n/zh_CN.po
+++ b/addons/sale_mrp/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:54+0000\n"
-"PO-Revision-Date: 2012-08-31 14:59+0000\n"
+"PO-Revision-Date: 2012-11-27 13:53+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:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
@@ -25,7 +25,7 @@ msgstr "在销售订单中标识出相关客户"
 #. module: sale_mrp
 #: field:mrp.production,sale_name:0
 msgid "Sale Name"
-msgstr ""
+msgstr "销售名称"
 
 #. module: sale_mrp
 #: model:ir.model,name:sale_mrp.model_mrp_production
@@ -35,7 +35,7 @@ msgstr "生产单"
 #. module: sale_mrp
 #: field:mrp.production,sale_ref:0
 msgid "Sale Reference"
-msgstr ""
+msgstr "销售单号"
 
 #. module: sale_mrp
 #: sql_constraint:mrp.production:0
diff --git a/addons/sale_order_dates/i18n/zh_CN.po b/addons/sale_order_dates/i18n/zh_CN.po
index c79939c5348..4b641453baa 100644
--- a/addons/sale_order_dates/i18n/zh_CN.po
+++ b/addons/sale_order_dates/i18n/zh_CN.po
@@ -8,24 +8,24 @@ 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-06-28 05:03+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-27 14: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:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "订单号必须在一个公司范围内唯一"
 
 #. module: sale_order_dates
 #: view:sale.order:0
 msgid "Dates"
-msgstr ""
+msgstr "日期"
 
 #. module: sale_order_dates
 #: field:sale.order,commitment_date:0
@@ -45,7 +45,7 @@ msgstr "创建装箱单日期"
 #. module: sale_order_dates
 #: help:sale.order,requested_date:0
 msgid "Date requested by the customer for the sale."
-msgstr ""
+msgstr "客户要求的日期"
 
 #. module: sale_order_dates
 #: field:sale.order,requested_date:0
@@ -60,7 +60,7 @@ msgstr "销售订单"
 #. module: sale_order_dates
 #: help:sale.order,commitment_date:0
 msgid "Committed date for delivery."
-msgstr ""
+msgstr "承诺发运日期"
 
 #~ msgid "Sales Order Dates"
 #~ msgstr "销售订单日期"
diff --git a/addons/sale_stock/__openerp__.py b/addons/sale_stock/__openerp__.py
index 10773b44a3f..a849df295d4 100644
--- a/addons/sale_stock/__openerp__.py
+++ b/addons/sale_stock/__openerp__.py
@@ -52,6 +52,7 @@ You can choose flexible invoicing methods:
                    'company_view.xml',
                    'sale_stock_view.xml',
                    'sale_stock_workflow.xml',
+                   'stock_view.xml',
                    'res_config_view.xml',
                    'report/sale_report_view.xml',
                    'process/sale_stock_process.xml',
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/stock_location/i18n/zh_CN.po b/addons/stock_location/i18n/zh_CN.po
index b569da9962b..cefef3bb4b4 100644
--- a/addons/stock_location/i18n/zh_CN.po
+++ b/addons/stock_location/i18n/zh_CN.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:54+0000\n"
-"PO-Revision-Date: 2012-02-08 03:39+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 12:39+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:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
 msgid "Is used to know to which company the pickings and moves belong."
-msgstr ""
+msgstr "用来了解属于哪个公司的的分拣和移动"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -72,7 +72,7 @@ msgstr "库位用于提供目标的库位"
 #. module: stock_location
 #: constraint:stock.move:0
 msgid "You must assign a serial number for this product."
-msgstr ""
+msgstr "你必须为这个产品指定序列号"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -157,7 +157,7 @@ msgstr "拉式流"
 #. module: stock_location
 #: sql_constraint:product.product:0
 msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "错误!结束日期不能早于开始日期。"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_move
@@ -188,7 +188,7 @@ msgstr "按库存生产"
 #: code:addons/stock_location/procurement_pull.py:118
 #, python-format
 msgid "Pulled from another location."
-msgstr ""
+msgstr "从其它库位拉动"
 
 #. module: stock_location
 #: field:product.pulled.flow,partner_address_id:0
@@ -230,7 +230,7 @@ msgstr "这些规则确定了产品在整个库位树的正确路径。"
 #. module: stock_location
 #: constraint:stock.move:0
 msgid "You cannot move products from or to a location of the type view."
-msgstr ""
+msgstr "你不能从视图类型的库位移动"
 
 #. module: stock_location
 #: selection:stock.location.path,auto:0
@@ -267,7 +267,7 @@ msgstr "需要提供目标库位"
 #. module: stock_location
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product."
-msgstr ""
+msgstr "您企图为不一样的产品创建批号"
 
 #. module: stock_location
 #: field:stock.location.path,product_id:0
@@ -345,7 +345,7 @@ msgstr "收货"
 msgid ""
 "You provided an invalid \"EAN13 Barcode\" reference. You may use the "
 "\"Internal Reference\" field instead."
-msgstr ""
+msgstr "你提供了一个错误的  \"EAN13 条码\" 编号。你可能要用 “编号”字段替代。"
 
 #. module: stock_location
 #: view:product.product:0
diff --git a/addons/stock_no_autopicking/i18n/zh_CN.po b/addons/stock_no_autopicking/i18n/zh_CN.po
index 05c19c53718..39dd650e475 100644
--- a/addons/stock_no_autopicking/i18n/zh_CN.po
+++ b/addons/stock_no_autopicking/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-23 16:02+0000\n"
+"PO-Revision-Date: 2012-11-27 14:21+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:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
@@ -29,7 +29,7 @@ msgstr "生产单"
 #. module: stock_no_autopicking
 #: sql_constraint:product.product:0
 msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "错误!结束日期不能早于开始日期。"
 
 #. module: stock_no_autopicking
 #: field:product.product,auto_pick:0
@@ -56,7 +56,7 @@ msgstr "订单数量不能是负数或者0！"
 msgid ""
 "You provided an invalid \"EAN13 Barcode\" reference. You may use the "
 "\"Internal Reference\" field instead."
-msgstr ""
+msgstr "你提供了一个错误的  \"EAN13 条码\" 编号。你可能要用 “编号”字段替代。"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "无效的视图结构xml文件"
diff --git a/addons/stock_planning/i18n/zh_CN.po b/addons/stock_planning/i18n/zh_CN.po
new file mode 100644
index 00000000000..2f27d66ad8a
--- /dev/null
+++ b/addons/stock_planning/i18n/zh_CN.po
@@ -0,0 +1,1664 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-11-27 16:40+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-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
+#, python-format
+msgid ""
+"No forecasts for selected period or no products in selected category !"
+msgstr "选定的周期没预计,选定的分类没产品!"
+
+#. module: stock_planning
+#: help:stock.planning,stock_only:0
+msgid ""
+"Check to calculate stock location of selected warehouse only. If not "
+"selected calculation is made for input, stock and output location of "
+"warehouse."
+msgstr "如果没选定仓库的入仓,库存,出仓的计算方式,检查选定仓库的库位."
+
+#. module: stock_planning
+#: field:stock.planning,maximum_op:0
+msgid "Maximum Rule"
+msgstr "最大库存规则"
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Group By..."
+msgstr "分组..."
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_amt:0
+msgid ""
+"Forecast value which will be converted to Product Quantity according to "
+"prices."
+msgstr "估值将为价格乘于产品数量."
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:626
+#: code:addons/stock_planning/stock_planning.py:670
+#, python-format
+msgid "Incoming Left must be greater than 0 !"
+msgstr "即将入库必须大于0!"
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_before:0
+msgid ""
+"Planned Out in periods before calculated. Between start date of current "
+"period and one day before start of calculated period."
+msgstr "在计算周期前的计划出库,在本周期开始时间和计算周期前的某天."
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,warehouse_id:0
+msgid ""
+"Warehouse which forecasts will concern. If during stock planning you will "
+"need sales forecast for all warehouses choose any warehouse now."
+msgstr "关注仓库的预计.如果在库存计划期间您需要在所有仓库中选择一个当前仓库做销售预计."
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_left:0
+msgid "Expected Out"
+msgstr "预计出仓"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid " "
+msgstr " "
+
+#. module: stock_planning
+#: field:stock.planning,incoming_left:0
+msgid "Incoming Left"
+msgstr "即将入库"
+
+#. module: stock_planning
+#: view:stock.sale.forecast.createlines:0
+msgid "Create Forecasts Lines"
+msgstr "创建预计明细"
+
+#. module: stock_planning
+#: help:stock.planning,outgoing:0
+msgid "Quantity of all confirmed outgoing moves in calculated Period."
+msgstr "确认所有计算周期内的出仓调拨数量."
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Daily Periods"
+msgstr "创建周期"
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,company_id:0
+#: field:stock.planning.createlines,company_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,company_id:0
+#: field:stock.sale.forecast.createlines,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: stock_planning
+#: help:stock.planning,warehouse_forecast:0
+msgid ""
+"All sales forecasts for selected Warehouse of selected Product during "
+"selected Period."
+msgstr "在选定周期指定的仓库里其选择的产品的所有销售预计."
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Minimum Stock Rule Indicators"
+msgstr "最小库存规则标识"
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,period_id:0
+msgid "Period which forecasts will concern."
+msgstr "关注这周期的预计"
+
+#. module: stock_planning
+#: field:stock.planning,stock_only:0
+msgid "Stock Location Only"
+msgstr "只有库存库位"
+
+#. module: stock_planning
+#: help:stock.planning,already_out:0
+msgid ""
+"Quantity which is already dispatched out of this warehouse in current period."
+msgstr "本期这仓库已派件出去的数量"
+
+#. module: stock_planning
+#: field:stock.planning,incoming:0
+msgid "Confirmed In"
+msgstr "已确认的入库"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Current Period Situation"
+msgstr "本期状况"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
+msgid ""
+"This wizard helps with the creation of stock planning periods. These periods "
+"are independent of financial periods. If you need periods other than day-, "
+"week- or month-based, you may also add then manually."
+msgstr "这个向导帮助建立库存计划周期。这些周期独立于财务会计周期.如果你需要除了日、星期或者月份基础的周期，你可以手工添加."
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Monthly Periods"
+msgstr "创建月度"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period_createlines
+msgid "stock.period.createlines"
+msgstr "stock.period.createlines"
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_before:0
+msgid "Planned Out Before"
+msgstr "之前的计划出库"
+
+#. module: stock_planning
+#: field:stock.planning.createlines,forecasted_products:0
+msgid "All Products with Forecast"
+msgstr "所有产品的预计"
+
+#. module: stock_planning
+#: help:stock.planning,maximum_op:0
+msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
+msgstr "为仓库在最小库存规则设置最大数量"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Periods :"
+msgstr "周期:"
+
+#. module: stock_planning
+#: help:stock.planning,procure_to_stock:0
+msgid ""
+"Check to make procurement to stock location of selected warehouse. If not "
+"selected procurement will be made into input location of warehouse."
+msgstr "为了 在选定仓库的库存库位生成需求，选中。如果不选择，需求将被产品到仓库的输入库位。"
+
+#. module: stock_planning
+#: help:stock.planning,already_in:0
+msgid ""
+"Quantity which is already picked up to this warehouse in current period."
+msgstr "本期这仓库已装箱的数量."
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
+#, python-format
+msgid "No products in selected category !"
+msgstr "在选定的分类没产品!"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Stock and Sales Forecast"
+msgstr "库存和销售预计"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast
+msgid "stock.sale.forecast"
+msgstr "stock.sale.forecast"
+
+#. module: stock_planning
+#: field:stock.planning,to_procure:0
+msgid "Planned In"
+msgstr "计划入库"
+
+#. module: stock_planning
+#: field:stock.planning,stock_simulation:0
+msgid "Stock Simulation"
+msgstr "库存模拟"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning_createlines
+msgid "stock.planning.createlines"
+msgstr "stock.planning.createlines"
+
+#. module: stock_planning
+#: help:stock.planning,incoming_before:0
+msgid ""
+"Confirmed incoming in periods before calculated (Including Already In). "
+"Between start date of current period and one day before start of calculated "
+"period."
+msgstr "确认计算周期前即将入库(已包括入库).在本期开始日期和在计算周期开始前的某天."
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Search  Sales Forecast"
+msgstr "搜索销售预计"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_user:0
+msgid "This User Period5"
+msgstr "用户周期 5"
+
+#. module: stock_planning
+#: help:stock.planning,history:0
+msgid "History of procurement or internal supply of this planning line."
+msgstr "需求日志或计划明细里的内部供求"
+
+#. module: stock_planning
+#: help:stock.planning,company_forecast:0
+msgid ""
+"All sales forecasts for whole company (for all Warehouses) of selected "
+"Product during selected Period."
+msgstr "公司在选定的周期其指定产品的所有的预计销售(所有仓库)."
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_user:0
+msgid "This User Period1"
+msgstr "用户周期 1"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_user:0
+msgid "This User Period3"
+msgstr "用户周期 3"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Stock Planning"
+msgstr "库存计划"
+
+#. module: stock_planning
+#: field:stock.planning,minimum_op:0
+msgid "Minimum Rule"
+msgstr "最少库存规则"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Procure Incoming Left"
+msgstr "接收(即将入库)入库"
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Create"
+msgstr "创建"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
+#: view:stock.planning:0
+msgid "Master Procurement Schedule"
+msgstr "主需求日程表"
+
+#. module: stock_planning
+#: field:stock.planning,line_time:0
+msgid "Past/Future"
+msgstr "过去/未来"
+
+#. module: stock_planning
+#: view:stock.period:0
+#: field:stock.period,state:0
+#: field:stock.planning,state:0
+#: field:stock.sale.forecast,state:0
+msgid "State"
+msgstr "状态"
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category of products which created forecasts will concern."
+msgstr "关注对这产品分类创建的产品预计"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period
+msgid "stock period"
+msgstr "库存周期"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
+msgid "stock.sale.forecast.createlines"
+msgstr "stock.sale.forecast.createlines"
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_id:0
+#: field:stock.planning.createlines,warehouse_id:0
+#: field:stock.sale.forecast,warehouse_id:0
+#: field:stock.sale.forecast.createlines,warehouse_id:0
+msgid "Warehouse"
+msgstr "仓库"
+
+#. module: stock_planning
+#: help:stock.planning,stock_simulation:0
+msgid ""
+"Stock simulation at the end of selected Period.\n"
+" For current period it is: \n"
+"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
+"For periods ahead it is: \n"
+"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
+"In."
+msgstr ""
+"在选定周期结束时库存的模拟\n"
+"    对本期它是: 初始库存 - 已出库 + 已进库 - 预计出库 + 即将入库\n"
+"    对未来周期它是: 初始库存 - 之前的计划出库 +之前的即将入库 - 计划出库 + 计划入库"
+
+#. module: stock_planning
+#: help:stock.sale.forecast,analyze_company:0
+msgid "Check this box to see the sales for whole company."
+msgstr "勾选,查看公司的销售"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Department :"
+msgstr "每个部门:"
+
+#. module: stock_planning
+#: field:stock.planning,incoming_before:0
+msgid "Incoming Before"
+msgstr "之前的入库"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:641
+#, python-format
+msgid ""
+" Procurement created by MPS for user: %s   Creation Date: %s                 "
+"                        \n"
+" For period: %s                                         \n"
+" according to state:                                         \n"
+" Warehouse Forecast: %s                                         \n"
+" Initial Stock: %s                                         \n"
+" Planned Out: %s    Planned In: %s                                         \n"
+" Already Out: %s    Already In: %s                                         \n"
+" Confirmed Out: %s    Confirmed In: %s                                       "
+"  \n"
+" Planned Out Before: %s    Confirmed In Before: %s                           "
+"              \n"
+" Expected Out: %s    Incoming Left: %s                                       "
+"  \n"
+" Stock Simulation: %s    Minimum stock: %s"
+msgstr ""
+" MPS  创建的采购，用户: %s ， 创建日期 : %s .                                       \n"
+"周期: %s :      \n"
+"                                                                         \n"
+"根据状态：                                    \n"
+"仓库预计: %s                                     \n"
+"初始库存: %s\n"
+"计划出库: %s , 计划入库: %s .\n"
+"已出库: %s , 已入库: %s .\n"
+"确认出库: %s , 确认入库: %s .\n"
+"计划前出库: %s , 计划前入库: %s .\n"
+"预计出库: %s , 即将入库: %s .\n"
+"库存模拟: %s , 最少库存: %s ."
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:626
+#: code:addons/stock_planning/stock_planning.py:670
+#: code:addons/stock_planning/stock_planning.py:672
+#: code:addons/stock_planning/stock_planning.py:674
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
+#, python-format
+msgid "Error !"
+msgstr "错误！"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_user_id:0
+msgid "This User"
+msgstr "该用户"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecasts"
+msgstr "预计"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Supply from Another Warehouse"
+msgstr "从其它仓库提供"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculate Planning"
+msgstr "计算计划"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:146
+#, python-format
+msgid "Invalid action !"
+msgstr "无效的动作！"
+
+#. module: stock_planning
+#: help:stock.planning,stock_start:0
+msgid "Stock quantity one day before current period."
+msgstr "在本期前一天的库存数量."
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Procurement history"
+msgstr "需求历史"
+
+#. module: stock_planning
+#: help:stock.planning,product_uom:0
+msgid ""
+"Unit of Measure used to show the quantities of stock calculation.You can use "
+"units from default category or from second category (UoS category)."
+msgstr "用作显示库存数量的单位。你能从默认或者第二个类别（销售单位目录）使用单位。"
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Weekly Periods"
+msgstr "创建周周期"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
+msgid ""
+"Stock periods are used for stock planning. Stock periods are independent of "
+"account periods. You can use wizard for creating periods and review them "
+"here."
+msgstr "库存周期用在库存计划。库存周期独立于财务会计周期。你能用向导来创建周期，并且在这里 复审。"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculated Period Simulation"
+msgstr "计算出的周期模拟"
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_user:0
+msgid "This User Period4"
+msgstr "用户周期 4"
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Stock and Sales Period"
+msgstr "库存和销售周期"
+
+#. module: stock_planning
+#: field:stock.planning,company_forecast:0
+msgid "Company Forecast"
+msgstr "公司预计"
+
+#. module: stock_planning
+#: help:stock.planning,minimum_op:0
+msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
+msgstr "为仓库在最小库存规则设置最小数量"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per User :"
+msgstr "每个用户:"
+
+#. module: stock_planning
+#: help:stock.planning.createlines,warehouse_id:0
+msgid "Warehouse which planning will concern."
+msgstr "关注的仓库计划."
+
+#. module: stock_planning
+#: field:stock.sale.forecast,user_id:0
+msgid "Created/Validated by"
+msgstr "创建/审核"
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_forecast:0
+msgid "Warehouse Forecast"
+msgstr "仓库预计"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:674
+#, python-format
+msgid ""
+"You must specify a Source Warehouse different than calculated (destination) "
+"Warehouse !"
+msgstr "您必须指定源仓库不同于计算的(目标)仓库!"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:146
+#, python-format
+msgid "Cannot delete a validated sales forecast!"
+msgstr "不能删除已经核准的销售预测"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_company:0
+msgid "This Company Period5"
+msgstr "公司周期 5"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uom:0
+msgid "Product UoM"
+msgstr "产品计量单位"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_company:0
+msgid "This Company Period1"
+msgstr "公司的会计周期"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_company:0
+msgid "This Company Period2"
+msgstr "公司周期 2"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_company:0
+msgid "This Company Period3"
+msgstr "公司周期 3"
+
+#. module: stock_planning
+#: field:stock.period,date_start:0
+#: field:stock.period.createlines,date_start:0
+msgid "Start Date"
+msgstr "开始日期"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_user:0
+msgid "This User Period2"
+msgstr "用户周期 2"
+
+#. module: stock_planning
+#: field:stock.planning,confirmed_forecasts_only:0
+msgid "Validated Forecasts"
+msgstr "审核预计"
+
+#. module: stock_planning
+#: help:stock.planning.createlines,product_categ_id:0
+msgid ""
+"Planning will be created for products from Product Category selected by this "
+"field. This field is ignored when you check \"All Forecasted Product\" box."
+msgstr "计划将在选定的产品分类里创建.当您勾选\"所有产品预计\"这字段将被忽略."
+
+#. module: stock_planning
+#: field:stock.planning,planned_outgoing:0
+msgid "Planned Out"
+msgstr "计划出仓"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_qty:0
+msgid "Forecast Quantity"
+msgstr "预测数量"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecast"
+msgstr "预计"
+
+#. module: stock_planning
+#: selection:stock.period,state:0
+#: selection:stock.planning,state:0
+#: selection:stock.sale.forecast,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Closed"
+msgstr "已关闭"
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Warehouse "
+msgstr "仓库 "
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_uom:0
+msgid ""
+"Unit of Measure used to show the quantities of stock calculation.You can use "
+"units form default category or from second category (UoS category)."
+msgstr "用作显示库存数量的单位。你能从默认或者第二个类别（销售单位目录）使用单位。"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Planning and Situation for Calculated Period"
+msgstr "计算周期的计划和状况"
+
+#. module: stock_planning
+#: help:stock.planning,planned_outgoing:0
+msgid ""
+"Enter planned outgoing quantity from selected Warehouse during the selected "
+"Period of selected Product. To plan this value look at Confirmed Out or "
+"Sales Forecasts. This value should be equal or greater than Confirmed Out."
+msgstr "在选择的产品选定的周期内输入指定仓库的计划出库数量.计划值看作确认的出库或销售预计.该值应大于或等于确认的出库."
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Current Periods"
+msgstr "当前周期"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Internal Supply"
+msgstr "内部提供"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:724
+#, python-format
+msgid "%s Pick List %s (%s,  %s) %s %s \n"
+msgstr "%s 包装列表 %s (%s, %s) %s %s \n"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
+msgid "Create Sales Forecasts"
+msgstr "创建销售预计"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_id:0
+msgid "Period4"
+msgstr "周期 4"
+
+#. module: stock_planning
+#: field:stock.period,name:0
+#: field:stock.period.createlines,name:0
+msgid "Period Name"
+msgstr "周期名称"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_id:0
+msgid "Period2"
+msgstr "周期 2"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_id:0
+msgid "Period3"
+msgstr "周期 3"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_id:0
+msgid "Period1"
+msgstr "周期 1"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
+msgid ""
+"This wizard helps create MPS planning lines for a given selected period and "
+"warehouse, so you don't have to create them one by one. The wizard doesn't "
+"duplicate lines if they already exist for this selection."
+msgstr ""
+"MPS  创建的采购，用户: %s ， 创建日期 : %s .                                              "
+" \r\n"
+"周期: %s : \r\n"
+"根据状态：%s\r\n"
+"仓库预计: %s\r\n"
+"初始库存: %s\r\n"
+"计划出库: %s , 计划入库: %s .\r\n"
+"已出库: %s , 已入库: %s .\r\n"
+"确认出库: %s , 确认入库: %s .\r\n"
+"计划前出库: %s , 计划前入库: %s .\r\n"
+"预计出库: %s , 即将入库: %s .\r\n"
+"库存模拟: %s , 最少库存: %s ."
+
+#. module: stock_planning
+#: field:stock.planning,outgoing:0
+msgid "Confirmed Out"
+msgstr "已确认的出库"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
+#: view:stock.planning.createlines:0
+msgid "Create Stock Planning Lines"
+msgstr "创建库存计划明细"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "General Info"
+msgstr "一般信息"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
+msgid "Sales Forecast"
+msgstr "销售预计"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
+msgid "This Warehouse Period1"
+msgstr "仓库周期 1"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Sales History"
+msgstr "销售日志"
+
+#. module: stock_planning
+#: field:stock.planning,supply_warehouse_id:0
+msgid "Source Warehouse"
+msgstr "源仓库"
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_qty:0
+msgid "Forecast Product quantity."
+msgstr "预测产品数量"
+
+#. module: stock_planning
+#: field:stock.planning,stock_supply_location:0
+msgid "Stock Supply Location"
+msgstr "库存存货库位"
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_stop:0
+msgid "Ending date for planning period."
+msgstr "计划周期的结束日期."
+
+#. module: stock_planning
+#: help:stock.planning.createlines,forecasted_products:0
+msgid ""
+"Check this box to create planning for all products having any forecast for "
+"selected Warehouse and Period. Product Category field will be ignored."
+msgstr "勾选这选项将为选定的仓库和周期计划所有产品的预计.产品分类字段将被忽略."
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:632
+#: code:addons/stock_planning/stock_planning.py:678
+#: code:addons/stock_planning/stock_planning.py:702
+#, python-format
+msgid "MPS(%s) %s"
+msgstr "主生产计划(%s) %s"
+
+#. module: stock_planning
+#: field:stock.planning,already_in:0
+msgid "Already In"
+msgstr "已入库"
+
+#. module: stock_planning
+#: field:stock.planning,product_uom_categ:0
+#: field:stock.planning,product_uos_categ:0
+#: field:stock.sale.forecast,product_uom_categ:0
+msgid "Product UoM Category"
+msgstr "产品计量单位类别"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
+msgid ""
+"This quantity sales forecast is an indication for Stock Planner to make "
+"procurement manually or to complement automatic procurement. You can use "
+"manual procurement with this forecast when some periods are exceptional for "
+"usual minimum stock rules."
+msgstr "销售预测数量只是为了库存计划进行手工采购，或者完成自动采购。当有些周期使用最小库存规则发生意外时，你能用这些预测进行手工采购 。"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
+msgid ""
+"The Master Procurement Schedule can be the main driver for warehouse "
+"replenishment, or can complement the automatic MRP scheduling (minimum stock "
+"rules, etc.).\n"
+"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
+"quantities of a given product for a given Stock Period in a given Warehouse, "
+"based on the current and future stock levels,\n"
+"as well as the planned stock moves. The forecast quantities can be altered "
+"manually, and when satisfied with resulting (simulated) Stock quantity, you "
+"can trigger the procurement of what is missing to reach your desired "
+"quantities"
+msgstr ""
+"这MPS 主要驱动仓库的补给，或者完成自动MRP排程（最小库存规则等）\n"
+"基于当前和预测的库存水平，每个MPS 行给你一个预算 给定产品、给定库存周期在给定的仓库的入库和出库数量。\n"
+" 除了计划的库存调拨。\n"
+"预测数量能手工改变。并且 产生（模拟）满足库存数量，你能触发这个采购已达到你要的数量。"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:685
+#, python-format
+msgid ""
+"Pick created from MPS by user: %s   Creation Date: %s                        "
+"             \n"
+"For period: %s   according to state:                                     \n"
+" Warehouse Forecast: %s                                     \n"
+" Initial Stock: %s                                     \n"
+" Planned Out: %s  Planned In: %s                                     \n"
+" Already Out: %s  Already In: %s                                     \n"
+" Confirmed Out: %s   Confirmed In: %s                                     \n"
+" Planned Out Before: %s   Confirmed In Before: %s                            "
+"         \n"
+" Expected Out: %s   Incoming Left: %s                                     \n"
+" Stock Simulation: %s   Minimum stock: %s "
+msgstr ""
+"用户: %s 主生产计划创建的包装 . 创建日期 : %s .\n"
+"周期: %s 的状态:\n"
+"仓库预计: %s\n"
+"初始库存: %s\n"
+"计划出库: %s , 计划入库: %s .\n"
+"已出库: %s , 已入库: %s .\n"
+"确认出库: %s , 确认入库: %s .\n"
+"计划前出库: %s , 计划前入库: %s .\n"
+"预计出库: %s , 即将入库: %s .\n"
+"库存模拟: %s , 最少库存: %s . "
+
+#. module: stock_planning
+#: field:stock.planning,period_id:0
+#: field:stock.planning.createlines,period_id:0
+#: field:stock.sale.forecast,period_id:0
+#: field:stock.sale.forecast.createlines,period_id:0
+msgid "Period"
+msgstr "周期"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uos_categ:0
+msgid "Product UoS Category"
+msgstr "产品销售单位类别"
+
+#. module: stock_planning
+#: field:stock.planning,active_uom:0
+#: field:stock.sale.forecast,active_uom:0
+msgid "Active UoM"
+msgstr "有效的计量单位"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Search Stock Planning"
+msgstr "查询库存计划"
+
+#. module: stock_planning
+#: field:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy Last Forecast"
+msgstr "复制最近预计"
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_id:0
+msgid "Shows which product this forecast concerns."
+msgstr "显示关注的哪个产品的预计"
+
+#. module: stock_planning
+#: selection:stock.planning,state:0
+msgid "Done"
+msgstr "完成"
+
+#. module: stock_planning
+#: field:stock.period.createlines,period_ids:0
+msgid "Periods"
+msgstr "会计期间"
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
+msgid "Create Stock Periods"
+msgstr "建立库存会计期间"
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Close"
+msgstr "结束"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+#: selection:stock.sale.forecast,state:0
+msgid "Validated"
+msgstr "已审核"
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+msgid "Open"
+msgstr "开始"
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy quantities from last Stock and Sale Forecast."
+msgstr "复制最近库存和销售估计的数量."
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_dept:0
+msgid "This Dept Period1"
+msgstr "部门周期 1"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_dept:0
+msgid "This Dept Period3"
+msgstr "部门周期 3"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_dept:0
+msgid "This Dept Period2"
+msgstr "部门周期 2"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_dept:0
+msgid "This Dept Period5"
+msgstr "部门周期 5"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_dept:0
+msgid "This Dept Period4"
+msgstr "部门周期 4"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
+msgid "This Warehouse Period2"
+msgstr "仓库周期 2"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
+msgid "This Warehouse Period3"
+msgstr "仓库周期 3"
+
+#. module: stock_planning
+#: help:stock.planning,stock_supply_location:0
+msgid ""
+"Check to supply from Stock location of Supply Warehouse. If not checked "
+"supply will be made from Output location of Supply Warehouse. Used in "
+"'Supply from Another Warehouse' with Supply Warehouse."
+msgstr "检查补给仓库库存库位的补给。如果没有选择，不给将从补给仓库出库库位产生。 随着供应仓库用在'从另一个仓库供应'。"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,create_uid:0
+msgid "Responsible"
+msgstr "负责人"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Default UOM"
+msgstr "默认计量单位"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
+msgid "This Warehouse Period4"
+msgstr "仓库周期 4"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
+msgid "This Warehouse Period5"
+msgstr "仓库周期 5"
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Current"
+msgstr "当前的"
+
+#. module: stock_planning
+#: help:stock.planning,supply_warehouse_id:0
+msgid ""
+"Warehouse used as source in supply pick move created by 'Supply from Another "
+"Warehouse'."
+msgstr "供应分拣移动的源仓库 通过 \"另一个仓库供应\"创建。"
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning
+msgid "stock.planning"
+msgstr "stock.planning"
+
+#. module: stock_planning
+#: help:stock.sale.forecast,warehouse_id:0
+msgid ""
+"Shows which warehouse this forecast concerns. If during stock planning you "
+"will need sales forecast for all warehouses choose any warehouse now."
+msgstr "显示关注的仓库的预计.如果在库存计划期间,您将需要在所有的仓库中选择一个做销售预计"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:661
+#, python-format
+msgid "%s Procurement (%s,  %s) %s %s \n"
+msgstr "%s 需求(%s, %s) %s %s \n"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyze_company:0
+msgid "Per Company"
+msgstr "每个公司"
+
+#. module: stock_planning
+#: help:stock.planning,to_procure:0
+msgid ""
+"Enter quantity which (by your plan) should come in. Change this value and "
+"observe Stock simulation. This value should be equal or greater than "
+"Confirmed In."
+msgstr "输入数量(您的计划)入库.修改该值和观察库存模拟.该值将大于等于确认的入库."
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_company:0
+msgid "This Company Period4"
+msgstr "公司周期 4"
+
+#. module: stock_planning
+#: help:stock.planning.createlines,period_id:0
+msgid "Period which planning will concern."
+msgstr "关注周期的计划"
+
+#. module: stock_planning
+#: field:stock.planning,already_out:0
+msgid "Already Out"
+msgstr "已出库"
+
+#. module: stock_planning
+#: help:stock.planning,product_id:0
+msgid "Product which this planning is created for."
+msgstr "创建产品的计划"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Warehouse :"
+msgstr "每个仓库:"
+
+#. module: stock_planning
+#: field:stock.planning,history:0
+msgid "Procurement History"
+msgstr "需求日志"
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_start:0
+msgid "Starting date for planning period."
+msgstr "计划周期的开始日期."
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
+#: view:stock.period:0
+#: view:stock.period.createlines:0
+msgid "Stock Periods"
+msgstr "库存周期"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Stock"
+msgstr "库存"
+
+#. module: stock_planning
+#: help:stock.planning,incoming:0
+msgid "Quantity of all confirmed incoming moves in calculated Period."
+msgstr "在计算周期里已确认入库的数量."
+
+#. module: stock_planning
+#: field:stock.period,date_stop:0
+#: field:stock.period.createlines,date_stop:0
+msgid "End Date"
+msgstr "结束日期"
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "No Requisition"
+msgstr "没请求"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,name:0
+msgid "Name"
+msgstr "名称"
+
+#. module: stock_planning
+#: help:stock.sale.forecast,period_id:0
+msgid "Shows which period this forecast concerns."
+msgstr "显示关注周期的预计"
+
+#. module: stock_planning
+#: field:stock.planning,product_uom:0
+msgid "UoM"
+msgstr "计量单位"
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Closed Periods"
+msgstr "关闭的会计期间"
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,product_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,product_id:0
+msgid "Product"
+msgstr "产品"
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
+#: view:stock.sale.forecast:0
+msgid "Sales Forecasts"
+msgstr "销售预计"
+
+#. module: stock_planning
+#: field:stock.planning.createlines,product_categ_id:0
+#: field:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category"
+msgstr "产品分类"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:672
+#, python-format
+msgid "You must specify a Source Warehouse !"
+msgstr "您必须要指定源仓库"
+
+#. module: stock_planning
+#: field:stock.planning,procure_to_stock:0
+msgid "Procure To Stock Location"
+msgstr "库存库位的产品"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Approve"
+msgstr "审批"
+
+#. module: stock_planning
+#: help:stock.planning,period_id:0
+msgid ""
+"Period for this planning. Requisition will be created for beginning of the "
+"period."
+msgstr "这计划的周期.在周期开始创建"
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:631
+#, python-format
+msgid "MPS planning for %s"
+msgstr "%s的 MPS 计划"
+
+#. module: stock_planning
+#: field:stock.planning,stock_start:0
+msgid "Initial Stock"
+msgstr "初始库存"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_amt:0
+msgid "Product Amount"
+msgstr "产品金额"
+
+#. module: stock_planning
+#: help:stock.planning,confirmed_forecasts_only:0
+msgid ""
+"Check to take validated forecasts only. If not checked system takes "
+"validated and draft forecasts."
+msgstr "选择要去审核的预计.如果不选定系统去审核和对预计做草稿"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_id:0
+msgid "Period5"
+msgstr "周期 5"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_warehouse_id:0
+msgid "This Warehouse"
+msgstr "仓库"
+
+#. module: stock_planning
+#: help:stock.sale.forecast,user_id:0
+msgid "Shows who created this forecast, or who validated."
+msgstr "显示谁创建这预计或谁去审核"
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_team_id:0
+msgid "Sales Team"
+msgstr "销售团队"
+
+#. module: stock_planning
+#: help:stock.planning,incoming_left:0
+msgid ""
+"Quantity left to Planned incoming quantity. This is calculated difference "
+"between Planned In and Confirmed In. For current period Already In is also "
+"calculated. This value is used to create procurement for lacking quantity."
+msgstr "即将入库的数量是在计划入库和确认入库间的差,该值用于创建需求缺少的数量."
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_left:0
+msgid ""
+"Quantity expected to go out in selected period besides Confirmed Out. As a "
+"difference between Planned Out and Confirmed Out. For current period Already "
+"Out is also calculated"
+msgstr "选定周期内计划出库数量除了已经被确认的。作为计划出库和确认出库之间的区别。当前期间已经出库的另外计算。"
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Calculate Sales History"
+msgstr "计算销售日志"
+
+#. module: stock_planning
+#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
+msgid ""
+"This wizard helps create many forecast lines at once. After creating them "
+"you only have to fill in the forecast quantities. The wizard doesn't "
+"duplicate the line when another one exist for the same selection."
+msgstr "这个向导帮你立即创建多个预测行。在创建后，你必须填充预测数量。这向导不会复制已经存在的相同选择。"
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ " Initial Stock: "
+#~ msgstr ""
+#~ "\n"
+#~ " 初始仓库: "
+
+#~ msgid "Requisition history"
+#~ msgstr "请求日志"
+
+#~ msgid ""
+#~ "Warehouse used as source in supply pick move created by 'Supply from Another "
+#~ "Warhouse'."
+#~ msgstr "仓库作为调拨的起点."
+
+#~ msgid "Create Stock and Sales Periods"
+#~ msgstr "创建库存和销售周期"
+
+#~ msgid "This Department"
+#~ msgstr "这部门"
+
+#, python-format
+#~ msgid "  Creation Date: "
+#~ msgstr "  创建日期: "
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ " Confirmed Out: "
+#~ msgstr ""
+#~ "\n"
+#~ " 确认出库: "
+
+#~ msgid "Creates planning lines for selected period and warehouse."
+#~ msgstr "选定周期和仓库创建计划明细."
+
+#~ msgid "Note: Doesn't duplicate existing lines created by you."
+#~ msgstr "注: 您不能重复现有的明细."
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ " Already Out: "
+#~ msgstr ""
+#~ "\n"
+#~ " 已出库: "
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ " Expected Out: "
+#~ msgstr ""
+#~ "\n"
+#~ " 预计出仓 : "
+
+#, python-format
+#~ msgid "    Already In: "
+#~ msgstr "    已进库: "
+
+#, python-format
+#~ msgid "Requisition ("
+#~ msgstr "请求("
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ " Planned Out: "
+#~ msgstr ""
+#~ "\n"
+#~ " 计划出库: "
+
+#~ msgid "Creates forecast lines for selected warehouse and period."
+#~ msgstr "对选定的仓库和周期创建预计明细."
+
+#, python-format
+#~ msgid "    Minimum stock: "
+#~ msgstr "    最少库存: "
+
+#~ msgid "Sales history"
+#~ msgstr "销售日志"
+
+#~ msgid "Forecasted quantity."
+#~ msgstr "预计数量"
+
+#~ msgid "Product Quantity"
+#~ msgstr "产品数量"
+
+#, python-format
+#~ msgid " according to state:"
+#~ msgstr " 根据状态:"
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ " Warehouse Forecast: "
+#~ msgstr ""
+#~ "\n"
+#~ " 仓库预计: "
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ " Stock Simulation: "
+#~ msgstr ""
+#~ "\n"
+#~ " 仓库模拟: "
+
+#, python-format
+#~ msgid "    Planned In: "
+#~ msgstr "    计划入库 "
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ "For period: "
+#~ msgstr ""
+#~ "\n"
+#~ "周期: "
+
+#, python-format
+#~ msgid "MPS("
+#~ msgstr "主生产计划("
+
+#~ msgid "Stock and Sales Planning Periods"
+#~ msgstr "库存和销售计划周期"
+
+#~ msgid "Stock and Sales Periods"
+#~ msgstr "库存和销售周期"
+
+#~ msgid "This Copmany Period1"
+#~ msgstr "公司周期 1"
+
+#, python-format
+#~ msgid "    Incoming Left: "
+#~ msgstr "    即将入库 "
+
+#, python-format
+#~ msgid "Manual planning for "
+#~ msgstr "手动计划 "
+
+#, python-format
+#~ msgid "Procurement created in MPS by user: "
+#~ msgstr "在MPS(主生产计划)由用户创建需求： "
+
+#, python-format
+#~ msgid "Pick created from MPS by user: "
+#~ msgstr "在MPS(主生产计划)由用户创建的装箱单： "
+
+#~ msgid ""
+#~ "\n"
+#~ "This module is based on original OpenERP SA module stock_planning version "
+#~ "1.0 of the same name Master Procurement Schedule.\n"
+#~ "\n"
+#~ "Purpose of MPS is to allow create a manual procurement (requisition) apart "
+#~ "of MRP scheduler (which works automatically on minimum stock rules).\n"
+#~ "\n"
+#~ "Terms used in the module:\n"
+#~ "- Stock and Sales Period - is the time (between Start Date and End Date) for "
+#~ "which you plan Stock and Sales Forecast and make Procurement Planning. \n"
+#~ "- Stock and Sales Forecast - is the quantity of products you plan to sell in "
+#~ "the Period.\n"
+#~ "- Stock Planning - is the quantity of products you plan to purchase or "
+#~ "produce for the Period.\n"
+#~ "\n"
+#~ "Because we have another module sale_forecast which uses terms \"Sales "
+#~ "Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
+#~ "Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
+#~ "values. \n"
+#~ "\n"
+#~ "Activity with this module is divided to three steps:\n"
+#~ "- Creating Periods. Mandatory step.\n"
+#~ "- Creating Sale Forecasts and entering quantities to them. Optional step but "
+#~ "useful for further planning.\n"
+#~ "- Creating Planning lines, entering quantities to them and making "
+#~ "Procurement. Making procurement is the final step for the Period.\n"
+#~ "\n"
+#~ "Periods\n"
+#~ "=======\n"
+#~ "You have two menu items for Periods in \"Sales Management - Configuration\". "
+#~ "There are:\n"
+#~ "- \"Create Sales Periods\" - Which automates creating daily, weekly or "
+#~ "monthly periods.\n"
+#~ "- \"Stock and sales Periods\" - Which allows to create any type of periods, "
+#~ "change the dates and change the State of period.\n"
+#~ "\n"
+#~ "Creating periods is the first step you have to do to use modules features. "
+#~ "You can create custom periods using \"New\" button in \"Stock and Sales "
+#~ "Periods\" form or view but it is recommended to use automating tool.\n"
+#~ "\n"
+#~ "Remarks:\n"
+#~ "- These periods (officially Stock and Sales Periods) are separated of "
+#~ "Financial or other periods in the system.\n"
+#~ "- Periods are not assigned to companies (when you use multicompany feature "
+#~ "at all). Module suppose that you use the same periods across companies. If "
+#~ "you wish to use different periods for different companies define them as you "
+#~ "wish (they can overlap). Later on in this text will be indications how to "
+#~ "use such periods.\n"
+#~ "- When periods are created automatically their start and finish dates are "
+#~ "with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
+#~ "periods they will have start date 31.01.2010 00:00:00 and end date "
+#~ "31.01.2010 23:59:00. It works only in automatic creation of periods. When "
+#~ "you create periods manually you have to take care about hours because you "
+#~ "can have incorrect values form sales or stock. \n"
+#~ "- If you use overlapping periods for the same product, warehouse and company "
+#~ "results can be unpredictable.\n"
+#~ "- If current date doesn't belong to any period or you have holes between "
+#~ "periods results can be unpredictable.\n"
+#~ "\n"
+#~ "Sales Forecasts\n"
+#~ "===============\n"
+#~ "You have few menus for Sales forecast in \"Sales Management - Sales "
+#~ "Forecasts\".\n"
+#~ "- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
+#~ "forecasts lines according to some parameters.\n"
+#~ "- \"Sales Forecasts\" - few menus for working with forecasts lists and "
+#~ "forms.\n"
+#~ "\n"
+#~ "Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
+#~ "products from selected Category, for selected Period and for selected "
+#~ "Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
+#~ "settings of period before this one to created one.\n"
+#~ "\n"
+#~ "Remarks:\n"
+#~ "- This tool doesn't create lines, if relevant lines (for the same Product, "
+#~ "Period, Warehouse and validated or created by you) already exists. If you "
+#~ "wish to create another forecast, if relevant lines exists you have to do it "
+#~ "manually using menus described bellow.\n"
+#~ "- When created lines are validated by someone else you can use this tool to "
+#~ "create another lines for the same Period, Product and Warehouse. \n"
+#~ "- When you choose \"Copy Last Forecast\" created line takes quantity and "
+#~ "some settings from your (validated by you or created by you if not validated "
+#~ "yet) forecast which is for last period before period of created forecast. If "
+#~ "there are few your forecasts for period before this one (it is possible) "
+#~ "system takes one of them (no rule which of them).\n"
+#~ "\n"
+#~ "\n"
+#~ "Menus \"Sales Forecasts\"\n"
+#~ "On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
+#~ "\"Product Quantity\". Further calculation can work for draft forecasts. But "
+#~ "validation can save your data against any accidental changes. You can click "
+#~ "\"Validate\" button but it is not mandatory.\n"
+#~ "\n"
+#~ "Instead of forecast quantity you can enter amount of forecast sales in field "
+#~ "\"Product Amount\". System will count quantity from amount according to Sale "
+#~ "price of the Product.\n"
+#~ "\n"
+#~ "All values on the form are expressed in unit of measure selected on form. "
+#~ "You can select one of unit of measure from default category or from second "
+#~ "category. When you change unit of measure the quanities will be recalculated "
+#~ "according to new UoM: editable values (blue fields) immediately, non edited "
+#~ "fields after clicking of \"Calculate Planning\" button.\n"
+#~ "\n"
+#~ "To find proper value for Sale Forecast you can use \"Sales History\" table "
+#~ "for this product. You have to enter parameters to the top and left of this "
+#~ "table and system will count sale quantities according to these parameters. "
+#~ "So you can select fe. your department (at the top) then (to the left): last "
+#~ "period, period before last and period year ago.\n"
+#~ "\n"
+#~ "Remarks:\n"
+#~ "\n"
+#~ "\n"
+#~ "Procurement Planning\n"
+#~ "====================\n"
+#~ "Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
+#~ "- \"Create Stock Planning Lines\" - allows you to automate creating planning "
+#~ "lines according to some parameters.\n"
+#~ "- \"Master Procurement Scheduler\" - is the most important menu of the "
+#~ "module which allows to create procurement.\n"
+#~ "\n"
+#~ "As Sales forecast is phase of planning sales. The Procurement Planning "
+#~ "(Planning) is the phase of scheduling Purchasing or Producing. You can "
+#~ "create Procurement Planning quickly using tool from menu \"Create Stock "
+#~ "Planning Lines\", then you can review created planning and make procurement "
+#~ "using menu \"Master Procurement Schedule\".\n"
+#~ "\n"
+#~ "Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
+#~ "lines for products from selected Category, for selected Period, and for "
+#~ "selected Warehouse. When you check option \"All Products with Forecast\" "
+#~ "system creates lines for all products having forecast for selected Period "
+#~ "and Warehouse. Selected Category will be ignored in this case.\n"
+#~ "\n"
+#~ "Under menu \"Master Procurement Scheduler\" you can generally change the "
+#~ "values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
+#~ "Simulation\" and decide if this value would be accurate for end of the "
+#~ "Period. \n"
+#~ "\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
+#~ "all forecasts for Period and Warehouse. But your planning can be based on "
+#~ "any other information you have. It is not necessary to have any forecast. \n"
+#~ "\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
+#~ "is the quantity to be procured to make stock as indicated in \"Stock "
+#~ "Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
+#~ "quantity to minimum stock rules visible on the form. But you can plan "
+#~ "different quantity than in Minimum Stock Rules. Calculation is made for "
+#~ "whole Warehouse by default. But if you want to see values for Stock location "
+#~ "of calculated warehouse you can use check box \"Stock Location Only\".\n"
+#~ "\n"
+#~ "If after few tries you decide that you found correct quantities for "
+#~ "\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
+#~ "stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
+#~ "Left\" button to procure quantity of field \"Incoming Left\" into the "
+#~ "Warehouse. System creates appropriate Procurement Order. You can decide if "
+#~ "procurement will be made to Stock or Input location of calculated Warehouse. "
+#~ "\n"
+#~ "\n"
+#~ "If you don't want to Produce or Buy the product but just pick calculated "
+#~ "quantity from another warehouse you can click \"Supply from Another "
+#~ "Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
+#~ "with move from selected source Warehouse to calculated Warehouse (as "
+#~ "destination). You can also decide if this pick should be done from Stock or "
+#~ "Output location of source warehouse. Destination location (Stock or Input) "
+#~ "of destination warehouse will be used as set for \"Procure Incoming Left\". "
+#~ "\n"
+#~ "\n"
+#~ "To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
+#~ "\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
+#~ "have to click button \"Calculate Planning\".\n"
+#~ "\n"
+#~ "All values on the form are expressed in unit of measure selected on form. "
+#~ "You can select one of unit of measure from default category or from second "
+#~ "category. When you change unit of measure the quanities will be recalculated "
+#~ "according to new UoM: editable values (blue fields) immediately, non edited "
+#~ "fields after clicking of \"Calculate Planning\" button.\n"
+#~ "\n"
+#~ "How Stock Simulation field is calculated:\n"
+#~ "Generally Stock Simulation shows the stock for end of the calculated period "
+#~ "according to some planned or confirmed stock moves. Calculation always "
+#~ "starts with quantity of real stock of beginning of current period. Then "
+#~ "calculation adds or subtracts quantities of calculated period or periods "
+#~ "before calculated.\n"
+#~ "When you are in the same period (current period is the same as calculated) "
+#~ "Stock Simulation is calculated as follows:\n"
+#~ "Stock Simulation = \n"
+#~ "\tStock of beginning of current Period\n"
+#~ "\t- Planned Out \n"
+#~ "\t+ Planned In\n"
+#~ "\n"
+#~ "When you calculate period next to current:\n"
+#~ "Stock Simulation = \n"
+#~ "\tStock of beginning of current Period\n"
+#~ "\t- Planned Out of current Period \n"
+#~ "\t+ Confirmed In of current Period  (incl. Already In)\n"
+#~ "\t- Planned Out of calculated Period \n"
+#~ "\t+ Planned In of calculated Period .\n"
+#~ "\n"
+#~ "As you see calculated Period is taken the same way like in case above. But "
+#~ "calculation of current Period are made a little bit different. First you "
+#~ "should note that system takes for current Period only Confirmed In moves. It "
+#~ "means that you have to make planning and procurement for current Period "
+#~ "before this calculation (for Period next to current). \n"
+#~ "\n"
+#~ "When you calculate Period ahead:\n"
+#~ "Stock Simulation = \n"
+#~ "\tStock of beginning of current Period \n"
+#~ "\t- Sum of Planned Out of Periods before calculated \n"
+#~ "\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
+#~ "\t- Planned Out of calculated Period \n"
+#~ "\t+ Planned In of calculated Period.\n"
+#~ "\n"
+#~ "Periods before calculated means periods starting from current till period "
+#~ "before calculated.\n"
+#~ "\n"
+#~ "Remarks:\n"
+#~ "- Remember to make planning for all periods before calculated because "
+#~ "omitting these quantities and procurements can cause wrong suggestions for "
+#~ "procurements few periods ahead.\n"
+#~ "- If you made planning few periods ahead and you find that real Confirmed "
+#~ "Out is bigger than Planned Out in some periods before you can repeat "
+#~ "Planning and make another procurement. You should do it in the same planning "
+#~ "line. If you create another planning line the suggestions can be wrong.\n"
+#~ "- When you wish to work with different periods for some part of products "
+#~ "define two kinds of periods (fe. Weekly and Monthly) and use them for "
+#~ "different products. Example: If you use always Weekly periods for Products "
+#~ "A, and Monthly periods for Products B your all calculations will work "
+#~ "correctly. You can also use different kind of periods for the same products "
+#~ "from different warehouse or companies. But you cannot use overlapping "
+#~ "periods for the same product, warehouse and company because results can be "
+#~ "unpredictable. The same apply to Forecasts lines.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "这模块的主要目标：在MPS(主生产计划)外能手动生成采购(正规请求)，MPS是根据最少库存规则来自动工作。\n"
+#~ "模块里的术语：\n"
+#~ "    仓库和销售周期：您库存计划，销售预测和制造需求计划(MRP)的开始日期与结束日期之间时间。\n"
+#~ "    仓库和销售预测：是在周期内您计划销售产品的数量。\n"
+#~ "    仓库计划：在周期内您计划采购产品的数量。\n"
+#~ "\n"
+#~ "因为在销售预测模块也使用术语“销售预测”和“计划”但它们是金额值。所以在这模块使用“仓库和销售预测”和“仓库计划”来强调这是一个数量值。\n"
+#~ "\n"
+#~ "本模块的三个操作步骤：\n"
+#~ "    1.创建周期，必须步骤。\n"
+#~ "    2.建立销售预测并输入数量，可选步骤，但它是下一步所必须的。\n"
+#~ "    3.建立计划的明细并输入数量，这是在周期内采购或生产的数量。\n"
+
+#~ msgid ""
+#~ "Chect to make procurement to stock location of selected warehouse. If not "
+#~ "selected procurement will be made into input location of warehouse."
+#~ msgstr "选择指定仓库需求的库位,如果不选择需求将用这仓库的入库库位."
+
+#, python-format
+#~ msgid "    Confirmed In Before: "
+#~ msgstr "    之前的确认入库: "
+
+#, python-format
+#~ msgid "Pick List "
+#~ msgstr "装箱单 "
+
+#~ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
+#~ msgstr "这仓库最小库存规则设置里的最大数量"
+
+#~ msgid ""
+#~ "Unit of Measure used to show the quanities of stock calculation.You can use "
+#~ "units form default category or from second category (UoS category)."
+#~ msgstr "计量单位用于显示库存数量,单位您可以使用默认分类或者第二分类(销售单位分类)."
+
+#~ msgid "Create periods for Stock and Sales Planning"
+#~ msgstr "创建库存和销售计划周期"
+
+#~ msgid ""
+#~ "Quantity expected to go out in selected period. As a difference between "
+#~ "Planned Out and Confirmed Out. For current period Already Out is also "
+#~ "calculated"
+#~ msgstr "在选定周期的出库预计数量.作为计划出库和确认出库的差,对本期已出库的已经计算进去."
+
+#, python-format
+#~ msgid "Cannot delete Validated Sale Forecasts !"
+#~ msgstr "不能删除已审核的销售预计!"
+
+#, python-format
+#~ msgid "    Confirmed In: "
+#~ msgstr "    已确认的入库: "
+
+#~ msgid ""
+#~ "Check to supply from Stock location of Supply Warehouse. If not checked "
+#~ "supply will be made from Output location of Supply Warehouse. Used in "
+#~ "'Supply from Another Warhouse' with Supply Warehouse."
+#~ msgstr "选择供货仓库的的库存库位.如果不选择将使用供应商仓库的出库库位作为供货地点.用在\"从其它仓库供货\"的那个供应商仓库."
+
+#~ msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
+#~ msgstr "这仓库最低库存量规则的数量"
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ " Planned Out Before: "
+#~ msgstr ""
+#~ "\n"
+#~ " 之前的计划出库 "
diff --git a/addons/subscription/i18n/zh_CN.po b/addons/subscription/i18n/zh_CN.po
index ece4f0b560b..9aaeeb5ebb3 100644
--- a/addons/subscription/i18n/zh_CN.po
+++ b/addons/subscription/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: 2010-03-20 10:31+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
+"PO-Revision-Date: 2012-11-27 14:20+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:39+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
@@ -145,7 +145,7 @@ msgstr "名称"
 #: code:addons/subscription/subscription.py:136
 #, python-format
 msgid "You cannot delete an active subscription !"
-msgstr ""
+msgstr "你不能删除一个活动的订阅"
 
 #. module: subscription
 #: field:subscription.document,field_ids:0
@@ -173,7 +173,7 @@ msgstr "日"
 #: code:addons/subscription/subscription.py:136
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误!"
 
 #. module: subscription
 #: field:subscription.subscription,cron_id:0
diff --git a/addons/warning/i18n/zh_CN.po b/addons/warning/i18n/zh_CN.po
index a3247df7f3c..5a7c2693929 100644
--- a/addons/warning/i18n/zh_CN.po
+++ b/addons/warning/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-02-11 14:00+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-27 14:17+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:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
@@ -31,7 +31,7 @@ msgstr "采购订单明细"
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking_in
 msgid "Incoming Shipments"
-msgstr ""
+msgstr "入库"
 
 #. module: warning
 #: field:product.product,sale_line_warn_msg:0
@@ -72,7 +72,7 @@ msgstr "警告"
 #. module: warning
 #: sql_constraint:product.product:0
 msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "错误!结束日期不能早于开始日期。"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -109,7 +109,7 @@ msgstr "发票警告"
 msgid ""
 "You provided an invalid \"EAN13 Barcode\" reference. You may use the "
 "\"Internal Reference\" field instead."
-msgstr ""
+msgstr "你提供了一个错误的  \"EAN13 条码\" 编号。你可能要用 “编号”字段替代。"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -262,7 +262,7 @@ msgstr "销售订单"
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking_out
 msgid "Delivery Orders"
-msgstr ""
+msgstr "送货单"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
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']
diff --git a/addons/web_linkedin/i18n/nl.po b/addons/web_linkedin/i18n/nl.po
new file mode 100644
index 00000000000..3afe1a8e726
--- /dev/null
+++ b/addons/web_linkedin/i18n/nl.po
@@ -0,0 +1,137 @@
+# Dutch 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-27 19:33+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-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "here:"
+msgstr "hier:"
+
+#. module: web_linkedin
+#: field:sale.config.settings,api_key:0
+msgid "API Key"
+msgstr "API Sleutel"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:249
+#, python-format
+msgid "No results found"
+msgstr "Geen resultaten gevonden"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:84
+#, python-format
+msgid "Ok"
+msgstr "Ok"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Log into LinkedIn."
+msgstr "Login in LinkedIn"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:13
+#, python-format
+msgid "People"
+msgstr "Personen"
+
+#. module: web_linkedin
+#: model:ir.model,name:web_linkedin.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "sale.config.settings"
+
+#. module: web_linkedin
+#: field:sale.config.settings,server_domain:0
+msgid "unknown"
+msgstr "onbekend"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "https://www.linkedin.com/secure/developer"
+msgstr "https://www.linkedin.com/secure/developer"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:15
+#, python-format
+msgid "Companies"
+msgstr "Bedrijven"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "API key"
+msgstr "API sleutel"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Copy the"
+msgstr "Kopieer de"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:181
+#, python-format
+msgid "LinkedIn search"
+msgstr "LinkedIn search"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:31
+#, python-format
+msgid ""
+"LinkedIn access was not enabled on this server.\n"
+"            Please ask your administrator to configure it in Settings > "
+"Configuration > Sales > Social Network Integration."
+msgstr ""
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid ""
+"To use the LinkedIn module with this database, an API Key is required. "
+"Please follow this procedure:"
+msgstr ""
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:82
+#, python-format
+msgid "LinkedIn is not enabled"
+msgstr "LinkedIn is niet geactiveerd"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Add a new application and fill the form:"
+msgstr "Voeg een nieuwe applicatie toe en vul het formulier in:"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Go to this URL:"
+msgstr "Ga naar deze URL:"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "The programming tool is Javascript"
+msgstr "De programmeertaal is Javascript"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "JavaScript API Domain:"
+msgstr "JavaScript API Domain:"
diff --git a/addons/web_shortcuts/i18n/nl.po b/addons/web_shortcuts/i18n/nl.po
new file mode 100644
index 00000000000..1d5d9802f60
--- /dev/null
+++ b/addons/web_shortcuts/i18n/nl.po
@@ -0,0 +1,25 @@
+# Dutch 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-27 19:29+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-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: web_shortcuts
+#. openerp-web
+#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
+#, python-format
+msgid "Add / Remove Shortcut..."
+msgstr "Toevoegen/verwijderen snelkoppeling"
diff --git a/addons/web_shortcuts/i18n/zh_CN.po b/addons/web_shortcuts/i18n/zh_CN.po
new file mode 100644
index 00000000000..614bb9fc0ff
--- /dev/null
+++ b/addons/web_shortcuts/i18n/zh_CN.po
@@ -0,0 +1,25 @@
+# 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:54+0000\n"
+"PO-Revision-Date: 2012-11-27 14:18+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-28 04:41+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
+
+#. module: web_shortcuts
+#. openerp-web
+#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
+#, python-format
+msgid "Add / Remove Shortcut..."
+msgstr "添加/删除快捷方式"