diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 9ff634a58d3..5284b1e5322 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -1407,6 +1407,7 @@ class account_invoice_line(osv.osv): _name = "account.invoice.line" _description = "Invoice Line" + _order = "invoice_id,sequence,id" _columns = { 'name': fields.text('Description', required=True), 'origin': fields.char('Source Document', size=256, help="Reference of the document that produced this invoice."), @@ -1443,6 +1444,7 @@ class account_invoice_line(osv.osv): 'discount': 0.0, 'price_unit': _price_unit_default, 'account_id': _default_account_id, + 'sequence': 10, } def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index c30297b16ed..ecfd73763ce 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -191,6 +191,7 @@ + diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po index 9ff231360d6..46db55f4bf4 100644 --- a/addons/account/i18n/da.po +++ b/addons/account/i18n/da.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-09-05 15:41+0000\n" +"Last-Translator: Morten Schou \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 05:39+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-09-06 06:07+0000\n" +"X-Generator: Launchpad (build 16760)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -38,7 +38,7 @@ msgstr "" #. module: account #: view:res.partner:0 msgid "the parent company" -msgstr "" +msgstr "Moderselskab" #. module: account #: view:account.move.reconcile:0 @@ -55,7 +55,7 @@ msgstr "Konto statistikker" #. module: account #: view:account.invoice:0 msgid "Proforma/Open/Paid Invoices" -msgstr "" +msgstr "Proforma/Åbne/Betalte faktura" #. module: account #: field:report.invoice.created,residual:0 @@ -84,7 +84,7 @@ msgstr "Importér fra faktura eller betaling" #: code:addons/account/account_move_line.py:1210 #, python-format msgid "Bad Account!" -msgstr "" +msgstr "Forkert konto!" #. module: account #: view:account.move:0 @@ -98,6 +98,8 @@ msgid "" "Error!\n" "You cannot create recursive account templates." msgstr "" +"Fejl!\n" +"Du kan ikke oprette rekursiv konto skabelon." #. module: account #. openerp-web @@ -128,6 +130,8 @@ msgid "" "If the active field is set to False, it will allow you to hide the payment " "term without removing it." msgstr "" +"Hvis det aktive felt sættes til falsk, kan du skjule betalings betingelse " +"uden at slette den." #. module: account #: code:addons/account/account.py:641 @@ -156,7 +160,7 @@ msgstr "Advarsel!" #: code:addons/account/account.py:3197 #, python-format msgid "Miscellaneous Journal" -msgstr "" +msgstr "Diverse journal" #. module: account #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39 @@ -184,21 +188,30 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klik for at oprette en bogførings periode.\n" +"

\n" +" En bogførings periode er typisk en måned eller et kvartal. " +"Den\n" +" defineres normalt svarende til samme længde som en " +"momsafregnings periode.\n" +"

\n" +" " #. module: account #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard msgid "Invoices Created Within Past 15 Days" -msgstr "" +msgstr "Fakturaer oprettet inden for de sidste 15 dage" #. module: account #: field:accounting.report,label_filter:0 msgid "Column Label" -msgstr "" +msgstr "Kolonne navn" #. module: account #: help:account.config.settings,code_digits:0 msgid "No. of digits to use for account code" -msgstr "" +msgstr "Antal cifre som bruges til konto kode" #. module: account #: help:account.analytic.journal,type:0 @@ -220,7 +233,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_tax_template_form #: model:ir.ui.menu,name:account.menu_action_account_tax_template_form msgid "Tax Templates" -msgstr "" +msgstr "Moms skabelon" #. module: account #: model:ir.model,name:account.model_account_move_line_reconcile_select @@ -240,12 +253,12 @@ msgstr "Belgiske rapporter" #. module: account #: model:mail.message.subtype,name:account.mt_invoice_validated msgid "Validated" -msgstr "" +msgstr "Valideret" #. module: account #: model:account.account.type,name:account.account_type_income_view1 msgid "Income View" -msgstr "" +msgstr "Indtægt visning" #. module: account #: help:account.account,user_type:0 @@ -258,7 +271,7 @@ msgstr "" #. module: account #: field:account.config.settings,sale_refund_sequence_next:0 msgid "Next credit note number" -msgstr "" +msgstr "Næste kredit nota nummer" #. module: account #: help:account.config.settings,module_account_voucher:0 @@ -271,17 +284,17 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry msgid "Manual Recurring" -msgstr "" +msgstr "Manuel gentagelse" #. module: account #: field:account.automatic.reconcile,allow_write_off:0 msgid "Allow write off" -msgstr "" +msgstr "Slå skrivning fra" #. module: account #: view:account.analytic.chart:0 msgid "Select the Period for Analysis" -msgstr "" +msgstr "Vælg analyse periode" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree3 @@ -316,7 +329,7 @@ msgstr "" #. module: account #: field:account.config.settings,module_account_budget:0 msgid "Budget management" -msgstr "" +msgstr "Budget opsætning" #. module: account #: view:product.template:0 @@ -334,7 +347,7 @@ msgstr "" #. module: account #: field:account.config.settings,group_multi_currency:0 msgid "Allow multi currencies" -msgstr "" +msgstr "Tillad flere valutaer" #. module: account #: code:addons/account/account_invoice.py:77 @@ -368,13 +381,13 @@ msgstr "" #: view:account.invoice.report:0 #: field:account.invoice.report,user_id:0 msgid "Salesperson" -msgstr "" +msgstr "Sælger" #. module: account #: view:account.bank.statement:0 #: view:account.invoice:0 msgid "Responsible" -msgstr "" +msgstr "Ansvarlig" #. module: account #: model:ir.model,name:account.model_account_bank_accounts_wizard @@ -395,7 +408,7 @@ msgstr "Annuller Faktura" #. module: account #: selection:account.journal,type:0 msgid "Purchase Refund" -msgstr "" +msgstr "Indkøb Kreditnota" #. module: account #: selection:account.journal,type:0 @@ -439,7 +452,7 @@ msgstr "" #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8 #, python-format msgid "Period :" -msgstr "" +msgstr "Periode:" #. module: account #: field:account.account.template,chart_template_id:0 @@ -480,12 +493,12 @@ msgstr "Det beløb udtrykt i anden valgfri valuta." #. module: account #: view:account.journal:0 msgid "Available Coins" -msgstr "" +msgstr "Tilgængelige mønter" #. module: account #: field:accounting.report,enable_filter:0 msgid "Enable Comparison" -msgstr "" +msgstr "Aktiver sammenligning" #. module: account #: view:account.analytic.line:0 @@ -518,12 +531,12 @@ msgstr "" #: model:ir.model,name:account.model_account_journal #: field:validate.account.move,journal_id:0 msgid "Journal" -msgstr "" +msgstr "Journal" #. module: account #: model:ir.model,name:account.model_account_invoice_confirm msgid "Confirm the selected invoices" -msgstr "" +msgstr "Godkend valgte faktura" #. module: account #: field:account.addtmpl.wizard,cparent_id:0 @@ -538,7 +551,7 @@ msgstr "" #. module: account #: field:account.bank.statement,account_id:0 msgid "Account used in this journal" -msgstr "" +msgstr "Konto brugt i Journal" #. module: account #: help:account.aged.trial.balance,chart_account_id:0 @@ -561,7 +574,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_invoice_refund msgid "Invoice Refund" -msgstr "" +msgstr "Kreditnota" #. module: account #: report:account.overdue:0 @@ -617,7 +630,7 @@ msgstr "" #: selection:account.config.settings,period:0 #: selection:account.installer,period:0 msgid "3 Monthly" -msgstr "" +msgstr "3 Pr. måned" #. module: account #: field:ir.sequence,fiscal_ids:0 diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po index 3adcc7a56cb..b93c68aacbe 100644 --- a/addons/account/i18n/hu.po +++ b/addons/account/i18n/hu.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2013-08-22 11:02+0000\n" +"PO-Revision-Date: 2013-09-08 09:45+0000\n" "Last-Translator: Herczeg Péter \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n" -"X-Generator: Launchpad (build 16737)\n" +"X-Launchpad-Export-Date: 2013-09-09 04:59+0000\n" +"X-Generator: Launchpad (build 16760)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -3867,7 +3867,7 @@ msgstr "Számlatükör" #: view:cash.box.out:0 #: model:ir.actions.act_window,name:account.action_cash_box_out msgid "Take Money Out" -msgstr "" +msgstr "Készpénz kifizetése" #. module: account #: report:account.vat.declaration:0 @@ -9437,7 +9437,7 @@ msgstr "Időszak vége" #: model:ir.actions.act_window,name:account.action_account_report #: model:ir.ui.menu,name:account.menu_account_reports msgid "Financial Reports" -msgstr "" +msgstr "Pénzügyi kimutatások" #. module: account #: model:account.account.type,name:account.account_type_liability_view1 @@ -9940,7 +9940,7 @@ msgstr "" #: view:cash.box.in:0 #: model:ir.actions.act_window,name:account.action_cash_box_in msgid "Put Money In" -msgstr "" +msgstr "Készpénz befizetése" #. module: account #: selection:account.account.type,close_method:0 diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po index 0d5e96ea837..ab45c3b59fd 100644 --- a/addons/account/i18n/pl.po +++ b/addons/account/i18n/pl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2013-07-17 10:37+0000\n" -"Last-Translator: Dariusz Kubiak \n" +"PO-Revision-Date: 2013-09-03 07:49+0000\n" +"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-18 07:14+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-09-04 05:03+0000\n" +"X-Generator: Launchpad (build 16753)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -7492,7 +7492,7 @@ msgstr "Wyświetl raport z każdym partnerem na osobnej stronie" #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 msgid "JRNL" -msgstr "DK" +msgstr "DZ" #. module: account #: view:account.state.open:0 @@ -8445,7 +8445,7 @@ msgstr "Środek trwały" #. module: account #: field:account.bank.statement,balance_end:0 msgid "Computed Balance" -msgstr "Wyliczona salso" +msgstr "Wyliczone saldo" #. module: account #. openerp-web @@ -9939,7 +9939,7 @@ msgstr "Nie ma konta %s w dzienniku %s." #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 msgid "Filters By" -msgstr "Fltry po" +msgstr "Filtry" #. module: account #: field:account.cashbox.line,number_closing:0 diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 58ed3b2e92f..addb7e5e8bd 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2013-08-05 16:30+0000\n" -"Last-Translator: 盈通 ccdos \n" +"PO-Revision-Date: 2013-09-07 07:23+0000\n" +"Last-Translator: youring \n" "Language-Team: Chinese (Simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-08-06 05:04+0000\n" -"X-Generator: Launchpad (build 16718)\n" +"X-Launchpad-Export-Date: 2013-09-08 05:02+0000\n" +"X-Generator: Launchpad (build 16760)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -4409,7 +4409,7 @@ msgstr "显示业务伙伴" #. module: account #: view:account.invoice:0 msgid "Validate" -msgstr "使其生效" +msgstr "确认生效" #. module: account #: model:account.financial.report,name:account.account_financial_report_assets0 @@ -7358,7 +7358,7 @@ msgstr "" #. module: account #: field:account.config.settings,module_account_voucher:0 msgid "Manage customer payments" -msgstr "" +msgstr "管理客户付款" #. module: account #: help:report.invoice.created,origin:0 diff --git a/addons/account/project/wizard/account_analytic_chart_view.xml b/addons/account/project/wizard/account_analytic_chart_view.xml index 70769049002..50a13acef18 100644 --- a/addons/account/project/wizard/account_analytic_chart_view.xml +++ b/addons/account/project/wizard/account_analytic_chart_view.xml @@ -7,16 +7,16 @@ account.analytic.chart
-
-
+
+
diff --git a/addons/account/report/account_financial_report.py b/addons/account/report/account_financial_report.py index 864c4bbc7d1..2b1f5af4d68 100644 --- a/addons/account/report/account_financial_report.py +++ b/addons/account/report/account_financial_report.py @@ -38,6 +38,7 @@ class report_account_common(report_sxw.rml_parse, common_report_header): 'get_filter': self._get_filter, 'get_start_date':self._get_start_date, 'get_end_date':self._get_end_date, + 'get_target_move': self._get_target_move, }) self.context = context diff --git a/addons/account/report/account_financial_report.rml b/addons/account/report/account_financial_report.rml index 1ee8d5b1858..7949077e43f 100644 --- a/addons/account/report/account_financial_report.rml +++ b/addons/account/report/account_financial_report.rml @@ -166,11 +166,12 @@ - + Chart of Accounts Fiscal Year Filter By [[ get_filter(data)!='No Filters' and get_filter(data) ]] + Target Moves [[ get_account(data) or removeParentNode('para') ]] @@ -197,6 +198,10 @@ + + [[ get_target_move(data) ]] + + diff --git a/addons/account/wizard/account_financial_report.py b/addons/account/wizard/account_financial_report.py index dde07eb7034..a22a41d7e0d 100644 --- a/addons/account/wizard/account_financial_report.py +++ b/addons/account/wizard/account_financial_report.py @@ -54,7 +54,7 @@ class accounting_report(osv.osv_memory): 'target_move': 'posted', 'account_report_id': _get_account_report, } - + def _build_comparison_context(self, cr, uid, ids, data, context=None): if context is None: context = {} @@ -62,6 +62,7 @@ class accounting_report(osv.osv_memory): result['fiscalyear'] = 'fiscalyear_id_cmp' in data['form'] and data['form']['fiscalyear_id_cmp'] or False result['journal_ids'] = 'journal_ids' in data['form'] and data['form']['journal_ids'] or False result['chart_account_id'] = 'chart_account_id' in data['form'] and data['form']['chart_account_id'] or False + result['state'] = 'target_move' in data['form'] and data['form']['target_move'] or '' if data['form']['filter_cmp'] == 'filter_date': result['date_from'] = data['form']['date_from_cmp'] result['date_to'] = data['form']['date_to_cmp'] @@ -86,7 +87,7 @@ class accounting_report(osv.osv_memory): return res def _print_report(self, cr, uid, ids, data, context=None): - data['form'].update(self.read(cr, uid, ids, ['date_from_cmp', 'debit_credit', 'date_to_cmp', 'fiscalyear_id_cmp', 'period_from_cmp', 'period_to_cmp', 'filter_cmp', 'account_report_id', 'enable_filter', 'label_filter'], context=context)[0]) + data['form'].update(self.read(cr, uid, ids, ['date_from_cmp', 'debit_credit', 'date_to_cmp', 'fiscalyear_id_cmp', 'period_from_cmp', 'period_to_cmp', 'filter_cmp', 'account_report_id', 'enable_filter', 'label_filter','target_move'], context=context)[0]) return { 'type': 'ir.actions.report.xml', 'report_name': 'account.financial.report', diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py index 58f8c5dd959..bbef144b99e 100644 --- a/addons/account/wizard/account_report_common.py +++ b/addons/account/wizard/account_report_common.py @@ -154,6 +154,7 @@ class account_common_report(osv.osv_memory): result['fiscalyear'] = 'fiscalyear_id' in data['form'] and data['form']['fiscalyear_id'] or False result['journal_ids'] = 'journal_ids' in data['form'] and data['form']['journal_ids'] or False result['chart_account_id'] = 'chart_account_id' in data['form'] and data['form']['chart_account_id'] or False + result['state'] = 'target_move' in data['form'] and data['form']['target_move'] or '' if data['form']['filter'] == 'filter_date': result['date_from'] = data['form']['date_from'] result['date_to'] = data['form']['date_to'] diff --git a/addons/account_accountant/i18n/da.po b/addons/account_accountant/i18n/da.po index 5a84204111e..3884bfbd56d 100644 --- a/addons/account_accountant/i18n/da.po +++ b/addons/account_accountant/i18n/da.po @@ -8,16 +8,16 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-09-05 15:11+0000\n" +"Last-Translator: Morten Schou \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 05:45+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-09-06 06:07+0000\n" +"X-Generator: Launchpad (build 16760)\n" #. module: account_accountant #: model:ir.actions.client,name:account_accountant.action_client_account_menu msgid "Open Accounting Menu" -msgstr "" +msgstr "Open Finans Menu" diff --git a/addons/account_asset/i18n/hu.po b/addons/account_asset/i18n/hu.po index 135bc865d73..3cb785ba83d 100644 --- a/addons/account_asset/i18n/hu.po +++ b/addons/account_asset/i18n/hu.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-08-22 11:22+0000\n" +"PO-Revision-Date: 2013-09-08 09:43+0000\n" "Last-Translator: Herczeg Péter \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-08-23 05:52+0000\n" -"X-Generator: Launchpad (build 16737)\n" +"X-Launchpad-Export-Date: 2013-09-09 04:59+0000\n" +"X-Generator: Launchpad (build 16760)\n" #. module: account_asset #: view:account.asset.asset:0 @@ -338,7 +338,7 @@ msgstr "" #: view:account.asset.history:0 #: model:ir.model,name:account_asset.model_account_asset_history msgid "Asset history" -msgstr "" +msgstr "Esuközök előzménye" #. module: account_asset #: view:account.asset.category:0 @@ -478,7 +478,7 @@ msgstr "Kiszámítás" #. module: account_asset #: view:account.asset.history:0 msgid "Asset History" -msgstr "Eszköz történet" +msgstr "Esuközök előzménye" #. module: account_asset #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard @@ -628,7 +628,7 @@ msgstr "Napló" #. module: account_asset #: field:account.asset.history,name:0 msgid "History name" -msgstr "" +msgstr "Előzmény neve" #. module: account_asset #: field:account.asset.depreciation.line,depreciated_value:0 diff --git a/addons/account_asset/i18n/pl.po b/addons/account_asset/i18n/pl.po index 2d0cd52687c..d16fec41fd0 100644 --- a/addons/account_asset/i18n/pl.po +++ b/addons/account_asset/i18n/pl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-09-02 08:30+0000\n" +"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 05:47+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-09-03 06:08+0000\n" +"X-Generator: Launchpad (build 16753)\n" #. module: account_asset #: view:account.asset.asset:0 @@ -37,7 +37,7 @@ msgstr "Wartość pozostała" #. module: account_asset #: field:account.asset.category,account_expense_depreciation_id:0 msgid "Depr. Expense Account" -msgstr "Konto umorzenia" +msgstr "Konto amortyzacji" #. module: account_asset #: view:asset.asset.report:0 @@ -178,7 +178,7 @@ msgstr "Środki trwałe" #. module: account_asset #: field:account.asset.category,account_depreciation_id:0 msgid "Depreciation Account" -msgstr "Konto amortyzacji" +msgstr "Konto umorzenia" #. module: account_asset #: view:account.asset.asset:0 diff --git a/addons/account_voucher/i18n/zh_CN.po b/addons/account_voucher/i18n/zh_CN.po index 8f3ce2334c0..f0f0df4a55e 100644 --- a/addons/account_voucher/i18n/zh_CN.po +++ b/addons/account_voucher/i18n/zh_CN.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-09-07 07:02+0000\n" +"Last-Translator: youring \n" "Language-Team: Chinese (Simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 05:49+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-09-08 05:02+0000\n" +"X-Generator: Launchpad (build 16760)\n" #. module: account_voucher #: field:account.bank.statement.line,voucher_id:0 @@ -158,7 +158,7 @@ msgstr "记账" #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment msgid "Supplier Payments" -msgstr "" +msgstr "供应商付款" #. module: account_voucher #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt @@ -226,7 +226,7 @@ msgstr "消息" #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt #: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt msgid "Purchase Receipts" -msgstr "" +msgstr "采购收据" #. module: account_voucher #: field:account.voucher.line,move_line_id:0 @@ -579,6 +579,14 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Click to register a new payment.登记一笔付款 \n" +"

\n" +" 输入客户名称及其付款方式，然后手工创建一条付款记录，\n" +" 或者OpenERP会提醒您自动核销此笔付款，以关闭相应发\n" +" 票或销售收据。\n" +"

\n" +" " #. module: account_voucher #: field:account.config.settings,expense_currency_exchange_account_id:0 @@ -791,7 +799,7 @@ msgstr "已付款" #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt msgid "Sales Receipts" -msgstr "" +msgstr "销售收据" #. module: account_voucher #: field:account.voucher,message_is_follower:0 @@ -889,7 +897,7 @@ msgstr "请在分类账上定义一个序列（ sequence ）。" #: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt msgid "Customer Payments" -msgstr "" +msgstr "客户付款" #. module: account_voucher #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all diff --git a/addons/auth_ldap/i18n/da.po b/addons/auth_ldap/i18n/da.po index f0ff1d198f9..7d6d4600de6 100644 --- a/addons/auth_ldap/i18n/da.po +++ b/addons/auth_ldap/i18n/da.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-09-05 20:35+0000\n" +"Last-Translator: Morten Schou \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 05:50+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-09-06 06:07+0000\n" +"X-Generator: Launchpad (build 16760)\n" #. module: auth_ldap #: field:res.company.ldap,user:0 msgid "Template User" -msgstr "" +msgstr "Skabelon bruger" #. module: auth_ldap #: help:res.company.ldap,ldap_tls:0 @@ -34,27 +34,27 @@ msgstr "" #: view:res.company:0 #: view:res.company.ldap:0 msgid "LDAP Configuration" -msgstr "" +msgstr "LDAP konfiguration" #. module: auth_ldap #: field:res.company.ldap,ldap_binddn:0 msgid "LDAP binddn" -msgstr "" +msgstr "LDAP bind dn" #. module: auth_ldap #: field:res.company.ldap,company:0 msgid "Company" -msgstr "" +msgstr "Firma" #. module: auth_ldap #: field:res.company.ldap,ldap_server:0 msgid "LDAP Server address" -msgstr "" +msgstr "LDAP server adresse" #. module: auth_ldap #: field:res.company.ldap,ldap_server_port:0 msgid "LDAP Server port" -msgstr "" +msgstr "LDAP server port" #. module: auth_ldap #: help:res.company.ldap,create_user:0 @@ -66,27 +66,27 @@ msgstr "" #. module: auth_ldap #: field:res.company.ldap,ldap_base:0 msgid "LDAP base" -msgstr "" +msgstr "LDAP base" #. module: auth_ldap #: view:res.company.ldap:0 msgid "User Information" -msgstr "" +msgstr "Brugerinformation" #. module: auth_ldap #: field:res.company.ldap,ldap_password:0 msgid "LDAP password" -msgstr "" +msgstr "LDAP kodeord" #. module: auth_ldap #: model:ir.model,name:auth_ldap.model_res_company msgid "Companies" -msgstr "" +msgstr "Firmaer" #. module: auth_ldap #: view:res.company.ldap:0 msgid "Process Parameter" -msgstr "" +msgstr "Proces parametre" #. module: auth_ldap #: model:ir.model,name:auth_ldap.model_res_company_ldap @@ -101,40 +101,40 @@ msgstr "" #. module: auth_ldap #: field:res.company.ldap,ldap_tls:0 msgid "Use TLS" -msgstr "" +msgstr "Brug TLS" #. module: auth_ldap #: field:res.company.ldap,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Rækkefølge" #. module: auth_ldap #: view:res.company.ldap:0 msgid "Login Information" -msgstr "" +msgstr "Login-information" #. module: auth_ldap #: view:res.company.ldap:0 msgid "Server Information" -msgstr "" +msgstr "Serverinformation" #. module: auth_ldap #: model:ir.actions.act_window,name:auth_ldap.action_ldap_installer msgid "Setup your LDAP Server" -msgstr "" +msgstr "Opsætning LDAP server" #. module: auth_ldap #: view:res.company:0 #: field:res.company,ldaps:0 msgid "LDAP Parameters" -msgstr "" +msgstr "LDAP parametre" #. module: auth_ldap #: help:res.company.ldap,ldap_password:0 msgid "" "The password of the user account on the LDAP server that is used to query " "the directory." -msgstr "" +msgstr "Brugers kodeord på LDAP server, bruges ved søgning i directory" #. module: auth_ldap #: help:res.company.ldap,ldap_binddn:0 @@ -142,18 +142,20 @@ msgid "" "The user account on the LDAP server that is used to query the directory. " "Leave empty to connect anonymously." msgstr "" +"Bruger konto på LDAP server bruges ved søgning i directory. Hvis tomt logges " +"på anonymt." #. module: auth_ldap #: model:ir.model,name:auth_ldap.model_res_users msgid "Users" -msgstr "" +msgstr "Brugere" #. module: auth_ldap #: field:res.company.ldap,ldap_filter:0 msgid "LDAP filter" -msgstr "" +msgstr "LDAP filter" #. module: auth_ldap #: field:res.company.ldap,create_user:0 msgid "Create user" -msgstr "" +msgstr "Opret bruger" diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index f8293e6e36e..380b5e85696 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -37,13 +37,6 @@ def _employee_get(obj, cr, uid, context=None): class hr_expense_expense(osv.osv): - def copy(self, cr, uid, id, default=None, context=None): - if context is None: - context = {} - if not default: default = {} - default.update({'voucher_id': False, 'date_confirm': False, 'date_valid': False, 'user_valid': False}) - return super(hr_expense_expense, self).copy(cr, uid, id, default, context=context) - def _amount(self, cr, uid, ids, field_name, arg, context=None): res= {} for expense in self.browse(cr, uid, ids, context=context): @@ -112,7 +105,12 @@ class hr_expense_expense(osv.osv): def copy(self, cr, uid, id, default=None, context=None): if default is None: default = {} - default.update(account_move_id=False) + default.update( + account_move_id=False, + voucher_id=False, + date_confirm=False, + date_valid=False, + user_valid=False) return super(hr_expense_expense, self).copy(cr, uid, id, default=default, context=context) def unlink(self, cr, uid, ids, context=None): diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra.py b/addons/l10n_be/wizard/l10n_be_vat_intra.py index c75d7c7cd57..ff86a6ba21e 100644 --- a/addons/l10n_be/wizard/l10n_be_vat_intra.py +++ b/addons/l10n_be/wizard/l10n_be_vat_intra.py @@ -247,9 +247,9 @@ class partner_vat_intra(osv.osv_memory): for client in xml_data['clientlist']: if not client['vatnum']: raise osv.except_osv(_('Insufficient Data!'),_('No vat number defined for %s.') % client['partner_name']) - data_clientinfo +='\n\t\t\n\t\t\t%(vatnum)s\n\t\t\t%(code)s\n\t\t\t%(amount)s\n\t\t' % (client) + data_clientinfo +='\n\t\t\n\t\t\t%(vatnum)s\n\t\t\t%(code)s\n\t\t\t%(amount).2f\n\t\t' % (client) - data_decl = '\n\t' % (xml_data) + data_decl = '\n\t' % (xml_data) data_file += data_head + data_decl + data_comp_period + data_clientinfo + '\n\t\t%(comments)s\n\t\n' % (xml_data) context['file_save'] = data_file diff --git a/addons/marketing_campaign/i18n/nl.po b/addons/marketing_campaign/i18n/nl.po index 67bf12d452f..e406018e530 100644 --- a/addons/marketing_campaign/i18n/nl.po +++ b/addons/marketing_campaign/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-26 12:58+0000\n" +"PO-Revision-Date: 2013-09-02 09:29+0000\n" "Last-Translator: Erwin van der Ploeg (Endian Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 06:08+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-09-03 06:08+0000\n" +"X-Generator: Launchpad (build 16753)\n" #. module: marketing_campaign #: view:marketing.campaign:0 @@ -102,6 +102,8 @@ msgid "" "Hi, we are delighted to let you know that you have entered the select circle " "of our Gold Partners" msgstr "" +"Hallo, we zijn verheugt om je te kunnen melden dat je bent toegetreden tot " +"de selectie groep van Gold partners." #. module: marketing_campaign #: selection:campaign.analysis,month:0 @@ -159,11 +161,13 @@ msgid "" "The campaign cannot be started. It does not have any starting activity. " "Modify campaign's activities to mark one as the starting point." msgstr "" +"De campagne kan niet worden gestart. Het heeft geen enkele start activiteit. " +"Pas de campagne activiteiten aan om er een als start punt aan te merken." #. module: marketing_campaign #: help:marketing.campaign.activity,email_template_id:0 msgid "The email to send when this activity is activated" -msgstr "" +msgstr "De te versturen e-mail wanneer deze activiteit wordt geactiveerd." #. module: marketing_campaign #: view:marketing.campaign.segment:0 @@ -528,6 +532,22 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Click to create a marketing campaign.\n" +"

\n" +" OpenERP's marketing campagne geeft u de mogelijkheid om de " +"communicatie met uw\n" +" prospects te automatiseren. U kunt een segment (een set van " +"condities) definiëren bij uw\n" +" leads en relaties om de campagne te volbrengen.\n" +"

\n" +" Een campagne kan meerdere activiteiten hebben, zoals het " +"versturen van een e-mail,\n" +" het afdrukken van een brief of het toewijzen aan een team. Deze " +"activiteiten worden geactiveerd\n" +" op basis van specifieke situaties.\n" +"

\n" +" " #. module: marketing_campaign #: field:marketing.campaign.transition,interval_nbr:0 @@ -1094,6 +1114,7 @@ msgstr "" #, python-format msgid "The campaign cannot be started. There are no activities in it." msgstr "" +"De campagne kan niet worden gestart. De campagne bevat geen activiteiten." #. module: marketing_campaign #: field:marketing.campaign.segment,date_next_sync:0 @@ -1105,6 +1126,8 @@ msgstr "Volgende synchronisatie" msgid "" "Hi, we are delighted to welcome you among our Silver Partners as of today!" msgstr "" +"Hallo, we zijn verheugt om je te kunnen melden dat je bent toegetreden tot " +"de groep van Silver partners." #. module: marketing_campaign #: field:marketing.campaign.segment,ir_filter_id:0 diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py index eec43c88fc8..900fee3be6f 100644 --- a/addons/point_of_sale/point_of_sale.py +++ b/addons/point_of_sale/point_of_sale.py @@ -497,9 +497,9 @@ class pos_order(osv.osv): 'user_id': order['user_id'] or False, 'session_id': order['pos_session_id'], 'lines': order['lines'], - 'pos_reference':order['name'] + 'pos_reference':order['name'], + 'partner_id': order.get('partner_id', False) }, context) - for payments in order['statement_ids']: payment = payments[2] self.add_payment(cr, uid, order_id, { diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index 2538f36eb13..838bf13e711 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -787,7 +787,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal lines: orderLines, statement_ids: paymentLines, pos_session_id: this.pos.get('pos_session').id, - partner_id: this.pos.get('client') ? this.pos.get('client').id : undefined, + partner_id: this.get('client') ? this.get('client').id : undefined, user_id: this.pos.get('cashier') ? this.pos.get('cashier').id : this.pos.get('user').id, }; }, diff --git a/addons/portal_anonymous/i18n/de.po b/addons/portal_anonymous/i18n/de.po new file mode 100644 index 00000000000..8fe3ee1443e --- /dev/null +++ b/addons/portal_anonymous/i18n/de.po @@ -0,0 +1,25 @@ +# German translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-06-07 19:37+0000\n" +"PO-Revision-Date: 2013-09-02 10:44+0000\n" +"Last-Translator: Matthias Fax \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-09-03 06:08+0000\n" +"X-Generator: Launchpad (build 16753)\n" + +#. module: portal_anonymous +#. openerp-web +#: code:addons/portal_anonymous/static/src/xml/portal_anonymous.xml:8 +#, python-format +msgid "Login" +msgstr "Anmelden" diff --git a/addons/portal_crm/i18n/de.po b/addons/portal_crm/i18n/de.po index 6e6b7610518..82a11daf649 100644 --- a/addons/portal_crm/i18n/de.po +++ b/addons/portal_crm/i18n/de.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-09-02 11:37+0000\n" +"Last-Translator: Matthias Fax \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 06:14+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-09-03 06:08+0000\n" +"X-Generator: Launchpad (build 16753)\n" #. module: portal_crm #: selection:portal_crm.crm_contact_us,type:0 msgid "Lead" -msgstr "Lead" +msgstr "Interessent" #. module: portal_crm #: field:portal_crm.crm_contact_us,title:0 @@ -30,17 +30,17 @@ msgstr "Anrede" #. module: portal_crm #: field:portal_crm.crm_contact_us,probability:0 msgid "Success Rate (%)" -msgstr "Erfolgsquote (%)" +msgstr "Erfolgsrate (%)" #. module: portal_crm #: view:portal_crm.crm_contact_us:0 msgid "Contact us" -msgstr "Kontaktieren Sie uns!" +msgstr "Kontakt" #. module: portal_crm #: field:portal_crm.crm_contact_us,date_action:0 msgid "Next Action Date" -msgstr "Datum der nächsten Aktion" +msgstr "Nächste Zahlungserinnerung" #. module: portal_crm #: field:portal_crm.crm_contact_us,fax:0 @@ -50,7 +50,7 @@ msgstr "Fax" #. module: portal_crm #: field:portal_crm.crm_contact_us,zip:0 msgid "Zip" -msgstr "Plz" +msgstr "PLZ" #. module: portal_crm #: field:portal_crm.crm_contact_us,message_unread:0 @@ -70,9 +70,7 @@ msgstr "Verkäufer" #. module: portal_crm #: view:portal_crm.crm_contact_us:0 msgid "Thank you for your interest, we'll respond to your request shortly." -msgstr "" -"Danke für Ihre Anfrage, wir werden uns schnellstmöglich um Ihre Anfrage " -"kümmern." +msgstr "Danke für Ihre Anfrage, wir werden uns baldmöglichst darum kümmern." #. module: portal_crm #: selection:portal_crm.crm_contact_us,priority:0 @@ -112,7 +110,7 @@ msgstr "Abgebrochen" #. module: portal_crm #: help:portal_crm.crm_contact_us,message_unread:0 msgid "If checked new messages require your attention." -msgstr "Wenn aktiviert, erfordern neue Nachrichten Ihr Handeln." +msgstr "Falls aktiviert, sind neue Nachrichten abzuarbeiten." #. module: portal_crm #: help:portal_crm.crm_contact_us,channel_id:0 @@ -152,7 +150,7 @@ msgstr "Partner" #. module: portal_crm #: model:ir.actions.act_window,name:portal_crm.action_contact_us msgid "Contact Us" -msgstr "Kontaktieren Sie uns" +msgstr "Kontakt" #. module: portal_crm #: field:portal_crm.crm_contact_us,name:0 @@ -162,7 +160,7 @@ msgstr "Betreff" #. module: portal_crm #: field:portal_crm.crm_contact_us,opt_out:0 msgid "Opt-Out" -msgstr "Opt-Out" +msgstr "Keine Werbe-E-Mails" #. module: portal_crm #: field:portal_crm.crm_contact_us,priority:0 @@ -224,7 +222,7 @@ msgstr "Erstellungsdatum" #. module: portal_crm #: view:portal_crm.crm_contact_us:0 msgid "Content..." -msgstr "" +msgstr "Inhalt..." #. module: portal_crm #: help:portal_crm.crm_contact_us,opt_out:0 @@ -233,11 +231,15 @@ msgid "" "mailing and marketing campaign. Filter 'Available for Mass Mailing' allows " "users to filter the leads when performing mass mailing." msgstr "" +"Falls 'Keine Werbung' markiert ist, hat dieser Kontakt Massen-E-Mails und " +"Marketingkampagnen abgelehnt. Durch den Filter 'Verfügbar für Massen-E-" +"Mails' können diejenigen Interessenten angezeigt werden, die für Massen-E-" +"Mails verfügbar sind." #. module: portal_crm #: help:portal_crm.crm_contact_us,type:0 msgid "Type is used to separate Leads and Opportunities" -msgstr "Typ wird zur Unterscheidung von Leads und Opportunities verwendet." +msgstr "Typ wird zur Unterscheidung von Interessenten und Chancen verwendet." #. module: portal_crm #: field:portal_crm.crm_contact_us,categ_ids:0 @@ -257,7 +259,7 @@ msgstr "Benutzername" #. module: portal_crm #: field:portal_crm.crm_contact_us,contact_name:0 msgid "Contact Name" -msgstr "Kontakt Name" +msgstr "Ansprechpartner" #. module: portal_crm #: model:ir.ui.menu,name:portal_crm.portal_company_contact @@ -267,7 +269,7 @@ msgstr "Kontakt" #. module: portal_crm #: view:portal_crm.crm_contact_us:0 msgid "Your name..." -msgstr "" +msgstr "Ihr Name..." #. module: portal_crm #: field:portal_crm.crm_contact_us,partner_address_email:0 @@ -302,7 +304,7 @@ msgstr "Aktualisierungsdatum" #. module: portal_crm #: view:portal_crm.crm_contact_us:0 msgid "Your email..." -msgstr "" +msgstr "Ihre E-Mail..." #. module: portal_crm #: field:portal_crm.crm_contact_us,date_deadline:0 @@ -335,8 +337,8 @@ msgid "" "The name of the future partner company that will be created while converting " "the lead into opportunity" msgstr "" -"Der Unternehmensname des zukünftigen Kunden, der bei der Umwandlung des " -"Leads zur Opportunity übernommen wird." +"Der Unternehmensname des Interessenten, der bei der Umwandlung des " +"Interessenten zur Chance verwendet wird." #. module: portal_crm #: field:portal_crm.crm_contact_us,planned_cost:0 @@ -346,7 +348,7 @@ msgstr "Geschätzte Kosten" #. module: portal_crm #: help:portal_crm.crm_contact_us,date_deadline:0 msgid "Estimate of the date on which the opportunity will be won." -msgstr "Vorraussichtliches Abschlussdatum dieses Leads" +msgstr "Voraussichtliches Abschlussdatum dieser Chance" #. module: portal_crm #: help:portal_crm.crm_contact_us,email_cc:0 @@ -356,8 +358,8 @@ msgid "" "addresses with a comma" msgstr "" "Diese E-Mail Adressen werden automatisch dem CC-Feld aller ein- und " -"ausgehenden Mails hinzugefügt. Trennen Sie mehrere E-Mail Adressen mit " -"Kommas." +"ausgehenden E-Mails hinzugefügt. Trennen Sie mehrere E-Mail-Adressen mit " +"Kommata." #. module: portal_crm #: selection:portal_crm.crm_contact_us,priority:0 @@ -373,7 +375,7 @@ msgstr "Abgeschlossen" #. module: portal_crm #: selection:portal_crm.crm_contact_us,state:0 msgid "Pending" -msgstr "Schwebend" +msgstr "Ausstehend" #. module: portal_crm #: field:portal_crm.crm_contact_us,state:0 @@ -388,7 +390,7 @@ msgstr "Normal" #. module: portal_crm #: field:portal_crm.crm_contact_us,email_cc:0 msgid "Global CC" -msgstr "Allgemeine CC" +msgstr "Globale CC" #. module: portal_crm #: field:portal_crm.crm_contact_us,street2:0 @@ -438,24 +440,24 @@ msgstr "Zusammenfassung" #. module: portal_crm #: view:portal_crm.crm_contact_us:0 msgid "Subject..." -msgstr "" +msgstr "Betreff..." #. module: portal_crm #: help:portal_crm.crm_contact_us,section_id:0 msgid "" "When sending mails, the default email address is taken from the sales team." msgstr "" -"Für den Mailversand wird die Standardadresse des Verkaufsteams verwendet" +"Für den E-Mail-Versand wird die Standardadresse des Verkaufsteams verwendet." #. module: portal_crm #: field:portal_crm.crm_contact_us,partner_address_name:0 msgid "Partner Contact Name" -msgstr "Partner Kontakt Name" +msgstr "Partner Kontakt" #. module: portal_crm #: view:portal_crm.crm_contact_us:0 msgid "Your phone number..." -msgstr "" +msgstr "Ihre Telefonnummer..." #. module: portal_crm #: view:portal_crm.crm_contact_us:0 @@ -465,7 +467,7 @@ msgstr "Schließen" #. module: portal_crm #: help:portal_crm.crm_contact_us,email_from:0 msgid "Email address of the contact" -msgstr "E-Mail Adresse des Kontakts" +msgstr "E-Mail-Adresse des Kontakts" #. module: portal_crm #: field:portal_crm.crm_contact_us,city:0 @@ -490,7 +492,7 @@ msgstr "Vermittelt durch" #. module: portal_crm #: selection:portal_crm.crm_contact_us,type:0 msgid "Opportunity" -msgstr "Opportunity" +msgstr "Chance" #. module: portal_crm #: view:portal_crm.crm_contact_us:0 @@ -500,7 +502,7 @@ msgstr "Name" #. module: portal_crm #: field:portal_crm.crm_contact_us,country_id:0 msgid "Country" -msgstr "Land" +msgstr "Staat" #. module: portal_crm #: view:portal_crm.crm_contact_us:0 @@ -523,7 +525,7 @@ msgstr "" #. module: portal_crm #: help:portal_crm.crm_contact_us,message_ids:0 msgid "Messages and communication history" -msgstr "Nachrichten- und Kommunikations-Historie" +msgstr "Nachrichten- und Kommunikationsverlauf" #. module: portal_crm #: help:portal_crm.crm_contact_us,type_id:0 @@ -542,7 +544,7 @@ msgstr "Hoch" #. module: portal_crm #: field:portal_crm.crm_contact_us,section_id:0 msgid "Sales Team" -msgstr "Verkaufsteam" +msgstr "Vertriebsteam" #. module: portal_crm #: field:portal_crm.crm_contact_us,street:0 @@ -557,7 +559,7 @@ msgstr "Letzte Aktion" #. module: portal_crm #: model:ir.model,name:portal_crm.model_portal_crm_crm_contact_us msgid "Contact form for the portal" -msgstr "Kontakt Formular für das Portal" +msgstr "Kontaktformular für das Portal" #~ msgid "Geo Latitude" #~ msgstr "Längengrad" diff --git a/addons/portal_hr_employees/i18n/hu.po b/addons/portal_hr_employees/i18n/hu.po index b2def417bac..c42c75f40ce 100644 --- a/addons/portal_hr_employees/i18n/hu.po +++ b/addons/portal_hr_employees/i18n/hu.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-03-10 20:30+0000\n" -"Last-Translator: krnkris \n" +"PO-Revision-Date: 2013-09-03 12:29+0000\n" +"Last-Translator: Herczeg Péter \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 06:14+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-09-04 05:03+0000\n" +"X-Generator: Launchpad (build 16753)\n" #. module: portal_hr_employees #: view:hr.employee:0 @@ -46,7 +46,7 @@ msgstr "Vállalat" #. module: portal_hr_employees #: view:hr.employee:0 msgid "Mobile:" -msgstr "" +msgstr "Mobil:" #. module: portal_hr_employees #: selection:hr.employee,visibility:0 @@ -114,4 +114,4 @@ msgstr "" #. module: portal_hr_employees #: view:hr.employee:0 msgid "Tel:" -msgstr "" +msgstr "Tel:" diff --git a/addons/portal_sale/i18n/nl.po b/addons/portal_sale/i18n/nl.po index e92975dab5b..371474423b3 100644 --- a/addons/portal_sale/i18n/nl.po +++ b/addons/portal_sale/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-04-14 11:56+0000\n" +"PO-Revision-Date: 2013-09-02 10:41+0000\n" "Last-Translator: Erwin van der Ploeg (Endian Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 06:14+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-09-03 06:08+0000\n" +"X-Generator: Launchpad (build 16753)\n" #. module: portal_sale #: model:ir.model,name:portal_sale.model_account_config_settings @@ -193,8 +193,8 @@ msgstr "" "\n" "

Hallo ${object.partner_id.name},

\n" " \n" -"

Hier is uw ${object.state in ('draft', 'sent') and 'quotation' or " -"'order confirmation'} van ${object.company_id.name}:

\n" +"

Hier is uw ${object.state in ('draft', 'sent') and 'offerte' or " +"'orderbevestiging'} van ${object.company_id.name}:

\n" "\n" "

\n" "   REFERENTIES
\n" diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po index fdd010c8786..a420894e00c 100644 --- a/addons/product/i18n/pt_BR.po +++ b/addons/product/i18n/pt_BR.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-07-18 21:01+0000\n" -"Last-Translator: Claudio de Araujo Santos \n" +"PO-Revision-Date: 2013-09-03 18:25+0000\n" +"Last-Translator: Luis Felipe Miléo \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-19 06:36+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-09-04 05:03+0000\n" +"X-Generator: Launchpad (build 16753)\n" #. module: product #: field:product.packaging,rows:0 @@ -2027,7 +2027,7 @@ msgstr "Mensagens" #. module: product #: model:product.uom,name:product.product_uom_unit msgid "Unit(s)" -msgstr "Unidade(s)" +msgstr "UN" #. module: product #: code:addons/product/product.py:176 diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py index 4b59856b6d8..331fb957e8e 100644 --- a/addons/product/pricelist.py +++ b/addons/product/pricelist.py @@ -95,6 +95,7 @@ class product_pricelist(osv.osv): _name = "product.pricelist" _description = "Pricelist" + _order = 'name' _columns = { 'name': fields.char('Pricelist Name',size=64, required=True, translate=True), 'active': fields.boolean('Active', help="If unchecked, it will allow you to hide the pricelist without removing it."), @@ -113,6 +114,27 @@ class product_pricelist(osv.osv): result.append((pl.id,name)) return result + def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100): + if name and operator == '=' and not args: + # search on the name of the pricelist and its currency, opposite of name_get(), + # Used by the magic context filter in the product search view. + query_args = {'name': name, 'limit': limit} + query = """SELECT p.id + FROM product_pricelist p JOIN + res_currency c ON (p.currency_id = c.id) + WHERE p.name || ' (' || c.name || ')' = %(name)s + ORDER BY p.name""" + if limit: + query += " LIMIT %(limit)s" + cr.execute(query, query_args) + ids = [r[0] for r in cr.fetchall()] + # regular search() to apply ACLs - may limit results below limit in some cases + ids = self.search(cr, uid, [('id', 'in', ids)], limit=limit, context=context) + if ids: + return self.name_get(cr, uid, ids, context) + return super(product_pricelist, self).name_search( + cr, uid, name, args, operator=operator, context=context, limit=limit) + def _get_currency(self, cr, uid, ctx): comp = self.pool.get('res.users').browse(cr, uid, uid).company_id diff --git a/addons/product/product.py b/addons/product/product.py index 82b37f7b9e8..cc60dddd6e4 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -420,6 +420,11 @@ class product_product(osv.osv): pricelist = context.get('pricelist', False) partner = context.get('partner', False) if pricelist: + # Support context pricelists specified as display_name or ID for compatibility + if isinstance(pricelist, basestring): + pricelist_ids = self.pool.get('product.pricelist').name_search( + cr, uid, pricelist, operator='=', context=context, limit=1) + pricelist = pricelist_ids[0][0] if pricelist_ids else pricelist for id in ids: try: price = self.pool.get('product.pricelist').price_get(cr,uid,[pricelist], id, quantity, partner=partner, context=context)[pricelist] diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 8ca8f5923ee..0ce5382cbef 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -15,7 +15,7 @@ - + diff --git a/addons/project/i18n/nl.po b/addons/project/i18n/nl.po index 49a50caf08f..484b818e733 100644 --- a/addons/project/i18n/nl.po +++ b/addons/project/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-08-08 10:20+0000\n" +"PO-Revision-Date: 2013-09-04 06:51+0000\n" "Last-Translator: Erwin van der Ploeg (Endian Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-08-09 05:35+0000\n" -"X-Generator: Launchpad (build 16723)\n" +"X-Launchpad-Export-Date: 2013-09-05 05:18+0000\n" +"X-Generator: Launchpad (build 16758)\n" #. module: project #: view:project.project:0 @@ -1322,7 +1322,7 @@ msgstr "%s (kopie)" #. module: project #: model:mail.message.subtype,name:project.mt_project_task_stage msgid "Task Stage Changed" -msgstr "Taakstadium gewijzigd" +msgstr "Fase taak gewijzigd" #. module: project #: view:project.task:0 diff --git a/addons/project/project.py b/addons/project/project.py index 0a6c62fe784..e413e5d6038 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -736,6 +736,16 @@ class task(base_stage, osv.osv): new_name = _("%s (copy)") % (default.get('name', '')) default.update({'name':new_name}) return super(task, self).copy_data(cr, uid, id, default, context) + + def copy(self, cr, uid, id, default=None, context=None): + if context is None: + context = {} + if default is None: + default = {} + stage = self._get_default_stage_id(cr, uid, context=context) + if stage: + default['stage_id'] = stage + return super(task, self).copy(cr, uid, id, default, context) def _is_template(self, cr, uid, ids, field_name, arg, context=None): res = {} diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index e2195c6f61b..e4b16e7daa2 100644 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -51,7 +51,7 @@ - + diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po index 297c3f596eb..2d1a47f902a 100644 --- a/addons/purchase/i18n/lt.po +++ b/addons/purchase/i18n/lt.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-04-30 16:28+0000\n" -"Last-Translator: Giedrius Slavinskas - inovera.lt \n" +"PO-Revision-Date: 2013-09-04 08:24+0000\n" +"Last-Translator: Eimis \n" "Language-Team: Lithuanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 06:19+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-09-05 05:18+0000\n" +"X-Generator: Launchpad (build 16758)\n" #. module: purchase #: model:res.groups,name:purchase.group_analytic_accounting @@ -25,7 +25,7 @@ msgstr "Pirkimų analitinė apskaita" #. 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 @@ -134,7 +134,7 @@ msgstr "Pirkimo kaina-Savikaina" #: code:addons/purchase/purchase.py:1037 #, python-format msgid "No supplier defined for this product !" -msgstr "" +msgstr "Šiam produktui nenustatytas tiekėjas!" #. module: purchase #: help:res.company,po_lead:0 diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po index 94ba9116c4c..bae6c28c39d 100644 --- a/addons/sale/i18n/nl.po +++ b/addons/sale/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-20 12:15+0000\n" +"PO-Revision-Date: 2013-09-02 10:40+0000\n" "Last-Translator: Erwin van der Ploeg (Endian Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 06:21+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-09-03 06:08+0000\n" +"X-Generator: Launchpad (build 16753)\n" #. module: sale #: model:ir.model,name:sale.model_account_config_settings @@ -1658,8 +1658,8 @@ msgstr "" "\n" "

Hallo ${object.partner_id.name},

\n" " \n" -"

Hier is uw ${object.state in ('draft', 'sent') and 'quotation' or " -"'order confirmation'} van ${object.company_id.name}:

\n" +"

Hier is uw ${object.state in ('draft', 'sent') and 'offerte' or " +"'orderbevestiging'} van ${object.company_id.name}:

\n" "\n" "

\n" "   REFERENTIE
\n" diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po index a3ffd6a8967..f784cbba0b6 100644 --- a/addons/sale/i18n/zh_CN.po +++ b/addons/sale/i18n/zh_CN.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-08-29 00:53+0000\n" +"PO-Revision-Date: 2013-09-07 07:19+0000\n" "Last-Translator: youring \n" "Language-Team: Chinese (Simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-08-30 05:24+0000\n" -"X-Generator: Launchpad (build 16750)\n" +"X-Launchpad-Export-Date: 2013-09-08 05:03+0000\n" +"X-Generator: Launchpad (build 16760)\n" #. module: sale #: model:ir.model,name:sale.model_account_config_settings @@ -265,7 +265,7 @@ msgstr "折扣(%)" #. module: sale #: view:sale.order.line.make.invoice:0 msgid "Create & View Invoice" -msgstr "创建和查看发票" +msgstr "生成并查看发票" #. module: sale #: view:board.board:0 @@ -774,7 +774,7 @@ msgstr "已送货" #. module: sale #: view:sale.advance.payment.inv:0 msgid "Create and View Invoice" -msgstr "创建和查看发票" +msgstr "生成并查看发票" #. module: sale #: report:sale.order:0 diff --git a/addons/sale_stock/i18n/zh_CN.po b/addons/sale_stock/i18n/zh_CN.po index 90deb4e5c83..69c2046d66c 100644 --- a/addons/sale_stock/i18n/zh_CN.po +++ b/addons/sale_stock/i18n/zh_CN.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-08-14 01:39+0000\n" -"Last-Translator: 盈通 ccdos \n" +"PO-Revision-Date: 2013-09-07 07:15+0000\n" +"Last-Translator: youring \n" "Language-Team: Chinese (Simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-08-15 05:51+0000\n" -"X-Generator: Launchpad (build 16723)\n" +"X-Launchpad-Export-Date: 2013-09-08 05:03+0000\n" +"X-Generator: Launchpad (build 16760)\n" #. module: sale_stock #: help:sale.config.settings,group_invoice_deli_orders:0 @@ -219,7 +219,7 @@ msgstr "转移给客户的单据" #. module: sale_stock #: view:sale.order:0 msgid "View Delivery Order" -msgstr "发运单视图" +msgstr "查看出货单" #. module: sale_stock #: field:sale.order.line,move_ids:0 diff --git a/addons/survey/i18n/nl.po b/addons/survey/i18n/nl.po index 29a555fa612..eb09db132b5 100644 --- a/addons/survey/i18n/nl.po +++ b/addons/survey/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-26 12:59+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) \n" +"PO-Revision-Date: 2013-09-03 21:29+0000\n" +"Last-Translator: Ronald Portier (Therp) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 06:25+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-09-04 05:03+0000\n" +"X-Generator: Launchpad (build 16753)\n" #. module: survey #: view:survey.response.line:0 @@ -439,9 +439,9 @@ msgstr "" "U kunt naar de enquête gaan met de volgende parameters:\n" "URL: %s\n" "\n" -" Uw login ID: %%(login)\n" +" Uw login ID: %%(login)s\n" "\n" -" Uw wachtwoord: %%(passwd)\n" +" Uw wachtwoord: %%(passwd)s\n" "\n" "\n" "\n"