diff --git a/addons/account/account_demo.xml b/addons/account/account_demo.xml
index 5ef0ee4992d..566185c70c3 100644
--- a/addons/account/account_demo.xml
+++ b/addons/account/account_demo.xml
@@ -126,6 +126,9 @@
-
+
+
+
+
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index f0cec0abda3..5b661e3e7d7 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -155,7 +155,7 @@
-
+
@@ -264,7 +264,7 @@
-
+
@@ -434,6 +434,7 @@
{'type':'out_invoice', 'journal_type': 'sale'}With Customer Invoices you can create and manage sales invoices issued to your customers. OpenERP can also generate draft invoices automatically from sales orders or deliveries. You should only confirm them before sending them to your customers.
+
@@ -461,7 +462,7 @@
[('type','=','in_invoice')]{'type':'in_invoice', 'journal_type': 'purchase'}
- With Supplier Invoices you can enter and manage invoices issued by your suppliers. OpenERP can also generate draft invoices automatically from purchase order or receipt. This way, you can control the invoice from your supplier according to what you purchased or received.
+ With Supplier Invoices you can enter and manage invoices issued by your suppliers. OpenERP can also generate draft invoices automatically from purchase orders or receipts. This way, you can control the invoice from your supplier according to what you purchased or received.
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 93bcc7724be..673cdfab8e1 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -26,15 +26,15 @@
formtree,graph{'group_by':['user_type'], 'group_by_no_leaf':1}
-
+ Treasuryaccount.accountformgraph,tree
- [('type','=','liquidity')]
-
+ [('type','=','liquidity')]
+ board.account.form
@@ -45,11 +45,11 @@
-
+
-
-
+
+
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 871ef514836..65184b3d130 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -438,6 +438,5 @@
-
diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml
index d3da592e085..15614444822 100644
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@@ -479,7 +479,7 @@
[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]
- [[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]
+ [[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.symbol or '' ]]
@@ -616,4 +616,4 @@
-
\ No newline at end of file
+
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 2d2fbed9ef9..22712af0f8c 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -508,7 +508,7 @@
[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]
- [[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]
+ [[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.symbol or '' ]]
diff --git a/addons/account/report/account_partner_balance.py b/addons/account/report/account_partner_balance.py
index ab3cfd70970..eacafb02eda 100644
--- a/addons/account/report/account_partner_balance.py
+++ b/addons/account/report/account_partner_balance.py
@@ -28,8 +28,6 @@ from common_report_header import common_report_header
class partner_balance(report_sxw.rml_parse, common_report_header):
def __init__(self, cr, uid, name, context=None):
- if context is None:
- context = {}
super(partner_balance, self).__init__(cr, uid, name, context=context)
self.account_ids = []
self.localcontext.update( {
@@ -276,6 +274,7 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
return temp_res
def _sum_litige(self):
+ #gives the total of move lines with blocked boolean set to TRUE for the report selection
move_state = ['draft','posted']
if self.target_move == 'posted':
move_state = ['posted']
@@ -296,12 +295,15 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
return temp_res
def _get_partners(self):
+ cr, uid = self.cr, self.uid
+ context = self.localcontext # all of it?
+
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 ''
report_sxw.report_sxw('report.account.partner.balance', 'res.partner', 'account/report/account_partner_balance.rml',parser=partner_balance, header="internal")
diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index b4492e05b0d..0bab362e578 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -260,10 +260,10 @@
[[ formatLang(l.price_unit) ]]
[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index fe98ef7a403..83efe67f103 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -98,6 +98,7 @@
"access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,1,1,1
"access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,1,1,1
"access_account_entries_report_user","account.entries.report","model_account_entries_report","account.group_account_user",1,0,0,0
+"access_account_entries_report_employee","account.entries.report employee","model_account_entries_report","base.group_user",1,0,0,0
"access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0
"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,1,1,1
"access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_user",1,1,1,1
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 9c3034fe127..01c34459289 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -384,7 +384,7 @@ class account_analytic_account(osv.osv):
'ca_to_invoice': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Uninvoiced Amount',
help="If invoice from analytic account, the remaining amount you can invoice to the customer based on the total costs.",
digits_compute=dp.get_precision('Account')),
- 'ca_theorical': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Theorical Revenue',
+ 'ca_theorical': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Theoretical Revenue',
help="Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist.",
digits_compute=dp.get_precision('Account')),
'hours_quantity': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Hours Tot',
@@ -410,7 +410,7 @@ class account_analytic_account(osv.osv):
'real_margin': fields.function(_real_margin_calc, method=True, type='float', string='Real Margin',
help="Computed using the formula: Invoiced Amount - Total Costs.",
digits_compute=dp.get_precision('Account')),
- 'theorical_margin': fields.function(_theorical_margin_calc, method=True, type='float', string='Theorical Margin',
+ 'theorical_margin': fields.function(_theorical_margin_calc, method=True, type='float', string='Theoretical Margin',
help="Computed using the formula: Theorial Revenue - Total Costs",
digits_compute=dp.get_precision('Account')),
'real_margin_rate': fields.function(_real_margin_rate_calc, method=True, type='float', string='Real Margin Rate (%)',
diff --git a/addons/account_budget/report/crossovered_budget_report.rml b/addons/account_budget/report/crossovered_budget_report.rml
index ef45c1bd2a6..63db53ab5ce 100644
--- a/addons/account_budget/report/crossovered_budget_report.rml
+++ b/addons/account_budget/report/crossovered_budget_report.rml
@@ -163,13 +163,13 @@
[['.....' *(a['status']-1) ]][[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ a['name'] ]]
- [[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['theo'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]
+ [[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['theo'], dp='Account') ]] [[ company.currency_id.symbol ]]
- [[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['pln'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]
+ [[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['pln'], dp='Account') ]] [[ company.currency_id.symbol ]]
- [[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['prac'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]
+ [[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['prac'], dp='Account') ]] [[ company.currency_id.symbol ]]
[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['perc'],digits=2) ]]%
@@ -183,13 +183,13 @@
[[ repeatIn(funct_total(data['form']),'b') ]] Total :
Total Deductions([[ o.company_id and o.company_id.currency_id.symbol or '' ]])
- [[ formatLang(o.deduction) ]] [[ o.company_id and o.company_id.currency_id.symbol or '' ]]
+ [[ formatLang(o.deduction, dp='Account') ]] [[ o.company_id.currency_id.symbol ]]
@@ -542,10 +542,10 @@
[[ ol.code or '' ]]
- [[ ol.type in ['advance','loan','otherpay'] and formatLang(ol.total) or '' ]] [[ ol.type in ['advance','loan','otherpay'] and o.company_id and o.company_id.currency_id.symbol or '' ]]
+ [[ ol.type in ['advance','loan','otherpay'] and formatLang(ol.total, dp='Account') or '' ]] [[ ol.type in ['advance','loan','otherpay'] and o.company_id and o.company_id.currency_id.symbol or '' ]]
- [[ ol.type in ['otherdeduct','installment'] and formatLang(ol.total) or '' ]] [[ ol.type in ['otherdeduct','installment'] and o.company_id and o.company_id.currency_id.symbol or '' ]]
+ [[ ol.type in ['otherdeduct','installment'] and formatLang(ol.total, dp='Account') or '' ]] [[ ol.type in ['otherdeduct','installment'] and o.company_id and o.company_id.currency_id.symbol or '' ]]
@@ -561,7 +561,7 @@
Net Amount([[ o.company_id and o.company_id.currency_id.symbol or '' ]])
- [[ formatLang(o.net) ]] [[ o.company_id and o.company_id.currency_id.symbol or '' ]]
+ [[ formatLang(o.net, dp='Account') ]] [[ o.company_id.currency_id.symbol ]]
-
\ No newline at end of file
+
diff --git a/addons/hr_payroll/report/report_payroll_advice.rml b/addons/hr_payroll/report/report_payroll_advice.rml
index bd1b0c632cd..3e0aa3c0af1 100644
--- a/addons/hr_payroll/report/report_payroll_advice.rml
+++ b/addons/hr_payroll/report/report_payroll_advice.rml
@@ -257,10 +257,10 @@
[[ line['name'] ]]
- [[ formatLang(line['amount' ]) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]
+ [[ formatLang(line['amount'], dp='Account') ]] [[ company.currency_id.symbol ]]
- [[ formatLang(line['bysal']) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]
+ [[ formatLang(line['bysal'], dp='Account') ]] [[ company.currency_id.symbol ]]
[[ line['acc_no'] ]]
@@ -282,10 +282,10 @@
Total:
- [[ formatLang(get_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]
+ [[ formatLang(get_total(), dp='Account') ]] [[ company.currency_id.symbol ]]
- [[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]
+ [[ formatLang(get_bysal_total(), dp='Account') ]] [[ company.currency_id.symbol ]]
@@ -361,4 +361,4 @@
-
\ No newline at end of file
+
diff --git a/addons/hr_payroll/report/report_year_report.rml b/addons/hr_payroll/report/report_year_report.rml
index 4314b91a552..564e87d04ab 100644
--- a/addons/hr_payroll/report/report_year_report.rml
+++ b/addons/hr_payroll/report/report_year_report.rml
@@ -248,66 +248,66 @@
- [[ (e[1]!='' and formatLang(e[1])) or removeParentNode('font') ]] [[company.currency_id.symbol]]
+ [[ (e[1]!='' and formatLang(e[1], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]
- [[ (e[2]!='' and formatLang(e[2])) or removeParentNode('font') ]] [[company.currency_id.symbol]]
+ [[ (e[2]!='' and formatLang(e[2], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]
- [[ (e[3]!='' and formatLang(e[3])) or removeParentNode('font') ]] [[company.currency_id.symbol]]
+ [[ (e[3]!='' and formatLang(e[3], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]
- [[ (e[4]!='' and formatLang(e[4])) or removeParentNode('font') ]] [[company.currency_id.symbol]]
+ [[ (e[4]!='' and formatLang(e[4], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]
- [[ (e[5]!='' and formatLang(e[5])) or removeParentNode('font') ]] [[company.currency_id.symbol]]
+ [[ (e[5]!='' and formatLang(e[5], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]
- [[ (e[6]!='' and formatLang(e[6])) or removeParentNode('font') ]] [[company.currency_id.symbol]]
+ [[ (e[6]!='' and formatLang(e[6], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]
- [[ (e[7]!='' and formatLang(e[7])) or removeParentNode('font') ]] [[company.currency_id.symbol]]
+ [[ (e[7]!='' and formatLang(e[7], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]
- [[ (e[8]!='' and formatLang(e[8])) or removeParentNode('font') ]] [[company.currency_id.symbol]]
+ [[ (e[8]!='' and formatLang(e[8], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]
- [[ (e[9]!='' and formatLang(e[9])) or removeParentNode('font') ]] [[company.currency_id.symbol]]
+ [[ (e[9]!='' and formatLang(e[9], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]
- [[ (e[10]!='' and formatLang(e[10])) or removeParentNode('font') ]] [[company.currency_id.symbol]]
+ [[ (e[10]!='' and formatLang(e[10], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]
- [[ (e[11]!='' and formatLang(e[11])) or removeParentNode('font') ]] [[company.currency_id.symbol]]
+ [[ (e[11]!='' and formatLang(e[11], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]
- [[ (e[12]!='' and formatLang(e[12])) or removeParentNode('font') ]] [[company.currency_id.symbol]]
+ [[ (e[12]!='' and formatLang(e[12], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]
-
\ No newline at end of file
+
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index 35f638a3326..4668827ef89 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -64,7 +64,7 @@ class hr_employee(osv.osv):
method=True,
domain="[('type', '=', 'liquidity')]",
view_load=True,
- help="Select Bank Account from where Salary Expanse will be Paid"),
+ help="Select Bank Account from where Salary Expense will be Paid"),
'salary_account':fields.property(
'account.account',
type='many2one',
@@ -73,7 +73,7 @@ class hr_employee(osv.osv):
method=True,
domain="[('type', '=', 'other')]",
view_load=True,
- help="Expanse account when Salary Expanse will be recorded"),
+ help="Expense account when Salary Expense will be recorded"),
'employee_account':fields.property(
'account.account',
type='many2one',
@@ -99,7 +99,7 @@ class payroll_register(osv.osv):
_description = 'Payroll Register'
_columns = {
- 'journal_id': fields.many2one('account.journal', 'Expanse Journal'),
+ 'journal_id': fields.many2one('account.journal', 'Expense Journal'),
'bank_journal_id': fields.many2one('account.journal', 'Bank Journal'),
'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
}
@@ -213,7 +213,7 @@ class hr_payslip(osv.osv):
_description = 'Pay Slip'
_columns = {
- 'journal_id': fields.many2one('account.journal', 'Expanse Journal'),
+ 'journal_id': fields.many2one('account.journal', 'Expense Journal'),
'bank_journal_id': fields.many2one('account.journal', 'Bank Journal'),
'move_ids':fields.one2many('hr.payslip.account.move', 'slip_id', 'Accounting vouchers'),
'move_line_ids':fields.many2many('account.move.line', 'payslip_lines_rel', 'slip_id', 'line_id', 'Accounting Lines', readonly=True),
@@ -336,7 +336,7 @@ class hr_payslip(osv.osv):
name = '[%s]-%s' % (slip.number, line.name)
invoice_pool.pay_and_reconcile(cr, uid, invids, amount, acc_id, period_id, journal_id, False, period_id, False, context, name)
other_pay -= amount
- #TODO: link this account entries to the Payment Lines also Expanse Entries to Account Lines
+ #TODO: link this account entries to the Payment Lines also Expense Entries to Account Lines
l_ids = movel_pool.search(cr, uid, [('name','=',name)], context=context)
line_ids += l_ids
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 7c158bb8795..2e941877b65 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -10,6 +10,7 @@
{"search_default_user_id":uid, 'search_default_current': 1,"search_default_department_id": department_id}
+ From this menu you can track applicants in the recruitment process and manage all operations: meetings, interviews, phone calls, etc. If you setup the email gateway, applicants and their attached CV are created automatically when an email is sent to jobs@yourcompany.com. If you install the document management modules, all documents (CV and motivation letters) are indexed automatically, so that you can easily search through their content.
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index e3955002c26..3738a1d8be6 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -23,11 +23,12 @@
# Stage
# ------------------------------------------------------
- Applicant Stages
+ Recruitment / Applicants Stageshr.recruitment.stageform[]{}
+ Define here your stages of the recruitment process, for example: qualification call, first interview, second interview, refused, hired.
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 3ba27af9228..5234e933813 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -21,6 +21,8 @@
import tools
from osv import fields,osv
from hr_recruitment import hr_recruitment
+from decimal_precision import decimal_precision as dp
+
AVAILABLE_STATES = [
('draft','New'),
@@ -56,9 +58,9 @@ class hr_recruitment_report(osv.osv):
'type_id': fields.many2one('hr.recruitment.degree', 'Degree'),
'department_id': fields.many2one('hr.department','Department',readonly=True),
'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'),
- 'salary_prop': fields.float("Salary Proposed"),
- 'salary_prop_avg': fields.float("Avg Salary Proposed", group_operator="avg"),
- 'salary_exp': fields.float("Salary Expected"),
+ 'salary_prop' : fields.float("Salary Proposed", digits_compute=dp.get_precision('Account')),
+ 'salary_prop_avg' : fields.float("Avg Salary Proposed", group_operator="avg", digits_compute=dp.get_precision('Account')),
+ 'salary_exp' : fields.float("Salary Expected", digits_compute=dp.get_precision('Account')),
'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact Name',readonly=True),
'available': fields.float("Availability"),
@@ -66,7 +68,6 @@ class hr_recruitment_report(osv.osv):
help="Number of Days to close the project issue"),
'delay_close': fields.float('Avg. Delay to Close', digits=(16,2), readonly=True, group_operator="avg",
help="Number of Days to close the project issue"),
-
}
_order = 'date desc'
def init(self, cr):
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 9cfbf0c992c..131148f373a 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -102,7 +102,7 @@
-
+
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
index 90ba2aa7f6c..eb1437534d4 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
@@ -217,91 +217,3 @@ class report_timesheet_invoice(osv.osv):
""")
report_timesheet_invoice()
-class report_random_timsheet(osv.osv):
- _name = "report.random.timesheet"
- _description = "Random Timesheet Report"
- _auto = False
-
- _columns = {
- 'analytic_account_id': fields.many2one('account.analytic.account','Analytic Account', readonly=True),
- 'name': fields.char('Description', size=64, readonly=True),
- 'quantity': fields.float('Quantity', readonly=True),
- 'date': fields.date('Date', readonly=True),
- 'user_id': fields.many2one('res.users', 'User', readonly=True)
- }
- _order = "date desc"
-
- def __init__(self, pool, cr):
- super(report_random_timsheet, self).__init__(pool, cr)
- self.called = False
-
- def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
- """ To call the init() method timely
- """
- if not self.called:
- self.init(cr, user)
- self.called = True # To make sure that init doesn't get called multiple times
-
- res = super(report_random_timsheet, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
- return res
-
- def init(self, cr, uid=1):
- drop_view_if_exists(cr, 'report_random_timesheet')
-
- cr.execute("""create or replace view report_random_timesheet as (
-
- select
- line.id as id, line.account_id as analytic_account_id, line.name as name,
- line.unit_amount as quantity, line.date as date, line.user_id as user_id
- from
- account_analytic_line line, hr_department dept,hr_employee dept_user
- where
- (dept.id = dept_user.department_id AND dept_user.id=line.user_id AND line.user_id is not null)
- AND (dept.manager_id = """ + str(uid) + """ )
- AND (line.date <= CURRENT_DATE AND line.date > (CURRENT_DATE-3))
- LIMIT 10
- )
- """ )
-
-report_random_timsheet()
-
-class random_timesheet_lines(osv.osv):
- _name = "random.timesheet.lines"
- _description = "Random Timesheet Lines"
- _auto = False
-
- _columns = {
- 'date': fields.date('Date', readonly=True),
- 'name': fields.char('Description', size=64, readonly=True),
- 'user_id': fields.many2one('res.users', 'User', readonly=True),
- 'quantity': fields.float('Quantity', readonly=True),
- 'product_id': fields.many2one('product.product', 'Product', readonly=True),
- 'analytic_account_id': fields.many2one('account.analytic.account','Analytic Account', readonly=True),
- 'uom_id': fields.many2one('product.uom', 'UoM', readonly=True),
- 'amount': fields.float('Amount', readonly=True),
- 'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Invoicing', readonly=True),
- 'general_account_id': fields.many2one('account.account', 'General Account', readonly=True)
- }
-
- _order = "date desc"
-
- def init(self, cr):
- drop_view_if_exists(cr, 'random_timesheet_lines')
-
- cr.execute("""create or replace view random_timesheet_lines as (
- select
- line.id as id, line.date as date, line.name as name, line.unit_amount as quantity,
- line.product_id as product_id, line.account_id as analytic_account_id,
- line.product_uom_id as uom_id, line.amount as amount, line.to_invoice as to_invoice,
- line.general_account_id as general_account_id, line.user_id as user_id
- from
- account_analytic_line line
- where
- (line.date <= CURRENT_DATE AND line.date > (CURRENT_DATE-15))
- )
- """ )
-
-random_timesheet_lines()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index b763f96c10a..1d2f5195687 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -425,85 +425,5 @@
src_model="res.users"/>
-
-
-
- report.random.timesheet.tree
- report.random.timesheet
- tree
-
-
-
-
-
-
-
-
-
-
-
- Random Timesheet
- report.random.timesheet
- form
- tree,form
-
-
-
-
-
-
- random.timesheet.lines.search
- random.timesheet.lines
- search
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- random.timesheet.lines.tree
- random.timesheet.lines
- tree
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ir.actions.act_window
- Working Hours
- random.timesheet.lines
- form
- tree,form
- {'search_default_user_id':uid }
-
-
-
diff --git a/addons/hr_timesheet_invoice/security/ir.model.access.csv b/addons/hr_timesheet_invoice/security/ir.model.access.csv
index c647fec62cf..9d8c41be2cd 100644
--- a/addons/hr_timesheet_invoice/security/ir.model.access.csv
+++ b/addons/hr_timesheet_invoice/security/ir.model.access.csv
@@ -7,8 +7,6 @@
"access_report_timesheet_account","report_timesheet.account","model_report_timesheet_account","base.group_hr_manager",1,1,1,1
"access_report_timesheet_account_date","report_timesheet.account.date","model_report_timesheet_account_date","base.group_hr_manager",1,1,1,1
"access_report_timesheet_invoice","report_timesheet.invoice","model_report_timesheet_invoice","base.group_hr_manager",1,1,1,1
-"access_report_random_timesheet","report_random_timesheet","model_report_random_timesheet","base.group_hr_manager",1,1,1,1
-"access_report_random_timesheet_lines","random_timesheet_lines","model_random_timesheet_lines","base.group_hr_manager",1,1,1,1
"access_report_analytic_account_close_manager","report.analytic.account.close.manager","model_report_analytic_account_close","base.group_hr_manager",1,1,1,1
"access_report_account_analytic_line_to_invoice_manager","report.account.analytic.line.to.invoice.manager","model_report_account_analytic_line_to_invoice","base.group_hr_manager",1,1,1,1
"access_account_invoice_hr_user","account.invoice.hr.user","account.model_account_invoice","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 22c169daac9..8456bca1f3d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -132,8 +132,8 @@
-
-
+
+
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml b/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
index 1afc8909323..667658685f9 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
@@ -40,21 +40,25 @@
+ confirm
+ done
+ cancel
+
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
index 84ef868ab81..d20ad3a5f4c 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
@@ -21,6 +21,8 @@
import tools
from osv import fields,osv
+from decimal_precision import decimal_precision as dp
+
class hr_timesheet_report(osv.osv):
_name = "hr.timesheet.report"
@@ -40,7 +42,7 @@ class hr_timesheet_report(osv.osv):
'user_id': fields.many2one('res.users', 'User',readonly=True),
'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
'company_id': fields.many2one('res.company', 'Company',readonly=True),
- 'cost': fields.float('Cost',readonly=True),
+ 'cost': fields.float('Cost',readonly=True, digits_compute=dp.get_precision('Account')),
'quantity': fields.float('Quantity',readonly=True),
}
diff --git a/addons/l10n_es/account_chart.xml b/addons/l10n_es/account_chart.xml
index 6e56007fc46..df0b218ae49 100644
--- a/addons/l10n_es/account_chart.xml
+++ b/addons/l10n_es/account_chart.xml
@@ -33,13 +33,13 @@
tercerosbalance
-
+ Terceros - A Cobrarterceros - recassetbalance
-
+ Terceros - A Pagarterceros - payliability
@@ -3883,7 +3883,7 @@
viewProveedores
-
+ 400
@@ -3891,7 +3891,7 @@
viewProveedores
-
+ 4000
@@ -3899,7 +3899,7 @@
viewProveedores (euros)
-
+ 4000
@@ -3907,7 +3907,7 @@
payableProveedores (euros)
-
+ 4004
@@ -3915,7 +3915,7 @@
viewProveedores (moneda extranjera)
-
+ 4004
@@ -3923,7 +3923,7 @@
payableProveedores (moneda extranjera)
-
+ 4009
@@ -3931,7 +3931,7 @@
viewProveedores, facturas pendientes de recibir o de formalizar
-
+ 4009
@@ -3939,7 +3939,7 @@
payableProveedores, facturas pendientes de recibir o de formalizar
-
+ 401
@@ -3947,7 +3947,7 @@
viewProveedores, efectos comerciales a pagar
-
+ 401
@@ -3955,7 +3955,7 @@
otherProveedores, efectos comerciales a pagar
-
+ 403
@@ -3963,7 +3963,7 @@
viewProveedores, empresas del grupo
-
+ 4030
@@ -3971,7 +3971,7 @@
viewProveedores, empresas del grupo (euros)
-
+ 4030
@@ -3979,7 +3979,7 @@
payableProveedores, empresas del grupo (euros)
-
+ 4031
@@ -3987,7 +3987,7 @@
viewEfectos comerciales a pagar, empresas del grupo
-
+ 4031
@@ -3995,7 +3995,7 @@
payableEfectos comerciales a pagar, empresas del grupo
-
+ 4034
@@ -4003,7 +4003,7 @@
viewProveedores, empresas del grupo (moneda extranjera)
-
+ 4034
@@ -4011,7 +4011,7 @@
payableProveedores, empresas del grupo (moneda extranjera)
-
+ 4036
@@ -4019,7 +4019,7 @@
viewEnvases y embalajes a devolver a proveedores, empresas del grupo
-
+ 4036
@@ -4027,7 +4027,7 @@
payableEnvases y embalajes a devolver a proveedores, empresas del grupo
-
+ 4039
@@ -4035,7 +4035,7 @@
viewProveedores, empresas del grupo, facturas pendientes de recibir o de formalizar
-
+ 4039
@@ -4043,7 +4043,7 @@
payableProveedores, empresas del grupo, facturas pendientes de recibir o de formalizar
-
+ 404
@@ -4051,7 +4051,7 @@
viewProveedores, empresas asociadas
-
+ 404
@@ -4059,7 +4059,7 @@
otherProveedores, empresas asociadas
-
+ 405
@@ -4067,7 +4067,7 @@
viewProveedores, otras partes vinculadas
-
+ 405
@@ -4075,7 +4075,7 @@
otherProveedores, otras partes vinculadas
-
+ 406
@@ -4083,7 +4083,7 @@
viewEnvases y embalajes a devolver a proveedores
-
+ 406
@@ -4091,7 +4091,7 @@
otherEnvases y embalajes a devolver a proveedores
-
+ 407
@@ -4099,7 +4099,7 @@
viewAnticipos a proveedores
-
+ 407
@@ -4107,7 +4107,7 @@
otherAnticipos a proveedores
-
+ 41
@@ -4115,7 +4115,7 @@
viewAcreedores varios
-
+ 410
@@ -4123,7 +4123,7 @@
viewAcreedores por prestaciones de servicios
-
+ 4100
@@ -4131,7 +4131,7 @@
viewAcreedores por prestaciones de servicios (euros)
-
+ 4100
@@ -4139,7 +4139,7 @@
payableAcreedores por prestaciones de servicios (euros)
-
+ 4104
@@ -4147,7 +4147,7 @@
viewAcreedores por prestaciones de servicios (moneda extranjera)
-
+ 4104
@@ -4155,7 +4155,7 @@
payableAcreedores por prestaciones de servicios (moneda extranjera)
-
+ 4109
@@ -4163,7 +4163,7 @@
viewAcreedores por prestaciones de servicios, facturas pendientes de recibir o de formalizar
-
+ 4109
@@ -4171,7 +4171,7 @@
payableAcreedores por prestaciones de servicios, facturas pendientes de recibir o de formalizar
-
+ 411
@@ -4179,7 +4179,7 @@
viewAcreedores, efectos comerciales a pagar
-
+ 411
@@ -4187,7 +4187,7 @@
otherAcreedores, efectos comerciales a pagar
-
+ 419
@@ -4195,7 +4195,7 @@
viewAcreedores por operaciones en común
-
+ 419
@@ -4203,7 +4203,7 @@
otherAcreedores por operaciones en común
-
+ 43
@@ -4211,7 +4211,7 @@
viewClientes
-
+ 430
@@ -4219,7 +4219,7 @@
viewClientes
-
+ 4300
@@ -4227,7 +4227,7 @@
viewClientes (euros)
-
+ 4300
@@ -4235,7 +4235,7 @@
receivableClientes (euros)
-
+ 4304
@@ -4243,7 +4243,7 @@
viewClientes (moneda extranjera)
-
+ 4304
@@ -4251,7 +4251,7 @@
receivableClientes (moneda extranjera)
-
+ 4309
@@ -4259,7 +4259,7 @@
viewClientes, facturas pendientes de recibir o de formalizar
-
+ 4309
@@ -4267,7 +4267,7 @@
receivableClientes, facturas pendientes de recibir o de formalizar
-
+ 431
@@ -4275,7 +4275,7 @@
viewClientes, efectos comerciales a cobrar
-
+ 4310
@@ -4283,7 +4283,7 @@
viewEfectos comerciales en cartera
-
+ 4310
@@ -4291,7 +4291,7 @@
receivableEfectos comerciales en cartera
-
+ 4311
@@ -4299,7 +4299,7 @@
viewEfectos comerciales descontados
-
+ 4311
@@ -4307,7 +4307,7 @@
receivableEfectos comerciales descontados
-
+ 4312
@@ -4315,7 +4315,7 @@
viewEfectos comerciales en gestión de cobro
-
+ 4312
@@ -4323,7 +4323,7 @@
receivableEfectos comerciales en gestión de cobro
-
+ 4315
@@ -4331,7 +4331,7 @@
viewEfectos comerciales impagados
-
+ 4315
@@ -4339,7 +4339,7 @@
receivableEfectos comerciales impagados
-
+ 432
@@ -4347,7 +4347,7 @@
viewClientes, operaciones de factoring
-
+ 432
@@ -4355,7 +4355,7 @@
otherClientes, operaciones de factoring
-
+ 433
@@ -4363,7 +4363,7 @@
viewClientes, empresas del grupo
-
+ 4330
@@ -4371,7 +4371,7 @@
viewClientes empresas del grupo (euros)
-
+ 4330
@@ -4379,7 +4379,7 @@
receivableClientes empresas del grupo (euros)
-
+ 4331
@@ -4387,7 +4387,7 @@
viewEfectos comerciales a cobrar, empresas del grupo
-
+ 4331
@@ -4395,7 +4395,7 @@
receivableEfectos comerciales a cobrar, empresas del grupo
-
+ 4332
@@ -4403,7 +4403,7 @@
viewClientes empresas del grupo, operaciones de factoring
-
+ 4332
@@ -4411,7 +4411,7 @@
receivableClientes empresas del grupo, operaciones de factoring
-
+ 4334
@@ -4419,7 +4419,7 @@
viewClientes empresas del grupo (moneda extranjera)
-
+ 4334
@@ -4427,7 +4427,7 @@
receivableClientes empresas del grupo (moneda extranjera)
-
+ 4336
@@ -4435,7 +4435,7 @@
viewClientes empresas del grupo de dudoso cobro
-
+ 4336
@@ -4443,7 +4443,7 @@
receivableClientes empresas del grupo de dudoso cobro
-
+ 4337
@@ -4451,7 +4451,7 @@
viewEnvases y embalajes a devolver a clientes, empresas del grupo
-
+ 4337
@@ -4459,7 +4459,7 @@
receivableEnvases y embalajes a devolver a clientes, empresas del grupo
-
+ 4339
@@ -4467,7 +4467,7 @@
viewClientes empresas del grupo, facturas pendientes de formalizar
-
+ 4339
@@ -4475,7 +4475,7 @@
receivableClientes empresas del grupo, facturas pendientes de formalizar
-
+ 434
@@ -4483,7 +4483,7 @@
viewClientes, empresas asociadas
-
+ 434
@@ -4491,7 +4491,7 @@
otherClientes, empresas asociadas
-
+ 435
@@ -4499,7 +4499,7 @@
viewClientes, otras partes vinculadas
-
+ 435
@@ -4507,7 +4507,7 @@
otherClientes, otras partes vinculadas
-
+ 436
@@ -4515,7 +4515,7 @@
viewClientes de dudoso cobro
-
+ 436
@@ -4523,7 +4523,7 @@
otherClientes de dudoso cobro
-
+ 437
@@ -4531,7 +4531,7 @@
viewEnvases y embalajes a devolver por clientes
-
+ 437
@@ -4539,7 +4539,7 @@
otherEnvases y embalajes a devolver por clientes
-
+ 438
@@ -4547,7 +4547,7 @@
viewAnticipos de clientes
-
+ 438
@@ -4555,7 +4555,7 @@
otherAnticipos de clientes
-
+ 44
@@ -4563,7 +4563,7 @@
viewDeudores varios
-
+ 440
@@ -4571,7 +4571,7 @@
viewDeudores
-
+ 4400
@@ -4579,7 +4579,7 @@
viewDeudores (euros)
-
+ 4400
@@ -4587,7 +4587,7 @@
receivableDeudores (euros)
-
+ 4404
@@ -4595,7 +4595,7 @@
viewDeudores (moneda extranjera)
-
+ 4404
@@ -4603,7 +4603,7 @@
receivableDeudores (moneda extranjera)
-
+ 4409
@@ -4611,7 +4611,7 @@
viewDeudores, facturas pendientes de formalizar
-
+ 4409
@@ -4619,7 +4619,7 @@
receivableDeudores, facturas pendientes de formalizar
-
+ 441
@@ -4627,7 +4627,7 @@
viewDeudores, efectos comerciales a cobrar
-
+ 4410
@@ -4635,7 +4635,7 @@
viewDeudores, efectos comerciales en cartera
-
+ 4410
@@ -4643,7 +4643,7 @@
receivableDeudores, efectos comerciales en cartera
-
+ 4411
@@ -4651,7 +4651,7 @@
viewDeudores, efectos comerciales descontados
-
+ 4411
@@ -4659,7 +4659,7 @@
receivableDeudores, efectos comerciales descontados
-
+ 4412
@@ -4667,7 +4667,7 @@
viewDeudores, efectos comerciales en gestión de cobro
-
+ 4412
@@ -4675,7 +4675,7 @@
receivableDeudores, efectos comerciales en gestión de cobro
-
+ 4415
@@ -4683,7 +4683,7 @@
viewDeudores, efectos comerciales impagados
-
+ 4415
@@ -4691,7 +4691,7 @@
receivableDeudores, efectos comerciales impagados
-
+ 446
@@ -4699,7 +4699,7 @@
viewDeudores de dudoso cobro
-
+ 446
@@ -4707,7 +4707,7 @@
otherDeudores de dudoso cobro
-
+ 449
@@ -4715,7 +4715,7 @@
viewDeudores por operaciones en común
-
+ 449
@@ -4723,7 +4723,7 @@
otherDeudores por operaciones en común
-
+ 46
@@ -4739,7 +4739,7 @@
viewAnticipos de remuneraciones
-
+ 460
@@ -4747,7 +4747,7 @@
otherAnticipos de remuneraciones
-
+ 465
@@ -4755,7 +4755,7 @@
viewRemuneraciones pendientes de pago
-
+ 465
@@ -4763,7 +4763,7 @@
otherRemuneraciones pendientes de pago
-
+ 466
@@ -4771,7 +4771,7 @@
viewRemuneraciones mediante sistemas de aportación definida pendientes de pago
-
+ 466
@@ -4779,7 +4779,7 @@
otherRemuneraciones mediante sistemas de aportación definida pendientes de pago
-
+ 47
@@ -5059,7 +5059,7 @@
viewGastos anticipados
-
+ 480
@@ -5067,7 +5067,7 @@
otherGastos anticipados
-
+ 485
@@ -5075,7 +5075,7 @@
viewIngresos anticipados
-
+ 485
@@ -5083,7 +5083,7 @@
otherIngresos anticipados
-
+ 49
diff --git a/addons/l10n_es/account_chart_pymes.xml b/addons/l10n_es/account_chart_pymes.xml
index 50ab4987113..2e52df600ab 100644
--- a/addons/l10n_es/account_chart_pymes.xml
+++ b/addons/l10n_es/account_chart_pymes.xml
@@ -3550,7 +3550,7 @@
viewProveedores
-
+ 400
@@ -3558,7 +3558,7 @@
viewProveedores
-
+ 4000
@@ -3566,7 +3566,7 @@
viewProveedores (euros)
-
+ 4000
@@ -3574,7 +3574,7 @@
payableProveedores (euros)
-
+ 4004
@@ -3582,7 +3582,7 @@
viewProveedores (moneda extranjera)
-
+ 4004
@@ -3590,7 +3590,7 @@
payableProveedores (moneda extranjera)
-
+ 4009
@@ -3598,7 +3598,7 @@
viewProveedores, facturas pendientes de recibir o de formalizar
-
+ 4009
@@ -3606,7 +3606,7 @@
payableProveedores, facturas pendientes de recibir o de formalizar
-
+ 401
@@ -3614,7 +3614,7 @@
viewProveedores, efectos comerciales a pagar
-
+ 401
@@ -3622,7 +3622,7 @@
otherProveedores, efectos comerciales a pagar
-
+ 403
@@ -3630,7 +3630,7 @@
viewProveedores, empresas del grupo
-
+ 4030
@@ -3638,7 +3638,7 @@
viewProveedores, empresas del grupo (euros)
-
+ 4030
@@ -3646,7 +3646,7 @@
payableProveedores, empresas del grupo (euros)
-
+ 4031
@@ -3654,7 +3654,7 @@
viewEfectos comerciales a pagar, empresas del grupo
-
+ 4031
@@ -3662,7 +3662,7 @@
payableEfectos comerciales a pagar, empresas del grupo
-
+ 4034
@@ -3670,7 +3670,7 @@
viewProveedores, empresas del grupo (moneda extranjera)
-
+ 4034
@@ -3678,7 +3678,7 @@
payableProveedores, empresas del grupo (moneda extranjera)
-
+ 4036
@@ -3686,7 +3686,7 @@
viewEnvases y embalajes a devolver a proveedores, empresas del grupo
-
+ 4036
@@ -3694,7 +3694,7 @@
payableEnvases y embalajes a devolver a proveedores, empresas del grupo
-
+ 4039
@@ -3702,7 +3702,7 @@
viewProveedores, empresas del grupo, facturas pendientes de recibir o de formalizar
-
+ 4039
@@ -3710,7 +3710,7 @@
payableProveedores, empresas del grupo, facturas pendientes de recibir o de formalizar
-
+ 404
@@ -3718,7 +3718,7 @@
viewProveedores, empresas asociadas
-
+ 404
@@ -3726,7 +3726,7 @@
otherProveedores, empresas asociadas
-
+ 405
@@ -3734,7 +3734,7 @@
viewProveedores, otras partes vinculadas
-
+ 405
@@ -3742,7 +3742,7 @@
otherProveedores, otras partes vinculadas
-
+ 406
@@ -3750,7 +3750,7 @@
viewEnvases y embalajes a devolver a proveedores
-
+ 406
@@ -3758,7 +3758,7 @@
otherEnvases y embalajes a devolver a proveedores
-
+ 407
@@ -3766,7 +3766,7 @@
viewAnticipos a proveedores
-
+ 407
@@ -3774,7 +3774,7 @@
otherAnticipos a proveedores
-
+ 41
@@ -3782,7 +3782,7 @@
viewAcreedores varios
-
+ 410
@@ -3790,7 +3790,7 @@
viewAcreedores por prestaciones de servicios
-
+ 4100
@@ -3798,7 +3798,7 @@
viewAcreedores por prestaciones de servicios (euros)
-
+ 4100
@@ -3806,7 +3806,7 @@
payableAcreedores por prestaciones de servicios (euros)
-
+ 4104
@@ -3814,7 +3814,7 @@
viewAcreedores por prestaciones de servicios (moneda extranjera)
-
+ 4104
@@ -3822,7 +3822,7 @@
payableAcreedores por prestaciones de servicios (moneda extranjera)
-
+ 4109
@@ -3830,7 +3830,7 @@
viewAcreedores por prestaciones de servicios, facturas pendientes de recibir o de formalizar
-
+ 4109
@@ -3838,7 +3838,7 @@
payableAcreedores por prestaciones de servicios, facturas pendientes de recibir o de formalizar
-
+ 411
@@ -3846,7 +3846,7 @@
viewAcreedores, efectos comerciales a pagar
-
+ 411
@@ -3854,7 +3854,7 @@
otherAcreedores, efectos comerciales a pagar
-
+ 419
@@ -3862,7 +3862,7 @@
viewAcreedores por operaciones en común
-
+ 419
@@ -3870,7 +3870,7 @@
otherAcreedores por operaciones en común
-
+ 43
@@ -3878,7 +3878,7 @@
viewClientes
-
+ 430
@@ -3886,7 +3886,7 @@
viewClientes
-
+ 4300
@@ -3894,7 +3894,7 @@
viewClientes (euros)
-
+ 4300
@@ -3902,7 +3902,7 @@
receivableClientes (euros)
-
+ 4304
@@ -3910,7 +3910,7 @@
viewClientes (moneda extranjera)
-
+ 4304
@@ -3918,7 +3918,7 @@
receivableClientes (moneda extranjera)
-
+ 4309
@@ -3926,7 +3926,7 @@
viewClientes, facturas pendientes de recibir o de formalizar
-
+ 4309
@@ -3934,7 +3934,7 @@
receivableClientes, facturas pendientes de recibir o de formalizar
-
+ 431
@@ -3942,7 +3942,7 @@
viewClientes, efectos comerciales a cobrar
-
+ 4310
@@ -3950,7 +3950,7 @@
viewEfectos comerciales en cartera
-
+ 4310
@@ -3958,7 +3958,7 @@
receivableEfectos comerciales en cartera
-
+ 4311
@@ -3966,7 +3966,7 @@
viewEfectos comerciales descontados
-
+ 4311
@@ -3974,7 +3974,7 @@
receivableEfectos comerciales descontados
-
+ 4312
@@ -3982,7 +3982,7 @@
viewEfectos comerciales en gestión de cobro
-
+ 4312
@@ -3990,7 +3990,7 @@
receivableEfectos comerciales en gestión de cobro
-
+ 4315
@@ -3998,7 +3998,7 @@
viewEfectos comerciales impagados
-
+ 4315
@@ -4006,7 +4006,7 @@
receivableEfectos comerciales impagados
-
+ 432
@@ -4014,7 +4014,7 @@
viewClientes, operaciones de factoring
-
+ 432
@@ -4022,7 +4022,7 @@
otherClientes, operaciones de factoring
-
+ 433
@@ -4030,7 +4030,7 @@
viewClientes, empresas del grupo
-
+ 4330
@@ -4038,7 +4038,7 @@
viewClientes empresas del grupo (euros)
-
+ 4330
@@ -4046,7 +4046,7 @@
receivableClientes empresas del grupo (euros)
-
+ 4331
@@ -4054,7 +4054,7 @@
viewEfectos comerciales a cobrar, empresas del grupo
-
+ 4331
@@ -4062,7 +4062,7 @@
receivableEfectos comerciales a cobrar, empresas del grupo
-
+ 4332
@@ -4070,7 +4070,7 @@
viewClientes empresas del grupo, operaciones de factoring
-
+ 4332
@@ -4078,7 +4078,7 @@
receivableClientes empresas del grupo, operaciones de factoring
-
+ 4334
@@ -4086,7 +4086,7 @@
viewClientes empresas del grupo (moneda extranjera)
-
+ 4334
@@ -4094,7 +4094,7 @@
receivableClientes empresas del grupo (moneda extranjera)
-
+ 4336
@@ -4102,7 +4102,7 @@
viewClientes empresas del grupo de dudoso cobro
-
+ 4336
@@ -4110,7 +4110,7 @@
receivableClientes empresas del grupo de dudoso cobro
-
+ 4337
@@ -4118,7 +4118,7 @@
viewEnvases y embalajes a devolver a clientes, empresas del grupo
-
+ 4337
@@ -4126,7 +4126,7 @@
receivableEnvases y embalajes a devolver a clientes, empresas del grupo
-
+ 4339
@@ -4134,7 +4134,7 @@
viewClientes empresas del grupo, facturas pendientes de formalizar
-
+ 4339
@@ -4142,7 +4142,7 @@
receivableClientes empresas del grupo, facturas pendientes de formalizar
-
+ 434
@@ -4150,7 +4150,7 @@
viewClientes, empresas asociadas
-
+ 434
@@ -4158,7 +4158,7 @@
otherClientes, empresas asociadas
-
+ 435
@@ -4166,7 +4166,7 @@
viewClientes, otras partes vinculadas
-
+ 435
@@ -4174,7 +4174,7 @@
otherClientes, otras partes vinculadas
-
+ 436
@@ -4182,7 +4182,7 @@
viewClientes de dudoso cobro
-
+ 436
@@ -4190,7 +4190,7 @@
otherClientes de dudoso cobro
-
+ 437
@@ -4198,7 +4198,7 @@
viewEnvases y embalajes a devolver por clientes
-
+ 437
@@ -4206,7 +4206,7 @@
otherEnvases y embalajes a devolver por clientes
-
+ 438
@@ -4214,7 +4214,7 @@
viewAnticipos de clientes
-
+ 438
@@ -4222,7 +4222,7 @@
otherAnticipos de clientes
-
+ 44
@@ -4230,7 +4230,7 @@
viewDeudores varios
-
+ 440
@@ -4238,7 +4238,7 @@
viewDeudores
-
+ 4400
@@ -4246,7 +4246,7 @@
viewDeudores (euros)
-
+ 4400
@@ -4254,7 +4254,7 @@
receivableDeudores (euros)
-
+ 4404
@@ -4262,7 +4262,7 @@
viewDeudores (moneda extranjera)
-
+ 4404
@@ -4270,7 +4270,7 @@
receivableDeudores (moneda extranjera)
-
+ 4409
@@ -4278,7 +4278,7 @@
viewDeudores, facturas pendientes de formalizar
-
+ 4409
@@ -4286,7 +4286,7 @@
receivableDeudores, facturas pendientes de formalizar
-
+ 441
@@ -4294,7 +4294,7 @@
viewDeudores, efectos comerciales a cobrar
-
+ 4410
@@ -4302,7 +4302,7 @@
viewDeudores, efectos comerciales en cartera
-
+ 4410
@@ -4310,7 +4310,7 @@
receivableDeudores, efectos comerciales en cartera
-
+ 4411
@@ -4318,7 +4318,7 @@
viewDeudores, efectos comerciales descontados
-
+ 4411
@@ -4326,7 +4326,7 @@
receivableDeudores, efectos comerciales descontados
-
+ 4412
@@ -4334,7 +4334,7 @@
viewDeudores, efectos comerciales en gestión de cobro
-
+ 4412
@@ -4342,7 +4342,7 @@
receivableDeudores, efectos comerciales en gestión de cobro
-
+ 4415
@@ -4350,7 +4350,7 @@
viewDeudores, efectos comerciales impagados
-
+ 4415
@@ -4358,7 +4358,7 @@
receivableDeudores, efectos comerciales impagados
-
+ 446
@@ -4366,7 +4366,7 @@
viewDeudores de dudoso cobro
-
+ 446
@@ -4374,7 +4374,7 @@
otherDeudores de dudoso cobro
-
+ 449
@@ -4382,7 +4382,7 @@
viewDeudores por operaciones en común
-
+ 449
@@ -4390,7 +4390,7 @@
otherDeudores por operaciones en común
-
+ 46
@@ -4406,7 +4406,7 @@
viewAnticipos de remuneraciones
-
+ 460
@@ -4414,7 +4414,7 @@
otherAnticipos de remuneraciones
-
+ 465
@@ -4422,7 +4422,7 @@
viewRemuneraciones pendientes de pago
-
+ 465
@@ -4430,7 +4430,7 @@
otherRemuneraciones pendientes de pago
-
+ 47
@@ -4710,7 +4710,7 @@
viewGastos anticipados
-
+ 480
@@ -4718,7 +4718,7 @@
otherGastos anticipados
-
+ 485
@@ -4726,7 +4726,7 @@
viewIngresos anticipados
-
+ 485
@@ -4734,7 +4734,7 @@
otherIngresos anticipados
-
+ 49
diff --git a/addons/l10n_it/libroIVA.py b/addons/l10n_it/libroIVA.py
index 1805cd108bf..a78c81ffdb3 100755
--- a/addons/l10n_it/libroIVA.py
+++ b/addons/l10n_it/libroIVA.py
@@ -40,14 +40,14 @@ class l10n_chart_it_report_libroIVA (osv.osv):
_columns = {
'name': fields.char('Fiscal year',size=64),
- 'company_id': fields.many2one('res.company', 'Company'),
+ 'company_id': fields.many2one('res.company', 'Company'),
}
def init (self, cr) :
cr.execute("""DROP VIEW IF EXISTS account_report_libroiva""")
- cr.execute("""
- CREATE VIEW account_report_libroiva AS (
- SELECT id, name, company_id FROM account_fiscalyear
+ cr.execute("""
+ CREATE VIEW account_report_libroiva AS (
+ SELECT id, name, company_id FROM account_fiscalyear
)""")
l10n_chart_it_report_libroIVA()
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 91af27db4ad..2ca21a3031c 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -28,6 +28,7 @@ from traceback import format_exception
from sys import exc_info
from tools.safe_eval import safe_eval as eval
import re
+from decimal_precision import decimal_precision as dp
from osv import fields, osv
import netsvc
@@ -108,7 +109,7 @@ Normal - the campaign runs normally and automatically sends all emails and repor
'State',),
'activity_ids': fields.one2many('marketing.campaign.activity',
'campaign_id', 'Activities'),
- 'fixed_cost': fields.float('Fixed Cost', help="Fixed cost for running this campaign. You may also specify variable cost and revenue on each campaign activity. Cost and Revenue statistics are included in Campaign Reporting."),
+ 'fixed_cost': fields.float('Fixed Cost', help="Fixed cost for running this campaign. You may also specify variable cost and revenue on each campaign activity. Cost and Revenue statistics are included in Campaign Reporting.", digits_compute=dp.get_precision('Purchase Price')),
}
_defaults = {
@@ -397,8 +398,8 @@ class marketing_campaign_activity(osv.osv):
'from_ids': fields.one2many('marketing.campaign.transition',
'activity_to_id',
'Previous Activities'),
- 'variable_cost': fields.float('Variable Cost', help="Set a variable cost if you consider that every campaign item that has reached this point has entailed a certain cost. You can get cost statistics in the Reporting section"),
- 'revenue': fields.float('Revenue', help="Set an expected revenue if you consider that every campaign item that has reached this point has generated a certain revenue. You can get revenue statistics in the Reporting section"),
+ 'variable_cost': fields.float('Variable Cost', help="Set a variable cost if you consider that every campaign item that has reached this point has entailed a certain cost. You can get cost statistics in the Reporting section", digits_compute=dp.get_precision('Purchase Price')),
+ 'revenue': fields.float('Revenue', help="Set an expected revenue if you consider that every campaign item that has reached this point has generated a certain revenue. You can get revenue statistics in the Reporting section", digits_compute=dp.get_precision('Sale Price')),
'signal': fields.char('Signal', size=128,
help='An activity with a signal can be called programmatically. Be careful, the workitem is always created when a signal is sent'),
'keep_if_condition_not_met': fields.boolean("Don't delete workitems",
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index e65579c1df3..89b459b8896 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -143,7 +143,7 @@
-
+
diff --git a/addons/marketing_campaign/report/campaign_analysis.py b/addons/marketing_campaign/report/campaign_analysis.py
index a4dbb1c4769..ceab0eab519 100644
--- a/addons/marketing_campaign/report/campaign_analysis.py
+++ b/addons/marketing_campaign/report/campaign_analysis.py
@@ -20,6 +20,8 @@
##############################################################################
import tools
from osv import fields, osv
+from decimal_precision import decimal_precision as dp
+
class campaign_analysis(osv.osv):
_name = "campaign.analysis"
@@ -61,8 +63,8 @@ class campaign_analysis(osv.osv):
'country_id': fields.related('partner_id','address', 'country_id',
type='many2one', relation='res.country',string='Country'),
'total_cost' : fields.function(_total_cost, string='Cost', method=True,
- type="float" ),
- 'revenue': fields.float('Revenue',digits=(16,2),readonly=True),
+ type="float", digits_compute=dp.get_precision('Purchase Price')),
+ 'revenue': fields.float('Revenue', readonly=True, digits_compute=dp.get_precision('Sale Price')),
'count' : fields.integer('# of Actions', readonly=True),
'state': fields.selection([('todo', 'To Do'),
('exception', 'Exception'), ('done', 'Done'),
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index f267764970a..b7a6466bbaf 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -34,7 +34,7 @@
* Make to Stock / Make to Order (by line)
* Multi-level BoMs, no limit
* Multi-level routing, no limit
- * Routing and workcenter integrated with analytic accounting
+ * Routing and work center integrated with analytic accounting
* Scheduler computation periodically / Just In Time module
* Multi-pos, multi-warehouse
* Different reordering policies
diff --git a/addons/mrp/i18n/ar.po b/addons/mrp/i18n/ar.po
index fd992456fc1..9c728738c6e 100644
--- a/addons/mrp/i18n/ar.po
+++ b/addons/mrp/i18n/ar.po
@@ -27,6 +27,11 @@ msgstr ""
msgid "No. Of Cycles"
msgstr ""
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1829,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2267,9 @@ msgstr ""
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/i18n/bg.po b/addons/mrp/i18n/bg.po
index 0222fc5fa4a..553247c5007 100644
--- a/addons/mrp/i18n/bg.po
+++ b/addons/mrp/i18n/bg.po
@@ -27,6 +27,11 @@ msgstr "Създадени движения"
msgid "No. Of Cycles"
msgstr "Бр. цикли"
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1829,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2267,9 @@ msgstr ""
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/i18n/bs.po b/addons/mrp/i18n/bs.po
index cfecb19f6de..18e0aafdba0 100644
--- a/addons/mrp/i18n/bs.po
+++ b/addons/mrp/i18n/bs.po
@@ -27,6 +27,11 @@ msgstr ""
msgid "No. Of Cycles"
msgstr ""
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1829,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2267,9 @@ msgstr ""
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/i18n/ca.po b/addons/mrp/i18n/ca.po
index fa478c6ce57..4961f086fc9 100644
--- a/addons/mrp/i18n/ca.po
+++ b/addons/mrp/i18n/ca.po
@@ -27,6 +27,11 @@ msgstr "Moviments creats"
msgid "No. Of Cycles"
msgstr "Núm. de cicles"
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -506,7 +511,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -558,7 +563,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -651,7 +656,7 @@ msgstr "Preparat"
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Temps en hores per realitzar un cicle."
#. module: mrp
@@ -1070,7 +1075,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1712,8 +1717,8 @@ msgstr "Consumició de productes produïts"
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Descripció del centre de producció. Descriu aquí que és un cicle segons "
"aquest centre de producció."
@@ -1798,9 +1803,9 @@ msgstr "Ordre de producció"
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1833,7 +1838,7 @@ msgstr "Estructura LdM"
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2271,9 +2276,9 @@ msgstr "Descripció"
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -3117,9 +3122,9 @@ msgstr ""
#~ "produir."
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "La llista d'operacions (llista de centres de producció) per produir el "
diff --git a/addons/mrp/i18n/cs.po b/addons/mrp/i18n/cs.po
index 205d0ec6770..6b49fe7dc1e 100644
--- a/addons/mrp/i18n/cs.po
+++ b/addons/mrp/i18n/cs.po
@@ -27,6 +27,11 @@ msgstr ""
msgid "No. Of Cycles"
msgstr ""
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1829,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2267,9 @@ msgstr ""
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index 1472f18b6e4..50c8ff7e0b2 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/i18n/de.po
@@ -28,6 +28,11 @@ msgstr "Buchung erzeugt"
msgid "No. Of Cycles"
msgstr "Anzahl Zyklen"
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr "Maximale Anzahl an Fertigungsvorgängen dieser Fertigungsstelle."
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -535,7 +540,7 @@ msgstr "Fehler: Falscher EAN code"
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr "Spezifiziere Stundensatz der Fertigungsstelle."
#. module: mrp
@@ -587,7 +592,7 @@ msgstr "März"
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr "Spezifiziere Kosten der Fertigungsstelle pro Zyklus"
#. module: mrp
@@ -680,7 +685,7 @@ msgstr "Fertig"
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Zeit in Stunden für einen Auftragszyklus"
#. module: mrp
@@ -1135,7 +1140,7 @@ msgstr "]"
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr "Reihenfolge bei Anzeige der Liste für Fertigungsstellen"
#. module: mrp
@@ -1853,8 +1858,8 @@ msgstr "Fertigprodukte Verbrauch"
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Beschreibung der Fertigungsstelle. Beschreibe hier den Fertigungszyklus aus "
"der Perspektive dieser Fertigungsstelle."
@@ -1947,9 +1952,9 @@ msgstr "Fertigungsauftrag"
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
"Liste der Fertigungsvorgänge (Liste Fertigungsstellen) für die Produktion "
@@ -1986,7 +1991,7 @@ msgstr "Stückliste Struktur"
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
"Anzahl Fertigungsvorgänge die bei einer Fertigungsstelle parallel bearbeitet "
@@ -2461,9 +2466,9 @@ msgstr "Beschreibung"
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
"Fertigungsvorgänge (Arbeitsauftragsliste) für die Herstellung des "
@@ -3353,9 +3358,9 @@ msgstr "Jahr"
#~ "geändert werden"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "Arbeitsplätze, an denen Fertigprodukte produziert werden. Das \"Routing\" "
diff --git a/addons/mrp/i18n/el.po b/addons/mrp/i18n/el.po
index 8064e84d120..db9b66be367 100644
--- a/addons/mrp/i18n/el.po
+++ b/addons/mrp/i18n/el.po
@@ -30,6 +30,11 @@ msgstr "Δημιουργημένες Κινήσεις"
msgid "No. Of Cycles"
msgstr "Αρ. Κύκλων"
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -42,7 +47,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -509,7 +514,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -561,7 +566,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -654,7 +659,7 @@ msgstr "Έτοιμο"
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Χρόνος ενός κύκλου σε ώρες"
#. module: mrp
@@ -1073,7 +1078,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1715,8 +1720,8 @@ msgstr "Ανάλωση Παραγομένων Προϊόντων"
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Περιγραφή κέντρου εργασίας. Εξηγείστε εδώ τι αποτελεί κύκλο για το κέντρο "
"αυτό."
@@ -1801,9 +1806,9 @@ msgstr "Εντολή Παραγωγής"
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1836,7 +1841,7 @@ msgstr "Δομή ΚΥ"
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2274,9 +2279,9 @@ msgstr "Περιγραφή"
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -3039,9 +3044,9 @@ msgstr ""
#~ msgstr "plus"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "Η λίστα των λειτουργιών (λίστα κέντρων εργασίας) ποαραγωγής του "
diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po
index 4ae19062725..a5e45586b9c 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/i18n/es.po
@@ -28,6 +28,10 @@ msgid "No. Of Cycles"
msgstr "Núm. de ciclos"
#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr "Número de operaciones que este centro de producción puede realizar."
+
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
msgstr "Ubicación donde el sistema buscará los componentes."
@@ -532,8 +536,8 @@ msgstr "Error: Código EAN no válido"
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
-msgstr "Indica el coste del centro de producción por hora."
+msgid "Specify Cost of Work center per hour."
+msgstr "Indica coste del centro de trabajo por hora."
#. module: mrp
#: view:mrp.routing:0
@@ -584,8 +588,8 @@ msgstr "Marzo"
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
-msgstr "Indica el coste del centro de producción por ciclo."
+msgid "Specify Cost of Work center per cycle."
+msgstr "Especifique el coste por centro de prodcción"
#. module: mrp
#: field:mrp.bom,child_complete_ids:0
@@ -678,7 +682,7 @@ msgstr "Preparado"
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Tiempo en horas para realizar un ciclo."
#. module: mrp
@@ -1132,7 +1136,7 @@ msgstr "]"
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
"Indica el orden de secuencia cuando se muestra una lista de rutas de centros "
"de producción."
@@ -1848,8 +1852,8 @@ msgstr "Consumición de productos producidos"
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Descripción del centro de producción. Describa aquí que es un ciclo según "
"este centro de producción."
@@ -1943,9 +1947,9 @@ msgstr "Orden de producción"
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
"La lista de las operaciones (lista de los centros de producción) para "
@@ -1983,7 +1987,7 @@ msgstr "Despiece de la LdM"
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
"Número de operaciones que este centro de producción puede realizar en "
@@ -2453,9 +2457,9 @@ msgstr "Descripción"
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
"La lista de las operaciones (lista de los centros de producción) para "
@@ -3351,9 +3355,9 @@ msgstr "Año"
#~ msgstr "Nombre de modelo no válido en la definición de acción."
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "La lista de operaciones (lista de centros de producción) para producir el "
diff --git a/addons/mrp/i18n/es_AR.po b/addons/mrp/i18n/es_AR.po
index c9cdf92b4df..679884415f6 100644
--- a/addons/mrp/i18n/es_AR.po
+++ b/addons/mrp/i18n/es_AR.po
@@ -27,6 +27,11 @@ msgstr ""
msgid "No. Of Cycles"
msgstr ""
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1794,9 @@ msgstr "Orden de Producción"
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1829,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2267,9 @@ msgstr ""
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/i18n/es_EC.po b/addons/mrp/i18n/es_EC.po
index d01cfcec684..3a0a21dd1d2 100644
--- a/addons/mrp/i18n/es_EC.po
+++ b/addons/mrp/i18n/es_EC.po
@@ -27,6 +27,11 @@ msgstr "Movimientos creados"
msgid "No. Of Cycles"
msgstr "Núm. de ciclos"
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -506,7 +511,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -558,7 +563,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -651,7 +656,7 @@ msgstr "Preparado"
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Tiempo en horas para realizar un ciclo."
#. module: mrp
@@ -1070,7 +1075,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1712,8 +1717,8 @@ msgstr "Consumición de productos producidos"
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Descripción del centro de producción. Describa aquí que es un ciclo según "
"este centro de producción."
@@ -1798,9 +1803,9 @@ msgstr "Orden de producción"
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1833,7 +1838,7 @@ msgstr "Despiece de la LdM"
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2271,9 +2276,9 @@ msgstr "Descripción"
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/i18n/et.po b/addons/mrp/i18n/et.po
index e5a6e8da9fa..dc6001bb3d1 100644
--- a/addons/mrp/i18n/et.po
+++ b/addons/mrp/i18n/et.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05+0000\n"
"PO-Revision-Date: 2010-10-30 09:28+0000\n"
"Last-Translator: Fabien (Open ERP) \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-17 05:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
@@ -27,6 +27,11 @@ msgstr "Liikumised loodud"
msgid "No. Of Cycles"
msgstr "Tsükklite No."
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -99,11 +104,6 @@ msgstr ""
msgid "Routings"
msgstr "Tarnimised"
-#. module: mrp
-#: field:mrp.workcenter,product_id:0
-msgid "Work Center Product"
-msgstr ""
-
#. module: mrp
#: view:mrp.bom:0
msgid "Search Bill Of Material"
@@ -119,13 +119,6 @@ msgstr ""
msgid "To Produce"
msgstr ""
-#. module: mrp
-#: help:mrp.routing.workcenter,cycle_nbr:0
-msgid ""
-"Number of iterations this work center has to do in the specified operation "
-"of the routing."
-msgstr ""
-
#. module: mrp
#: view:mrp.bom:0
#: field:mrp.bom,code:0
@@ -223,13 +216,6 @@ msgid ""
"your bills of materials."
msgstr ""
-#. module: mrp
-#: help:mrp.workcenter,product_id:0
-msgid ""
-"Fill this product to track easily your production costs in the analytic "
-"accounting."
-msgstr ""
-
#. module: mrp
#: model:process.node,note:mrp.process_node_purchaseprocure0
msgid "For purchased material"
@@ -500,7 +486,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -550,9 +536,14 @@ msgstr ""
msgid "March"
msgstr ""
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_workcenter_load
+msgid "Workcenter Load"
+msgstr "Töökeskkonna Koormus"
+
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -567,6 +558,13 @@ msgstr ""
msgid "Produce"
msgstr ""
+#. module: mrp
+#: help:mrp.product_price,number:0
+msgid ""
+"Specify quantity of products to produce or buy. Report of Cost structure "
+"will be displayed base on this qunatity."
+msgstr ""
+
#. module: mrp
#: selection:mrp.production,state:0
#: view:mrp.production.order:0
@@ -611,7 +609,6 @@ msgstr ""
#. module: mrp
#: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
-#: model:ir.model,name:mrp.model_mrp_workcenter_load
#: model:ir.model,name:mrp.model_report_workcenter_load
msgid "Work Center Load"
msgstr ""
@@ -639,13 +636,14 @@ msgid "Planning"
msgstr ""
#. module: mrp
-#: view:mrp.production:0
-msgid "Ready"
-msgstr "Valmis"
+#: view:mrp.workcenter:0
+msgid "Costing Information"
+msgstr ""
#. module: mrp
+#: help:mrp.routing.workcenter,hour_nbr:0
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Aeg tundides mis kulub ühes tsükklis."
#. module: mrp
@@ -809,13 +807,6 @@ msgstr ""
msgid "Procurement of raw material"
msgstr ""
-#. module: mrp
-#: help:mrp.routing.workcenter,hour_nbr:0
-msgid ""
-"Time in hours for this work center to achieve the operation of the specified "
-"routing."
-msgstr ""
-
#. module: mrp
#: view:mrp.production:0
#: field:mrp.production,cycle_total:0
@@ -1064,7 +1055,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1072,45 +1063,6 @@ msgstr ""
msgid "Order quantity cannot be negative or zero !"
msgstr ""
-#. module: mrp
-#: model:ir.module.module,description:mrp.module_meta_information
-msgid ""
-"\n"
-" This is the base module to manage the manufacturing process in OpenERP.\n"
-"\n"
-" Features:\n"
-" * Make to Stock / Make to Order (by line)\n"
-" * Multi-level BoMs, no limit\n"
-" * Multi-level routing, no limit\n"
-" * Routing and workcenter integrated with analytic accounting\n"
-" * Scheduler computation periodically / Just In Time module\n"
-" * Multi-pos, multi-warehouse\n"
-" * Different reordering policies\n"
-" * Cost method by product: standard price, average price\n"
-" * Easy analysis of troubles or needs\n"
-" * Very flexible\n"
-" * Allows to browse Bill of Materials in complete structure\n"
-" that include child and phantom BoMs\n"
-" It supports complete integration and planification of stockable goods,\n"
-" consumable of services. Services are completely integrated with the "
-"rest\n"
-" of the software. For instance, you can set up a sub-contracting service\n"
-" in a BoM to automatically purchase on order the assembly of your "
-"production.\n"
-"\n"
-" Reports provided by this module:\n"
-" * Bill of Material structure and components\n"
-" * Load forecast on workcenters\n"
-" * Print a production order\n"
-" * Stock forecasts\n"
-" Dashboard provided by this module::\n"
-" * List of next production orders\n"
-" * List of deliveries (out picking)\n"
-" * Graph of work center load\n"
-" * List of procurement in exception\n"
-" "
-msgstr ""
-
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_production_action3
msgid "Manufacturing Orders in Progress"
@@ -1627,12 +1579,6 @@ msgstr ""
msgid "Production Analysis"
msgstr ""
-#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#, python-format
-msgid "Copy"
-msgstr ""
-
#. module: mrp
#: view:mrp.production.lot.line:0
msgid "Production Products"
@@ -1705,8 +1651,8 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Töökeskonna kirjeldus. selgita siin mis tsükklid kuuluvad sellele "
"töökeskonnale."
@@ -1791,9 +1737,9 @@ msgstr "Tootmiskorraldus"
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1826,7 +1772,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -1972,11 +1918,6 @@ msgstr ""
msgid "Number of Hours"
msgstr ""
-#. module: mrp
-#: view:mrp.workcenter:0
-msgid "Costing Information"
-msgstr ""
-
#. module: mrp
#: model:process.node,name:mrp.process_node_purchaseprocure0
msgid "Procurement Orders"
@@ -2054,6 +1995,7 @@ msgid "BoM Revisions"
msgstr ""
#. module: mrp
+#: view:mrp.production:0
#: selection:mrp.production,state:0
#: selection:mrp.production.order,state:0
msgid "Draft"
@@ -2264,9 +2206,9 @@ msgstr ""
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -2351,13 +2293,6 @@ msgid ""
"the BOM, through a run of the schedulers (MRP)."
msgstr ""
-#. module: mrp
-#: help:mrp.product_price,number:0
-msgid ""
-"Specify quantity of products to produce or buy. Report of Cost structure "
-"will be displayed base on this quantity."
-msgstr ""
-
#. module: mrp
#: selection:mrp.bom,method:0
msgid "On Stock"
@@ -2413,14 +2348,6 @@ msgstr ""
#~ msgid "Origin"
#~ msgstr "Allikas"
-#, python-format
-#~ msgid "No supplier defined for this product !"
-#~ msgstr "Sellele tootele pole defineeritud tarnijat !"
-
-#, python-format
-#~ msgid "Product name"
-#~ msgstr "Toote nimi"
-
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "Vigane XML vaate arhitektuurile!"
@@ -2442,10 +2369,6 @@ msgstr ""
#~ msgid "Do nothing"
#~ msgstr "Ära tee midagi"
-#, python-format
-#~ msgid "products"
-#~ msgstr "tooted"
-
#~ msgid "Internal Ref."
#~ msgstr "Sisemine viide"
@@ -2455,27 +2378,15 @@ msgstr ""
#~ msgid "Stockable Production Order"
#~ msgstr "Tootmiskorraldus lattu"
-#, python-format
-#~ msgid "Workcenter name"
-#~ msgstr "Töökeskkonna nimi"
-
#~ msgid "Production Orders"
#~ msgstr "Tootmiskorraldused"
-#, python-format
-#~ msgid "Product Quantity"
-#~ msgstr "Tootekogus"
-
#~ msgid "Procurements"
#~ msgstr "Hanked"
#~ msgid "Details"
#~ msgstr "Üksikasjad"
-#, python-format
-#~ msgid "Product Standard Price"
-#~ msgstr "Toote standardhind"
-
#~ msgid "product"
#~ msgstr "toode"
@@ -2491,6 +2402,9 @@ msgstr ""
#~ msgid "Latest error"
#~ msgstr "Viimane viga"
+#~ msgid "Ready"
+#~ msgstr "Valmis"
+
#~ msgid "Production Orders Planning"
#~ msgstr "Tootmiskorralduste Planeerimine"
@@ -2509,10 +2423,6 @@ msgstr ""
#~ msgid "If Product type is service"
#~ msgstr "kui Toote tüüp on teenus"
-#, python-format
-#~ msgid "SUBTOTAL"
-#~ msgstr "VAHESUMMA"
-
#~ msgid "Security Days"
#~ msgstr "Turvalised Päevad"
@@ -2537,13 +2447,6 @@ msgstr ""
#~ msgid "on order"
#~ msgstr "tellimisel"
-#~ msgid "Create Procurement"
-#~ msgstr "Loo hange"
-
-#, python-format
-#~ msgid "Product uom"
-#~ msgstr "Toote mõõtühik"
-
#~ msgid "Number of Cycle"
#~ msgstr "Tsükkli number"
@@ -2674,9 +2577,6 @@ msgstr ""
#~ msgid "Workcenters load"
#~ msgstr "Töökeskkonna koormus"
-#~ msgid "Workcenter Load"
-#~ msgstr "Töökeskkonna Koormus"
-
#~ msgid "MRP Management - Reporting"
#~ msgstr "TVP haldus - Aruandlus"
diff --git a/addons/mrp/i18n/fi.po b/addons/mrp/i18n/fi.po
index 37774f19cf7..1ff6b7b8452 100644
--- a/addons/mrp/i18n/fi.po
+++ b/addons/mrp/i18n/fi.po
@@ -28,6 +28,11 @@ msgstr "Luodut siirrot"
msgid "No. Of Cycles"
msgstr "Kiertojen määrä"
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -40,7 +45,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -506,7 +511,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -558,7 +563,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -651,7 +656,7 @@ msgstr "Valmis"
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Yhden kierron kesto tunneissa."
#. module: mrp
@@ -1070,7 +1075,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1713,8 +1718,8 @@ msgstr "Tuotannon tuotteiden kulutus"
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Työpisteen kuvaus. Selitä tässä mitä kierros tarkoittaa tässä työpisteessä."
@@ -1798,9 +1803,9 @@ msgstr "Tuotantotilaus"
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1833,7 +1838,7 @@ msgstr "Osaluettelon rakenne"
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2271,9 +2276,9 @@ msgstr "Kuvaus"
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -2991,9 +2996,9 @@ msgstr ""
#~ msgstr "Varastoitava tuote prosessi"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "Lista toiminnoista (työpisteistä) jotka tuotteen valmistaminen vaatii. "
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index a6997ded81c..21c1e20d700 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -44,6 +44,11 @@ msgstr "Mouvements créés"
msgid "No. Of Cycles"
msgstr "Nombre de Cycles"
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr "Nombre d'opérations simultanées du poste de charge"
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -540,7 +545,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr "Précisez le coût horaire du centre de charge"
#. module: mrp
@@ -592,7 +597,7 @@ msgstr "Mars"
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr "Précisez le coût par cycle du poste de charge"
#. module: mrp
@@ -685,7 +690,7 @@ msgstr "Prêt"
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Temps nécessaire à la réalisation d'un cycle"
#. module: mrp
@@ -1772,8 +1777,8 @@ msgstr "Consommation en production de produit"
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Description du centre de travail. Expliquez ici ce qu'est le cycle d'après "
"le centre de travail."
@@ -1862,9 +1867,9 @@ msgstr "Ordre de Production"
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
"La liste des opérations (liste des postes de charge) pour fabriquer le "
@@ -1901,7 +1906,7 @@ msgstr "Structure de la Nomenclature"
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
"Nombre d'opérations que ce poste de charge peut réaliser en parallèle. Si ce "
@@ -2352,9 +2357,9 @@ msgstr "Description"
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
"La liste des opérations (liste des postes de charge) pour fabriquer le "
@@ -3159,9 +3164,9 @@ msgstr ""
#~ msgstr "Ordres de production en cours"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "La liste des opérations pour fabriquer le produit fini. La gammeest "
diff --git a/addons/mrp/i18n/hi.po b/addons/mrp/i18n/hi.po
index b8eba16b420..f7856ec0047 100644
--- a/addons/mrp/i18n/hi.po
+++ b/addons/mrp/i18n/hi.po
@@ -28,6 +28,11 @@ msgstr ""
msgid "No. Of Cycles"
msgstr ""
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -40,7 +45,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -501,7 +506,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -553,7 +558,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -646,7 +651,7 @@ msgstr "तैयार"
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1065,7 +1070,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1706,8 +1711,8 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1790,9 +1795,9 @@ msgstr ""
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1825,7 +1830,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2263,9 +2268,9 @@ msgstr ""
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/i18n/hr.po b/addons/mrp/i18n/hr.po
index af544d5fb2f..7893f000c79 100644
--- a/addons/mrp/i18n/hr.po
+++ b/addons/mrp/i18n/hr.po
@@ -27,6 +27,11 @@ msgstr ""
msgid "No. Of Cycles"
msgstr ""
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1829,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2267,9 @@ msgstr ""
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/i18n/hu.po b/addons/mrp/i18n/hu.po
index 137f199dc2e..f8d642055b7 100644
--- a/addons/mrp/i18n/hu.po
+++ b/addons/mrp/i18n/hu.po
@@ -27,6 +27,11 @@ msgstr ""
msgid "No. Of Cycles"
msgstr ""
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1829,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2267,9 @@ msgstr ""
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/i18n/id.po b/addons/mrp/i18n/id.po
index 686a95f7f1b..548406b5ca2 100644
--- a/addons/mrp/i18n/id.po
+++ b/addons/mrp/i18n/id.po
@@ -27,6 +27,11 @@ msgstr ""
msgid "No. Of Cycles"
msgstr ""
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1829,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2267,9 @@ msgstr ""
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/i18n/it.po b/addons/mrp/i18n/it.po
index 2386e0ca010..3210fa1e43d 100644
--- a/addons/mrp/i18n/it.po
+++ b/addons/mrp/i18n/it.po
@@ -27,6 +27,11 @@ msgstr "Movimentazioni generate"
msgid "No. Of Cycles"
msgstr "N. Cicli di Lavoro"
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr "Numero di operazioni che questo centro di lavoro può fare."
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -516,7 +521,7 @@ msgstr "Errore: codice EAN non valido"
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr "Specificare il costo orario per il centro di lavoro."
#. module: mrp
@@ -568,7 +573,7 @@ msgstr "Marzo"
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr "Specificare il costo per ciclo per il centro di lavoro."
#. module: mrp
@@ -661,7 +666,7 @@ msgstr "Pronto"
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Tempo in ore per completare un ciclo."
#. module: mrp
@@ -1083,7 +1088,7 @@ msgstr "]"
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1726,8 +1731,8 @@ msgstr "Utilizzo Prodotti in Produzione"
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1810,9 +1815,9 @@ msgstr "Ordine di Produzione"
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1845,7 +1850,7 @@ msgstr "Struttura Distinta Base"
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
"Numero di operazioni che questo centro di lavoro può fare in parallelo. Se "
@@ -2292,9 +2297,9 @@ msgstr "Descrizione"
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -2662,9 +2667,9 @@ msgstr "Anno"
#~ msgstr "Ciclo di lavoro del materiale"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "La lista delle lavorazioni (lista dei centri di lavoro) per ottenere il "
diff --git a/addons/mrp/i18n/ko.po b/addons/mrp/i18n/ko.po
index c3e286954ea..b789ccde189 100644
--- a/addons/mrp/i18n/ko.po
+++ b/addons/mrp/i18n/ko.po
@@ -28,6 +28,11 @@ msgstr "생성된 무브"
msgid "No. Of Cycles"
msgstr "싸이클 횟수"
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -40,7 +45,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -503,7 +508,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -555,7 +560,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -648,7 +653,7 @@ msgstr "준비"
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "한 사이클을 수행하는 시간"
#. module: mrp
@@ -1067,7 +1072,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1708,8 +1713,8 @@ msgstr "생산 상품 소비"
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr "워크센터 설명. 이 워크센터에 기초하여 사이클을 설명하십시오."
#. module: mrp
@@ -1792,9 +1797,9 @@ msgstr "생산 주문"
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1827,7 +1832,7 @@ msgstr "BOM 구조"
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2265,9 +2270,9 @@ msgstr "설명"
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -2872,9 +2877,9 @@ msgstr ""
#~ msgstr "견적 요청이 생성되어 공급자에게 전송됩니다."
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "완제품 생산을 위한 오퍼레이션 리스트 (워크센터 리스트). 이 라우팅은 주로 오퍼레이션 중의 워크센터 원가 계산과 생산 계획에 기초한 "
diff --git a/addons/mrp/i18n/lt.po b/addons/mrp/i18n/lt.po
index d79f5abb856..63e69a2e684 100644
--- a/addons/mrp/i18n/lt.po
+++ b/addons/mrp/i18n/lt.po
@@ -28,6 +28,11 @@ msgstr "Sukurta perdavimų"
msgid "No. Of Cycles"
msgstr "Ciklų skaičius"
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -40,7 +45,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -506,7 +511,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -558,7 +563,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -651,7 +656,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Vieno ciklo laikas valandomis."
#. module: mrp
@@ -1070,7 +1075,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1712,8 +1717,8 @@ msgstr "Gamybos produktų vartojimas"
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr "Darbo centro parašymas. Nurodomas koks yra šio darbo centro ciklas."
#. module: mrp
@@ -1796,9 +1801,9 @@ msgstr "Gamybos užsakymas"
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1831,7 +1836,7 @@ msgstr "KS struktūra"
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2269,9 +2274,9 @@ msgstr "Aprašymas"
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -2955,9 +2960,9 @@ msgstr ""
#~ msgstr "plius"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "Tai yra darbų sąrašas (sąrašas darbo centrų) pagaminti pabaigtus produktus. "
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index fd09e5a8e1f..24f420781ef 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/mrp.pot
@@ -26,6 +26,11 @@ msgstr ""
msgid "No. Of Cycles"
msgstr ""
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -441,6 +446,12 @@ msgstr ""
msgid "Complete this only if you want automatic analytic accounting entries on production orders."
msgstr ""
+#. module: mrp
+#: help:mrp.workcenter,product_id:0
+#: help:mrp.workcenter,product_id:0
+msgid "Fill this product to track easily your production costs in the analytic accounting."
+msgstr ""
+
#. module: mrp
#: field:mrp.production.workcenter.line,cycle:0
msgid "Nbr of cycles"
@@ -470,7 +481,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -520,9 +531,14 @@ msgstr ""
msgid "March"
msgstr ""
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_workcenter_load
+msgid "Work Center Load"
+msgstr ""
+
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -613,7 +629,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1003,7 +1019,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
-msgid "Gives the sequence order when displaying a list of routing workcenters."
+msgid "Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1613,7 +1629,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
-msgid "Description of the workcenter. Explain here what's a cycle according to this workcenter."
+msgid "Description of the work center. Explain here what's a cycle according to this work center."
msgstr ""
#. module: mrp
@@ -1687,7 +1703,7 @@ msgstr ""
#. module: mrp
#: help:mrp.production,routing_id:0
-msgid "The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production plannification."
+msgid "The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."
msgstr ""
#. module: mrp
@@ -1718,7 +1734,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
-msgid "Number of operations this workcenter can do in parallel. If this workcenter represents a team of 5 workers, the capacity per cycle is 5."
+msgid "Number of operations this work center can do in parallel. If this work center represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
#. module: mrp
@@ -2131,7 +2147,7 @@ msgstr ""
#. module: mrp
#: help:mrp.bom,routing_id:0
-msgid "The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production planning."
+msgid "The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production planning."
msgstr ""
#. module: mrp
diff --git a/addons/mrp/i18n/nl.po b/addons/mrp/i18n/nl.po
index a55a23a4244..3824d520de2 100644
--- a/addons/mrp/i18n/nl.po
+++ b/addons/mrp/i18n/nl.po
@@ -27,6 +27,11 @@ msgstr "Gegenereerde boekingen"
msgid "No. Of Cycles"
msgstr "Aantal cycli"
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -505,7 +510,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -557,7 +562,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -650,7 +655,7 @@ msgstr "Gereed"
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Tijd in uren voor één productiecyclus."
#. module: mrp
@@ -1069,7 +1074,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1712,8 +1717,8 @@ msgstr "Productie verbruiksartikelen"
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Omschrijving van de werkplaats. Leg uit wat een cyclus is vanuit het "
"gezichtspunt van deze werkplaats."
@@ -1798,9 +1803,9 @@ msgstr "Productieorder"
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1833,7 +1838,7 @@ msgstr "Materiaallijststructuur"
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2271,9 +2276,9 @@ msgstr "Beschrijving"
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -2642,9 +2647,9 @@ msgstr ""
#~ msgstr "Wacht op beschikbare producten ter reservering"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "De lijst van handelingen (lijst van werkplaatsen) voor het produceren van "
diff --git a/addons/mrp/i18n/nl_BE.po b/addons/mrp/i18n/nl_BE.po
index d1719be2c3e..49dff3e758c 100644
--- a/addons/mrp/i18n/nl_BE.po
+++ b/addons/mrp/i18n/nl_BE.po
@@ -27,6 +27,11 @@ msgstr ""
msgid "No. Of Cycles"
msgstr ""
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1829,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2267,9 @@ msgstr ""
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index 577e85c38fd..6033974b20d 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/i18n/pl.po
@@ -27,6 +27,11 @@ msgstr "Utworzone przesunięcia"
msgid "No. Of Cycles"
msgstr "Liczba cykli"
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr "Liczba operacji, którą to centrum może wykonać."
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr "Wykorzystanie centrum roboczego"
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr "Obłożenie centrum roboczego"
#. module: mrp
@@ -518,7 +523,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr "Podaj godzinowy koszt centrum roboczego"
#. module: mrp
@@ -570,7 +575,7 @@ msgstr "Marzec"
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr "Podaj koszt centrum roboczego na cykl"
#. module: mrp
@@ -663,7 +668,7 @@ msgstr "Gotowe"
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Czas wykonania jednego cyklu w godzinach"
#. module: mrp
@@ -1090,7 +1095,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr "Ustala kolejność wyświetlania na liście centrów roboczych."
#. module: mrp
@@ -1742,8 +1747,8 @@ msgstr "Zużycie materiałów w produkcji"
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr "Opis centrum roboczego. Opisz co jest cyklem dla tego centrum."
#. module: mrp
@@ -1826,9 +1831,9 @@ msgstr "Zamówienie produkcji"
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1861,7 +1866,7 @@ msgstr "Struktura Zest. Mat."
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2299,9 +2304,9 @@ msgstr "Opis"
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -2751,9 +2756,9 @@ msgstr ""
#~ msgstr "plus"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "Lista operacji (lista centrów roboczych) do wyprodukowania produktu "
diff --git a/addons/mrp/i18n/pt.po b/addons/mrp/i18n/pt.po
index 9d7ba0a1852..64507331115 100644
--- a/addons/mrp/i18n/pt.po
+++ b/addons/mrp/i18n/pt.po
@@ -27,6 +27,11 @@ msgstr "Movimentos criados"
msgid "No. Of Cycles"
msgstr "Núm. de ciclos"
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr "Número de operacões que este centro de produção pode realizar."
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -519,7 +524,7 @@ msgstr "Erro: Código EAN inválido"
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr "Indica o custo do centro de trabalho por hora."
#. module: mrp
@@ -571,7 +576,7 @@ msgstr "Março"
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr "Especifique o custe do centro de trabalho por ciclo"
#. module: mrp
@@ -664,7 +669,7 @@ msgstr "Pronto"
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Tempo em horas por fazer um ciclo."
#. module: mrp
@@ -1083,7 +1088,7 @@ msgstr "]"
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1724,8 +1729,8 @@ msgstr "Consumo de produtos de produção"
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Descrição do centro de trabalho. Explicar aqui o que é um ciclo de acordo "
"para este centro de trabalho."
@@ -1810,9 +1815,9 @@ msgstr "Ordem de produção"
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1845,7 +1850,7 @@ msgstr "Estructura BoM"
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2283,9 +2288,9 @@ msgstr "Descrição"
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index 9b73821968f..534e492ac45 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/i18n/pt_BR.po
@@ -27,6 +27,11 @@ msgstr "Movimentações Criadas"
msgid "No. Of Cycles"
msgstr "Núm. de ciclos"
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -503,7 +508,7 @@ msgstr "Erro: Código EAN inválido"
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -555,7 +560,7 @@ msgstr "Março"
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -648,7 +653,7 @@ msgstr "Pronto"
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Tempo em hora para fazer um ciclo."
#. module: mrp
@@ -1067,7 +1072,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1710,8 +1715,8 @@ msgstr "Produção de Bens de Consumo"
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Descrição do centro de trabalho. Explique aqui o que é um ciclo de acordo "
"com este centro de trabalho."
@@ -1796,9 +1801,9 @@ msgstr "Ordem de Produção"
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1831,7 +1836,7 @@ msgstr "Estrutura da BoM"
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2269,9 +2274,9 @@ msgstr "Descrição"
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/i18n/ro.po b/addons/mrp/i18n/ro.po
index 6ac472d9d89..ce29311c0f9 100644
--- a/addons/mrp/i18n/ro.po
+++ b/addons/mrp/i18n/ro.po
@@ -27,6 +27,11 @@ msgstr ""
msgid "No. Of Cycles"
msgstr "Nr de cicluri"
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1829,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2267,9 @@ msgstr ""
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/i18n/ru.po b/addons/mrp/i18n/ru.po
index 44aa10a6d9d..3d105709d9a 100644
--- a/addons/mrp/i18n/ru.po
+++ b/addons/mrp/i18n/ru.po
@@ -27,6 +27,11 @@ msgstr "Перемещение создано"
msgid "No. Of Cycles"
msgstr "Кол-во циклов"
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +650,7 @@ msgstr "Готово"
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Время в часах на выполнение одного цикла"
#. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
"Описание участка обработка. Укажите здесь, что соответствует циклу участка."
@@ -1790,9 +1795,9 @@ msgstr "Заказ на производство"
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1825,7 +1830,7 @@ msgstr "Структура спецификации"
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2263,9 +2268,9 @@ msgstr "Описание"
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -2688,9 +2693,9 @@ msgstr ""
#~ msgstr "Заявка выслана поставщику"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "Список операций и участков обработки для производства готового изделия. "
diff --git a/addons/mrp/i18n/sk.po b/addons/mrp/i18n/sk.po
index 12076c50989..c4633f77368 100644
--- a/addons/mrp/i18n/sk.po
+++ b/addons/mrp/i18n/sk.po
@@ -28,6 +28,11 @@ msgstr ""
msgid "No. Of Cycles"
msgstr ""
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -40,7 +45,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -501,7 +506,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -553,7 +558,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -646,7 +651,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1065,7 +1070,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1706,8 +1711,8 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1790,9 +1795,9 @@ msgstr ""
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1825,7 +1830,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2263,9 +2268,9 @@ msgstr ""
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/i18n/sl.po b/addons/mrp/i18n/sl.po
index c8939d2538e..d666b0eb4c0 100644
--- a/addons/mrp/i18n/sl.po
+++ b/addons/mrp/i18n/sl.po
@@ -27,6 +27,11 @@ msgstr ""
msgid "No. Of Cycles"
msgstr ""
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +650,7 @@ msgstr "Pripravljen"
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1829,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2267,9 @@ msgstr "Opis"
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/i18n/sq.po b/addons/mrp/i18n/sq.po
index 41d0f380f13..e40beaf43d9 100644
--- a/addons/mrp/i18n/sq.po
+++ b/addons/mrp/i18n/sq.po
@@ -28,6 +28,11 @@ msgstr ""
msgid "No. Of Cycles"
msgstr ""
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -40,7 +45,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -501,7 +506,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -553,7 +558,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -646,7 +651,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1065,7 +1070,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1706,8 +1711,8 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1790,9 +1795,9 @@ msgstr ""
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1825,7 +1830,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2263,9 +2268,9 @@ msgstr ""
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/i18n/sv.po b/addons/mrp/i18n/sv.po
index 9d30a29b085..30028732a6e 100644
--- a/addons/mrp/i18n/sv.po
+++ b/addons/mrp/i18n/sv.po
@@ -27,6 +27,11 @@ msgstr "Moves Created"
msgid "No. Of Cycles"
msgstr "No. Of Cycles"
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -505,7 +510,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -557,7 +562,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -650,7 +655,7 @@ msgstr "Klar"
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "Time in hours for doing one cycle."
#. module: mrp
@@ -1069,7 +1074,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1710,11 +1715,11 @@ msgstr "Production Products Consommation"
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
#. module: mrp
#: help:mrp.product.produce,mode:0
@@ -1796,9 +1801,9 @@ msgstr "Tillverkningsorder"
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1831,7 +1836,7 @@ msgstr "BOM Structure"
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2269,9 +2274,9 @@ msgstr "Beskrivning"
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -3098,14 +3103,14 @@ msgstr ""
#~ msgstr "Product quantity"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgid "Stockable Product Process"
diff --git a/addons/mrp/i18n/tlh.po b/addons/mrp/i18n/tlh.po
index bba5f31e89b..90d56600d2d 100644
--- a/addons/mrp/i18n/tlh.po
+++ b/addons/mrp/i18n/tlh.po
@@ -27,6 +27,11 @@ msgstr ""
msgid "No. Of Cycles"
msgstr ""
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1829,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2267,9 @@ msgstr ""
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index 3de31d3a78c..56eb40bf975 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/i18n/tr.po
@@ -27,6 +27,11 @@ msgstr "Oluşan Hareketler"
msgid "No. Of Cycles"
msgstr "Çevrim Sayısı"
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +650,7 @@ msgstr "Hazır"
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1710,8 @@ msgstr "Üretim Ürünleri Consommation"
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1794,9 @@ msgstr "Üretim Emri"
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1829,7 @@ msgstr "BOM YAPISI"
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2267,9 @@ msgstr "Açıklama"
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -2715,9 +2720,9 @@ msgstr ""
#~ msgstr "İptal Edildi"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr ""
#~ "Operasyon Listesi (iş merkezi listesi) Bitmiş ürünleri üretmek için. The "
diff --git a/addons/mrp/i18n/uk.po b/addons/mrp/i18n/uk.po
index 4fb0fdf5fc4..d8ab0d477a1 100644
--- a/addons/mrp/i18n/uk.po
+++ b/addons/mrp/i18n/uk.po
@@ -27,6 +27,11 @@ msgstr "Створені переміщення"
msgid "No. Of Cycles"
msgstr ""
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1710,8 @@ msgstr "Видаток продуктів виробництва"
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1789,9 +1794,9 @@ msgstr "Заявка на виробництво"
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1829,7 @@ msgstr "Структура СВ"
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2267,9 @@ msgstr "Опис"
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/i18n/vi.po b/addons/mrp/i18n/vi.po
index 621a36a862c..927d3b0a809 100644
--- a/addons/mrp/i18n/vi.po
+++ b/addons/mrp/i18n/vi.po
@@ -28,6 +28,11 @@ msgstr ""
msgid "No. Of Cycles"
msgstr ""
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -40,7 +45,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -501,7 +506,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -553,7 +558,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -646,7 +651,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr ""
#. module: mrp
@@ -1065,7 +1070,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1706,8 +1711,8 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr ""
#. module: mrp
@@ -1790,9 +1795,9 @@ msgstr ""
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1825,7 +1830,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2263,9 +2268,9 @@ msgstr ""
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index 17f6f4a27e9..7a19a38ff95 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/i18n/zh_CN.po
@@ -27,6 +27,11 @@ msgstr "创建调拨"
msgid "No. Of Cycles"
msgstr "周期"
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +650,7 @@ msgstr "准备好"
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "一个周期的工作小时数"
#. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1710,8 @@ msgstr "生产产品消耗"
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr "根据中工作中心说明在什么循环"
#. module: mrp
@@ -1789,9 +1794,9 @@ msgstr "生产单"
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1829,7 @@ msgstr "物料清单结构"
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2267,9 @@ msgstr "说明"
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
@@ -2722,7 +2727,7 @@ msgstr ""
#~ " * Make to Stock / Make to Order (by line)\n"
#~ " * Multi-level BoMs, no limit\n"
#~ " * Multi-level routing, no limit\n"
-#~ " * Routing and workcenter integrated with analytic accounting\n"
+#~ " * Routing and work center integrated with analytic accounting\n"
#~ " * Scheduler computation periodically / Just In Time module\n"
#~ " * Multi-pos, multi-warehouse\n"
#~ " * Different reordering policies\n"
@@ -3065,9 +3070,9 @@ msgstr ""
#~ msgstr "正"
#~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
#~ "plannification."
#~ msgstr "这生产成品的运作列表(工作中心列表)工艺路线主要是用于计算这生产计划的工作中心的成本和计划未来的工作中心的未来负荷"
diff --git a/addons/mrp/i18n/zh_HK.po b/addons/mrp/i18n/zh_HK.po
index d476b2177fd..14b8b5e22b4 100644
--- a/addons/mrp/i18n/zh_HK.po
+++ b/addons/mrp/i18n/zh_HK.po
@@ -28,6 +28,11 @@ msgstr "成功創建調撥"
msgid "No. Of Cycles"
msgstr "週期數"
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -40,7 +45,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -501,7 +506,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -553,7 +558,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -646,7 +651,7 @@ msgstr "就緒"
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "一個循環所須的小時數"
#. module: mrp
@@ -1065,7 +1070,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1706,8 +1711,8 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr "工作中心之描述。在此說明此工作中心是依據那個週期。"
#. module: mrp
@@ -1790,9 +1795,9 @@ msgstr ""
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1825,7 +1830,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2263,9 +2268,9 @@ msgstr ""
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po
index a374cea05cc..f8ee29c605b 100644
--- a/addons/mrp/i18n/zh_TW.po
+++ b/addons/mrp/i18n/zh_TW.po
@@ -27,6 +27,11 @@ msgstr "調撥已創建"
msgid "No. Of Cycles"
msgstr "週期數"
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
msgstr ""
#. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
msgstr ""
#. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
msgstr ""
#. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
msgstr "一個循環所須的小時數"
#. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
msgstr ""
#. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
msgstr "工作中心之描述。在此說明此工作中心是依據那個週期。"
#. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"plannification."
msgstr ""
@@ -1824,7 +1829,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2262,9 +2267,9 @@ msgstr ""
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
"planning."
msgstr ""
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index d5bc8f39e6c..3850ab33822 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -39,15 +39,15 @@ class mrp_workcenter(osv.osv):
_description = 'Work Center'
_inherits = {'resource.resource':"resource_id"}
_columns = {
- 'note': fields.text('Description', help="Description of the workcenter. Explain here what's a cycle according to this workcenter."),
- 'capacity_per_cycle': fields.float('Capacity per Cycle', help="Number of operations this workcenter can do in parallel. If this workcenter represents a team of 5 workers, the capacity per cycle is 5."),
+ 'note': fields.text('Description', help="Description of the work center. Explain here what's a cycle according to this work center."),
+ 'capacity_per_cycle': fields.float('Capacity per Cycle', help="Number of operations this work center can do in parallel. If this work center represents a team of 5 workers, the capacity per cycle is 5."),
'time_cycle': fields.float('Time for 1 cycle (hour)', help="Time in hours for doing one cycle."),
'time_start': fields.float('Time before prod.', help="Time in hours for the setup."),
'time_stop': fields.float('Time after prod.', help="Time in hours for the cleaning."),
- 'costs_hour': fields.float('Cost per hour', help="Specify Cost of Workcenter per hour."),
+ 'costs_hour': fields.float('Cost per hour', help="Specify Cost of Work center per hour."),
'costs_hour_account_id': fields.many2one('account.analytic.account', 'Hour Account', domain=[('type','<>','view')],
help="Complete this only if you want automatic analytic accounting entries on production orders."),
- 'costs_cycle': fields.float('Cost per cycle', help="Specify Cost of Workcenter per cycle."),
+ 'costs_cycle': fields.float('Cost per cycle', help="Specify Cost of Work center per cycle."),
'costs_cycle_account_id': fields.many2one('account.analytic.account', 'Cycle Account', domain=[('type','<>','view')],
help="Complete this only if you want automatic analytic accounting entries on production orders."),
'costs_journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal'),
@@ -109,7 +109,7 @@ class mrp_routing_workcenter(osv.osv):
_columns = {
'workcenter_id': fields.many2one('mrp.workcenter', 'Work Center', required=True),
'name': fields.char('Name', size=64, required=True),
- 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of routing workcenters."),
+ 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of routing work centers."),
'cycle_nbr': fields.float('Number of Cycles', required=True,
help="Number of iterations this work center has to do in the specified operation of the routing."),
'hour_nbr': fields.float('Number of Hours', required=True, help="Time in hours for this work center to achieve the operation of the specified routing."),
@@ -211,7 +211,7 @@ class mrp_bom(osv.osv):
'product_efficiency': fields.float('Manufacturing Efficiency', required=True, help="A factor of 0.9 means a loss of 10% within the production process."),
'bom_lines': fields.one2many('mrp.bom', 'bom_id', 'BoM Lines'),
'bom_id': fields.many2one('mrp.bom', 'Parent BoM', ondelete='cascade', select=True),
- 'routing_id': fields.many2one('mrp.routing', 'Routing', help="The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production planning."),
+ 'routing_id': fields.many2one('mrp.routing', 'Routing', help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production planning."),
'property_ids': fields.many2many('mrp.property', 'mrp_bom_property_rel', 'bom_id','property_id', 'Properties'),
'revision_ids': fields.one2many('mrp.bom.revision', 'bom_id', 'BoM Revisions'),
'child_complete_ids': fields.function(_child_compute, relation='mrp.bom', method=True, string="BoM Hierarchy", type='many2many'),
@@ -335,7 +335,7 @@ class mrp_bom(osv.osv):
result = result + res[0]
result2 = result2 + res[1]
return result, result2
-
+
def copy_data(self, cr, uid, id, default=None, context=None):
if default is None:
default = {}
@@ -442,7 +442,7 @@ class mrp_production(osv.osv):
'date_finished': fields.datetime('End Date'),
'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)]),
- 'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', help="The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production plannification."),
+ 'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."),
'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True,
help="This is the internal picking list that brings the finished product to the production plan"),
@@ -664,8 +664,6 @@ class mrp_production(osv.osv):
"""
stock_mov_obj = self.pool.get('stock.move')
production = self.browse(cr, uid, production_id, context=context)
-
- final_product_todo = []
produced_qty = 0
if production_mode == 'consume_produce':
@@ -706,10 +704,7 @@ class mrp_production(osv.osv):
stock_mov_obj.action_consume(cr, uid, [raw_product.id], consumed_qty, production.location_src_id.id, context=context)
if production_mode == 'consume_produce':
- # To produce remaining qty of final product
- vals = {'state':'confirmed'}
- final_product_todo = [x.id for x in production.move_created_ids]
- stock_mov_obj.write(cr, uid, final_product_todo, vals)
+
produced_products = {}
for produced_product in production.move_created_ids2:
if produced_product.scrapped:
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 2fa05cfc04d..000ae6cbcf2 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -561,19 +561,18 @@
formtree
-
+
@@ -29,7 +29,7 @@
-
+
report.workcenter.load.searchreport.workcenter.load
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index f3d0a3d51ac..85063c1a335 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -18,9 +18,10 @@
# along with this program. If not, see .
#
##############################################################################
+
import pooler
from report.interface import report_rml
-from report.interface import toxml
+#from report.interface import toxml
from tools import to_xml
from report import report_sxw
from datetime import datetime
diff --git a/addons/mrp/report/workcenter_load.py b/addons/mrp/report/workcenter_load.py
index 7c8c9d9e575..145051f17fd 100644
--- a/addons/mrp/report/workcenter_load.py
+++ b/addons/mrp/report/workcenter_load.py
@@ -124,7 +124,7 @@ class report_custom(report_int):
x_index.append((dates[date]['name'], date))
pdf_string = StringIO.StringIO()
can = canvas.init(fname=pdf_string, format='pdf')
- can.set_title("Work Centers Load")
+ can.set_title("Work Center Loads")
chart_object.set_defaults(line_plot.T, line_style=None)
if datas['form']['measure_unit'] == 'cycles':
y_label = "Load (Cycles)"
@@ -132,7 +132,7 @@ class report_custom(report_int):
y_label = "Load (Hours)"
# For add the report header on the top of the report.
- tb = text_box.T(loc=(300, 500), text="/hL/15/bWork Centers Load", line_style=None)
+ tb = text_box.T(loc=(300, 500), text="/hL/15/bWork Center Loads", line_style=None)
tb.draw()
ar = area.T(legend = legend.T(),
x_grid_style = line_style.gray70_dash1,
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 8758bc09cd5..f8fad71fc58 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -140,6 +140,13 @@ class StockMove(osv.osv):
res.append(new_move)
return {}
+ def trigger_move_state(self, cr, uid, move, state, context=None):
+ new_moves = super(StockMove, self).trigger_move_state(cr, uid, move, state, context=context)
+ if state == 'confirm':
+ new_moves =[x.id for x in new_moves]
+ self.write(cr, uid, new_moves, {'production_id': False}, context=context)
+ return new_moves
+
StockMove()
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index b0f197a2f1d..b72f3d7a130 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -306,7 +306,7 @@
Operation Line(s)[[ repeatIn(o.operations,'line') ]]
- [[ line or removeParentNode('section')]]
+ [[ (not line) and removeParentNode('section') ]][[ (line.to_invoice==True) or removeParentNode('blockTable') ]]
@@ -332,7 +332,7 @@
Fees Line(s) [[ (o.fees_lines ==[] and removeParentNode('para') ) ]][[ repeatIn(o.fees_lines,'fees') ]]
- [[ fees or removeParentNode('section')]]
+ [[ (not fees) and removeParentNode('section') ]][[ (fees.to_invoice==True) or removeParentNode('blockTable') ]]
@@ -365,7 +365,7 @@
Net Total :
- [[ formatLang(o.amount_untaxed, digits=get_digits(dp='Sale Price'))]] [[ o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(o.amount_untaxed, dp='Sale Price')]] [[ o.pricelist_id.currency_id. symbol ]]
@@ -379,7 +379,7 @@
Taxes:
- [[ formatLang(o.amount_tax, digits=get_digits(dp='Account'))]] [[ o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(o.amount_tax, dp='Account')]] [[ o.pricelist_id.currency_id. symbol ]]
@@ -392,7 +392,7 @@
Total :
- [[ formatLang(total(o), digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(total(o), dp='Sale Price') ]] [[ o.pricelist_id.currency_id. symbol ]]
diff --git a/addons/mrp_repair/wizard/make_invoice.py b/addons/mrp_repair/wizard/make_invoice.py
index 2cb6409348e..61f82a3d57c 100644
--- a/addons/mrp_repair/wizard/make_invoice.py
+++ b/addons/mrp_repair/wizard/make_invoice.py
@@ -27,7 +27,7 @@ class make_invoice(osv.osv_memory):
_description = 'Make Invoice'
_columns = {
- 'group': fields.boolean('Group by partner invoice address'),
+ 'group': fields.boolean('Group by partner invoice address'),
}
def make_invoices(self, cr, uid, ids, context=None):
diff --git a/addons/pad/web/editors.py b/addons/pad/web/editors.py
index b954967497c..e303dc4b3d7 100644
--- a/addons/pad/web/editors.py
+++ b/addons/pad/web/editors.py
@@ -14,7 +14,7 @@ class SidebarTemplateEditor(openobject.templating.TemplateEditor):
output.index(self.ADD_ATTACHMENT_BUTTON)) + 1
output = output[:form_opener_insertion] + \
'''${_(" Add pad")}\n''' + \
+ attachment-button">${_("Write")}\n''' + \
output[form_opener_insertion:]
return output
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 0476fb03b31..f359b8208d7 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -33,6 +33,7 @@ class pos_config_journal(osv.osv):
""" Point of Sale journal configuration"""
_name = 'pos.config.journal'
_description = "Journal Configuration"
+
_columns = {
'name': fields.char('Description', size=64),
'code': fields.char('Code', size=64),
@@ -41,9 +42,11 @@ class pos_config_journal(osv.osv):
pos_config_journal()
+
class pos_company_discount(osv.osv):
""" Company Discount and Cashboxes """
_inherit = 'res.company'
+
_columns = {
'company_discount': fields.float('Max Discount(%)', digits_compute=dp.get_precision('Point Of Sale')),
'max_diff': fields.float('Max Difference for Cashboxes', digits_compute=dp.get_precision('Point Of Sale Discount')),
@@ -173,21 +176,23 @@ class pos_order(osv.osv):
(1-(line.discount or 0.0)/100.0), line.qty),
res[order.id]['amount_tax'])
elif line.qty != 0.0:
- for c in tax_obj.compute_all(cr, uid, line.product_id.taxes_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.qty, line.product_id, line.order_id.partner_id)['taxes']:
+ for c in tax_obj.compute_all(cr, uid, line.product_id.taxes_id, \
+ line.price_unit * (1-(line.discount or 0.0)/100.0), \
+ line.qty, line.product_id, line.order_id.partner_id)['taxes']:
val += c.get('amount', 0.0)
res[order.id]['amount_tax'] = cur_obj.round(cr, uid, cur, val)
res[order.id]['amount_total'] = res[order.id]['amount_tax'] + cur_obj.round(cr, uid, cur, val1)
return res
def _sale_journal_get(self, cr, uid, context=None):
- """ To get sale journal for this order"
+ """ To get sale journal for this order
@return: journal """
journal_obj = self.pool.get('account.journal')
res = journal_obj.search(cr, uid, [('type', '=', 'sale')], limit=1)
return res and res[0] or False
def _shop_get(self, cr, uid, context=None):
- """ To get Shop for this order"
+ """ To get Shop for this order
@return: Shop id """
res = self.pool.get('sale.shop').search(cr, uid, [])
return res and res[0] or False
@@ -207,7 +212,7 @@ class pos_order(osv.osv):
})
return super(pos_order, self).copy(cr, uid, id, default, context=context)
- def _get_v( self, cr, uid, ids, *a):
+ def _get_v( self, cr, uid, ids, *args):
""" Changed the Validation state of order
@return: State """
res_obj = self.pool.get('res.users')
@@ -243,8 +248,13 @@ class pos_order(osv.osv):
'shop_id': fields.many2one('sale.shop', 'Shop', required=True,
states={'draft': [('readonly', False)]}, readonly=True),
'date_order': fields.datetime('Date Ordered', readonly=True),
- 'date_validation': fields.function(_get_date_payment, method=True, string='Validation Date', type='date', store=True),
- 'date_payment': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date', store=True),
+ 'date_validation': fields.function(_get_date_payment,
+ method=True,
+ string='Validation Date',
+ type='date', store=True),
+ 'date_payment': fields.function(_get_date_payment2, method=True,
+ string='Payment Date',
+ type='date', store=True),
'date_validity': fields.date('Validity Date', required=True),
'user_id': fields.many2one('res.users', 'Connected Salesman', help="Person who uses the the cash register. It could be a reliever, a student or an interim employee."),
'user_salesman_id': fields.many2one('res.users', 'Cashier', required=True, help="User who is logged into the system."),
@@ -285,7 +295,7 @@ class pos_order(osv.osv):
}
def _select_pricelist(self, cr, uid, context=None):
- """ To get default pricelist for the order"
+ """ To get default pricelist for the order
@param name: Names of fields.
@return: pricelist ID
"""
@@ -293,7 +303,7 @@ class pos_order(osv.osv):
return pricelist and pricelist[0] or False
def _journal_default(self, cr, uid, context=None):
- """ To get default pricelist for the order"
+ """ To get default pricelist for the order
@param name: Names of fields.
@return: journal ID
"""
@@ -319,7 +329,7 @@ class pos_order(osv.osv):
def test_order_lines(self, cr, uid, order, context=None):
- """ Test order line is created or not for the order "
+ """ Test order line is created or not for the order
@param name: Names of fields.
@return: True
"""
@@ -452,7 +462,7 @@ class pos_order(osv.osv):
location_id, stock_dest_id = stock_dest_id, location_id
move_obj.create(cr, uid, {
- 'name': 'Stock move (POS %d)' % (order.id, ),
+ 'name': '(POS %d)' % (order.id, ),
'product_uom': line.product_id.uom_id.id,
'product_uos': line.product_id.uom_id.id,
'picking_id': picking_id,
@@ -506,7 +516,7 @@ class pos_order(osv.osv):
def add_payment(self, cr, uid, order_id, data, context=None):
"""Create a new payment for the order"""
- statement_obj= self.pool.get('account.bank.statement')
+ statement_obj = self.pool.get('account.bank.statement')
statement_line_obj = self.pool.get('account.bank.statement.line')
prod_obj = self.pool.get('product.product')
property_obj = self.pool.get('ir.property')
@@ -524,12 +534,15 @@ class pos_order(osv.osv):
if 'payment_name' in data.keys():
args['name'] = data['payment_name'] + ' ' + order.name
account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
- args['account_id'] = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def.id or curr_c.account_receivable.id
+ args['account_id'] = order.partner_id and order.partner_id.property_account_receivable \
+ and order.partner_id.property_account_receivable.id or account_def.id or curr_c.account_receivable.id
if data.get('is_acc', False):
args['is_acc'] = data['is_acc']
- args['account_id'] = prod_obj.browse(cr, uid, data['product_id'], context=context).property_account_income and prod_obj.browse(cr, uid, data['product_id'], context=context).property_account_income.id
+ args['account_id'] = prod_obj.browse(cr, uid, data['product_id'], context=context).property_account_income \
+ and prod_obj.browse(cr, uid, data['product_id'], context=context).property_account_income.id
if not args['account_id']:
- raise osv.except_osv(_('Error'), _('Please provide an account for the product: %s')%(prod_obj.browse(cr, uid, data['product_id'], context=context).name))
+ raise osv.except_osv(_('Error'), _('Please provide an account for the product: %s')% \
+ (prod_obj.browse(cr, uid, data['product_id'], context=context).name))
args['partner_id'] = order.partner_id and order.partner_id.id or None
args['ref'] = order.contract_number or None
@@ -545,6 +558,8 @@ class pos_order(osv.osv):
args['statement_id'] = statement_id
args['pos_statement_id'] = order_id
args['journal_id'] = data['journal']
+ args['type'] = 'customer'
+ args['ref'] = order.name
statement_line_obj.create(cr, uid, args, context=context)
ids_new.append(statement_id)
@@ -555,7 +570,9 @@ class pos_order(osv.osv):
return statement_id
def add_product(self, cr, uid, order_id, product_id, qty, context=None):
+
"""Create a new order line the order"""
+
line_obj = self.pool.get('pos.order.line')
values = self.read(cr, uid, order_id, ['partner_id', 'pricelist_id'])
@@ -576,7 +593,9 @@ class pos_order(osv.osv):
return order_line_id, price
def refund(self, cr, uid, ids, context=None):
+
"""Create a copy of order for refund order"""
+
clone_list = []
line_obj = self.pool.get('pos.order.line')
@@ -601,7 +620,9 @@ class pos_order(osv.osv):
return clone_list
def action_invoice(self, cr, uid, ids, context=None):
+
"""Create a invoice of order """
+
inv_ref = self.pool.get('account.invoice')
inv_line_ref = self.pool.get('account.invoice.line')
product_obj = self.pool.get('product.product')
@@ -644,7 +665,8 @@ class pos_order(osv.osv):
inv_line.update(inv_line_ref.product_id_change(cr, uid, [],
line.product_id.id,
line.product_id.uom_id.id,
- line.qty, partner_id = order.partner_id.id, fposition_id=order.partner_id.property_account_position.id)['value'])
+ line.qty, partner_id = order.partner_id.id,
+ fposition_id=order.partner_id.property_account_position.id)['value'])
inv_line['price_unit'] = line.price_unit
inv_line['discount'] = line.discount
inv_line['name'] = inv_name
diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml
index c61d0347d84..33c6c62cd6e 100644
--- a/addons/point_of_sale/report/account_statement.rml
+++ b/addons/point_of_sale/report/account_statement.rml
@@ -214,10 +214,10 @@
[[ formatLang(statement.closing_date,date_time=True)]]
- [[ formatLang(pos_payment_date_total(data['form'])) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]
+ [[ formatLang(pos_payment_date_total(data['form']), dp='Sale Price') or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]
@@ -185,4 +185,4 @@
-
\ No newline at end of file
+
diff --git a/addons/point_of_sale/report/pos_receipt_with_remboursment.py b/addons/point_of_sale/report/pos_receipt_with_remboursment.py
index 9b3dc529646..c600a9e2754 100644
--- a/addons/point_of_sale/report/pos_receipt_with_remboursment.py
+++ b/addons/point_of_sale/report/pos_receipt_with_remboursment.py
@@ -63,14 +63,19 @@ class order(report_sxw.rml_parse):
WHERE absl.pos_statement_id = %d"""%(order_id.id)
self.cr.execute(sql)
res = self.cr.fetchone()
- lst.append(res[0])
+ if not res:
+ return ['', 0.0]
+ lst.append(res[0]) # todo: improve
sql2 = """ select sum(absl.amount) as amt from account_bank_statement as abs
LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
where aj.name = '%s' """%(res[0])
self.cr.execute(sql2)
res1 = self.cr.fetchone()
- lst.append(res1[0])
+ if res1:
+ lst.append(res1[0])
+ else:
+ lst.append(0.0)
return lst
report_sxw.report_sxw('report.pos.receipt.with.remboursment', 'pos.order', 'addons/point_of_sale/report/pos_receipt_with_remboursment.rml', parser=order, header=False)
diff --git a/addons/point_of_sale/report/pos_receipt_without_remboursment.py b/addons/point_of_sale/report/pos_receipt_without_remboursment.py
index 72d227fbd52..d2fe0f1d542 100644
--- a/addons/point_of_sale/report/pos_receipt_without_remboursment.py
+++ b/addons/point_of_sale/report/pos_receipt_without_remboursment.py
@@ -63,14 +63,19 @@ class order(report_sxw.rml_parse):
WHERE absl.pos_statement_id = %d"""%(order_id.id)
self.cr.execute(sql)
res = self.cr.fetchone()
- lst.append(res[0])
+ if not res:
+ return ['', 0.0]
+ lst.append(res[0]) # todo: improve
sql2 = """ select sum(absl.amount) as amt from account_bank_statement as abs
LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
where aj.name = '%s' """%(res[0])
self.cr.execute(sql2)
res1 = self.cr.fetchone()
- lst.append(res1[0])
+ if res1:
+ lst.append(res1[0])
+ else:
+ lst.append(0.0)
return lst
report_sxw.report_sxw('report.pos.receipt.without.remboursment', 'pos.order', 'addons/point_of_sale/report/pos_receipt_without_remboursment.rml', parser=order, header=False)
diff --git a/addons/point_of_sale/wizard/pos_scan_product.py b/addons/point_of_sale/wizard/pos_scan_product.py
index 49cd32eba4d..391b6a70e87 100644
--- a/addons/point_of_sale/wizard/pos_scan_product.py
+++ b/addons/point_of_sale/wizard/pos_scan_product.py
@@ -25,9 +25,11 @@ from tools.translate import _
class pos_scan_product(osv.osv_memory):
_name = 'pos.scan.product'
_description = 'Scan product'
+
_columns = {
- 'gencod': fields.char('Barcode',size=13,required= True)
+ 'gencod': fields.char('Barcode', size=13, required=True)
}
+
def scan(self, cr, uid, ids, context=None):
"""
To get the gencod and scan product
@@ -40,9 +42,10 @@ class pos_scan_product(osv.osv_memory):
if context is None:
context = {}
data=self.read(cr, uid, ids)[0]
- record_id = context and context.get('active_id',False)
+ record_id = context and context.get('active_id', False)
result =self. pool.get('pos.order.line')._scan_product(cr, uid, data['gencod'], 1, record_id)
return {'gencod': False}
+
pos_scan_product()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index bea250a25f5..618e8d9794c 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -35,6 +35,7 @@
+
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 8991d99d077..cd8c338da89 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -221,7 +221,7 @@ class product_pricelist(osv.osv):
'AND (min_quantity IS NULL OR min_quantity <= %s) '
'AND i.price_version_id = v.id AND v.pricelist_id = pl.id '
'ORDER BY sequence',
- (tmpl_id, product_id, pricelist_id, qty))
+ (tmpl_id, product_id, plversion_ids[0], qty))
res1 = cr.dictfetchall()
uom_price_already_computed = False
for res in res1:
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 83b6b5beec6..c6c248be3ce 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -208,5 +208,11 @@
formtree,form
+
+
+
diff --git a/addons/product/product.py b/addons/product/product.py
index c55105a1b16..7c0cf118ce2 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -53,7 +53,7 @@ def check_ean(eancode):
evensum += int(finalean[i])
total=(oddsum * 3) + evensum
- check = int(10 - math.ceil(total % 10.0))
+ check = int(10 - math.ceil(total % 10.0)) %10
if check != int(eancode[-1]):
return False
@@ -524,9 +524,9 @@ class product_product(osv.osv):
if sellers:
for s in sellers:
mydict = {
- 'id': product.id,
- 'name': s.product_name or product.name,
- 'default_code': s.product_code or product.default_code,
+ 'id': product.id,
+ 'name': s.product_name or product.name,
+ 'default_code': s.product_code or product.default_code,
'variants': product.variants
}
result.append(_name_get(mydict))
@@ -724,7 +724,8 @@ class product_supplierinfo(osv.osv):
'qty': lambda *a: 0.0,
'sequence': lambda *a: 1,
'delay': lambda *a: 1,
- 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'product.supplierinfo', context=c)
+ 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'product.supplierinfo', context=c),
+ 'product_uom': _get_uom_id,
}
def _check_uom(self, cr, uid, ids, context=None):
for supplier_info in self.browse(cr, uid, ids, context=context):
diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py
index 6c0d03e2ddb..6f68b63cc02 100644
--- a/addons/profile_tools/installer.py
+++ b/addons/profile_tools/installer.py
@@ -31,7 +31,7 @@ class misc_tools_installer(osv.osv_memory):
'idea':fields.boolean('Ideas Box',help='Promote ideas of the employees, votes and discussion on best ideas.'),
'share':fields.boolean('Web Share',help='Allows you to give restricted access to your OpenERP documents to external users, ' \
'such as customers, suppliers, or accountants. You can share any OpenERP Menu such as your project tasks, support requests, invoices, etc.'),
- 'pad': fields.boolean('Native pad integration',
+ 'pad': fields.boolean('Collaborative Note Pads',
help="This module creates a tighter integration between a Pad "
"instance of your choosing and your OpenERP Web Client by "
"letting you easily link pads to OpenERP objects via "
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 4640ea8fa48..c8dbcdf0dcd 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -105,8 +105,8 @@ class project_phase(osv.osv):
_columns = {
'name': fields.char("Name", size=64, required=True),
- 'date_start': fields.date('Start Date', help="Starting Date of the phase", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
- 'date_end': fields.date('End Date', help="Ending Date of the phase", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+ 'date_start': fields.date('Start Date', help="It's computed according to the phases order : the start date of the 1st phase is set by you while the other start dates depend on the end date of their previous phases", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+ 'date_end': fields.date('End Date', help=" It's computed by the scheduler according to the start date and the duration.", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
'constraint_date_start': fields.date('Minimum Start Date', help='force the phase to start after this date', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
'constraint_date_end': fields.date('Deadline', help='force the phase to finish before this date', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
'project_id': fields.many2one('project.project', 'Project', required=True),
@@ -144,13 +144,6 @@ class project_phase(osv.osv):
result['date_start'] = project_id.date_start
return {'value': result}
- def onchange_days(self, cr, uid, ids, project, context=None):
- result = {}
- for id in ids:
- project_id = self.browse(cr, uid, id, context=context)
- newdate = datetime.strptime(project_id.date_start, '%Y-%m-%d') + relativedelta(days=project_id.duration or 0.0)
- result['date_end'] = newdate.strftime('%Y-%m-%d')
- return {'value': result}
def _check_date_start(self, cr, uid, phase, date_end, context=None):
"""
@@ -192,55 +185,6 @@ class project_phase(osv.osv):
dt_end = work_times[-1][1].strftime('%Y-%m-%d')
self.write(cr, uid, [phase.id], {'date_start': date_start.strftime('%Y-%m-%d'), 'date_end': dt_end}, context=context)
- def write(self, cr, uid, ids, vals, context=None):
- resource_calendar_obj = self.pool.get('resource.calendar')
- resource_obj = self.pool.get('resource.resource')
- uom_obj = self.pool.get('product.uom')
- if context is None:
- context = {}
- res = super(project_phase, self).write(cr, uid, ids, vals, context=context)
- if context.get('scheduler',False):
- return res
- # Consider calendar and efficiency if the phase is performed by a resource
- # otherwise consider the project's working calendar
-
- #TOCHECK : why need this ?
- if isinstance(ids, (int, long)):
- ids = [ids]
- default_uom_id = self._get_default_uom_id(cr, uid)
- for phase in self.browse(cr, uid, ids, context=context):
- calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
- resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)],context=context)
- if resource_id:
- cal_id = resource_obj.browse(cr, uid, resource_id[0], context=context).calendar_id.id
- if cal_id:
- calendar_id = cal_id
-
- avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
- # Change the date_start and date_end
- # for previous and next phases respectively based on valid condition
- if vals.get('date_start', False) and vals['date_start'] < phase.date_start:
- dt_start = datetime.strptime(vals['date_start'], '%Y-%m-%d')
- work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, dt_start, avg_hours or 0.0, resource_id and resource_id[0] or False)
- if work_times:
- vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d')
- for prv_phase in phase.previous_phase_ids:
- if prv_phase.id == phase.id:
- continue
- self._check_date_start(cr, uid, prv_phase, dt_start, context=context)
-
- if vals.get('date_end', False) and vals['date_end'] > phase.date_end:
- dt_end = datetime.strptime(vals['date_end'], '%Y-%m-%d')
- work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, dt_end, avg_hours or 0.0, resource_id and resource_id[0] or False)
- if work_times:
- vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d')
- for next_phase in phase.next_phase_ids:
- if next_phase.id == phase.id:
- continue
- self._check_date_end(cr, uid, next_phase, dt_end, context=context)
-
- return res
-
def copy(self, cr, uid, id, default=None, context=None):
if default is None:
default = {}
@@ -282,25 +226,29 @@ class project_phase(osv.osv):
res[phase.id] = resource_objs
return res
- def generate_schedule(self, cr, uid, ids, start_date, calendar_id=False, context=None):
+ def generate_schedule(self, cr, uid, ids, start_date=False, calendar_id=False, context=None):
"""
Schedule phase with the start date till all the next phases are completed.
- @param: start_dsate : start date for the phase
+ @param: start_date (datetime.datetime) : start date for the phase. It would be either Start date of phase or start date of project or system current date
@param: calendar_id : working calendar of the project
"""
if context is None:
context = {}
resource_pool = self.pool.get('resource.resource')
+ data_pool = self.pool.get('ir.model.data')
resource_allocation_pool = self.pool.get('project.resource.allocation')
uom_pool = self.pool.get('product.uom')
- default_uom_id = self._get_default_uom_id(cr, uid)
+ data_model, day_uom_id = data_pool.get_object_reference(cr, uid, 'product', 'uom_day')
for phase in self.browse(cr, uid, ids, context=context):
if not phase.responsible_id:
raise osv.except_osv(_('No responsible person assigned !'),_("You must assign a responsible person for phase '%s' !") % (phase.name,))
+ if not start_date:
+ start_date = phase.project_id.date_start or phase.date_start or datetime.now().strftime("%Y-%m-%d")
+ start_date = datetime.strftime((datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d")
phase_resource_obj = resource_pool.generate_resources(cr, uid, [phase.responsible_id.id], calendar_id, context=context)
- avg_hours = uom_pool._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
- duration = str(avg_hours) + 'H'
+ avg_days = uom_pool._compute_qty(cr, uid, phase.product_uom.id, phase.duration, day_uom_id)
+ duration = str(avg_days) + 'd'
# Create a new project for each phase
def Project():
# If project has working calendar then that
@@ -308,14 +256,17 @@ class project_phase(osv.osv):
start = start_date
minimum_time_unit = 1
resource = phase_resource_obj
+ working_hours_per_day = 24
+ vacation = []
if calendar_id:
- working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
+ working_hours_per_day = 8 #TODO: it should be come from calendars
vacation = tuple(resource_pool.compute_vacation(cr, uid, calendar_id))
-
+ working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
def phase():
effort = duration
project = Task.BalancedProject(Project)
+
s_date = project.phase.start.to_datetime()
e_date = project.phase.end.to_datetime()
# Recalculate date_start and date_end
@@ -368,7 +319,7 @@ class project_phase(osv.osv):
start_date = datetime.now().strftime("%Y-%m-%d")
resources = resources_list.get(phase.id, [])
calendar_id = phase.project_id.resource_calendar_id.id
- task_ids = map(lambda x : x.id, (filter(lambda x : x.state in ['open', 'draft', 'pending'] , phase.task_ids)))
+ task_ids = map(lambda x : x.id, (filter(lambda x : x.state in ['draft'] , phase.task_ids))) #reassign only task not yet started
if task_ids:
task_pool.generate_schedule(cr, uid, task_ids, resources, calendar_id, start_date, context=context)
@@ -440,12 +391,9 @@ class project(osv.osv):
('state', 'in', ['draft', 'open', 'pending']),
('previous_phase_ids', '=', False)
])
- start_date = project.date_start
- if not start_date:
- start_date = datetime.now().strftime("%Y-%m-%d")
- start_dt = datetime.strftime((datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d %H:%M")
calendar_id = project.resource_calendar_id and project.resource_calendar_id.id or False
- phase_pool.generate_schedule(cr, uid, phase_ids, start_dt, calendar_id, context=context)
+ start_date = False
+ phase_pool.generate_schedule(cr, uid, phase_ids, start_date, calendar_id, context=context)
return True
def schedule_tasks(self, cr, uid, ids, context=None):
@@ -507,6 +455,7 @@ class project_task(osv.osv):
"""
Schedule the tasks according to resource available and priority.
"""
+ resource_pool = self.pool.get('resource.resource')
if not ids:
return False
if context is None:
@@ -535,11 +484,14 @@ class project_task(osv.osv):
try:
resource = reduce(operator.or_, resources)
except:
- raise osv.except_osv(_('Error'), _('Should have Resources Allocation or Project Members!'))
+ raise osv.except_osv(_('Error'), _('Resources should be allocated to your phases and Members should be assigned to your Project!'))
minimum_time_unit = 1
- if calendar_id: # If project has working calendar
- working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
+ working_hours_per_day = 24
+ vacation = []
+ if calendar_id:
+ working_hours_per_day = 8 #TODO: it should be come from calendars
vacation = tuple(resource_pool.compute_vacation(cr, uid, calendar_id, context=context))
+ working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
# Dynamic creation of tasks
task_number = 0
for openobect_task in self.browse(cr, uid, ids, context=context):
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 37813f84946..7eaed6e120c 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -63,7 +63,7 @@
-
+
@@ -117,7 +117,7 @@
-
+
@@ -127,15 +127,15 @@
-
-
-
+
+
+
@@ -148,15 +148,17 @@
-
-
-
+
+
+
+
+
-
+ purchase.order.graphpurchase.ordergraph
@@ -156,7 +189,7 @@
-
+
@@ -206,7 +239,7 @@
-
+
@@ -257,10 +290,11 @@
{'search_default_draft': 1}tree,form,graph,calendar
- With the Requests for Quotation menu you can create new requests for quotations, review existing ones or turn them into a purchase order once the supplier offer is approved. When you confirm a RfQ, OpenERP will convert it to a Purchase Order and generate the next steps: draft reception of the products, draft invoice to control.
+ You can create a request for quotation when you want to buy products to a supplier but the purchase is not confirmed yet. Use also this menu to review requests for quotation created automatically based on your logistic rules (minimum stock, MTO, etc). You can convert the request for quotation into a purchase order once the order is confirmed. If you use the extended interface (from user's preferences), you can select the way to control your supplier invoices: based on the order, based on the receptions or manual encoding.
-
+
Purchase Orders
@@ -269,8 +303,7 @@
tree,form,graph,calendar{'search_default_approved': 1,'search_default_create_uid':uid}
- From the Purchase Orders menu, you can track the status of your orders: products received, invoice received and controlled.
-
+ Use this menu to search within your purchase orders by references, supplier, products, etc. For each purchase order, you can track the products received, and control the supplier invoices.
diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index c12a04b586f..4b143d0f961 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -352,7 +352,7 @@
Taxes :
- [[ formatLang(o.amount_tax, digits=get_digits(dp='Purchase Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(o.amount_tax, dp='Purchase Price') ]] [[ o.pricelist_id.currency_id. symbol ]]
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index 8c5510852ca..6b68cecf1a5 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -103,9 +103,10 @@ class purchase_report(osv.osv):
extract(epoch from age(l.date_planned,s.date_order))/(24*60*60)::decimal(16,2) as delay_pass,
count(*) as nbr,
(l.price_unit*l.product_qty*u.factor)::decimal(16,2) as price_total,
- avg(100.0 * (l.price_unit*l.product_qty*u.factor) / (t.standard_price*l.product_qty*u.factor))::decimal(16,2) as negociation,
+ avg(100.0 * (l.price_unit*l.product_qty*u.factor) / NULLIF(t.standard_price*l.product_qty*u.factor, 0.0))::decimal(16,2) as negociation,
+
sum(t.standard_price*l.product_qty*u.factor)::decimal(16,2) as price_standard,
- (sum(l.product_qty*l.price_unit)/sum(l.product_qty/u.factor))::decimal(16,2) as price_average
+ (sum(l.product_qty*l.price_unit)/NULLIF(sum(l.product_qty*u.factor),0.0))::decimal(16,2) as price_average
from purchase_order s
left join purchase_order_line l on (s.id=l.order_id)
left join product_product p on (l.product_id=p.id)
diff --git a/addons/purchase/wizard/purchase_line_invoice.py b/addons/purchase/wizard/purchase_line_invoice.py
index f22df7aef41..3ff0ee53b6e 100644
--- a/addons/purchase/wizard/purchase_line_invoice.py
+++ b/addons/purchase/wizard/purchase_line_invoice.py
@@ -19,8 +19,6 @@
#
##############################################################################
-import netsvc
-import ir
from osv import osv
from tools.translate import _
@@ -52,7 +50,6 @@ class purchase_line_invoice(osv.osv_memory):
invoices = {}
invoice_obj=self.pool.get('account.invoice')
purchase_line_obj=self.pool.get('purchase.order.line')
- purchase_obj = self.pool.get('purchase.order')
property_obj=self.pool.get('ir.property')
account_fiscal_obj=self.pool.get('account.fiscal.position')
invoice_line_obj=self.pool.get('account.invoice.line')
diff --git a/addons/purchase_double_validation/__init__.py b/addons/purchase_double_validation/__init__.py
new file mode 100644
index 00000000000..989850585bf
--- /dev/null
+++ b/addons/purchase_double_validation/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+import purchase_double_validation_installer
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py
new file mode 100644
index 00000000000..ca21dfc6077
--- /dev/null
+++ b/addons/purchase_double_validation/__openerp__.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+{
+ "name" : "purchase_double_validation",
+ "version" : "1.1",
+ "category": 'Generic Modules/Sales & Purchases',
+ "depends" : ["base","purchase"],
+ "author" : 'OpenERP SA',
+ "description": """
+ This module modifies the purchase workflow in order to validate purchases that exceeds minimum amount set by configuration wizard
+ """,
+ 'website': 'http://www.openerp.com',
+ 'init_xml': [],
+ 'update_xml': [
+ 'purchase_double_validation_workflow.xml',
+ 'purchase_double_validation_installer.xml'
+ ],
+ 'demo_xml': [],
+ 'installable': True,
+ 'active': False,
+
+}
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.py b/addons/purchase_double_validation/purchase_double_validation_installer.py
new file mode 100644
index 00000000000..4dc73b45fcb
--- /dev/null
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.py
@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL ().
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+import time
+from osv import fields, osv
+
+class purchase_double_validation_installer(osv.osv_memory):
+ _name = 'purchase.double.validation.installer'
+ _inherit = 'res.config'
+ _columns = {
+ 'limit_amount': fields.integer('Maximum Purchase Amount', required=True, help="Maximum amount after which validation of purchase is required."),
+ }
+
+ _defaults = {
+ 'limit_amount': 5000,
+ }
+
+ def execute(self, cr, uid, ids, context=None):
+ data = self.read(cr, uid, ids, context=context)
+ if not data:
+ return {}
+ amt = data[0]['limit_amount']
+ data_pool = self.pool.get('ir.model.data')
+ transition_obj = self.pool.get('workflow.transition')
+ waiting = data_pool._get_id(cr, uid, 'purchase', 'trans_confirmed_router')
+ waiting_id = data_pool.browse(cr, uid, waiting, context=context).res_id
+ confirm = data_pool._get_id(cr, uid, 'purchase_double_validation', 'trans_waiting_confirmed')
+ confirm_id = data_pool.browse(cr, uid, confirm, context=context).res_id
+ transition_obj.write(cr, uid, waiting_id, {'condition': 'amount_total>=%s' % (amt)})
+ transition_obj.write(cr, uid, confirm_id, {'condition': 'amount_total<%s' % (amt)})
+ return {}
+
+purchase_double_validation_installer()
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
new file mode 100644
index 00000000000..c3369f68554
--- /dev/null
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+ Configure Limit Amount for Purchase
+ purchase.double.validation.installer
+ form
+
+
+
+
+
+ Configure Limit Amount for Purchase
+
+
+ Define minimum amount after which puchase is needed to be validated.
+
+
+ 15
+
+
+
+
+
+
+
+
+
+
+
+ Configure Limit Amount for Purchase
+ ir.actions.act_window
+ purchase.double.validation.installer
+
+ form
+ form
+ new
+
+
+
+
+
+ onskip
+
+
+
+
diff --git a/addons/purchase_double_validation/purchase_double_validation_workflow.xml b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
new file mode 100644
index 00000000000..b4005133b60
--- /dev/null
+++ b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+ amount_untaxed >= 1000
+ purchase_approve
+
+
+
+
+
+
+ amount_untaxed < 1000
+
+
+
+
diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py
index 82d68f53ef4..9b9f6c7ca89 100644
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -28,7 +28,7 @@
"description": """
Module for resource management
A resource represent something that can be scheduled
- (a developer on a task or a workcenter on manufacturing orders).
+ (a developer on a task or a work center on manufacturing orders).
This module manages a resource calendar associated to every resource.
It also manages the leaves of every resource.
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 19ece464eaf..30def0c2e16 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -229,7 +229,7 @@ class resource_resource(osv.osv):
'resource_type': fields.selection([('user','Human'),('material','Material')], 'Resource Type', required=True),
'user_id' : fields.many2one('res.users', 'User', help='Related user name for the resource to manage its access.'),
'time_efficiency' : fields.float('Efficiency factor', size=8, required=True, help="This field depict the efficiency of the resource to complete tasks. e.g resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficency of 200%, then his load will only be 50%."),
- 'calendar_id' : fields.many2one("resource.calendar", "Working time", help="Define the schedule of resource"),
+ 'calendar_id' : fields.many2one("resource.calendar", "Working Period", help="Define the schedule of resource"),
}
_defaults = {
'resource_type' : 'user',
@@ -299,11 +299,15 @@ class resource_resource(osv.osv):
leave_list.sort()
return leave_list
- def compute_working_calendar(cr, uid, calendar_id, context=None):
+ def compute_working_calendar(self, cr, uid, calendar_id=False, context=None):
"""
Change the format of working calendar from 'Openerp' format to bring it into 'Faces' format.
@param calendar_id : working calendar of the project
"""
+ if not calendar_id:
+ # Calendar is not specified: working days: 24/7
+ return [('fri', '1:0-12:0','12:0-24:0'), ('thu', '1:0-12:0','12:0-24:0'), ('wed', '1:0-12:0','12:0-24:0'),
+ ('mon', '1:0-12:0','12:0-24:0'), ('tue', '1:0-12:0','12:0-24:0'), ('sat', '1:0-12:0','12:0-24:0'), ('sun', '1:0-12:0','12:0-24:0')]
resource_attendance_pool = self.pool.get('resource.calendar.attendance')
time_range = "8:00-8:00"
non_working = ""
@@ -321,8 +325,8 @@ class resource_resource(osv.osv):
if week_days.has_key(week['dayofweek']):
day = week_days[week['dayofweek']]
wk_days[week['dayofweek']] = week_days[week['dayofweek']]
- hour_from_str = convert_timeformat(cr, uid, week['hour_from'])
- hour_to_str = convert_timeformat(cr, uid, week['hour_to'])
+ hour_from_str = convert_timeformat(week['hour_from'])
+ hour_to_str = convert_timeformat(week['hour_to'])
res_str = hour_from_str + '-' + hour_to_str
wktime_list.append((day, res_str))
# Convert into format like [('mon', '8:00-12:00', '13:00-18:00')]
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 61b14c3614d..424955d0584 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -26,7 +26,7 @@
-
+
@@ -57,7 +57,7 @@
-
+
@@ -179,7 +179,7 @@
-
+
@@ -197,7 +197,7 @@
-
+
@@ -225,7 +225,7 @@
-
+
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index d80b07fa06f..807e552cc80 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -334,7 +334,7 @@
Net Total :