diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index 18f63733ff6..c42597e785d 100644 --- a/addons/account/account_analytic_line.py +++ b/addons/account/account_analytic_line.py @@ -147,8 +147,9 @@ class account_analytic_line(osv.osv): # Compute based on pricetype pricetype=self.pool.get('product.price.type').browse(cr,uid,company_obj.browse(cr,uid,company_id).property_valuation_price_type.id) + # Take the company currency as the reference one + context['currency_id']=company_obj.browse(cr,uid,company_id).currency_id.id amount_unit=prod.price_get(pricetype.field, context)[prod.id] - amount=amount_unit*unit_amount or 1.0 return {'value': { 'amount': - round(amount, 2), diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 0adc85a942e..07d8e1a02ac 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -278,7 +278,7 @@ class account_move_line(osv.osv): data['amount_currency'] = v return data - def _on_create_write(self, cr, uid, id, context={}): + def on_create_write(self, cr, uid, id, context={}): ml = self.browse(cr, uid, id, context) return map(lambda x: x.id, ml.move_id.line_id) @@ -733,7 +733,7 @@ class account_move_line(osv.osv): state = ' colors="red:state==\'draft\'"' #xml = '''\n\n\t''' % (title, state) - xml = '''\n\n\t''' % (title, state) + xml = '''\n\n\t''' % (title, state) fields = [] widths = { diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index d865823e9cd..88205521b1c 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -159,7 +159,7 @@ - + List of Accounts account.account @@ -681,7 +681,7 @@ tree - + diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po index 932d4e3cf3d..417964044e5 100644 --- a/addons/account/i18n/cs.po +++ b/addons/account/i18n/cs.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-17 20:55+0000\n" +"PO-Revision-Date: 2010-03-28 20:40+0000\n" "Last-Translator: mitev.dmitry \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: 2010-03-18 04:34+0000\n" +"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -110,7 +110,7 @@ msgstr "Vytištěné reporty o daních" #. module: account #: field:account.account,parent_id:0 msgid "Parent" -msgstr "" +msgstr "Rodič" #. module: account #: selection:account.move,type:0 @@ -415,7 +415,7 @@ msgstr "Datum:" #. module: account #: selection:account.account.type,sign:0 msgid "Negative" -msgstr "" +msgstr "Negativ" #. module: account #: rml:account.partner.balance:0 diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po index 117d5f3975a..11692706164 100644 --- a/addons/account/i18n/pt_BR.po +++ b/addons/account/i18n/pt_BR.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-24 04:53+0000\n" +"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po index 6dfa3106b60..74c60176c3a 100644 --- a/addons/account/i18n/sv.po +++ b/addons/account/i18n/sv.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-23 16:02+0000\n" -"Last-Translator: djn (Xclude) \n" +"PO-Revision-Date: 2010-03-24 14:33+0000\n" +"Last-Translator: Anders Eriksson (Mobila System) \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: 2010-03-24 04:53+0000\n" +"X-Launchpad-Export-Date: 2010-03-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -24,7 +24,7 @@ msgstr "Internt namn" #. module: account #: view:account.tax.code:0 msgid "Account Tax Code" -msgstr "Skattekontokod" +msgstr "Konto, skattekod" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree9 @@ -45,7 +45,7 @@ msgstr "Ange meddelande till rapporten försenade betalningar." #. module: account #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0 msgid "Confirm statement from draft" -msgstr "Bekräfta verifikat från utkast" +msgstr "Bekräfta preliminära verifikat" #. module: account #: model:account.account.type,name:account.account_type_asset @@ -55,7 +55,7 @@ msgstr "Tillgång" #. module: account #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen." +msgstr "Felaktigt namn för modell i händelsedefinitionen." #. module: account #: help:account.journal,currency:0 @@ -112,7 +112,7 @@ msgstr "Skriv ut momsrapport" #. module: account #: field:account.account,parent_id:0 msgid "Parent" -msgstr "Ovanliggande" +msgstr "Överliggande" #. module: account #: selection:account.move,type:0 @@ -141,7 +141,7 @@ msgstr "Ej avstämda transaktioner" #. module: account #: constraint:account.period:0 msgid "Error ! The duration of the Period(s) is/are invalid. " -msgstr "Fel ! Varaktigheten i perioden/erna är felaktig " +msgstr "Fel! Fel periodintervall. " #. module: account #: view:account.bank.statement.reconcile:0 @@ -262,7 +262,7 @@ msgstr "Summa Debet" #. module: account #: rml:account.tax.code.entries:0 msgid "Accounting Entries-" -msgstr "Bokföringstransaktioner" +msgstr "Bokföringstransaktioner-" #. module: account #: help:account.journal,view_id:0 @@ -272,8 +272,8 @@ msgid "" "in which order. You can create your own view for a faster encoding in each " "journal." msgstr "" -"Ger vyn som används när du skriver eller surfar poster i journalen. Vyn " -"berättar för Open ERP vilka fält som ska synas, krävs eller skrivskyddas och " +"Ger vyn som används när du skriver eller bläddrar poster i journalen. Vyn " +"berättar för OpenERP vilka fält som ska synas, krävs eller skrivskyddas och " "i vilken ordning. Du kan skapa din egen vy för en snabbare kodning i varje " "journal." @@ -287,8 +287,8 @@ msgid "" "due dates, for example 50% now, 50% in one month." msgstr "" "Om du använder betalningsvillkor, förfallodagen kommer att beräknas " -"automatiskt vid generering av bokföringsposter. Om du håller " -"betalningsvillkor och förfallodagen tom betyder det direkt betalning. " +"automatiskt vid generering av bokföringsposter. Om du lämnar " +"betalningsvillkor och förfallodagen tomma betyder det direkt betalning. " "Betalningsvillkor kan beräkna flera förfallodatum, till exempel 50% nu, 50% " "efter en månad." @@ -319,7 +319,7 @@ msgstr "Välj period" #: field:account.invoice,origin:0 #: field:account.invoice.line,origin:0 msgid "Origin" -msgstr "Ursprung" +msgstr "Orginal" #. module: account #: rml:account.analytic.account.journal:0 @@ -364,7 +364,7 @@ msgstr "Debettransaktion" #: field:account.move.line,analytic_account_id:0 #: field:report.hr.timesheet.invoice.journal,account_id:0 msgid "Analytic Account" -msgstr "Objektkonto" +msgstr "Objekt" #. module: account #: field:account.tax,child_depend:0 @@ -382,7 +382,7 @@ msgstr "Journalnamn" #. module: account #: view:account.payment.term:0 msgid "Description on invoices" -msgstr "Beskrivning på faktura" +msgstr "Beskrivning på fakturor" #. module: account #: constraint:account.analytic.account:0 @@ -434,7 +434,7 @@ msgstr "Negativ" #. module: account #: rml:account.partner.balance:0 msgid "(Account/Partner) Name" -msgstr "(Konto/Företag) namn" +msgstr "(Konto/Partner) namn" #. module: account #: selection:account.move,type:0 @@ -509,7 +509,7 @@ msgstr "" #. module: account #: view:report.hr.timesheet.invoice.journal:0 msgid "Analytic Entries Stats" -msgstr "Objektposter" +msgstr "Objektposter statistikKredit ber" #. module: account #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form @@ -526,7 +526,7 @@ msgstr "Leverantörsfaktura" #: model:process.transition,name:account.process_transition_reconcilepaid0 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 msgid "Reconcile Paid" -msgstr "" +msgstr "Kreditering betald" #. module: account #: wizard_field:account.chart,init,target_move:0 @@ -542,7 +542,7 @@ msgstr "Momsmallar" #. module: account #: field:account.invoice,reconciled:0 msgid "Paid/Reconciled" -msgstr "" +msgstr "Betald/Återbetald" #. module: account #: field:account.account.type,close_method:0 @@ -552,7 +552,7 @@ msgstr "" #. module: account #: field:account.tax.template,include_base_amount:0 msgid "Include in Base Amount" -msgstr "" +msgstr "Inkluder i basbeloppet" #. module: account #: field:account.tax,ref_base_code_id:0 @@ -2071,7 +2071,7 @@ msgstr "Preliminär faktura" #. module: account #: model:account.account.type,name:account.account_type_expense msgid "Expense" -msgstr "Kostnad" +msgstr "Utgift" #. module: account #: field:account.journal,invoice_sequence_id:0 @@ -3268,7 +3268,7 @@ msgstr "Kod" #. module: account #: model:ir.ui.menu,name:account.menu_finance msgid "Financial Management" -msgstr "Bokföring" +msgstr "Redovisning" #. module: account #: selection:account.account.type,close_method:0 @@ -3664,7 +3664,7 @@ msgstr "" #: field:account.tax.template,sequence:0 #: field:fiscalyear.seq,sequence_id:0 msgid "Sequence" -msgstr "Nummerserie" +msgstr "Sekvens" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_template @@ -4140,7 +4140,7 @@ msgstr "Valuta för boken" #: view:account.journal.column:0 #: model:ir.model,name:account.model_account_journal_column msgid "Journal Column" -msgstr "" +msgstr "Journalkolumn" #. module: account #: selection:account.fiscalyear,state:0 diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 8b5131c0683..8d2ee5edb76 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.6\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-20 07:43+0000\n" -"Last-Translator: Black Jack \n" +"PO-Revision-Date: 2010-03-29 00:34+0000\n" +"Last-Translator: digitalsatori \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: 2010-03-21 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -896,7 +896,7 @@ msgstr "货币金额" #. module: account #: field:account.chart.template,property_account_expense_categ:0 msgid "Expense Category Account" -msgstr "" +msgstr "费用类科目" #. module: account #: wizard_field:account.fiscalyear.close,init,fy2_id:0 @@ -1110,7 +1110,7 @@ msgstr "列表模板" #. module: account #: field:account.chart.template,property_account_income_categ:0 msgid "Income Category Account" -msgstr "" +msgstr "收入类科目" #. module: account #: model:ir.actions.act_window,name:account.analytic_account_form diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index f551d77ccaa..cd9727d5903 100644 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -46,7 +46,7 @@ child_of user.company_id.id - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] @@ -60,7 +60,7 @@ child_of user.company_id.id - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] @@ -72,7 +72,7 @@ child_of user.company_id.id - ['|','|',('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])] + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] @@ -85,7 +85,7 @@ child_of user.company_id.id - ['|','|',('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] diff --git a/addons/account_analytic_default/i18n/zh_CN.po b/addons/account_analytic_default/i18n/zh_CN.po index a20701c0aae..a37b184a372 100644 --- a/addons/account_analytic_default/i18n/zh_CN.po +++ b/addons/account_analytic_default/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-20 03:48+0000\n" -"Last-Translator: Black Jack \n" +"PO-Revision-Date: 2010-03-29 00:37+0000\n" +"Last-Translator: digitalsatori \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: 2010-03-21 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-03-29 03:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_default @@ -42,7 +42,7 @@ msgstr "这对象名必须以x_开头并且不能包含特殊的字符!" #. module: account_analytic_default #: view:account.analytic.default:0 msgid "Seq" -msgstr "" +msgstr "序号" #. module: account_analytic_default #: field:account.analytic.default,date_stop:0 diff --git a/addons/account_analytic_plans/i18n/oc.po b/addons/account_analytic_plans/i18n/oc.po new file mode 100644 index 00000000000..c697c75a25c --- /dev/null +++ b/addons/account_analytic_plans/i18n/oc.po @@ -0,0 +1,376 @@ +# Occitan (post 1500) translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2009-08-28 16:01+0000\n" +"PO-Revision-Date: 2010-03-25 12:58+0000\n" +"Last-Translator: Cédric VALMARY (Per Tot en òc) \n" +"Language-Team: Occitan (post 1500) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account4_ids:0 +msgid "Account4 Id" +msgstr "" + +#. module: account_analytic_plans +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs " +"especials !" + +#. module: account_analytic_plans +#: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic +#: model:ir.actions.wizard,name:account_analytic_plans.account_analytic_account_inverted_balance_report +msgid "Crossovered Analytic" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account5_ids:0 +msgid "Account5 Id" +msgstr "Identificant del Compte5" + +#. module: account_analytic_plans +#: wizard_field:wizard.crossovered.analytic,init,date2:0 +msgid "End Date" +msgstr "Data de fin" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance.line,rate:0 +msgid "Rate (%)" +msgstr "Taus (%)" + +#. module: account_analytic_plans +#: view:account.analytic.plan:0 +#: field:account.analytic.plan,name:0 +#: field:account.analytic.plan.line,plan_id:0 +#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action +#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action +msgid "Analytic Plan" +msgstr "Plan Analitic" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line +msgid "Analytic Instance Line" +msgstr "" + +#. module: account_analytic_plans +#: view:account.analytic.plan.instance.line:0 +msgid "Analytic Distribution Lines" +msgstr "" + +#. module: account_analytic_plans +#: wizard_button:wizard.crossovered.analytic,init,print:0 +msgid "Print" +msgstr "Estampar" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "To Date" +msgstr "Data de Fin" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance.line,plan_id:0 +msgid "Plan Id" +msgstr "Identificant del Plan" + +#. module: account_analytic_plans +#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action +msgid "Analytic Distribution's Models" +msgstr "" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Account Name" +msgstr "Nom del compte" + +#. module: account_analytic_plans +#: view:account.analytic.plan.instance.line:0 +msgid "Analytic Distribution Line" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,code:0 +msgid "Distribution Code" +msgstr "" + +#. module: account_analytic_plans +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Nom del Modèl invalid per la definicion de l'accion." + +#. module: account_analytic_plans +#: field:account.analytic.plan.line,name:0 +msgid "Plan Name" +msgstr "Nom del Plan" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Printing date" +msgstr "Data d'estampatge" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Percentage" +msgstr "Percentatge" + +#. module: account_analytic_plans +#: wizard_field:wizard.crossovered.analytic,init,empty_line:0 +msgid "Dont show empty lines" +msgstr "" + +#. module: account_analytic_plans +#: wizard_view:wizard.crossovered.analytic,init:0 +msgid "Select Information" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account3_ids:0 +msgid "Account3 Id" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,journal_id:0 +#: wizard_field:wizard.crossovered.analytic,init,journal_ids:0 +msgid "Analytic Journal" +msgstr "Jornal analitic" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "100.00%" +msgstr "100.00%" + +#. module: account_analytic_plans +#: wizard_field:wizard.crossovered.analytic,init,ref:0 +msgid "Analytic Account Ref." +msgstr "" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Analytic Account :" +msgstr "Compte Analitic :" + +#. module: account_analytic_plans +#: view:account.analytic.plan.line:0 +msgid "Analytic Plan Line" +msgstr "" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Analytic Account Reference:" +msgstr "" + +#. module: account_analytic_plans +#: model:ir.actions.wizard,name:account_analytic_plans.create_model +msgid "Create Model" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan,default_instance_id:0 +msgid "Default Entries" +msgstr "" + +#. module: account_analytic_plans +#: view:account.analytic.plan:0 +#: field:account.analytic.plan,plan_ids:0 +#: field:account.journal,plan_id:0 +#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan +msgid "Analytic Plans" +msgstr "Plans Analitics" + +#. module: account_analytic_plans +#: field:account.analytic.plan.line,min_required:0 +msgid "Minimum Allowed (%)" +msgstr "Minimum Permés (%)" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account1_ids:0 +msgid "Account1 Id" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.line,max_required:0 +msgid "Maximum Allowed (%)" +msgstr "Maximum Permés (%)" + +#. module: account_analytic_plans +#: wizard_view:create.model,info:0 +msgid "Distribution Model Saved" +msgstr "" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance +msgid "Analytic Plan Instance" +msgstr "" + +#. module: account_analytic_plans +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "XML invalid per l'arquitectura de la vista" + +#. module: account_analytic_plans +#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open +msgid "Distribution Models" +msgstr "" + +#. 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" +" " +msgstr "" + +#. module: account_analytic_plans +#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information +msgid "Multiple-plans management in Analytic Accounting" +msgstr "" + +#. module: account_analytic_plans +#: view:account.analytic.plan.line:0 +#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line +msgid "Analytic Plan Lines" +msgstr "" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Crossovered Analytic -" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,plan_id:0 +msgid "Model's Plan" +msgstr "Plan del Modèl" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account2_ids:0 +msgid "Account2 Id" +msgstr "" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Amount" +msgstr "Montant" + +#. module: account_analytic_plans +#: help:account.analytic.plan.line,root_analytic_id:0 +msgid "Root account of this plan." +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account6_ids:0 +msgid "Account6 Id" +msgstr "" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Quantity" +msgstr "Quantitat" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account_ids:0 +msgid "Account Id" +msgstr "" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Code" +msgstr "Còde" + +#. module: account_analytic_plans +#: wizard_button:create.model,info,end:0 +msgid "OK" +msgstr "D'acòrdi" + +#. module: account_analytic_plans +#: field:account.analytic.plan.line,root_analytic_id:0 +msgid "Root Account" +msgstr "" + +#. module: account_analytic_plans +#: wizard_view:create.model,info:0 +msgid "" +"This distribution model has been saved. You will be able to reuse it later." +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.line,sequence:0 +msgid "Sequence" +msgstr "Sequéncia" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance.line,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Compte Analitic" + +#. module: account_analytic_plans +#: field:account.analytic.default,analytics_id:0 +#: view:account.analytic.plan.instance:0 +#: field:account.analytic.plan.instance,name:0 +#: field:account.invoice.line,analytics_id:0 +#: field:account.move.line,analytics_id:0 +msgid "Analytic Distribution" +msgstr "" + +#. module: account_analytic_plans +#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_instance_action +msgid "Analytic Distribution's models" +msgstr "" + +#. module: account_analytic_plans +#: wizard_button:wizard.crossovered.analytic,init,end:0 +msgid "Cancel" +msgstr "Anullar" + +#. module: account_analytic_plans +#: wizard_field:wizard.crossovered.analytic,init,date1:0 +msgid "Start Date" +msgstr "Data de començament" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "at" +msgstr "a" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "From Date" +msgstr "" diff --git a/addons/account_anglo_saxon/i18n/es.po b/addons/account_anglo_saxon/i18n/es.po new file mode 100644 index 00000000000..68e7618ac56 --- /dev/null +++ b/addons/account_anglo_saxon/i18n/es.po @@ -0,0 +1,66 @@ +# Spanish translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2009-11-24 12:50+0000\n" +"PO-Revision-Date: 2010-03-24 17:25+0000\n" +"Last-Translator: relojero \n" +"Language-Team: Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_anglo_saxon +#: view:product.category:0 +msgid " Accounting Property" +msgstr " Contabilidad de la propiedad" + +#. 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 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 "" + +#. module: account_anglo_saxon +#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information +msgid "Stock Account" +msgstr "" + +#. module: account_anglo_saxon +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "" + +#. module: account_anglo_saxon +#: field:product.category,property_account_creditor_price_difference_categ:0 +#: field:product.template,property_account_creditor_price_difference:0 +msgid "Price Difference Account" +msgstr "Precio de la cuenta diferencia" + +#. module: account_anglo_saxon +#: help:product.category,property_account_creditor_price_difference_categ:0 +#: help:product.template,property_account_creditor_price_difference:0 +msgid "" +"This account will be used to value price difference between purchase price " +"and cost price." +msgstr "" +"Esta cuenta se utilizará para valorar la diferencia de precios entre el " +"precio de compra y precio de coste" diff --git a/addons/account_chart/i18n/pt_BR.po b/addons/account_chart/i18n/pt_BR.po index 5ca91351ef7..48873002c79 100644 --- a/addons/account_chart/i18n/pt_BR.po +++ b/addons/account_chart/i18n/pt_BR.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-24 04:53+0000\n" +"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_chart diff --git a/addons/account_date_check/i18n/pt_BR.po b/addons/account_date_check/i18n/pt_BR.po index 01484e7d6de..46b422bf9ed 100644 --- a/addons/account_date_check/i18n/pt_BR.po +++ b/addons/account_date_check/i18n/pt_BR.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-24 04:53+0000\n" +"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_date_check diff --git a/addons/account_invoice_layout/account_invoice_layout.py b/addons/account_invoice_layout/account_invoice_layout.py index 58f7721d253..2317e0c65a9 100644 --- a/addons/account_invoice_layout/account_invoice_layout.py +++ b/addons/account_invoice_layout/account_invoice_layout.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -70,7 +70,7 @@ class account_invoice_line(osv.osv): res[field]['states'][key] = value return res - def _onchange_invoice_line_view(self, cr, uid, id, type, context={}, *args): + def onchange_invoice_line_view(self, cr, uid, id, type, context={}, *args): if (not type): return {} diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml index 18e7996a7cd..fe11e407bf3 100644 --- a/addons/account_invoice_layout/account_invoice_layout_view.xml +++ b/addons/account_invoice_layout/account_invoice_layout_view.xml @@ -9,7 +9,7 @@ form - + diff --git a/addons/account_payment/i18n/pt_BR.po b/addons/account_payment/i18n/pt_BR.po index 3292a090a89..0ea750cd530 100644 --- a/addons/account_payment/i18n/pt_BR.po +++ b/addons/account_payment/i18n/pt_BR.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-24 04:53+0000\n" +"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_payment diff --git a/addons/analytic_user_function/i18n/hr.po b/addons/analytic_user_function/i18n/hr.po index d458ac939a6..05b08aca798 100644 --- a/addons/analytic_user_function/i18n/hr.po +++ b/addons/analytic_user_function/i18n/hr.po @@ -1,64 +1,66 @@ # Translation of OpenERP Server. # This file contains the translation of the following modules: -# * analytic_user_function -# +# * analytic_user_function +# Drazen Bosak , 2010. msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.0_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 15:12+0000\n" -"Last-Translator: Ivica Perić \n" -"Language-Team: \n" +"PO-Revision-Date: 2010-03-25 00:56+0000\n" +"Last-Translator: Drazen Bosak \n" +"Language-Team: Vinteh\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n" +"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" +"Language: hr\n" #. module: analytic_user_function #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "Nepravilan XML format za View Architecture!" #. module: analytic_user_function #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid msgid "Relation table between users and products on a analytic account" -msgstr "" +msgstr "Vza između korisnika i proizvoda kod Analitičkog konta." #. module: analytic_user_function #: field:analytic_user_funct_grid,product_id:0 msgid "Product" -msgstr "" +msgstr "Proizvod" #. module: analytic_user_function #: field:analytic_user_funct_grid,account_id:0 msgid "Analytic Account" -msgstr "" +msgstr "Analitički Konto" #. module: analytic_user_function #: view:account.analytic.account:0 #: field:account.analytic.account,user_product_ids:0 msgid "Users/Products Rel." -msgstr "" +msgstr "veza Korisnici/Proizvodi" #. module: analytic_user_function #: field:analytic_user_funct_grid,user_id:0 msgid "User" -msgstr "" +msgstr "Korisnik" #. module: analytic_user_function #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" +"Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !" #. module: analytic_user_function #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information msgid "Analytic User Function" -msgstr "" +msgstr "Funkcija Analitičkog Korisnika" #. module: analytic_user_function #: view:analytic_user_funct_grid:0 msgid "User's Product for this Analytic Account" -msgstr "" +msgstr "Korisnikov Proizvod za ovaj Analitički konto." diff --git a/addons/auction/__terp__.py b/addons/auction/__terp__.py index ecc91f4e2d2..61e91802f44 100644 --- a/addons/auction/__terp__.py +++ b/addons/auction/__terp__.py @@ -38,6 +38,19 @@ 'init_xml': ['auction_sequence.xml'], 'update_xml': [ 'security/ir.model.access.csv', + 'wizard/auction_lots_able_view.xml', + 'wizard/auction_lots_enable_view.xml', + 'wizard/auction_lots_make_invoice_buyer_view.xml', + 'wizard/auction_lots_make_invoice_view.xml', + 'wizard/auction_taken_view.xml', + 'wizard/auction_lots_auction_move_view.xml', + 'wizard/auction_pay_buy_view.xml', + 'wizard/auction_payer_sel_view.xml', + 'wizard/auction_lots_sms_send_view.xml', + 'wizard/auction_catalog_flagey_view.xml', +# 'wizard/auction_aie_send_result_view.xml', + 'wizard/auction_lots_buyer_map_view.xml', + 'auction_view.xml', 'auction_report.xml', 'auction_wizard.xml' diff --git a/addons/auction/auction.py b/addons/auction/auction.py index 0ece4690d9f..1687980c029 100644 --- a/addons/auction/auction.py +++ b/addons/auction/auction.py @@ -478,13 +478,13 @@ class auction_lots(osv.osv): result = [ (r['id'], str(r['obj_num'])+' - '+r['name']) for r in self.read(cr, user, ids, ['name','obj_num'])] return result - def name_search(self, cr, user, name, args=[], operator='ilike', context={}): - try: - ids = self.search(cr, user, [('obj_num','=',int(name))]+ args) - except: - ids = [] + def name_search(self, cr, user, name, args=None, operator='ilike', context={}): + if not args: + args = [] + + ids = self.search(cr, user, [('obj_num','=',int(name))] + args) if not ids: - ids = self.search(cr, user, [('name',operator,name)]+ args) + ids = self.search(cr, user, [('name',operator,name)] + args) return self.name_get(cr, user, ids) def _sum_taxes_by_type_and_id(self, taxes): diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index 2189253f3ce..ee1004ab0f3 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -3,7 +3,8 @@ - + + ======================================================= Auction Management/Configuration/artist ======================================================= @@ -203,6 +204,7 @@ + @@ -277,7 +279,7 @@ - +