From 49ad2f0f510451eb416f9245d2fb16a73a688e2e Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Thu, 13 Sep 2012 09:09:52 +0200 Subject: [PATCH 01/18] [FIX] Reports (Balance Sheet, P&L,...) for consolidated companies can now correctly be generated bzr revid: cbi@openerp.com-20120913070952-zlk7q9l53tc3r3su --- addons/account/account.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 72ce11f05ea..b23ac2d0ee1 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1095,10 +1095,14 @@ class account_period(osv.osv): raise osv.except_osv(_('Error'), _('You should have chosen periods that belongs to the same company')) if period_date_start > period_date_stop: raise osv.except_osv(_('Error'), _('Start period should be smaller then End period')) - #for period from = january, we want to exclude the opening period (but it has same date_from, so we have to check if period_from is special or not to include that clause or not in the search). + + # /!\ We do not include a criterion on the company_id field below, to allow producing consolidated reports + # on multiple companies. It will only work when start/end periods are selected and no fiscal year is chosen. + + # for period from = january, we want to exclude the opening period (but it has same date_from, so we have to check if period_from is special or not to include that clause or not in the search). if period_from.special: - return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id)]) - return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id), ('special', '=', False)]) + return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop)]) + return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('special', '=', False)]) account_period() From 6159b5d091a4f88b0693b85d0f8572d8dd5353ea Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Mon, 24 Sep 2012 14:41:40 +0200 Subject: [PATCH 02/18] [FIX] all except pot bzr revid: cbi@openerp.com-20120924124140-qkwugz9fhpihhe68 --- addons/account/account_report.xml | 4 +++- addons/account_budget/account_budget_report.xml | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml index 86bc571a5a6..2dc3dd6e4d9 100644 --- a/addons/account/account_report.xml +++ b/addons/account/account_report.xml @@ -2,6 +2,8 @@ + + @@ -16,7 +18,7 @@ auto="False" id="account_invoices" model="account.invoice" - name="account.invoice" + name="account.invoice" rml="account/report/account_print_invoice.rml" string="Invoices" attachment="(object.state in ('open','paid')) and ('INV'+(object.number or '').replace('/','')+'.pdf')" diff --git a/addons/account_budget/account_budget_report.xml b/addons/account_budget/account_budget_report.xml index 68a055b93e1..365625e88c2 100644 --- a/addons/account_budget/account_budget_report.xml +++ b/addons/account_budget/account_budget_report.xml @@ -19,6 +19,14 @@ name="account.budget" rml="account_budget/report/budget_report.rml" string="Budget"/> + + - \ No newline at end of file + From e512a7b5608c57b647fc3d1d7646fd8765ebeb53 Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Mon, 24 Sep 2012 14:41:43 +0200 Subject: [PATCH 03/18] [FIX] all except pot bzr revid: cbi@openerp.com-20120924124143-zu8jac0koz5mu8en --- addons/stock/report/lot_move_label.xsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/report/lot_move_label.xsl b/addons/stock/report/lot_move_label.xsl index 57b29e69405..2a15feb9f66 100644 --- a/addons/stock/report/lot_move_label.xsl +++ b/addons/stock/report/lot_move_label.xsl @@ -54,8 +54,8 @@ , - Serial: - Tracking: + Serial: + Tracking: From d13f3019c0fabe4c9a62e0a496f664a1edb9db90 Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Mon, 24 Sep 2012 14:41:47 +0200 Subject: [PATCH 04/18] [FIX] all except pot bzr revid: cbi@openerp.com-20120924124147-7a8jdgbg0pm27uiu --- addons/account/report/account_aged_partner_balance.rml | 6 +++--- addons/account/report/account_balance.rml | 8 ++++---- addons/account/report/account_general_journal.rml | 4 ++-- .../account/report/account_general_ledger_landscape.rml | 6 +++--- addons/account/report/account_journal.rml | 4 ++-- addons/account/report/account_journal_sale_purchase.rml | 4 ++-- addons/account_payment/report/order.rml | 6 +++--- addons/stock/report/picking.rml | 6 +++--- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml index fb79ab0d199..787c7789495 100644 --- a/addons/account/report/account_aged_partner_balance.rml +++ b/addons/account/report/account_aged_partner_balance.rml @@ -121,7 +121,7 @@ Start Date - Period Length(days) + Period Length (days) Partner's @@ -150,7 +150,7 @@ [[ get_partners(data) ]] - [[ data['form']['direction_selection'] ]] + [[ get_direction_selection(data) ]] [[ get_target_move(data) ]] @@ -166,7 +166,7 @@ Partners - [[ data['form']['direction_selection'] == 'future' and 'Due' or 'Not due' ]] + [[ data['form']['direction_selection'] == 'future' and translate('Due') or translate('Not due') ]] [[ data['form']['4']['name'] ]] diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index 88980a9cd97..6a6375438ca 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -212,7 +212,7 @@ [[ data['model']=='account.account' and 'Company'or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]] + [[ data['model']=='ir.ui.menu' and translate('Chart of Accounts') or removeParentNode('para') ]] Fiscal Year @@ -220,7 +220,7 @@ Display Account - Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]] + Filter By [[ has_filter(data) and get_filter(data) ]] Target Moves @@ -233,8 +233,8 @@ [[ get_fiscalyear(data) or '' ]] - [[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']] - [[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] + [[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and translate('With movements')) or translate('With balance is not equal to 0')]] + [[ not has_filter(data) and get_filter(data) or removeParentNode('para') ]] [[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml index 4ad086d6bd4..69cd931d29b 100644 --- a/addons/account/report/account_general_journal.rml +++ b/addons/account/report/account_general_journal.rml @@ -220,8 +220,8 @@ - [[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]] + [[ data['model']=='account.journal.period' and translate('Company') or removeParentNode('para') ]] + [[ data['model']=='ir.ui.menu' and translate('Chart of Accounts') or removeParentNode('para') ]] Fiscal Year Journals Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]] diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml index 79003c5aaa6..8a6be8c4d46 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -360,8 +360,8 @@ - [[ data['model']=='account.account' and 'Company' or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]] + [[ data['model']=='account.account' and translate('Company') or removeParentNode('para') ]] + [[ data['model']=='ir.ui.menu' and translate('Chart of Accounts') or removeParentNode('para') ]] Fiscal Year @@ -395,7 +395,7 @@ [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] - [[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and 'With movements') or 'With balance is not equal to 0']] + [[ (data['form']['display_account']=='all' and translate('All')) or (data['form']['display_account']=='movement' and translate('With movements')) or translate('With balance is not equal to 0')]] [[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml index fb203d4e664..407cc04c92d 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -186,8 +186,8 @@ - [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]] + [[ data['model']=='account.journal.period'and translate('Company') or removeParentNode('para') ]] + [[ data['model']=='ir.ui.menu' and translate('Chart of Accounts') or removeParentNode('para') ]] Fiscal Year Journal Period diff --git a/addons/account/report/account_journal_sale_purchase.rml b/addons/account/report/account_journal_sale_purchase.rml index 68f93b88294..1b9c027fcea 100644 --- a/addons/account/report/account_journal_sale_purchase.rml +++ b/addons/account/report/account_journal_sale_purchase.rml @@ -186,8 +186,8 @@ - [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]] + [[ data['model']=='account.journal.period'and translate('Company') or removeParentNode('para') ]] + [[ data['model']=='ir.ui.menu' and translate('Chart of Accounts') or removeParentNode('para') ]] Fiscal Year Journal Period diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml index da6269c7b00..208b340ef46 100644 --- a/addons/account_payment/report/order.rml +++ b/addons/account_payment/report/order.rml @@ -205,9 +205,9 @@ [[get_account_name(o.mode.bank_id.id)]] - [[ o.date_prefered == 'now' and 'Now' or removeParentNode('para') ]] - [[ o.date_prefered == 'due' and 'Due date' or removeParentNode('para') ]] - [[ o.date_prefered == 'fixed' and 'Fixed date' or removeParentNode('para') ]] + [[ o.date_prefered == 'now' and translate('Now') or removeParentNode('para') ]] + [[ o.date_prefered == 'due' and translate('Due date') or removeParentNode('para') ]] + [[ o.date_prefered == 'fixed' and translate('Fixed date') or removeParentNode('para') ]] [[ o.user_id and o.user_id.company_id and o.user_id.company_id.currency_id and o.user_id.company_id.currency_id.name or '' ]] diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index d6fe80ae882..ea86e6ef6d3 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -262,7 +262,7 @@ [[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]] - [[ move_lines.state ]] + [[ move_lines.state == 'confirmed' and translate('Waiting Availability') or move_lines.state == 'done' and translate('Done') or move_lines.state == 'assigned' and translate('Available')]] [[ (move_lines.location_id and move_lines.location_id.name) or '' ]] @@ -273,7 +273,7 @@ - [[ ([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting' )]) and 'Non Assigned Products:' or removeParentNode('para') ]] + [[ ([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting' )]) and translate('Non Assigned Products:') or removeParentNode('para') ]]
[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]] @@ -287,7 +287,7 @@ [[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]] - [[ move_lines.state ]] + [[ move_lines.state == 'draft' and translate('New') or move_lines.state == 'waiting' and translate('Waiting Another Move') ]] [[ (move_lines.location_id and move_lines.location_id.name) or '' ]] From b6366e26121a7dc15c67e7793ca18af2142b202c Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Mon, 24 Sep 2012 14:41:57 +0200 Subject: [PATCH 05/18] [FIX] all except pot bzr revid: cbi@openerp.com-20120924124157-i93uxqu8hudaffcp --- addons/account/account.py | 6 +- .../report/account_aged_partner_balance.py | 15 +++- addons/account/report/account_balance.py | 1 + .../account/report/account_general_ledger.py | 1 + addons/account/report/account_journal.py | 12 +-- .../account/report/account_partner_ledger.py | 6 +- addons/account/report/account_tax_report.py | 7 +- addons/account/report/common_report_header.py | 11 ++- .../wizard/account_report_print_journal.py | 2 +- .../report/analytic_account_budget_report.py | 2 +- .../account_payment/report/payment_order.py | 2 +- addons/mail/mail_message.py | 2 + addons/product/report/product_pricelist.py | 2 +- addons/project_issue/project_issue.py | 19 +---- addons/resource/resource.py | 81 +++++++++++-------- addons/stock/report/product_stock.py | 6 +- addons/stock/report/stock_graph.py | 16 +++- 17 files changed, 110 insertions(+), 81 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index b23ac2d0ee1..1da45c51d14 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1095,11 +1095,7 @@ class account_period(osv.osv): raise osv.except_osv(_('Error'), _('You should have chosen periods that belongs to the same company')) if period_date_start > period_date_stop: raise osv.except_osv(_('Error'), _('Start period should be smaller then End period')) - - # /!\ We do not include a criterion on the company_id field below, to allow producing consolidated reports - # on multiple companies. It will only work when start/end periods are selected and no fiscal year is chosen. - - # for period from = january, we want to exclude the opening period (but it has same date_from, so we have to check if period_from is special or not to include that clause or not in the search). + #for period from = january, we want to exclude the opening period (but it has same date_from, so we have to check if period_from is special or not to include that clause or not in the search). if period_from.special: return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop)]) return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('special', '=', False)]) diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py index 2812fd409e6..88480a36310 100644 --- a/addons/account/report/account_aged_partner_balance.py +++ b/addons/account/report/account_aged_partner_balance.py @@ -22,6 +22,7 @@ import time from report import report_sxw from common_report_header import common_report_header +from tools.translate import _ class aged_trial_report(report_sxw.rml_parse, common_report_header): @@ -41,6 +42,7 @@ class aged_trial_report(report_sxw.rml_parse, common_report_header): 'get_account': self._get_account, 'get_fiscalyear': self._get_fiscalyear, 'get_target_move': self._get_target_move, + 'get_direction_selection': self._get_direction_selection, }) def set_context(self, objects, data, ids, report_type=None): @@ -367,13 +369,20 @@ class aged_trial_report(report_sxw.rml_parse, common_report_header): def _get_partners(self,data): if data['form']['result_selection'] == 'customer': - return 'Receivable Accounts' + return _('Receivable Accounts') elif data['form']['result_selection'] == 'supplier': - return 'Payable Accounts' + return _('Payable Accounts') elif data['form']['result_selection'] == 'customer_supplier': - return 'Receivable and Payable Accounts' + return _('Receivable and Payable Accounts') return '' + def _get_direction_selection(self, data): + if data['form']['direction_selection'] == 'past': + return _('Past') + elif data['form']['direction_selection'] == 'future': + return _('Future') + return '' + report_sxw.report_sxw('report.account.aged_trial_balance', 'res.partner', 'addons/account/report/account_aged_partner_balance.rml',parser=aged_trial_report, header="internal landscape") diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index c3117e60379..deaf5fb6e4d 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -41,6 +41,7 @@ class account_balance(report_sxw.rml_parse, common_report_header): 'sum_credit': self._sum_credit, 'get_fiscalyear':self._get_fiscalyear, 'get_filter': self._get_filter, + 'has_filter': self._has_filter, 'get_start_period': self.get_start_period, 'get_end_period': self.get_end_period , 'get_account': self._get_account, diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py index 294c7fa99cf..0512f69d6e7 100644 --- a/addons/account/report/account_general_ledger.py +++ b/addons/account/report/account_general_ledger.py @@ -83,6 +83,7 @@ class general_ledger(report_sxw.rml_parse, common_report_header): 'get_start_period': self.get_start_period, 'get_end_period': self.get_end_period, 'get_filter': self._get_filter, + 'has_filter': self._has_filter, 'get_sortby': self._get_sortby, 'get_start_date':self._get_start_date, 'get_end_date':self._get_end_date, diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py index 2669a3d174c..c3d0806fc4b 100644 --- a/addons/account/report/account_journal.py +++ b/addons/account/report/account_journal.py @@ -23,6 +23,8 @@ import time from common_report_header import common_report_header from report import report_sxw +from tools.translate import _ + class journal_print(report_sxw.rml_parse, common_report_header): def __init__(self, cr, uid, name, context=None): @@ -189,11 +191,11 @@ class journal_print(report_sxw.rml_parse, common_report_header): return data['form']['amount_currency'] def _get_sortby(self, data): - if self.sort_selection == 'date': - return 'Date' - elif self.sort_selection == 'ref': - return 'Reference Number' - return 'Date' + if self.sort_selection == 'l.date': + return _('Date') + elif self.sort_selection == 'am.name': + return _('Journal Entry Number') + return _('Date') report_sxw.report_sxw('report.account.journal.period.print', 'account.journal.period', 'addons/account/report/account_journal.rml', parser=journal_print, header='internal') report_sxw.report_sxw('report.account.journal.period.print.sale.purchase', 'account.journal.period', 'addons/account/report/account_journal_sale_purchase.rml', parser=journal_print, header='internal') diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py index ca0515c9f08..007dbcef4a1 100644 --- a/addons/account/report/account_partner_ledger.py +++ b/addons/account/report/account_partner_ledger.py @@ -391,11 +391,11 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header): def _get_partners(self): if self.result_selection == 'customer': - return 'Receivable Accounts' + return _('Receivable Accounts') elif self.result_selection == 'supplier': - return 'Payable Accounts' + return _('Payable Accounts') elif self.result_selection == 'customer_supplier': - return 'Receivable and Payable Accounts' + return _('Receivable and Payable Accounts') return '' def _sum_currency_amount_account(self, account, form): diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py index 2a0c5987b47..e167d35b888 100644 --- a/addons/account/report/account_tax_report.py +++ b/addons/account/report/account_tax_report.py @@ -23,6 +23,7 @@ import time from common_report_header import common_report_header from report import report_sxw +from tools.translate import _ class tax_report(report_sxw.rml_parse, common_report_header): _name = 'report.account.vat.declaration' @@ -62,7 +63,11 @@ class tax_report(report_sxw.rml_parse, common_report_header): }) def _get_basedon(self, form): - return form['form']['based_on'] + based_on = form['form']['based_on'] + if based_on == 'invoices': + return _('Invoices') + elif based_on == 'payments': + return _('Payments') def _get_lines(self, based_on, company_id=False, parent=False, level=0, context=None): period_list = self.period_ids diff --git a/addons/account/report/common_report_header.py b/addons/account/report/common_report_header.py index c0365875bdc..799ea1c39a5 100644 --- a/addons/account/report/common_report_header.py +++ b/addons/account/report/common_report_header.py @@ -92,12 +92,15 @@ class common_report_header(object): raise (_('Error'), _('Not implemented')) def _get_filter(self, data): - if data.get('form', False) and data['form'].get('filter', False): + if self._has_filter(data): if data['form']['filter'] == 'filter_date': - return 'Date' + return _('Date') elif data['form']['filter'] == 'filter_period': - return 'Periods' - return 'No Filter' + return _('Periods') + return _('No Filters') + + def _has_filter(self, data): + return data.get('form', False) and data['form'].get('filter', False) and data['form'].get('filter', False) != 'filter_no' def _sum_debit_period(self, period_id, journal_id=None): journals = journal_id or self.journal_ids diff --git a/addons/account/wizard/account_report_print_journal.py b/addons/account/wizard/account_report_print_journal.py index 0ffbde3fa9e..799c5349df8 100644 --- a/addons/account/wizard/account_report_print_journal.py +++ b/addons/account/wizard/account_report_print_journal.py @@ -53,7 +53,7 @@ class account_print_journal(osv.osv_memory): if context.get('sale_purchase_only'): domain ="[('type', 'in', ('sale','purchase','sale_refund','purchase_refund'))]" else: - domain ="[('type', 'not in', ('sale','purchase','sale_refund','purchase_refund'))]" + domain ="[]" nodes = doc.xpath("//field[@name='journal_ids']") for node in nodes: node.set('domain', domain) diff --git a/addons/account_budget/report/analytic_account_budget_report.py b/addons/account_budget/report/analytic_account_budget_report.py index aa5d39f8d49..b23e5e5b6ff 100644 --- a/addons/account_budget/report/analytic_account_budget_report.py +++ b/addons/account_budget/report/analytic_account_budget_report.py @@ -167,4 +167,4 @@ class analytic_account_budget_report(report_sxw.rml_parse): report_sxw.report_sxw('report.account.analytic.account.budget', 'account.analytic.account', 'addons/account_budget/report/analytic_account_budget_report.rml',parser=analytic_account_budget_report,header='internal') -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_payment/report/payment_order.py b/addons/account_payment/report/payment_order.py index 0b2a8061906..68b3bc6c4b5 100644 --- a/addons/account_payment/report/payment_order.py +++ b/addons/account_payment/report/payment_order.py @@ -87,4 +87,4 @@ class payment_order(report_sxw.rml_parse): report_sxw.report_sxw('report.payment.order', 'payment.order', 'addons/account_payment/report/payment_order.rml', parser=payment_order, header="external") -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index b69869efa11..295056c66eb 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -536,9 +536,11 @@ class mail_message(osv.osv): if res: message.write({'state':'sent', 'message_id': res}) message_sent = True + print "SENT" else: message.write({'state':'exception'}) message_sent = False + print "NOT SENT" # if auto_delete=True then delete that sent messages as well as attachments if message_sent and message.auto_delete: diff --git a/addons/product/report/product_pricelist.py b/addons/product/report/product_pricelist.py index dca7828a517..09b9881d07b 100644 --- a/addons/product/report/product_pricelist.py +++ b/addons/product/report/product_pricelist.py @@ -46,7 +46,7 @@ class product_pricelist(report_sxw.rml_parse): for i in range(1,6): if form['qty'+str(i)]!=0: - vals['qty'+str(qtys)] = str(form['qty'+str(i)]) + ' units' + vals['qty'+str(qtys)] = str(form['qty'+str(i)]) + ' ' + _('units') qtys += 1 lst.append(vals) return lst diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index f0d78f53dfc..a099f30f561 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -142,27 +142,12 @@ class project_issue(crm.crm_case, osv.osv): resource_ids = res_obj.search(cr, uid, [('user_id','=',issue.user_id.id)]) if resource_ids and len(resource_ids): resource_id = resource_ids[0] - duration = float(ans.days) - if issue.project_id and issue.project_id.resource_calendar_id: - duration = float(ans.days) * 24 - - new_dates = cal_obj.interval_min_get(cr, uid, - issue.project_id.resource_calendar_id.id, - date_create, - duration, resource=resource_id) - no_days = [] - date_until = datetime.strptime(date_until, '%Y-%m-%d %H:%M:%S') - for in_time, out_time in new_dates: - if in_time.date not in no_days: - no_days.append(in_time.date) - if out_time > date_until: - break - duration = len(no_days) + duration = float(ans.days) + float(ans.seconds)/(24*3600) if field in ['working_hours_open','working_hours_close']: res[issue.id][field] = hours else: - res[issue.id][field] = abs(float(duration)) + res[issue.id][field] = duration return res diff --git a/addons/resource/resource.py b/addons/resource/resource.py index fb3d8c0980e..7578bf2f3f1 100644 --- a/addons/resource/resource.py +++ b/addons/resource/resource.py @@ -28,6 +28,7 @@ from tools.translate import _ from itertools import groupby from operator import itemgetter +import pytz class resource_calendar(osv.osv): _name = "resource.calendar" @@ -199,7 +200,7 @@ class resource_calendar(osv.osv): res = self.interval_get_multi(cr, uid, [(dt_from.strftime('%Y-%m-%d %H:%M:%S'), hours, id)], resource, byday)[(dt_from.strftime('%Y-%m-%d %H:%M:%S'), hours, id)] return res - def interval_hours_get(self, cr, uid, id, dt_from, dt_to, resource=False): + def interval_hours_get(self, cr, uid, id, dt_from, dt_to, resource=False, context=None): """ Calculates the Total Working hours based on given start_date to end_date, If resource id is supplied that it will consider the source leaves also in calculating the hours. @@ -216,41 +217,57 @@ class resource_calendar(osv.osv): return 0.0 dt_leave = self._get_leaves(cr, uid, id, resource) hours = 0.0 - - current_hour = dt_from.hour - - while (dt_from <= dt_to): + + orig_dt_from = dt_from + + users_obj = self.pool.get('res.users') + user = users_obj.browse(cr, uid, uid, context=context) + utc = pytz.timezone('UTC') + + if user.context_tz: + context_tz = pytz.timezone(user.context_tz) + else: + context_tz = utc + + # gap between UTC ans user timezone + tz_gap = (utc.localize(dt_from) - context_tz.localize(dt_from)).seconds / 3600 + + while dt_from <= dt_to: cr.execute("select hour_from,hour_to from resource_calendar_attendance where dayofweek='%s' and calendar_id=%s order by hour_from", (dt_from.weekday(),id)) - der = cr.fetchall() - for (hour_from,hour_to) in der: - if hours != 0.0:#For first time of the loop only,hours will be 0 - current_hour = hour_from + slots = cr.fetchall() + + for (hour_from, hour_to) in slots: leave_flag = False - if (hour_to>=current_hour): - dt_check = dt_from.strftime('%Y-%m-%d') - for leave in dt_leave: - if dt_check == leave: - dt_check = datetime.strptime(dt_check, "%Y-%m-%d") + timedelta(days=1) - leave_flag = True - - if leave_flag: + dt_check = dt_from.strftime('%Y-%m-%d') + for leave in dt_leave: + if dt_check == leave: + dt_check = datetime.strptime(dt_check, "%Y-%m-%d") + timedelta(days=1) + leave_flag = True + + if leave_flag: + break + else: + if dt_from.hour >= hour_to: + continue + elif dt_from.hour >= hour_from: + hour_from = dt_from.hour + dt_from.minute/60 + dt_from.second/3600 + d1 = datetime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(hour_from)), int((hour_from % 1) * 60)) + + if dt_from.day == dt_to.day and hour_from <= (dt_to.hour + tz_gap) < hour_to: + + hours += (utc.localize(dt_to) - context_tz.localize(d1)).seconds break - else: - d1 = dt_from + elif dt_from == orig_dt_from: d2 = datetime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(hour_to)), int((hour_to%1) * 60)) - - if hours != 0.0:#For first time of the loop only,hours will be 0 - d1 = datetime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(current_hour)), int((current_hour%1) * 60)) - - if dt_from.day == dt_to.day: - if hour_from <= dt_to.hour <= hour_to: - d2 = dt_to - dt_from = d2 - hours += (d2-d1).seconds - dt_from = datetime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(current_hour)), int((current_hour%1) * 60)) + timedelta(days=1) - current_hour = 0.0 - - return (hours/3600) + hours += (context_tz.localize(d2) - utc.localize(d1)).seconds + else: + d2 = datetime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(hour_to)), int((hour_to%1) * 60)) + hours += (d2 - d1).seconds + + dt_from += timedelta(days=1) + dt_from = datetime(dt_from.year, dt_from.month, dt_from.day) + + return hours / 3600 resource_calendar() diff --git a/addons/stock/report/product_stock.py b/addons/stock/report/product_stock.py index b7dd254234c..59c60676895 100644 --- a/addons/stock/report/product_stock.py +++ b/addons/stock/report/product_stock.py @@ -56,11 +56,11 @@ class report_stock(report_int): dt_from = now dt_to = now - names = dict(pooler.get_pool(cr.dbname).get('product.product').name_get(cr, uid, product_ids)) + names = dict(pooler.get_pool(cr.dbname).get('product.product').name_get(cr, uid, product_ids, context=context),) for name in names: names[name] = names[name].encode('utf8') products = {} - prods = pooler.get_pool(cr.dbname).get('stock.location')._product_all_get(cr, uid, location_id, product_ids) + prods = pooler.get_pool(cr.dbname).get('stock.location')._product_all_get(cr, uid, location_id, product_ids, context=context) for p in prods: products[p] = [(now,prods[p])] @@ -102,7 +102,7 @@ class report_stock(report_int): qty = 0 io = StringIO.StringIO() - gt = stock_graph.stock_graph(io) + gt = stock_graph.stock_graph(io, context['lang'], cr) for prod_id in products: gt.add(prod_id, names.get(prod_id, 'Unknown'), products[prod_id]) gt.draw() diff --git a/addons/stock/report/stock_graph.py b/addons/stock/report/stock_graph.py index 5ee58bb9d2c..2b1e18f1160 100644 --- a/addons/stock/report/stock_graph.py +++ b/addons/stock/report/stock_graph.py @@ -22,19 +22,23 @@ from pychart import * import pychart.legend import time from report.misc import choice_colors +from tools.translate import _ +import inspect # # Draw a graph for stocks # class stock_graph(object): - def __init__(self, io): + def __init__(self, io, lang, cr): self._datas = {} self._canvas = canvas.init(fname=io, format='pdf') self._canvas.set_author("OpenERP") - self._canvas.set_title("Stock Level Forecast") + self._canvas.set_title(_("Stock Level Forecast")) self._names = {} self.val_min = '' self.val_max = '' + self._lang = lang + self._cr = cr def add(self, product_id, product_name, datas): if hasattr(product_name, 'replace'): @@ -90,12 +94,16 @@ class stock_graph(object): plot = line_plot.T(label=self._names[product_id], data=datas2, line_style=st) plots.append(plot) + # Cheating to make them available in _(...) calls + context = {'lang': self._lang} + cr = self._cr + interval = max((val_max-val_min)/15, 86400) x_axis = axis.X(format=lambda x:'/a60{}'+time.strftime('%Y-%m-%d',time.gmtime(x)), tic_interval=interval, label=None) # For add the report header on the top of the report. - tb = text_box.T(loc=(300, 500), text="/hL/15/bStock Level Forecast", line_style=None) + tb = text_box.T(loc=(300, 500), text="/hL/15/b%s" % _("Stock Level Forecast"), line_style=None) tb.draw() - ar = area.T(size = (620,435), x_range=(val_min,val_max+1), y_axis = axis.Y(format="%d", label="Virtual Stock (Unit)"), x_axis=x_axis) + ar = area.T(size = (620,435), x_range=(val_min,val_max+1), y_axis = axis.Y(format="%d", label=_("Virtual Stock (Unit)")), x_axis=x_axis) for plot in plots: ar.add_plot(plot) ar.draw(self._canvas) From e8fe0a099f3937be2f39939a37363c0dbdc859fd Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Mon, 24 Sep 2012 15:30:53 +0200 Subject: [PATCH 06/18] [FIX] new pot file bzr revid: cbi@openerp.com-20120924133053-9lzwm9s3tnx69822 --- addons/account/i18n/account.pot | 645 +++++++++++++++++++++----------- 1 file changed, 419 insertions(+), 226 deletions(-) diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index a3831438831..14427c1bedd 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.1rc1\n" +"Project-Id-Version: OpenERP Server 6.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-02-08 00:35+0000\n" +"POT-Creation-Date: 2012-09-24 13:21+0000\n" +"PO-Revision-Date: 2012-09-24 13:21+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -95,6 +95,11 @@ msgstr "" msgid "wizard.multi.charts.accounts" msgstr "" +#. module: account +#: report:account.aged_trial_balance:0 +msgid "Aged Trial Balance" +msgstr "" + #. module: account #: view:account.move:0 msgid "Total Debit" @@ -132,6 +137,7 @@ msgstr "" #: field:account.move,ref:0 #: field:account.move.line,ref:0 #: field:account.subscription,ref:0 +#: xsl:account.transfer:0 msgid "Reference" msgstr "" @@ -146,13 +152,13 @@ msgid "If the active field is set to False, it will allow you to hide the paymen msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1428 +#: code:addons/account/account_invoice.py:1430 #, python-format msgid "Warning!" msgstr "" #. module: account -#: code:addons/account/account.py:3112 +#: code:addons/account/account.py:3129 #, python-format msgid "Miscellaneous Journal" msgstr "" @@ -212,7 +218,7 @@ msgid "Check this box if you don't want any VAT related to this Tax Code to appe msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1241 +#: code:addons/account/account_invoice.py:1254 #, python-format msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)" msgstr "" @@ -228,7 +234,7 @@ msgid "Belgian Reports" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1200 +#: code:addons/account/account_move_line.py:1215 #, python-format msgid "You can not add/modify entries in a closed journal." msgstr "" @@ -271,7 +277,7 @@ msgid "St." msgstr "" #. module: account -#: code:addons/account/account_invoice.py:551 +#: code:addons/account/account_invoice.py:560 #, python-format msgid "Invoice line account company does not match with invoice company." msgstr "" @@ -529,6 +535,7 @@ msgstr "" #. module: account #: selection:account.balance.report,display_account:0 #: selection:account.common.account.report,display_account:0 +#: report:account.general.ledger_landscape:0 #: selection:account.report.general.ledger,display_account:0 #: selection:account.tax,type_tax_use:0 #: selection:account.tax.template,type_tax_use:0 @@ -582,7 +589,7 @@ msgid "Main Sequence must be different from current !" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1251 +#: code:addons/account/account_move_line.py:1266 #, python-format msgid "No period found or more than one period found for the given date." msgstr "" @@ -593,7 +600,7 @@ msgid "Tax Code Amount" msgstr "" #. module: account -#: code:addons/account/account.py:3116 +#: code:addons/account/account.py:3133 #, python-format msgid "SAJ" msgstr "" @@ -620,8 +627,8 @@ msgid "Journal Period" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:750 -#: code:addons/account/account_move_line.py:803 +#: code:addons/account/account_move_line.py:766 +#: code:addons/account/account_move_line.py:819 #, python-format msgid "To reconcile the entries company should be the same for all entries" msgstr "" @@ -632,7 +639,9 @@ msgstr "" #: selection:account.common.partner.report,result_selection:0 #: selection:account.partner.balance,result_selection:0 #: selection:account.partner.ledger,result_selection:0 +#: code:addons/account/report/account_aged_partner_balance.py:372 #: code:addons/account/report/account_partner_balance.py:297 +#: code:addons/account/report/account_partner_ledger.py:394 #: model:ir.actions.act_window,name:account.action_aged_receivable #, python-format msgid "Receivable Accounts" @@ -680,7 +689,6 @@ msgstr "" #. module: account #: selection:account.payment.term.line,value:0 -#: selection:account.tax.template,type:0 msgid "Percent" msgstr "" @@ -708,6 +716,7 @@ msgid "You can only change currency for Draft Invoice !" msgstr "" #. module: account +#: model:ir.actions.report.xml,name:account.account_financial_report #: model:ir.ui.menu,name:account.menu_account_report msgid "Financial Report" msgstr "" @@ -723,12 +732,13 @@ msgstr "" #: view:account.journal:0 #: field:account.journal,type:0 #: field:account.move.reconcile,type:0 +#: xsl:account.transfer:0 #: field:report.invoice.created,type:0 msgid "Type" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:738 +#: code:addons/account/account_invoice.py:747 #, python-format msgid "Taxes are missing!\n" "Click on compute button." @@ -846,22 +856,17 @@ msgid "Create 3 Months Periods" msgstr "" #. module: account +#: report:account.aged_trial_balance:0 #: report:account.overdue:0 msgid "Due" msgstr "" #. module: account -#: code:addons/account/account.py:1345 +#: code:addons/account/account.py:1353 #, python-format msgid "You cannot validate this journal entry because account \"%s\" does not belong to chart of accounts \"%s\"!" msgstr "" -#. module: account -#: code:addons/account/account_move_line.py:835 -#, python-format -msgid "This account does not allow reconciliation! You should update the account definition to change this." -msgstr "" - #. module: account #: view:account.invoice:0 #: view:account.move:0 @@ -922,7 +927,7 @@ msgid "If the Tax account is a tax code account, this field will contain the tax msgstr "" #. module: account -#: code:addons/account/account.py:2596 +#: code:addons/account/account.py:2613 #, python-format msgid "I can not locate a parent code for the template account!" msgstr "" @@ -955,10 +960,10 @@ msgid "Code" msgstr "" #. module: account -#: code:addons/account/account.py:2268 +#: code:addons/account/account.py:2285 #: code:addons/account/account_bank_statement.py:357 #: code:addons/account/account_invoice.py:73 -#: code:addons/account/account_invoice.py:688 +#: code:addons/account/account_invoice.py:697 #: code:addons/account/account_move_line.py:173 #, python-format msgid "No Analytic Journal !" @@ -1016,7 +1021,7 @@ msgid "These types are defined according to your country. The type contains more msgstr "" #. module: account -#: code:addons/account/account_move_line.py:842 +#: code:addons/account/account_move_line.py:856 #, python-format msgid "You have to provide an account for the write off/exchange difference entry !" msgstr "" @@ -1063,7 +1068,7 @@ msgstr "" #. module: account #: model:account.account.type,name:account.data_account_type_bank #: selection:account.bank.accounts.wizard,account_type:0 -#: code:addons/account/account.py:3003 +#: code:addons/account/account.py:3020 #, python-format msgid "Bank" msgstr "" @@ -1149,7 +1154,7 @@ msgid "The move of this entry line." msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1302 +#: code:addons/account/account_move_line.py:1317 #, python-format msgid "You can not use this general account in this journal, check the tab 'Entry Controls' on the related journal !" msgstr "" @@ -1168,7 +1173,7 @@ msgid "Entry Label" msgstr "" #. module: account -#: code:addons/account/account.py:1129 +#: code:addons/account/account.py:1136 #, python-format msgid "You can not modify/delete a journal with entries for this period !" msgstr "" @@ -1253,14 +1258,15 @@ msgid "Taxes" msgstr "" #. module: account -#: code:addons/account/wizard/account_financial_report.py:69 -#: code:addons/account/wizard/account_report_common.py:144 +#: code:addons/account/wizard/account_financial_report.py:70 +#: code:addons/account/wizard/account_report_common.py:145 #, python-format msgid "Select a starting and an ending period" msgstr "" #. module: account #: model:account.financial.report,name:account.account_financial_report_profitandloss0 +#: model:ir.actions.act_window,name:account.action_account_report_pl msgid "Profit and Loss" msgstr "" @@ -1315,6 +1321,7 @@ msgid "Journal Items Analysis" msgstr "" #. module: account +#: report:account.aged_trial_balance:0 #: model:ir.ui.menu,name:account.next_id_22 msgid "Partners" msgstr "" @@ -1339,8 +1346,10 @@ msgid "Central Journal" msgstr "" #. module: account +#: report:account.account.balance:0 #: selection:account.balance.report,display_account:0 #: selection:account.common.account.report,display_account:0 +#: report:account.general.ledger_landscape:0 #: selection:account.partner.balance,display_partner:0 #: selection:account.report.general.ledger,display_account:0 msgid "With balance is not equal to 0" @@ -1351,6 +1360,90 @@ msgstr "" msgid "Search Taxes" msgstr "" +#. module: account +#: model:email.template,body_html:account.email_template_edi_invoice +msgid "\n" +"
\n" +"\n" +"

Hello${object.address_invoice_id.name and ' ' or ''}${object.address_invoice_id.name or ''},

\n" +" \n" +"

A new invoice is available for ${object.partner_id.name}:

\n" +" \n" +"

\n" +"   REFERENCES
\n" +"   Invoice number: ${object.number}
\n" +"   Invoice total: ${object.amount_total} ${object.currency_id.name}
\n" +"   Invoice date: ${object.date_invoice}
\n" +" % if object.origin:\n" +"   Order reference: ${object.origin}
\n" +" % endif\n" +"   Your contact: ${object.user_id.name}\n" +"

\n" +" \n" +"

\n" +" You can view the invoice document, download it and pay online using the following link:\n" +"

\n" +" View Invoice\n" +" \n" +" % if object.company_id.paypal_account and object.type in ('out_invoice', 'in_refund'):\n" +" <% \n" +" comp_name = quote(object.company_id.name)\n" +" inv_number = quote(object.number)\n" +" paypal_account = quote(object.company_id.paypal_account)\n" +" inv_amount = quote(str(object.amount_total))\n" +" cur_name = quote(object.currency_id.name)\n" +" paypal_url = \"https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s&\" \\\n" +" \"invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Invoice_PayNow_%s\" % \\\n" +" (paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)\n" +" %>\n" +"
\n" +"

It is also possible to directly pay with Paypal:

\n" +" \n" +" \n" +" \n" +" % endif\n" +" \n" +"
\n" +"

If you have any question, do not hesitate to contact us.

\n" +"

Thank you for choosing ${object.company_id.name or 'us'}!

\n" +"
\n" +"
\n" +"
\n" +"

\n" +" ${object.company_id.name}

\n" +"
\n" +"
\n" +" \n" +" % if object.company_id.street:\n" +" ${object.company_id.street}
\n" +" % endif\n" +" % if object.company_id.street2:\n" +" ${object.company_id.street2}
\n" +" % endif\n" +" % if object.company_id.city or object.company_id.zip:\n" +" ${object.company_id.zip} ${object.company_id.city}
\n" +" % endif\n" +" % if object.company_id.country_id:\n" +" ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
\n" +" % endif\n" +" \n" +" % if object.company_id.phone:\n" +"
\n" +" Phone:  ${object.company_id.phone}\n" +"
\n" +" % endif\n" +" % if object.company_id.website:\n" +"
\n" +" Web : ${object.company_id.website}\n" +"
\n" +" %endif\n" +"

\n" +"
\n" +"
\n" +" " +msgstr "" + #. module: account #: model:ir.model,name:account.model_account_analytic_cost_ledger msgid "Account Analytic Cost Ledger" @@ -1536,6 +1629,11 @@ msgstr "" msgid "Invoice" msgstr "" +#. module: account +#: field:account.move,balance:0 +msgid "balance" +msgstr "" + #. module: account #: model:process.node,note:account.process_node_analytic0 #: model:process.node,note:account.process_node_analyticcost0 @@ -1584,7 +1682,7 @@ msgid "Year Sum" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1429 +#: code:addons/account/account_invoice.py:1431 #, python-format msgid "You selected an Unit of Measure which is not compatible with the product." msgstr "" @@ -1651,7 +1749,7 @@ msgid "Customer Ref:" msgstr "" #. module: account -#: code:addons/account/account_cash_statement.py:292 +#: code:addons/account/account_cash_statement.py:293 #, python-format msgid "User %s does not have rights to access %s journal !" msgstr "" @@ -1779,6 +1877,12 @@ msgstr "" msgid "Product Category" msgstr "" +#. module: account +#: code:addons/account/installer.py:94 +#, python-format +msgid "No unconfigured company !" +msgstr "" + #. module: account #: selection:account.account.type,report_type:0 msgid "/" @@ -1889,6 +1993,11 @@ msgstr "" msgid "Fiscalyear" msgstr "" +#. module: account +#: xsl:account.transfer:0 +msgid "Partner ID" +msgstr "" + #. module: account #: view:account.journal.select:0 #: view:project.account.analytic.line:0 @@ -1954,7 +2063,7 @@ msgid "Pro-forma" msgstr "" #. module: account -#: code:addons/account/account.py:1461 +#: code:addons/account/account.py:1478 #, python-format msgid "There is no default default debit account defined \n" "on journal \"%s\"" @@ -1972,7 +2081,7 @@ msgid "Search Chart of Account Templates" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1277 +#: code:addons/account/account_move_line.py:1292 #, python-format msgid "Can not create an automatic sequence for this piece!\n" "Put a sequence in the journal definition for automatic numbering or create a sequence manually for this piece." @@ -2014,7 +2123,7 @@ msgid "Description" msgstr "" #. module: account -#: code:addons/account/account.py:3119 +#: code:addons/account/account.py:3136 #, python-format msgid "ECNJ" msgstr "" @@ -2033,7 +2142,7 @@ msgid "Income Account" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:370 +#: code:addons/account/account_invoice.py:379 #, python-format msgid "There is no Accounting Journal of type Sale/Purchase defined!" msgstr "" @@ -2073,6 +2182,7 @@ msgstr "" #. module: account #: report:account.account.balance:0 #: field:account.aged.trial.balance,fiscalyear_id:0 +#: report:account.aged_trial_balance:0 #: field:account.balance.report,fiscalyear_id:0 #: report:account.central.journal:0 #: field:account.central.journal,fiscalyear_id:0 @@ -2082,6 +2192,7 @@ msgstr "" #: field:account.common.report,fiscalyear_id:0 #: view:account.entries.report:0 #: field:account.entries.report,fiscalyear_id:0 +#: report:account.financial.report:0 #: field:account.fiscalyear,name:0 #: report:account.general.journal:0 #: field:account.general.journal,fiscalyear_id:0 @@ -2132,7 +2243,7 @@ msgid "Account Line" msgstr "" #. module: account -#: code:addons/account/account.py:1468 +#: code:addons/account/account.py:1485 #, python-format msgid "There is no default default credit account defined \n" "on journal \"%s\"" @@ -2159,7 +2270,7 @@ msgid "Main Sequence" msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:402 +#: code:addons/account/account_bank_statement.py:403 #, python-format msgid "In order to delete a bank statement, you must first cancel it to delete related journal items." msgstr "" @@ -2231,7 +2342,7 @@ msgid "Account Tax Code" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:572 +#: code:addons/account/account_invoice.py:581 #, python-format msgid "Can't find any account journal of %s type for this company.\n" "\n" @@ -2305,7 +2416,7 @@ msgid "Account Model Entries" msgstr "" #. module: account -#: code:addons/account/account.py:3117 +#: code:addons/account/account.py:3134 #, python-format msgid "EXJ" msgstr "" @@ -2357,7 +2468,6 @@ msgid "Account move line reconcile (writeoff)" msgstr "" #. module: account -#: model:account.account.type,name:account.account_type_tax #: report:account.invoice:0 #: field:account.invoice,amount_tax:0 #: field:account.move.line,account_tax_id:0 @@ -2375,6 +2485,11 @@ msgstr "" msgid "Analytic Account" msgstr "" +#. module: account +#: report:account.aged_trial_balance:0 +msgid "Not due" +msgstr "" + #. module: account #: view:account.account:0 #: field:account.financial.report,account_ids:0 @@ -2389,7 +2504,7 @@ msgid "Accounts" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:369 +#: code:addons/account/account_invoice.py:378 #, python-format msgid "Configuration Error!" msgstr "" @@ -2507,6 +2622,7 @@ msgstr "" #. module: account #: view:account.aged.trial.balance:0 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view +#: model:ir.actions.report.xml,name:account.account_aged_partner_balance #: model:ir.ui.menu,name:account.menu_aged_trial_balance msgid "Aged Partner Balance" msgstr "" @@ -2557,14 +2673,14 @@ msgid "This wizard will create recurring accounting entries" msgstr "" #. module: account -#: code:addons/account/account.py:1321 +#: code:addons/account/account.py:1329 #, python-format msgid "No sequence defined on the journal !" msgstr "" #. module: account -#: code:addons/account/account.py:2268 -#: code:addons/account/account_invoice.py:688 +#: code:addons/account/account.py:2285 +#: code:addons/account/account_invoice.py:697 #: code:addons/account/account_move_line.py:173 #, python-format msgid "You have to define an analytic journal on the '%s' journal!" @@ -2615,6 +2731,11 @@ msgstr "" msgid "Payment entries are the second input of the reconciliation." msgstr "" +#. module: account +#: field:accounting.report,debit_credit:0 +msgid "Display Debit/Credit Columns" +msgstr "" + #. module: account #: selection:account.entries.report,month:0 #: selection:account.invoice.report,month:0 @@ -2662,7 +2783,7 @@ msgid "Base Code Amount" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:392 +#: code:addons/account/account_invoice.py:401 #, python-format msgid "You can not delete an invoice which is open or paid. We suggest you to refund it instead." msgstr "" @@ -2673,7 +2794,7 @@ msgid "Default Sale Tax" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1013 +#: code:addons/account/account_invoice.py:1025 #, python-format msgid "Invoice '%s' is validated." msgstr "" @@ -2708,7 +2829,7 @@ msgid "Fiscal Position" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:735 +#: code:addons/account/account_invoice.py:744 #, python-format msgid "Tax base different!\n" "Click on compute to update the tax base." @@ -2847,7 +2968,7 @@ msgid "View" msgstr "" #. module: account -#: code:addons/account/account.py:3363 +#: code:addons/account/account.py:3380 #: code:addons/account/account_bank.py:90 #, python-format msgid "BNK" @@ -2926,11 +3047,6 @@ msgstr "" msgid "Account Unreconcile Reconcile" msgstr "" -#. module: account -#: sql_constraint:account.tax:0 -msgid "The description must be unique per company!" -msgstr "" - #. module: account #: help:account.account.type,close_method:0 msgid "Set here the method that will be used to generate the end of year journal entries for all the accounts of this type.\n" @@ -3033,7 +3149,7 @@ msgid "Starting Balance" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1332 +#: code:addons/account/account_invoice.py:1345 #, python-format msgid "No Partner Defined !" msgstr "" @@ -3085,7 +3201,7 @@ msgid "Chart of Tax" msgstr "" #. module: account -#: code:addons/account/account_cash_statement.py:314 +#: code:addons/account/account_cash_statement.py:315 #, python-format msgid "The closing balance should be the same than the computed balance!" msgstr "" @@ -3162,6 +3278,7 @@ msgstr "" #. module: account #: field:account.aged.trial.balance,period_length:0 +#: report:account.aged_trial_balance:0 msgid "Period Length (days)" msgstr "" @@ -3208,7 +3325,7 @@ msgid "Detail" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:839 +#: code:addons/account/account_invoice.py:850 #, python-format msgid "Can not create the invoice !\n" "The related payment term is probably misconfigured as it gives a computed amount greater than the total invoiced amount. The latest line of your payment term must be of type 'balance' to avoid rounding issues." @@ -3220,9 +3337,16 @@ msgid "VAT :" msgstr "" #. module: account +#: report:account.account.balance:0 +#: report:account.aged_trial_balance:0 #: report:account.central.journal:0 +#: report:account.financial.report:0 +#: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.installer,charts:0 +#: report:account.journal.period.print:0 +#: report:account.journal.period.print.sale.purchase:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 @@ -3243,7 +3367,7 @@ msgid "Centralised counterpart" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:584 +#: code:addons/account/account_move_line.py:575 #, python-format msgid "You can not create journal items on a \"view\" account %s %s" msgstr "" @@ -3295,10 +3419,15 @@ msgstr "" #: field:account.subscription.line,date:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 +#: xsl:account.transfer:0 #: selection:account.vat.declaration,filter:0 #: selection:accounting.report,filter:0 #: selection:accounting.report,filter_cmp:0 +#: code:addons/account/report/account_journal.py:195 +#: code:addons/account/report/account_journal.py:198 +#: code:addons/account/report/common_report_header.py:97 #: field:analytic.entries.report,date:0 +#, python-format msgid "Date" msgstr "" @@ -3329,14 +3458,14 @@ msgid "Chart of Accounts Template" msgstr "" #. module: account -#: code:addons/account/account.py:2280 +#: code:addons/account/account.py:2297 #, python-format msgid "Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!\n" "Please define partner on it!" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:837 +#: code:addons/account/account_move_line.py:846 #, python-format msgid "Some entries are already reconciled !" msgstr "" @@ -3367,6 +3496,8 @@ msgstr "" #: selection:account.vat.declaration,filter:0 #: selection:accounting.report,filter:0 #: selection:accounting.report,filter_cmp:0 +#: code:addons/account/report/common_report_header.py:100 +#, python-format msgid "No Filters" msgstr "" @@ -3445,7 +3576,12 @@ msgid "Analytic Items" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1153 +#: report:account.aged_trial_balance:0 +msgid "Account Total" +msgstr "" + +#. module: account +#: code:addons/account/account_move_line.py:1168 #, python-format msgid "Unable to change tax !" msgstr "" @@ -3476,7 +3612,7 @@ msgid "Mapping" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:921 +#: code:addons/account/account_invoice.py:932 #, python-format msgid "You cannot create an invoice on a centralised journal. Uncheck the centralised counterpart box in the related journal from the configuration menu." msgstr "" @@ -3487,6 +3623,7 @@ msgstr "" #: report:account.analytic.account.inverted.balance:0 #: field:account.bank.statement,name:0 #: field:account.chart.template,name:0 +#: report:account.financial.report:0 #: field:account.model.line,name:0 #: field:account.move.line,name:0 #: field:account.move.reconcile,name:0 @@ -3500,7 +3637,7 @@ msgid "Account Aged Trial balance Report" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:591 +#: code:addons/account/account_move_line.py:582 #, python-format msgid "You can not create journal items on a closed account %s %s" msgstr "" @@ -3802,7 +3939,7 @@ msgid "Month" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1216 +#: code:addons/account/account_move_line.py:1231 #, python-format msgid "You can not do this modification on a confirmed entry! You can just change some non legal fields or you must unconfirm the journal entry first! \n" "%s" @@ -3857,7 +3994,7 @@ msgid "Account Base Code" msgstr "" #. module: account -#: code:addons/account/account_analytic_line.py:93 +#: code:addons/account/account_analytic_line.py:91 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" @@ -4059,7 +4196,7 @@ msgid "Allow Reconciliation" msgstr "" #. module: account -#: code:addons/account/account.py:1077 +#: code:addons/account/account.py:1082 #, python-format msgid "You can not modify company of this period as some journal items exists." msgstr "" @@ -4092,7 +4229,7 @@ msgid "Recurring Models" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1251 +#: code:addons/account/account_move_line.py:1266 #, python-format msgid "Encoding error" msgstr "" @@ -4104,6 +4241,7 @@ msgstr "" #. module: account #: view:account.invoice:0 +#: xsl:account.transfer:0 msgid "Change" msgstr "" @@ -4148,7 +4286,7 @@ msgid "Example" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:828 +#: code:addons/account/account_invoice.py:839 #, python-format msgid "Please verify the price of the invoice !\n" "The real total does not match the computed total." @@ -4161,7 +4299,7 @@ msgid "Keep empty to use the income account" msgstr "" #. module: account -#: code:addons/account/account.py:3299 +#: code:addons/account/account.py:3316 #, python-format msgid "Purchase Tax %.2f%%" msgstr "" @@ -4189,7 +4327,7 @@ msgstr "" #: selection:account.bank.statement.line,type:0 #: view:account.invoice:0 #: view:account.invoice.report:0 -#: code:addons/account/account_invoice.py:337 +#: code:addons/account/account_invoice.py:346 #, python-format msgid "Customer" msgstr "" @@ -4205,7 +4343,7 @@ msgid "Cancelled Invoice" msgstr "" #. module: account -#: code:addons/account/account.py:1567 +#: code:addons/account/account.py:1584 #, python-format msgid "Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies." msgstr "" @@ -4241,18 +4379,13 @@ msgstr "" msgid "Configuration" msgstr "" -#. module: account -#: field:account.automatic.reconcile,date1:0 -msgid "Starting Date" -msgstr "" - #. module: account #: field:account.chart.template,property_account_income:0 msgid "Income Account on Product Template" msgstr "" #. module: account -#: code:addons/account/account.py:3120 +#: code:addons/account/account.py:3137 #, python-format msgid "MISC" msgstr "" @@ -4276,11 +4409,13 @@ msgstr "" #: view:account.invoice:0 #: view:account.tax.template:0 #: selection:account.vat.declaration,based_on:0 +#: code:addons/account/report/account_tax_report.py:68 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened #: model:ir.actions.act_window,name:account.action_invoice_tree #: model:ir.actions.report.xml,name:account.account_invoices #: view:report.invoice.created:0 #: field:res.partner,invoice_ids:0 +#, python-format msgid "Invoices" msgstr "" @@ -4412,26 +4547,24 @@ msgid "Journal Items" msgstr "" #. module: account -#: code:addons/account/account.py:1088 -#: code:addons/account/account.py:1090 -#: code:addons/account/account.py:1321 -#: code:addons/account/account.py:1563 -#: code:addons/account/account.py:1567 -#: code:addons/account/account.py:3368 -#: code:addons/account/account_move_line.py:807 -#: code:addons/account/account_move_line.py:830 -#: code:addons/account/account_move_line.py:832 -#: code:addons/account/account_move_line.py:835 -#: code:addons/account/account_move_line.py:837 +#: code:addons/account/account.py:1095 +#: code:addons/account/account.py:1097 +#: code:addons/account/account.py:1329 +#: code:addons/account/account.py:1580 +#: code:addons/account/account.py:1584 +#: code:addons/account/account.py:3385 +#: code:addons/account/account_move_line.py:823 +#: code:addons/account/account_move_line.py:843 +#: code:addons/account/account_move_line.py:846 #: code:addons/account/report/common_report_header.py:92 #: code:addons/account/wizard/account_change_currency.py:38 #: code:addons/account/wizard/account_change_currency.py:59 #: code:addons/account/wizard/account_change_currency.py:64 #: code:addons/account/wizard/account_change_currency.py:70 -#: code:addons/account/wizard/account_financial_report.py:69 +#: code:addons/account/wizard/account_financial_report.py:70 #: code:addons/account/wizard/account_move_bank_reconcile.py:49 -#: code:addons/account/wizard/account_report_common.py:144 -#: code:addons/account/wizard/account_report_common.py:150 +#: code:addons/account/wizard/account_report_common.py:145 +#: code:addons/account/wizard/account_report_common.py:151 #, python-format msgid "Error" msgstr "" @@ -4528,7 +4661,7 @@ msgid "Beginning of Period Date" msgstr "" #. module: account -#: code:addons/account/account.py:1351 +#: code:addons/account/account.py:1361 #, python-format msgid "You can not modify a posted entry of this journal !\n" "You should set the journal to allow cancelling entries if you want to do that." @@ -4550,7 +4683,7 @@ msgid "Child Tax Accounts" msgstr "" #. module: account -#: code:addons/account/account.py:1090 +#: code:addons/account/account.py:1097 #, python-format msgid "Start period should be smaller then End period" msgstr "" @@ -4569,6 +4702,7 @@ msgstr "" #. module: account #: report:account.account.balance:0 #: field:account.aged.trial.balance,target_move:0 +#: report:account.aged_trial_balance:0 #: field:account.balance.report,target_move:0 #: report:account.central.journal:0 #: field:account.central.journal,target_move:0 @@ -4612,6 +4746,8 @@ msgstr "" #: view:account.invoice:0 #: field:account.invoice,payment_ids:0 #: selection:account.vat.declaration,based_on:0 +#: code:addons/account/report/account_tax_report.py:70 +#, python-format msgid "Payments" msgstr "" @@ -4681,7 +4817,7 @@ msgid "Line 1:" msgstr "" #. module: account -#: code:addons/account/account.py:1307 +#: code:addons/account/account.py:1315 #, python-format msgid "Integrity Error !" msgstr "" @@ -4714,6 +4850,7 @@ msgstr "" #. module: account #: model:account.financial.report,name:account.account_financial_report_balancesheet0 +#: model:ir.actions.act_window,name:account.action_account_report_bs #: model:ir.ui.menu,name:account.menu_account_report_bs msgid "Balance Sheet" msgstr "" @@ -4790,6 +4927,7 @@ msgstr "" #: view:account.move.line:0 #: field:account.tax,amount:0 #: field:account.tax.template,amount:0 +#: xsl:account.transfer:0 #: view:analytic.entries.report:0 #: field:analytic.entries.report,amount:0 msgid "Amount" @@ -4966,13 +5104,13 @@ msgid "End of Year Entries Journal" msgstr "" #. module: account -#: code:addons/account/account.py:3446 +#: code:addons/account/account.py:3463 #: code:addons/account/account_bank_statement.py:338 -#: code:addons/account/account_invoice.py:427 -#: code:addons/account/account_invoice.py:527 -#: code:addons/account/account_invoice.py:542 -#: code:addons/account/account_invoice.py:550 -#: code:addons/account/account_invoice.py:572 +#: code:addons/account/account_invoice.py:436 +#: code:addons/account/account_invoice.py:536 +#: code:addons/account/account_invoice.py:551 +#: code:addons/account/account_invoice.py:559 +#: code:addons/account/account_invoice.py:581 #: code:addons/account/wizard/account_move_journal.py:63 #, python-format msgid "Configuration Error !" @@ -5069,6 +5207,8 @@ msgstr "" #: field:account.invoice.line,quantity:0 #: field:account.model.line,quantity:0 #: field:account.move.line,quantity:0 +#: selection:account.tax,type:0 +#: selection:account.tax.template,type:0 #: view:analytic.entries.report:0 #: field:analytic.entries.report,unit_amount:0 #: field:report.account.sales,quantity:0 @@ -5159,6 +5299,7 @@ msgstr "" #. module: account #: selection:account.payment.term.line,value:0 #: selection:account.tax,type:0 +#: selection:account.tax.template,type:0 msgid "Fixed Amount" msgstr "" @@ -5195,13 +5336,14 @@ msgid "Generate Opening Entries" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:759 +#: code:addons/account/account_move_line.py:775 #, python-format msgid "Already Reconciled!" msgstr "" #. module: account #: help:account.tax,type:0 +#: help:account.tax.template,type:0 msgid "The computation method for the tax amount." msgstr "" @@ -5228,14 +5370,14 @@ msgid "Child Accounts" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1214 +#: code:addons/account/account_move_line.py:1229 #, python-format msgid "Move name (id): %s (%s)" msgstr "" #. module: account #: view:account.move.line.reconcile:0 -#: code:addons/account/account_move_line.py:857 +#: code:addons/account/account_move_line.py:871 #, python-format msgid "Write-Off" msgstr "" @@ -5255,7 +5397,7 @@ msgstr "" #: selection:account.bank.statement.line,type:0 #: view:account.invoice:0 #: view:account.invoice.report:0 -#: code:addons/account/account_invoice.py:339 +#: code:addons/account/account_invoice.py:348 #, python-format msgid "Supplier" msgstr "" @@ -5285,7 +5427,7 @@ msgid "Account n°" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:88 +#: code:addons/account/account_invoice.py:91 #, python-format msgid "Free Reference" msgstr "" @@ -5300,7 +5442,9 @@ msgstr "" #: selection:account.common.partner.report,result_selection:0 #: selection:account.partner.balance,result_selection:0 #: selection:account.partner.ledger,result_selection:0 +#: code:addons/account/report/account_aged_partner_balance.py:376 #: code:addons/account/report/account_partner_balance.py:301 +#: code:addons/account/report/account_partner_ledger.py:398 #, python-format msgid "Receivable and Payable Accounts" msgstr "" @@ -5386,7 +5530,7 @@ msgid "Filter by" msgstr "" #. module: account -#: code:addons/account/account.py:2256 +#: code:addons/account/account.py:2273 #, python-format msgid "You have a wrong expression \"%(...)s\" in your model !" msgstr "" @@ -5397,18 +5541,12 @@ msgid "Entry Date" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1155 -#: code:addons/account/account_move_line.py:1238 +#: code:addons/account/account_move_line.py:1170 +#: code:addons/account/account_move_line.py:1253 #, python-format msgid "You can not use an inactive account!" msgstr "" -#. module: account -#: code:addons/account/account_move_line.py:830 -#, python-format -msgid "Entries are not of the same account or already reconciled ! " -msgstr "" - #. module: account #: help:account.bank.statement,balance_end:0 msgid "Balance as calculated based on Starting Balance and transaction lines" @@ -5439,8 +5577,8 @@ msgid "Number of Days" msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:402 -#: code:addons/account/account_invoice.py:392 +#: code:addons/account/account_bank_statement.py:403 +#: code:addons/account/account_invoice.py:401 #: code:addons/account/wizard/account_period_close.py:51 #, python-format msgid "Invalid action !" @@ -5502,7 +5640,7 @@ msgid "Multipication factor for Base code" msgstr "" #. module: account -#: code:addons/account/wizard/account_report_common.py:150 +#: code:addons/account/wizard/account_report_common.py:151 #, python-format msgid "not implemented" msgstr "" @@ -5537,6 +5675,8 @@ msgstr "" #. module: account #: selection:account.aged.trial.balance,direction_selection:0 +#: code:addons/account/report/account_aged_partner_balance.py:381 +#, python-format msgid "Past" msgstr "" @@ -5782,13 +5922,9 @@ msgstr "" msgid "CashBox" msgstr "" -#. module: account -#: model:account.account.type,name:account.account_type_cash_equity -msgid "Equity" -msgstr "" - #. module: account #: selection:account.tax,type:0 +#: selection:account.tax.template,type:0 msgid "Percentage" msgstr "" @@ -5803,7 +5939,7 @@ msgid "Power" msgstr "" #. module: account -#: code:addons/account/account.py:3368 +#: code:addons/account/account.py:3385 #, python-format msgid "Cannot generate an unused journal code." msgstr "" @@ -6014,6 +6150,11 @@ msgstr "" msgid "Expense Category Account" msgstr "" +#. module: account +#: sql_constraint:account.tax:0 +msgid "Tax Name must be unique per company!" +msgstr "" + #. module: account #: view:account.bank.statement:0 msgid "Cash Transactions" @@ -6050,8 +6191,8 @@ msgid "You can not remove an account containing journal items." msgstr "" #. module: account -#: code:addons/account/account_analytic_line.py:145 -#: code:addons/account/account_move_line.py:933 +#: code:addons/account/account_analytic_line.py:143 +#: code:addons/account/account_move_line.py:947 #, python-format msgid "Entries: " msgstr "" @@ -6067,7 +6208,7 @@ msgid "Currency of the related account journal." msgstr "" #. module: account -#: code:addons/account/account.py:1563 +#: code:addons/account/account.py:1580 #, python-format msgid "Couldn't create move between different companies" msgstr "" @@ -6096,13 +6237,13 @@ msgstr "" #. module: account #: view:account.move.line:0 -#: code:addons/account/account_move_line.py:1043 +#: code:addons/account/account_move_line.py:1058 #, python-format msgid "Total debit" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:808 +#: code:addons/account/account_move_line.py:824 #, python-format msgid "Entry \"%s\" is not valid !" msgstr "" @@ -6164,25 +6305,26 @@ msgstr "" #: code:addons/account/account.py:622 #: code:addons/account/account.py:624 #: code:addons/account/account.py:963 -#: code:addons/account/account.py:1052 -#: code:addons/account/account.py:1129 -#: code:addons/account/account.py:1344 -#: code:addons/account/account.py:1351 -#: code:addons/account/account.py:2280 -#: code:addons/account/account.py:2596 -#: code:addons/account/account_analytic_line.py:92 -#: code:addons/account/account_analytic_line.py:101 +#: code:addons/account/account.py:1057 +#: code:addons/account/account.py:1136 +#: code:addons/account/account.py:1352 +#: code:addons/account/account.py:1359 +#: code:addons/account/account.py:1361 +#: code:addons/account/account.py:2297 +#: code:addons/account/account.py:2613 +#: code:addons/account/account_analytic_line.py:90 +#: code:addons/account/account_analytic_line.py:99 #: code:addons/account/account_bank_statement.py:301 #: code:addons/account/account_bank_statement.py:314 #: code:addons/account/account_bank_statement.py:352 -#: code:addons/account/account_cash_statement.py:292 -#: code:addons/account/account_cash_statement.py:314 -#: code:addons/account/account_invoice.py:808 -#: code:addons/account/account_invoice.py:839 -#: code:addons/account/account_invoice.py:1030 -#: code:addons/account/account_move_line.py:1200 -#: code:addons/account/account_move_line.py:1216 -#: code:addons/account/account_move_line.py:1218 +#: code:addons/account/account_cash_statement.py:293 +#: code:addons/account/account_cash_statement.py:315 +#: code:addons/account/account_invoice.py:819 +#: code:addons/account/account_invoice.py:850 +#: code:addons/account/account_invoice.py:1042 +#: code:addons/account/account_move_line.py:1215 +#: code:addons/account/account_move_line.py:1231 +#: code:addons/account/account_move_line.py:1233 #: code:addons/account/wizard/account_invoice_refund.py:108 #: code:addons/account/wizard/account_invoice_refund.py:110 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39 @@ -6214,8 +6356,8 @@ msgid "Printed" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:584 -#: code:addons/account/account_move_line.py:591 +#: code:addons/account/account_move_line.py:575 +#: code:addons/account/account_move_line.py:582 #, python-format msgid "Error :" msgstr "" @@ -6262,7 +6404,7 @@ msgid "Display Ledger Report with One partner per page" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1218 +#: code:addons/account/account_move_line.py:1233 #, python-format msgid "You can not do this modification on a reconciled entry! You can just change some non legal fields or you must unreconcile first!\n" "%s" @@ -6400,7 +6542,7 @@ msgid "Total:" msgstr "" #. module: account -#: code:addons/account/account.py:2229 +#: code:addons/account/account.py:2246 #, python-format msgid "You can specify year, month and date in the name of the model using the following labels:\n" "\n" @@ -6433,7 +6575,7 @@ msgid "Taxes used in Sales" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:495 +#: code:addons/account/account_invoice.py:504 #: code:addons/account/wizard/account_invoice_refund.py:145 #, python-format msgid "Data Insufficient !" @@ -6491,7 +6633,7 @@ msgid "Source Document" msgstr "" #. module: account -#: code:addons/account/account.py:1432 +#: code:addons/account/account.py:1449 #, python-format msgid "You can not delete a posted journal entry \"%s\"!" msgstr "" @@ -6584,8 +6726,8 @@ msgid "Are you sure you want to open this invoice ?" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:528 -#: code:addons/account/account_invoice.py:543 +#: code:addons/account/account_invoice.py:537 +#: code:addons/account/account_invoice.py:552 #, python-format msgid "Can not find a chart of account, you should create one from the configuration of the accounting menu." msgstr "" @@ -6596,7 +6738,7 @@ msgid "Opening Entries Expense Account" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:999 +#: code:addons/account/account_move_line.py:1014 #, python-format msgid "Accounting Entries" msgstr "" @@ -6634,6 +6776,11 @@ msgstr "" msgid "Posted entries" msgstr "" +#. module: account +#: help:accounting.report,debit_credit:0 +msgid "This option allow you to get more details about your the way your balances are computed. Because it is space consumming, we do not allow to use it while doing a comparison" +msgstr "" + #. module: account #: help:account.payment.term.line,value_amount:0 msgid "For percent enter a ratio between 0-1." @@ -6693,11 +6840,6 @@ msgstr "" msgid "Bank Statement Line" msgstr "" -#. module: account -#: field:account.automatic.reconcile,date2:0 -msgid "Ending Date" -msgstr "" - #. module: account #: field:wizard.multi.charts.accounts,purchase_tax:0 msgid "Default Purchase Tax" @@ -6720,7 +6862,7 @@ msgid "This field is only used if you develop your own module allowing developer msgstr "" #. module: account -#: code:addons/account/account.py:1088 +#: code:addons/account/account.py:1095 #, python-format msgid "You should have chosen periods that belongs to the same company" msgstr "" @@ -6751,8 +6893,8 @@ msgid "Reporting" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:759 -#: code:addons/account/account_move_line.py:842 +#: code:addons/account/account_move_line.py:775 +#: code:addons/account/account_move_line.py:856 #: code:addons/account/wizard/account_invoice_state.py:44 #: code:addons/account/wizard/account_invoice_state.py:68 #: code:addons/account/wizard/account_state_open.py:37 @@ -6834,7 +6976,7 @@ msgid "Sign on Reports" msgstr "" #. module: account -#: code:addons/account/wizard/account_fiscalyear_close.py:73 +#: code:addons/account/wizard/account_fiscalyear_close.py:88 #, python-format msgid "The periods to generate opening entries were not found" msgstr "" @@ -6845,7 +6987,7 @@ msgid "Root/View" msgstr "" #. module: account -#: code:addons/account/account.py:3121 +#: code:addons/account/account.py:3138 #, python-format msgid "OPEJ" msgstr "" @@ -6880,13 +7022,14 @@ msgid "Optional Information" msgstr "" #. module: account -#: code:addons/account/wizard/account_fiscalyear_close.py:84 +#: code:addons/account/wizard/account_fiscalyear_close.py:100 #, python-format msgid "The journal must have default credit and debit account" msgstr "" #. module: account #: report:account.general.journal:0 +#: xsl:account.transfer:0 msgid ":" msgstr "" @@ -6911,13 +7054,13 @@ msgid "Maturity Date" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1302 +#: code:addons/account/account_move_line.py:1317 #, python-format msgid "Bad account !" msgstr "" #. module: account -#: code:addons/account/account.py:3108 +#: code:addons/account/account.py:3125 #, python-format msgid "Sales Journal" msgstr "" @@ -6934,7 +7077,7 @@ msgid "Invoice Tax" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1277 +#: code:addons/account/account_move_line.py:1292 #, python-format msgid "No piece number !" msgstr "" @@ -6979,7 +7122,7 @@ msgstr "" #. module: account #: selection:account.move.line,centralisation:0 -#: code:addons/account/account.py:1518 +#: code:addons/account/account.py:1535 #, python-format msgid "Currency Adjustment" msgstr "" @@ -7022,13 +7165,15 @@ msgstr "" #: selection:account.common.partner.report,result_selection:0 #: selection:account.partner.balance,result_selection:0 #: selection:account.partner.ledger,result_selection:0 +#: code:addons/account/report/account_aged_partner_balance.py:374 #: code:addons/account/report/account_partner_balance.py:299 +#: code:addons/account/report/account_partner_ledger.py:396 #, python-format msgid "Payable Accounts" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:732 +#: code:addons/account/account_invoice.py:741 #, python-format msgid "Global taxes defined, but they are not in invoice lines !" msgstr "" @@ -7070,7 +7215,7 @@ msgstr "" #: selection:account.bank.accounts.wizard,account_type:0 #: selection:account.entries.report,type:0 #: selection:account.journal,type:0 -#: code:addons/account/account.py:3003 +#: code:addons/account/account.py:3020 #, python-format msgid "Cash" msgstr "" @@ -7082,15 +7227,15 @@ msgid "Account Destination" msgstr "" #. module: account -#: code:addons/account/account.py:1431 -#: code:addons/account/account.py:1460 -#: code:addons/account/account.py:1467 -#: code:addons/account/account_invoice.py:920 -#: code:addons/account/account_move_line.py:1104 -#: code:addons/account/wizard/account_automatic_reconcile.py:152 -#: code:addons/account/wizard/account_fiscalyear_close.py:73 -#: code:addons/account/wizard/account_fiscalyear_close.py:83 -#: code:addons/account/wizard/account_fiscalyear_close.py:86 +#: code:addons/account/account.py:1448 +#: code:addons/account/account.py:1477 +#: code:addons/account/account.py:1484 +#: code:addons/account/account_invoice.py:931 +#: code:addons/account/account_move_line.py:1119 +#: code:addons/account/wizard/account_automatic_reconcile.py:148 +#: code:addons/account/wizard/account_fiscalyear_close.py:88 +#: code:addons/account/wizard/account_fiscalyear_close.py:99 +#: code:addons/account/wizard/account_fiscalyear_close.py:102 #: code:addons/account/wizard/account_move_journal.py:165 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58 @@ -7214,24 +7359,20 @@ msgstr "" msgid "Partner Ledger" msgstr "" -#. module: account -#: selection:account.tax.template,type:0 -msgid "Fixed" -msgstr "" - #. module: account #: code:addons/account/account.py:629 #: code:addons/account/account.py:642 #: code:addons/account/account.py:645 #: code:addons/account/account.py:664 #: code:addons/account/account.py:787 -#: code:addons/account/account.py:1077 -#: code:addons/account/account_invoice.py:732 -#: code:addons/account/account_invoice.py:735 -#: code:addons/account/account_invoice.py:738 +#: code:addons/account/account.py:1082 +#: code:addons/account/account_invoice.py:741 +#: code:addons/account/account_invoice.py:744 +#: code:addons/account/account_invoice.py:747 #: code:addons/account/account_move_line.py:97 -#: code:addons/account/account_move_line.py:750 -#: code:addons/account/account_move_line.py:803 +#: code:addons/account/account_move_line.py:766 +#: code:addons/account/account_move_line.py:819 +#: code:addons/account/wizard/account_fiscalyear_close.py:62 #, python-format msgid "Warning !" msgstr "" @@ -7283,7 +7424,7 @@ msgid "Select a currency to apply on the invoice" msgstr "" #. module: account -#: code:addons/account/account.py:3446 +#: code:addons/account/account.py:3463 #, python-format msgid "The bank account defined on the selected chart of accounts hasn't a code." msgstr "" @@ -7295,7 +7436,7 @@ msgid "Can not %s draft/proforma/cancel invoice." msgstr "" #. module: account -#: code:addons/account/account_invoice.py:810 +#: code:addons/account/account_invoice.py:821 #, python-format msgid "No Invoice Lines !" msgstr "" @@ -7360,7 +7501,7 @@ msgid "Deferral Method" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:379 +#: code:addons/account/account_invoice.py:388 #, python-format msgid "Invoice '%s' is paid." msgstr "" @@ -7417,7 +7558,7 @@ msgid "Associated Partner" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1332 +#: code:addons/account/account_invoice.py:1345 #, python-format msgid "You must first select a partner !" msgstr "" @@ -7455,7 +7596,7 @@ msgid "The chart of taxes is used to generate your periodical tax statement. You msgstr "" #. module: account -#: code:addons/account/account_invoice.py:428 +#: code:addons/account/account_invoice.py:437 #, python-format msgid "Can not find a chart of accounts for this company, you should create one." msgstr "" @@ -7476,7 +7617,7 @@ msgid "Choose Fiscal Year" msgstr "" #. module: account -#: code:addons/account/account.py:3111 +#: code:addons/account/account.py:3128 #, python-format msgid "Purchase Refund Journal" msgstr "" @@ -7557,7 +7698,7 @@ msgid "Compute Code for Taxes included prices" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1030 +#: code:addons/account/account_invoice.py:1042 #, python-format msgid "You can not cancel an invoice which is partially paid! You need to unreconcile related payment entries first!" msgstr "" @@ -7671,7 +7812,7 @@ msgid "current month" msgstr "" #. module: account -#: code:addons/account/account.py:1052 +#: code:addons/account/account.py:1057 #, python-format msgid "No period defined for this date: %s !\n" "Please create one." @@ -7743,6 +7884,7 @@ msgstr "" #. module: account #: report:account.account.balance:0 #: report:account.central.journal:0 +#: report:account.financial.report:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 #: report:account.general.ledger_landscape:0 @@ -7762,10 +7904,9 @@ msgid "In order to close a period, you must first post related journal entries." msgstr "" #. module: account -#: view:account.entries.report:0 -#: view:board.board:0 -#: model:ir.actions.act_window,name:account.action_company_analysis_tree -msgid "Company Analysis" +#: code:addons/account/wizard/account_fiscalyear_close.py:62 +#, python-format +msgid "The entries to reconcile should belong to the same company" msgstr "" #. module: account @@ -7774,7 +7915,7 @@ msgid "The partner account used for this invoice." msgstr "" #. module: account -#: code:addons/account/account.py:3296 +#: code:addons/account/account.py:3313 #, python-format msgid "Tax %.2f%%" msgstr "" @@ -7797,7 +7938,7 @@ msgid "Payment Term Line" msgstr "" #. module: account -#: code:addons/account/account.py:3109 +#: code:addons/account/account.py:3126 #, python-format msgid "Purchase Journal" msgstr "" @@ -7880,7 +8021,7 @@ msgid "Unpaid Invoices" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:495 +#: code:addons/account/account_invoice.py:504 #, python-format msgid "The payment term of supplier does not have a payment term line!" msgstr "" @@ -7982,7 +8123,7 @@ msgid "Keep empty for all open fiscal years" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1105 +#: code:addons/account/account_move_line.py:1120 #, python-format msgid "The account move (%s) for centralisation has been confirmed!" msgstr "" @@ -7993,7 +8134,7 @@ msgid "The amount expressed in an optional other currency if it is a multi-curre msgstr "" #. module: account -#: code:addons/account/account.py:1307 +#: code:addons/account/account.py:1315 #, python-format msgid "You can not validate a non-balanced entry !\n" "Make sure you have configured payment terms properly !\n" @@ -8057,7 +8198,7 @@ msgid "Contact Address" msgstr "" #. module: account -#: code:addons/account/account.py:2256 +#: code:addons/account/account.py:2273 #, python-format msgid "Wrong model !" msgstr "" @@ -8087,12 +8228,14 @@ msgstr "" #: field:account.cashbox.line,starting_id:0 #: field:account.entries.report,reconcile_id:0 #: field:account.financial.report,balance:0 +#: field:account.financial.report,credit:0 +#: field:account.financial.report,debit:0 msgid "unknown" msgstr "" #. module: account #: field:account.fiscalyear.close,journal_id:0 -#: code:addons/account/account.py:3113 +#: code:addons/account/account.py:3130 #, python-format msgid "Opening Entries Journal" msgstr "" @@ -8108,7 +8251,7 @@ msgid "This Account is used for transferring Profit/Loss(If It is Profit: Amount msgstr "" #. module: account -#: code:addons/account/account_invoice.py:808 +#: code:addons/account/account_invoice.py:819 #, python-format msgid "Please define sequence on the journal related to this invoice." msgstr "" @@ -8189,7 +8332,7 @@ msgid "Period from" msgstr "" #. module: account -#: code:addons/account/account.py:3110 +#: code:addons/account/account.py:3127 #, python-format msgid "Sales Refund Journal" msgstr "" @@ -8236,7 +8379,7 @@ msgid "Purchase Tax(%)" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:810 +#: code:addons/account/account_invoice.py:821 #, python-format msgid "Please create some invoice lines." msgstr "" @@ -8252,7 +8395,7 @@ msgid "Display Detail" msgstr "" #. module: account -#: code:addons/account/account.py:3118 +#: code:addons/account/account.py:3135 #, python-format msgid "SCNJ" msgstr "" @@ -8278,8 +8421,6 @@ msgstr "" #: field:account.account.template,financial_report_ids:0 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree #: model:ir.actions.act_window,name:account.action_account_report -#: model:ir.actions.act_window,name:account.action_account_report_bs -#: model:ir.actions.act_window,name:account.action_account_report_pl #: model:ir.ui.menu,name:account.menu_account_reports msgid "Financial Reports" msgstr "" @@ -8294,6 +8435,7 @@ msgstr "" #: field:account.common.journal.report,period_from:0 #: field:account.common.partner.report,period_from:0 #: field:account.common.report,period_from:0 +#: report:account.financial.report:0 #: report:account.general.journal:0 #: field:account.general.journal,period_from:0 #: report:account.general.ledger:0 @@ -8314,6 +8456,7 @@ msgstr "" #. module: account #: field:account.aged.trial.balance,direction_selection:0 +#: report:account.aged_trial_balance:0 msgid "Analysis Direction" msgstr "" @@ -8333,7 +8476,7 @@ msgstr "" #. module: account #: view:account.move.line:0 -#: code:addons/account/account_move_line.py:1046 +#: code:addons/account/account_move_line.py:1061 #, python-format msgid "Total credit" msgstr "" @@ -8378,6 +8521,11 @@ msgstr "" msgid "Receivale Accounts" msgstr "" +#. module: account +#: xsl:account.transfer:0 +msgid "Document" +msgstr "" + #. module: account #: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree #: model:ir.actions.act_window,name:account.action_bank_statement_tree @@ -8394,6 +8542,7 @@ msgstr "" #: report:account.analytic.account.inverted.balance:0 #: report:account.central.journal:0 #: field:account.entries.report,balance:0 +#: report:account.financial.report:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 #: report:account.general.ledger_landscape:0 @@ -8464,7 +8613,7 @@ msgid "This view is used by accountants in order to record entries massively in msgstr "" #. module: account -#: code:addons/account/wizard/account_automatic_reconcile.py:152 +#: code:addons/account/wizard/account_automatic_reconcile.py:148 #, python-format msgid "You must select accounts to reconcile" msgstr "" @@ -8502,7 +8651,7 @@ msgid "Move" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1153 +#: code:addons/account/account_move_line.py:1168 #, python-format msgid "You can not change the tax, you should remove and recreate lines !" msgstr "" @@ -8556,7 +8705,7 @@ msgid "Consolidated Children" msgstr "" #. module: account -#: code:addons/account/wizard/account_fiscalyear_close.py:87 +#: code:addons/account/wizard/account_fiscalyear_close.py:103 #, python-format msgid "The journal must have centralised counterpart without the Skipping draft state option checked!" msgstr "" @@ -8597,6 +8746,13 @@ msgstr "" msgid "Account Analytic Balance" msgstr "" +#. module: account +#: view:account.entries.report:0 +#: view:board.board:0 +#: model:ir.actions.act_window,name:account.action_company_analysis_tree +msgid "Company Analysis" +msgstr "" + #. module: account #: code:addons/account/account.py:412 #, python-format @@ -8613,6 +8769,7 @@ msgstr "" #: field:account.common.journal.report,period_to:0 #: field:account.common.partner.report,period_to:0 #: field:account.common.report,period_to:0 +#: report:account.financial.report:0 #: report:account.general.journal:0 #: field:account.general.journal,period_to:0 #: report:account.general.ledger:0 @@ -8631,6 +8788,12 @@ msgstr "" msgid "End Period" msgstr "" +#. module: account +#: code:addons/account/installer.py:94 +#, python-format +msgid "There are currently no company without chart of account. The wizard will therefore not be executed." +msgstr "" + #. module: account #: field:account.move.line,date_maturity:0 msgid "Due date" @@ -8664,6 +8827,7 @@ msgstr "" #. module: account #: report:account.account.balance:0 #: field:account.aged.trial.balance,date_from:0 +#: report:account.aged_trial_balance:0 #: field:account.balance.report,date_from:0 #: report:account.central.journal:0 #: field:account.central.journal,date_from:0 @@ -8671,6 +8835,7 @@ msgstr "" #: field:account.common.journal.report,date_from:0 #: field:account.common.partner.report,date_from:0 #: field:account.common.report,date_from:0 +#: report:account.financial.report:0 #: field:account.fiscalyear,date_start:0 #: report:account.general.journal:0 #: field:account.general.journal,date_from:0 @@ -8711,7 +8876,7 @@ msgid "Unreconciled" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:828 +#: code:addons/account/account_invoice.py:839 #, python-format msgid "Bad total !" msgstr "" @@ -8763,7 +8928,7 @@ msgid "Comparison" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:372 +#: code:addons/account/account_invoice.py:381 #, python-format msgid "Unknown Error" msgstr "" @@ -8798,6 +8963,7 @@ msgstr "" #: report:account.analytic.account.inverted.balance:0 #: report:account.central.journal:0 #: field:account.entries.report,credit:0 +#: report:account.financial.report:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 #: report:account.general.ledger_landscape:0 @@ -8889,9 +9055,11 @@ msgstr "" #: view:accounting.report:0 #: selection:accounting.report,filter:0 #: selection:accounting.report,filter_cmp:0 +#: code:addons/account/report/common_report_header.py:99 #: model:ir.actions.act_window,name:account.action_account_period_form #: model:ir.ui.menu,name:account.menu_action_account_period_form #: model:ir.ui.menu,name:account.next_id_23 +#, python-format msgid "Periods" msgstr "" @@ -9045,6 +9213,7 @@ msgstr "" #: field:account.common.journal.report,date_to:0 #: field:account.common.partner.report,date_to:0 #: field:account.common.report,date_to:0 +#: report:account.financial.report:0 #: field:account.fiscalyear,date_stop:0 #: report:account.general.journal:0 #: field:account.general.journal,date_to:0 @@ -9092,7 +9261,7 @@ msgid "No detail" msgstr "" #. module: account -#: code:addons/account/account_analytic_line.py:102 +#: code:addons/account/account_analytic_line.py:100 #, python-format msgid "There is no income account defined for this product: \"%s\" (id:%d)" msgstr "" @@ -9128,6 +9297,7 @@ msgid "Verification Total" msgstr "" #. module: account +#: report:account.aged_trial_balance:0 #: report:account.analytic.account.balance:0 #: report:account.analytic.account.inverted.balance:0 #: report:account.analytic.account.quantity_cost_ledger:0 @@ -9162,7 +9332,9 @@ msgstr "" #: field:account.entries.report,company_id:0 #: field:account.fiscal.position,company_id:0 #: field:account.fiscalyear,company_id:0 +#: report:account.general.journal:0 #: field:account.general.journal,company_id:0 +#: report:account.general.ledger_landscape:0 #: field:account.installer,company_id:0 #: field:account.invoice,company_id:0 #: field:account.invoice.line,company_id:0 @@ -9172,6 +9344,8 @@ msgstr "" #: view:account.journal:0 #: field:account.journal,company_id:0 #: field:account.journal.period,company_id:0 +#: report:account.journal.period.print:0 +#: report:account.journal.period.print.sale.purchase:0 #: field:account.model,company_id:0 #: field:account.move,company_id:0 #: field:account.move.line,company_id:0 @@ -9316,6 +9490,7 @@ msgstr "" #: report:account.analytic.account.inverted.balance:0 #: report:account.central.journal:0 #: field:account.entries.report,debit:0 +#: report:account.financial.report:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 #: report:account.general.ledger_landscape:0 @@ -9349,6 +9524,8 @@ msgstr "" #. module: account #: selection:account.print.journal,sort_selection:0 +#: code:addons/account/report/account_journal.py:197 +#, python-format msgid "Journal Entry Number" msgstr "" @@ -9364,7 +9541,7 @@ msgid "You cannot change the type of account from 'Closed' to any other type whi msgstr "" #. module: account -#: code:addons/account/account_move_line.py:832 +#: code:addons/account/account_move_line.py:843 #, python-format msgid "Entry is already reconciled" msgstr "" @@ -9395,8 +9572,10 @@ msgid "The 'Internal Type' is used for features available on different types of msgstr "" #. module: account +#: report:account.account.balance:0 #: selection:account.balance.report,display_account:0 #: selection:account.common.account.report,display_account:0 +#: report:account.general.ledger_landscape:0 #: selection:account.report.general.ledger,display_account:0 msgid "With movements" msgstr "" @@ -9416,6 +9595,11 @@ msgstr "" msgid "Manually" msgstr "" +#. module: account +#: help:account.move,balance:0 +msgid "This is a field only used for internal purpose and shouldn't be displayed" +msgstr "" + #. module: account #: selection:account.entries.report,month:0 #: selection:account.invoice.report,month:0 @@ -9505,8 +9689,8 @@ msgid "Statistic Reports" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1155 -#: code:addons/account/account_move_line.py:1238 +#: code:addons/account/account_move_line.py:1170 +#: code:addons/account/account_move_line.py:1253 #, python-format msgid "Bad account!" msgstr "" @@ -9527,7 +9711,7 @@ msgid "Accounts Mapping" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:364 +#: code:addons/account/account_invoice.py:373 #, python-format msgid "Invoice '%s' is waiting for validation." msgstr "" @@ -9556,6 +9740,12 @@ msgstr "" msgid "Number of Periods" msgstr "" +#. module: account +#: code:addons/account/account.py:1359 +#, python-format +msgid "You can not modify a posted entry of closed periods" +msgstr "" + #. module: account #: report:account.general.journal:0 #: model:ir.actions.report.xml,name:account.account_general_journal @@ -9705,6 +9895,7 @@ msgstr "" #. module: account #: field:account.aged.trial.balance,result_selection:0 +#: report:account.aged_trial_balance:0 #: field:account.common.partner.report,result_selection:0 #: report:account.partner.balance:0 #: field:account.partner.balance,result_selection:0 @@ -9773,6 +9964,8 @@ msgstr "" #. module: account #: selection:account.aged.trial.balance,direction_selection:0 +#: code:addons/account/report/account_aged_partner_balance.py:383 +#, python-format msgid "Future" msgstr "" From 9b4a0c577736520348e918746d4660501bda7a39 Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Mon, 24 Sep 2012 15:31:02 +0200 Subject: [PATCH 07/18] [FIX] new pot file bzr revid: cbi@openerp.com-20120924133102-ivlqrxki5xwh52st --- addons/account_payment/i18n/account_payment.pot | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/addons/account_payment/i18n/account_payment.pot b/addons/account_payment/i18n/account_payment.pot index 0588747c3f7..4d6599ff918 100644 --- a/addons/account_payment/i18n/account_payment.pot +++ b/addons/account_payment/i18n/account_payment.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.1rc1\n" +"Project-Id-Version: OpenERP Server 6.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-02-08 00:35+0000\n" +"POT-Creation-Date: 2012-09-24 13:21+0000\n" +"PO-Revision-Date: 2012-09-24 13:21+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -94,6 +94,11 @@ msgstr "" msgid "Entries" msgstr "" +#. module: account_payment +#: report:payment.order:0 +msgid "Now" +msgstr "" + #. module: account_payment #: report:payment.order:0 msgid "Used Account" @@ -271,6 +276,7 @@ msgid "Bank or Cash Journal for the Payment Mode" msgstr "" #. module: account_payment +#: report:payment.order:0 #: selection:payment.order,date_prefered:0 msgid "Fixed date" msgstr "" @@ -329,6 +335,7 @@ msgid "Bank statement line" msgstr "" #. module: account_payment +#: report:payment.order:0 #: selection:payment.order,date_prefered:0 msgid "Due date" msgstr "" From 94aecc1dacb0e62f6b224f5b941e930fc2bff099 Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Mon, 24 Sep 2012 15:31:25 +0200 Subject: [PATCH 08/18] [FIX] new pot file bzr revid: cbi@openerp.com-20120924133125-ousmof2flrvu3t2u --- addons/account_budget/i18n/account_budget.pot | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/addons/account_budget/i18n/account_budget.pot b/addons/account_budget/i18n/account_budget.pot index 95f60f7b376..32d4f166fba 100644 --- a/addons/account_budget/i18n/account_budget.pot +++ b/addons/account_budget/i18n/account_budget.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.1rc1\n" +"Project-Id-Version: OpenERP Server 6.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-02-08 00:35+0000\n" +"POT-Creation-Date: 2012-09-24 13:21+0000\n" +"PO-Revision-Date: 2012-09-24 13:21+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -103,6 +103,7 @@ msgid "Percentage" msgstr "" #. module: account_budget +#: report:account.analytic.account.budget:0 #: report:crossovered.budget.report:0 msgid "to" msgstr "" @@ -124,18 +125,21 @@ msgid "The Budget '%s' has no accounts!" msgstr "" #. module: account_budget +#: report:account.analytic.account.budget:0 #: report:account.budget:0 #: report:crossovered.budget.report:0 msgid "%" msgstr "" #. module: account_budget +#: report:account.analytic.account.budget:0 #: report:account.budget:0 #: report:crossovered.budget.report:0 msgid "Description" msgstr "" #. module: account_budget +#: report:account.analytic.account.budget:0 #: report:crossovered.budget.report:0 msgid "Currency" msgstr "" @@ -170,6 +174,7 @@ msgid "Planned Amount" msgstr "" #. module: account_budget +#: report:account.analytic.account.budget:0 #: report:account.budget:0 #: report:crossovered.budget.report:0 msgid "Perc(%)" @@ -182,6 +187,7 @@ msgid "Done" msgstr "" #. module: account_budget +#: report:account.analytic.account.budget:0 #: report:account.budget:0 #: report:crossovered.budget.report:0 msgid "Practical Amt" @@ -218,6 +224,11 @@ msgstr "" msgid "Name" msgstr "" +#. module: account_budget +#: report:account.analytic.account.budget:0 +msgid "Total:" +msgstr "" + #. module: account_budget #: model:ir.model,name:account_budget.model_crossovered_budget_lines msgid "Budget Line" @@ -284,6 +295,12 @@ msgstr "" msgid "Cancelled" msgstr "" +#. module: account_budget +#: report:account.analytic.account.budget:0 +#: model:ir.actions.report.xml,name:account_budget.account_budget_analytic +msgid "Analytic Budget" +msgstr "" + #. module: account_budget #: view:crossovered.budget:0 msgid "Approve" @@ -316,6 +333,7 @@ msgid "Account Budget crossvered summary report" msgstr "" #. module: account_budget +#: report:account.analytic.account.budget:0 #: report:account.budget:0 #: report:crossovered.budget.report:0 msgid "Theoretical Amt" @@ -345,6 +363,7 @@ msgid "Theoretical Amount" msgstr "" #. module: account_budget +#: report:account.analytic.account.budget:0 #: field:crossovered.budget.lines,analytic_account_id:0 #: model:ir.model,name:account_budget.model_account_analytic_account msgid "Analytic Account" @@ -356,6 +375,7 @@ msgid "Budget :" msgstr "" #. module: account_budget +#: report:account.analytic.account.budget:0 #: report:account.budget:0 #: report:crossovered.budget.report:0 msgid "Planned Amt" @@ -396,6 +416,7 @@ msgid "Error! You can not create recursive analytic accounts." msgstr "" #. module: account_budget +#: report:account.analytic.account.budget:0 #: report:account.budget:0 #: report:crossovered.budget.report:0 msgid "Analysis from" From 9af73397c526a77b96c690287988aa00788190a2 Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Mon, 24 Sep 2012 15:31:49 +0200 Subject: [PATCH 09/18] [FIX] new pot file bzr revid: cbi@openerp.com-20120924133149-96890kn8fsi0iy7h --- addons/hr_holidays/i18n/hr_holidays.pot | 228 ++++++++++++------------ 1 file changed, 116 insertions(+), 112 deletions(-) diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot index 76cbd507c0e..2f96614f3a0 100644 --- a/addons/hr_holidays/i18n/hr_holidays.pot +++ b/addons/hr_holidays/i18n/hr_holidays.pot @@ -1,39 +1,19 @@ -# #-#-#-#-# hr_holidays.pot (OpenERP Server 6.1rc1) #-#-#-#-# # Translation of OpenERP Server. # This file contains the translation of the following modules: -# * hr_holidays +# * hr_holidays # -# #-#-#-#-# hr_holidays.pot.web (PROJECT VERSION) #-#-#-#-# -# Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION -# This file is distributed under the same license as the PROJECT project. -# FIRST AUTHOR , 2012. -# -#, fuzzy msgid "" msgstr "" -"#-#-#-#-# hr_holidays.pot (OpenERP Server 6.1rc1) #-#-#-#-#\n" -"Project-Id-Version: OpenERP Server 6.1rc1\n" +"Project-Id-Version: OpenERP Server 6.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-02-08 00:35+0000\n" +"POT-Creation-Date: 2012-09-24 13:20+0000\n" +"PO-Revision-Date: 2012-09-24 13:20+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" -"#-#-#-#-# hr_holidays.pot.web (PROJECT VERSION) #-#-#-#-#\n" -"Project-Id-Version: PROJECT VERSION\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-02-08 01:37+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 @@ -46,7 +26,8 @@ msgid "Allocation Type" msgstr "" #. module: hr_holidays -#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0 +#: selection:hr.employee,current_leave_state:0 +#: selection:hr.holidays,state:0 msgid "Waiting Second Approval" msgstr "" @@ -71,7 +52,8 @@ msgid "Allocation Mode" msgstr "" #. module: hr_holidays -#: view:hr.holidays:0 field:hr.holidays,department_id:0 +#: view:hr.holidays:0 +#: field:hr.holidays,department_id:0 msgid "Department" msgstr "" @@ -81,7 +63,8 @@ msgid "Requests Approve" msgstr "" #. module: hr_holidays -#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0 +#: selection:hr.employee,current_leave_state:0 +#: selection:hr.holidays,state:0 msgid "Refused" msgstr "" @@ -105,6 +88,16 @@ msgstr "" msgid "Remaining Days" msgstr "" +#. module: hr_holidays +#: xsl:holidays.summary:0 +msgid "of the" +msgstr "" + +#. module: hr_holidays +#: xsl:holidays.summary:0 +msgid "Off-Days' Summary" +msgstr "" + #. module: hr_holidays #: selection:hr.holidays,holiday_type:0 msgid "By Employee" @@ -112,9 +105,7 @@ msgstr "" #. module: hr_holidays #: help:hr.holidays,employee_id:0 -msgid "" -"Leave Manager can let this field empty if this leave request/allocation is " -"for every employee" +msgid "Leave Manager can let this field empty if this leave request/allocation is for every employee" msgstr "" #. module: hr_holidays @@ -122,6 +113,11 @@ msgstr "" msgid "Set to Draft" msgstr "" +#. module: hr_holidays +#: xsl:holidays.summary:0 +msgid "to" +msgstr "" + #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Cyan" @@ -139,11 +135,7 @@ msgstr "" #. module: hr_holidays #: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays -msgid "" -"Leave requests can be recorded by employees and validated by their managers. " -"Once a leave request is validated, it appears automatically in the agenda of " -"the employee. You can define several allowance types (paid holidays, " -"sickness, etc.) and manage allowances per type." +msgid "Leave requests can be recorded by employees and validated by their managers. Once a leave request is validated, it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc.) and manage allowances per type." msgstr "" #. module: hr_holidays @@ -152,7 +144,8 @@ msgid "Summary Of Leaves" msgstr "" #. module: hr_holidays -#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0 +#: selection:hr.employee,current_leave_state:0 +#: view:hr.holidays:0 #: selection:hr.holidays,state:0 msgid "Approved" msgstr "" @@ -162,6 +155,11 @@ msgstr "" msgid "Latest Connection" msgstr "" +#. module: hr_holidays +#: view:hr.holidays:0 +msgid "Search Leave" +msgstr "" + #. module: hr_holidays #: view:hr.holidays:0 msgid "Refuse" @@ -170,18 +168,14 @@ msgstr "" #. module: hr_holidays #: code:addons/hr_holidays/hr_holidays.py:344 #, python-format -msgid "" -"You cannot validate leaves for employee %s: too few remaining days (%s)." +msgid "You cannot validate leaves for employee %s: too few remaining days (%s)." msgstr "" #. module: hr_holidays #: help:hr.holidays,state:0 -msgid "" -"The state is set to 'Draft', when a holiday request is created. \n" -"The state is 'Waiting Approval', when holiday request is confirmed by " -"user. \n" -"The state is 'Refused', when holiday request is refused by " -"manager. \n" +msgid "The state is set to 'Draft', when a holiday request is created. \n" +"The state is 'Waiting Approval', when holiday request is confirmed by user. \n" +"The state is 'Refused', when holiday request is refused by manager. \n" "The state is 'Approved', when holiday request is approved by manager." msgstr "" @@ -194,8 +188,8 @@ msgid "Leaves" msgstr "" #. module: hr_holidays -#: model:ir.model,name:hr_holidays.model_hr_holidays -msgid "Leave" +#: xsl:holidays.summary:0 +msgid "Analyze from" msgstr "" #. module: hr_holidays @@ -209,23 +203,20 @@ msgid "Leaves by Department" msgstr "" #. module: hr_holidays -#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0 +#: selection:hr.employee,current_leave_state:0 +#: selection:hr.holidays,state:0 msgid "Cancelled" msgstr "" #. module: hr_holidays #: help:hr.holidays,type:0 -msgid "" -"Choose 'Leave Request' if someone wants to take an off-day. \n" -"Choose 'Allocation Request' if you want to increase the number of leaves " -"available for someone" +msgid "Choose 'Leave Request' if someone wants to take an off-day. \n" +"Choose 'Allocation Request' if you want to increase the number of leaves available for someone" msgstr "" #. module: hr_holidays #: help:hr.employee,remaining_leaves:0 -msgid "" -"Total number of legal leaves allocated to this employee, change this value " -"to create allocation/leave requests." +msgid "Total number of legal leaves allocated to this employee, change this value to create allocation/leave requests." msgstr "" #. module: hr_holidays @@ -257,7 +248,8 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays,holiday_status_id:0 #: field:hr.holidays.remaining.leaves.user,leave_type:0 -#: view:hr.holidays.status:0 field:hr.holidays.status,name:0 +#: view:hr.holidays.status:0 +#: field:hr.holidays.status,name:0 #: field:hr.holidays.summary.dept,holiday_type:0 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status #: model:ir.model,name:hr_holidays.model_hr_holidays_status @@ -306,13 +298,19 @@ msgstr "" msgid "Leave Request for %s" msgstr "" +#. module: hr_holidays +#: xsl:holidays.summary:0 +msgid "Sum" +msgstr "" + #. module: hr_holidays #: field:hr.holidays.status,remaining_leaves:0 msgid "Remaining Leaves" msgstr "" #. module: hr_holidays -#: view:hr.holidays:0 field:hr.holidays,state:0 +#: view:hr.holidays:0 +#: field:hr.holidays,state:0 msgid "State" msgstr "" @@ -322,14 +320,17 @@ msgid "Total holidays by type" msgstr "" #. module: hr_holidays -#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0 +#: view:hr.employee:0 +#: view:hr.holidays:0 +#: field:hr.holidays,employee_id:0 #: field:hr.holidays.remaining.leaves.user,name:0 #: model:ir.model,name:hr_holidays.model_hr_employee msgid "Employee" msgstr "" #. module: hr_holidays -#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0 +#: selection:hr.employee,current_leave_state:0 +#: selection:hr.holidays,state:0 msgid "New" msgstr "" @@ -370,7 +371,8 @@ msgid "Allocation for %s" msgstr "" #. module: hr_holidays -#: view:hr.holidays:0 field:hr.holidays,number_of_days:0 +#: view:hr.holidays:0 +#: field:hr.holidays,number_of_days:0 #: field:hr.holidays,number_of_days_temp:0 msgid "Number of Days" msgstr "" @@ -378,14 +380,8 @@ msgstr "" #. module: hr_holidays #: code:addons/hr_holidays/hr_holidays.py:377 #, python-format -msgid "" -"The feature behind the field 'Remaining Legal Leaves' can only be used when " -"there is only one leave type with the option 'Allow to Override Limit' " -"unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot " -"decide on which leave type the update has to be done. \n" -"You may prefer to use the classic menus 'Leave Requests' and 'Allocation " -"Requests' located in 'Human Resources \\ Leaves' to manage the leave days of " -"the employees if the configuration does not allow to use this field." +msgid "The feature behind the field 'Remaining Legal Leaves' can only be used when there is only one leave type with the option 'Allow to Override Limit' unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot decide on which leave type the update has to be done. \n" +"You may prefer to use the classic menus 'Leave Requests' and 'Allocation Requests' located in 'Human Resources \\ Leaves' to manage the leave days of the employees if the configuration does not allow to use this field." msgstr "" #. module: hr_holidays @@ -400,13 +396,12 @@ msgstr "" #. module: hr_holidays #: help:hr.holidays.status,double_validation:0 -msgid "" -"If its True then its Allocation/Request have to be validated by second " -"validator" +msgid "If its True then its Allocation/Request have to be validated by second validator" msgstr "" #. module: hr_holidays -#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0 +#: selection:hr.employee,current_leave_state:0 +#: selection:hr.holidays,state:0 msgid "Waiting Approval" msgstr "" @@ -417,9 +412,7 @@ msgstr "" #. module: hr_holidays #: help:hr.holidays.status,categ_id:0 -msgid "" -"If you set a meeting type, OpenERP will create a meeting in the calendar " -"once a leave is validated." +msgid "If you set a meeting type, OpenERP will create a meeting in the calendar once a leave is validated." msgstr "" #. module: hr_holidays @@ -438,6 +431,7 @@ msgid "Lavender" msgstr "" #. module: hr_holidays +#: xsl:holidays.summary:0 #: view:hr.holidays:0 msgid "Month" msgstr "" @@ -461,15 +455,14 @@ msgid "Employee's Holidays" msgstr "" #. module: hr_holidays -#: view:hr.holidays:0 field:hr.holidays,category_id:0 +#: view:hr.holidays:0 +#: field:hr.holidays,category_id:0 msgid "Category" msgstr "" #. module: hr_holidays #: help:hr.holidays.status,max_leaves:0 -msgid "" -"This value is given by the sum of all holidays requests with a positive " -"value." +msgid "This value is given by the sum of all holidays requests with a positive value." msgstr "" #. module: hr_holidays @@ -504,7 +497,8 @@ msgid "Holiday" msgstr "" #. module: hr_holidays -#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0 +#: field:hr.holidays,case_id:0 +#: field:hr.holidays.status,categ_id:0 msgid "Meeting" msgstr "" @@ -524,6 +518,11 @@ msgstr "" msgid "Leaves Already Taken" msgstr "" +#. module: hr_holidays +#: xsl:holidays.summary:0 +msgid "holidays." +msgstr "" + #. module: hr_holidays #: field:hr.holidays,user_id:0 #: field:hr.holidays.remaining.leaves.user,user_id:0 @@ -551,7 +550,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees." msgstr "" #. module: hr_holidays -#: view:hr.employee:0 field:hr.employee,remaining_leaves:0 +#: view:hr.employee:0 +#: field:hr.employee,remaining_leaves:0 msgid "Remaining Legal Leaves" msgstr "" @@ -610,9 +610,7 @@ msgstr "" #. module: hr_holidays #: help:hr.holidays.status,active:0 -msgid "" -"If the active field is set to false, it will allow you to hide the leave " -"type without removing it." +msgid "If the active field is set to false, it will allow you to hide the leave type without removing it." msgstr "" #. module: hr_holidays @@ -631,8 +629,8 @@ msgid "Compensatory Days" msgstr "" #. module: hr_holidays -#: view:hr.holidays:0 field:hr.holidays,notes:0 -msgid "Reasons" +#: selection:hr.holidays.status,color_name:0 +msgid "Light Yellow" msgstr "" #. module: hr_holidays @@ -642,25 +640,26 @@ msgid "Leaves Analysis" msgstr "" #. module: hr_holidays -#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0 +#: view:hr.holidays.summary.dept:0 +#: view:hr.holidays.summary.employee:0 msgid "Cancel" msgstr "" #. module: hr_holidays #: help:hr.holidays.status,color_name:0 -msgid "" -"This color will be used in the leaves summary located in Reporting\\Leaves " -"by Departement" +msgid "This color will be used in the leaves summary located in Reporting\\Leaves by Departement" msgstr "" #. module: hr_holidays -#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0 +#: view:hr.holidays:0 +#: selection:hr.holidays.summary.dept,holiday_type:0 #: selection:hr.holidays.summary.employee,holiday_type:0 msgid "Validated" msgstr "" #. module: hr_holidays -#: view:hr.holidays:0 selection:hr.holidays,type:0 +#: view:hr.holidays:0 +#: selection:hr.holidays,type:0 msgid "Allocation Request" msgstr "" @@ -676,7 +675,13 @@ msgid "Apply Double Validation" msgstr "" #. module: hr_holidays -#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0 +#: xsl:holidays.summary:0 +msgid "Holiday Type" +msgstr "" + +#. module: hr_holidays +#: view:hr.holidays.summary.dept:0 +#: view:hr.holidays.summary.employee:0 msgid "Print" msgstr "" @@ -697,7 +702,8 @@ msgid "By Employee Category" msgstr "" #. module: hr_holidays -#: view:hr.holidays:0 selection:hr.holidays,type:0 +#: view:hr.holidays:0 +#: selection:hr.holidays,type:0 msgid "Leave Request" msgstr "" @@ -718,9 +724,7 @@ msgstr "" #. module: hr_holidays #: help:hr.holidays,holiday_type:0 -msgid "" -"By Employee: Allocation/Request for individual Employee, By Employee " -"Category: Allocation/Request for group of employees in category" +msgid "By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category" msgstr "" #. module: hr_holidays @@ -731,7 +735,8 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -msgid "Search Leave" +#: field:hr.holidays,notes:0 +msgid "Reasons" msgstr "" #. module: hr_holidays @@ -766,16 +771,12 @@ msgstr "" #. module: hr_holidays #: help:hr.holidays.status,limit:0 -msgid "" -"If you tick this checkbox, the system will allow, for this section, the " -"employees to take more leaves than the available ones." +msgid "If you tick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones." msgstr "" #. module: hr_holidays #: help:hr.holidays.status,leaves_taken:0 -msgid "" -"This value is given by the sum of all holidays requests with a negative " -"value." +msgid "This value is given by the sum of all holidays requests with a negative value." msgstr "" #. module: hr_holidays @@ -785,9 +786,7 @@ msgstr "" #. module: hr_holidays #: model:ir.actions.act_window,help:hr_holidays.hr_holidays_leaves_assign_legal -msgid "" -"You can assign remaining Legal Leaves for each employee, OpenERP will " -"automatically create and validate allocation requests." +msgid "You can assign remaining Legal Leaves for each employee, OpenERP will automatically create and validate allocation requests." msgstr "" #. module: hr_holidays @@ -797,9 +796,7 @@ msgstr "" #. module: hr_holidays #: help:hr.holidays,manager_id2:0 -msgid "" -"This area is automaticly filled by the user who validate the leave with " -"second level (If Leave type need second validation)" +msgid "This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)" msgstr "" #. module: hr_holidays @@ -818,10 +815,16 @@ msgid "Approve" msgstr "" #. module: hr_holidays -#: view:hr.holidays:0 field:hr.holidays,date_from:0 +#: view:hr.holidays:0 +#: field:hr.holidays,date_from:0 msgid "Start Date" msgstr "" +#. module: hr_holidays +#: model:ir.model,name:hr_holidays.model_hr_holidays +msgid "Leave" +msgstr "" + #. module: hr_holidays #: view:hr.holidays:0 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays @@ -830,8 +833,8 @@ msgid "Allocation Requests" msgstr "" #. module: hr_holidays -#: selection:hr.holidays.status,color_name:0 -msgid "Light Yellow" +#: xsl:holidays.summary:0 +msgid "Color" msgstr "" #. module: hr_holidays @@ -858,3 +861,4 @@ msgstr "" #: view:hr.holidays:0 msgid "To Approve" msgstr "" + From 93775fac16da7000ea4adde9fd781c123a2436a4 Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Mon, 24 Sep 2012 15:32:04 +0200 Subject: [PATCH 10/18] [FIX] new pot file bzr revid: cbi@openerp.com-20120924133204-qlhy186t5hkkwxey --- addons/hr_timesheet/i18n/hr_timesheet.pot | 50 +++++++++++++++-------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/addons/hr_timesheet/i18n/hr_timesheet.pot b/addons/hr_timesheet/i18n/hr_timesheet.pot index b4ccb8ad997..2b518eed79e 100644 --- a/addons/hr_timesheet/i18n/hr_timesheet.pot +++ b/addons/hr_timesheet/i18n/hr_timesheet.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.1rc1\n" +"Project-Id-Version: OpenERP Server 6.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-08 00:36+0000\n" -"PO-Revision-Date: 2012-02-08 00:36+0000\n" +"POT-Creation-Date: 2012-09-24 13:21+0000\n" +"PO-Revision-Date: 2012-09-24 13:21+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -199,6 +199,11 @@ msgstr "" msgid "Sun" msgstr "" +#. module: hr_timesheet +#: xsl:hr.analytical.timesheet:0 +msgid "Sum" +msgstr "" + #. module: hr_timesheet #: view:hr.analytic.timesheet:0 msgid "Analytic account" @@ -242,11 +247,6 @@ msgstr "" msgid "Categories" msgstr "" -#. module: hr_timesheet -#: constraint:hr.analytic.timesheet:0 -msgid "You cannot modify an entry in a Confirmed/Done timesheet !." -msgstr "" - #. module: hr_timesheet #: help:hr.employee,product_id:0 msgid "Specifies employee's designation as a product with type 'service'." @@ -267,8 +267,12 @@ msgid "September" msgstr "" #. module: hr_timesheet -#: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet -msgid "Timesheet Line" +#: code:addons/hr_timesheet/report/user_timesheet.py:40 +#: code:addons/hr_timesheet/report/users_timesheet.py:73 +#: selection:hr.analytical.timesheet.employee,month:0 +#: selection:hr.analytical.timesheet.users,month:0 +#, python-format +msgid "December" msgstr "" #. module: hr_timesheet @@ -298,6 +302,11 @@ msgstr "" msgid "Invoice Analysis" msgstr "" +#. module: hr_timesheet +#: xsl:hr.analytical.timesheet:0 +msgid "Timesheet by Employee" +msgstr "" + #. module: hr_timesheet #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet msgid "Employee timesheet" @@ -450,12 +459,8 @@ msgid "My Timesheet" msgstr "" #. module: hr_timesheet -#: code:addons/hr_timesheet/report/user_timesheet.py:40 -#: code:addons/hr_timesheet/report/users_timesheet.py:73 -#: selection:hr.analytical.timesheet.employee,month:0 -#: selection:hr.analytical.timesheet.users,month:0 -#, python-format -msgid "December" +#: constraint:hr.analytic.timesheet:0 +msgid "You cannot modify an entry in a Confirmed/Done timesheet !." msgstr "" #. module: hr_timesheet @@ -467,9 +472,9 @@ msgid "Cancel" msgstr "" #. module: hr_timesheet +#: xsl:hr.analytical.timesheet_users:0 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_users #: model:ir.actions.report.xml,name:hr_timesheet.report_users_timesheet -#: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users #: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_users msgid "Employees Timesheet" msgstr "" @@ -496,6 +501,11 @@ msgstr "" msgid "Current Date" msgstr "" +#. module: hr_timesheet +#: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet +msgid "Timesheet Line" +msgstr "" + #. module: hr_timesheet #: view:hr.analytical.timesheet.employee:0 msgid "This wizard will print monthly timesheet" @@ -613,6 +623,12 @@ msgstr "" msgid "Accounting" msgstr "" +#. module: hr_timesheet +#: xsl:hr.analytical.timesheet:0 +#: xsl:hr.analytical.timesheet_users:0 +msgid "Total" +msgstr "" + #. module: hr_timesheet #: view:hr.sign.out.project:0 msgid "Change Work" From 23f79b2edcb442d1d70d84b51d7fcfdda8ebc2b3 Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Mon, 24 Sep 2012 15:32:19 +0200 Subject: [PATCH 11/18] [FIX] new pot file bzr revid: cbi@openerp.com-20120924133219-mypjd2y7rzlm4y80 --- addons/product/i18n/product.pot | 2978 ++++++++++++++----------------- 1 file changed, 1318 insertions(+), 1660 deletions(-) diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot index 0b741b4ff02..e7ef442f31e 100644 --- a/addons/product/i18n/product.pot +++ b/addons/product/i18n/product.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.1rc1\n" +"Project-Id-Version: OpenERP Server 6.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-08 00:37+0000\n" -"PO-Revision-Date: 2012-02-08 00:37+0000\n" +"POT-Creation-Date: 2012-09-24 13:22+0000\n" +"PO-Revision-Date: 2012-09-24 13:22+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,561 +15,6 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" -#. module: product -#: model:product.template,name:product.product_product_ram512_product_template -msgid "DDR 512MB PC400" -msgstr "" - -#. module: product -#: field:product.packaging,rows:0 -msgid "Number of Layers" -msgstr "" - -#. module: product -#: constraint:product.pricelist.item:0 -msgid "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!" -msgstr "" - -#. module: product -#: help:product.pricelist.item,product_tmpl_id:0 -msgid "Set a template if this rule only apply to a template of product. Keep empty for all products" -msgstr "" - -#. module: product -#: help:product.product,virtual_available:0 -msgid "Forecast quantity (computed as Quantity On Hand - Outgoing + Incoming)\n" -"In a context with a single Stock Location, this includes goods stored at this Location, or any of its children.\n" -"In a context with a single Warehouse, this includes goods stored in the Stock Location of this Warehouse, or any of its children.\n" -"In a context with a single Shop, this includes goods stored in the Stock Location of the Warehouse of this Shop, or any of its children.\n" -"Otherwise, this includes goods stored in any Stock Location typed as 'internal'." -msgstr "" - -#. module: product -#: model:product.category,name:product.cat1 -msgid "Sellable" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_mb2_product_template -msgid "Mainboard ASUStek A7V8X-X" -msgstr "" - -#. module: product -#: help:product.template,seller_qty:0 -msgid "This is minimum quantity to purchase from Main Supplier." -msgstr "" - -#. module: product -#: model:product.uom,name:product.uom_day -msgid "Day" -msgstr "" - -#. module: product -#: view:product.product:0 -msgid "UoM" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_pc2_product_template -msgid "Basic+ PC (assembly on order)" -msgstr "" - -#. module: product -#: field:product.product,incoming_qty:0 -msgid "Incoming" -msgstr "" - -#. module: product -#: help:res.partner,property_product_pricelist:0 -msgid "This pricelist will be used, instead of the default one, for sales to the current partner" -msgstr "" - -#. module: product -#: field:product.template,seller_qty:0 -msgid "Supplier Quantity" -msgstr "" - -#. module: product -#: selection:product.template,mes_type:0 -msgid "Fixed" -msgstr "" - -#. module: product -#: code:addons/product/pricelist.py:178 -#, python-format -msgid "Warning !" -msgstr "" - -#. module: product -#: model:ir.actions.report.xml,name:product.report_product_pricelist -#: model:ir.model,name:product.model_product_pricelist -#: field:product.product,price:0 -#: field:product.product,pricelist_id:0 -#: view:product.supplierinfo:0 -msgid "Pricelist" -msgstr "" - -#. module: product -#: view:product.product:0 -#: view:product.template:0 -msgid "Base Prices" -msgstr "" - -#. module: product -#: field:product.pricelist.item,name:0 -msgid "Rule Name" -msgstr "" - -#. module: product -#: field:product.product,code:0 -#: field:product.product,default_code:0 -msgid "Reference" -msgstr "" - -#. module: product -#: help:pricelist.partnerinfo,min_quantity:0 -msgid "The minimal quantity to trigger this rule, expressed in the supplier UoM if any or in the default UoM of the product otherrwise." -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_24_product_template -msgid "Keyboard" -msgstr "" - -#. module: product -#: model:ir.model,name:product.model_res_partner -msgid "Partner" -msgstr "" - -#. module: product -#: code:addons/product/product.py:143 -#, python-format -msgid "Conversion from Product UoM %s to Default UoM %s is not possible as they both belong to different Category!." -msgstr "" - -#. module: product -#: model:product.uom,name:product.product_uom_dozen -msgid "Dozen" -msgstr "" - -#. module: product -#: selection:product.template,cost_method:0 -msgid "Average Price" -msgstr "" - -#. module: product -#: help:product.pricelist.item,name:0 -msgid "Explicit rule name for this pricelist line." -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_cpu1_product_template -msgid "Processor AMD Athlon XP 1800+" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_20_product_template -msgid "HDD on demand" -msgstr "" - -#. module: product -#: field:product.price_list,price_list:0 -msgid "PriceList" -msgstr "" - -#. module: product -#: view:product.template:0 -msgid "UOM" -msgstr "" - -#. module: product -#: model:product.uom,name:product.product_uom_unit -msgid "PCE" -msgstr "" - -#. module: product -#: view:product.template:0 -msgid "Miscelleanous" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_worker0_product_template -msgid "Worker" -msgstr "" - -#. module: product -#: help:product.template,sale_ok:0 -msgid "Determines if the product can be visible in the list of product within a selection from a sale order line." -msgstr "" - -#. module: product -#: model:product.pricelist.version,name:product.ver0 -msgid "Default Public Pricelist Version" -msgstr "" - -#. module: product -#: selection:product.template,cost_method:0 -msgid "Standard Price" -msgstr "" - -#. module: product -#: model:product.pricelist.type,name:product.pricelist_type_sale -#: field:res.partner,property_product_pricelist:0 -msgid "Sale Pricelist" -msgstr "" - -#. module: product -#: view:product.template:0 -#: field:product.template,type:0 -msgid "Product Type" -msgstr "" - -#. module: product -#: model:ir.actions.act_window,help:product.product_form_config_action -msgid "Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased." -msgstr "" - -#. module: product -#: view:product.uom:0 -msgid " e.g: 1 * (this unit) = ratio * (reference unit)" -msgstr "" - -#. module: product -#: code:addons/product/product.py:418 -#, python-format -msgid "Products: " -msgstr "" - -#. module: product -#: field:product.category,parent_id:0 -msgid "Parent Category" -msgstr "" - -#. module: product -#: help:product.template,procure_method:0 -msgid "'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request." -msgstr "" - -#. module: product -#: model:process.node,note:product.process_node_supplier0 -msgid "Supplier name, price, product code, ..." -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_hdd3_product_template -msgid "HDD Seagate 7200.8 160GB" -msgstr "" - -#. module: product -#: field:product.product,ean13:0 -msgid "EAN13" -msgstr "" - -#. module: product -#: field:product.template,seller_id:0 -msgid "Main Supplier" -msgstr "" - -#. module: product -#: model:ir.actions.act_window,name:product.product_ul_form_action -#: model:ir.model,name:product.model_product_packaging -#: model:ir.ui.menu,name:product.menu_product_ul_form_action -#: view:product.packaging:0 -#: view:product.product:0 -#: view:product.ul:0 -msgid "Packaging" -msgstr "" - -#. module: product -#: view:product.product:0 -#: field:product.template,categ_id:0 -msgid "Category" -msgstr "" - -#. module: product -#: help:product.pricelist.item,min_quantity:0 -msgid "The rule only applies if the partner buys/sells more than this quantity." -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_woodmm0_product_template -msgid "Wood 2mm" -msgstr "" - -#. module: product -#: field:product.price_list,qty1:0 -msgid "Quantity-1" -msgstr "" - -#. module: product -#: help:product.packaging,ul_qty:0 -msgid "The number of packages by layer" -msgstr "" - -#. module: product -#: field:product.packaging,qty:0 -msgid "Quantity by Package" -msgstr "" - -#. module: product -#: view:product.product:0 -#: view:product.template:0 -#: field:product.template,state:0 -msgid "Status" -msgstr "" - -#. module: product -#: help:product.template,categ_id:0 -msgid "Select category for the current product" -msgstr "" - -#. module: product -#: field:product.product,outgoing_qty:0 -msgid "Outgoing" -msgstr "" - -#. module: product -#: selection:product.uom,uom_type:0 -msgid "Reference UoM for this category" -msgstr "" - -#. module: product -#: model:product.price.type,name:product.list_price -#: field:product.product,lst_price:0 -msgid "Public Price" -msgstr "" - -#. module: product -#: field:product.price_list,qty5:0 -msgid "Quantity-5" -msgstr "" - -#. module: product -#: model:product.category,name:product.product_category_10 -msgid "IT components" -msgstr "" - -#. module: product -#: field:product.template,product_manager:0 -msgid "Product Manager" -msgstr "" - -#. module: product -#: field:product.supplierinfo,product_name:0 -msgid "Supplier Product Name" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_pc3_product_template -msgid "Medium PC" -msgstr "" - -#. module: product -#: model:ir.actions.act_window,help:product.product_normal_action_puchased -msgid "Products can be purchased and/or sold. They can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on." -msgstr "" - -#. module: product -#: help:product.product,qty_available:0 -msgid "Current quantity of products.\n" -"In a context with a single Stock Location, this includes goods stored at this Location, or any of its children.\n" -"In a context with a single Warehouse, this includes goods stored in the Stock Location of this Warehouse, or any of its children.\n" -"In a context with a single Shop, this includes goods stored in the Stock Location of the Warehouse of this Shop, or any of its children.\n" -"Otherwise, this includes goods stored in any Stock Location typed as 'internal'." -msgstr "" - -#. module: product -#: view:product.pricelist:0 -msgid "Products Price Search" -msgstr "" - -#. module: product -#: view:product.product:0 -#: view:product.template:0 -#: field:product.template,description_sale:0 -msgid "Sale Description" -msgstr "" - -#. module: product -#: view:product.product:0 -#: view:product.template:0 -msgid "Storage Localisation" -msgstr "" - -#. module: product -#: help:product.packaging,length:0 -msgid "The length of the package" -msgstr "" - -#. module: product -#: help:product.template,weight_net:0 -msgid "The net weight in Kg." -msgstr "" - -#. module: product -#: help:product.template,state:0 -msgid "Tells the user if he can use the product or not." -msgstr "" - -#. module: product -#: field:pricelist.partnerinfo,min_quantity:0 -#: field:product.supplierinfo,qty:0 -msgid "Quantity" -msgstr "" - -#. module: product -#: field:product.packaging,height:0 -msgid "Height" -msgstr "" - -#. module: product -#: help:product.pricelist.version,date_end:0 -msgid "Ending date for this pricelist version to be valid." -msgstr "" - -#. module: product -#: model:product.category,name:product.cat0 -msgid "All products" -msgstr "" - -#. module: product -#: model:ir.model,name:product.model_pricelist_partnerinfo -msgid "pricelist.partnerinfo" -msgstr "" - -#. module: product -#: field:product.price_list,qty2:0 -msgid "Quantity-2" -msgstr "" - -#. module: product -#: field:product.price_list,qty3:0 -msgid "Quantity-3" -msgstr "" - -#. module: product -#: view:product.product:0 -msgid "Codes" -msgstr "" - -#. module: product -#: field:product.price_list,qty4:0 -msgid "Quantity-4" -msgstr "" - -#. module: product -#: view:res.partner:0 -msgid "Sales & Purchases" -msgstr "" - -#. module: product -#: model:product.uom.categ,name:product.uom_categ_wtime -msgid "Working Time" -msgstr "" - -#. module: product -#: model:ir.actions.act_window,help:product.product_pricelist_action2 -#: model:ir.actions.act_window,help:product.product_pricelist_action_for_purchase -msgid "A price list contains rules to be evaluated in order to compute the purchase or sales price for all the partners assigned to a price list. Price lists have several versions (2010, 2011, Promotion of February 2010, etc.) and each version has several rules. Example: the customer price of a product category will be based on the supplier price multiplied by 1.80." -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_metalcleats0_product_template -msgid "Metal Cleats" -msgstr "" - -#. module: product -#: code:addons/product/product.py:175 -#, python-format -msgid "Cannot change the category of existing UoM '%s'." -msgstr "" - -#. module: product -#: model:ir.model,name:product.model_product_uom_categ -msgid "Product uom categ" -msgstr "" - -#. module: product -#: model:product.ul,name:product.product_ul_box -msgid "Box 20x20x40" -msgstr "" - -#. module: product -#: view:product.pricelist.item:0 -msgid "Price Computation" -msgstr "" - -#. module: product -#: model:res.groups,name:product.group_uos -msgid "Product UoS View" -msgstr "" - -#. module: product -#: field:product.template,purchase_ok:0 -msgid "Can be Purchased" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_cpu2_product_template -msgid "High speed processor config" -msgstr "" - -#. module: product -#: model:process.transition,note:product.process_transition_supplierofproduct0 -msgid "1 or several supplier(s) can be linked to a product. All information stands in the product form." -msgstr "" - -#. module: product -#: help:product.uom,category_id:0 -msgid "Quantity conversions may happen automatically between Units of Measure in the same category, according to their respective ratios." -msgstr "" - -#. module: product -#: help:product.packaging,width:0 -msgid "The width of the package" -msgstr "" - -#. module: product -#: selection:product.category,type:0 -msgid "View" -msgstr "" - -#. module: product -#: model:ir.actions.act_window,name:product.product_template_action_tree -msgid "Product Templates" -msgstr "" - -#. module: product -#: field:product.category,parent_left:0 -msgid "Left Parent" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_restaurantexpenses0_product_template -msgid "Restaurant Expenses" -msgstr "" - -#. module: product -#: help:product.packaging,qty:0 -msgid "The total number of products you can put by pallet or box." -msgstr "" - -#. module: product -#: constraint:product.packaging:0 -#: constraint:product.product:0 -msgid "Error: Invalid ean code" -msgstr "" - -#. module: product -#: field:product.pricelist.item,min_quantity:0 -msgid "Min. Quantity" -msgstr "" - -#. module: product -#: model:ir.model,name:product.model_product_price_type -msgid "Price Type" -msgstr "" - #. module: product #: code:addons/product/product.py:363 #, python-format @@ -586,498 +31,9 @@ msgstr "" msgid "Base Price" msgstr "" -#. module: product -#: model:product.template,name:product.product_consultant_product_template -msgid "Service on Timesheet" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_fan2_product_template -msgid "Silent fan" -msgstr "" - -#. module: product -#: help:product.supplierinfo,name:0 -msgid "Supplier of this product" -msgstr "" - -#. module: product -#: help:product.pricelist.version,active:0 -msgid "When a version is duplicated it is set to non active, so that the dates do not overlaps with original version. You should change the dates and reactivate the pricelist" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_kitshelfofcm0_product_template -msgid "KIT Shelf of 100cm" -msgstr "" - -#. module: product -#: field:product.supplierinfo,name:0 -msgid "Supplier" -msgstr "" - -#. module: product -#: field:product.product,qty_available:0 -msgid "Quantity On Hand" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_26_product_template -msgid "Kit Keyboard + Mouse" -msgstr "" - -#. module: product -#: field:product.price.type,name:0 -msgid "Price Name" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_arm_product_template -msgid "Cabinet" -msgstr "" - -#. module: product -#: help:product.product,incoming_qty:0 -msgid "Quantity of products that are planned to arrive.\n" -"In a context with a single Stock Location, this includes goods arriving to this Location, or any of its children.\n" -"In a context with a single Warehouse, this includes goods arriving to the Stock Location of this Warehouse, or any of its children.\n" -"In a context with a single Shop, this includes goods arriving to the Stock Location of the Warehouse of this Shop, or any of its children.\n" -"Otherwise, this includes goods arriving to any Stock Location typed as 'internal'." -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_woodentable0_product_template -msgid "Wooden Table" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_cpu3_product_template -msgid "Processor AMD Athlon XP 2200+" -msgstr "" - -#. module: product -#: model:ir.actions.act_window,name:product.action_product_price_list -#: model:ir.model,name:product.model_product_price_list -#: view:product.price_list:0 -#: report:product.pricelist:0 -#: field:product.pricelist.version,pricelist_id:0 -msgid "Price List" -msgstr "" - -#. module: product -#: view:product.product:0 -#: view:product.template:0 -msgid "Suppliers" -msgstr "" - -#. module: product -#: view:product.product:0 -msgid "To Purchase" -msgstr "" - -#. module: product -#: help:product.supplierinfo,min_qty:0 -msgid "The minimal quantity to purchase to this supplier, expressed in the supplier Product UoM if not empty, in the default unit of measure of the product otherwise." -msgstr "" - #. module: product #: view:product.pricelist.item:0 -msgid "New Price =" -msgstr "" - -#. module: product -#: help:pricelist.partnerinfo,price:0 -msgid "This price will be considered as a price for the supplier UoM if any or the default Unit of Measure of the product otherwise" -msgstr "" - -#. module: product -#: model:product.category,name:product.product_category_accessories -msgid "Accessories" -msgstr "" - -#. module: product -#: field:product.template,sale_delay:0 -msgid "Customer Lead Time" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_25_product_template -msgid "Mouse" -msgstr "" - -#. module: product -#: help:product.template,uos_id:0 -msgid "Used by companies that manage two units of measure: invoicing and inventory management. For example, in food industries, you will manage a stock of ham but invoice in Kg. Keep empty to use the default UOM." -msgstr "" - -#. module: product -#: view:product.pricelist.item:0 -msgid "Min. Margin" -msgstr "" - -#. module: product -#: field:product.category,child_id:0 -msgid "Child Categories" -msgstr "" - -#. module: product -#: field:product.pricelist.version,date_end:0 -msgid "End Date" -msgstr "" - -#. module: product -#: view:product.price_list:0 -msgid "Print" -msgstr "" - -#. module: product -#: view:product.product:0 -#: field:product.ul,type:0 -msgid "Type" -msgstr "" - -#. module: product -#: model:ir.actions.act_window,name:product.product_pricelist_action2 -#: model:ir.actions.act_window,name:product.product_pricelist_action_for_purchase -#: model:ir.ui.menu,name:product.menu_product_pricelist_action2 -#: model:ir.ui.menu,name:product.menu_product_pricelist_main -msgid "Pricelists" -msgstr "" - -#. module: product -#: field:product.product,partner_ref:0 -msgid "Customer ref" -msgstr "" - -#. module: product -#: view:product.product:0 -msgid "Miscellaneous" -msgstr "" - -#. module: product -#: field:product.pricelist.type,key:0 -msgid "Key" -msgstr "" - -#. module: product -#: view:product.pricelist.item:0 -msgid "Rules Test Match" -msgstr "" - -#. module: product -#: help:product.pricelist.item,product_id:0 -msgid "Set a product if this rule only apply to one product. Keep empty for all products" -msgstr "" - -#. module: product -#: view:product.product:0 -#: view:product.template:0 -msgid "Procurement & Locations" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_kitchendesignproject0_product_template -msgid "Kitchen Design Project" -msgstr "" - -#. module: product -#: model:product.uom,name:product.uom_hour -msgid "Hour" -msgstr "" - -#. module: product -#: selection:product.template,state:0 -msgid "In Development" -msgstr "" - -#. module: product -#: code:addons/product/product.py:363 -#, python-format -msgid "UoM categories Mismatch!" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_shelfofcm1_product_template -msgid "Shelf of 200cm" -msgstr "" - -#. module: product -#: view:product.uom:0 -msgid "Ratio & Precision" -msgstr "" - -#. module: product -#: model:product.uom,name:product.product_uom_gram -msgid "g" -msgstr "" - -#. module: product -#: model:product.category,name:product.product_category_11 -msgid "IT components kits" -msgstr "" - -#. module: product -#: selection:product.category,type:0 -#: selection:product.template,state:0 -msgid "Normal" -msgstr "" - -#. module: product -#: model:process.node,name:product.process_node_supplier0 -#: view:product.supplierinfo:0 -msgid "Supplier Information" -msgstr "" - -#. module: product -#: field:product.price.type,currency_id:0 -#: report:product.pricelist:0 -#: field:product.pricelist,currency_id:0 -msgid "Currency" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_ram_product_template -msgid "DDR 256MB PC400" -msgstr "" - -#. module: product -#: model:ir.actions.act_window,name:product.product_category_action_form -#: model:ir.ui.menu,name:product.menu_product_category_action_form -#: view:product.category:0 -msgid "Product Categories" -msgstr "" - -#. module: product -#: view:product.uom:0 -msgid " e.g: 1 * (reference unit) = ratio * (this unit)" -msgstr "" - -#. module: product -#: model:ir.actions.act_window,help:product.product_uom_form_action -msgid "Create and manage the units of measure you want to be used in your system. You can define a conversion rate between several Units of Measure within the same category." -msgstr "" - -#. module: product -#: field:product.packaging,weight:0 -msgid "Total Package Weight" -msgstr "" - -#. module: product -#: field:product.template,seller_info_id:0 -msgid "unknown" -msgstr "" - -#. module: product -#: help:product.packaging,code:0 -msgid "The code of the transport unit." -msgstr "" - -#. module: product -#: help:product.template,standard_price:0 -msgid "Product's cost for accounting stock valuation. It is the base price for the supplier price." -msgstr "" - -#. module: product -#: view:product.price.type:0 -msgid "Products Price Type" -msgstr "" - -#. module: product -#: field:product.product,price_extra:0 -msgid "Variant Price Extra" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_fan_product_template -msgid "Regular case fan 80mm" -msgstr "" - -#. module: product -#: model:ir.model,name:product.model_product_supplierinfo -msgid "Information about a product supplier" -msgstr "" - -#. module: product -#: view:product.product:0 -#: view:product.template:0 -#: field:product.template,description_purchase:0 -msgid "Purchase Description" -msgstr "" - -#. module: product -#: constraint:product.pricelist.version:0 -msgid "You cannot have 2 pricelist versions that overlap!" -msgstr "" - -#. module: product -#: help:product.supplierinfo,delay:0 -msgid "Lead time in days between the confirmation of the purchase order and the reception of the products in your warehouse. Used by the scheduler for automatic computation of the purchase order planning." -msgstr "" - -#. module: product -#: model:ir.actions.act_window,help:product.product_pricelist_action -msgid "There can be more than one version of a pricelist. Here you can create and manage new versions of a price list. Some examples of versions: 2010, 2011, Summer Promotion, etc." -msgstr "" - -#. module: product -#: selection:product.template,type:0 -msgid "Stockable Product" -msgstr "" - -#. module: product -#: field:product.packaging,code:0 -msgid "Code" -msgstr "" - -#. module: product -#: view:product.supplierinfo:0 -msgid "Seq" -msgstr "" - -#. module: product -#: view:product.price_list:0 -msgid "Calculate Product Price per unit base on pricelist version." -msgstr "" - -#. module: product -#: model:ir.model,name:product.model_product_ul -msgid "Shipping Unit" -msgstr "" - -#. module: product -#: field:pricelist.partnerinfo,suppinfo_id:0 -msgid "Partner Information" -msgstr "" - -#. module: product -#: selection:product.ul,type:0 -#: model:product.uom.categ,name:product.product_uom_categ_unit -msgid "Unit" -msgstr "" - -#. module: product -#: view:product.product:0 -#: view:product.template:0 -msgid "Information" -msgstr "" - -#. module: product -#: view:product.pricelist.item:0 -msgid "Products Listprices Items" -msgstr "" - -#. module: product -#: view:product.packaging:0 -msgid "Other Info" -msgstr "" - -#. module: product -#: field:product.pricelist.version,items_id:0 -msgid "Price List Items" -msgstr "" - -#. module: product -#: model:ir.actions.act_window,help:product.product_uom_categ_form_action -msgid "Create and manage the units of measure categories you want to be used in your system. If several units of measure are in the same category, they can be converted to each other. For example, in the unit of measure category \"Time\", you will have the following UoM: Hours, Days." -msgstr "" - -#. module: product -#: selection:product.uom,uom_type:0 -msgid "Bigger than the reference UoM" -msgstr "" - -#. module: product -#: field:product.category,parent_right:0 -msgid "Right Parent" -msgstr "" - -#. module: product -#: view:product.product:0 -msgid "To Sell" -msgstr "" - -#. module: product -#: help:product.product,outgoing_qty:0 -msgid "Quantity of products that are planned to leave.\n" -"In a context with a single Stock Location, this includes goods leaving from this Location, or any of its children.\n" -"In a context with a single Warehouse, this includes goods leaving from the Stock Location of this Warehouse, or any of its children.\n" -"In a context with a single Shop, this includes goods leaving from the Stock Location of the Warehouse of this Shop, or any of its children.\n" -"Otherwise, this includes goods leaving from any Stock Location typed as 'internal'." -msgstr "" - -#. module: product -#: model:product.category,name:product.product_category_services0 -msgid "Marketable Services" -msgstr "" - -#. module: product -#: field:product.pricelist.item,price_surcharge:0 -msgid "Price Surcharge" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_mb1_product_template -msgid "Mainboard ASUStek A7N8X" -msgstr "" - -#. module: product -#: field:product.product,packaging:0 -msgid "Logistical Units" -msgstr "" - -#. module: product -#: field:product.category,complete_name:0 -#: field:product.category,name:0 -#: field:product.pricelist.type,name:0 -#: field:product.pricelist.version,name:0 -#: view:product.product:0 -#: field:product.product,name_template:0 -#: field:product.template,name:0 -#: field:product.ul,name:0 -#: field:product.uom,name:0 -#: field:product.uom.categ,name:0 -msgid "Name" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_woodlintelm0_product_template -msgid "Wood Lintel 4m" -msgstr "" - -#. module: product -#: model:ir.actions.act_window,help:product.product_normal_action -#: model:ir.actions.act_window,help:product.product_normal_action_sell -msgid "You must define a Product for everything you buy or sell. Products can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on." -msgstr "" - -#. module: product -#: model:product.uom,name:product.product_uom_kgm -msgid "kg" -msgstr "" - -#. module: product -#: model:product.uom,name:product.product_uom_meter -msgid "m" -msgstr "" - -#. module: product -#: selection:product.template,state:0 -msgid "Obsolete" -msgstr "" - -#. module: product -#: model:product.uom,name:product.product_uom_km -msgid "km" -msgstr "" - -#. module: product -#: help:product.template,cost_method:0 -msgid "Standard Price: the cost price is fixed and recomputed periodically (usually at the end of the year), Average Price: the cost price is recomputed at each reception of products." -msgstr "" - -#. module: product -#: help:product.category,sequence:0 -msgid "Gives the sequence order when displaying a list of product categories." +msgid " ) + " msgstr "" #. module: product @@ -1086,19 +42,90 @@ msgstr "" msgid "Ratio" msgstr "" +#. module: product +#: help:product.supplierinfo,min_qty:0 +msgid "The minimal quantity to purchase to this supplier, expressed in the supplier Product UoM if not empty, in the default unit of measure of the product otherwise." +msgstr "" + +#. module: product +#: selection:product.template,type:0 +msgid "Service" +msgstr "" + #. module: product #: help:product.template,purchase_ok:0 msgid "Determine if the product is visible in the list of products within a selection from a purchase order line." msgstr "" +#. module: product +#: help:product.supplierinfo,name:0 +msgid "Supplier of this product" +msgstr "" + +#. module: product +#: model:process.node,note:product.process_node_supplier0 +msgid "Supplier name, price, product code, ..." +msgstr "" + +#. module: product +#: help:pricelist.partnerinfo,min_quantity:0 +msgid "The minimal quantity to trigger this rule, expressed in the supplier UoM if any or in the default UoM of the product otherrwise." +msgstr "" + +#. module: product +#: field:product.packaging,rows:0 +msgid "Number of Layers" +msgstr "" + #. module: product #: field:product.template,weight_net:0 msgid "Net weight" msgstr "" #. module: product -#: field:product.packaging,width:0 -msgid "Width" +#: help:product.pricelist.version,active:0 +msgid "When a version is duplicated it is set to non active, so that the dates do not overlaps with original version. You should change the dates and reactivate the pricelist" +msgstr "" + +#. module: product +#: field:product.price.type,field:0 +msgid "Product Field" +msgstr "" + +#. module: product +#: help:product.pricelist.item,product_tmpl_id:0 +msgid "Set a template if this rule only apply to a template of product. Keep empty for all products" +msgstr "" + +#. module: product +#: help:product.product,virtual_available:0 +msgid "Forecast quantity (computed as Quantity On Hand - Outgoing + Incoming)\n" +"In a context with a single Stock Location, this includes goods stored at this Location, or any of its children.\n" +"In a context with a single Warehouse, this includes goods stored in the Stock Location of this Warehouse, or any of its children.\n" +"In a context with a single Shop, this includes goods stored in the Stock Location of the Warehouse of this Shop, or any of its children.\n" +"Otherwise, this includes goods stored in any Stock Location typed as 'internal'." +msgstr "" + +#. module: product +#: field:product.supplierinfo,product_uom:0 +msgid "Supplier UoM" +msgstr "" + +#. module: product +#: help:product.pricelist.item,price_round:0 +msgid "Sets the price so that it is a multiple of this value.\n" +"Rounding is applied after the discount and before the surcharge.\n" +"To have prices that end in 9.99, set rounding 10, surcharge -0.01" +msgstr "" + +#. module: product +#: field:product.supplierinfo,name:0 +msgid "Supplier" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_consultant_product_template +msgid "Service on Timesheet" msgstr "" #. module: product @@ -1122,8 +149,38 @@ msgid "Printing Date" msgstr "" #. module: product -#: field:product.template,uos_id:0 -msgid "Unit of Sale" +#: field:product.product,qty_available:0 +msgid "Quantity On Hand" +msgstr "" + +#. module: product +#: view:product.pricelist:0 +msgid "Products Price List" +msgstr "" + +#. module: product +#: model:product.uom,name:product.product_uom_cm +msgid "cm" +msgstr "" + +#. module: product +#: field:product.price.type,name:0 +msgid "Price Name" +msgstr "" + +#. module: product +#: field:product.pricelist,company_id:0 +#: field:product.pricelist.item,company_id:0 +#: field:product.pricelist.version,company_id:0 +#: view:product.product:0 +#: field:product.supplierinfo,company_id:0 +#: field:product.template,company_id:0 +msgid "Company" +msgstr "" + +#. module: product +#: help:product.template,weight_net:0 +msgid "The net weight in Kg." msgstr "" #. module: product @@ -1131,22 +188,107 @@ msgstr "" msgid "This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays." msgstr "" +#. module: product +#: help:product.template,seller_qty:0 +msgid "This is minimum quantity to purchase from Main Supplier." +msgstr "" + +#. module: product +#: help:product.product,incoming_qty:0 +msgid "Quantity of products that are planned to arrive.\n" +"In a context with a single Stock Location, this includes goods arriving to this Location, or any of its children.\n" +"In a context with a single Warehouse, this includes goods arriving to the Stock Location of this Warehouse, or any of its children.\n" +"In a context with a single Shop, this includes goods arriving to the Stock Location of the Warehouse of this Shop, or any of its children.\n" +"Otherwise, this includes goods arriving to any Stock Location typed as 'internal'." +msgstr "" + #. module: product #: help:product.template,seller_id:0 msgid "Main Supplier who has highest priority in Supplier List." msgstr "" #. module: product -#: model:product.category,name:product.product_category_services #: view:product.product:0 msgid "Services" msgstr "" +#. module: product +#: help:product.template,list_price:0 +msgid "Base price for computing the customer price. Sometimes called the catalog price." +msgstr "" + +#. module: product +#: code:addons/product/pricelist.py:376 +#, python-format +msgid "Partner section of the product form" +msgstr "" + +#. module: product +#: model:product.uom,name:product.uom_day +msgid "Day" +msgstr "" + +#. module: product +#: view:product.product:0 +msgid "UoM" +msgstr "" + #. module: product #: model:ir.actions.act_window,name:product.product_form_config_action msgid "Create or Import Products" msgstr "" +#. module: product +#: help:product.template,supply_method:0 +msgid "Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested." +msgstr "" + +#. module: product +#: help:product.pricelist.version,date_start:0 +msgid "Starting date for this pricelist version to be valid." +msgstr "" + +#. module: product +#: field:product.product,incoming_qty:0 +msgid "Incoming" +msgstr "" + +#. module: product +#: selection:product.template,procure_method:0 +msgid "Make to Stock" +msgstr "" + +#. module: product +#: constraint:product.template:0 +msgid "Error: The default UOM and the purchase UOM must be in the same category." +msgstr "" + +#. module: product +#: view:product.product:0 +#: view:product.template:0 +msgid "Suppliers" +msgstr "" + +#. module: product +#: field:product.pricelist.item,name:0 +msgid "Rule Name" +msgstr "" + +#. module: product +#: view:product.product:0 +msgid "To Purchase" +msgstr "" + +#. module: product +#: field:product.supplierinfo,product_code:0 +msgid "Supplier Product Code" +msgstr "" + +#. module: product +#: view:product.pricelist.item:0 +msgid "Rules Test Match" +msgstr "" + #. module: product #: field:product.pricelist.item,base_pricelist_id:0 msgid "If Other Pricelist" @@ -1163,14 +305,121 @@ msgstr "" msgid "Products" msgstr "" +#. module: product +#: model:product.uom.categ,name:product.uom_categ_length +msgid "Length / Distance" +msgstr "" + +#. module: product +#: field:product.template,seller_qty:0 +msgid "Supplier Quantity" +msgstr "" + +#. module: product +#: view:product.pricelist.item:0 +msgid "New Price =" +msgstr "" + +#. module: product +#: model:ir.model,name:product.model_pricelist_partnerinfo +msgid "pricelist.partnerinfo" +msgstr "" + +#. module: product +#: field:product.template,uom_po_id:0 +msgid "Purchase Unit of Measure" +msgstr "" + +#. module: product +#: selection:product.template,mes_type:0 +msgid "Fixed" +msgstr "" + +#. module: product +#: code:addons/product/pricelist.py:178 +#, python-format +msgid "Warning !" +msgstr "" + +#. module: product +#: help:product.pricelist.item,product_id:0 +msgid "Set a product if this rule only apply to one product. Keep empty for all products" +msgstr "" + #. module: product #: help:product.packaging,rows:0 msgid "The number of layers on a pallet or box" msgstr "" #. module: product -#: help:product.pricelist.item,base:0 -msgid "The mode for computing the price for this rule." +#: model:ir.model,name:product.model_product_pricelist_type +#: field:product.pricelist,type:0 +msgid "Pricelist Type" +msgstr "" + +#. module: product +#: view:product.product:0 +#: view:product.template:0 +msgid "Base Prices" +msgstr "" + +#. module: product +#: field:product.product,color:0 +msgid "Color Index" +msgstr "" + +#. module: product +#: view:product.template:0 +#: field:product.template,type:0 +msgid "Product Type" +msgstr "" + +#. module: product +#: field:product.product,partner_ref:0 +msgid "Customer ref" +msgstr "" + +#. module: product +#: field:product.product,code:0 +#: field:product.product,default_code:0 +msgid "Reference" +msgstr "" + +#. module: product +#: field:product.packaging,width:0 +msgid "Width" +msgstr "" + +#. module: product +#: view:product.product:0 +msgid "Characteristics" +msgstr "" + +#. module: product +#: field:product.template,sale_ok:0 +msgid "Can be Sold" +msgstr "" + +#. module: product +#: view:product.product:0 +msgid "Group by..." +msgstr "" + +#. module: product +#: view:product.product:0 +#: view:product.template:0 +#: field:product.template,description_sale:0 +msgid "Sale Description" +msgstr "" + +#. module: product +#: field:product.template,produce_delay:0 +msgid "Manufacturing Lead Time" +msgstr "" + +#. module: product +#: field:product.supplierinfo,pricelist_ids:0 +msgid "Supplier Pricelist" msgstr "" #. module: product @@ -1180,9 +429,66 @@ msgid "Pallet Dimension" msgstr "" #. module: product -#: code:addons/product/product.py:668 +#: code:addons/product/product.py:175 #, python-format -msgid " (copy)" +msgid "Warning" +msgstr "" + +#. module: product +#: field:product.pricelist.item,base:0 +msgid "Based on" +msgstr "" + +#. module: product +#: model:product.uom,name:product.product_uom_ton +msgid "t" +msgstr "" + +#. module: product +#: help:pricelist.partnerinfo,price:0 +msgid "This price will be considered as a price for the supplier UoM if any or the default Unit of Measure of the product otherwise" +msgstr "" + +#. module: product +#: model:product.uom,name:product.product_uom_kgm +msgid "kg" +msgstr "" + +#. module: product +#: model:ir.model,name:product.model_res_partner +msgid "Partner" +msgstr "" + +#. module: product +#: code:addons/product/product.py:143 +#, python-format +msgid "Conversion from Product UoM %s to Default UoM %s is not possible as they both belong to different Category!." +msgstr "" + +#. module: product +#: field:product.template,sale_delay:0 +msgid "Customer Lead Time" +msgstr "" + +#. module: product +#: model:process.transition,name:product.process_transition_supplierofproduct0 +msgid "Supplier of the product" +msgstr "" + +#. module: product +#: help:product.template,cost_method:0 +msgid "Standard Price: the cost price is fixed and recomputed periodically (usually at the end of the year), Average Price: the cost price is recomputed at each reception of products." +msgstr "" + +#. module: product +#: field:product.pricelist,name:0 +msgid "Pricelist Name" +msgstr "" + +#. module: product +#: model:product.price.type,name:product.list_price +#: field:product.product,lst_price:0 +msgid "Public Price" msgstr "" #. module: product @@ -1191,14 +497,110 @@ msgid "Partners" msgstr "" #. module: product -#: help:product.template,sale_delay:0 -msgid "This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers." +#: selection:product.template,cost_method:0 +msgid "Average Price" +msgstr "" + +#. module: product +#: field:product.uom,rounding:0 +msgid "Rounding Precision" +msgstr "" + +#. module: product +#: help:product.pricelist.item,name:0 +msgid "Explicit rule name for this pricelist line." +msgstr "" + +#. module: product +#: view:product.pricelist.item:0 +msgid "Min. Margin" +msgstr "" + +#. module: product +#: view:product.pricelist.item:0 +msgid "* ( 1 + " +msgstr "" + +#. module: product +#: help:product.template,product_manager:0 +msgid "This is use as task responsible" +msgstr "" + +#. module: product +#: view:product.pricelist.item:0 +msgid "Rounding Method" +msgstr "" + +#. module: product +#: field:product.category,child_id:0 +msgid "Child Categories" msgstr "" #. module: product #: view:product.product:0 #: view:product.template:0 -msgid "Second UoM" +#: field:product.template,state:0 +msgid "Status" +msgstr "" + +#. module: product +#: field:product.pricelist.item,price_round:0 +msgid "Price Rounding" +msgstr "" + +#. module: product +#: sql_constraint:product.uom:0 +msgid "The conversion ratio for a unit of measure cannot be 0!" +msgstr "" + +#. module: product +#: help:product.packaging,height:0 +msgid "The height of the package" +msgstr "" + +#. module: product +#: view:product.price_list:0 +msgid "Print" +msgstr "" + +#. module: product +#: model:product.pricelist.type,name:product.pricelist_type_sale +#: field:res.partner,property_product_pricelist:0 +msgid "Sale Pricelist" +msgstr "" + +#. module: product +#: view:product.product:0 +#: field:product.ul,type:0 +msgid "Type" +msgstr "" + +#. module: product +#: field:product.price_list,price_list:0 +msgid "PriceList" +msgstr "" + +#. module: product +#: help:product.packaging,weight:0 +msgid "The weight of a full package, pallet or box." +msgstr "" + +#. module: product +#: model:product.uom,name:product.product_uom_unit +msgid "PCE" +msgstr "" + +#. module: product +#: model:ir.actions.act_window,name:product.product_pricelist_action2 +#: model:ir.actions.act_window,name:product.product_pricelist_action_for_purchase +#: model:ir.ui.menu,name:product.menu_product_pricelist_action2 +#: model:ir.ui.menu,name:product.menu_product_pricelist_main +msgid "Pricelists" +msgstr "" + +#. module: product +#: view:product.template:0 +msgid "Miscelleanous" msgstr "" #. module: product @@ -1207,6 +609,16 @@ msgstr "" msgid "Error !" msgstr "" +#. module: product +#: report:product.pricelist:0 +msgid "Price List Name" +msgstr "" + +#. module: product +#: help:product.pricelist.item,base:0 +msgid "The mode for computing the price for this rule." +msgstr "" + #. module: product #: model:ir.actions.act_window,name:product.product_uom_form_action #: model:ir.ui.menu,name:product.menu_product_uom_form_action @@ -1215,14 +627,40 @@ msgstr "" msgid "Units of Measure" msgstr "" +#. module: product +#: field:product.supplierinfo,delay:0 +msgid "Delivery Lead Time" +msgstr "" + #. module: product #: field:product.supplierinfo,min_qty:0 msgid "Minimal Quantity" msgstr "" #. module: product -#: model:product.category,name:product.product_category_pc -msgid "PC" +#: view:product.product:0 +msgid "Miscellaneous" +msgstr "" + +#. module: product +#: help:product.uom,active:0 +msgid "By unchecking the active field you can disable a unit of measure without deleting it." +msgstr "" + +#. module: product +#: model:ir.actions.act_window,name:product.product_uom_categ_form_action +#: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action +msgid "UoM Categories" +msgstr "" + +#. module: product +#: help:product.template,sale_ok:0 +msgid "Determines if the product can be visible in the list of product within a selection from a sale order line." +msgstr "" + +#. module: product +#: field:product.template,seller_delay:0 +msgid "Supplier Lead Time" msgstr "" #. module: product @@ -1231,8 +669,13 @@ msgid "This supplier's product code will be used when printing a request for quo msgstr "" #. module: product -#: selection:product.template,procure_method:0 -msgid "Make to Stock" +#: model:product.pricelist.version,name:product.ver0 +msgid "Default Public Pricelist Version" +msgstr "" + +#. module: product +#: field:product.pricelist.type,key:0 +msgid "Key" msgstr "" #. module: product @@ -1250,14 +693,28 @@ msgstr "" msgid "Gives the order in which the pricelist items will be checked. The evaluation gives highest priority to lowest sequence and stops as soon as a matching item is found." msgstr "" +#. module: product +#: model:ir.actions.report.xml,name:product.report_product_pricelist +#: model:ir.model,name:product.model_product_pricelist +#: field:product.product,price:0 +#: field:product.product,pricelist_id:0 +#: view:product.supplierinfo:0 +msgid "Pricelist" +msgstr "" + #. module: product #: selection:product.template,type:0 msgid "Consumable" msgstr "" #. module: product -#: help:product.price.type,currency_id:0 -msgid "The currency the field is expressed in." +#: model:ir.actions.act_window,help:product.product_form_config_action +msgid "Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased." +msgstr "" + +#. module: product +#: view:product.uom:0 +msgid " e.g: 1 * (this unit) = ratio * (reference unit)" msgstr "" #. module: product @@ -1266,8 +723,49 @@ msgid "The gross weight in Kg." msgstr "" #. module: product -#: model:product.template,name:product.product_product_sidepanel0_product_template -msgid "Side Panel" +#: selection:product.ul,type:0 +msgid "Box" +msgstr "" + +#. module: product +#: code:addons/product/product.py:418 +#, python-format +msgid "Products: " +msgstr "" + +#. module: product +#: model:product.uom,name:product.uom_hour +msgid "Hour" +msgstr "" + +#. module: product +#: field:product.category,parent_id:0 +msgid "Parent Category" +msgstr "" + +#. module: product +#: selection:product.template,state:0 +msgid "In Development" +msgstr "" + +#. module: product +#: help:product.pricelist.type,key:0 +msgid "Used in the code to select specific prices based on the context. Keep unchanged." +msgstr "" + +#. module: product +#: field:product.packaging,weight:0 +msgid "Total Package Weight" +msgstr "" + +#. module: product +#: view:product.product:0 +msgid "Context..." +msgstr "" + +#. module: product +#: help:product.template,procure_method:0 +msgid "'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request." msgstr "" #. module: product @@ -1276,6 +774,12 @@ msgstr "" msgid "Procurement" msgstr "" +#. module: product +#: model:ir.actions.act_window,name:product.product_category_action +#: model:ir.ui.menu,name:product.menu_products_category +msgid "Products by Category" +msgstr "" + #. module: product #: view:product.product:0 #: view:product.template:0 @@ -1287,14 +791,65 @@ msgstr "" msgid "UoM Category" msgstr "" +#. module: product +#: view:product.product:0 +#: model:res.groups,name:product.group_product_variant +msgid "Product Variant" +msgstr "" + +#. module: product +#: help:product.supplierinfo,product_name:0 +msgid "This supplier's product name will be used when printing a request for quotation. Keep empty to use the internal one." +msgstr "" + +#. module: product +#: field:product.packaging,ul:0 +msgid "Type of Package" +msgstr "" + #. module: product #: field:product.template,loc_rack:0 msgid "Rack" msgstr "" #. module: product -#: field:product.template,uom_po_id:0 -msgid "Purchase Unit of Measure" +#: selection:product.ul,type:0 +msgid "Pack" +msgstr "" + +#. module: product +#: field:product.product,ean13:0 +msgid "EAN13" +msgstr "" + +#. module: product +#: view:product.uom:0 +msgid "Ratio & Precision" +msgstr "" + +#. module: product +#: field:product.template,uos_id:0 +msgid "Unit of Sale" +msgstr "" + +#. module: product +#: field:product.template,seller_id:0 +msgid "Main Supplier" +msgstr "" + +#. module: product +#: help:product.template,type:0 +msgid "Will change the way procurements are processed. Consumable are product where you don't manage stock." +msgstr "" + +#. module: product +#: model:product.uom.categ,name:product.product_uom_categ_kgm +msgid "Weight" +msgstr "" + +#. module: product +#: help:product.uom,category_id:0 +msgid "Quantity conversions may happen automatically between Units of Measure in the same category, according to their respective ratios." msgstr "" #. module: product @@ -1308,18 +863,52 @@ msgid "Here is a list of all your products classified by category. You can click msgstr "" #. module: product +#: selection:product.template,state:0 +msgid "Obsolete" +msgstr "" + +#. module: product +#: model:process.node,name:product.process_node_supplier0 +#: view:product.supplierinfo:0 +msgid "Supplier Information" +msgstr "" + +#. module: product +#: help:product.product,active:0 +msgid "If the active field is set to False, it will allow you to hide the product without removing it." +msgstr "" + +#. module: product +#: model:ir.actions.act_window,name:product.product_ul_form_action +#: model:ir.model,name:product.model_product_packaging +#: model:ir.ui.menu,name:product.menu_product_ul_form_action +#: view:product.packaging:0 #: view:product.product:0 -msgid "Group by..." +#: view:product.ul:0 +msgid "Packaging" msgstr "" #. module: product -#: model:product.template,name:product.product_product_cpu_gen_product_template -msgid "Regular processor config" +#: field:product.price.type,currency_id:0 +#: report:product.pricelist:0 +#: field:product.pricelist,currency_id:0 +msgid "Currency" msgstr "" #. module: product -#: help:product.template,type:0 -msgid "Will change the way procurements are processed. Consumable are product where you don't manage stock." +#: help:product.price.type,currency_id:0 +msgid "The currency the field is expressed in." +msgstr "" + +#. module: product +#: help:product.uom,rounding:0 +msgid "The computed quantity will be a multiple of this value. Use 1.0 for a UoM that cannot be further split, such as a piece." +msgstr "" + +#. module: product +#: view:product.product:0 +#: view:product.template:0 +msgid "Descriptions" msgstr "" #. module: product @@ -1328,13 +917,29 @@ msgid "Start Date" msgstr "" #. module: product -#: help:product.template,produce_delay:0 -msgid "Average delay in days to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders." +#: view:res.partner:0 +msgid "Sales Properties" msgstr "" #. module: product -#: model:product.template,name:product.product_product_pc1_product_template -msgid "Basic PC" +#: field:product.template,loc_row:0 +msgid "Row" +msgstr "" + +#. module: product +#: view:product.product:0 +#: field:product.template,categ_id:0 +msgid "Category" +msgstr "" + +#. module: product +#: help:product.pricelist.item,min_quantity:0 +msgid "The rule only applies if the partner buys/sells more than this quantity." +msgstr "" + +#. module: product +#: selection:product.template,cost_method:0 +msgid "Standard Price" msgstr "" #. module: product @@ -1343,8 +948,15 @@ msgid "If the active field is set to False, it will allow you to hide the pricel msgstr "" #. module: product -#: model:product.uom,name:product.product_uom_cm -msgid "cm" +#: model:ir.actions.act_window,name:product.product_category_action_form +#: model:ir.ui.menu,name:product.menu_product_category_action_form +#: view:product.category:0 +msgid "Product Categories" +msgstr "" + +#. module: product +#: field:product.uom,uom_type:0 +msgid "UoM Type" msgstr "" #. module: product @@ -1353,13 +965,45 @@ msgid "Product Unit of Measure" msgstr "" #. module: product -#: constraint:product.template:0 -msgid "Error: The default UOM and the purchase UOM must be in the same category." +#: help:product.template,uom_po_id:0 +msgid "Default Unit of Measure used for purchase orders. It must be in the same category than the default unit of measure." msgstr "" #. module: product -#: field:product.uom,rounding:0 -msgid "Rounding Precision" +#: help:product.supplierinfo,product_uom:0 +msgid "This comes from the product form." +msgstr "" + +#. module: product +#: model:ir.actions.act_window,help:product.product_normal_action +#: model:ir.actions.act_window,help:product.product_normal_action_sell +msgid "You must define a Product for everything you buy or sell. Products can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on." +msgstr "" + +#. module: product +#: view:product.pricelist.item:0 +msgid "Products Listprices Items" +msgstr "" + +#. module: product +#: help:product.packaging,ul_qty:0 +msgid "The number of packages by layer" +msgstr "" + +#. module: product +#: help:product.uom,factor_inv:0 +msgid "How many times this UoM is bigger than the reference UoM in this category:\n" +"1 * (this unit) = ratio * (reference unit)" +msgstr "" + +#. module: product +#: help:product.packaging,width:0 +msgid "The width of the package" +msgstr "" + +#. module: product +#: field:product.packaging,qty:0 +msgid "Quantity by Package" msgstr "" #. module: product @@ -1368,8 +1012,33 @@ msgid "Unit of Measure Properties" msgstr "" #. module: product -#: model:product.template,name:product.product_product_shelf1_product_template -msgid "Rack 200cm" +#: help:product.template,standard_price:0 +msgid "Product's cost for accounting stock valuation. It is the base price for the supplier price." +msgstr "" + +#. module: product +#: help:product.supplierinfo,qty:0 +msgid "This is a quantity which is converted into Default Uom." +msgstr "" + +#. module: product +#: model:ir.actions.act_window,help:product.product_uom_form_action +msgid "Create and manage the units of measure you want to be used in your system. You can define a conversion rate between several Units of Measure within the same category." +msgstr "" + +#. module: product +#: model:ir.actions.act_window,help:product.product_ul_form_action +msgid "Create and manage your packaging dimensions and types you want to be maintained in your system." +msgstr "" + +#. module: product +#: help:product.template,categ_id:0 +msgid "Select category for the current product" +msgstr "" + +#. module: product +#: field:product.product,outgoing_qty:0 +msgid "Outgoing" msgstr "" #. module: product @@ -1378,8 +1047,48 @@ msgid "Buy" msgstr "" #. module: product -#: view:product.uom.categ:0 -msgid "Units of Measure categories" +#: selection:product.uom,uom_type:0 +msgid "Reference UoM for this category" +msgstr "" + +#. module: product +#: model:ir.model,name:product.model_product_pricelist_version +#: view:product.pricelist:0 +#: view:product.pricelist.version:0 +msgid "Pricelist Version" +msgstr "" + +#. module: product +#: help:product.packaging,sequence:0 +msgid "Gives the sequence order when displaying a list of packaging." +msgstr "" + +#. module: product +#: selection:product.category,type:0 +#: selection:product.template,state:0 +msgid "Normal" +msgstr "" + +#. module: product +#: code:addons/product/pricelist.py:178 +#, python-format +msgid "At least one pricelist has no active version !\n" +"Please create or activate one." +msgstr "" + +#. module: product +#: field:product.template,seller_info_id:0 +msgid "unknown" +msgstr "" + +#. module: product +#: field:product.pricelist.item,price_max_margin:0 +msgid "Max. Price Margin" +msgstr "" + +#. module: product +#: view:res.partner:0 +msgid "Sales & Purchases" msgstr "" #. module: product @@ -1388,8 +1097,29 @@ msgid "The weight of the empty UL" msgstr "" #. module: product -#: model:product.template,name:product.product_product_woodmm10_product_template -msgid "Wood 10mm" +#: help:product.packaging,code:0 +msgid "The code of the transport unit." +msgstr "" + +#. module: product +#: view:product.uom:0 +msgid " e.g: 1 * (reference unit) = ratio * (this unit)" +msgstr "" + +#. module: product +#: code:addons/product/pricelist.py:375 +#, python-format +msgid "Other Pricelist" +msgstr "" + +#. module: product +#: view:product.price.type:0 +msgid "Products Price Type" +msgstr "" + +#. module: product +#: field:product.template,product_manager:0 +msgid "Product Manager" msgstr "" #. module: product @@ -1397,6 +1127,16 @@ msgstr "" msgid "Smaller than the reference UoM" msgstr "" +#. module: product +#: field:product.product,price_extra:0 +msgid "Variant Price Extra" +msgstr "" + +#. module: product +#: model:ir.model,name:product.model_product_supplierinfo +msgid "Information about a product supplier" +msgstr "" + #. module: product #: field:product.price.type,active:0 #: field:product.pricelist,active:0 @@ -1412,18 +1152,82 @@ msgid "Variant Price Margin" msgstr "" #. module: product -#: sql_constraint:product.uom:0 -msgid "The conversion ratio for a unit of measure cannot be 0!" +#: field:product.supplierinfo,product_name:0 +msgid "Supplier Product Name" msgstr "" #. module: product -#: help:product.packaging,ean:0 -msgid "The EAN code of the package unit." +#: model:ir.actions.act_window,help:product.product_normal_action_puchased +msgid "Products can be purchased and/or sold. They can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on." msgstr "" #. module: product -#: help:product.supplierinfo,product_uom:0 -msgid "This comes from the product form." +#: help:product.product,qty_available:0 +msgid "Current quantity of products.\n" +"In a context with a single Stock Location, this includes goods stored at this Location, or any of its children.\n" +"In a context with a single Warehouse, this includes goods stored in the Stock Location of this Warehouse, or any of its children.\n" +"In a context with a single Shop, this includes goods stored in the Stock Location of the Warehouse of this Shop, or any of its children.\n" +"Otherwise, this includes goods stored in any Stock Location typed as 'internal'." +msgstr "" + +#. module: product +#: field:product.template,rental:0 +msgid "Can be Rent" +msgstr "" + +#. module: product +#: model:product.price.type,name:product.standard_price +#: field:product.template,standard_price:0 +msgid "Cost Price" +msgstr "" + +#. module: product +#: view:product.product:0 +#: view:product.template:0 +#: field:product.template,description_purchase:0 +msgid "Purchase Description" +msgstr "" + +#. module: product +#: view:product.pricelist:0 +msgid "Products Price Search" +msgstr "" + +#. module: product +#: view:product.product:0 +#: view:product.template:0 +msgid "Second UoM" +msgstr "" + +#. module: product +#: model:ir.actions.act_window,name:product.product_template_action_tree +msgid "Product Templates" +msgstr "" + +#. module: product +#: view:product.product:0 +#: view:product.template:0 +msgid "Storage Localisation" +msgstr "" + +#. module: product +#: help:product.packaging,length:0 +msgid "The length of the package" +msgstr "" + +#. module: product +#: field:product.pricelist.item,price_min_margin:0 +msgid "Min. Price Margin" +msgstr "" + +#. module: product +#: field:product.pricelist.version,items_id:0 +msgid "Price List Items" +msgstr "" + +#. module: product +#: field:product.template,weight:0 +msgid "Gross weight" msgstr "" #. module: product @@ -1432,19 +1236,9 @@ msgid "Empty Package Weight" msgstr "" #. module: product -#: field:product.price.type,field:0 -msgid "Product Field" -msgstr "" - -#. module: product -#: field:product.template,mes_type:0 -msgid "Measure Type" -msgstr "" - -#. module: product -#: help:product.uom,factor:0 -msgid "How many times this UoM is smaller than the reference UoM in this category:\n" -"1 * (reference unit) = ratio * (this unit)" +#: model:ir.model,name:product.model_product_category +#: field:product.pricelist.item,categ_id:0 +msgid "Product Category" msgstr "" #. module: product @@ -1453,30 +1247,116 @@ msgstr "" msgid "Price Types" msgstr "" +#. module: product +#: constraint:product.pricelist.item:0 +msgid "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!" +msgstr "" + +#. module: product +#: field:product.template,mes_type:0 +msgid "Measure Type" +msgstr "" + +#. module: product +#: model:ir.actions.act_window,help:product.product_pricelist_action +msgid "There can be more than one version of a pricelist. Here you can create and manage new versions of a price list. Some examples of versions: 2010, 2011, Summer Promotion, etc." +msgstr "" + +#. module: product +#: help:product.uom,factor:0 +msgid "How many times this UoM is smaller than the reference UoM in this category:\n" +"1 * (reference unit) = ratio * (this unit)" +msgstr "" + +#. module: product +#: help:product.template,state:0 +msgid "Tells the user if he can use the product or not." +msgstr "" + +#. module: product +#: selection:product.template,type:0 +msgid "Stockable Product" +msgstr "" + +#. module: product +#: field:pricelist.partnerinfo,min_quantity:0 +#: field:product.supplierinfo,qty:0 +msgid "Quantity" +msgstr "" + +#. module: product +#: field:product.packaging,code:0 +msgid "Code" +msgstr "" + +#. module: product +#: model:product.uom,name:product.product_uom_gram +msgid "g" +msgstr "" + +#. module: product +#: view:product.supplierinfo:0 +msgid "Seq" +msgstr "" + +#. module: product +#: view:product.price_list:0 +msgid "Calculate Product Price per unit base on pricelist version." +msgstr "" + +#. module: product +#: selection:product.template,mes_type:0 +msgid "Variable" +msgstr "" + #. module: product #: help:product.template,uom_id:0 msgid "Default Unit of Measure used for all stock operation." msgstr "" #. module: product -#: model:product.category,name:product.product_category_misc0 -msgid "Misc" +#: model:ir.model,name:product.model_product_ul +msgid "Shipping Unit" msgstr "" #. module: product -#: model:product.template,name:product.product_product_pc4_product_template -msgid "Customizable PC" +#: field:product.packaging,height:0 +msgid "Height" msgstr "" #. module: product -#: field:pricelist.partnerinfo,price:0 -msgid "Unit Price" +#: help:product.pricelist.version,date_end:0 +msgid "Ending date for this pricelist version to be valid." msgstr "" #. module: product -#: model:product.category,name:product.product_category_7 -#: model:product.template,name:product.product_product_1_product_template -msgid "Onsite Intervention" +#: field:pricelist.partnerinfo,suppinfo_id:0 +msgid "Partner Information" +msgstr "" + +#. module: product +#: selection:product.category,type:0 +msgid "View" +msgstr "" + +#. module: product +#: model:product.category,name:product.cat0 +msgid "All products" +msgstr "" + +#. module: product +#: view:product.price_list:0 +msgid "Close" +msgstr "" + +#. module: product +#: model:ir.model,name:product.model_product_pricelist_item +msgid "Pricelist item" +msgstr "" + +#. module: product +#: help:product.price.type,name:0 +msgid "Name of this kind of price." msgstr "" #. module: product @@ -1485,13 +1365,66 @@ msgid "Public Pricelist" msgstr "" #. module: product -#: model:product.category,name:product.product_category_marketableproduct0 -msgid "Marketable Products" +#: field:product.product,product_image:0 +msgid "Image" msgstr "" #. module: product -#: field:product.supplierinfo,product_code:0 -msgid "Supplier Product Code" +#: selection:product.ul,type:0 +#: model:product.uom.categ,name:product.product_uom_categ_unit +msgid "Unit" +msgstr "" + +#. module: product +#: help:product.template,produce_delay:0 +msgid "Average delay in days to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders." +msgstr "" + +#. module: product +#: field:product.price_list,qty2:0 +msgid "Quantity-2" +msgstr "" + +#. module: product +#: view:product.product:0 +#: view:product.template:0 +msgid "Information" +msgstr "" + +#. module: product +#: view:product.product:0 +msgid "Codes" +msgstr "" + +#. module: product +#: field:product.price_list,qty4:0 +msgid "Quantity-4" +msgstr "" + +#. module: product +#: field:product.price_list,qty5:0 +msgid "Quantity-5" +msgstr "" + +#. module: product +#: view:product.packaging:0 +msgid "Other Info" +msgstr "" + +#. module: product +#: model:product.uom,name:product.product_uom_meter +msgid "m" +msgstr "" + +#. module: product +#: view:product.product:0 +#: view:product.template:0 +msgid "Delays" +msgstr "" + +#. module: product +#: model:product.uom.categ,name:product.uom_categ_wtime +msgid "Working Time" msgstr "" #. module: product @@ -1499,16 +1432,57 @@ msgstr "" msgid "Default UOM" msgstr "" +#. module: product +#: view:product.product:0 +msgid "Both stockable and consumable products" +msgstr "" + #. module: product #: selection:product.ul,type:0 msgid "Pallet" msgstr "" +#. module: product +#: model:process.node,note:product.process_node_product0 +msgid "Creation of the product" +msgstr "" + +#. module: product +#: model:ir.actions.act_window,help:product.product_uom_categ_form_action +msgid "Create and manage the units of measure categories you want to be used in your system. If several units of measure are in the same category, they can be converted to each other. For example, in the unit of measure category \"Time\", you will have the following UoM: Hours, Days." +msgstr "" + +#. module: product +#: selection:product.uom,uom_type:0 +msgid "Bigger than the reference UoM" +msgstr "" + +#. module: product +#: model:ir.actions.act_window,help:product.product_pricelist_action2 +#: model:ir.actions.act_window,help:product.product_pricelist_action_for_purchase +msgid "A price list contains rules to be evaluated in order to compute the purchase or sales price for all the partners assigned to a price list. Price lists have several versions (2010, 2011, Promotion of February 2010, etc.) and each version has several rules. Example: the customer price of a product category will be based on the supplier price multiplied by 1.80." +msgstr "" + #. module: product #: field:product.packaging,ul_qty:0 msgid "Package by layer" msgstr "" +#. module: product +#: view:product.uom.categ:0 +msgid "Units of Measure categories" +msgstr "" + +#. module: product +#: field:pricelist.partnerinfo,price:0 +msgid "Unit Price" +msgstr "" + +#. module: product +#: field:product.category,parent_right:0 +msgid "Right Parent" +msgstr "" + #. module: product #: field:product.template,warranty:0 msgid "Warranty (months)" @@ -1532,525 +1506,14 @@ msgid "Product" msgstr "" #. module: product -#: selection:product.template,supply_method:0 -msgid "Produce" -msgstr "" - -#. module: product -#: selection:product.template,procure_method:0 -msgid "Make to Order" -msgstr "" - -#. module: product -#: help:product.template,supply_method:0 -msgid "Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested." -msgstr "" - -#. module: product -#: field:product.product,variants:0 -msgid "Variants" -msgstr "" - -#. module: product -#: model:ir.actions.act_window,name:product.product_category_action -#: model:ir.ui.menu,name:product.menu_products_category -msgid "Products by Category" -msgstr "" - -#. module: product -#: field:product.template,uos_coeff:0 -msgid "UOM -> UOS Coeff" -msgstr "" - -#. module: product -#: help:product.supplierinfo,sequence:0 -msgid "Assigns the priority to the list of product supplier." -msgstr "" - -#. module: product -#: field:product.template,uom_id:0 -msgid "Default Unit Of Measure" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_tow1_product_template -msgid "ATX Mid-size Tower" -msgstr "" - -#. module: product -#: view:product.pricelist.item:0 -msgid "Rounding Method" -msgstr "" - -#. module: product -#: model:product.category,name:product.product_category_assembly -msgid "Assembly Service" -msgstr "" - -#. module: product -#: model:ir.actions.report.xml,name:product.report_product_label -msgid "Products Labels" -msgstr "" - -#. module: product -#: model:product.ul,name:product.product_ul_big_box -msgid "Box 30x40x60" -msgstr "" - -#. module: product -#: selection:product.template,type:0 -msgid "Service" -msgstr "" - -#. module: product -#: help:product.packaging,height:0 -msgid "The height of the package" -msgstr "" - -#. module: product -#: view:product.pricelist:0 -msgid "Products Price List" -msgstr "" - -#. module: product -#: field:product.pricelist,company_id:0 -#: field:product.pricelist.item,company_id:0 -#: field:product.pricelist.version,company_id:0 -#: view:product.product:0 -#: field:product.supplierinfo,company_id:0 -#: field:product.template,company_id:0 -msgid "Company" -msgstr "" - -#. module: product -#: help:product.template,list_price:0 -msgid "Base price for computing the customer price. Sometimes called the catalog price." -msgstr "" - -#. module: product -#: code:addons/product/pricelist.py:376 -#, python-format -msgid "Partner section of the product form" -msgstr "" - -#. module: product -#: help:product.price.type,name:0 -msgid "Name of this kind of price." -msgstr "" - -#. module: product -#: field:product.supplierinfo,product_uom:0 -msgid "Supplier UoM" -msgstr "" - -#. module: product -#: help:product.pricelist.version,date_start:0 -msgid "Starting date for this pricelist version to be valid." -msgstr "" - -#. module: product -#: help:product.template,uom_po_id:0 -msgid "Default Unit of Measure used for purchase orders. It must be in the same category than the default unit of measure." -msgstr "" - -#. module: product -#: model:product.template,description:product.product_product_cpu1_product_template -msgid "This product is configured with example of push/pull flows" -msgstr "" - -#. module: product -#: field:product.packaging,length:0 -msgid "Length" -msgstr "" - -#. module: product -#: model:product.uom.categ,name:product.uom_categ_length -msgid "Length / Distance" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_0_product_template -msgid "Onsite Senior Intervention" -msgstr "" - -#. module: product -#: model:ir.model,name:product.model_product_pricelist_type -#: field:product.pricelist,type:0 -msgid "Pricelist Type" -msgstr "" - -#. module: product -#: model:product.category,name:product.product_category_otherproducts0 -msgid "Other Products" -msgstr "" - -#. module: product -#: field:product.product,color:0 -msgid "Color Index" -msgstr "" - -#. module: product -#: view:product.product:0 -msgid "Characteristics" -msgstr "" - -#. module: product -#: field:product.template,sale_ok:0 -msgid "Can be Sold" -msgstr "" - -#. module: product -#: field:product.template,produce_delay:0 -msgid "Manufacturing Lead Time" -msgstr "" - -#. module: product -#: field:product.supplierinfo,pricelist_ids:0 -msgid "Supplier Pricelist" +#: help:product.template,sale_delay:0 +msgid "This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers." msgstr "" #. module: product #: code:addons/product/product.py:175 #, python-format -msgid "Warning" -msgstr "" - -#. module: product -#: field:product.pricelist.item,base:0 -msgid "Based on" -msgstr "" - -#. module: product -#: model:product.uom,name:product.product_uom_ton -msgid "t" -msgstr "" - -#. module: product -#: model:product.category,name:product.product_category_rawmaterial0 -msgid "Raw Materials" -msgstr "" - -#. module: product -#: help:product.template,product_manager:0 -msgid "This is use as task responsible" -msgstr "" - -#. module: product -#: field:product.pricelist,name:0 -msgid "Pricelist Name" -msgstr "" - -#. module: product -#: model:ir.model,name:product.model_product_pricelist_version -#: view:product.pricelist:0 -#: view:product.pricelist.version:0 -msgid "Pricelist Version" -msgstr "" - -#. module: product -#: view:product.pricelist.item:0 -msgid "* ( 1 + " -msgstr "" - -#. module: product -#: help:product.packaging,weight:0 -msgid "The weight of a full package, pallet or box." -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_hdd2_product_template -msgid "HDD Seagate 7200.8 120GB" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_employee0_product_template -msgid "Employee" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_shelfofcm0_product_template -msgid "Shelf of 100cm" -msgstr "" - -#. module: product -#: model:ir.model,name:product.model_product_category -#: field:product.pricelist.item,categ_id:0 -msgid "Product Category" -msgstr "" - -#. module: product -#: report:product.pricelist:0 -msgid "Price List Name" -msgstr "" - -#. module: product -#: field:product.supplierinfo,delay:0 -msgid "Delivery Lead Time" -msgstr "" - -#. module: product -#: help:product.uom,active:0 -msgid "By unchecking the active field you can disable a unit of measure without deleting it." -msgstr "" - -#. module: product -#: model:ir.actions.act_window,name:product.product_uom_categ_form_action -#: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action -msgid "UoM Categories" -msgstr "" - -#. module: product -#: field:product.template,seller_delay:0 -msgid "Supplier Lead Time" -msgstr "" - -#. module: product -#: selection:product.ul,type:0 -msgid "Box" -msgstr "" - -#. module: product -#: model:ir.actions.act_window,help:product.product_ul_form_action -msgid "Create and manage your packaging dimensions and types you want to be maintained in your system." -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_rearpanelarm1_product_template -msgid "Rear Panel SHE200" -msgstr "" - -#. module: product -#: help:product.pricelist.type,key:0 -msgid "Used in the code to select specific prices based on the context. Keep unchanged." -msgstr "" - -#. module: product -#: view:product.product:0 -msgid "Context..." -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_hdd1_product_template -msgid "HDD Seagate 7200.8 80GB" -msgstr "" - -#. module: product -#: help:product.supplierinfo,qty:0 -msgid "This is a quantity which is converted into Default Uom." -msgstr "" - -#. module: product -#: field:product.packaging,ul:0 -msgid "Type of Package" -msgstr "" - -#. module: product -#: selection:product.ul,type:0 -msgid "Pack" -msgstr "" - -#. module: product -#: model:product.category,name:product.product_category_4 -msgid "Dello Computer" -msgstr "" - -#. module: product -#: model:product.uom.categ,name:product.product_uom_categ_kgm -msgid "Weight" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_22_product_template -msgid "Processor on demand" -msgstr "" - -#. module: product -#: model:process.transition,name:product.process_transition_supplierofproduct0 -msgid "Supplier of the product" -msgstr "" - -#. module: product -#: field:product.product,product_image:0 -msgid "Image" -msgstr "" - -#. module: product -#: field:product.uom,uom_type:0 -msgid "UoM Type" -msgstr "" - -#. module: product -#: help:product.product,active:0 -msgid "If the active field is set to False, it will allow you to hide the product without removing it." -msgstr "" - -#. module: product -#: help:product.uom,rounding:0 -msgid "The computed quantity will be a multiple of this value. Use 1.0 for a UoM that cannot be further split, such as a piece." -msgstr "" - -#. module: product -#: view:product.product:0 -#: view:product.template:0 -msgid "Descriptions" -msgstr "" - -#. module: product -#: field:product.template,loc_row:0 -msgid "Row" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_rearpanelarm0_product_template -msgid "Rear Panel SHE100" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_23_product_template -msgid "Complete PC With Peripherals" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_hotelexpenses0_product_template -msgid "Hotel Expenses" -msgstr "" - -#. module: product -#: help:product.uom,factor_inv:0 -msgid "How many times this UoM is bigger than the reference UoM in this category:\n" -"1 * (this unit) = ratio * (reference unit)" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_shelf0_product_template -msgid "Rack 100cm" -msgstr "" - -#. module: product -#: help:product.packaging,sequence:0 -msgid "Gives the sequence order when displaying a list of packaging." -msgstr "" - -#. module: product -#: field:product.pricelist.item,price_round:0 -msgid "Price Rounding" -msgstr "" - -#. module: product -#: code:addons/product/pricelist.py:178 -#, python-format -msgid "At least one pricelist has no active version !\n" -"Please create or activate one." -msgstr "" - -#. module: product -#: field:product.pricelist.item,price_max_margin:0 -msgid "Max. Price Margin" -msgstr "" - -#. module: product -#: help:product.supplierinfo,product_name:0 -msgid "This supplier's product name will be used when printing a request for quotation. Keep empty to use the internal one." -msgstr "" - -#. module: product -#: selection:product.template,mes_type:0 -msgid "Variable" -msgstr "" - -#. module: product -#: field:product.template,rental:0 -msgid "Can be Rent" -msgstr "" - -#. module: product -#: model:product.price.type,name:product.standard_price -#: field:product.template,standard_price:0 -msgid "Cost Price" -msgstr "" - -#. module: product -#: field:product.pricelist.item,price_min_margin:0 -msgid "Min. Price Margin" -msgstr "" - -#. module: product -#: field:product.template,weight:0 -msgid "Gross weight" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_assemblysection0_product_template -msgid "Assembly Section" -msgstr "" - -#. module: product -#: model:product.category,name:product.product_category_3 -msgid "Computer Stuff" -msgstr "" - -#. module: product -#: model:product.category,name:product.product_category_8 -msgid "Phone Help" -msgstr "" - -#. module: product -#: field:product.category,sequence:0 -#: field:product.packaging,sequence:0 -#: field:product.pricelist.item,sequence:0 -#: field:product.supplierinfo,sequence:0 -msgid "Sequence" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_assembly_product_template -msgid "Assembly Service Cost" -msgstr "" - -#. module: product -#: view:product.price_list:0 -msgid "Close" -msgstr "" - -#. module: product -#: model:ir.model,name:product.model_product_pricelist_item -msgid "Pricelist item" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_product_21_product_template -msgid "RAM on demand" -msgstr "" - -#. module: product -#: view:res.partner:0 -msgid "Sales Properties" -msgstr "" - -#. module: product -#: view:product.product:0 -#: view:product.template:0 -msgid "Delays" -msgstr "" - -#. module: product -#: view:product.product:0 -msgid "Both stockable and consumable products" -msgstr "" - -#. module: product -#: model:process.node,note:product.process_node_product0 -msgid "Creation of the product" -msgstr "" - -#. module: product -#: field:pricelist.partnerinfo,name:0 -#: field:product.packaging,name:0 -#: report:product.pricelist:0 -#: view:product.product:0 -#: view:product.template:0 -#: field:product.template,description:0 -msgid "Description" +msgid "Cannot change the category of existing UoM '%s'." msgstr "" #. module: product @@ -2064,13 +1527,87 @@ msgid "Product Description" msgstr "" #. module: product -#: view:product.pricelist.item:0 -msgid " ) + " +#: help:product.packaging,qty:0 +msgid "The total number of products you can put by pallet or box." msgstr "" #. module: product -#: field:product.template,volume:0 -msgid "Volume" +#: help:product.product,ean13:0 +msgid "Barcode" +msgstr "" + +#. module: product +#: model:ir.model,name:product.model_product_uom_categ +msgid "Product uom categ" +msgstr "" + +#. module: product +#: field:product.price_list,qty3:0 +msgid "Quantity-3" +msgstr "" + +#. module: product +#: help:product.product,outgoing_qty:0 +msgid "Quantity of products that are planned to leave.\n" +"In a context with a single Stock Location, this includes goods leaving from this Location, or any of its children.\n" +"In a context with a single Warehouse, this includes goods leaving from the Stock Location of this Warehouse, or any of its children.\n" +"In a context with a single Shop, this includes goods leaving from the Stock Location of the Warehouse of this Shop, or any of its children.\n" +"Otherwise, this includes goods leaving from any Stock Location typed as 'internal'." +msgstr "" + +#. module: product +#: selection:product.template,supply_method:0 +msgid "Produce" +msgstr "" + +#. module: product +#: selection:product.template,procure_method:0 +msgid "Make to Order" +msgstr "" + +#. module: product +#: view:product.template:0 +msgid "UOM" +msgstr "" + +#. module: product +#: field:product.pricelist.item,price_surcharge:0 +msgid "Price Surcharge" +msgstr "" + +#. module: product +#: constraint:product.pricelist.version:0 +msgid "You cannot have 2 pricelist versions that overlap!" +msgstr "" + +#. module: product +#: code:addons/product/report/product_pricelist.py:49 +#, python-format +msgid "units" +msgstr "" + +#. module: product +#: model:ir.actions.act_window,name:product.action_product_price_list +#: model:ir.model,name:product.model_product_price_list +#: view:product.price_list:0 +#: report:product.pricelist:0 +#: field:product.pricelist.version,pricelist_id:0 +msgid "Price List" +msgstr "" + +#. module: product +#: field:product.product,variants:0 +msgid "Variants" +msgstr "" + +#. module: product +#: view:product.pricelist.item:0 +msgid "Price Computation" +msgstr "" + +#. module: product +#: model:res.groups,name:product.group_uos +msgid "Product UoS View" msgstr "" #. module: product @@ -2079,20 +1616,47 @@ msgid "Case" msgstr "" #. module: product +#: field:product.pricelist.version,date_end:0 +msgid "End Date" +msgstr "" + +#. module: product +#: field:product.product,packaging:0 +msgid "Logistical Units" +msgstr "" + +#. module: product +#: field:product.category,complete_name:0 +#: field:product.category,name:0 +#: field:product.pricelist.type,name:0 +#: field:product.pricelist.version,name:0 #: view:product.product:0 -#: model:res.groups,name:product.group_product_variant -msgid "Product Variant" +#: field:product.product,name_template:0 +#: field:product.template,name:0 +#: field:product.ul,name:0 +#: field:product.uom,name:0 +#: field:product.uom.categ,name:0 +msgid "Name" msgstr "" #. module: product -#: model:product.category,name:product.product_category_shelves0 -msgid "Shelves" +#: field:product.template,purchase_ok:0 +msgid "Can be Purchased" msgstr "" #. module: product -#: code:addons/product/pricelist.py:375 -#, python-format -msgid "Other Pricelist" +#: field:product.template,uos_coeff:0 +msgid "UOM -> UOS Coeff" +msgstr "" + +#. module: product +#: help:res.partner,property_product_pricelist:0 +msgid "This pricelist will be used, instead of the default one, for sales to the current partner" +msgstr "" + +#. module: product +#: model:process.transition,note:product.process_transition_supplierofproduct0 +msgid "1 or several supplier(s) can be linked to a product. All information stands in the product form." msgstr "" #. module: product @@ -2115,8 +1679,34 @@ msgid "Palletization" msgstr "" #. module: product -#: help:product.template,volume:0 -msgid "The volume in m3." +#: field:product.packaging,length:0 +msgid "Length" +msgstr "" + +#. module: product +#: code:addons/product/product.py:363 +#, python-format +msgid "UoM categories Mismatch!" +msgstr "" + +#. module: product +#: field:product.template,volume:0 +msgid "Volume" +msgstr "" + +#. module: product +#: help:product.supplierinfo,sequence:0 +msgid "Assigns the priority to the list of product supplier." +msgstr "" + +#. module: product +#: field:product.template,uom_id:0 +msgid "Default Unit Of Measure" +msgstr "" + +#. module: product +#: help:product.packaging,ean:0 +msgid "The EAN code of the package unit." msgstr "" #. module: product @@ -2124,11 +1714,31 @@ msgstr "" msgid "End of Lifecycle" msgstr "" +#. module: product +#: field:pricelist.partnerinfo,name:0 +#: field:product.packaging,name:0 +#: report:product.pricelist:0 +#: view:product.product:0 +#: view:product.template:0 +#: field:product.template,description:0 +msgid "Description" +msgstr "" + #. module: product #: help:product.product,packaging:0 msgid "Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module." msgstr "" +#. module: product +#: help:product.supplierinfo,delay:0 +msgid "Lead time in days between the confirmation of the purchase order and the reception of the products in your warehouse. Used by the scheduler for automatic computation of the purchase order planning." +msgstr "" + +#. module: product +#: field:product.category,parent_left:0 +msgid "Left Parent" +msgstr "" + #. module: product #: model:ir.actions.act_window,name:product.product_pricelist_action #: model:ir.ui.menu,name:product.menu_product_pricelist_action @@ -2137,15 +1747,16 @@ msgid "Pricelist Versions" msgstr "" #. module: product -#: model:product.template,name:product.product_product_span100_product_template -msgid "Shelf Panel" +#: constraint:res.partner:0 +msgid "Error ! You cannot create recursive associated members." msgstr "" #. module: product -#: help:product.pricelist.item,price_round:0 -msgid "Sets the price so that it is a multiple of this value.\n" -"Rounding is applied after the discount and before the surcharge.\n" -"To have prices that end in 9.99, set rounding 10, surcharge -0.01" +#: field:product.category,sequence:0 +#: field:product.packaging,sequence:0 +#: field:product.pricelist.item,sequence:0 +#: field:product.supplierinfo,sequence:0 +msgid "Sequence" msgstr "" #. module: product @@ -2153,6 +1764,12 @@ msgstr "" msgid "Sale Price" msgstr "" +#. module: product +#: view:product.product:0 +#: view:product.template:0 +msgid "Procurement & Locations" +msgstr "" + #. module: product #: constraint:product.category:0 msgid "Error ! You cannot create recursive categories." @@ -2164,8 +1781,18 @@ msgid "Category Type" msgstr "" #. module: product -#: model:product.category,name:product.cat2 -msgid "Private" +#: model:product.uom,name:product.product_uom_km +msgid "km" +msgstr "" + +#. module: product +#: help:product.template,uos_id:0 +msgid "Used by companies that manage two units of measure: invoicing and inventory management. For example, in food industries, you will manage a stock of ham but invoice in Kg. Keep empty to use the default UOM." +msgstr "" + +#. module: product +#: field:product.price_list,qty1:0 +msgid "Quantity-1" msgstr "" #. module: product @@ -2175,8 +1802,34 @@ msgid "Coefficient to convert UOM to UOS\n" msgstr "" #. module: product -#: constraint:res.partner:0 -msgid "Error ! You cannot create recursive associated members." +#: constraint:product.packaging:0 +#: constraint:product.product:0 +msgid "Error: Invalid ean code" +msgstr "" + +#. module: product +#: field:product.pricelist.item,min_quantity:0 +msgid "Min. Quantity" +msgstr "" + +#. module: product +#: model:ir.actions.report.xml,name:product.report_product_label +msgid "Products Labels" +msgstr "" + +#. module: product +#: help:product.template,volume:0 +msgid "The volume in m3." +msgstr "" + +#. module: product +#: model:ir.model,name:product.model_product_price_type +msgid "Price Type" +msgstr "" + +#. module: product +#: view:product.product:0 +msgid "To Sell" msgstr "" #. module: product @@ -2184,3 +1837,8 @@ msgstr "" msgid "Price Discount" msgstr "" +#. module: product +#: help:product.category,sequence:0 +msgid "Gives the sequence order when displaying a list of product categories." +msgstr "" + From 90b189fa228d0b8f97fba4ffe676faa55e10a663 Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Mon, 24 Sep 2012 15:32:30 +0200 Subject: [PATCH 12/18] [FIX] new pot file bzr revid: cbi@openerp.com-20120924133230-68dbpph71i9d4hp5 --- addons/stock/i18n/stock.pot | 1321 ++++++++++++++++------------------- 1 file changed, 603 insertions(+), 718 deletions(-) diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot index a198722cf16..6d37505a478 100644 --- a/addons/stock/i18n/stock.pot +++ b/addons/stock/i18n/stock.pot @@ -1,39 +1,19 @@ -# #-#-#-#-# stock.pot (OpenERP Server 6.1rc1) #-#-#-#-# # Translation of OpenERP Server. # This file contains the translation of the following modules: -# * stock +# * stock # -# #-#-#-#-# stock.pot.web (PROJECT VERSION) #-#-#-#-# -# Translations template for PROJECT. -# Copyright (C) 2012 ORGANIZATION -# This file is distributed under the same license as the PROJECT project. -# FIRST AUTHOR , 2012. -# -#, fuzzy msgid "" msgstr "" -"#-#-#-#-# stock.pot (OpenERP Server 6.1rc1) #-#-#-#-#\n" -"Project-Id-Version: OpenERP Server 6.1rc1\n" +"Project-Id-Version: OpenERP Server 6.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-02-08 00:35+0000\n" +"POT-Creation-Date: 2012-09-24 13:20+0000\n" +"PO-Revision-Date: 2012-09-24 13:20+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" -"#-#-#-#-# stock.pot.web (PROJECT VERSION) #-#-#-#-#\n" -"Project-Id-Version: PROJECT VERSION\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-02-08 01:37+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" #. module: stock #: field:product.product,track_outgoing:0 @@ -47,12 +27,7 @@ msgstr "" #. module: stock #: help:product.category,property_stock_account_input_categ:0 -msgid "" -"When doing real-time inventory valuation, counterpart journal items for all " -"incoming stock moves will be posted in this account, unless there is a " -"specific valuation account set on the source location. This is the default " -"value for all products in this category. It can also directly be set on each " -"product" +msgid "When doing real-time inventory valuation, counterpart journal items for all incoming stock moves will be posted in this account, unless there is a specific valuation account set on the source location. This is the default value for all products in this category. It can also directly be set on each product" msgstr "" #. module: stock @@ -61,7 +36,9 @@ msgid "Chained Location If Fixed" msgstr "" #. module: stock -#: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0 +#: view:stock.inventory:0 +#: view:stock.move:0 +#: view:stock.picking:0 msgid "Put in a new pack" msgstr "" @@ -99,8 +76,10 @@ msgid "Orders processed Today or planned for Today" msgstr "" #. module: stock -#: view:stock.partial.move.line:0 view:stock.partial.picking:0 -#: field:stock.partial.picking,move_ids:0 view:stock.partial.picking.line:0 +#: view:stock.partial.move.line:0 +#: view:stock.partial.picking:0 +#: field:stock.partial.picking,move_ids:0 +#: view:stock.partial.picking.line:0 #: view:stock.return.picking.memory:0 msgid "Product Moves" msgstr "" @@ -119,9 +98,7 @@ msgstr "" #. module: stock #: help:stock.production.lot,ref:0 -msgid "" -"Internal reference number in case it differs from the manufacturer's serial " -"number" +msgid "Internal reference number in case it differs from the manufacturer's serial number" msgstr "" #. module: stock @@ -132,10 +109,7 @@ msgstr "" #. module: stock #: model:ir.actions.act_window,help:stock.action_inventory_form -msgid "" -"Periodical Inventories are used to count the number of products available " -"per location. You can use it once a year when you do the general inventory " -"or whenever you need it, to correct the current stock level of a product." +msgid "Periodical Inventories are used to count the number of products available per location. You can use it once a year when you do the general inventory or whenever you need it, to correct the current stock level of a product." msgstr "" #. module: stock @@ -150,19 +124,25 @@ msgid "Picking list" msgstr "" #. module: stock -#: report:lot.stock.overview:0 report:lot.stock.overview_all:0 +#: report:lot.stock.overview:0 +#: report:lot.stock.overview_all:0 #: field:report.stock.inventory,product_qty:0 #: field:report.stock.move,product_qty:0 #: field:stock.change.product.qty,new_quantity:0 #: field:stock.inventory.line,product_qty:0 #: field:stock.inventory.line.split,qty:0 #: field:stock.inventory.line.split.lines,quantity:0 -#: report:stock.inventory.move:0 field:stock.move,product_qty:0 -#: field:stock.move.consume,product_qty:0 field:stock.move.scrap,product_qty:0 -#: field:stock.move.split,qty:0 field:stock.move.split.lines,quantity:0 +#: report:stock.inventory.move:0 +#: field:stock.move,product_qty:0 +#: field:stock.move.consume,product_qty:0 +#: field:stock.move.scrap,product_qty:0 +#: field:stock.move.split,qty:0 +#: field:stock.move.split.lines,quantity:0 #: field:stock.partial.move.line,quantity:0 -#: field:stock.partial.picking.line,quantity:0 report:stock.picking.list:0 -#: field:stock.report.prodlots,qty:0 field:stock.report.tracklots,name:0 +#: field:stock.partial.picking.line,quantity:0 +#: report:stock.picking.list:0 +#: field:stock.report.prodlots,qty:0 +#: field:stock.report.tracklots,name:0 #: field:stock.return.picking.memory,quantity:0 #: field:stock.split.into,quantity:0 msgid "Quantity" @@ -170,19 +150,21 @@ msgstr "" #. module: stock #: model:ir.actions.act_window,help:stock.action_picking_tree -msgid "" -"This is the list of all delivery orders that have to be prepared, according " -"to your different sales orders and your logistics rules." +msgid "This is the list of all delivery orders that have to be prepared, according to your different sales orders and your logistics rules." msgstr "" #. module: stock -#: view:report.stock.move:0 field:report.stock.move,day:0 +#: view:report.stock.move:0 +#: field:report.stock.move,day:0 msgid "Day" msgstr "" #. module: stock -#: view:stock.inventory:0 field:stock.inventory.line.split,product_uom:0 -#: view:stock.move:0 field:stock.move.split,product_uom:0 view:stock.picking:0 +#: view:stock.inventory:0 +#: field:stock.inventory.line.split,product_uom:0 +#: view:stock.move:0 +#: field:stock.move.split,product_uom:0 +#: view:stock.picking:0 #: view:stock.production.lot:0 msgid "UoM" msgstr "" @@ -194,13 +176,15 @@ msgid "Physical Inventories" msgstr "" #. module: stock -#: field:product.category,property_stock_journal:0 view:report.stock.move:0 +#: field:product.category,property_stock_journal:0 +#: view:report.stock.move:0 #: field:stock.change.standard.price,stock_journal:0 msgid "Stock journal" msgstr "" #. module: stock -#: view:report.stock.inventory:0 view:report.stock.move:0 +#: view:report.stock.inventory:0 +#: view:report.stock.move:0 msgid "Current month" msgstr "" @@ -211,7 +195,7 @@ msgid "Unable to assign all lots to this move!" msgstr "" #. module: stock -#: code:addons/stock/stock.py:2516 +#: code:addons/stock/stock.py:2522 #, python-format msgid "Missing partial picking data for move #%s" msgstr "" @@ -247,10 +231,7 @@ msgstr "" #. module: stock #: code:addons/stock/wizard/stock_splitinto.py:49 #, python-format -msgid "" -"The current move line is already assigned to a pack, please remove it first " -"if you really want to change it ' # 'for " -"this product: \"%s\" (id: %d)" +msgid "The current move line is already assigned to a pack, please remove it first if you really want to change it ' # 'for this product: \"%s\" (id: %d)" msgstr "" #. module: stock @@ -264,7 +245,9 @@ msgid "Other reference or serial number" msgstr "" #. module: stock -#: field:stock.move,origin:0 view:stock.picking:0 field:stock.picking,origin:0 +#: field:stock.move,origin:0 +#: view:stock.picking:0 +#: field:stock.picking,origin:0 msgid "Origin" msgstr "" @@ -280,48 +263,49 @@ msgid "Non Inv" msgstr "" #. module: stock -#: code:addons/stock/wizard/stock_traceability.py:54 -#: view:stock.production.lot:0 -#, python-format -msgid "Downstream Traceability" +#: view:stock.tracking:0 +msgid "Pack Identification" msgstr "" #. module: stock -#: view:stock.move:0 field:stock.move,picking_id:0 field:stock.picking,name:0 +#: view:stock.move:0 +#: field:stock.move,picking_id:0 +#: field:stock.picking,name:0 #: view:stock.production.lot:0 msgid "Reference" msgstr "" #. module: stock -#: code:addons/stock/stock.py:670 code:addons/stock/stock.py:1516 +#: code:addons/stock/stock.py:676 +#: code:addons/stock/stock.py:1525 #, python-format msgid "Products to Process" msgstr "" #. module: stock #: help:stock.fill.inventory,set_stock_zero:0 -msgid "" -"If checked, all product quantities will be set to zero to help ensure a real " -"physical inventory is done" +msgid "If checked, all product quantities will be set to zero to help ensure a real physical inventory is done" msgstr "" #. module: stock -#: view:stock.partial.move:0 view:stock.partial.picking:0 +#: view:stock.partial.move:0 +#: view:stock.partial.picking:0 msgid "_Validate" msgstr "" #. module: stock -#: code:addons/stock/stock.py:1149 +#: code:addons/stock/stock.py:1158 #, python-format msgid "You cannot cancel picking because stock move is in done state !" msgstr "" #. module: stock -#: code:addons/stock/stock.py:2337 code:addons/stock/stock.py:2379 -#: code:addons/stock/stock.py:2440 +#: code:addons/stock/stock.py:2346 +#: code:addons/stock/stock.py:2388 +#: code:addons/stock/stock.py:2449 #: code:addons/stock/wizard/stock_change_product_qty.py:87 #: code:addons/stock/wizard/stock_fill_inventory.py:53 -#: code:addons/stock/wizard/stock_partial_picking.py:141 +#: code:addons/stock/wizard/stock_partial_picking.py:142 #, python-format msgid "Warning!" msgstr "" @@ -332,20 +316,22 @@ msgid "Group by partner" msgstr "" #. module: stock -#: model:ir.model,name:stock.model_res_partner view:report.stock.inventory:0 -#: field:report.stock.inventory,partner_id:0 view:report.stock.move:0 -#: field:report.stock.move,partner_id:0 view:stock.move:0 -#: field:stock.move,partner_id:0 view:stock.picking:0 +#: model:ir.model,name:stock.model_res_partner +#: view:report.stock.inventory:0 +#: field:report.stock.inventory,partner_id:0 +#: view:report.stock.move:0 +#: field:report.stock.move,partner_id:0 +#: view:stock.move:0 +#: field:stock.move,partner_id:0 +#: view:stock.picking:0 #: field:stock.picking,partner_id:0 msgid "Partner" msgstr "" #. module: stock -#: code:addons/stock/stock.py:2119 +#: code:addons/stock/stock.py:2128 #, python-format -msgid "" -"Can not create Journal Entry, Input Account defined on this product and " -"Valuation account on category of this product are same." +msgid "Can not create Journal Entry, Input Account defined on this product and Valuation account on category of this product are same." msgstr "" #. module: stock @@ -388,18 +374,21 @@ msgstr "" #. module: stock #: view:stock.location.product:0 -msgid "" -"(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to " -"filter all resources of the day for the 'From' date and 23:59:59 for the " -"'To' date)" +msgid "(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to filter all resources of the day for the 'From' date and 23:59:59 for the 'To' date)" msgstr "" #. module: stock -#: view:report.stock.inventory:0 field:report.stock.inventory,state:0 -#: view:report.stock.move:0 field:report.stock.move,state:0 -#: view:stock.inventory:0 field:stock.inventory,state:0 -#: field:stock.inventory.line,state:0 view:stock.move:0 -#: field:stock.move,state:0 view:stock.picking:0 field:stock.picking,state:0 +#: view:report.stock.inventory:0 +#: field:report.stock.inventory,state:0 +#: view:report.stock.move:0 +#: field:report.stock.move,state:0 +#: view:stock.inventory:0 +#: field:stock.inventory,state:0 +#: field:stock.inventory.line,state:0 +#: view:stock.move:0 +#: field:stock.move,state:0 +#: view:stock.picking:0 +#: field:stock.picking,state:0 #: report:stock.picking.list:0 msgid "State" msgstr "" @@ -431,14 +420,19 @@ msgstr "" #. module: stock #: selection:report.stock.inventory,state:0 -#: selection:report.stock.move,state:0 view:stock.move:0 -#: selection:stock.move,state:0 view:stock.picking:0 -#: view:stock.production.lot:0 field:stock.production.lot,stock_available:0 +#: selection:report.stock.move,state:0 +#: view:stock.move:0 +#: selection:stock.move,state:0 +#: view:stock.picking:0 +#: report:stock.picking.list:0 +#: view:stock.production.lot:0 +#: field:stock.production.lot,stock_available:0 msgid "Available" msgstr "" #. module: stock -#: view:stock.picking:0 field:stock.picking,min_date:0 +#: view:stock.picking:0 +#: field:stock.picking,min_date:0 msgid "Expected Date" msgstr "" @@ -481,18 +475,18 @@ msgstr "" #. module: stock #: help:product.category,property_stock_valuation_account_id:0 -msgid "" -"When real-time inventory valuation is enabled on a product, this account " -"will hold the current value of the products." +msgid "When real-time inventory valuation is enabled on a product, this account will hold the current value of the products." msgstr "" #. module: stock -#: field:report.stock.inventory,location_type:0 field:stock.location,usage:0 +#: field:report.stock.inventory,location_type:0 +#: field:stock.location,usage:0 msgid "Location Type" msgstr "" #. module: stock -#: help:report.stock.move,type:0 help:stock.picking,type:0 +#: help:report.stock.move,type:0 +#: help:stock.picking,type:0 msgid "Shipping type specify, goods coming in or going out." msgstr "" @@ -512,16 +506,16 @@ msgid "Product Lots Filter" msgstr "" #. module: stock -#: report:lot.stock.overview:0 report:lot.stock.overview_all:0 -#: report:stock.inventory.move:0 report:stock.picking.list:0 +#: report:lot.stock.overview:0 +#: report:lot.stock.overview_all:0 +#: report:stock.inventory.move:0 +#: report:stock.picking.list:0 msgid "[" msgstr "" #. module: stock #: help:stock.production.lot,stock_available:0 -msgid "" -"Current quantity of products with this Production Lot Number available in " -"company warehouses" +msgid "Current quantity of products with this Production Lot Number available in company warehouses" msgstr "" #. module: stock @@ -530,11 +524,9 @@ msgid "Move History (child moves)" msgstr "" #. module: stock -#: code:addons/stock/stock.py:2125 +#: code:addons/stock/stock.py:2134 #, python-format -msgid "" -"There is no stock output account defined for this product or its category: " -"\"%s\" (id: %d)" +msgid "There is no stock output account defined for this product or its category: \"%s\" (id: %d)" msgstr "" #. module: stock @@ -555,7 +547,7 @@ msgid "stock.partial.move.line" msgstr "" #. module: stock -#: code:addons/stock/stock.py:760 +#: code:addons/stock/stock.py:766 #, python-format msgid "You can not process picking without stock moves" msgstr "" @@ -572,17 +564,14 @@ msgid "Order(Origin)" msgstr "" #. module: stock -#: report:lot.stock.overview:0 report:lot.stock.overview_all:0 +#: report:lot.stock.overview:0 +#: report:lot.stock.overview_all:0 msgid "Grand Total:" msgstr "" #. module: stock #: model:ir.actions.act_window,help:stock.action_out_picking_move -msgid "" -"You will find in this list all products you have to deliver to your " -"customers. You can process the deliveries directly from this list using the " -"buttons on the right of each line. You can filter the products to deliver by " -"customer, products or sale order (using the Origin field)." +msgid "You will find in this list all products you have to deliver to your customers. You can process the deliveries directly from this list using the buttons on the right of each line. You can filter the products to deliver by customer, products or sale order (using the Origin field)." msgstr "" #. module: stock @@ -591,12 +580,14 @@ msgid "Inventory Control" msgstr "" #. module: stock -#: view:stock.location:0 field:stock.location,comment:0 +#: view:stock.location:0 +#: field:stock.location,comment:0 msgid "Additional Information" msgstr "" #. module: stock -#: report:lot.stock.overview:0 report:lot.stock.overview_all:0 +#: report:lot.stock.overview:0 +#: report:lot.stock.overview_all:0 msgid "Location / Product" msgstr "" @@ -606,7 +597,7 @@ msgid "Destination Address " msgstr "" #. module: stock -#: code:addons/stock/stock.py:1333 +#: code:addons/stock/stock.py:1342 #, python-format msgid "Reception" msgstr "" @@ -623,30 +614,15 @@ msgstr "" #. module: stock #: model:ir.actions.act_window,help:stock.action_stock_journal_form -msgid "" -"The stock journal system allows you to assign each stock operation to a " -"specific journal according to the type of operation to perform or the worker/" -"team that should perform the operation. Examples of stock journals may be: " -"quality control, pick lists, packing, etc." +msgid "The stock journal system allows you to assign each stock operation to a specific journal according to the type of operation to perform or the worker/team that should perform the operation. Examples of stock journals may be: quality control, pick lists, packing, etc." msgstr "" #. module: stock -#: field:stock.location,complete_name:0 field:stock.location,name:0 +#: field:stock.location,complete_name:0 +#: field:stock.location,name:0 msgid "Location Name" msgstr "" -#. module: stock -#: model:res.company,overdue_msg:stock.res_company_shop0 -#: model:res.company,overdue_msg:stock.res_company_tinyshop0 -msgid "" -"Our records indicate that the following payments are still due. If the " -"amount\n" -"has already been paid, please disregard this notice. However, if you have " -"any\n" -"queries regarding your account, please contact us.\n" -"Thank you in advance.\n" -msgstr "" - #. module: stock #: view:stock.inventory:0 msgid "Posted Inventory" @@ -654,11 +630,7 @@ msgstr "" #. module: stock #: model:ir.actions.act_window,help:stock.action_picking_tree4 -msgid "" -"The Incoming Shipments is the list of all orders you will receive from your " -"suppliers. An incoming shipment contains a list of products to be received " -"according to the original purchase order. You can validate the shipment " -"totally or partially." +msgid "The Incoming Shipments is the list of all orders you will receive from your suppliers. An incoming shipment contains a list of products to be received according to the original purchase order. You can validate the shipment totally or partially." msgstr "" #. module: stock @@ -667,16 +639,15 @@ msgid "Parent Wizard (for existing lines)" msgstr "" #. module: stock -#: view:stock.move:0 view:stock.picking:0 +#: view:stock.move:0 +#: view:stock.picking:0 msgid "Move Information" msgstr "" #. module: stock -#: code:addons/stock/stock.py:2131 +#: code:addons/stock/stock.py:2140 #, python-format -msgid "" -"There is no inventory Valuation account defined on the product category: \"%s" -"\" (id: %d)" +msgid "There is no inventory Valuation account defined on the product category: \"%s\" (id: %d)" msgstr "" #. module: stock @@ -693,7 +664,8 @@ msgstr "" #. module: stock #: model:ir.actions.act_window,name:stock.action_tracking_form #: model:ir.model,name:stock.model_stock_tracking -#: model:ir.ui.menu,name:stock.menu_action_tracking_form view:stock.tracking:0 +#: model:ir.ui.menu,name:stock.menu_action_tracking_form +#: view:stock.tracking:0 msgid "Packs" msgstr "" @@ -723,7 +695,8 @@ msgstr "" #: model:ir.ui.menu,name:stock.menu_action_production_lot_form #: field:stock.inventory.line.split,line_exist_ids:0 #: field:stock.inventory.line.split,line_ids:0 -#: field:stock.move.split,line_exist_ids:0 field:stock.move.split,line_ids:0 +#: field:stock.move.split,line_exist_ids:0 +#: field:stock.move.split,line_ids:0 msgid "Production Lots" msgstr "" @@ -732,11 +705,6 @@ msgstr "" msgid "Recipient" msgstr "" -#. module: stock -#: model:stock.location,name:stock.location_refrigerator -msgid "Refrigerator" -msgstr "" - #. module: stock #: model:ir.actions.act_window,name:stock.action_location_tree #: model:ir.ui.menu,name:stock.menu_action_location_tree @@ -755,9 +723,7 @@ msgstr "" #. module: stock #: help:product.category,property_stock_journal:0 -msgid "" -"When doing real-time inventory valuation, this is the Accounting Journal in " -"which entries will be automatically posted when stock moves are processed." +msgid "When doing real-time inventory valuation, this is the Accounting Journal in which entries will be automatically posted when stock moves are processed." msgstr "" #. module: stock @@ -771,7 +737,7 @@ msgid "Reference must be unique per Company!" msgstr "" #. module: stock -#: code:addons/stock/product.py:417 +#: code:addons/stock/product.py:421 #, python-format msgid "Future Receptions" msgstr "" @@ -784,9 +750,7 @@ msgstr "" #. module: stock #: help:stock.inventory.line.split,use_exist:0 #: help:stock.move.split,use_exist:0 -msgid "" -"Check this option to select existing lots in the list below, otherwise you " -"should enter new ones line by line." +msgid "Check this option to select existing lots in the list below, otherwise you should enter new ones line by line." msgstr "" #. module: stock @@ -801,7 +765,8 @@ msgid "Destination Move" msgstr "" #. module: stock -#: view:stock.move:0 view:stock.picking:0 +#: view:stock.move:0 +#: view:stock.picking:0 msgid "Process Now" msgstr "" @@ -835,11 +800,6 @@ msgstr "" msgid "Procurements" msgstr "" -#. module: stock -#: model:stock.location,name:stock.stock_location_3 -msgid "IT Suppliers" -msgstr "" - #. module: stock #: model:ir.actions.act_window,name:stock.action_inventory_form_draft msgid "Draft Physical Inventories" @@ -874,7 +834,7 @@ msgid "Merge Inventory" msgstr "" #. module: stock -#: code:addons/stock/product.py:433 +#: code:addons/stock/product.py:437 #, python-format msgid "Future P&L" msgstr "" @@ -883,12 +843,15 @@ msgstr "" #: view:board.board:0 #: model:ir.actions.act_window,name:stock.action_incoming_product_board #: model:ir.actions.act_window,name:stock.action_picking_tree4 -#: model:ir.ui.menu,name:stock.menu_action_picking_tree4 view:stock.picking:0 +#: model:ir.ui.menu,name:stock.menu_action_picking_tree4 +#: view:stock.picking:0 msgid "Incoming Shipments" msgstr "" #. module: stock -#: view:report.stock.inventory:0 view:stock.move:0 view:stock.picking:0 +#: view:report.stock.inventory:0 +#: view:stock.move:0 +#: view:stock.picking:0 msgid "Scrap" msgstr "" @@ -908,7 +871,8 @@ msgid "Incoming" msgstr "" #. module: stock -#: report:lot.stock.overview:0 report:lot.stock.overview_all:0 +#: report:lot.stock.overview:0 +#: report:lot.stock.overview_all:0 #: field:stock.move,price_unit:0 msgid "Unit Price" msgstr "" @@ -935,22 +899,20 @@ msgid "Currency" msgstr "" #. module: stock -#: view:stock.picking:0 report:stock.picking.list:0 +#: view:stock.picking:0 +#: report:stock.picking.list:0 msgid "Journal" msgstr "" #. module: stock -#: code:addons/stock/stock.py:1345 +#: code:addons/stock/stock.py:1354 #, python-format msgid "is scheduled %s." msgstr "" #. module: stock #: help:stock.picking,location_id:0 -msgid "" -"Keep empty if you produce at the location where the finished products are " -"needed.Set a location if you produce at a fixed location. This can be a " -"partner location if you subcontract the manufacturing operations." +msgid "Keep empty if you produce at the location where the finished products are needed.Set a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations." msgstr "" #. module: stock @@ -975,20 +937,18 @@ msgstr "" #. module: stock #: help:stock.move,address_id:0 -msgid "" -"Optional address where goods are to be delivered, specifically used for " -"allotment" +msgid "Optional address where goods are to be delivered, specifically used for allotment" msgstr "" #. module: stock -#: view:report.stock.inventory:0 view:report.stock.move:0 +#: view:report.stock.inventory:0 +#: view:report.stock.move:0 msgid "Month-1" msgstr "" #. module: stock #: help:stock.location,active:0 -msgid "" -"By unchecking the active field, you may hide a location without deleting it." +msgid "By unchecking the active field, you may hide a location without deleting it." msgstr "" #. module: stock @@ -998,8 +958,8 @@ msgid "Please select multiple physical inventories to merge in the list view." msgstr "" #. module: stock -#: view:stock.picking:0 -msgid "Confirmed Pickings" +#: model:ir.actions.report.xml,name:stock.report_picking_list +msgid "Packing list" msgstr "" #. module: stock @@ -1014,7 +974,8 @@ msgid "View" msgstr "" #. module: stock -#: view:report.stock.inventory:0 view:report.stock.move:0 +#: view:report.stock.inventory:0 +#: view:report.stock.move:0 msgid "Last month" msgstr "" @@ -1029,7 +990,7 @@ msgid "Stock Valuation Account" msgstr "" #. module: stock -#: code:addons/stock/stock.py:1349 +#: code:addons/stock/stock.py:1358 #, python-format msgid "is waiting." msgstr "" @@ -1042,8 +1003,7 @@ msgstr "" #. module: stock #: code:addons/stock/product.py:147 #, python-format -msgid "" -"There is no stock output account defined for this product: \"%s\" (id: %d)" +msgid "There is no stock output account defined for this product: \"%s\" (id: %d)" msgstr "" #. module: stock @@ -1063,29 +1023,19 @@ msgstr "" #. module: stock #: help:stock.location,usage:0 -msgid "" -"* Supplier Location: Virtual location representing the source location for " -"products coming from your suppliers\n" +msgid "* Supplier Location: Virtual location representing the source location for products coming from your suppliers\n" " \n" -"* View: Virtual location used to create a hierarchical structures for your " -"warehouse, aggregating its child locations ; can't directly contain " -"products\n" +"* View: Virtual location used to create a hierarchical structures for your warehouse, aggregating its child locations ; can't directly contain products\n" " \n" "* Internal Location: Physical locations inside your own warehouses,\n" " \n" -"* Customer Location: Virtual location representing the destination location " -"for products sent to your customers\n" +"* Customer Location: Virtual location representing the destination location for products sent to your customers\n" " \n" -"* Inventory: Virtual location serving as counterpart for inventory " -"operations used to correct stock levels (Physical inventories)\n" +"* Inventory: Virtual location serving as counterpart for inventory operations used to correct stock levels (Physical inventories)\n" " \n" -"* Procurement: Virtual location serving as temporary counterpart for " -"procurement operations when the source (supplier or production) is not known " -"yet. This location should be empty when the procurement scheduler has " -"finished running.\n" +"* Procurement: Virtual location serving as temporary counterpart for procurement operations when the source (supplier or production) is not known yet. This location should be empty when the procurement scheduler has finished running.\n" " \n" -"* Production: Virtual counterpart location for production operations: this " -"location consumes the raw material and produces finished products\n" +"* Production: Virtual counterpart location for production operations: this location consumes the raw material and produces finished products\n" " " msgstr "" @@ -1095,7 +1045,7 @@ msgid "Author" msgstr "" #. module: stock -#: code:addons/stock/stock.py:1332 +#: code:addons/stock/stock.py:1341 #, python-format msgid "Delivery Order" msgstr "" @@ -1106,16 +1056,15 @@ msgid "Manual Operation" msgstr "" #. module: stock -#: view:stock.location:0 view:stock.move:0 +#: view:stock.location:0 +#: view:stock.move:0 msgid "Supplier" msgstr "" #. module: stock -#: code:addons/stock/stock.py:2727 +#: code:addons/stock/stock.py:2739 #, python-format -msgid "" -"In order to cancel this inventory, you must first unpost related journal " -"entries." +msgid "In order to cancel this inventory, you must first unpost related journal entries." msgstr "" #. module: stock @@ -1124,11 +1073,9 @@ msgid "Date Done" msgstr "" #. module: stock -#: code:addons/stock/wizard/stock_partial_picking.py:148 +#: code:addons/stock/wizard/stock_partial_picking.py:149 #, python-format -msgid "" -"The uom rounding does not allow you to ship \"%s %s\", only roundings of " -"\"%s %s\" is accepted by the uom." +msgid "The uom rounding does not allow you to ship \"%s %s\", only roundings of \"%s %s\" is accepted by the uom." msgstr "" #. module: stock @@ -1150,7 +1097,8 @@ msgstr "" #. module: stock #: model:ir.actions.act_window,name:stock.action_view_stock_inventory_line_split #: model:ir.model,name:stock.model_stock_inventory_line_split -#: view:stock.inventory:0 view:stock.inventory.line:0 +#: view:stock.inventory:0 +#: view:stock.inventory.line:0 msgid "Split inventory lines" msgstr "" @@ -1159,19 +1107,9 @@ msgstr "" msgid "Physical Inventory" msgstr "" -#. module: stock -#: help:stock.location,chained_company_id:0 -msgid "" -"Picking List containing the chained move will belong to this company " -"( leave empty to use the default company determination rules )." -msgstr "" - #. module: stock #: help:stock.location,chained_picking_type:0 -msgid "" -"Shipping Type of the Picking List that will contain the chained move (leave " -"empty to automatically detect the type based on the source and destination " -"locations)." +msgid "Shipping Type of the Picking List that will contain the chained move (leave empty to automatically detect the type based on the source and destination locations)." msgstr "" #. module: stock @@ -1181,7 +1119,8 @@ msgstr "" #. module: stock #: field:stock.inventory.line,product_uom:0 -#: field:stock.move.consume,product_uom:0 field:stock.move.scrap,product_uom:0 +#: field:stock.move.consume,product_uom:0 +#: field:stock.move.scrap,product_uom:0 msgid "Product UOM" msgstr "" @@ -1191,12 +1130,20 @@ msgid "Partner Locations" msgstr "" #. module: stock -#: view:report.stock.inventory:0 view:report.stock.move:0 +#: code:addons/stock/report/stock_graph.py:106 +#, python-format +msgid "Virtual Stock (Unit)" +msgstr "" + +#. module: stock +#: view:report.stock.inventory:0 +#: view:report.stock.move:0 msgid "Current year" msgstr "" #. module: stock -#: view:report.stock.inventory:0 view:report.stock.move:0 +#: view:report.stock.inventory:0 +#: view:report.stock.move:0 msgid "Total quantity" msgstr "" @@ -1207,8 +1154,8 @@ msgid "Consume Move" msgstr "" #. module: stock -#: model:stock.location,name:stock.stock_location_7 -msgid "European Customers" +#: model:stock.location,name:stock.stock_location_suppliers +msgid "Suppliers" msgstr "" #. module: stock @@ -1223,17 +1170,15 @@ msgstr "" #. module: stock #: help:stock.location,chained_auto_packing:0 -msgid "" -"This is used only if you select a chained location type.\n" -"The 'Automatic Move' value will create a stock move after the current one " -"that will be validated automatically. With 'Manual Operation', the stock " -"move has to be validated by a worker. With 'Automatic No Step Added', the " -"location is replaced in the original move." +msgid "This is used only if you select a chained location type.\n" +"The 'Automatic Move' value will create a stock move after the current one that will be validated automatically. With 'Manual Operation', the stock move has to be validated by a worker. With 'Automatic No Step Added', the location is replaced in the original move." msgstr "" #. module: stock -#: view:stock.tracking:0 -msgid "Pack Identification" +#: code:addons/stock/wizard/stock_traceability.py:54 +#: view:stock.production.lot:0 +#, python-format +msgid "Downstream Traceability" msgstr "" #. module: stock @@ -1243,15 +1188,13 @@ msgstr "" #. module: stock #: selection:stock.move,state:0 +#: report:stock.picking.list:0 msgid "Waiting Another Move" msgstr "" #. module: stock #: help:product.template,property_stock_production:0 -msgid "" -"For the current product, this stock location will be used, instead of the " -"default one, as the source location for stock moves generated by production " -"orders" +msgid "For the current product, this stock location will be used, instead of the default one, as the source location for stock moves generated by production orders" msgstr "" #. module: stock @@ -1261,22 +1204,18 @@ msgstr "" #. module: stock #: help:stock.move,price_unit:0 -msgid "" -"Technical field used to record the product cost set by the user during a " -"picking confirmation (when average price costing method is used)" +msgid "Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)" msgstr "" #. module: stock -#: code:addons/stock/stock.py:1350 +#: code:addons/stock/stock.py:1359 #, python-format msgid "is in draft state." msgstr "" #. module: stock #: model:ir.actions.act_window,help:stock.action_tracking_form -msgid "" -"This is the list of all your packs. When you select a Pack, you can get the " -"upstream or downstream traceability of the products contained in the pack." +msgid "This is the list of all your packs. When you select a Pack, you can get the upstream or downstream traceability of the products contained in the pack." msgstr "" #. module: stock @@ -1285,21 +1224,30 @@ msgid "To be refunded/invoiced" msgstr "" #. module: stock -#: model:stock.location,name:stock.stock_location_shop0 -msgid "Shop 1" +#: code:addons/stock/stock.py:2321 +#, python-format +msgid "You can only delete draft moves." msgstr "" #. module: stock -#: view:stock.change.product.qty:0 view:stock.change.standard.price:0 -#: view:stock.fill.inventory:0 view:stock.inventory.merge:0 -#: view:stock.invoice.onshipping:0 view:stock.location.product:0 -#: view:stock.move:0 view:stock.partial.move:0 view:stock.partial.picking:0 -#: view:stock.picking:0 view:stock.return.picking:0 view:stock.split.into:0 +#: view:stock.change.product.qty:0 +#: view:stock.change.standard.price:0 +#: view:stock.fill.inventory:0 +#: view:stock.inventory.merge:0 +#: view:stock.invoice.onshipping:0 +#: view:stock.location.product:0 +#: view:stock.move:0 +#: view:stock.partial.move:0 +#: view:stock.partial.picking:0 +#: view:stock.picking:0 +#: view:stock.return.picking:0 +#: view:stock.split.into:0 msgid "_Cancel" msgstr "" #. module: stock -#: view:stock.move:0 view:stock.picking:0 +#: view:stock.move:0 +#: view:stock.picking:0 msgid "Ready" msgstr "" @@ -1314,10 +1262,9 @@ msgid "Additional Info" msgstr "" #. module: stock -#: field:stock.partial.move.line,move_id:0 -#: field:stock.partial.picking.line,move_id:0 -#: field:stock.return.picking.memory,move_id:0 -msgid "Move" +#: code:addons/stock/stock.py:1706 +#, python-format +msgid "Operation forbidden" msgstr "" #. module: stock @@ -1337,7 +1284,13 @@ msgid "You may only return pickings that are Confirmed, Available or Done!" msgstr "" #. module: stock -#: view:stock.picking:0 field:stock.picking,invoice_state:0 +#: report:stock.picking.list:0 +msgid "Non Assigned Products:" +msgstr "" + +#. module: stock +#: view:stock.picking:0 +#: field:stock.picking,invoice_state:0 msgid "Invoice Control" msgstr "" @@ -1353,12 +1306,14 @@ msgstr "" #. module: stock #: selection:report.stock.inventory,state:0 -#: selection:report.stock.move,state:0 view:stock.picking:0 +#: selection:report.stock.move,state:0 +#: view:stock.picking:0 msgid "Waiting" msgstr "" #. module: stock -#: view:stock.move:0 view:stock.picking:0 +#: view:stock.move:0 +#: view:stock.picking:0 msgid "Split" msgstr "" @@ -1383,11 +1338,6 @@ msgstr "" msgid "Available Pickings" msgstr "" -#. module: stock -#: model:stock.location,name:stock.stock_location_5 -msgid "Generic IT Suppliers" -msgstr "" - #. module: stock #: view:stock.move:0 msgid "Stock to be receive" @@ -1395,12 +1345,7 @@ msgstr "" #. module: stock #: help:stock.location,valuation_out_account_id:0 -msgid "" -"Used for real-time inventory valuation. When set on a virtual location (non " -"internal type), this account will be used to hold the value of products " -"being moved out of this location and into an internal location, instead of " -"the generic Stock Output Account set on the product. This has no effect for " -"internal locations." +msgid "Used for real-time inventory valuation. When set on a virtual location (non internal type), this account will be used to hold the value of products being moved out of this location and into an internal location, instead of the generic Stock Output Account set on the product. This has no effect for internal locations." msgstr "" #. module: stock @@ -1409,8 +1354,10 @@ msgid "Picking List:" msgstr "" #. module: stock -#: field:stock.inventory,date:0 field:stock.move,create_date:0 -#: field:stock.production.lot,date:0 field:stock.tracking,date:0 +#: field:stock.inventory,date:0 +#: field:stock.move,create_date:0 +#: field:stock.production.lot,date:0 +#: field:stock.tracking,date:0 msgid "Creation Date" msgstr "" @@ -1425,7 +1372,8 @@ msgid "Address of customer or supplier." msgstr "" #. module: stock -#: view:report.stock.move:0 field:report.stock.move,picking_id:0 +#: view:report.stock.move:0 +#: field:report.stock.move,picking_id:0 msgid "Packing" msgstr "" @@ -1437,9 +1385,8 @@ msgid "Customer Location" msgstr "" #. module: stock -#: code:addons/stock/stock.py:2312 -#, python-format -msgid "You can only delete draft moves." +#: xsl:stock.move.label:0 +msgid "Serial:" msgstr "" #. module: stock @@ -1464,7 +1411,8 @@ msgid "Analysis including future moves (similar to virtual stock)" msgstr "" #. module: stock -#: model:ir.actions.act_window,name:stock.action3 view:stock.tracking:0 +#: model:ir.actions.act_window,name:stock.action3 +#: view:stock.tracking:0 msgid "Downstream traceability" msgstr "" @@ -1481,12 +1429,13 @@ msgstr "" #. module: stock #: help:stock.incoterms,active:0 -msgid "" -"By unchecking the active field, you may hide an INCOTERM without deleting it." +msgid "By unchecking the active field, you may hide an INCOTERM without deleting it." msgstr "" #. module: stock -#: view:stock.move:0 view:stock.picking:0 field:stock.picking,date:0 +#: view:stock.move:0 +#: view:stock.picking:0 +#: field:stock.picking,date:0 msgid "Order Date" msgstr "" @@ -1497,18 +1446,17 @@ msgid "INV: %s" msgstr "" #. module: stock -#: view:stock.location:0 field:stock.location,location_id:0 +#: view:stock.location:0 +#: field:stock.location,location_id:0 msgid "Parent Location" msgstr "" #. module: stock #: help:stock.picking,state:0 -msgid "" -"* Draft: not confirmed yet and will not be scheduled until confirmed\n" +msgid "* Draft: not confirmed yet and will not be scheduled until confirmed\n" "* Confirmed: still waiting for the availability of products\n" "* Available: products reserved, simply waiting for confirmation.\n" -"* Waiting: waiting for another move to proceed before it becomes " -"automatically available (e.g. in Make-To-Order flows)\n" +"* Waiting: waiting for another move to proceed before it becomes automatically available (e.g. in Make-To-Order flows)\n" "* Done: has been processed, can't be modified or cancelled anymore\n" "* Cancelled: has been cancelled, can't be confirmed anymore" msgstr "" @@ -1519,7 +1467,7 @@ msgid "Let this field empty if this location is shared between all companies" msgstr "" #. module: stock -#: code:addons/stock/stock.py:2337 +#: code:addons/stock/stock.py:2346 #, python-format msgid "Please provide a positive quantity to scrap!" msgstr "" @@ -1531,9 +1479,7 @@ msgstr "" #. module: stock #: help:product.product,track_outgoing:0 -msgid "" -"Forces to specify a Production Lot for all moves containing this product and " -"going to a Customer Location" +msgid "Forces to specify a Production Lot for all moves containing this product and going to a Customer Location" msgstr "" #. module: stock @@ -1543,10 +1489,8 @@ msgstr "" #. module: stock #: help:stock.move,state:0 -msgid "" -"When the stock move is created it is in the 'Draft' state.\n" -" After that, it is set to 'Not Available' state if the scheduler did not " -"find the products.\n" +msgid "When the stock move is created it is in the 'Draft' state.\n" +" After that, it is set to 'Not Available' state if the scheduler did not find the products.\n" " When products are reserved it is set to 'Available'.\n" " When the picking is done the state is 'Done'. \n" "The state is 'Waiting' if the move is waiting for another one." @@ -1560,7 +1504,7 @@ msgid "Supplier Location" msgstr "" #. module: stock -#: code:addons/stock/stock.py:2358 +#: code:addons/stock/stock.py:2367 #, python-format msgid "were scrapped" msgstr "" @@ -1579,9 +1523,7 @@ msgstr "" #. module: stock #: help:stock.picking,backorder_id:0 -msgid "" -"If this picking was split this field links to the picking that contains the " -"other part that has been processed already." +msgid "If this picking was split this field links to the picking that contains the other part that has been processed already." msgstr "" #. module: stock @@ -1612,8 +1554,11 @@ msgstr "" #. module: stock #: model:ir.actions.act_window,name:stock.act_product_stock_move_open #: model:ir.actions.act_window,name:stock.action_move_form2 -#: model:ir.ui.menu,name:stock.menu_action_move_form2 view:stock.inventory:0 -#: view:stock.move:0 view:stock.picking:0 view:stock.production.lot:0 +#: model:ir.ui.menu,name:stock.menu_action_move_form2 +#: view:stock.inventory:0 +#: view:stock.move:0 +#: view:stock.picking:0 +#: view:stock.production.lot:0 #: view:stock.tracking:0 msgid "Stock Moves" msgstr "" @@ -1650,11 +1595,6 @@ msgstr "" msgid "Stock Valuation Account (Incoming)" msgstr "" -#. module: stock -#: model:stock.location,name:stock.stock_location_14 -msgid "Shelf 2" -msgstr "" - #. module: stock #: field:stock.report.tracklots,tracking_id:0 msgid "Tracking lot" @@ -1662,11 +1602,12 @@ msgstr "" #. module: stock #: view:stock.picking:0 -msgid "Back Orders" +msgid "Confirmed Pickings" msgstr "" #. module: stock -#: view:product.product:0 view:product.template:0 +#: view:product.product:0 +#: view:product.template:0 msgid "Counter-Part Locations Properties" msgstr "" @@ -1676,14 +1617,15 @@ msgid "Localization" msgstr "" #. module: stock -#: code:addons/stock/product.py:429 +#: code:addons/stock/product.py:433 #, python-format msgid "Delivered Qty" msgstr "" #. module: stock #: model:ir.actions.act_window,name:stock.track_line -#: view:stock.inventory.line.split:0 view:stock.move.split:0 +#: view:stock.inventory.line.split:0 +#: view:stock.move.split:0 msgid "Split in lots" msgstr "" @@ -1694,11 +1636,7 @@ msgstr "" #. module: stock #: help:product.template,property_stock_account_output:0 -msgid "" -"When doing real-time inventory valuation, counterpart journal items for all " -"outgoing stock moves will be posted in this account, unless there is a " -"specific valuation account set on the destination location. When not set on " -"the product, the one from the product category is used." +msgid "When doing real-time inventory valuation, counterpart journal items for all outgoing stock moves will be posted in this account, unless there is a specific valuation account set on the destination location. When not set on the product, the one from the product category is used." msgstr "" #. module: stock @@ -1707,16 +1645,22 @@ msgid "Day Planned" msgstr "" #. module: stock -#: view:report.stock.inventory:0 field:report.stock.inventory,date:0 -#: field:report.stock.move,date:0 view:stock.inventory:0 -#: report:stock.inventory.move:0 view:stock.move:0 field:stock.move,date:0 -#: field:stock.partial.move,date:0 field:stock.partial.picking,date:0 +#: view:report.stock.inventory:0 +#: field:report.stock.inventory,date:0 +#: field:report.stock.move,date:0 +#: view:stock.inventory:0 +#: report:stock.inventory.move:0 +#: view:stock.move:0 +#: field:stock.move,date:0 +#: field:stock.partial.move,date:0 +#: field:stock.partial.picking,date:0 #: view:stock.picking:0 msgid "Date" msgstr "" #. module: stock -#: view:report.stock.inventory:0 view:report.stock.move:0 +#: view:report.stock.inventory:0 +#: view:report.stock.move:0 msgid "Extended Filters..." msgstr "" @@ -1753,26 +1697,31 @@ msgid "Warehouse Dashboard" msgstr "" #. module: stock -#: code:addons/stock/stock.py:513 +#: code:addons/stock/stock.py:519 #, python-format msgid "You can not remove a lot line !" msgstr "" #. module: stock -#: model:ir.model,name:stock.model_stock_move_scrap view:stock.move:0 -#: view:stock.move.scrap:0 view:stock.picking:0 +#: model:ir.model,name:stock.model_stock_move_scrap +#: view:stock.move:0 +#: view:stock.move.scrap:0 +#: view:stock.picking:0 msgid "Scrap Products" msgstr "" #. module: stock -#: code:addons/stock/stock.py:1157 +#: code:addons/stock/stock.py:1166 #, python-format msgid "You cannot remove the picking which is in %s state !" msgstr "" #. module: stock -#: view:stock.inventory.line.split:0 view:stock.move.consume:0 -#: view:stock.move.scrap:0 view:stock.move.split:0 view:stock.picking:0 +#: view:stock.inventory.line.split:0 +#: view:stock.move.consume:0 +#: view:stock.move.scrap:0 +#: view:stock.move.split:0 +#: view:stock.picking:0 msgid "Cancel" msgstr "" @@ -1783,22 +1732,29 @@ msgid "Return Picking" msgstr "" #. module: stock -#: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0 +#: view:stock.inventory:0 +#: view:stock.move:0 +#: view:stock.picking:0 msgid "Split in production lots" msgstr "" #. module: stock #: model:ir.model,name:stock.model_stock_location -#: field:product.product,location_id:0 view:report.stock.inventory:0 +#: field:product.product,location_id:0 +#: view:report.stock.inventory:0 #: field:report.stock.inventory,location_id:0 #: field:stock.change.product.qty,location_id:0 #: field:stock.fill.inventory,location_id:0 -#: field:stock.inventory.line,location_id:0 report:stock.inventory.move:0 -#: view:stock.location:0 view:stock.move:0 -#: field:stock.move.consume,location_id:0 field:stock.move.scrap,location_id:0 +#: field:stock.inventory.line,location_id:0 +#: report:stock.inventory.move:0 +#: view:stock.location:0 +#: view:stock.move:0 +#: field:stock.move.consume,location_id:0 +#: field:stock.move.scrap,location_id:0 #: field:stock.partial.move.line,location_id:0 #: field:stock.partial.picking.line,location_id:0 -#: field:stock.picking,location_id:0 report:stock.picking.list:0 +#: field:stock.picking,location_id:0 +#: report:stock.picking.list:0 #: field:stock.report.prodlots,location_id:0 #: field:stock.report.tracklots,location_id:0 msgid "Location" @@ -1816,12 +1772,7 @@ msgstr "" #. module: stock #: help:stock.location,valuation_in_account_id:0 -msgid "" -"Used for real-time inventory valuation. When set on a virtual location (non " -"internal type), this account will be used to hold the value of products " -"being moved from an internal location into this location, instead of the " -"generic Stock Output Account set on the product. This has no effect for " -"internal locations." +msgid "Used for real-time inventory valuation. When set on a virtual location (non internal type), this account will be used to hold the value of products being moved from an internal location into this location, instead of the generic Stock Output Account set on the product. This has no effect for internal locations." msgstr "" #. module: stock @@ -1835,7 +1786,8 @@ msgid "Cost Price" msgstr "" #. module: stock -#: view:product.product:0 field:product.product,valuation:0 +#: view:product.product:0 +#: field:product.product,valuation:0 msgid "Inventory Valuation" msgstr "" @@ -1845,15 +1797,14 @@ msgid "Orders planned for today" msgstr "" #. module: stock -#: view:stock.move:0 view:stock.picking:0 +#: view:stock.move:0 +#: view:stock.picking:0 msgid "Process Later" msgstr "" #. module: stock #: help:res.partner,property_stock_supplier:0 -msgid "" -"This stock location will be used, instead of the default one, as the source " -"location for goods you receive from the current partner" +msgid "This stock location will be used, instead of the default one, as the source location for goods you receive from the current partner" msgstr "" #. module: stock @@ -1863,18 +1814,13 @@ msgstr "" #. module: stock #: model:ir.actions.act_window,help:stock.action_stock_move_report -msgid "" -"Moves Analysis allows you to easily check and analyse your company stock " -"moves. Use this report when you want to analyse the different routes taken " -"by your products and inventory management performance." +msgid "Moves Analysis allows you to easily check and analyse your company stock moves. Use this report when you want to analyse the different routes taken by your products and inventory management performance." msgstr "" #. module: stock -#: code:addons/stock/stock.py:2116 +#: code:addons/stock/stock.py:2125 #, python-format -msgid "" -"Can not create Journal Entry, Output Account defined on this product and " -"Valuation account on category of this product are same." +msgid "Can not create Journal Entry, Output Account defined on this product and Valuation account on category of this product are same." msgstr "" #. module: stock @@ -1903,15 +1849,13 @@ msgid "Stock report by tracking lots" msgstr "" #. module: stock -#: code:addons/stock/stock.py:2122 +#: code:addons/stock/stock.py:2131 #, python-format -msgid "" -"There is no stock input account defined for this product or its category: " -"\"%s\" (id: %d)" +msgid "There is no stock input account defined for this product or its category: \"%s\" (id: %d)" msgstr "" #. module: stock -#: code:addons/stock/product.py:419 +#: code:addons/stock/product.py:423 #, python-format msgid "Received Qty" msgstr "" @@ -1923,9 +1867,7 @@ msgstr "" #. module: stock #: help:stock.production.lot,prefix:0 -msgid "" -"Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL " -"[INT_REF]" +msgid "Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL [INT_REF]" msgstr "" #. module: stock @@ -1936,7 +1878,8 @@ msgid "Import Inventory" msgstr "" #. module: stock -#: field:stock.incoterms,name:0 field:stock.move,name:0 +#: field:stock.incoterms,name:0 +#: field:stock.move,name:0 #: field:stock.warehouse,name:0 msgid "Name" msgstr "" @@ -1949,17 +1892,12 @@ msgstr "" #. module: stock #: help:stock.partial.move,hide_tracking:0 #: help:stock.partial.picking,hide_tracking:0 -msgid "" -"This field is for internal purpose. It is used to decide if the column " -"prodlot has to be shown on the move_ids field or not" +msgid "This field is for internal purpose. It is used to decide if the column prodlot has to be shown on the move_ids field or not" msgstr "" #. module: stock #: help:product.template,property_stock_inventory:0 -msgid "" -"For the current product, this stock location will be used, instead of the " -"default one, as the source location for stock moves generated when you do an " -"inventory" +msgid "For the current product, this stock location will be used, instead of the default one, as the source location for stock moves generated when you do an inventory" msgstr "" #. module: stock @@ -1983,13 +1921,16 @@ msgid "Customer Locations" msgstr "" #. module: stock -#: view:stock.change.product.qty:0 view:stock.change.standard.price:0 +#: view:stock.change.product.qty:0 +#: view:stock.change.standard.price:0 msgid "_Apply" msgstr "" #. module: stock -#: report:lot.stock.overview:0 report:lot.stock.overview_all:0 -#: report:stock.inventory.move:0 report:stock.picking.list:0 +#: report:lot.stock.overview:0 +#: report:lot.stock.overview_all:0 +#: report:stock.inventory.move:0 +#: report:stock.picking.list:0 msgid "]" msgstr "" @@ -1999,15 +1940,14 @@ msgid "Inventory Location" msgstr "" #. module: stock -#: view:report.stock.inventory:0 view:report.stock.move:0 +#: view:report.stock.inventory:0 +#: view:report.stock.move:0 msgid "Total value" msgstr "" #. module: stock #: help:stock.location,chained_journal_id:0 -msgid "" -"Inventory Journal in which the chained move will be written, if the Chaining " -"Type is not Transparent (no journal is used if left empty)" +msgid "Inventory Journal in which the chained move will be written, if the Chaining Type is not Transparent (no journal is used if left empty)" msgstr "" #. module: stock @@ -2017,8 +1957,7 @@ msgstr "" #. module: stock #: view:report.stock.inventory:0 -msgid "" -"Analysis of current inventory (only moves that have already been processed)" +msgid "Analysis of current inventory (only moves that have already been processed)" msgstr "" #. module: stock @@ -2062,14 +2001,15 @@ msgstr "" #. module: stock #: help:stock.move,date:0 -msgid "" -"Move date: scheduled date until move is done, then date of actual move " -"processing" +msgid "Move date: scheduled date until move is done, then date of actual move processing" msgstr "" #. module: stock -#: view:report.stock.inventory:0 view:report.stock.move:0 -#: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0 +#: view:report.stock.inventory:0 +#: view:report.stock.move:0 +#: view:stock.inventory:0 +#: view:stock.move:0 +#: view:stock.picking:0 #: view:stock.production.lot:0 msgid "Group By..." msgstr "" @@ -2085,7 +2025,7 @@ msgid "Inventory loss" msgstr "" #. module: stock -#: code:addons/stock/stock.py:1341 +#: code:addons/stock/stock.py:1350 #, python-format msgid "Document" msgstr "" @@ -2096,7 +2036,8 @@ msgid "Input Picking List" msgstr "" #. module: stock -#: field:stock.move,product_uom:0 field:stock.partial.move.line,product_uom:0 +#: field:stock.move,product_uom:0 +#: field:stock.partial.move.line,product_uom:0 #: field:stock.partial.picking.line,product_uom:0 msgid "Unit of Measure" msgstr "" @@ -2109,9 +2050,7 @@ msgstr "" #. module: stock #: help:product.product,track_production:0 -msgid "" -"Forces to specify a Production Lot for all moves containing this product and " -"generated by a Manufacturing Order" +msgid "Forces to specify a Production Lot for all moves containing this product and generated by a Manufacturing Order" msgstr "" #. module: stock @@ -2163,23 +2102,27 @@ msgid "Warehouse board" msgstr "" #. module: stock -#: code:addons/stock/product.py:439 +#: code:addons/stock/product.py:443 #, python-format msgid "Future Qty" msgstr "" #. module: stock -#: field:stock.move,note:0 view:stock.picking:0 field:stock.picking,note:0 +#: field:stock.move,note:0 +#: view:stock.picking:0 +#: field:stock.picking,note:0 msgid "Notes" msgstr "" #. module: stock -#: report:lot.stock.overview:0 report:lot.stock.overview_all:0 +#: report:lot.stock.overview:0 +#: report:lot.stock.overview_all:0 msgid "Value" msgstr "" #. module: stock -#: field:report.stock.move,type:0 field:stock.location,chained_picking_type:0 +#: field:report.stock.move,type:0 +#: field:stock.location,chained_picking_type:0 #: field:stock.picking,type:0 msgid "Shipping Type" msgstr "" @@ -2193,8 +2136,11 @@ msgstr "" #: model:ir.actions.act_window,name:stock.act_product_location_open #: model:ir.ui.menu,name:stock.menu_product_in_config_stock #: model:ir.ui.menu,name:stock.menu_stock_product -#: model:ir.ui.menu,name:stock.menu_stock_products_menu view:stock.inventory:0 -#: view:stock.partial.move:0 view:stock.partial.picking:0 view:stock.picking:0 +#: model:ir.ui.menu,name:stock.menu_stock_products_menu +#: view:stock.inventory:0 +#: view:stock.partial.move:0 +#: view:stock.partial.picking:0 +#: view:stock.picking:0 msgid "Products" msgstr "" @@ -2215,7 +2161,8 @@ msgstr "" #. module: stock #: help:report.stock.move,location_dest_id:0 -#: help:stock.move,location_dest_id:0 help:stock.picking,location_dest_id:0 +#: help:stock.move,location_dest_id:0 +#: help:stock.picking,location_dest_id:0 msgid "Location where the system will stock the finished products." msgstr "" @@ -2232,12 +2179,7 @@ msgstr "" #. module: stock #: model:ir.actions.act_window,help:stock.action_reception_picking_move -msgid "" -"Here you can receive individual products, no matter what purchase order or " -"picking order they come from. You will find the list of all products you are " -"waiting for. Once you receive an order, you can filter based on the name of " -"the supplier or the purchase order reference. Then you can confirm all " -"products received using the buttons on the right of each line." +msgid "Here you can receive individual products, no matter what purchase order or picking order they come from. You will find the list of all products you are waiting for. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line." msgstr "" #. module: stock @@ -2251,9 +2193,10 @@ msgid "Delay(Days)" msgstr "" #. module: stock -#: code:addons/stock/stock.py:1697 -#, python-format -msgid "Operation forbidden" +#: field:stock.partial.move.line,move_id:0 +#: field:stock.partial.picking.line,move_id:0 +#: field:stock.return.picking.memory,move_id:0 +msgid "Move" msgstr "" #. module: stock @@ -2262,7 +2205,7 @@ msgid "Expected date for the picking to be processed" msgstr "" #. module: stock -#: code:addons/stock/product.py:435 +#: code:addons/stock/product.py:439 #, python-format msgid "P&L Qty" msgstr "" @@ -2273,7 +2216,13 @@ msgid "Internal Pickings to invoice" msgstr "" #. module: stock -#: view:stock.production.lot:0 field:stock.production.lot,revisions:0 +#: xsl:stock.move.label:0 +msgid "Tracking:" +msgstr "" + +#. module: stock +#: view:stock.production.lot:0 +#: field:stock.production.lot,revisions:0 msgid "Revisions" msgstr "" @@ -2284,41 +2233,23 @@ msgstr "" #. module: stock #: help:product.product,valuation:0 -msgid "" -"If real-time valuation is enabled for a product, the system will " -"automatically write journal entries corresponding to stock moves.The " -"inventory variation account set on the product category will represent the " -"current inventory value, and the stock input and stock output account will " -"hold the counterpart moves for incoming and outgoing products." +msgid "If real-time valuation is enabled for a product, the system will automatically write journal entries corresponding to stock moves.The inventory variation account set on the product category will represent the current inventory value, and the stock input and stock output account will hold the counterpart moves for incoming and outgoing products." msgstr "" #. module: stock #: model:ir.actions.act_window,help:stock.action_stock_inventory_report -msgid "" -"Inventory Analysis allows you to easily check and analyse your company stock " -"levels. Sort and group by selection criteria in order to better analyse and " -"manage your company activities." +msgid "Inventory Analysis allows you to easily check and analyse your company stock levels. Sort and group by selection criteria in order to better analyse and manage your company activities." msgstr "" #. module: stock -#: help:report.stock.move,location_id:0 help:stock.move,location_id:0 -msgid "" -"Sets a location if you produce at a fixed location. This can be a partner " -"location if you subcontract the manufacturing operations." +#: help:report.stock.move,location_id:0 +#: help:stock.move,location_id:0 +msgid "Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations." msgstr "" #. module: stock #: model:ir.actions.act_window,help:stock.action_location_form -msgid "" -"Define your locations to reflect your warehouse structure and organization. " -"OpenERP is able to manage physical locations (warehouses, shelves, bin, " -"etc), partner locations (customers, suppliers) and virtual locations which " -"are the counterpart of the stock operations like the manufacturing orders " -"consumptions, inventories, etc. Every stock operation in OpenERP moves the " -"products from one location to another one. For instance, if you receive " -"products from a supplier, OpenERP will move products from the Supplier " -"location to the Stock location. Each report can be performed on physical, " -"partner or virtual locations." +msgid "Define your locations to reflect your warehouse structure and organization. OpenERP is able to manage physical locations (warehouses, shelves, bin, etc), partner locations (customers, suppliers) and virtual locations which are the counterpart of the stock operations like the manufacturing orders consumptions, inventories, etc. Every stock operation in OpenERP moves the products from one location to another one. For instance, if you receive products from a supplier, OpenERP will move products from the Supplier location to the Stock location. Each report can be performed on physical, partner or virtual locations." msgstr "" #. module: stock @@ -2327,7 +2258,8 @@ msgid "Create" msgstr "" #. module: stock -#: view:stock.move:0 view:stock.picking:0 +#: view:stock.move:0 +#: view:stock.picking:0 msgid "Dates" msgstr "" @@ -2344,7 +2276,8 @@ msgstr "" #. module: stock #: model:ir.model,name:stock.model_stock_inventory #: selection:report.stock.inventory,location_type:0 -#: field:stock.inventory.line,inventory_id:0 report:stock.inventory.move:0 +#: field:stock.inventory.line,inventory_id:0 +#: report:stock.inventory.move:0 #: selection:stock.location,usage:0 msgid "Inventory" msgstr "" @@ -2356,8 +2289,7 @@ msgstr "" #. module: stock #: sql_constraint:stock.production.lot:0 -msgid "" -"The combination of serial number and internal reference must be unique !" +msgid "The combination of serial number and internal reference must be unique !" msgstr "" #. module: stock @@ -2367,7 +2299,8 @@ msgstr "" #. module: stock #: code:addons/stock/report/report_stock.py:78 -#: code:addons/stock/report/report_stock.py:135 code:addons/stock/stock.py:760 +#: code:addons/stock/report/report_stock.py:135 +#: code:addons/stock/stock.py:766 #, python-format msgid "Error !" msgstr "" @@ -2384,21 +2317,11 @@ msgid "Fixed Location" msgstr "" #. module: stock -#: code:addons/stock/stock.py:2486 +#: code:addons/stock/stock.py:2492 #, python-format msgid "Product '%s' is consumed with '%s' quantity." msgstr "" -#. module: stock -#: model:product.template,description:stock.product_icecream_product_template -msgid "" -"Ice cream can be mass-produced and thus is widely available in developed " -"parts of the world. Ice cream can be purchased in large cartons (vats and " -"squrounds) from supermarkets and grocery stores, in smaller quantities from " -"ice cream shops, convenience stores, and milk bars, and in individual " -"servings from small carts or vans at public events." -msgstr "" - #. module: stock #: selection:report.stock.inventory,month:0 #: selection:report.stock.move,month:0 @@ -2412,27 +2335,23 @@ msgstr "" #. module: stock #: model:ir.actions.act_window,help:stock.action_stock_line_date -msgid "" -"Display the last inventories done on your products and easily sort them with " -"specific filtering criteria. If you do frequent and partial inventories, you " -"need this report in order to ensure that the stock of each product is " -"controlled at least once a year." -msgstr "" - -#. module: stock -#: model:stock.location,name:stock.location_opening -msgid "opening" +msgid "Display the last inventories done on your products and easily sort them with specific filtering criteria. If you do frequent and partial inventories, you need this report in order to ensure that the stock of each product is controlled at least once a year." msgstr "" #. module: stock +#: code:addons/stock/report/stock_graph.py:36 +#: code:addons/stock/report/stock_graph.py:104 #: model:ir.actions.report.xml,name:stock.report_product_history +#, python-format msgid "Stock Level Forecast" msgstr "" #. module: stock #: model:ir.model,name:stock.model_stock_journal -#: field:report.stock.move,stock_journal:0 view:stock.journal:0 -#: field:stock.journal,name:0 field:stock.picking,stock_journal_id:0 +#: field:report.stock.move,stock_journal:0 +#: view:stock.journal:0 +#: field:stock.journal,name:0 +#: field:stock.picking,stock_journal_id:0 msgid "Stock Journal" msgstr "" @@ -2442,11 +2361,6 @@ msgstr "" msgid "Procurement" msgstr "" -#. module: stock -#: model:stock.location,name:stock.stock_location_4 -msgid "Maxtor Suppliers" -msgstr "" - #. module: stock #: code:addons/stock/wizard/stock_change_product_qty.py:78 #: code:addons/stock/wizard/stock_change_standard_price.py:107 @@ -2460,13 +2374,15 @@ msgid "Force Availability" msgstr "" #. module: stock -#: model:ir.actions.act_window,name:stock.move_scrap view:stock.move.scrap:0 +#: model:ir.actions.act_window,name:stock.move_scrap +#: view:stock.move.scrap:0 msgid "Scrap Move" msgstr "" #. module: stock #: model:ir.actions.act_window,name:stock.action_reception_picking_move -#: model:ir.ui.menu,name:stock.menu_action_pdct_in view:stock.move:0 +#: model:ir.ui.menu,name:stock.menu_action_pdct_in +#: view:stock.move:0 msgid "Receive Products" msgstr "" @@ -2482,7 +2398,8 @@ msgid "View Stock of Products" msgstr "" #. module: stock -#: view:report.stock.inventory:0 view:report.stock.move:0 +#: view:report.stock.inventory:0 +#: view:report.stock.move:0 #: field:report.stock.move,month:0 msgid "Month" msgstr "" @@ -2509,8 +2426,7 @@ msgstr "" #. module: stock #: help:stock.tracking,active:0 -msgid "" -"By unchecking the active field, you may hide a pack without deleting it." +msgid "By unchecking the active field, you may hide a pack without deleting it." msgstr "" #. module: stock @@ -2529,30 +2445,34 @@ msgid "Todo" msgstr "" #. module: stock -#: view:report.stock.inventory:0 field:report.stock.inventory,company_id:0 -#: view:report.stock.move:0 field:report.stock.move,company_id:0 -#: field:stock.inventory,company_id:0 field:stock.inventory.line,company_id:0 -#: field:stock.location,company_id:0 field:stock.move,company_id:0 -#: field:stock.picking,company_id:0 field:stock.production.lot,company_id:0 +#: view:report.stock.inventory:0 +#: field:report.stock.inventory,company_id:0 +#: view:report.stock.move:0 +#: field:report.stock.move,company_id:0 +#: field:stock.inventory,company_id:0 +#: field:stock.inventory.line,company_id:0 +#: field:stock.location,company_id:0 +#: field:stock.move,company_id:0 +#: field:stock.picking,company_id:0 +#: field:stock.production.lot,company_id:0 #: field:stock.production.lot.revision,company_id:0 #: field:stock.warehouse,company_id:0 msgid "Company" msgstr "" #. module: stock -#: view:stock.move:0 view:stock.picking:0 -msgid "Unit Of Measure" +#: view:stock.picking:0 +msgid "Back Orders" msgstr "" #. module: stock #: code:addons/stock/product.py:121 #, python-format -msgid "" -"There is no stock input account defined for this product: \"%s\" (id: %d)" +msgid "There is no stock input account defined for this product: \"%s\" (id: %d)" msgstr "" #. module: stock -#: code:addons/stock/stock.py:2445 +#: code:addons/stock/stock.py:2454 #, python-format msgid "Can not consume a move with negative or zero quantity !" msgstr "" @@ -2569,18 +2489,19 @@ msgstr "" #. module: stock #: constraint:product.template:0 -msgid "" -"Error: The default UOM and the purchase UOM must be in the same category." +msgid "Error: The default UOM and the purchase UOM must be in the same category." msgstr "" #. module: stock -#: model:stock.location,name:stock.location_delivery_counter -msgid "Delivery Counter" +#: field:stock.production.lot.revision,date:0 +msgid "Revision Date" msgstr "" #. module: stock -#: view:report.stock.inventory:0 field:report.stock.inventory,prodlot_id:0 -#: view:stock.move:0 report:stock.picking.list:0 +#: view:report.stock.inventory:0 +#: field:report.stock.inventory,prodlot_id:0 +#: view:stock.move:0 +#: report:stock.picking.list:0 msgid "Lot" msgstr "" @@ -2590,7 +2511,7 @@ msgid "Production Lot Number" msgstr "" #. module: stock -#: code:addons/stock/stock.py:2697 +#: code:addons/stock/stock.py:2709 #, python-format msgid "Inventory '%s' is done." msgstr "" @@ -2601,7 +2522,7 @@ msgid "Quantity (UOS)" msgstr "" #. module: stock -#: code:addons/stock/stock.py:1743 +#: code:addons/stock/stock.py:1752 #, python-format msgid "You are moving %.2f %s products but only %.2f %s available in this lot." msgstr "" @@ -2622,7 +2543,8 @@ msgid "Back Order" msgstr "" #. module: stock -#: field:stock.incoterms,active:0 field:stock.location,active:0 +#: field:stock.incoterms,active:0 +#: field:stock.location,active:0 #: field:stock.tracking,active:0 msgid "Active" msgstr "" @@ -2633,7 +2555,7 @@ msgid "Properties" msgstr "" #. module: stock -#: code:addons/stock/stock.py:1082 +#: code:addons/stock/stock.py:1088 #, python-format msgid "Error, no partner !" msgstr "" @@ -2659,24 +2581,20 @@ msgid "stock.partial.picking.line" msgstr "" #. module: stock -#: report:lot.stock.overview:0 report:lot.stock.overview_all:0 +#: report:lot.stock.overview:0 +#: report:lot.stock.overview_all:0 #: report:stock.inventory.move:0 msgid "Total:" msgstr "" #. module: stock #: help:stock.incoterms,name:0 -msgid "" -"Incoterms are series of sales terms.They are used to divide transaction " -"costs and responsibilities between buyer and seller and reflect state-of-the-" -"art transportation practices." +msgid "Incoterms are series of sales terms.They are used to divide transaction costs and responsibilities between buyer and seller and reflect state-of-the-art transportation practices." msgstr "" #. module: stock #: help:stock.fill.inventory,recursive:0 -msgid "" -"If checked, products contained in child locations of selected location will " -"be included as well." +msgid "If checked, products contained in child locations of selected location will be included as well." msgstr "" #. module: stock @@ -2685,7 +2603,7 @@ msgid "Inventory Reference" msgstr "" #. module: stock -#: code:addons/stock/stock.py:1334 +#: code:addons/stock/stock.py:1343 #, python-format msgid "Internal picking" msgstr "" @@ -2701,7 +2619,8 @@ msgid "To" msgstr "" #. module: stock -#: view:stock.move:0 view:stock.picking:0 +#: view:stock.move:0 +#: view:stock.picking:0 msgid "Process" msgstr "" @@ -2713,7 +2632,8 @@ msgstr "" #. module: stock #: model:ir.model,name:stock.model_stock_warehouse #: model:ir.ui.menu,name:stock.menu_stock_root -#: field:product.product,warehouse_id:0 view:stock.warehouse:0 +#: field:product.product,warehouse_id:0 +#: view:stock.warehouse:0 msgid "Warehouse" msgstr "" @@ -2733,10 +2653,15 @@ msgid "Customers Packings" msgstr "" #. module: stock -#: selection:report.stock.inventory,state:0 view:report.stock.move:0 -#: selection:report.stock.move,state:0 selection:stock.inventory,state:0 -#: view:stock.move:0 selection:stock.move,state:0 view:stock.picking:0 +#: selection:report.stock.inventory,state:0 +#: view:report.stock.move:0 +#: selection:report.stock.move,state:0 +#: selection:stock.inventory,state:0 +#: view:stock.move:0 +#: selection:stock.move,state:0 +#: view:stock.picking:0 #: selection:stock.picking,state:0 +#: report:stock.picking.list:0 msgid "Done" msgstr "" @@ -2763,10 +2688,9 @@ msgid "Date done" msgstr "" #. module: stock -#: code:addons/stock/stock.py:1083 +#: code:addons/stock/stock.py:1089 #, python-format -msgid "" -"Please put a partner on the picking list if you want to generate invoice." +msgid "Please put a partner on the picking list if you want to generate invoice." msgstr "" #. module: stock @@ -2805,17 +2729,23 @@ msgstr "" #. module: stock #: model:ir.model,name:stock.model_product_product -#: view:report.stock.inventory:0 field:report.stock.inventory,product_id:0 -#: field:report.stock.lines.date,product_id:0 view:report.stock.move:0 +#: view:report.stock.inventory:0 +#: field:report.stock.inventory,product_id:0 +#: field:report.stock.lines.date,product_id:0 +#: view:report.stock.move:0 #: field:report.stock.move,product_id:0 #: field:stock.change.product.qty,product_id:0 #: field:stock.inventory.line,product_id:0 -#: field:stock.inventory.line.split,product_id:0 report:stock.inventory.move:0 -#: view:stock.move:0 field:stock.move,product_id:0 -#: field:stock.move.consume,product_id:0 field:stock.move.scrap,product_id:0 +#: field:stock.inventory.line.split,product_id:0 +#: report:stock.inventory.move:0 +#: view:stock.move:0 +#: field:stock.move,product_id:0 +#: field:stock.move.consume,product_id:0 +#: field:stock.move.scrap,product_id:0 #: field:stock.move.split,product_id:0 #: field:stock.partial.move.line,product_id:0 -#: field:stock.partial.picking.line,product_id:0 view:stock.production.lot:0 +#: field:stock.partial.picking.line,product_id:0 +#: view:stock.production.lot:0 #: field:stock.production.lot,product_id:0 #: field:stock.report.prodlots,product_id:0 #: field:stock.report.tracklots,product_id:0 @@ -2839,8 +2769,9 @@ msgid "Assigned Internal Moves" msgstr "" #. module: stock -#: code:addons/stock/stock.py:2379 code:addons/stock/stock.py:2440 -#: code:addons/stock/wizard/stock_partial_picking.py:141 +#: code:addons/stock/stock.py:2388 +#: code:addons/stock/stock.py:2449 +#: code:addons/stock/wizard/stock_partial_picking.py:142 #, python-format msgid "Please provide Proper Quantity !" msgstr "" @@ -2862,7 +2793,7 @@ msgid "Consume Products" msgstr "" #. module: stock -#: code:addons/stock/stock.py:1742 +#: code:addons/stock/stock.py:1751 #, python-format msgid "Insufficient Stock in Lot !" msgstr "" @@ -2878,7 +2809,8 @@ msgid "Address" msgstr "" #. module: stock -#: report:lot.stock.overview:0 report:lot.stock.overview_all:0 +#: report:lot.stock.overview:0 +#: report:lot.stock.overview_all:0 msgid "Variants" msgstr "" @@ -2888,12 +2820,8 @@ msgid "Corridor (X)" msgstr "" #. module: stock -#: model:stock.location,name:stock.stock_location_suppliers -msgid "Suppliers" -msgstr "" - -#. module: stock -#: field:report.stock.inventory,value:0 field:report.stock.move,value:0 +#: field:report.stock.inventory,value:0 +#: field:report.stock.move,value:0 msgid "Total Value" msgstr "" @@ -2935,20 +2863,9 @@ msgstr "" msgid "Include children" msgstr "" -#. module: stock -#: model:stock.location,name:stock.stock_location_components -msgid "Shelf 1" -msgstr "" - #. module: stock #: model:ir.actions.act_window,help:stock.action_picking_tree6 -msgid "" -"Internal Moves display all inventory operations you have to perform in your " -"warehouse. All operations can be categorized into stock journals, so that " -"each worker has his own list of operations to perform in his own journal. " -"Most operations are prepared automatically by OpenERP according to your " -"preconfigured logistics rules, but you can also record manual stock " -"operations." +msgid "Internal Moves display all inventory operations you have to perform in your warehouse. All operations can be categorized into stock journals, so that each worker has his own list of operations to perform in his own journal. Most operations are prepared automatically by OpenERP according to your preconfigured logistics rules, but you can also record manual stock operations." msgstr "" #. module: stock @@ -2967,9 +2884,11 @@ msgid "Pack Reference" msgstr "" #. module: stock -#: view:report.stock.move:0 field:report.stock.move,location_id:0 +#: view:report.stock.move:0 +#: field:report.stock.move,location_id:0 #: field:stock.inventory.line.split,location_id:0 -#: field:stock.move,location_id:0 field:stock.move.split,location_id:0 +#: field:stock.move,location_id:0 +#: field:stock.move.split,location_id:0 msgid "Source Location" msgstr "" @@ -2989,13 +2908,14 @@ msgid "Manager" msgstr "" #. module: stock -#: report:stock.picking.list:0 -msgid "Total" +#: view:stock.move:0 +#: view:stock.picking:0 +msgid "Unit Of Measure" msgstr "" #. module: stock -#: model:stock.location,name:stock.stock_location_intermediatelocation0 -msgid "Internal Shippings" +#: report:stock.picking.list:0 +msgid "Total" msgstr "" #. module: stock @@ -3009,13 +2929,15 @@ msgid "Virtual Stock Value" msgstr "" #. module: stock -#: view:product.product:0 view:stock.inventory.line.split:0 +#: view:product.product:0 +#: view:stock.inventory.line.split:0 #: view:stock.move.split:0 msgid "Lots" msgstr "" #. module: stock -#: view:stock.move:0 view:stock.picking:0 +#: view:stock.move:0 +#: view:stock.picking:0 msgid "New pack" msgstr "" @@ -3030,15 +2952,13 @@ msgid "All at once" msgstr "" #. module: stock -#: code:addons/stock/stock.py:1698 +#: code:addons/stock/stock.py:1707 #, python-format -msgid "" -"Quantities, UoMs, Products and Locations cannot be modified on stock moves " -"that have already been processed (except by the Administrator)" +msgid "Quantities, UoMs, Products and Locations cannot be modified on stock moves that have already been processed (except by the Administrator)" msgstr "" #. module: stock -#: code:addons/stock/product.py:445 +#: code:addons/stock/product.py:449 #, python-format msgid "Future Productions" msgstr "" @@ -3075,7 +2995,8 @@ msgid "Moves for this production lot" msgstr "" #. module: stock -#: view:stock.move:0 view:stock.picking:0 +#: view:stock.move:0 +#: view:stock.picking:0 msgid "Put in current pack" msgstr "" @@ -3089,11 +3010,6 @@ msgstr "" msgid "Reason" msgstr "" -#. module: stock -#: model:product.template,name:stock.product_icecream_product_template -msgid "Ice Cream" -msgstr "" - #. module: stock #: model:ir.model,name:stock.model_stock_partial_picking msgid "Partial Picking Processing Wizard" @@ -3101,13 +3017,7 @@ msgstr "" #. module: stock #: model:ir.actions.act_window,help:stock.action_production_lot_form -msgid "" -"This is the list of all the production lots (serial numbers) you recorded. " -"When you select a lot, you can get the upstream or downstream traceability " -"of the products contained in lot. By default, the list is filtred on the " -"serial numbers that are available in your warehouse but you can uncheck the " -"'Available' button to get all the lots you produced, received or delivered " -"to customers." +msgid "This is the list of all the production lots (serial numbers) you recorded. When you select a lot, you can get the upstream or downstream traceability of the products contained in lot. By default, the list is filtred on the serial numbers that are available in your warehouse but you can uncheck the 'Available' button to get all the lots you produced, received or delivered to customers." msgstr "" #. module: stock @@ -3116,7 +3026,8 @@ msgid "Icon" msgstr "" #. module: stock -#: code:addons/stock/stock.py:2311 code:addons/stock/stock.py:2726 +#: code:addons/stock/stock.py:2320 +#: code:addons/stock/stock.py:2738 #, python-format msgid "UserError" msgstr "" @@ -3130,34 +3041,33 @@ msgid "Tracking" msgstr "" #. module: stock -#: view:stock.inventory.line.split:0 view:stock.move.consume:0 -#: view:stock.move.scrap:0 view:stock.move.split:0 view:stock.split.into:0 +#: view:stock.inventory.line.split:0 +#: view:stock.move.consume:0 +#: view:stock.move.scrap:0 +#: view:stock.move.split:0 +#: view:stock.split.into:0 msgid "Ok" msgstr "" #. module: stock #: help:product.category,property_stock_account_output_categ:0 -msgid "" -"When doing real-time inventory valuation, counterpart journal items for all " -"outgoing stock moves will be posted in this account, unless there is a " -"specific valuation account set on the destination location. This is the " -"default value for all products in this category. It can also directly be set " -"on each product" +msgid "When doing real-time inventory valuation, counterpart journal items for all outgoing stock moves will be posted in this account, unless there is a specific valuation account set on the destination location. This is the default value for all products in this category. It can also directly be set on each product" msgstr "" #. module: stock -#: model:stock.location,name:stock.stock_location_8 -msgid "Non European Customers" -msgstr "" - -#. module: stock -#: code:addons/stock/product.py:75 code:addons/stock/product.py:89 -#: code:addons/stock/product.py:92 code:addons/stock/product.py:99 -#: code:addons/stock/product.py:120 code:addons/stock/product.py:146 -#: code:addons/stock/stock.py:2116 code:addons/stock/stock.py:2119 -#: code:addons/stock/stock.py:2122 code:addons/stock/stock.py:2125 -#: code:addons/stock/stock.py:2128 code:addons/stock/stock.py:2131 -#: code:addons/stock/stock.py:2445 +#: code:addons/stock/product.py:75 +#: code:addons/stock/product.py:89 +#: code:addons/stock/product.py:92 +#: code:addons/stock/product.py:99 +#: code:addons/stock/product.py:120 +#: code:addons/stock/product.py:146 +#: code:addons/stock/stock.py:2125 +#: code:addons/stock/stock.py:2128 +#: code:addons/stock/stock.py:2131 +#: code:addons/stock/stock.py:2134 +#: code:addons/stock/stock.py:2137 +#: code:addons/stock/stock.py:2140 +#: code:addons/stock/stock.py:2454 #: code:addons/stock/wizard/stock_fill_inventory.py:47 #: code:addons/stock/wizard/stock_splitinto.py:49 #: code:addons/stock/wizard/stock_splitinto.py:53 @@ -3172,8 +3082,10 @@ msgstr "" #. module: stock #: selection:report.stock.inventory,state:0 -#: selection:report.stock.move,state:0 selection:stock.inventory,state:0 -#: selection:stock.move,state:0 selection:stock.picking,state:0 +#: selection:report.stock.move,state:0 +#: selection:stock.inventory,state:0 +#: selection:stock.move,state:0 +#: selection:stock.picking,state:0 msgid "Cancelled" msgstr "" @@ -3183,7 +3095,8 @@ msgid "Confirmed Delivery Orders" msgstr "" #. module: stock -#: view:stock.move:0 field:stock.partial.move,picking_id:0 +#: view:stock.move:0 +#: field:stock.partial.move,picking_id:0 #: field:stock.partial.picking,picking_id:0 msgid "Picking" msgstr "" @@ -3208,44 +3121,34 @@ msgstr "" #. module: stock #: help:stock.location,chained_location_type:0 -msgid "" -"Determines whether this location is chained to another location, i.e. any " -"incoming product in this location \n" -"should next go to the chained location. The chained location is determined " -"according to the type :\n" +msgid "Determines whether this location is chained to another location, i.e. any incoming product in this location \n" +"should next go to the chained location. The chained location is determined according to the type :\n" "* None: No chaining at all\n" -"* Customer: The chained location will be taken from the Customer Location " -"field on the Partner form of the Partner that is specified in the Picking " -"list of the incoming products.\n" -"* Fixed Location: The chained location is taken from the next field: Chained " -"Location if Fixed." +"* Customer: The chained location will be taken from the Customer Location field on the Partner form of the Partner that is specified in the Picking list of the incoming products.\n" +"* Fixed Location: The chained location is taken from the next field: Chained Location if Fixed." msgstr "" #. module: stock #: code:addons/stock/wizard/stock_inventory_merge.py:43 #: code:addons/stock/wizard/stock_inventory_merge.py:63 -#: code:addons/stock/wizard/stock_partial_picking.py:148 -#: code:addons/stock/wizard/stock_partial_picking.py:159 +#: code:addons/stock/wizard/stock_partial_picking.py:149 +#: code:addons/stock/wizard/stock_partial_picking.py:160 #, python-format msgid "Warning" msgstr "" #. module: stock -#: code:addons/stock/stock.py:1348 +#: code:addons/stock/stock.py:1357 #, python-format msgid "is done." msgstr "" -#. module: stock -#: field:stock.production.lot.revision,date:0 -msgid "Revision Date" -msgstr "" - #. module: stock #: view:board.board:0 #: model:ir.actions.act_window,name:stock.action_outgoing_product_board #: model:ir.actions.act_window,name:stock.action_picking_tree -#: model:ir.ui.menu,name:stock.menu_action_picking_tree view:stock.picking:0 +#: model:ir.ui.menu,name:stock.menu_action_picking_tree +#: view:stock.picking:0 msgid "Delivery Orders" msgstr "" @@ -3256,14 +3159,13 @@ msgstr "" #. module: stock #: help:res.partner,property_stock_customer:0 -msgid "" -"This stock location will be used, instead of the default one, as the " -"destination location for goods you send to this partner" +msgid "This stock location will be used, instead of the default one, as the destination location for goods you send to this partner" msgstr "" #. module: stock #: selection:report.stock.inventory,state:0 -#: selection:report.stock.move,state:0 selection:stock.inventory,state:0 +#: selection:report.stock.move,state:0 +#: selection:stock.inventory,state:0 #: view:stock.picking:0 msgid "Confirmed" msgstr "" @@ -3296,8 +3198,7 @@ msgstr "" #. module: stock #: help:stock.location,scrap_location:0 -msgid "" -"Check this box to allow using this location to put scrapped/damaged goods." +msgid "Check this box to allow using this location to put scrapped/damaged goods." msgstr "" #. module: stock @@ -3316,19 +3217,23 @@ msgid "Total outgoing quantity" msgstr "" #. module: stock -#: selection:stock.move,state:0 selection:stock.picking,state:0 +#: selection:stock.move,state:0 +#: selection:stock.picking,state:0 +#: report:stock.picking.list:0 msgid "New" msgstr "" #. module: stock -#: help:stock.partial.move.line,cost:0 help:stock.partial.picking.line,cost:0 +#: help:stock.partial.move.line,cost:0 +#: help:stock.partial.picking.line,cost:0 msgid "Unit Cost for this product line" msgstr "" #. module: stock #: model:ir.model,name:stock.model_product_category #: view:report.stock.inventory:0 -#: field:report.stock.inventory,product_categ_id:0 view:report.stock.move:0 +#: field:report.stock.inventory,product_categ_id:0 +#: view:report.stock.move:0 #: field:report.stock.move,categ_id:0 msgid "Product Category" msgstr "" @@ -3339,7 +3244,7 @@ msgid "Reporting" msgstr "" #. module: stock -#: code:addons/stock/stock.py:1343 +#: code:addons/stock/stock.py:1352 #, python-format msgid " for the " msgstr "" @@ -3383,12 +3288,8 @@ msgstr "" #. module: stock #: help:stock.change.standard.price,new_price:0 -msgid "" -"If cost price is increased, stock variation account will be debited and " -"stock output account will be credited with the value = (difference of amount " -"* quantity available).\n" -"If cost price is decreased, stock variation account will be creadited and " -"stock input account will be debited." +msgid "If cost price is increased, stock variation account will be debited and stock output account will be credited with the value = (difference of amount * quantity available).\n" +"If cost price is decreased, stock variation account will be creadited and stock input account will be debited." msgstr "" #. module: stock @@ -3397,12 +3298,7 @@ msgid "Chaining Journal" msgstr "" #. module: stock -#: model:ir.actions.report.xml,name:stock.report_picking_list -msgid "Packing list" -msgstr "" - -#. module: stock -#: code:addons/stock/stock.py:738 +#: code:addons/stock/stock.py:744 #, python-format msgid "Not enough stock, unable to reserve the products." msgstr "" @@ -3413,12 +3309,14 @@ msgid "Customers" msgstr "" #. module: stock -#: selection:stock.move,state:0 selection:stock.picking,state:0 +#: selection:stock.move,state:0 +#: selection:stock.picking,state:0 +#: report:stock.picking.list:0 msgid "Waiting Availability" msgstr "" #. module: stock -#: code:addons/stock/stock.py:1347 +#: code:addons/stock/stock.py:1356 #, python-format msgid "is cancelled." msgstr "" @@ -3434,7 +3332,7 @@ msgid "Waiting " msgstr "" #. module: stock -#: code:addons/stock/product.py:427 +#: code:addons/stock/product.py:431 #, python-format msgid "Future Deliveries" msgstr "" @@ -3445,12 +3343,14 @@ msgid "Additional info" msgstr "" #. module: stock -#: view:stock.move:0 field:stock.move,tracking_id:0 +#: view:stock.move:0 +#: field:stock.move,tracking_id:0 msgid "Pack" msgstr "" #. module: stock -#: view:stock.move:0 view:stock.picking:0 +#: view:stock.move:0 +#: view:stock.picking:0 msgid "Date Expected" msgstr "" @@ -3481,10 +3381,7 @@ msgstr "" #. module: stock #: model:ir.actions.act_window,help:stock.action_move_form2 -msgid "" -"This menu gives you the full traceability of inventory operations on a " -"specific product. You can filter on the product to see all the past or " -"future movements for the product." +msgid "This menu gives you the full traceability of inventory operations on a specific product. You can filter on the product to see all the past or future movements for the product." msgstr "" #. module: stock @@ -3499,9 +3396,7 @@ msgstr "" #. module: stock #: help:stock.move,price_currency_id:0 -msgid "" -"Technical field used to record the currency chosen by the user during a " -"picking confirmation (when average price costing method is used)" +msgid "Technical field used to record the currency chosen by the user during a picking confirmation (when average price costing method is used)" msgstr "" #. module: stock @@ -3530,19 +3425,16 @@ msgstr "" msgid "Auto-Picking" msgstr "" -#. module: stock -#: model:stock.location,name:stock.stock_location_shop1 -msgid "Shop 2" -msgstr "" - #. module: stock #: field:stock.location,chained_auto_packing:0 msgid "Chaining Type" msgstr "" #. module: stock -#: view:report.stock.inventory:0 view:report.stock.move:0 -#: selection:report.stock.move,type:0 view:stock.location:0 +#: view:report.stock.inventory:0 +#: view:report.stock.move:0 +#: selection:report.stock.move,type:0 +#: view:stock.location:0 #: selection:stock.location,chained_picking_type:0 #: selection:stock.picking,type:0 msgid "Internal" @@ -3550,7 +3442,8 @@ msgstr "" #. module: stock #: selection:report.stock.inventory,state:0 -#: selection:report.stock.move,state:0 selection:stock.inventory,state:0 +#: selection:report.stock.move,state:0 +#: selection:stock.inventory,state:0 msgid "Draft" msgstr "" @@ -3562,8 +3455,7 @@ msgstr "" #. module: stock #: help:report.stock.inventory,state:0 -msgid "" -"When the stock move is created it is in the 'Draft' state.\n" +msgid "When the stock move is created it is in the 'Draft' state.\n" " After that it is set to 'Confirmed' state.\n" " If stock is available state is set to 'Avaiable'.\n" " When the picking it done the state is 'Done'. \n" @@ -3576,20 +3468,18 @@ msgid "Create Invoice" msgstr "" #. module: stock -#: code:addons/stock/wizard/stock_return_picking.py:189 +#: code:addons/stock/wizard/stock_return_picking.py:197 #, python-format msgid "Please specify at least one non-zero quantity!" msgstr "" #. module: stock #: help:product.template,property_stock_procurement:0 -msgid "" -"For the current product, this stock location will be used, instead of the " -"default one, as the source location for stock moves generated by procurements" +msgid "For the current product, this stock location will be used, instead of the default one, as the source location for stock moves generated by procurements" msgstr "" #. module: stock -#: code:addons/stock/stock.py:1346 +#: code:addons/stock/stock.py:1355 #, python-format msgid "is ready to process." msgstr "" @@ -3599,6 +3489,11 @@ msgstr "" msgid "Reference of the document that produced this picking." msgstr "" +#. module: stock +#: help:stock.location,chained_company_id:0 +msgid "Picking List containing the chained move will belong to this company ( leave empty to use the default company determination rules )." +msgstr "" + #. module: stock #: field:stock.fill.inventory,set_stock_zero:0 msgid "Set to zero" @@ -3621,13 +3516,14 @@ msgid "November" msgstr "" #. module: stock -#: code:addons/stock/product.py:100 code:addons/stock/stock.py:2128 +#: code:addons/stock/product.py:100 +#: code:addons/stock/stock.py:2137 #, python-format msgid "There is no journal defined on the product category: \"%s\" (id: %d)" msgstr "" #. module: stock -#: code:addons/stock/product.py:441 +#: code:addons/stock/product.py:445 #, python-format msgid "Unplanned Qty" msgstr "" @@ -3650,9 +3546,7 @@ msgstr "" #. module: stock #: help:product.product,track_incoming:0 -msgid "" -"Forces to specify a Production Lot for all moves containing this product and " -"coming from a Supplier Location" +msgid "Forces to specify a Production Lot for all moves containing this product and coming from a Supplier Location" msgstr "" #. module: stock @@ -3666,14 +3560,15 @@ msgid "Move History (parent moves)" msgstr "" #. module: stock -#: code:addons/stock/product.py:423 +#: code:addons/stock/product.py:427 #, python-format msgid "Future Stock" msgstr "" #. module: stock -#: code:addons/stock/stock.py:513 code:addons/stock/stock.py:1149 -#: code:addons/stock/stock.py:1157 +#: code:addons/stock/stock.py:519 +#: code:addons/stock/stock.py:1158 +#: code:addons/stock/stock.py:1166 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112 #, python-format msgid "Error" @@ -3686,10 +3581,7 @@ msgstr "" #. module: stock #: model:ir.actions.act_window,help:stock.action_location_tree -msgid "" -"This is the structure of your company's warehouses and locations. You can " -"click on a location to get the list of the products and their stock level in " -"this particular location and all its children." +msgid "This is the structure of your company's warehouses and locations. You can click on a location to get the list of the products and their stock level in this particular location and all its children." msgstr "" #. module: stock @@ -3698,18 +3590,23 @@ msgstr "" #: field:stock.inventory.line,prod_lot_id:0 #: field:stock.inventory.line.split.lines,name:0 #: field:stock.inventory.line.split.lines,prodlot_id:0 -#: report:stock.inventory.move:0 field:stock.move,prodlot_id:0 +#: report:stock.inventory.move:0 +#: field:stock.move,prodlot_id:0 #: field:stock.move.split.lines,name:0 #: field:stock.move.split.lines,prodlot_id:0 #: field:stock.partial.move.line,prodlot_id:0 -#: field:stock.partial.picking.line,prodlot_id:0 view:stock.production.lot:0 +#: field:stock.partial.picking.line,prodlot_id:0 +#: view:stock.production.lot:0 #: field:stock.production.lot,name:0 msgid "Production Lot" msgstr "" #. module: stock -#: model:ir.ui.menu,name:stock.menu_traceability view:stock.move:0 -#: view:stock.picking:0 view:stock.production.lot:0 view:stock.tracking:0 +#: model:ir.ui.menu,name:stock.menu_traceability +#: view:stock.move:0 +#: view:stock.picking:0 +#: view:stock.production.lot:0 +#: view:stock.tracking:0 msgid "Traceability" msgstr "" @@ -3720,7 +3617,8 @@ msgstr "" #. module: stock #: model:ir.actions.act_window,name:stock.action_location_form -#: model:ir.ui.menu,name:stock.menu_action_location_form view:stock.picking:0 +#: model:ir.ui.menu,name:stock.menu_action_location_form +#: view:stock.picking:0 msgid "Locations" msgstr "" @@ -3737,28 +3635,24 @@ msgstr "" #. module: stock #: code:addons/stock/wizard/stock_splitinto.py:53 #, python-format -msgid "" -"Total quantity after split exceeds the quantity to split for this product: " -"\"%s\" (id: %d)" +msgid "Total quantity after split exceeds the quantity to split for this product: \"%s\" (id: %d)" msgstr "" #. module: stock #: help:product.template,property_stock_account_input:0 -msgid "" -"When doing real-time inventory valuation, counterpart journal items for all " -"incoming stock moves will be posted in this account, unless there is a " -"specific valuation account set on the source location. When not set on the " -"product, the one from the product category is used." +msgid "When doing real-time inventory valuation, counterpart journal items for all incoming stock moves will be posted in this account, unless there is a specific valuation account set on the source location. When not set on the product, the one from the product category is used." msgstr "" #. module: stock -#: view:stock.move:0 field:stock.partial.move,move_ids:0 +#: view:stock.move:0 +#: field:stock.partial.move,move_ids:0 #: field:stock.return.picking,product_return_moves:0 msgid "Moves" msgstr "" #. module: stock -#: view:report.stock.move:0 field:report.stock.move,location_dest_id:0 +#: view:report.stock.move:0 +#: field:report.stock.move,location_dest_id:0 #: field:stock.partial.move.line,location_dest_id:0 #: field:stock.partial.picking.line,location_dest_id:0 #: field:stock.picking,location_dest_id:0 @@ -3767,8 +3661,7 @@ msgstr "" #. module: stock #: help:stock.move,product_packaging:0 -msgid "" -"It specifies attributes of packaging like type, quantity of packaging,etc." +msgid "It specifies attributes of packaging like type, quantity of packaging,etc." msgstr "" #. module: stock @@ -3801,9 +3694,7 @@ msgstr "" #. module: stock #: code:addons/stock/wizard/stock_return_picking.py:106 #, python-format -msgid "" -"There are no products to return (only lines in Done state and not fully " -"returned yet can be returned)!" +msgid "There are no products to return (only lines in Done state and not fully returned yet can be returned)!" msgstr "" #. module: stock @@ -3828,7 +3719,8 @@ msgid "Real" msgstr "" #. module: stock -#: report:stock.picking.list:0 view:stock.production.lot.revision:0 +#: report:stock.picking.list:0 +#: view:stock.production.lot.revision:0 #: field:stock.production.lot.revision,description:0 msgid "Description" msgstr "" @@ -3840,7 +3732,8 @@ msgid "May" msgstr "" #. module: stock -#: model:ir.actions.act_window,name:stock.action5 view:stock.tracking:0 +#: model:ir.actions.act_window,name:stock.action5 +#: view:stock.tracking:0 msgid "Upstream traceability" msgstr "" @@ -3851,7 +3744,7 @@ msgid "Location Content" msgstr "" #. module: stock -#: code:addons/stock/product.py:447 +#: code:addons/stock/product.py:451 #, python-format msgid "Produced Qty" msgstr "" @@ -3874,7 +3767,8 @@ msgid "Stock report by production lots" msgstr "" #. module: stock -#: view:stock.location:0 selection:stock.location,chained_location_type:0 +#: view:stock.location:0 +#: selection:stock.location,chained_location_type:0 #: view:stock.move:0 msgid "Customer" msgstr "" @@ -3891,17 +3785,8 @@ msgid "Production Lot Identification" msgstr "" #. module: stock -#: model:stock.location,name:stock.location_refrigerator_small -msgid "Small Refrigerator" -msgstr "" - -#. module: stock -#: model:stock.location,name:stock.location_convenience_shop -msgid "Convenient Store" -msgstr "" - -#. module: stock -#: field:stock.location,scrap_location:0 view:stock.move.scrap:0 +#: field:stock.location,scrap_location:0 +#: view:stock.move.scrap:0 msgid "Scrap Location" msgstr "" @@ -3912,7 +3797,8 @@ msgid "April" msgstr "" #. module: stock -#: view:report.stock.inventory:0 view:stock.move:0 +#: view:report.stock.inventory:0 +#: view:stock.move:0 msgid "Future" msgstr "" @@ -3922,13 +3808,13 @@ msgid "Invoiced date" msgstr "" #. module: stock -#: code:addons/stock/stock.py:738 +#: code:addons/stock/stock.py:744 #: code:addons/stock/wizard/stock_fill_inventory.py:116 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98 #: code:addons/stock/wizard/stock_return_picking.py:99 #: code:addons/stock/wizard/stock_return_picking.py:106 -#: code:addons/stock/wizard/stock_return_picking.py:189 +#: code:addons/stock/wizard/stock_return_picking.py:197 #, python-format msgid "Warning !" msgstr "" @@ -3940,9 +3826,7 @@ msgstr "" #. module: stock #: help:stock.tracking,name:0 -msgid "" -"By default, the pack reference is generated following the sscc standard. " -"(Serial number + 1 check digit)" +msgid "By default, the pack reference is generated following the sscc standard. (Serial number + 1 check digit)" msgstr "" #. module: stock @@ -3951,19 +3835,15 @@ msgid "Error ! You cannot create recursive associated members." msgstr "" #. module: stock -#: code:addons/stock/wizard/stock_partial_picking.py:159 +#: code:addons/stock/wizard/stock_partial_picking.py:160 #, python-format -msgid "" -"The rounding of the initial uom does not allow you to ship \"%s %s\", as it " -"would let a quantity of \"%s %s\" to ship and only roundings of \"%s %s\" is " -"accepted by the uom." +msgid "The rounding of the initial uom does not allow you to ship \"%s %s\", as it would let a quantity of \"%s %s\" to ship and only roundings of \"%s %s\" is accepted by the uom." msgstr "" #. module: stock #: code:addons/stock/wizard/stock_move.py:213 #, python-format -msgid "" -"Production lot quantity %d of %s is larger than available quantity (%d) !" +msgid "Production lot quantity %d of %s is larger than available quantity (%d) !" msgstr "" #. module: stock @@ -3977,8 +3857,10 @@ msgid "Optional: next stock move when chaining them" msgstr "" #. module: stock -#: view:report.stock.inventory:0 field:report.stock.inventory,year:0 -#: view:report.stock.move:0 field:report.stock.move,year:0 +#: view:report.stock.inventory:0 +#: field:report.stock.inventory,year:0 +#: view:report.stock.move:0 +#: field:report.stock.move,year:0 msgid "Year" msgstr "" @@ -3988,12 +3870,15 @@ msgid "Physical Locations" msgstr "" #. module: stock -#: view:stock.picking:0 selection:stock.picking,state:0 +#: view:stock.picking:0 +#: selection:stock.picking,state:0 msgid "Ready to Process" msgstr "" #. module: stock -#: help:stock.location,posx:0 help:stock.location,posy:0 +#: help:stock.location,posx:0 +#: help:stock.location,posy:0 #: help:stock.location,posz:0 msgid "Optional localization details, for information purpose only" msgstr "" + From b6735a8442871ed49ecf233d8656b9fd02730c5a Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Mon, 24 Sep 2012 15:56:35 +0200 Subject: [PATCH 13/18] UNdoing changes that should not be in this branch bzr revid: cbi@openerp.com-20120924135635-nohqubjlt0g0jpu4 --- addons/account/account.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 1da45c51d14..72ce11f05ea 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1097,8 +1097,8 @@ class account_period(osv.osv): raise osv.except_osv(_('Error'), _('Start period should be smaller then End period')) #for period from = january, we want to exclude the opening period (but it has same date_from, so we have to check if period_from is special or not to include that clause or not in the search). if period_from.special: - return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop)]) - return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('special', '=', False)]) + return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id)]) + return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id), ('special', '=', False)]) account_period() From aac4cf3dc5e784849412d59fbea32c8d29703e3d Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Mon, 24 Sep 2012 16:02:33 +0200 Subject: [PATCH 14/18] [Fix] More unwanted changes bzr revid: cbi@openerp.com-20120924140233-al6zsb2u46nh1k75 --- addons/mail/mail_message.py | 2 - addons/project_issue/project_issue.py | 19 ++++++- addons/resource/resource.py | 79 +++++++++++---------------- 3 files changed, 48 insertions(+), 52 deletions(-) diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index 295056c66eb..b69869efa11 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -536,11 +536,9 @@ class mail_message(osv.osv): if res: message.write({'state':'sent', 'message_id': res}) message_sent = True - print "SENT" else: message.write({'state':'exception'}) message_sent = False - print "NOT SENT" # if auto_delete=True then delete that sent messages as well as attachments if message_sent and message.auto_delete: diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index a099f30f561..f0d78f53dfc 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -142,12 +142,27 @@ class project_issue(crm.crm_case, osv.osv): resource_ids = res_obj.search(cr, uid, [('user_id','=',issue.user_id.id)]) if resource_ids and len(resource_ids): resource_id = resource_ids[0] - duration = float(ans.days) + float(ans.seconds)/(24*3600) + duration = float(ans.days) + if issue.project_id and issue.project_id.resource_calendar_id: + duration = float(ans.days) * 24 + + new_dates = cal_obj.interval_min_get(cr, uid, + issue.project_id.resource_calendar_id.id, + date_create, + duration, resource=resource_id) + no_days = [] + date_until = datetime.strptime(date_until, '%Y-%m-%d %H:%M:%S') + for in_time, out_time in new_dates: + if in_time.date not in no_days: + no_days.append(in_time.date) + if out_time > date_until: + break + duration = len(no_days) if field in ['working_hours_open','working_hours_close']: res[issue.id][field] = hours else: - res[issue.id][field] = duration + res[issue.id][field] = abs(float(duration)) return res diff --git a/addons/resource/resource.py b/addons/resource/resource.py index 7578bf2f3f1..fb3d8c0980e 100644 --- a/addons/resource/resource.py +++ b/addons/resource/resource.py @@ -28,7 +28,6 @@ from tools.translate import _ from itertools import groupby from operator import itemgetter -import pytz class resource_calendar(osv.osv): _name = "resource.calendar" @@ -200,7 +199,7 @@ class resource_calendar(osv.osv): res = self.interval_get_multi(cr, uid, [(dt_from.strftime('%Y-%m-%d %H:%M:%S'), hours, id)], resource, byday)[(dt_from.strftime('%Y-%m-%d %H:%M:%S'), hours, id)] return res - def interval_hours_get(self, cr, uid, id, dt_from, dt_to, resource=False, context=None): + def interval_hours_get(self, cr, uid, id, dt_from, dt_to, resource=False): """ Calculates the Total Working hours based on given start_date to end_date, If resource id is supplied that it will consider the source leaves also in calculating the hours. @@ -217,57 +216,41 @@ class resource_calendar(osv.osv): return 0.0 dt_leave = self._get_leaves(cr, uid, id, resource) hours = 0.0 - - orig_dt_from = dt_from - - users_obj = self.pool.get('res.users') - user = users_obj.browse(cr, uid, uid, context=context) - utc = pytz.timezone('UTC') - - if user.context_tz: - context_tz = pytz.timezone(user.context_tz) - else: - context_tz = utc - - # gap between UTC ans user timezone - tz_gap = (utc.localize(dt_from) - context_tz.localize(dt_from)).seconds / 3600 - - while dt_from <= dt_to: + + current_hour = dt_from.hour + + while (dt_from <= dt_to): cr.execute("select hour_from,hour_to from resource_calendar_attendance where dayofweek='%s' and calendar_id=%s order by hour_from", (dt_from.weekday(),id)) - slots = cr.fetchall() - - for (hour_from, hour_to) in slots: + der = cr.fetchall() + for (hour_from,hour_to) in der: + if hours != 0.0:#For first time of the loop only,hours will be 0 + current_hour = hour_from leave_flag = False - dt_check = dt_from.strftime('%Y-%m-%d') - for leave in dt_leave: - if dt_check == leave: - dt_check = datetime.strptime(dt_check, "%Y-%m-%d") + timedelta(days=1) - leave_flag = True - - if leave_flag: - break - else: - if dt_from.hour >= hour_to: - continue - elif dt_from.hour >= hour_from: - hour_from = dt_from.hour + dt_from.minute/60 + dt_from.second/3600 - d1 = datetime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(hour_from)), int((hour_from % 1) * 60)) - - if dt_from.day == dt_to.day and hour_from <= (dt_to.hour + tz_gap) < hour_to: - - hours += (utc.localize(dt_to) - context_tz.localize(d1)).seconds + if (hour_to>=current_hour): + dt_check = dt_from.strftime('%Y-%m-%d') + for leave in dt_leave: + if dt_check == leave: + dt_check = datetime.strptime(dt_check, "%Y-%m-%d") + timedelta(days=1) + leave_flag = True + + if leave_flag: break - elif dt_from == orig_dt_from: - d2 = datetime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(hour_to)), int((hour_to%1) * 60)) - hours += (context_tz.localize(d2) - utc.localize(d1)).seconds else: + d1 = dt_from d2 = datetime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(hour_to)), int((hour_to%1) * 60)) - hours += (d2 - d1).seconds - - dt_from += timedelta(days=1) - dt_from = datetime(dt_from.year, dt_from.month, dt_from.day) - - return hours / 3600 + + if hours != 0.0:#For first time of the loop only,hours will be 0 + d1 = datetime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(current_hour)), int((current_hour%1) * 60)) + + if dt_from.day == dt_to.day: + if hour_from <= dt_to.hour <= hour_to: + d2 = dt_to + dt_from = d2 + hours += (d2-d1).seconds + dt_from = datetime(dt_from.year, dt_from.month, dt_from.day, int(math.floor(current_hour)), int((current_hour%1) * 60)) + timedelta(days=1) + current_hour = 0.0 + + return (hours/3600) resource_calendar() From da7879638cc5fb5086943c8ae9941386bf73283b Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Tue, 25 Sep 2012 09:27:37 +0200 Subject: [PATCH 15/18] [FIX] changed an unsafe dictionary access into a get() call, this caused a test to fail bzr revid: cbi@openerp.com-20120925072737-bspeduh88b1zash3 --- addons/stock/report/product_stock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/report/product_stock.py b/addons/stock/report/product_stock.py index 59c60676895..be390fbf02a 100644 --- a/addons/stock/report/product_stock.py +++ b/addons/stock/report/product_stock.py @@ -102,7 +102,7 @@ class report_stock(report_int): qty = 0 io = StringIO.StringIO() - gt = stock_graph.stock_graph(io, context['lang'], cr) + gt = stock_graph.stock_graph(io, context.get('lang', 'en_US'), cr) for prod_id in products: gt.add(prod_id, names.get(prod_id, 'Unknown'), products[prod_id]) gt.draw() From dfe472f3ac0fdd5d452693f32281010ccbb449e9 Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Mon, 1 Oct 2012 10:56:39 +0200 Subject: [PATCH 16/18] [FIX] fixed some.rml files, updated some .sxw files bzr revid: cbi@openerp.com-20121001085639-cbwbx7pqtqaw41vf --- addons/account/report/account_aged_partner_balance.rml | 3 ++- addons/account/report/account_balance.rml | 8 +++++--- addons/account/report/account_general_journal.rml | 4 ++-- .../account/report/account_general_ledger_landscape.rml | 8 +++++--- addons/account/report/account_journal.rml | 4 ++-- addons/account/report/account_journal_sale_purchase.rml | 4 ++-- addons/account_payment/report/order.rml | 6 +++--- addons/stock/report/picking.rml | 9 ++++++--- 8 files changed, 27 insertions(+), 19 deletions(-) diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml index 787c7789495..a5211729579 100644 --- a/addons/account/report/account_aged_partner_balance.rml +++ b/addons/account/report/account_aged_partner_balance.rml @@ -166,7 +166,8 @@ Partners - [[ data['form']['direction_selection'] == 'future' and translate('Due') or translate('Not due') ]] + Due[[ data['form']['direction_selection'] == 'future' and ' ' or removeParentNode('para') + Not due[[ data['form']['direction_selection'] == 'past' and ' ' or removeParentNode('para') ]] [[ data['form']['4']['name'] ]] diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index 6a6375438ca..f532d7eb1d0 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -211,8 +211,8 @@ - [[ data['model']=='account.account' and 'Company'or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and translate('Chart of Accounts') or removeParentNode('para') ]] + Company[[ data['model']=='account.account' and ' ' or removeParentNode('para') ]] + Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]] Fiscal Year @@ -233,7 +233,9 @@ [[ get_fiscalyear(data) or '' ]] - [[ (data['form']['display_account']=='all' and 'All') or (data['form']['display_account']=='movement' and translate('With movements')) or translate('With balance is not equal to 0')]] + All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') ]] + With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') + With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') [[ not has_filter(data) and get_filter(data) or removeParentNode('para') ]] [[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml index 69cd931d29b..3c96f2e04af 100644 --- a/addons/account/report/account_general_journal.rml +++ b/addons/account/report/account_general_journal.rml @@ -220,8 +220,8 @@ - [[ data['model']=='account.journal.period' and translate('Company') or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and translate('Chart of Accounts') or removeParentNode('para') ]] + Company[[ data['model']=='account.journal.period'and ' ' or removeParentNode('para') ]] + Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]] Fiscal Year Journals Filter By [[ data['form']['filter']!='filter_no' and get_filter(data) ]] diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml index 8a6be8c4d46..35a6217db81 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -360,8 +360,8 @@ - [[ data['model']=='account.account' and translate('Company') or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and translate('Chart of Accounts') or removeParentNode('para') ]] + Company[[ data['model']=='account.account' and ' ' or removeParentNode('para') ]] + Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]] Fiscal Year @@ -395,7 +395,9 @@ [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] - [[ (data['form']['display_account']=='all' and translate('All')) or (data['form']['display_account']=='movement' and translate('With movements')) or translate('With balance is not equal to 0')]] + All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') + With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') + With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') [[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml index 407cc04c92d..117ff368bef 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -186,8 +186,8 @@ - [[ data['model']=='account.journal.period'and translate('Company') or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and translate('Chart of Accounts') or removeParentNode('para') ]] + Company[[ data['model']=='account.journal.period'and ' ' or removeParentNode('para') ]] + Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]] Fiscal Year Journal Period diff --git a/addons/account/report/account_journal_sale_purchase.rml b/addons/account/report/account_journal_sale_purchase.rml index 1b9c027fcea..a3fd8f0e97d 100644 --- a/addons/account/report/account_journal_sale_purchase.rml +++ b/addons/account/report/account_journal_sale_purchase.rml @@ -186,8 +186,8 @@ - [[ data['model']=='account.journal.period'and translate('Company') or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and translate('Chart of Accounts') or removeParentNode('para') ]] + Company[[ data['model']=='account.journal.period'and ' ' or removeParentNode('para') ]] + Chart of Accounts[[ data['model']=='ir.ui.menu' and ' ' or removeParentNode('para') ]] Fiscal Year Journal Period diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml index 208b340ef46..e93474827fa 100644 --- a/addons/account_payment/report/order.rml +++ b/addons/account_payment/report/order.rml @@ -205,9 +205,9 @@ [[get_account_name(o.mode.bank_id.id)]] - [[ o.date_prefered == 'now' and translate('Now') or removeParentNode('para') ]] - [[ o.date_prefered == 'due' and translate('Due date') or removeParentNode('para') ]] - [[ o.date_prefered == 'fixed' and translate('Fixed date') or removeParentNode('para') ]] + Now[[ o.date_prefered == 'now' and ' ' or removeParentNode('para') ]] + Due date[[ o.date_prefered == 'due' and ' ' or removeParentNode('para') ]] + Fixed date[[ o.date_prefered == 'fixed' and ' ' or removeParentNode('para') ]] [[ o.user_id and o.user_id.company_id and o.user_id.company_id.currency_id and o.user_id.company_id.currency_id.name or '' ]] diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index ea86e6ef6d3..7966d6efc6c 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -262,7 +262,9 @@ [[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]] - [[ move_lines.state == 'confirmed' and translate('Waiting Availability') or move_lines.state == 'done' and translate('Done') or move_lines.state == 'assigned' and translate('Available')]] + Waiting Availability[[ move_lines.state == 'confirmed' and ' ' or removeParentNode('para') ]] + Done[[ move_lines.state == 'done' and ' ' or removeParentNode('para') ]] + Available[[ move_lines.state == 'assigned' and ' ' or removeParentNode('para') ]] [[ (move_lines.location_id and move_lines.location_id.name) or '' ]] @@ -273,7 +275,7 @@
- [[ ([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting' )]) and translate('Non Assigned Products:') or removeParentNode('para') ]] + Non Assigned Products:[[ ([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting' )]) and ' ' or removeParentNode('para') ]]
[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]] @@ -287,7 +289,8 @@ [[ (move_lines.prodlot_id and move_lines.prodlot_id.name) or '' ]] - [[ move_lines.state == 'draft' and translate('New') or move_lines.state == 'waiting' and translate('Waiting Another Move') ]] + New[[ move_lines.state == 'draft' and ' ' or removeParentNode('para') ]] + Waiting Another Move[[ move_lines.state == 'waiting' and ' ' or removeParentNode('para') ]] [[ (move_lines.location_id and move_lines.location_id.name) or '' ]] From ac935d6580ccec25de88095ba83a8d61eace34a2 Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Mon, 8 Oct 2012 13:59:50 +0200 Subject: [PATCH 17/18] [FIX] Missing brackets in .rml files bzr revid: cbi@openerp.com-20121008115950-n54c52tugw8sisys --- addons/account/report/account_aged_partner_balance.rml | 2 +- addons/account/report/account_balance.rml | 5 ++--- addons/account/report/account_general_ledger_landscape.rml | 7 +++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml index a5211729579..abf0f57752b 100644 --- a/addons/account/report/account_aged_partner_balance.rml +++ b/addons/account/report/account_aged_partner_balance.rml @@ -166,7 +166,7 @@ Partners - Due[[ data['form']['direction_selection'] == 'future' and ' ' or removeParentNode('para') + Due[[ data['form']['direction_selection'] == 'future' and ' ' or removeParentNode('para') ]] Not due[[ data['form']['direction_selection'] == 'past' and ' ' or removeParentNode('para') ]] diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index f532d7eb1d0..87e5541677c 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -16,7 +16,6 @@ - @@ -234,8 +233,8 @@ [[ get_fiscalyear(data) or '' ]] All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') ]] - With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') - With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') + With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') ]] + With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') ]] [[ not has_filter(data) and get_filter(data) or removeParentNode('para') ]] [[ data['form']['filter']=='filter_date' or removeParentNode('blockTable') ]] diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml index 35a6217db81..800f4b875ed 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -16,7 +16,6 @@ - @@ -395,9 +394,9 @@ [[', '.join([ lt or '' for lt in get_journal(data) ]) ]] - All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') - With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') - With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') + All[[ data['form']['display_account']=='all' and ' ' or removeParentNode('para') ]] + With movements[[ data['form']['display_account']=='movement' and ' ' or removeParentNode('para') ]] + With balance is not equal to 0[[ data['form']['display_account']=='not_zero' and ' ' or removeParentNode('para') ]] [[ data['form']['filter']=='filter_no' and get_filter(data) or removeParentNode('para') ]] From 712a0543f296dcf8edd00b0da979070418eb7ec0 Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Mon, 8 Oct 2012 15:00:26 +0200 Subject: [PATCH 18/18] [FIX] new .pot files containing demo data bzr revid: cbi@openerp.com-20121008130026-i53npn06eekxd7iz --- addons/account/i18n/account.pot | 12 +- addons/account_budget/i18n/account_budget.pot | 4 +- .../account_payment/i18n/account_payment.pot | 4 +- addons/hr_holidays/i18n/hr_holidays.pot | 4 +- addons/hr_timesheet/i18n/hr_timesheet.pot | 4 +- addons/product/i18n/product.pot | 3019 +++++++++-------- addons/stock/i18n/stock.pot | 157 +- 7 files changed, 1827 insertions(+), 1377 deletions(-) diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index 14427c1bedd..b4e5248bd7e 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 6.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-24 13:21+0000\n" -"PO-Revision-Date: 2012-09-24 13:21+0000\n" +"POT-Creation-Date: 2012-10-08 12:28+0000\n" +"PO-Revision-Date: 2012-10-08 12:28+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -533,6 +533,7 @@ msgid "The accountant confirms the statement." msgstr "" #. module: account +#: report:account.account.balance:0 #: selection:account.balance.report,display_account:0 #: selection:account.common.account.report,display_account:0 #: report:account.general.ledger_landscape:0 @@ -2468,6 +2469,7 @@ msgid "Account move line reconcile (writeoff)" msgstr "" #. module: account +#: model:account.account.type,name:account.account_type_tax #: report:account.invoice:0 #: field:account.invoice,amount_tax:0 #: field:account.move.line,account_tax_id:0 @@ -5922,6 +5924,11 @@ msgstr "" msgid "CashBox" msgstr "" +#. module: account +#: model:account.account.type,name:account.account_type_cash_equity +msgid "Equity" +msgstr "" + #. module: account #: selection:account.tax,type:0 #: selection:account.tax.template,type:0 @@ -9318,6 +9325,7 @@ msgstr "" #. module: account #: field:account.account,company_id:0 +#: report:account.account.balance:0 #: field:account.aged.trial.balance,company_id:0 #: field:account.analytic.journal,company_id:0 #: field:account.balance.report,company_id:0 diff --git a/addons/account_budget/i18n/account_budget.pot b/addons/account_budget/i18n/account_budget.pot index 32d4f166fba..df77642e0ae 100644 --- a/addons/account_budget/i18n/account_budget.pot +++ b/addons/account_budget/i18n/account_budget.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 6.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-24 13:21+0000\n" -"PO-Revision-Date: 2012-09-24 13:21+0000\n" +"POT-Creation-Date: 2012-10-08 12:28+0000\n" +"PO-Revision-Date: 2012-10-08 12:28+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/account_payment/i18n/account_payment.pot b/addons/account_payment/i18n/account_payment.pot index 4d6599ff918..85f831e3cd5 100644 --- a/addons/account_payment/i18n/account_payment.pot +++ b/addons/account_payment/i18n/account_payment.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 6.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-24 13:21+0000\n" -"PO-Revision-Date: 2012-09-24 13:21+0000\n" +"POT-Creation-Date: 2012-10-08 12:28+0000\n" +"PO-Revision-Date: 2012-10-08 12:28+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot index 2f96614f3a0..e015fc23d58 100644 --- a/addons/hr_holidays/i18n/hr_holidays.pot +++ b/addons/hr_holidays/i18n/hr_holidays.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 6.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-24 13:20+0000\n" -"PO-Revision-Date: 2012-09-24 13:20+0000\n" +"POT-Creation-Date: 2012-10-08 12:28+0000\n" +"PO-Revision-Date: 2012-10-08 12:28+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/hr_timesheet/i18n/hr_timesheet.pot b/addons/hr_timesheet/i18n/hr_timesheet.pot index 2b518eed79e..bf2c5731ab2 100644 --- a/addons/hr_timesheet/i18n/hr_timesheet.pot +++ b/addons/hr_timesheet/i18n/hr_timesheet.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 6.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-24 13:21+0000\n" -"PO-Revision-Date: 2012-09-24 13:21+0000\n" +"POT-Creation-Date: 2012-10-08 12:29+0000\n" +"PO-Revision-Date: 2012-10-08 12:29+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot index e7ef442f31e..e421bb3e03f 100644 --- a/addons/product/i18n/product.pot +++ b/addons/product/i18n/product.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 6.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-24 13:22+0000\n" -"PO-Revision-Date: 2012-09-24 13:22+0000\n" +"POT-Creation-Date: 2012-10-08 12:29+0000\n" +"PO-Revision-Date: 2012-10-08 12:29+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,6 +15,561 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: product +#: model:product.template,name:product.product_product_ram512_product_template +msgid "DDR 512MB PC400" +msgstr "" + +#. module: product +#: field:product.packaging,rows:0 +msgid "Number of Layers" +msgstr "" + +#. module: product +#: constraint:product.pricelist.item:0 +msgid "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!" +msgstr "" + +#. module: product +#: help:product.pricelist.item,product_tmpl_id:0 +msgid "Set a template if this rule only apply to a template of product. Keep empty for all products" +msgstr "" + +#. module: product +#: help:product.product,virtual_available:0 +msgid "Forecast quantity (computed as Quantity On Hand - Outgoing + Incoming)\n" +"In a context with a single Stock Location, this includes goods stored at this Location, or any of its children.\n" +"In a context with a single Warehouse, this includes goods stored in the Stock Location of this Warehouse, or any of its children.\n" +"In a context with a single Shop, this includes goods stored in the Stock Location of the Warehouse of this Shop, or any of its children.\n" +"Otherwise, this includes goods stored in any Stock Location typed as 'internal'." +msgstr "" + +#. module: product +#: model:product.category,name:product.cat1 +msgid "Sellable" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_mb2_product_template +msgid "Mainboard ASUStek A7V8X-X" +msgstr "" + +#. module: product +#: help:product.template,seller_qty:0 +msgid "This is minimum quantity to purchase from Main Supplier." +msgstr "" + +#. module: product +#: model:product.uom,name:product.uom_day +msgid "Day" +msgstr "" + +#. module: product +#: view:product.product:0 +msgid "UoM" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_pc2_product_template +msgid "Basic+ PC (assembly on order)" +msgstr "" + +#. module: product +#: field:product.product,incoming_qty:0 +msgid "Incoming" +msgstr "" + +#. module: product +#: help:res.partner,property_product_pricelist:0 +msgid "This pricelist will be used, instead of the default one, for sales to the current partner" +msgstr "" + +#. module: product +#: field:product.template,seller_qty:0 +msgid "Supplier Quantity" +msgstr "" + +#. module: product +#: selection:product.template,mes_type:0 +msgid "Fixed" +msgstr "" + +#. module: product +#: code:addons/product/pricelist.py:178 +#, python-format +msgid "Warning !" +msgstr "" + +#. module: product +#: model:ir.actions.report.xml,name:product.report_product_pricelist +#: model:ir.model,name:product.model_product_pricelist +#: field:product.product,price:0 +#: field:product.product,pricelist_id:0 +#: view:product.supplierinfo:0 +msgid "Pricelist" +msgstr "" + +#. module: product +#: view:product.product:0 +#: view:product.template:0 +msgid "Base Prices" +msgstr "" + +#. module: product +#: field:product.pricelist.item,name:0 +msgid "Rule Name" +msgstr "" + +#. module: product +#: field:product.product,code:0 +#: field:product.product,default_code:0 +msgid "Reference" +msgstr "" + +#. module: product +#: help:pricelist.partnerinfo,min_quantity:0 +msgid "The minimal quantity to trigger this rule, expressed in the supplier UoM if any or in the default UoM of the product otherrwise." +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_24_product_template +msgid "Keyboard" +msgstr "" + +#. module: product +#: model:ir.model,name:product.model_res_partner +msgid "Partner" +msgstr "" + +#. module: product +#: code:addons/product/product.py:143 +#, python-format +msgid "Conversion from Product UoM %s to Default UoM %s is not possible as they both belong to different Category!." +msgstr "" + +#. module: product +#: model:product.uom,name:product.product_uom_dozen +msgid "Dozen" +msgstr "" + +#. module: product +#: selection:product.template,cost_method:0 +msgid "Average Price" +msgstr "" + +#. module: product +#: help:product.pricelist.item,name:0 +msgid "Explicit rule name for this pricelist line." +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_cpu1_product_template +msgid "Processor AMD Athlon XP 1800+" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_20_product_template +msgid "HDD on demand" +msgstr "" + +#. module: product +#: field:product.price_list,price_list:0 +msgid "PriceList" +msgstr "" + +#. module: product +#: view:product.template:0 +msgid "UOM" +msgstr "" + +#. module: product +#: model:product.uom,name:product.product_uom_unit +msgid "PCE" +msgstr "" + +#. module: product +#: view:product.template:0 +msgid "Miscelleanous" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_worker0_product_template +msgid "Worker" +msgstr "" + +#. module: product +#: help:product.template,sale_ok:0 +msgid "Determines if the product can be visible in the list of product within a selection from a sale order line." +msgstr "" + +#. module: product +#: model:product.pricelist.version,name:product.ver0 +msgid "Default Public Pricelist Version" +msgstr "" + +#. module: product +#: selection:product.template,cost_method:0 +msgid "Standard Price" +msgstr "" + +#. module: product +#: model:product.pricelist.type,name:product.pricelist_type_sale +#: field:res.partner,property_product_pricelist:0 +msgid "Sale Pricelist" +msgstr "" + +#. module: product +#: view:product.template:0 +#: field:product.template,type:0 +msgid "Product Type" +msgstr "" + +#. module: product +#: model:ir.actions.act_window,help:product.product_form_config_action +msgid "Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased." +msgstr "" + +#. module: product +#: view:product.uom:0 +msgid " e.g: 1 * (this unit) = ratio * (reference unit)" +msgstr "" + +#. module: product +#: code:addons/product/product.py:418 +#, python-format +msgid "Products: " +msgstr "" + +#. module: product +#: field:product.category,parent_id:0 +msgid "Parent Category" +msgstr "" + +#. module: product +#: help:product.template,procure_method:0 +msgid "'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request." +msgstr "" + +#. module: product +#: model:process.node,note:product.process_node_supplier0 +msgid "Supplier name, price, product code, ..." +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_hdd3_product_template +msgid "HDD Seagate 7200.8 160GB" +msgstr "" + +#. module: product +#: field:product.product,ean13:0 +msgid "EAN13" +msgstr "" + +#. module: product +#: field:product.template,seller_id:0 +msgid "Main Supplier" +msgstr "" + +#. module: product +#: model:ir.actions.act_window,name:product.product_ul_form_action +#: model:ir.model,name:product.model_product_packaging +#: model:ir.ui.menu,name:product.menu_product_ul_form_action +#: view:product.packaging:0 +#: view:product.product:0 +#: view:product.ul:0 +msgid "Packaging" +msgstr "" + +#. module: product +#: view:product.product:0 +#: field:product.template,categ_id:0 +msgid "Category" +msgstr "" + +#. module: product +#: help:product.pricelist.item,min_quantity:0 +msgid "The rule only applies if the partner buys/sells more than this quantity." +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_woodmm0_product_template +msgid "Wood 2mm" +msgstr "" + +#. module: product +#: field:product.price_list,qty1:0 +msgid "Quantity-1" +msgstr "" + +#. module: product +#: help:product.packaging,ul_qty:0 +msgid "The number of packages by layer" +msgstr "" + +#. module: product +#: field:product.packaging,qty:0 +msgid "Quantity by Package" +msgstr "" + +#. module: product +#: view:product.product:0 +#: view:product.template:0 +#: field:product.template,state:0 +msgid "Status" +msgstr "" + +#. module: product +#: help:product.template,categ_id:0 +msgid "Select category for the current product" +msgstr "" + +#. module: product +#: field:product.product,outgoing_qty:0 +msgid "Outgoing" +msgstr "" + +#. module: product +#: selection:product.uom,uom_type:0 +msgid "Reference UoM for this category" +msgstr "" + +#. module: product +#: model:product.price.type,name:product.list_price +#: field:product.product,lst_price:0 +msgid "Public Price" +msgstr "" + +#. module: product +#: field:product.price_list,qty5:0 +msgid "Quantity-5" +msgstr "" + +#. module: product +#: model:product.category,name:product.product_category_10 +msgid "IT components" +msgstr "" + +#. module: product +#: field:product.template,product_manager:0 +msgid "Product Manager" +msgstr "" + +#. module: product +#: field:product.supplierinfo,product_name:0 +msgid "Supplier Product Name" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_pc3_product_template +msgid "Medium PC" +msgstr "" + +#. module: product +#: model:ir.actions.act_window,help:product.product_normal_action_puchased +msgid "Products can be purchased and/or sold. They can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on." +msgstr "" + +#. module: product +#: help:product.product,qty_available:0 +msgid "Current quantity of products.\n" +"In a context with a single Stock Location, this includes goods stored at this Location, or any of its children.\n" +"In a context with a single Warehouse, this includes goods stored in the Stock Location of this Warehouse, or any of its children.\n" +"In a context with a single Shop, this includes goods stored in the Stock Location of the Warehouse of this Shop, or any of its children.\n" +"Otherwise, this includes goods stored in any Stock Location typed as 'internal'." +msgstr "" + +#. module: product +#: view:product.pricelist:0 +msgid "Products Price Search" +msgstr "" + +#. module: product +#: view:product.product:0 +#: view:product.template:0 +#: field:product.template,description_sale:0 +msgid "Sale Description" +msgstr "" + +#. module: product +#: view:product.product:0 +#: view:product.template:0 +msgid "Storage Localisation" +msgstr "" + +#. module: product +#: help:product.packaging,length:0 +msgid "The length of the package" +msgstr "" + +#. module: product +#: help:product.template,weight_net:0 +msgid "The net weight in Kg." +msgstr "" + +#. module: product +#: help:product.template,state:0 +msgid "Tells the user if he can use the product or not." +msgstr "" + +#. module: product +#: field:pricelist.partnerinfo,min_quantity:0 +#: field:product.supplierinfo,qty:0 +msgid "Quantity" +msgstr "" + +#. module: product +#: field:product.packaging,height:0 +msgid "Height" +msgstr "" + +#. module: product +#: help:product.pricelist.version,date_end:0 +msgid "Ending date for this pricelist version to be valid." +msgstr "" + +#. module: product +#: model:product.category,name:product.cat0 +msgid "All products" +msgstr "" + +#. module: product +#: model:ir.model,name:product.model_pricelist_partnerinfo +msgid "pricelist.partnerinfo" +msgstr "" + +#. module: product +#: field:product.price_list,qty2:0 +msgid "Quantity-2" +msgstr "" + +#. module: product +#: field:product.price_list,qty3:0 +msgid "Quantity-3" +msgstr "" + +#. module: product +#: view:product.product:0 +msgid "Codes" +msgstr "" + +#. module: product +#: field:product.price_list,qty4:0 +msgid "Quantity-4" +msgstr "" + +#. module: product +#: view:res.partner:0 +msgid "Sales & Purchases" +msgstr "" + +#. module: product +#: model:product.uom.categ,name:product.uom_categ_wtime +msgid "Working Time" +msgstr "" + +#. module: product +#: model:ir.actions.act_window,help:product.product_pricelist_action2 +#: model:ir.actions.act_window,help:product.product_pricelist_action_for_purchase +msgid "A price list contains rules to be evaluated in order to compute the purchase or sales price for all the partners assigned to a price list. Price lists have several versions (2010, 2011, Promotion of February 2010, etc.) and each version has several rules. Example: the customer price of a product category will be based on the supplier price multiplied by 1.80." +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_metalcleats0_product_template +msgid "Metal Cleats" +msgstr "" + +#. module: product +#: code:addons/product/product.py:175 +#, python-format +msgid "Cannot change the category of existing UoM '%s'." +msgstr "" + +#. module: product +#: model:ir.model,name:product.model_product_uom_categ +msgid "Product uom categ" +msgstr "" + +#. module: product +#: model:product.ul,name:product.product_ul_box +msgid "Box 20x20x40" +msgstr "" + +#. module: product +#: view:product.pricelist.item:0 +msgid "Price Computation" +msgstr "" + +#. module: product +#: model:res.groups,name:product.group_uos +msgid "Product UoS View" +msgstr "" + +#. module: product +#: field:product.template,purchase_ok:0 +msgid "Can be Purchased" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_cpu2_product_template +msgid "High speed processor config" +msgstr "" + +#. module: product +#: model:process.transition,note:product.process_transition_supplierofproduct0 +msgid "1 or several supplier(s) can be linked to a product. All information stands in the product form." +msgstr "" + +#. module: product +#: help:product.uom,category_id:0 +msgid "Quantity conversions may happen automatically between Units of Measure in the same category, according to their respective ratios." +msgstr "" + +#. module: product +#: help:product.packaging,width:0 +msgid "The width of the package" +msgstr "" + +#. module: product +#: selection:product.category,type:0 +msgid "View" +msgstr "" + +#. module: product +#: model:ir.actions.act_window,name:product.product_template_action_tree +msgid "Product Templates" +msgstr "" + +#. module: product +#: field:product.category,parent_left:0 +msgid "Left Parent" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_restaurantexpenses0_product_template +msgid "Restaurant Expenses" +msgstr "" + +#. module: product +#: help:product.packaging,qty:0 +msgid "The total number of products you can put by pallet or box." +msgstr "" + +#. module: product +#: constraint:product.packaging:0 +#: constraint:product.product:0 +msgid "Error: Invalid ean code" +msgstr "" + +#. module: product +#: field:product.pricelist.item,min_quantity:0 +msgid "Min. Quantity" +msgstr "" + +#. module: product +#: model:ir.model,name:product.model_product_price_type +msgid "Price Type" +msgstr "" + #. module: product #: code:addons/product/product.py:363 #, python-format @@ -31,9 +586,503 @@ msgstr "" msgid "Base Price" msgstr "" +#. module: product +#: model:product.template,name:product.product_consultant_product_template +msgid "Service on Timesheet" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_fan2_product_template +msgid "Silent fan" +msgstr "" + +#. module: product +#: help:product.supplierinfo,name:0 +msgid "Supplier of this product" +msgstr "" + +#. module: product +#: help:product.pricelist.version,active:0 +msgid "When a version is duplicated it is set to non active, so that the dates do not overlaps with original version. You should change the dates and reactivate the pricelist" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_kitshelfofcm0_product_template +msgid "KIT Shelf of 100cm" +msgstr "" + +#. module: product +#: field:product.supplierinfo,name:0 +msgid "Supplier" +msgstr "" + +#. module: product +#: field:product.product,qty_available:0 +msgid "Quantity On Hand" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_26_product_template +msgid "Kit Keyboard + Mouse" +msgstr "" + +#. module: product +#: field:product.price.type,name:0 +msgid "Price Name" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_arm_product_template +msgid "Cabinet" +msgstr "" + +#. module: product +#: help:product.product,incoming_qty:0 +msgid "Quantity of products that are planned to arrive.\n" +"In a context with a single Stock Location, this includes goods arriving to this Location, or any of its children.\n" +"In a context with a single Warehouse, this includes goods arriving to the Stock Location of this Warehouse, or any of its children.\n" +"In a context with a single Shop, this includes goods arriving to the Stock Location of the Warehouse of this Shop, or any of its children.\n" +"Otherwise, this includes goods arriving to any Stock Location typed as 'internal'." +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_woodentable0_product_template +msgid "Wooden Table" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_cpu3_product_template +msgid "Processor AMD Athlon XP 2200+" +msgstr "" + +#. module: product +#: model:ir.actions.act_window,name:product.action_product_price_list +#: model:ir.model,name:product.model_product_price_list +#: view:product.price_list:0 +#: report:product.pricelist:0 +#: field:product.pricelist.version,pricelist_id:0 +msgid "Price List" +msgstr "" + +#. module: product +#: view:product.product:0 +#: view:product.template:0 +msgid "Suppliers" +msgstr "" + +#. module: product +#: view:product.product:0 +msgid "To Purchase" +msgstr "" + +#. module: product +#: help:product.supplierinfo,min_qty:0 +msgid "The minimal quantity to purchase to this supplier, expressed in the supplier Product UoM if not empty, in the default unit of measure of the product otherwise." +msgstr "" + #. module: product #: view:product.pricelist.item:0 -msgid " ) + " +msgid "New Price =" +msgstr "" + +#. module: product +#: help:pricelist.partnerinfo,price:0 +msgid "This price will be considered as a price for the supplier UoM if any or the default Unit of Measure of the product otherwise" +msgstr "" + +#. module: product +#: model:product.category,name:product.product_category_accessories +msgid "Accessories" +msgstr "" + +#. module: product +#: field:product.template,sale_delay:0 +msgid "Customer Lead Time" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_25_product_template +msgid "Mouse" +msgstr "" + +#. module: product +#: help:product.template,uos_id:0 +msgid "Used by companies that manage two units of measure: invoicing and inventory management. For example, in food industries, you will manage a stock of ham but invoice in Kg. Keep empty to use the default UOM." +msgstr "" + +#. module: product +#: view:product.pricelist.item:0 +msgid "Min. Margin" +msgstr "" + +#. module: product +#: field:product.category,child_id:0 +msgid "Child Categories" +msgstr "" + +#. module: product +#: field:product.pricelist.version,date_end:0 +msgid "End Date" +msgstr "" + +#. module: product +#: view:product.price_list:0 +msgid "Print" +msgstr "" + +#. module: product +#: view:product.product:0 +#: field:product.ul,type:0 +msgid "Type" +msgstr "" + +#. module: product +#: model:ir.actions.act_window,name:product.product_pricelist_action2 +#: model:ir.actions.act_window,name:product.product_pricelist_action_for_purchase +#: model:ir.ui.menu,name:product.menu_product_pricelist_action2 +#: model:ir.ui.menu,name:product.menu_product_pricelist_main +msgid "Pricelists" +msgstr "" + +#. module: product +#: field:product.product,partner_ref:0 +msgid "Customer ref" +msgstr "" + +#. module: product +#: view:product.product:0 +msgid "Miscellaneous" +msgstr "" + +#. module: product +#: field:product.pricelist.type,key:0 +msgid "Key" +msgstr "" + +#. module: product +#: view:product.pricelist.item:0 +msgid "Rules Test Match" +msgstr "" + +#. module: product +#: help:product.pricelist.item,product_id:0 +msgid "Set a product if this rule only apply to one product. Keep empty for all products" +msgstr "" + +#. module: product +#: view:product.product:0 +#: view:product.template:0 +msgid "Procurement & Locations" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_kitchendesignproject0_product_template +msgid "Kitchen Design Project" +msgstr "" + +#. module: product +#: model:product.uom,name:product.uom_hour +msgid "Hour" +msgstr "" + +#. module: product +#: selection:product.template,state:0 +msgid "In Development" +msgstr "" + +#. module: product +#: code:addons/product/product.py:363 +#, python-format +msgid "UoM categories Mismatch!" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_shelfofcm1_product_template +msgid "Shelf of 200cm" +msgstr "" + +#. module: product +#: view:product.uom:0 +msgid "Ratio & Precision" +msgstr "" + +#. module: product +#: model:product.uom,name:product.product_uom_gram +msgid "g" +msgstr "" + +#. module: product +#: model:product.category,name:product.product_category_11 +msgid "IT components kits" +msgstr "" + +#. module: product +#: selection:product.category,type:0 +#: selection:product.template,state:0 +msgid "Normal" +msgstr "" + +#. module: product +#: model:process.node,name:product.process_node_supplier0 +#: view:product.supplierinfo:0 +msgid "Supplier Information" +msgstr "" + +#. module: product +#: field:product.price.type,currency_id:0 +#: report:product.pricelist:0 +#: field:product.pricelist,currency_id:0 +msgid "Currency" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_ram_product_template +msgid "DDR 256MB PC400" +msgstr "" + +#. module: product +#: model:ir.actions.act_window,name:product.product_category_action_form +#: model:ir.ui.menu,name:product.menu_product_category_action_form +#: view:product.category:0 +msgid "Product Categories" +msgstr "" + +#. module: product +#: view:product.uom:0 +msgid " e.g: 1 * (reference unit) = ratio * (this unit)" +msgstr "" + +#. module: product +#: model:ir.actions.act_window,help:product.product_uom_form_action +msgid "Create and manage the units of measure you want to be used in your system. You can define a conversion rate between several Units of Measure within the same category." +msgstr "" + +#. module: product +#: field:product.packaging,weight:0 +msgid "Total Package Weight" +msgstr "" + +#. module: product +#: field:product.template,seller_info_id:0 +msgid "unknown" +msgstr "" + +#. module: product +#: help:product.packaging,code:0 +msgid "The code of the transport unit." +msgstr "" + +#. module: product +#: help:product.template,standard_price:0 +msgid "Product's cost for accounting stock valuation. It is the base price for the supplier price." +msgstr "" + +#. module: product +#: view:product.price.type:0 +msgid "Products Price Type" +msgstr "" + +#. module: product +#: field:product.product,price_extra:0 +msgid "Variant Price Extra" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_fan_product_template +msgid "Regular case fan 80mm" +msgstr "" + +#. module: product +#: model:ir.model,name:product.model_product_supplierinfo +msgid "Information about a product supplier" +msgstr "" + +#. module: product +#: view:product.product:0 +#: view:product.template:0 +#: field:product.template,description_purchase:0 +msgid "Purchase Description" +msgstr "" + +#. module: product +#: constraint:product.pricelist.version:0 +msgid "You cannot have 2 pricelist versions that overlap!" +msgstr "" + +#. module: product +#: help:product.supplierinfo,delay:0 +msgid "Lead time in days between the confirmation of the purchase order and the reception of the products in your warehouse. Used by the scheduler for automatic computation of the purchase order planning." +msgstr "" + +#. module: product +#: model:ir.actions.act_window,help:product.product_pricelist_action +msgid "There can be more than one version of a pricelist. Here you can create and manage new versions of a price list. Some examples of versions: 2010, 2011, Summer Promotion, etc." +msgstr "" + +#. module: product +#: selection:product.template,type:0 +msgid "Stockable Product" +msgstr "" + +#. module: product +#: field:product.packaging,code:0 +msgid "Code" +msgstr "" + +#. module: product +#: view:product.supplierinfo:0 +msgid "Seq" +msgstr "" + +#. module: product +#: view:product.price_list:0 +msgid "Calculate Product Price per unit base on pricelist version." +msgstr "" + +#. module: product +#: model:ir.model,name:product.model_product_ul +msgid "Shipping Unit" +msgstr "" + +#. module: product +#: field:pricelist.partnerinfo,suppinfo_id:0 +msgid "Partner Information" +msgstr "" + +#. module: product +#: selection:product.ul,type:0 +#: model:product.uom.categ,name:product.product_uom_categ_unit +msgid "Unit" +msgstr "" + +#. module: product +#: view:product.product:0 +#: view:product.template:0 +msgid "Information" +msgstr "" + +#. module: product +#: view:product.pricelist.item:0 +msgid "Products Listprices Items" +msgstr "" + +#. module: product +#: view:product.packaging:0 +msgid "Other Info" +msgstr "" + +#. module: product +#: field:product.pricelist.version,items_id:0 +msgid "Price List Items" +msgstr "" + +#. module: product +#: model:ir.actions.act_window,help:product.product_uom_categ_form_action +msgid "Create and manage the units of measure categories you want to be used in your system. If several units of measure are in the same category, they can be converted to each other. For example, in the unit of measure category \"Time\", you will have the following UoM: Hours, Days." +msgstr "" + +#. module: product +#: selection:product.uom,uom_type:0 +msgid "Bigger than the reference UoM" +msgstr "" + +#. module: product +#: field:product.category,parent_right:0 +msgid "Right Parent" +msgstr "" + +#. module: product +#: view:product.product:0 +msgid "To Sell" +msgstr "" + +#. module: product +#: help:product.product,ean13:0 +msgid "Barcode" +msgstr "" + +#. module: product +#: help:product.product,outgoing_qty:0 +msgid "Quantity of products that are planned to leave.\n" +"In a context with a single Stock Location, this includes goods leaving from this Location, or any of its children.\n" +"In a context with a single Warehouse, this includes goods leaving from the Stock Location of this Warehouse, or any of its children.\n" +"In a context with a single Shop, this includes goods leaving from the Stock Location of the Warehouse of this Shop, or any of its children.\n" +"Otherwise, this includes goods leaving from any Stock Location typed as 'internal'." +msgstr "" + +#. module: product +#: model:product.category,name:product.product_category_services0 +msgid "Marketable Services" +msgstr "" + +#. module: product +#: field:product.pricelist.item,price_surcharge:0 +msgid "Price Surcharge" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_mb1_product_template +msgid "Mainboard ASUStek A7N8X" +msgstr "" + +#. module: product +#: field:product.product,packaging:0 +msgid "Logistical Units" +msgstr "" + +#. module: product +#: field:product.category,complete_name:0 +#: field:product.category,name:0 +#: field:product.pricelist.type,name:0 +#: field:product.pricelist.version,name:0 +#: view:product.product:0 +#: field:product.product,name_template:0 +#: field:product.template,name:0 +#: field:product.ul,name:0 +#: field:product.uom,name:0 +#: field:product.uom.categ,name:0 +msgid "Name" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_woodlintelm0_product_template +msgid "Wood Lintel 4m" +msgstr "" + +#. module: product +#: model:ir.actions.act_window,help:product.product_normal_action +#: model:ir.actions.act_window,help:product.product_normal_action_sell +msgid "You must define a Product for everything you buy or sell. Products can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on." +msgstr "" + +#. module: product +#: model:product.uom,name:product.product_uom_kgm +msgid "kg" +msgstr "" + +#. module: product +#: model:product.uom,name:product.product_uom_meter +msgid "m" +msgstr "" + +#. module: product +#: selection:product.template,state:0 +msgid "Obsolete" +msgstr "" + +#. module: product +#: model:product.uom,name:product.product_uom_km +msgid "km" +msgstr "" + +#. module: product +#: help:product.template,cost_method:0 +msgid "Standard Price: the cost price is fixed and recomputed periodically (usually at the end of the year), Average Price: the cost price is recomputed at each reception of products." +msgstr "" + +#. module: product +#: help:product.category,sequence:0 +msgid "Gives the sequence order when displaying a list of product categories." msgstr "" #. module: product @@ -42,90 +1091,19 @@ msgstr "" msgid "Ratio" msgstr "" -#. module: product -#: help:product.supplierinfo,min_qty:0 -msgid "The minimal quantity to purchase to this supplier, expressed in the supplier Product UoM if not empty, in the default unit of measure of the product otherwise." -msgstr "" - -#. module: product -#: selection:product.template,type:0 -msgid "Service" -msgstr "" - #. module: product #: help:product.template,purchase_ok:0 msgid "Determine if the product is visible in the list of products within a selection from a purchase order line." msgstr "" -#. module: product -#: help:product.supplierinfo,name:0 -msgid "Supplier of this product" -msgstr "" - -#. module: product -#: model:process.node,note:product.process_node_supplier0 -msgid "Supplier name, price, product code, ..." -msgstr "" - -#. module: product -#: help:pricelist.partnerinfo,min_quantity:0 -msgid "The minimal quantity to trigger this rule, expressed in the supplier UoM if any or in the default UoM of the product otherrwise." -msgstr "" - -#. module: product -#: field:product.packaging,rows:0 -msgid "Number of Layers" -msgstr "" - #. module: product #: field:product.template,weight_net:0 msgid "Net weight" msgstr "" #. module: product -#: help:product.pricelist.version,active:0 -msgid "When a version is duplicated it is set to non active, so that the dates do not overlaps with original version. You should change the dates and reactivate the pricelist" -msgstr "" - -#. module: product -#: field:product.price.type,field:0 -msgid "Product Field" -msgstr "" - -#. module: product -#: help:product.pricelist.item,product_tmpl_id:0 -msgid "Set a template if this rule only apply to a template of product. Keep empty for all products" -msgstr "" - -#. module: product -#: help:product.product,virtual_available:0 -msgid "Forecast quantity (computed as Quantity On Hand - Outgoing + Incoming)\n" -"In a context with a single Stock Location, this includes goods stored at this Location, or any of its children.\n" -"In a context with a single Warehouse, this includes goods stored in the Stock Location of this Warehouse, or any of its children.\n" -"In a context with a single Shop, this includes goods stored in the Stock Location of the Warehouse of this Shop, or any of its children.\n" -"Otherwise, this includes goods stored in any Stock Location typed as 'internal'." -msgstr "" - -#. module: product -#: field:product.supplierinfo,product_uom:0 -msgid "Supplier UoM" -msgstr "" - -#. module: product -#: help:product.pricelist.item,price_round:0 -msgid "Sets the price so that it is a multiple of this value.\n" -"Rounding is applied after the discount and before the surcharge.\n" -"To have prices that end in 9.99, set rounding 10, surcharge -0.01" -msgstr "" - -#. module: product -#: field:product.supplierinfo,name:0 -msgid "Supplier" -msgstr "" - -#. module: product -#: model:product.template,name:product.product_consultant_product_template -msgid "Service on Timesheet" +#: field:product.packaging,width:0 +msgid "Width" msgstr "" #. module: product @@ -149,38 +1127,8 @@ msgid "Printing Date" msgstr "" #. module: product -#: field:product.product,qty_available:0 -msgid "Quantity On Hand" -msgstr "" - -#. module: product -#: view:product.pricelist:0 -msgid "Products Price List" -msgstr "" - -#. module: product -#: model:product.uom,name:product.product_uom_cm -msgid "cm" -msgstr "" - -#. module: product -#: field:product.price.type,name:0 -msgid "Price Name" -msgstr "" - -#. module: product -#: field:product.pricelist,company_id:0 -#: field:product.pricelist.item,company_id:0 -#: field:product.pricelist.version,company_id:0 -#: view:product.product:0 -#: field:product.supplierinfo,company_id:0 -#: field:product.template,company_id:0 -msgid "Company" -msgstr "" - -#. module: product -#: help:product.template,weight_net:0 -msgid "The net weight in Kg." +#: field:product.template,uos_id:0 +msgid "Unit of Sale" msgstr "" #. module: product @@ -188,107 +1136,22 @@ msgstr "" msgid "This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays." msgstr "" -#. module: product -#: help:product.template,seller_qty:0 -msgid "This is minimum quantity to purchase from Main Supplier." -msgstr "" - -#. module: product -#: help:product.product,incoming_qty:0 -msgid "Quantity of products that are planned to arrive.\n" -"In a context with a single Stock Location, this includes goods arriving to this Location, or any of its children.\n" -"In a context with a single Warehouse, this includes goods arriving to the Stock Location of this Warehouse, or any of its children.\n" -"In a context with a single Shop, this includes goods arriving to the Stock Location of the Warehouse of this Shop, or any of its children.\n" -"Otherwise, this includes goods arriving to any Stock Location typed as 'internal'." -msgstr "" - #. module: product #: help:product.template,seller_id:0 msgid "Main Supplier who has highest priority in Supplier List." msgstr "" #. module: product +#: model:product.category,name:product.product_category_services #: view:product.product:0 msgid "Services" msgstr "" -#. module: product -#: help:product.template,list_price:0 -msgid "Base price for computing the customer price. Sometimes called the catalog price." -msgstr "" - -#. module: product -#: code:addons/product/pricelist.py:376 -#, python-format -msgid "Partner section of the product form" -msgstr "" - -#. module: product -#: model:product.uom,name:product.uom_day -msgid "Day" -msgstr "" - -#. module: product -#: view:product.product:0 -msgid "UoM" -msgstr "" - #. module: product #: model:ir.actions.act_window,name:product.product_form_config_action msgid "Create or Import Products" msgstr "" -#. module: product -#: help:product.template,supply_method:0 -msgid "Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested." -msgstr "" - -#. module: product -#: help:product.pricelist.version,date_start:0 -msgid "Starting date for this pricelist version to be valid." -msgstr "" - -#. module: product -#: field:product.product,incoming_qty:0 -msgid "Incoming" -msgstr "" - -#. module: product -#: selection:product.template,procure_method:0 -msgid "Make to Stock" -msgstr "" - -#. module: product -#: constraint:product.template:0 -msgid "Error: The default UOM and the purchase UOM must be in the same category." -msgstr "" - -#. module: product -#: view:product.product:0 -#: view:product.template:0 -msgid "Suppliers" -msgstr "" - -#. module: product -#: field:product.pricelist.item,name:0 -msgid "Rule Name" -msgstr "" - -#. module: product -#: view:product.product:0 -msgid "To Purchase" -msgstr "" - -#. module: product -#: field:product.supplierinfo,product_code:0 -msgid "Supplier Product Code" -msgstr "" - -#. module: product -#: view:product.pricelist.item:0 -msgid "Rules Test Match" -msgstr "" - #. module: product #: field:product.pricelist.item,base_pricelist_id:0 msgid "If Other Pricelist" @@ -305,121 +1168,14 @@ msgstr "" msgid "Products" msgstr "" -#. module: product -#: model:product.uom.categ,name:product.uom_categ_length -msgid "Length / Distance" -msgstr "" - -#. module: product -#: field:product.template,seller_qty:0 -msgid "Supplier Quantity" -msgstr "" - -#. module: product -#: view:product.pricelist.item:0 -msgid "New Price =" -msgstr "" - -#. module: product -#: model:ir.model,name:product.model_pricelist_partnerinfo -msgid "pricelist.partnerinfo" -msgstr "" - -#. module: product -#: field:product.template,uom_po_id:0 -msgid "Purchase Unit of Measure" -msgstr "" - -#. module: product -#: selection:product.template,mes_type:0 -msgid "Fixed" -msgstr "" - -#. module: product -#: code:addons/product/pricelist.py:178 -#, python-format -msgid "Warning !" -msgstr "" - -#. module: product -#: help:product.pricelist.item,product_id:0 -msgid "Set a product if this rule only apply to one product. Keep empty for all products" -msgstr "" - #. module: product #: help:product.packaging,rows:0 msgid "The number of layers on a pallet or box" msgstr "" #. module: product -#: model:ir.model,name:product.model_product_pricelist_type -#: field:product.pricelist,type:0 -msgid "Pricelist Type" -msgstr "" - -#. module: product -#: view:product.product:0 -#: view:product.template:0 -msgid "Base Prices" -msgstr "" - -#. module: product -#: field:product.product,color:0 -msgid "Color Index" -msgstr "" - -#. module: product -#: view:product.template:0 -#: field:product.template,type:0 -msgid "Product Type" -msgstr "" - -#. module: product -#: field:product.product,partner_ref:0 -msgid "Customer ref" -msgstr "" - -#. module: product -#: field:product.product,code:0 -#: field:product.product,default_code:0 -msgid "Reference" -msgstr "" - -#. module: product -#: field:product.packaging,width:0 -msgid "Width" -msgstr "" - -#. module: product -#: view:product.product:0 -msgid "Characteristics" -msgstr "" - -#. module: product -#: field:product.template,sale_ok:0 -msgid "Can be Sold" -msgstr "" - -#. module: product -#: view:product.product:0 -msgid "Group by..." -msgstr "" - -#. module: product -#: view:product.product:0 -#: view:product.template:0 -#: field:product.template,description_sale:0 -msgid "Sale Description" -msgstr "" - -#. module: product -#: field:product.template,produce_delay:0 -msgid "Manufacturing Lead Time" -msgstr "" - -#. module: product -#: field:product.supplierinfo,pricelist_ids:0 -msgid "Supplier Pricelist" +#: help:product.pricelist.item,base:0 +msgid "The mode for computing the price for this rule." msgstr "" #. module: product @@ -428,179 +1184,20 @@ msgstr "" msgid "Pallet Dimension" msgstr "" -#. module: product -#: code:addons/product/product.py:175 -#, python-format -msgid "Warning" -msgstr "" - -#. module: product -#: field:product.pricelist.item,base:0 -msgid "Based on" -msgstr "" - -#. module: product -#: model:product.uom,name:product.product_uom_ton -msgid "t" -msgstr "" - -#. module: product -#: help:pricelist.partnerinfo,price:0 -msgid "This price will be considered as a price for the supplier UoM if any or the default Unit of Measure of the product otherwise" -msgstr "" - -#. module: product -#: model:product.uom,name:product.product_uom_kgm -msgid "kg" -msgstr "" - -#. module: product -#: model:ir.model,name:product.model_res_partner -msgid "Partner" -msgstr "" - -#. module: product -#: code:addons/product/product.py:143 -#, python-format -msgid "Conversion from Product UoM %s to Default UoM %s is not possible as they both belong to different Category!." -msgstr "" - -#. module: product -#: field:product.template,sale_delay:0 -msgid "Customer Lead Time" -msgstr "" - -#. module: product -#: model:process.transition,name:product.process_transition_supplierofproduct0 -msgid "Supplier of the product" -msgstr "" - -#. module: product -#: help:product.template,cost_method:0 -msgid "Standard Price: the cost price is fixed and recomputed periodically (usually at the end of the year), Average Price: the cost price is recomputed at each reception of products." -msgstr "" - -#. module: product -#: field:product.pricelist,name:0 -msgid "Pricelist Name" -msgstr "" - -#. module: product -#: model:product.price.type,name:product.list_price -#: field:product.product,lst_price:0 -msgid "Public Price" -msgstr "" - #. module: product #: field:product.template,seller_ids:0 msgid "Partners" msgstr "" #. module: product -#: selection:product.template,cost_method:0 -msgid "Average Price" -msgstr "" - -#. module: product -#: field:product.uom,rounding:0 -msgid "Rounding Precision" -msgstr "" - -#. module: product -#: help:product.pricelist.item,name:0 -msgid "Explicit rule name for this pricelist line." -msgstr "" - -#. module: product -#: view:product.pricelist.item:0 -msgid "Min. Margin" -msgstr "" - -#. module: product -#: view:product.pricelist.item:0 -msgid "* ( 1 + " -msgstr "" - -#. module: product -#: help:product.template,product_manager:0 -msgid "This is use as task responsible" -msgstr "" - -#. module: product -#: view:product.pricelist.item:0 -msgid "Rounding Method" -msgstr "" - -#. module: product -#: field:product.category,child_id:0 -msgid "Child Categories" +#: help:product.template,sale_delay:0 +msgid "This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers." msgstr "" #. module: product #: view:product.product:0 #: view:product.template:0 -#: field:product.template,state:0 -msgid "Status" -msgstr "" - -#. module: product -#: field:product.pricelist.item,price_round:0 -msgid "Price Rounding" -msgstr "" - -#. module: product -#: sql_constraint:product.uom:0 -msgid "The conversion ratio for a unit of measure cannot be 0!" -msgstr "" - -#. module: product -#: help:product.packaging,height:0 -msgid "The height of the package" -msgstr "" - -#. module: product -#: view:product.price_list:0 -msgid "Print" -msgstr "" - -#. module: product -#: model:product.pricelist.type,name:product.pricelist_type_sale -#: field:res.partner,property_product_pricelist:0 -msgid "Sale Pricelist" -msgstr "" - -#. module: product -#: view:product.product:0 -#: field:product.ul,type:0 -msgid "Type" -msgstr "" - -#. module: product -#: field:product.price_list,price_list:0 -msgid "PriceList" -msgstr "" - -#. module: product -#: help:product.packaging,weight:0 -msgid "The weight of a full package, pallet or box." -msgstr "" - -#. module: product -#: model:product.uom,name:product.product_uom_unit -msgid "PCE" -msgstr "" - -#. module: product -#: model:ir.actions.act_window,name:product.product_pricelist_action2 -#: model:ir.actions.act_window,name:product.product_pricelist_action_for_purchase -#: model:ir.ui.menu,name:product.menu_product_pricelist_action2 -#: model:ir.ui.menu,name:product.menu_product_pricelist_main -msgid "Pricelists" -msgstr "" - -#. module: product -#: view:product.template:0 -msgid "Miscelleanous" +msgid "Second UoM" msgstr "" #. module: product @@ -609,16 +1206,6 @@ msgstr "" msgid "Error !" msgstr "" -#. module: product -#: report:product.pricelist:0 -msgid "Price List Name" -msgstr "" - -#. module: product -#: help:product.pricelist.item,base:0 -msgid "The mode for computing the price for this rule." -msgstr "" - #. module: product #: model:ir.actions.act_window,name:product.product_uom_form_action #: model:ir.ui.menu,name:product.menu_product_uom_form_action @@ -627,40 +1214,14 @@ msgstr "" msgid "Units of Measure" msgstr "" -#. module: product -#: field:product.supplierinfo,delay:0 -msgid "Delivery Lead Time" -msgstr "" - #. module: product #: field:product.supplierinfo,min_qty:0 msgid "Minimal Quantity" msgstr "" #. module: product -#: view:product.product:0 -msgid "Miscellaneous" -msgstr "" - -#. module: product -#: help:product.uom,active:0 -msgid "By unchecking the active field you can disable a unit of measure without deleting it." -msgstr "" - -#. module: product -#: model:ir.actions.act_window,name:product.product_uom_categ_form_action -#: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action -msgid "UoM Categories" -msgstr "" - -#. module: product -#: help:product.template,sale_ok:0 -msgid "Determines if the product can be visible in the list of product within a selection from a sale order line." -msgstr "" - -#. module: product -#: field:product.template,seller_delay:0 -msgid "Supplier Lead Time" +#: model:product.category,name:product.product_category_pc +msgid "PC" msgstr "" #. module: product @@ -669,13 +1230,8 @@ msgid "This supplier's product code will be used when printing a request for quo msgstr "" #. module: product -#: model:product.pricelist.version,name:product.ver0 -msgid "Default Public Pricelist Version" -msgstr "" - -#. module: product -#: field:product.pricelist.type,key:0 -msgid "Key" +#: selection:product.template,procure_method:0 +msgid "Make to Stock" msgstr "" #. module: product @@ -693,28 +1249,14 @@ msgstr "" msgid "Gives the order in which the pricelist items will be checked. The evaluation gives highest priority to lowest sequence and stops as soon as a matching item is found." msgstr "" -#. module: product -#: model:ir.actions.report.xml,name:product.report_product_pricelist -#: model:ir.model,name:product.model_product_pricelist -#: field:product.product,price:0 -#: field:product.product,pricelist_id:0 -#: view:product.supplierinfo:0 -msgid "Pricelist" -msgstr "" - #. module: product #: selection:product.template,type:0 msgid "Consumable" msgstr "" #. module: product -#: model:ir.actions.act_window,help:product.product_form_config_action -msgid "Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased." -msgstr "" - -#. module: product -#: view:product.uom:0 -msgid " e.g: 1 * (this unit) = ratio * (reference unit)" +#: help:product.price.type,currency_id:0 +msgid "The currency the field is expressed in." msgstr "" #. module: product @@ -723,49 +1265,8 @@ msgid "The gross weight in Kg." msgstr "" #. module: product -#: selection:product.ul,type:0 -msgid "Box" -msgstr "" - -#. module: product -#: code:addons/product/product.py:418 -#, python-format -msgid "Products: " -msgstr "" - -#. module: product -#: model:product.uom,name:product.uom_hour -msgid "Hour" -msgstr "" - -#. module: product -#: field:product.category,parent_id:0 -msgid "Parent Category" -msgstr "" - -#. module: product -#: selection:product.template,state:0 -msgid "In Development" -msgstr "" - -#. module: product -#: help:product.pricelist.type,key:0 -msgid "Used in the code to select specific prices based on the context. Keep unchanged." -msgstr "" - -#. module: product -#: field:product.packaging,weight:0 -msgid "Total Package Weight" -msgstr "" - -#. module: product -#: view:product.product:0 -msgid "Context..." -msgstr "" - -#. module: product -#: help:product.template,procure_method:0 -msgid "'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request." +#: model:product.template,name:product.product_product_sidepanel0_product_template +msgid "Side Panel" msgstr "" #. module: product @@ -774,12 +1275,6 @@ msgstr "" msgid "Procurement" msgstr "" -#. module: product -#: model:ir.actions.act_window,name:product.product_category_action -#: model:ir.ui.menu,name:product.menu_products_category -msgid "Products by Category" -msgstr "" - #. module: product #: view:product.product:0 #: view:product.template:0 @@ -791,65 +1286,14 @@ msgstr "" msgid "UoM Category" msgstr "" -#. module: product -#: view:product.product:0 -#: model:res.groups,name:product.group_product_variant -msgid "Product Variant" -msgstr "" - -#. module: product -#: help:product.supplierinfo,product_name:0 -msgid "This supplier's product name will be used when printing a request for quotation. Keep empty to use the internal one." -msgstr "" - -#. module: product -#: field:product.packaging,ul:0 -msgid "Type of Package" -msgstr "" - #. module: product #: field:product.template,loc_rack:0 msgid "Rack" msgstr "" #. module: product -#: selection:product.ul,type:0 -msgid "Pack" -msgstr "" - -#. module: product -#: field:product.product,ean13:0 -msgid "EAN13" -msgstr "" - -#. module: product -#: view:product.uom:0 -msgid "Ratio & Precision" -msgstr "" - -#. module: product -#: field:product.template,uos_id:0 -msgid "Unit of Sale" -msgstr "" - -#. module: product -#: field:product.template,seller_id:0 -msgid "Main Supplier" -msgstr "" - -#. module: product -#: help:product.template,type:0 -msgid "Will change the way procurements are processed. Consumable are product where you don't manage stock." -msgstr "" - -#. module: product -#: model:product.uom.categ,name:product.product_uom_categ_kgm -msgid "Weight" -msgstr "" - -#. module: product -#: help:product.uom,category_id:0 -msgid "Quantity conversions may happen automatically between Units of Measure in the same category, according to their respective ratios." +#: field:product.template,uom_po_id:0 +msgid "Purchase Unit of Measure" msgstr "" #. module: product @@ -863,52 +1307,18 @@ msgid "Here is a list of all your products classified by category. You can click msgstr "" #. module: product -#: selection:product.template,state:0 -msgid "Obsolete" -msgstr "" - -#. module: product -#: model:process.node,name:product.process_node_supplier0 -#: view:product.supplierinfo:0 -msgid "Supplier Information" -msgstr "" - -#. module: product -#: help:product.product,active:0 -msgid "If the active field is set to False, it will allow you to hide the product without removing it." -msgstr "" - -#. module: product -#: model:ir.actions.act_window,name:product.product_ul_form_action -#: model:ir.model,name:product.model_product_packaging -#: model:ir.ui.menu,name:product.menu_product_ul_form_action -#: view:product.packaging:0 #: view:product.product:0 -#: view:product.ul:0 -msgid "Packaging" +msgid "Group by..." msgstr "" #. module: product -#: field:product.price.type,currency_id:0 -#: report:product.pricelist:0 -#: field:product.pricelist,currency_id:0 -msgid "Currency" +#: model:product.template,name:product.product_product_cpu_gen_product_template +msgid "Regular processor config" msgstr "" #. module: product -#: help:product.price.type,currency_id:0 -msgid "The currency the field is expressed in." -msgstr "" - -#. module: product -#: help:product.uom,rounding:0 -msgid "The computed quantity will be a multiple of this value. Use 1.0 for a UoM that cannot be further split, such as a piece." -msgstr "" - -#. module: product -#: view:product.product:0 -#: view:product.template:0 -msgid "Descriptions" +#: help:product.template,type:0 +msgid "Will change the way procurements are processed. Consumable are product where you don't manage stock." msgstr "" #. module: product @@ -917,29 +1327,13 @@ msgid "Start Date" msgstr "" #. module: product -#: view:res.partner:0 -msgid "Sales Properties" +#: help:product.template,produce_delay:0 +msgid "Average delay in days to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders." msgstr "" #. module: product -#: field:product.template,loc_row:0 -msgid "Row" -msgstr "" - -#. module: product -#: view:product.product:0 -#: field:product.template,categ_id:0 -msgid "Category" -msgstr "" - -#. module: product -#: help:product.pricelist.item,min_quantity:0 -msgid "The rule only applies if the partner buys/sells more than this quantity." -msgstr "" - -#. module: product -#: selection:product.template,cost_method:0 -msgid "Standard Price" +#: model:product.template,name:product.product_product_pc1_product_template +msgid "Basic PC" msgstr "" #. module: product @@ -948,15 +1342,8 @@ msgid "If the active field is set to False, it will allow you to hide the pricel msgstr "" #. module: product -#: model:ir.actions.act_window,name:product.product_category_action_form -#: model:ir.ui.menu,name:product.menu_product_category_action_form -#: view:product.category:0 -msgid "Product Categories" -msgstr "" - -#. module: product -#: field:product.uom,uom_type:0 -msgid "UoM Type" +#: model:product.uom,name:product.product_uom_cm +msgid "cm" msgstr "" #. module: product @@ -965,45 +1352,13 @@ msgid "Product Unit of Measure" msgstr "" #. module: product -#: help:product.template,uom_po_id:0 -msgid "Default Unit of Measure used for purchase orders. It must be in the same category than the default unit of measure." +#: constraint:product.template:0 +msgid "Error: The default UOM and the purchase UOM must be in the same category." msgstr "" #. module: product -#: help:product.supplierinfo,product_uom:0 -msgid "This comes from the product form." -msgstr "" - -#. module: product -#: model:ir.actions.act_window,help:product.product_normal_action -#: model:ir.actions.act_window,help:product.product_normal_action_sell -msgid "You must define a Product for everything you buy or sell. Products can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on." -msgstr "" - -#. module: product -#: view:product.pricelist.item:0 -msgid "Products Listprices Items" -msgstr "" - -#. module: product -#: help:product.packaging,ul_qty:0 -msgid "The number of packages by layer" -msgstr "" - -#. module: product -#: help:product.uom,factor_inv:0 -msgid "How many times this UoM is bigger than the reference UoM in this category:\n" -"1 * (this unit) = ratio * (reference unit)" -msgstr "" - -#. module: product -#: help:product.packaging,width:0 -msgid "The width of the package" -msgstr "" - -#. module: product -#: field:product.packaging,qty:0 -msgid "Quantity by Package" +#: field:product.uom,rounding:0 +msgid "Rounding Precision" msgstr "" #. module: product @@ -1012,33 +1367,8 @@ msgid "Unit of Measure Properties" msgstr "" #. module: product -#: help:product.template,standard_price:0 -msgid "Product's cost for accounting stock valuation. It is the base price for the supplier price." -msgstr "" - -#. module: product -#: help:product.supplierinfo,qty:0 -msgid "This is a quantity which is converted into Default Uom." -msgstr "" - -#. module: product -#: model:ir.actions.act_window,help:product.product_uom_form_action -msgid "Create and manage the units of measure you want to be used in your system. You can define a conversion rate between several Units of Measure within the same category." -msgstr "" - -#. module: product -#: model:ir.actions.act_window,help:product.product_ul_form_action -msgid "Create and manage your packaging dimensions and types you want to be maintained in your system." -msgstr "" - -#. module: product -#: help:product.template,categ_id:0 -msgid "Select category for the current product" -msgstr "" - -#. module: product -#: field:product.product,outgoing_qty:0 -msgid "Outgoing" +#: model:product.template,name:product.product_product_shelf1_product_template +msgid "Rack 200cm" msgstr "" #. module: product @@ -1047,48 +1377,8 @@ msgid "Buy" msgstr "" #. module: product -#: selection:product.uom,uom_type:0 -msgid "Reference UoM for this category" -msgstr "" - -#. module: product -#: model:ir.model,name:product.model_product_pricelist_version -#: view:product.pricelist:0 -#: view:product.pricelist.version:0 -msgid "Pricelist Version" -msgstr "" - -#. module: product -#: help:product.packaging,sequence:0 -msgid "Gives the sequence order when displaying a list of packaging." -msgstr "" - -#. module: product -#: selection:product.category,type:0 -#: selection:product.template,state:0 -msgid "Normal" -msgstr "" - -#. module: product -#: code:addons/product/pricelist.py:178 -#, python-format -msgid "At least one pricelist has no active version !\n" -"Please create or activate one." -msgstr "" - -#. module: product -#: field:product.template,seller_info_id:0 -msgid "unknown" -msgstr "" - -#. module: product -#: field:product.pricelist.item,price_max_margin:0 -msgid "Max. Price Margin" -msgstr "" - -#. module: product -#: view:res.partner:0 -msgid "Sales & Purchases" +#: view:product.uom.categ:0 +msgid "Units of Measure categories" msgstr "" #. module: product @@ -1097,29 +1387,8 @@ msgid "The weight of the empty UL" msgstr "" #. module: product -#: help:product.packaging,code:0 -msgid "The code of the transport unit." -msgstr "" - -#. module: product -#: view:product.uom:0 -msgid " e.g: 1 * (reference unit) = ratio * (this unit)" -msgstr "" - -#. module: product -#: code:addons/product/pricelist.py:375 -#, python-format -msgid "Other Pricelist" -msgstr "" - -#. module: product -#: view:product.price.type:0 -msgid "Products Price Type" -msgstr "" - -#. module: product -#: field:product.template,product_manager:0 -msgid "Product Manager" +#: model:product.template,name:product.product_product_woodmm10_product_template +msgid "Wood 10mm" msgstr "" #. module: product @@ -1127,16 +1396,6 @@ msgstr "" msgid "Smaller than the reference UoM" msgstr "" -#. module: product -#: field:product.product,price_extra:0 -msgid "Variant Price Extra" -msgstr "" - -#. module: product -#: model:ir.model,name:product.model_product_supplierinfo -msgid "Information about a product supplier" -msgstr "" - #. module: product #: field:product.price.type,active:0 #: field:product.pricelist,active:0 @@ -1152,82 +1411,18 @@ msgid "Variant Price Margin" msgstr "" #. module: product -#: field:product.supplierinfo,product_name:0 -msgid "Supplier Product Name" +#: sql_constraint:product.uom:0 +msgid "The conversion ratio for a unit of measure cannot be 0!" msgstr "" #. module: product -#: model:ir.actions.act_window,help:product.product_normal_action_puchased -msgid "Products can be purchased and/or sold. They can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on." +#: help:product.packaging,ean:0 +msgid "The EAN code of the package unit." msgstr "" #. module: product -#: help:product.product,qty_available:0 -msgid "Current quantity of products.\n" -"In a context with a single Stock Location, this includes goods stored at this Location, or any of its children.\n" -"In a context with a single Warehouse, this includes goods stored in the Stock Location of this Warehouse, or any of its children.\n" -"In a context with a single Shop, this includes goods stored in the Stock Location of the Warehouse of this Shop, or any of its children.\n" -"Otherwise, this includes goods stored in any Stock Location typed as 'internal'." -msgstr "" - -#. module: product -#: field:product.template,rental:0 -msgid "Can be Rent" -msgstr "" - -#. module: product -#: model:product.price.type,name:product.standard_price -#: field:product.template,standard_price:0 -msgid "Cost Price" -msgstr "" - -#. module: product -#: view:product.product:0 -#: view:product.template:0 -#: field:product.template,description_purchase:0 -msgid "Purchase Description" -msgstr "" - -#. module: product -#: view:product.pricelist:0 -msgid "Products Price Search" -msgstr "" - -#. module: product -#: view:product.product:0 -#: view:product.template:0 -msgid "Second UoM" -msgstr "" - -#. module: product -#: model:ir.actions.act_window,name:product.product_template_action_tree -msgid "Product Templates" -msgstr "" - -#. module: product -#: view:product.product:0 -#: view:product.template:0 -msgid "Storage Localisation" -msgstr "" - -#. module: product -#: help:product.packaging,length:0 -msgid "The length of the package" -msgstr "" - -#. module: product -#: field:product.pricelist.item,price_min_margin:0 -msgid "Min. Price Margin" -msgstr "" - -#. module: product -#: field:product.pricelist.version,items_id:0 -msgid "Price List Items" -msgstr "" - -#. module: product -#: field:product.template,weight:0 -msgid "Gross weight" +#: help:product.supplierinfo,product_uom:0 +msgid "This comes from the product form." msgstr "" #. module: product @@ -1236,20 +1431,8 @@ msgid "Empty Package Weight" msgstr "" #. module: product -#: model:ir.model,name:product.model_product_category -#: field:product.pricelist.item,categ_id:0 -msgid "Product Category" -msgstr "" - -#. module: product -#: model:ir.actions.act_window,name:product.product_price_type_action -#: model:ir.ui.menu,name:product.menu_product_price_type -msgid "Price Types" -msgstr "" - -#. module: product -#: constraint:product.pricelist.item:0 -msgid "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!" +#: field:product.price.type,field:0 +msgid "Product Field" msgstr "" #. module: product @@ -1257,11 +1440,6 @@ msgstr "" msgid "Measure Type" msgstr "" -#. module: product -#: model:ir.actions.act_window,help:product.product_pricelist_action -msgid "There can be more than one version of a pricelist. Here you can create and manage new versions of a price list. Some examples of versions: 2010, 2011, Summer Promotion, etc." -msgstr "" - #. module: product #: help:product.uom,factor:0 msgid "How many times this UoM is smaller than the reference UoM in this category:\n" @@ -1269,44 +1447,9 @@ msgid "How many times this UoM is smaller than the reference UoM in this categor msgstr "" #. module: product -#: help:product.template,state:0 -msgid "Tells the user if he can use the product or not." -msgstr "" - -#. module: product -#: selection:product.template,type:0 -msgid "Stockable Product" -msgstr "" - -#. module: product -#: field:pricelist.partnerinfo,min_quantity:0 -#: field:product.supplierinfo,qty:0 -msgid "Quantity" -msgstr "" - -#. module: product -#: field:product.packaging,code:0 -msgid "Code" -msgstr "" - -#. module: product -#: model:product.uom,name:product.product_uom_gram -msgid "g" -msgstr "" - -#. module: product -#: view:product.supplierinfo:0 -msgid "Seq" -msgstr "" - -#. module: product -#: view:product.price_list:0 -msgid "Calculate Product Price per unit base on pricelist version." -msgstr "" - -#. module: product -#: selection:product.template,mes_type:0 -msgid "Variable" +#: model:ir.actions.act_window,name:product.product_price_type_action +#: model:ir.ui.menu,name:product.menu_product_price_type +msgid "Price Types" msgstr "" #. module: product @@ -1315,162 +1458,13 @@ msgid "Default Unit of Measure used for all stock operation." msgstr "" #. module: product -#: model:ir.model,name:product.model_product_ul -msgid "Shipping Unit" +#: model:product.category,name:product.product_category_misc0 +msgid "Misc" msgstr "" #. module: product -#: field:product.packaging,height:0 -msgid "Height" -msgstr "" - -#. module: product -#: help:product.pricelist.version,date_end:0 -msgid "Ending date for this pricelist version to be valid." -msgstr "" - -#. module: product -#: field:pricelist.partnerinfo,suppinfo_id:0 -msgid "Partner Information" -msgstr "" - -#. module: product -#: selection:product.category,type:0 -msgid "View" -msgstr "" - -#. module: product -#: model:product.category,name:product.cat0 -msgid "All products" -msgstr "" - -#. module: product -#: view:product.price_list:0 -msgid "Close" -msgstr "" - -#. module: product -#: model:ir.model,name:product.model_product_pricelist_item -msgid "Pricelist item" -msgstr "" - -#. module: product -#: help:product.price.type,name:0 -msgid "Name of this kind of price." -msgstr "" - -#. module: product -#: model:product.pricelist,name:product.list0 -msgid "Public Pricelist" -msgstr "" - -#. module: product -#: field:product.product,product_image:0 -msgid "Image" -msgstr "" - -#. module: product -#: selection:product.ul,type:0 -#: model:product.uom.categ,name:product.product_uom_categ_unit -msgid "Unit" -msgstr "" - -#. module: product -#: help:product.template,produce_delay:0 -msgid "Average delay in days to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders." -msgstr "" - -#. module: product -#: field:product.price_list,qty2:0 -msgid "Quantity-2" -msgstr "" - -#. module: product -#: view:product.product:0 -#: view:product.template:0 -msgid "Information" -msgstr "" - -#. module: product -#: view:product.product:0 -msgid "Codes" -msgstr "" - -#. module: product -#: field:product.price_list,qty4:0 -msgid "Quantity-4" -msgstr "" - -#. module: product -#: field:product.price_list,qty5:0 -msgid "Quantity-5" -msgstr "" - -#. module: product -#: view:product.packaging:0 -msgid "Other Info" -msgstr "" - -#. module: product -#: model:product.uom,name:product.product_uom_meter -msgid "m" -msgstr "" - -#. module: product -#: view:product.product:0 -#: view:product.template:0 -msgid "Delays" -msgstr "" - -#. module: product -#: model:product.uom.categ,name:product.uom_categ_wtime -msgid "Working Time" -msgstr "" - -#. module: product -#: view:product.product:0 -msgid "Default UOM" -msgstr "" - -#. module: product -#: view:product.product:0 -msgid "Both stockable and consumable products" -msgstr "" - -#. module: product -#: selection:product.ul,type:0 -msgid "Pallet" -msgstr "" - -#. module: product -#: model:process.node,note:product.process_node_product0 -msgid "Creation of the product" -msgstr "" - -#. module: product -#: model:ir.actions.act_window,help:product.product_uom_categ_form_action -msgid "Create and manage the units of measure categories you want to be used in your system. If several units of measure are in the same category, they can be converted to each other. For example, in the unit of measure category \"Time\", you will have the following UoM: Hours, Days." -msgstr "" - -#. module: product -#: selection:product.uom,uom_type:0 -msgid "Bigger than the reference UoM" -msgstr "" - -#. module: product -#: model:ir.actions.act_window,help:product.product_pricelist_action2 -#: model:ir.actions.act_window,help:product.product_pricelist_action_for_purchase -msgid "A price list contains rules to be evaluated in order to compute the purchase or sales price for all the partners assigned to a price list. Price lists have several versions (2010, 2011, Promotion of February 2010, etc.) and each version has several rules. Example: the customer price of a product category will be based on the supplier price multiplied by 1.80." -msgstr "" - -#. module: product -#: field:product.packaging,ul_qty:0 -msgid "Package by layer" -msgstr "" - -#. module: product -#: view:product.uom.categ:0 -msgid "Units of Measure categories" +#: model:product.template,name:product.product_product_pc4_product_template +msgid "Customizable PC" msgstr "" #. module: product @@ -1479,8 +1473,39 @@ msgid "Unit Price" msgstr "" #. module: product -#: field:product.category,parent_right:0 -msgid "Right Parent" +#: model:product.category,name:product.product_category_7 +#: model:product.template,name:product.product_product_1_product_template +msgid "Onsite Intervention" +msgstr "" + +#. module: product +#: model:product.pricelist,name:product.list0 +msgid "Public Pricelist" +msgstr "" + +#. module: product +#: model:product.category,name:product.product_category_marketableproduct0 +msgid "Marketable Products" +msgstr "" + +#. module: product +#: field:product.supplierinfo,product_code:0 +msgid "Supplier Product Code" +msgstr "" + +#. module: product +#: view:product.product:0 +msgid "Default UOM" +msgstr "" + +#. module: product +#: selection:product.ul,type:0 +msgid "Pallet" +msgstr "" + +#. module: product +#: field:product.packaging,ul_qty:0 +msgid "Package by layer" msgstr "" #. module: product @@ -1506,14 +1531,531 @@ msgid "Product" msgstr "" #. module: product -#: help:product.template,sale_delay:0 -msgid "This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers." +#: selection:product.template,supply_method:0 +msgid "Produce" +msgstr "" + +#. module: product +#: selection:product.template,procure_method:0 +msgid "Make to Order" +msgstr "" + +#. module: product +#: code:addons/product/report/product_pricelist.py:49 +#, python-format +msgid "units" +msgstr "" + +#. module: product +#: help:product.template,supply_method:0 +msgid "Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested." +msgstr "" + +#. module: product +#: field:product.product,variants:0 +msgid "Variants" +msgstr "" + +#. module: product +#: model:ir.actions.act_window,name:product.product_category_action +#: model:ir.ui.menu,name:product.menu_products_category +msgid "Products by Category" +msgstr "" + +#. module: product +#: field:product.template,uos_coeff:0 +msgid "UOM -> UOS Coeff" +msgstr "" + +#. module: product +#: help:product.supplierinfo,sequence:0 +msgid "Assigns the priority to the list of product supplier." +msgstr "" + +#. module: product +#: field:product.template,uom_id:0 +msgid "Default Unit Of Measure" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_tow1_product_template +msgid "ATX Mid-size Tower" +msgstr "" + +#. module: product +#: view:product.pricelist.item:0 +msgid "Rounding Method" +msgstr "" + +#. module: product +#: model:product.category,name:product.product_category_assembly +msgid "Assembly Service" +msgstr "" + +#. module: product +#: model:ir.actions.report.xml,name:product.report_product_label +msgid "Products Labels" +msgstr "" + +#. module: product +#: model:product.ul,name:product.product_ul_big_box +msgid "Box 30x40x60" +msgstr "" + +#. module: product +#: selection:product.template,type:0 +msgid "Service" +msgstr "" + +#. module: product +#: help:product.packaging,height:0 +msgid "The height of the package" +msgstr "" + +#. module: product +#: view:product.pricelist:0 +msgid "Products Price List" +msgstr "" + +#. module: product +#: field:product.pricelist,company_id:0 +#: field:product.pricelist.item,company_id:0 +#: field:product.pricelist.version,company_id:0 +#: view:product.product:0 +#: field:product.supplierinfo,company_id:0 +#: field:product.template,company_id:0 +msgid "Company" +msgstr "" + +#. module: product +#: help:product.template,list_price:0 +msgid "Base price for computing the customer price. Sometimes called the catalog price." +msgstr "" + +#. module: product +#: code:addons/product/pricelist.py:376 +#, python-format +msgid "Partner section of the product form" +msgstr "" + +#. module: product +#: help:product.price.type,name:0 +msgid "Name of this kind of price." +msgstr "" + +#. module: product +#: field:product.supplierinfo,product_uom:0 +msgid "Supplier UoM" +msgstr "" + +#. module: product +#: help:product.pricelist.version,date_start:0 +msgid "Starting date for this pricelist version to be valid." +msgstr "" + +#. module: product +#: help:product.template,uom_po_id:0 +msgid "Default Unit of Measure used for purchase orders. It must be in the same category than the default unit of measure." +msgstr "" + +#. module: product +#: model:product.template,description:product.product_product_cpu1_product_template +msgid "This product is configured with example of push/pull flows" +msgstr "" + +#. module: product +#: field:product.packaging,length:0 +msgid "Length" +msgstr "" + +#. module: product +#: model:product.uom.categ,name:product.uom_categ_length +msgid "Length / Distance" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_0_product_template +msgid "Onsite Senior Intervention" +msgstr "" + +#. module: product +#: model:ir.model,name:product.model_product_pricelist_type +#: field:product.pricelist,type:0 +msgid "Pricelist Type" +msgstr "" + +#. module: product +#: model:product.category,name:product.product_category_otherproducts0 +msgid "Other Products" +msgstr "" + +#. module: product +#: field:product.product,color:0 +msgid "Color Index" +msgstr "" + +#. module: product +#: view:product.product:0 +msgid "Characteristics" +msgstr "" + +#. module: product +#: field:product.template,sale_ok:0 +msgid "Can be Sold" +msgstr "" + +#. module: product +#: field:product.template,produce_delay:0 +msgid "Manufacturing Lead Time" +msgstr "" + +#. module: product +#: field:product.supplierinfo,pricelist_ids:0 +msgid "Supplier Pricelist" msgstr "" #. module: product #: code:addons/product/product.py:175 #, python-format -msgid "Cannot change the category of existing UoM '%s'." +msgid "Warning" +msgstr "" + +#. module: product +#: field:product.pricelist.item,base:0 +msgid "Based on" +msgstr "" + +#. module: product +#: model:product.uom,name:product.product_uom_ton +msgid "t" +msgstr "" + +#. module: product +#: model:product.category,name:product.product_category_rawmaterial0 +msgid "Raw Materials" +msgstr "" + +#. module: product +#: help:product.template,product_manager:0 +msgid "This is use as task responsible" +msgstr "" + +#. module: product +#: field:product.pricelist,name:0 +msgid "Pricelist Name" +msgstr "" + +#. module: product +#: model:ir.model,name:product.model_product_pricelist_version +#: view:product.pricelist:0 +#: view:product.pricelist.version:0 +msgid "Pricelist Version" +msgstr "" + +#. module: product +#: view:product.pricelist.item:0 +msgid "* ( 1 + " +msgstr "" + +#. module: product +#: help:product.packaging,weight:0 +msgid "The weight of a full package, pallet or box." +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_hdd2_product_template +msgid "HDD Seagate 7200.8 120GB" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_employee0_product_template +msgid "Employee" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_shelfofcm0_product_template +msgid "Shelf of 100cm" +msgstr "" + +#. module: product +#: model:ir.model,name:product.model_product_category +#: field:product.pricelist.item,categ_id:0 +msgid "Product Category" +msgstr "" + +#. module: product +#: report:product.pricelist:0 +msgid "Price List Name" +msgstr "" + +#. module: product +#: field:product.supplierinfo,delay:0 +msgid "Delivery Lead Time" +msgstr "" + +#. module: product +#: help:product.uom,active:0 +msgid "By unchecking the active field you can disable a unit of measure without deleting it." +msgstr "" + +#. module: product +#: model:ir.actions.act_window,name:product.product_uom_categ_form_action +#: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action +msgid "UoM Categories" +msgstr "" + +#. module: product +#: field:product.template,seller_delay:0 +msgid "Supplier Lead Time" +msgstr "" + +#. module: product +#: selection:product.ul,type:0 +msgid "Box" +msgstr "" + +#. module: product +#: model:ir.actions.act_window,help:product.product_ul_form_action +msgid "Create and manage your packaging dimensions and types you want to be maintained in your system." +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_rearpanelarm1_product_template +msgid "Rear Panel SHE200" +msgstr "" + +#. module: product +#: help:product.pricelist.type,key:0 +msgid "Used in the code to select specific prices based on the context. Keep unchanged." +msgstr "" + +#. module: product +#: view:product.product:0 +msgid "Context..." +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_hdd1_product_template +msgid "HDD Seagate 7200.8 80GB" +msgstr "" + +#. module: product +#: help:product.supplierinfo,qty:0 +msgid "This is a quantity which is converted into Default Uom." +msgstr "" + +#. module: product +#: field:product.packaging,ul:0 +msgid "Type of Package" +msgstr "" + +#. module: product +#: selection:product.ul,type:0 +msgid "Pack" +msgstr "" + +#. module: product +#: model:product.category,name:product.product_category_4 +msgid "Dello Computer" +msgstr "" + +#. module: product +#: model:product.uom.categ,name:product.product_uom_categ_kgm +msgid "Weight" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_22_product_template +msgid "Processor on demand" +msgstr "" + +#. module: product +#: model:process.transition,name:product.process_transition_supplierofproduct0 +msgid "Supplier of the product" +msgstr "" + +#. module: product +#: field:product.product,product_image:0 +msgid "Image" +msgstr "" + +#. module: product +#: field:product.uom,uom_type:0 +msgid "UoM Type" +msgstr "" + +#. module: product +#: help:product.product,active:0 +msgid "If the active field is set to False, it will allow you to hide the product without removing it." +msgstr "" + +#. module: product +#: help:product.uom,rounding:0 +msgid "The computed quantity will be a multiple of this value. Use 1.0 for a UoM that cannot be further split, such as a piece." +msgstr "" + +#. module: product +#: view:product.product:0 +#: view:product.template:0 +msgid "Descriptions" +msgstr "" + +#. module: product +#: field:product.template,loc_row:0 +msgid "Row" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_rearpanelarm0_product_template +msgid "Rear Panel SHE100" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_23_product_template +msgid "Complete PC With Peripherals" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_hotelexpenses0_product_template +msgid "Hotel Expenses" +msgstr "" + +#. module: product +#: help:product.uom,factor_inv:0 +msgid "How many times this UoM is bigger than the reference UoM in this category:\n" +"1 * (this unit) = ratio * (reference unit)" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_shelf0_product_template +msgid "Rack 100cm" +msgstr "" + +#. module: product +#: help:product.packaging,sequence:0 +msgid "Gives the sequence order when displaying a list of packaging." +msgstr "" + +#. module: product +#: field:product.pricelist.item,price_round:0 +msgid "Price Rounding" +msgstr "" + +#. module: product +#: code:addons/product/pricelist.py:178 +#, python-format +msgid "At least one pricelist has no active version !\n" +"Please create or activate one." +msgstr "" + +#. module: product +#: field:product.pricelist.item,price_max_margin:0 +msgid "Max. Price Margin" +msgstr "" + +#. module: product +#: help:product.supplierinfo,product_name:0 +msgid "This supplier's product name will be used when printing a request for quotation. Keep empty to use the internal one." +msgstr "" + +#. module: product +#: selection:product.template,mes_type:0 +msgid "Variable" +msgstr "" + +#. module: product +#: field:product.template,rental:0 +msgid "Can be Rent" +msgstr "" + +#. module: product +#: model:product.price.type,name:product.standard_price +#: field:product.template,standard_price:0 +msgid "Cost Price" +msgstr "" + +#. module: product +#: field:product.pricelist.item,price_min_margin:0 +msgid "Min. Price Margin" +msgstr "" + +#. module: product +#: field:product.template,weight:0 +msgid "Gross weight" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_assemblysection0_product_template +msgid "Assembly Section" +msgstr "" + +#. module: product +#: model:product.category,name:product.product_category_3 +msgid "Computer Stuff" +msgstr "" + +#. module: product +#: model:product.category,name:product.product_category_8 +msgid "Phone Help" +msgstr "" + +#. module: product +#: field:product.category,sequence:0 +#: field:product.packaging,sequence:0 +#: field:product.pricelist.item,sequence:0 +#: field:product.supplierinfo,sequence:0 +msgid "Sequence" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_assembly_product_template +msgid "Assembly Service Cost" +msgstr "" + +#. module: product +#: view:product.price_list:0 +msgid "Close" +msgstr "" + +#. module: product +#: model:ir.model,name:product.model_product_pricelist_item +msgid "Pricelist item" +msgstr "" + +#. module: product +#: model:product.template,name:product.product_product_21_product_template +msgid "RAM on demand" +msgstr "" + +#. module: product +#: view:res.partner:0 +msgid "Sales Properties" +msgstr "" + +#. module: product +#: view:product.product:0 +#: view:product.template:0 +msgid "Delays" +msgstr "" + +#. module: product +#: view:product.product:0 +msgid "Both stockable and consumable products" +msgstr "" + +#. module: product +#: model:process.node,note:product.process_node_product0 +msgid "Creation of the product" +msgstr "" + +#. module: product +#: field:pricelist.partnerinfo,name:0 +#: field:product.packaging,name:0 +#: report:product.pricelist:0 +#: view:product.product:0 +#: view:product.template:0 +#: field:product.template,description:0 +msgid "Description" msgstr "" #. module: product @@ -1526,88 +2068,14 @@ msgstr "" msgid "Product Description" msgstr "" -#. module: product -#: help:product.packaging,qty:0 -msgid "The total number of products you can put by pallet or box." -msgstr "" - -#. module: product -#: help:product.product,ean13:0 -msgid "Barcode" -msgstr "" - -#. module: product -#: model:ir.model,name:product.model_product_uom_categ -msgid "Product uom categ" -msgstr "" - -#. module: product -#: field:product.price_list,qty3:0 -msgid "Quantity-3" -msgstr "" - -#. module: product -#: help:product.product,outgoing_qty:0 -msgid "Quantity of products that are planned to leave.\n" -"In a context with a single Stock Location, this includes goods leaving from this Location, or any of its children.\n" -"In a context with a single Warehouse, this includes goods leaving from the Stock Location of this Warehouse, or any of its children.\n" -"In a context with a single Shop, this includes goods leaving from the Stock Location of the Warehouse of this Shop, or any of its children.\n" -"Otherwise, this includes goods leaving from any Stock Location typed as 'internal'." -msgstr "" - -#. module: product -#: selection:product.template,supply_method:0 -msgid "Produce" -msgstr "" - -#. module: product -#: selection:product.template,procure_method:0 -msgid "Make to Order" -msgstr "" - -#. module: product -#: view:product.template:0 -msgid "UOM" -msgstr "" - -#. module: product -#: field:product.pricelist.item,price_surcharge:0 -msgid "Price Surcharge" -msgstr "" - -#. module: product -#: constraint:product.pricelist.version:0 -msgid "You cannot have 2 pricelist versions that overlap!" -msgstr "" - -#. module: product -#: code:addons/product/report/product_pricelist.py:49 -#, python-format -msgid "units" -msgstr "" - -#. module: product -#: model:ir.actions.act_window,name:product.action_product_price_list -#: model:ir.model,name:product.model_product_price_list -#: view:product.price_list:0 -#: report:product.pricelist:0 -#: field:product.pricelist.version,pricelist_id:0 -msgid "Price List" -msgstr "" - -#. module: product -#: field:product.product,variants:0 -msgid "Variants" -msgstr "" - #. module: product #: view:product.pricelist.item:0 -msgid "Price Computation" +msgid " ) + " msgstr "" #. module: product -#: model:res.groups,name:product.group_uos -msgid "Product UoS View" +#: field:product.template,volume:0 +msgid "Volume" msgstr "" #. module: product @@ -1616,47 +2084,20 @@ msgid "Case" msgstr "" #. module: product -#: field:product.pricelist.version,date_end:0 -msgid "End Date" -msgstr "" - -#. module: product -#: field:product.product,packaging:0 -msgid "Logistical Units" -msgstr "" - -#. module: product -#: field:product.category,complete_name:0 -#: field:product.category,name:0 -#: field:product.pricelist.type,name:0 -#: field:product.pricelist.version,name:0 #: view:product.product:0 -#: field:product.product,name_template:0 -#: field:product.template,name:0 -#: field:product.ul,name:0 -#: field:product.uom,name:0 -#: field:product.uom.categ,name:0 -msgid "Name" +#: model:res.groups,name:product.group_product_variant +msgid "Product Variant" msgstr "" #. module: product -#: field:product.template,purchase_ok:0 -msgid "Can be Purchased" +#: model:product.category,name:product.product_category_shelves0 +msgid "Shelves" msgstr "" #. module: product -#: field:product.template,uos_coeff:0 -msgid "UOM -> UOS Coeff" -msgstr "" - -#. module: product -#: help:res.partner,property_product_pricelist:0 -msgid "This pricelist will be used, instead of the default one, for sales to the current partner" -msgstr "" - -#. module: product -#: model:process.transition,note:product.process_transition_supplierofproduct0 -msgid "1 or several supplier(s) can be linked to a product. All information stands in the product form." +#: code:addons/product/pricelist.py:375 +#, python-format +msgid "Other Pricelist" msgstr "" #. module: product @@ -1679,34 +2120,8 @@ msgid "Palletization" msgstr "" #. module: product -#: field:product.packaging,length:0 -msgid "Length" -msgstr "" - -#. module: product -#: code:addons/product/product.py:363 -#, python-format -msgid "UoM categories Mismatch!" -msgstr "" - -#. module: product -#: field:product.template,volume:0 -msgid "Volume" -msgstr "" - -#. module: product -#: help:product.supplierinfo,sequence:0 -msgid "Assigns the priority to the list of product supplier." -msgstr "" - -#. module: product -#: field:product.template,uom_id:0 -msgid "Default Unit Of Measure" -msgstr "" - -#. module: product -#: help:product.packaging,ean:0 -msgid "The EAN code of the package unit." +#: help:product.template,volume:0 +msgid "The volume in m3." msgstr "" #. module: product @@ -1714,31 +2129,11 @@ msgstr "" msgid "End of Lifecycle" msgstr "" -#. module: product -#: field:pricelist.partnerinfo,name:0 -#: field:product.packaging,name:0 -#: report:product.pricelist:0 -#: view:product.product:0 -#: view:product.template:0 -#: field:product.template,description:0 -msgid "Description" -msgstr "" - #. module: product #: help:product.product,packaging:0 msgid "Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module." msgstr "" -#. module: product -#: help:product.supplierinfo,delay:0 -msgid "Lead time in days between the confirmation of the purchase order and the reception of the products in your warehouse. Used by the scheduler for automatic computation of the purchase order planning." -msgstr "" - -#. module: product -#: field:product.category,parent_left:0 -msgid "Left Parent" -msgstr "" - #. module: product #: model:ir.actions.act_window,name:product.product_pricelist_action #: model:ir.ui.menu,name:product.menu_product_pricelist_action @@ -1747,16 +2142,15 @@ msgid "Pricelist Versions" msgstr "" #. module: product -#: constraint:res.partner:0 -msgid "Error ! You cannot create recursive associated members." +#: model:product.template,name:product.product_product_span100_product_template +msgid "Shelf Panel" msgstr "" #. module: product -#: field:product.category,sequence:0 -#: field:product.packaging,sequence:0 -#: field:product.pricelist.item,sequence:0 -#: field:product.supplierinfo,sequence:0 -msgid "Sequence" +#: help:product.pricelist.item,price_round:0 +msgid "Sets the price so that it is a multiple of this value.\n" +"Rounding is applied after the discount and before the surcharge.\n" +"To have prices that end in 9.99, set rounding 10, surcharge -0.01" msgstr "" #. module: product @@ -1764,12 +2158,6 @@ msgstr "" msgid "Sale Price" msgstr "" -#. module: product -#: view:product.product:0 -#: view:product.template:0 -msgid "Procurement & Locations" -msgstr "" - #. module: product #: constraint:product.category:0 msgid "Error ! You cannot create recursive categories." @@ -1781,18 +2169,8 @@ msgid "Category Type" msgstr "" #. module: product -#: model:product.uom,name:product.product_uom_km -msgid "km" -msgstr "" - -#. module: product -#: help:product.template,uos_id:0 -msgid "Used by companies that manage two units of measure: invoicing and inventory management. For example, in food industries, you will manage a stock of ham but invoice in Kg. Keep empty to use the default UOM." -msgstr "" - -#. module: product -#: field:product.price_list,qty1:0 -msgid "Quantity-1" +#: model:product.category,name:product.cat2 +msgid "Private" msgstr "" #. module: product @@ -1802,34 +2180,8 @@ msgid "Coefficient to convert UOM to UOS\n" msgstr "" #. module: product -#: constraint:product.packaging:0 -#: constraint:product.product:0 -msgid "Error: Invalid ean code" -msgstr "" - -#. module: product -#: field:product.pricelist.item,min_quantity:0 -msgid "Min. Quantity" -msgstr "" - -#. module: product -#: model:ir.actions.report.xml,name:product.report_product_label -msgid "Products Labels" -msgstr "" - -#. module: product -#: help:product.template,volume:0 -msgid "The volume in m3." -msgstr "" - -#. module: product -#: model:ir.model,name:product.model_product_price_type -msgid "Price Type" -msgstr "" - -#. module: product -#: view:product.product:0 -msgid "To Sell" +#: constraint:res.partner:0 +msgid "Error ! You cannot create recursive associated members." msgstr "" #. module: product @@ -1837,8 +2189,3 @@ msgstr "" msgid "Price Discount" msgstr "" -#. module: product -#: help:product.category,sequence:0 -msgid "Gives the sequence order when displaying a list of product categories." -msgstr "" - diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot index 6d37505a478..e6049d9b711 100644 --- a/addons/stock/i18n/stock.pot +++ b/addons/stock/i18n/stock.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 6.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-24 13:20+0000\n" -"PO-Revision-Date: 2012-09-24 13:20+0000\n" +"POT-Creation-Date: 2012-10-08 12:28+0000\n" +"PO-Revision-Date: 2012-10-08 12:28+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -263,8 +263,10 @@ msgid "Non Inv" msgstr "" #. module: stock -#: view:stock.tracking:0 -msgid "Pack Identification" +#: code:addons/stock/wizard/stock_traceability.py:54 +#: view:stock.production.lot:0 +#, python-format +msgid "Downstream Traceability" msgstr "" #. module: stock @@ -623,6 +625,16 @@ msgstr "" msgid "Location Name" msgstr "" +#. module: stock +#: model:res.company,overdue_msg:stock.res_company_shop0 +#: model:res.company,overdue_msg:stock.res_company_tinyshop0 +msgid "Our records indicate that the following payments are still due. If the amount\n" +"has already been paid, please disregard this notice. However, if you have any\n" +"queries regarding your account, please contact us.\n" +"Thank you in advance.\n" +"" +msgstr "" + #. module: stock #: view:stock.inventory:0 msgid "Posted Inventory" @@ -705,6 +717,11 @@ msgstr "" msgid "Recipient" msgstr "" +#. module: stock +#: model:stock.location,name:stock.location_refrigerator +msgid "Refrigerator" +msgstr "" + #. module: stock #: model:ir.actions.act_window,name:stock.action_location_tree #: model:ir.ui.menu,name:stock.menu_action_location_tree @@ -800,6 +817,11 @@ msgstr "" msgid "Procurements" msgstr "" +#. module: stock +#: model:stock.location,name:stock.stock_location_3 +msgid "IT Suppliers" +msgstr "" + #. module: stock #: model:ir.actions.act_window,name:stock.action_inventory_form_draft msgid "Draft Physical Inventories" @@ -958,8 +980,8 @@ msgid "Please select multiple physical inventories to merge in the list view." msgstr "" #. module: stock -#: model:ir.actions.report.xml,name:stock.report_picking_list -msgid "Packing list" +#: view:stock.picking:0 +msgid "Confirmed Pickings" msgstr "" #. module: stock @@ -1154,8 +1176,8 @@ msgid "Consume Move" msgstr "" #. module: stock -#: model:stock.location,name:stock.stock_location_suppliers -msgid "Suppliers" +#: model:stock.location,name:stock.stock_location_7 +msgid "European Customers" msgstr "" #. module: stock @@ -1175,10 +1197,8 @@ msgid "This is used only if you select a chained location type.\n" msgstr "" #. module: stock -#: code:addons/stock/wizard/stock_traceability.py:54 -#: view:stock.production.lot:0 -#, python-format -msgid "Downstream Traceability" +#: view:stock.tracking:0 +msgid "Pack Identification" msgstr "" #. module: stock @@ -1224,9 +1244,8 @@ msgid "To be refunded/invoiced" msgstr "" #. module: stock -#: code:addons/stock/stock.py:2321 -#, python-format -msgid "You can only delete draft moves." +#: model:stock.location,name:stock.stock_location_shop0 +msgid "Shop 1" msgstr "" #. module: stock @@ -1262,9 +1281,10 @@ msgid "Additional Info" msgstr "" #. module: stock -#: code:addons/stock/stock.py:1706 -#, python-format -msgid "Operation forbidden" +#: field:stock.partial.move.line,move_id:0 +#: field:stock.partial.picking.line,move_id:0 +#: field:stock.return.picking.memory,move_id:0 +msgid "Move" msgstr "" #. module: stock @@ -1338,6 +1358,11 @@ msgstr "" msgid "Available Pickings" msgstr "" +#. module: stock +#: model:stock.location,name:stock.stock_location_5 +msgid "Generic IT Suppliers" +msgstr "" + #. module: stock #: view:stock.move:0 msgid "Stock to be receive" @@ -1384,6 +1409,12 @@ msgstr "" msgid "Customer Location" msgstr "" +#. module: stock +#: code:addons/stock/stock.py:2321 +#, python-format +msgid "You can only delete draft moves." +msgstr "" + #. module: stock #: xsl:stock.move.label:0 msgid "Serial:" @@ -1595,6 +1626,11 @@ msgstr "" msgid "Stock Valuation Account (Incoming)" msgstr "" +#. module: stock +#: model:stock.location,name:stock.stock_location_14 +msgid "Shelf 2" +msgstr "" + #. module: stock #: field:stock.report.tracklots,tracking_id:0 msgid "Tracking lot" @@ -1602,7 +1638,7 @@ msgstr "" #. module: stock #: view:stock.picking:0 -msgid "Confirmed Pickings" +msgid "Back Orders" msgstr "" #. module: stock @@ -2193,10 +2229,9 @@ msgid "Delay(Days)" msgstr "" #. module: stock -#: field:stock.partial.move.line,move_id:0 -#: field:stock.partial.picking.line,move_id:0 -#: field:stock.return.picking.memory,move_id:0 -msgid "Move" +#: code:addons/stock/stock.py:1706 +#, python-format +msgid "Operation forbidden" msgstr "" #. module: stock @@ -2322,6 +2357,11 @@ msgstr "" msgid "Product '%s' is consumed with '%s' quantity." msgstr "" +#. module: stock +#: model:product.template,description:stock.product_icecream_product_template +msgid "Ice cream can be mass-produced and thus is widely available in developed parts of the world. Ice cream can be purchased in large cartons (vats and squrounds) from supermarkets and grocery stores, in smaller quantities from ice cream shops, convenience stores, and milk bars, and in individual servings from small carts or vans at public events." +msgstr "" + #. module: stock #: selection:report.stock.inventory,month:0 #: selection:report.stock.move,month:0 @@ -2338,6 +2378,11 @@ msgstr "" msgid "Display the last inventories done on your products and easily sort them with specific filtering criteria. If you do frequent and partial inventories, you need this report in order to ensure that the stock of each product is controlled at least once a year." msgstr "" +#. module: stock +#: model:stock.location,name:stock.location_opening +msgid "opening" +msgstr "" + #. module: stock #: code:addons/stock/report/stock_graph.py:36 #: code:addons/stock/report/stock_graph.py:104 @@ -2361,6 +2406,11 @@ msgstr "" msgid "Procurement" msgstr "" +#. module: stock +#: model:stock.location,name:stock.stock_location_4 +msgid "Maxtor Suppliers" +msgstr "" + #. module: stock #: code:addons/stock/wizard/stock_change_product_qty.py:78 #: code:addons/stock/wizard/stock_change_standard_price.py:107 @@ -2461,8 +2511,9 @@ msgid "Company" msgstr "" #. module: stock +#: view:stock.move:0 #: view:stock.picking:0 -msgid "Back Orders" +msgid "Unit Of Measure" msgstr "" #. module: stock @@ -2493,8 +2544,8 @@ msgid "Error: The default UOM and the purchase UOM must be in the same category. msgstr "" #. module: stock -#: field:stock.production.lot.revision,date:0 -msgid "Revision Date" +#: model:stock.location,name:stock.location_delivery_counter +msgid "Delivery Counter" msgstr "" #. module: stock @@ -2819,6 +2870,11 @@ msgstr "" msgid "Corridor (X)" msgstr "" +#. module: stock +#: model:stock.location,name:stock.stock_location_suppliers +msgid "Suppliers" +msgstr "" + #. module: stock #: field:report.stock.inventory,value:0 #: field:report.stock.move,value:0 @@ -2863,6 +2919,11 @@ msgstr "" msgid "Include children" msgstr "" +#. module: stock +#: model:stock.location,name:stock.stock_location_components +msgid "Shelf 1" +msgstr "" + #. module: stock #: model:ir.actions.act_window,help:stock.action_picking_tree6 msgid "Internal Moves display all inventory operations you have to perform in your warehouse. All operations can be categorized into stock journals, so that each worker has his own list of operations to perform in his own journal. Most operations are prepared automatically by OpenERP according to your preconfigured logistics rules, but you can also record manual stock operations." @@ -2908,14 +2969,13 @@ msgid "Manager" msgstr "" #. module: stock -#: view:stock.move:0 -#: view:stock.picking:0 -msgid "Unit Of Measure" +#: report:stock.picking.list:0 +msgid "Total" msgstr "" #. module: stock -#: report:stock.picking.list:0 -msgid "Total" +#: model:stock.location,name:stock.stock_location_intermediatelocation0 +msgid "Internal Shippings" msgstr "" #. module: stock @@ -3010,6 +3070,11 @@ msgstr "" msgid "Reason" msgstr "" +#. module: stock +#: model:product.template,name:stock.product_icecream_product_template +msgid "Ice Cream" +msgstr "" + #. module: stock #: model:ir.model,name:stock.model_stock_partial_picking msgid "Partial Picking Processing Wizard" @@ -3054,6 +3119,11 @@ msgstr "" msgid "When doing real-time inventory valuation, counterpart journal items for all outgoing stock moves will be posted in this account, unless there is a specific valuation account set on the destination location. This is the default value for all products in this category. It can also directly be set on each product" msgstr "" +#. module: stock +#: model:stock.location,name:stock.stock_location_8 +msgid "Non European Customers" +msgstr "" + #. module: stock #: code:addons/stock/product.py:75 #: code:addons/stock/product.py:89 @@ -3143,6 +3213,11 @@ msgstr "" msgid "is done." msgstr "" +#. module: stock +#: field:stock.production.lot.revision,date:0 +msgid "Revision Date" +msgstr "" + #. module: stock #: view:board.board:0 #: model:ir.actions.act_window,name:stock.action_outgoing_product_board @@ -3297,6 +3372,11 @@ msgstr "" msgid "Chaining Journal" msgstr "" +#. module: stock +#: model:ir.actions.report.xml,name:stock.report_picking_list +msgid "Packing list" +msgstr "" + #. module: stock #: code:addons/stock/stock.py:744 #, python-format @@ -3425,6 +3505,11 @@ msgstr "" msgid "Auto-Picking" msgstr "" +#. module: stock +#: model:stock.location,name:stock.stock_location_shop1 +msgid "Shop 2" +msgstr "" + #. module: stock #: field:stock.location,chained_auto_packing:0 msgid "Chaining Type" @@ -3784,6 +3869,16 @@ msgstr "" msgid "Production Lot Identification" msgstr "" +#. module: stock +#: model:stock.location,name:stock.location_refrigerator_small +msgid "Small Refrigerator" +msgstr "" + +#. module: stock +#: model:stock.location,name:stock.location_convenience_shop +msgid "Convenient Store" +msgstr "" + #. module: stock #: field:stock.location,scrap_location:0 #: view:stock.move.scrap:0