From 0159340e87b8b15489f838b7b6c5d07fe5a96891 Mon Sep 17 00:00:00 2001 From: "Nimesh (Open ERP)" Date: Fri, 28 Sep 2012 17:07:12 +0530 Subject: [PATCH 01/38] [IMP] imporve amount with curruncy in hr_expense bzr revid: nco@tinyerp.com-20120928113712-wcy20zoas4ixkk7x --- addons/hr_expense/report/expense.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml index bf456cfc4d6..7efe2112f95 100644 --- a/addons/hr_expense/report/expense.rml +++ b/addons/hr_expense/report/expense.rml @@ -277,7 +277,7 @@ Total: - [[ formatLang(o.amount) ]] [[ o.currency_id.symbol ]] + [[ formatLang(o.amount, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]] From de647d9f628f57a812a10e94a660d82f965162fd Mon Sep 17 00:00:00 2001 From: "Nimesh (Open ERP)" Date: Fri, 28 Sep 2012 17:15:12 +0530 Subject: [PATCH 02/38] [IMP] imporve amount with curruncy in report_intrastat bzr revid: nco@tinyerp.com-20120928114512-di7475khiaz1cpz7 --- addons/report_intrastat/report/invoice.rml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/report_intrastat/report/invoice.rml b/addons/report_intrastat/report/invoice.rml index c07bd06f402..ec23b9b091a 100644 --- a/addons/report_intrastat/report/invoice.rml +++ b/addons/report_intrastat/report/invoice.rml @@ -301,7 +301,7 @@ Total (excl. taxes): - [[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]] + [[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]] @@ -314,7 +314,7 @@ Taxes: - [[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]] + [[ formatLang(o.amount_tax, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]] @@ -327,7 +327,7 @@ Total (inclu. taxes): - [[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]] + [[ formatLang(o.amount_total, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]] From 74eeaba4866e5c5488bd7dc5b87a99ac82a27464 Mon Sep 17 00:00:00 2001 From: "Nimesh (Open ERP)" Date: Fri, 28 Sep 2012 17:16:25 +0530 Subject: [PATCH 03/38] [IMP] imporve amount with curruncy in mrp_repair , order.rml bzr revid: nco@tinyerp.com-20120928114625-nud95lo4y0sao7ya --- addons/mrp_repair/report/order.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml index be5737d4b85..a688c4047a0 100644 --- a/addons/mrp_repair/report/order.rml +++ b/addons/mrp_repair/report/order.rml @@ -367,7 +367,7 @@ Taxes: - [[ formatLang(o.amount_tax, dp='Account')]] [[ o.pricelist_id.currency_id. symbol ]] + [[ formatLang(o.amount_tax, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id) ]] From b3dde42f5b2cfab66705812673f7729b2a73fadd Mon Sep 17 00:00:00 2001 From: "Nimesh (Open ERP)" Date: Fri, 28 Sep 2012 17:17:43 +0530 Subject: [PATCH 04/38] [IMP] imporve amount with curruncy in point_of_sale , pos_lines.rml bzr revid: nco@tinyerp.com-20120928114743-we0dvo10wv7d3its --- addons/point_of_sale/report/pos_lines.rml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml index be394ed4f16..e98f6bcd9f1 100644 --- a/addons/point_of_sale/report/pos_lines.rml +++ b/addons/point_of_sale/report/pos_lines.rml @@ -202,7 +202,7 @@ Net Total : - [[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.symbol ]] + [[ formatLang(o.amount_total, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id) ]] @@ -215,7 +215,7 @@ Taxes : - [[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]] + [[ formatLang(o.amount_tax, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id) ]] @@ -228,7 +228,7 @@ Total: - [[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]] + [[ formatLang(o.amount_total + o.amount_tax, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id) ]] From 04f64ecb7068e0bb4a016acfdc8c7fcc20eb9249 Mon Sep 17 00:00:00 2001 From: "Nimesh (Open ERP)" Date: Fri, 28 Sep 2012 17:28:39 +0530 Subject: [PATCH 06/38] [IMP] improve order.rml in mrp_repair bzr revid: nco@tinyerp.com-20120928115839-4fpootp5m4exrw4e --- addons/mrp_repair/report/order.rml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml index a688c4047a0..dd7788910b5 100644 --- a/addons/mrp_repair/report/order.rml +++ b/addons/mrp_repair/report/order.rml @@ -353,7 +353,7 @@ Net Total : - [[ formatLang(o.amount_untaxed, dp='Sale Price')]] [[ o.pricelist_id.currency_id. symbol ]] + [[ formatLang(o.amount_untaxed, dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]] @@ -367,7 +367,7 @@ Taxes: - [[ formatLang(o.amount_tax, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id) ]] + [[ formatLang(o.amount_tax, dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]] @@ -380,7 +380,7 @@ Total : - [[ formatLang(total(o), dp='Sale Price') ]] [[ o.pricelist_id.currency_id. symbol ]] + [[ formatLang(total(o), dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]] From 7f3455cdc89e00e9e02c03462523f3bf945894ca Mon Sep 17 00:00:00 2001 From: "Nimesh (Open ERP)" Date: Fri, 28 Sep 2012 17:43:13 +0530 Subject: [PATCH 07/38] [IMP] point_of_sale , pos_lines.rml bzr revid: nco@tinyerp.com-20120928121313-r2iicypzvjlyrzjt --- addons/point_of_sale/report/pos_lines.rml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml index e98f6bcd9f1..1eff03d1cd2 100644 --- a/addons/point_of_sale/report/pos_lines.rml +++ b/addons/point_of_sale/report/pos_lines.rml @@ -202,7 +202,7 @@ Net Total : - [[ formatLang(o.amount_total, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id) ]] + [[ formatLang(o.amount_total, currency_obj=o.pricelist_id.currency_id) ]] @@ -215,7 +215,7 @@ Taxes : - [[ formatLang(o.amount_tax, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id) ]] + [[ formatLang(o.amount_tax, currency_obj=o.pricelist_id.currency_id) ]] @@ -228,7 +228,7 @@ Total: - [[ formatLang(o.amount_total + o.amount_tax, digits=get_digits(dp='Account'), currency_obj=o.pricelist_id.currency_id) ]] + [[ formatLang(o.amount_total + o.amount_tax, currency_obj=o.pricelist_id.currency_id) ]] From 8afc4b0d16316a4e7fd12ec0d0bf1796fd3d2536 Mon Sep 17 00:00:00 2001 From: "Nimesh (Open ERP)" Date: Fri, 28 Sep 2012 17:59:20 +0530 Subject: [PATCH 08/38] [IMP] expense.rml bzr revid: nco@tinyerp.com-20120928122920-rah1697pni2xnwk3 --- addons/hr_expense/report/expense.rml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml index 7efe2112f95..3e07516c01b 100644 --- a/addons/hr_expense/report/expense.rml +++ b/addons/hr_expense/report/expense.rml @@ -231,7 +231,7 @@ [[ formatLang(line.unit_quantity) ]] - [[ formatLang(line.total_amount) ]] [[ o.currency_id.symbol ]] + [[ formatLang(line.total_amount, currency_obj=o.currency_id) ]] @@ -277,7 +277,7 @@ Total: - [[ formatLang(o.amount, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]] + [[ formatLang(o.amount, currency_obj=o.currency_id) ]] From a634a1a91f318052161a9ef4f2360c174a12282b Mon Sep 17 00:00:00 2001 From: "Nimesh (Open ERP)" Date: Fri, 28 Sep 2012 18:10:57 +0530 Subject: [PATCH 09/38] expense.sxw pos_lines.sxw and pos_lines.rml bzr revid: nco@tinyerp.com-20120928124057-26jmpyivpgs536cp --- addons/point_of_sale/report/pos_lines.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml index 1eff03d1cd2..1ed8e33eede 100644 --- a/addons/point_of_sale/report/pos_lines.rml +++ b/addons/point_of_sale/report/pos_lines.rml @@ -186,7 +186,7 @@ [[ formatLang(l.discount) ]] - [[ formatLang(l.price_subtotal) ]] [[o.pricelist_id.currency_id. symbol ]] + [[ formatLang(l.price_subtotal, currency_obj=o.pricelist_id.currency_id) ]] From 99a3c0c074aaa0430f341ec10f1c5f52ca8f0170 Mon Sep 17 00:00:00 2001 From: "Nimesh (Open ERP)" Date: Fri, 28 Sep 2012 18:36:57 +0530 Subject: [PATCH 10/38] [IMP] imorove report_intrastat/report/invoice.sxw and rml bzr revid: nco@tinyerp.com-20120928130657-2ruakuwnibj02hvb --- addons/report_intrastat/report/invoice.rml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/report_intrastat/report/invoice.rml b/addons/report_intrastat/report/invoice.rml index ec23b9b091a..a6f94a0e2a8 100644 --- a/addons/report_intrastat/report/invoice.rml +++ b/addons/report_intrastat/report/invoice.rml @@ -245,7 +245,7 @@ [[ l.discount and formatLang (l.discount) or '' ]] - [[ formatLang(l.price_subtotal) ]] [[ o.currency_id.symbol ]] + [[ formatLang(l.price_subtotal, currency_obj=o.currency_id) ]] @@ -301,7 +301,7 @@ Total (excl. taxes): - [[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]] + [[ formatLang(o.amount_untaxed, currency_obj=o.currency_id) ]] @@ -314,7 +314,7 @@ Taxes: - [[ formatLang(o.amount_tax, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]] + [[ formatLang(o.amount_tax, currency_obj=o.currency_id) ]] @@ -327,7 +327,7 @@ Total (inclu. taxes): - [[ formatLang(o.amount_total, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]] + [[ formatLang(o.amount_total, currency_obj=o.currency_id) ]] @@ -363,7 +363,7 @@ [[ formatLang(t.base, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] - [[ (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 ]] + [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]] From a9676cfd8c892e1daf45a4f148b794d762e8f84d Mon Sep 17 00:00:00 2001 From: "Nimesh (Open ERP)" Date: Mon, 1 Oct 2012 16:38:02 +0530 Subject: [PATCH 11/38] [IMP] amout with currency. bzr revid: nco@tinyerp.com-20121001110802-r3l169i2ka73t2rh --- addons/account/project/report/analytic_balance.rml | 6 +++--- addons/account/project/report/cost_ledger.rml | 8 ++++---- .../project/report/inverted_analytic_balance.rml | 6 +++--- addons/account/report/account_print_overdue.rml | 2 +- .../report/report_contribution_register.rml | 4 ++-- addons/hr_payroll/report/report_payslip.rml | 2 +- addons/hr_payroll/report/report_payslip_details.rml | 4 ++-- .../report/report_hr_salary_employee_bymonth.rml | 2 +- .../report/report_payroll_advice.rml | 8 ++++---- .../report/report_payslip_details.rml | 2 +- addons/lunch/report/order.rml | 6 +++--- addons/mrp_repair/report/order.rml | 4 ++-- addons/point_of_sale/report/account_statement.rml | 8 ++++---- .../report/all_closed_cashbox_of_the_day.rml | 6 +++--- addons/point_of_sale/report/pos_details.rml | 12 ++++++------ addons/point_of_sale/report/pos_payment_report.rml | 2 +- .../point_of_sale/report/pos_payment_report_user.rml | 2 +- addons/point_of_sale/report/pos_users_product.rml | 4 ++-- addons/report_intrastat/report/invoice.rml | 2 +- addons/stock/report/lot_overview.rml | 6 +++--- addons/stock/report/lot_overview_all.rml | 6 +++--- 21 files changed, 51 insertions(+), 51 deletions(-) diff --git a/addons/account/project/report/analytic_balance.rml b/addons/account/project/report/analytic_balance.rml index 0c488eac400..1754988f7d6 100644 --- a/addons/account/project/report/analytic_balance.rml +++ b/addons/account/project/report/analytic_balance.rml @@ -163,7 +163,7 @@ [[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]] - [[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]] + [[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]] [[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'quantity')) ]] @@ -187,7 +187,7 @@ [[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'credit')) ]] - [[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]] + [[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]] [[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'quantity')) ]] @@ -211,7 +211,7 @@ [[ formatLang(move_g['credit']) ]] - [[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol ]] + [[ formatLang(move_g['balance'], currency_obj = company.currency_id) ]] [[ formatLang(move_g['quantity']) ]] diff --git a/addons/account/project/report/cost_ledger.rml b/addons/account/project/report/cost_ledger.rml index 7500b655ab3..1099a8b8b4e 100644 --- a/addons/account/project/report/cost_ledger.rml +++ b/addons/account/project/report/cost_ledger.rml @@ -224,7 +224,7 @@ [[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]] - [[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]] + [[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id) ]] @@ -245,7 +245,7 @@ [[ formatLang (account_sum_credit(account,data['form']['date1'],data['form']['date2'])) ]] - [[ formatLang (account_sum_balance(account,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol ]] + [[ formatLang (account_sum_balance(account,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id) ]] @@ -266,7 +266,7 @@ [[ formatLang( move_g['credit']) ]] - [[ formatLang( move_g['balance']) ]] [[ company.currency_id.symbol ]] + [[ formatLang( move_g['balance'], currency_obj = company.currency_id) ]] @@ -290,7 +290,7 @@ [[ formatLang( move_a['credit']) ]] - [[ formatLang( move_a['balance']) ]] [[ company.currency_id.symbol]] + [[ formatLang( move_a['balance'], currency_obj = company.currency_id)]] diff --git a/addons/account/project/report/inverted_analytic_balance.rml b/addons/account/project/report/inverted_analytic_balance.rml index f112ec8fbd3..54b6878c407 100644 --- a/addons/account/project/report/inverted_analytic_balance.rml +++ b/addons/account/project/report/inverted_analytic_balance.rml @@ -164,7 +164,7 @@ [[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]] - [[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol]] + [[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]] [[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]] @@ -188,7 +188,7 @@ [[formatLang(move_g['credit'])]] - [[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol]] + [[ formatLang(move_g['balance'], currency_obj = company.currency_id)]] [[formatLang(move_g['quantity']) ]] @@ -212,7 +212,7 @@ [[ formatLang(move_a['credit']) ]] - [[ formatLang(move_a['balance']) ]] [[ company.currency_id.symbol]] + [[ formatLang(move_a['balance'], currency_obj = company.currency_id)]] [[ formatLang(move_a['quantity']) ]] diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml index 2d4238823da..83d3162cf6d 100644 --- a/addons/account/report/account_print_overdue.rml +++ b/addons/account/report/account_print_overdue.rml @@ -216,7 +216,7 @@ [[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]] - [[ time.strftime('%Y-%m-%d') > formatLang((line['date_maturity'])) and formatLang(line['debit'] - line['credit']) ]] [[ company.currency_id.symbol ]] + [[ time.strftime('%Y-%m-%d') > formatLang((line['date_maturity'])) and formatLang(line['debit'] - line['credit'], currency_obj = company.currency_id) ]] [[ line['blocked'] and 'X' or '' ]] diff --git a/addons/hr_payroll/report/report_contribution_register.rml b/addons/hr_payroll/report/report_contribution_register.rml index b3a5de9753d..8a5897c6091 100644 --- a/addons/hr_payroll/report/report_contribution_register.rml +++ b/addons/hr_payroll/report/report_contribution_register.rml @@ -206,7 +206,7 @@ [[ formatLang(r['amount']) ]] - [[ formatLang(r['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] + [[ formatLang(r['total'], currency_obj = o.company_id and o.company_id.currency_id)]] @@ -222,7 +222,7 @@ Total: - [[ formatLang(sum_total()) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] + [[ formatLang(sum_total(), currency_obj = o.company_id and o.company_id.currency_id)]] diff --git a/addons/hr_payroll/report/report_payslip.rml b/addons/hr_payroll/report/report_payslip.rml index 4d96e4b5ef7..7b419ddc2ee 100644 --- a/addons/hr_payroll/report/report_payslip.rml +++ b/addons/hr_payroll/report/report_payslip.rml @@ -293,7 +293,7 @@ [[ formatLang(p.amount) ]] - [[ formatLang(p.total) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] + [[ formatLang(p.total, currency_obj = o.company_id and o.company_id.currency_id)]] diff --git a/addons/hr_payroll/report/report_payslip_details.rml b/addons/hr_payroll/report/report_payslip_details.rml index fe6a10dd1f5..83e9e5c09a1 100644 --- a/addons/hr_payroll/report/report_payslip_details.rml +++ b/addons/hr_payroll/report/report_payslip_details.rml @@ -334,7 +334,7 @@ [[ '..'*h['level'] ]][[ h['rule_category'] ]][[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]] - [[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]] + [[ formatLang(h['total'], currency_obj = o.company_id and o.company_id.currency_id)]] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]] @@ -391,7 +391,7 @@ [[ formatLang(r['amount']) ]] - [[ formatLang(r['total']) ]] [[ o.company_id and o.company_id.currency_id.symbol or '']][[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]] + [[ formatLang(r['total'], currency_obj = o.company_id and o.company_id.currency_id)]][[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]] diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml index 8f2a57d2018..0c0353a4045 100644 --- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml +++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml @@ -284,7 +284,7 @@ [[ formatLang(t[12]) or removeParentNode('para')]] [[company.currency_id.symbol]] - [[ formatLang(get_total()) ]] [[company.currency_id.symbol]] + [[ formatLang(get_total(), currency_obj = company.currency_id)]] diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml index 8ca1bae5ba5..879314a24d9 100644 --- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml +++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml @@ -247,7 +247,7 @@ [[ line['acc_no'] ]] - [[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]] + [[formatLang(line['bysal'], currency_obj = company.currency_id) ]] [[ line['debit_credit'] ]] @@ -296,7 +296,7 @@ [[ line['ifsc_code'] ]] - [[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]] + [[formatLang(line['bysal'], currency_obj = company.currency_id) ]] [[ line['debit_credit'] ]] @@ -321,7 +321,7 @@ - [[ o.line_ids==[] and removeParentNode('para') ]][[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]] + [[ o.line_ids==[] and removeParentNode('para') ]][[ formatLang(get_bysal_total(), currency_obj = company.currency_id) ]] @@ -347,7 +347,7 @@ - [[ o.line_ids==[] and removeParentNode('para') ]][[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]] + [[ o.line_ids==[] and removeParentNode('para') ]][[ formatLang(get_bysal_total(), currency_obj = company.currency_id) ]] diff --git a/addons/l10n_in_hr_payroll/report/report_payslip_details.rml b/addons/l10n_in_hr_payroll/report/report_payslip_details.rml index a7ab3db3185..76bf65c98ac 100644 --- a/addons/l10n_in_hr_payroll/report/report_payslip_details.rml +++ b/addons/l10n_in_hr_payroll/report/report_payslip_details.rml @@ -334,7 +334,7 @@ [[ '..'*h['level'] ]][[ h['rule_category'] ]][[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]] - [[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]] + [[ formatLang(h['total'], currency_obj = o.company_id and o.company_id.currency_id)]] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]] diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml index b09b59bb96b..0a13beb622c 100644 --- a/addons/lunch/report/order.rml +++ b/addons/lunch/report/order.rml @@ -137,7 +137,7 @@ - [[ formatLang(get_total(o,objects)) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]] + [[ formatLang(get_total(o,objects), currency_obj = o.company_id and o.company_id.currency_id) ]] @@ -155,7 +155,7 @@ [[ lines.descript]] - [[ lines.price ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]] + [[ formatLang(lines.price , currency_obj = o.company_id and o.company_id.currency_id) ]] @@ -172,7 +172,7 @@ Total : - [[ formatLang(get_nettotal()) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]] + [[ formatLang(get_nettotal(), currency_obj = o.company_id and o.company_id.currency_id) ]] diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml index dd7788910b5..5e1344ce95a 100644 --- a/addons/mrp_repair/report/order.rml +++ b/addons/mrp_repair/report/order.rml @@ -312,7 +312,7 @@ [[ formatLang(line.price_unit) ]] - [[ formatLang(line.price_subtotal) ]] [[ o.pricelist_id.currency_id. symbol ]] + [[ formatLang(line.price_subtotal, currency_obj = o.pricelist_id.currency_id) ]] @@ -337,7 +337,7 @@ [[ formatLang(fees.price_unit) ]] - [[ formatLang(fees.price_subtotal) ]] [[ o.pricelist_id.currency_id. symbol ]] + [[ formatLang(fees.price_subtotal, currency_obj = o.pricelist_id.currency_id) ]] diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml index dc6e6c5e64c..0b633f3f7c4 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(statement.balance_start, dp='Account') ]][[ company.currency_id.symbol ]] + [[ formatLang(statement.balance_start, dp='Account', currency_obj = company.currency_id) ]] - [[ formatLang(statement.balance_end_real, dp='Account') ]][[ company.currency_id.symbol ]] + [[ formatLang(statement.balance_end_real, dp='Account', currency_obj = company.currency_id) ]] @@ -250,7 +250,7 @@ [[ line_ids.partner_id.name ]] - [[ formatLang(line_ids.amount, dp='Account') ]] [[ company.currency_id.symbol ]] + [[ formatLang(line_ids.amount, dp='Account', currency_obj=company.currency_id) ]] @@ -267,7 +267,7 @@ Total : - [[ formatLang(get_total(statement.line_ids), dp='Account') ]] [[ company.currency_id.symbol ]] + [[ formatLang(get_total(statement.line_ids), dp='Account', currency_obj = company.currency_id) ]] diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml index bb58c5e823d..4b7088cb86f 100644 --- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml +++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml @@ -183,10 +183,10 @@ - [[ formatLang(get_net_total_starting(user)[1]) ]] [[company.currency_id.symbol]] + [[ formatLang(get_net_total_starting(user)[1], currency_obj = company.currency_id)]] - [[ formatLang(get_net_total(user)) ]] [[company.currency_id.symbol]] + [[ formatLang(get_net_total(user), currency_obj = company.currency_id)]] @@ -236,7 +236,7 @@ - [[ formatLang(line_ids['amount']) ]] [[company.currency_id.symbol]] + [[ formatLang(line_ids['amount'], currency_obj = company.currency_id)]] diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml index b0019133009..aeecc82f7ef 100644 --- a/addons/point_of_sale/report/pos_details.rml +++ b/addons/point_of_sale/report/pos_details.rml @@ -252,7 +252,7 @@ [ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]] - [[ formatLang(line_ids['price_unit'], dp='Sale Price') ]] [[ company.currency_id.symbol ]] + [[ formatLang(line_ids['price_unit'], dp='Sale Price', currency_obj = company.currency_id) ]] [[ formatLang(line_ids['qty']) ]] [[ line_ids['uom'] ]] @@ -349,7 +349,7 @@ Sales total(Revenue) - [[ formatLang(getsalestotal2(), dp='Sale Price') ]] [[ company.currency_id.symbol ]] + [[ formatLang(getsalestotal2(), dp='Sale Price', currency_obj = company.currency_id) ]] @@ -365,7 +365,7 @@ Total invoiced - [[ formatLang(getsuminvoice2(data['form']), dp='Sale Price') ]] [[ company.currency_id.symbol ]] + [[ formatLang(getsuminvoice2(data['form']), dp='Sale Price', currency_obj = company.currency_id) ]] @@ -373,7 +373,7 @@ Total discount - [[ formatLang(getsumdisc(), dp='Sale Price') ]] [[ company.currency_id.symbol ]] + [[ formatLang(getsumdisc(), dp='Sale Price', currency_obj = company.currency_id) ]] @@ -381,7 +381,7 @@ Total paid - [[ formatLang(getpaidtotal2(), dp='Sale Price') ]] [[ company.currency_id.symbol ]] + [[ formatLang(getpaidtotal2(), dp='Sale Price', currency_obj = company.currency_id) ]] @@ -389,7 +389,7 @@ Total of the day - [[ formatLang(gettotalofthaday(data['form']), dp='Sale Price') ]] [[ company.currency_id.symbol ]] + [[ formatLang(gettotalofthaday(data['form']), dp='Sale Price', currency_obj = company.currency_id) ]] diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml index 757de687ee0..1e43b44cf05 100644 --- a/addons/point_of_sale/report/pos_payment_report.rml +++ b/addons/point_of_sale/report/pos_payment_report.rml @@ -183,7 +183,7 @@ [[ formatLang(line_ids['price_unit']) ]] - [[ formatLang(line_ids['total']) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line_ids['total'], currency_obj = company.currency_id) ]] diff --git a/addons/point_of_sale/report/pos_payment_report_user.rml b/addons/point_of_sale/report/pos_payment_report_user.rml index 3105441aa0c..f945890d984 100644 --- a/addons/point_of_sale/report/pos_payment_report_user.rml +++ b/addons/point_of_sale/report/pos_payment_report_user.rml @@ -168,7 +168,7 @@ [[ formatLang(line_ids['price_unit']) ]] - [[ formatLang(line_ids['total']) ]] [[company.currency_id.symbol]] + [[ formatLang(line_ids['total'], currency_obj = company.currency_id)]] diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml index f3a8cfd77e8..9758e924ada 100644 --- a/addons/point_of_sale/report/pos_users_product.rml +++ b/addons/point_of_sale/report/pos_users_product.rml @@ -191,7 +191,7 @@ [[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]] - [[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]] + [[ formatLang(line_ids['amt'], currency_obj = company.currency_id) ]] @@ -208,7 +208,7 @@ Total : - [[ formatLang(get_total(statement)) ]] [[ company.currency_id.symbol ]] + [[ formatLang(get_total(statement), currency_obj = company.currency_id) ]] diff --git a/addons/report_intrastat/report/invoice.rml b/addons/report_intrastat/report/invoice.rml index a6f94a0e2a8..fc410e04ce0 100644 --- a/addons/report_intrastat/report/invoice.rml +++ b/addons/report_intrastat/report/invoice.rml @@ -360,7 +360,7 @@ [[ t.name ]] - [[ formatLang(t.base, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]] + [[ formatLang(t.base, digits=get_digits(dp='Account'), currency_obj = o.currency_id) ]] [[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]] diff --git a/addons/stock/report/lot_overview.rml b/addons/stock/report/lot_overview.rml index 9662eede03b..82c402a3fdf 100644 --- a/addons/stock/report/lot_overview.rml +++ b/addons/stock/report/lot_overview.rml @@ -184,7 +184,7 @@ [[ formatLang(p['price'], dp='Account') ]] - [[ formatLang(p['price_value'], dp='Account') ]] [[ o.company_id.currency_id.symbol]] + [[ formatLang(p['price_value'], dp='Account', currency_obj = o.company_id.currency_id)]] @@ -198,7 +198,7 @@ Total: - [[ formatLang(price_total(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]] + [[ formatLang(price_total(), dp='Account', currency_obj = o.company_id.currency_id) ]] @@ -215,7 +215,7 @@ - [[ formatLang(grand_total_price(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]] + [[ formatLang(grand_total_price(), dp='Account', currency_obj = o.company_id.currency_id) ]] diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml index 3b2dc5f7751..51b93c6323b 100644 --- a/addons/stock/report/lot_overview_all.rml +++ b/addons/stock/report/lot_overview_all.rml @@ -184,7 +184,7 @@ [[ formatLang(p['price'], dp='Account') ]] - [[ formatLang(p['price_value'], dp='Account') ]] [[ o.company_id.currency_id.symbol]] + [[ formatLang(p['price_value'], dp='Account', currency_obj = o.company_id.currency_id)]] @@ -198,7 +198,7 @@ Total: - [[ formatLang(price_total(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]] + [[ formatLang(price_total(), dp='Account', currency_obj = o.company_id.currency_id) ]] @@ -215,7 +215,7 @@ - [[ formatLang(grand_total_price(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]] + [[ formatLang(grand_total_price(), dp='Account', currency_obj = o.company_id.currency_id) ]] From 082f70cb6f33f242e276e64706188a81c3263cc9 Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Tue, 2 Oct 2012 12:28:32 +0530 Subject: [PATCH 13/38] [MERGE]: Merged display_address() field bzr revid: atp@tinyerp.com-20121002065832-7wick5qjfbbhy5jv --- addons/hr_payroll/report/report_payslip.rml | 2 +- addons/hr_payroll/report/report_payslip_details.rml | 2 +- addons/point_of_sale/report/pos_receipt.rml | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/hr_payroll/report/report_payslip.rml b/addons/hr_payroll/report/report_payslip.rml index 7b419ddc2ee..bbf8716379a 100644 --- a/addons/hr_payroll/report/report_payslip.rml +++ b/addons/hr_payroll/report/report_payslip.rml @@ -197,7 +197,7 @@ - [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]] + [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]] diff --git a/addons/hr_payroll/report/report_payslip_details.rml b/addons/hr_payroll/report/report_payslip_details.rml index 83e9e5c09a1..7d8575a9fe1 100644 --- a/addons/hr_payroll/report/report_payslip_details.rml +++ b/addons/hr_payroll/report/report_payslip_details.rml @@ -234,7 +234,7 @@ - [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]] + [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]] diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml index 55873887210..484d125ab82 100644 --- a/addons/point_of_sale/report/pos_receipt.rml +++ b/addons/point_of_sale/report/pos_receipt.rml @@ -72,8 +72,7 @@ [[ repeatIn(objects,'o') ]] [[o.user_id.company_id.name]] - [[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]] - [[ address and address.country_id.name ]] + [[ address and display_address(address)]] Tel : [[ address and address.phone ]] User : [[ o.user_id.name ]] Shop : [[ o.shop_id.name ]] From c12510e6e41df3d7cca0fd955d24c496f62c2bbf Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Tue, 2 Oct 2012 19:39:05 +0530 Subject: [PATCH 14/38] [IMP]account_check_writing: Remove get_zip_line() and add display_address() function bzr revid: atp@tinyerp.com-20121002140905-jmiudzxe3pqdroha --- .../report/check_print.py | 20 ------------------- .../report/check_print_bottom.rml | 5 +---- .../report/check_print_middle.rml | 5 +---- .../report/check_print_top.rml | 4 +--- 4 files changed, 3 insertions(+), 31 deletions(-) diff --git a/addons/account_check_writing/report/check_print.py b/addons/account_check_writing/report/check_print.py index f8e048beb2d..fd52c96b9aa 100644 --- a/addons/account_check_writing/report/check_print.py +++ b/addons/account_check_writing/report/check_print.py @@ -32,7 +32,6 @@ class report_print_check(report_sxw.rml_parse): 'time': time, 'get_lines': self.get_lines, 'fill_stars' : self.fill_stars, - 'get_zip_line': self.get_zip_line, }) def fill_stars(self, amount): amount = amount.replace('Dollars','') @@ -41,25 +40,6 @@ class report_print_check(report_sxw.rml_parse): return ' '.join([amount,'*'*stars]) else: return amount - - def get_zip_line(self, address): - ''' - Get the address line - ''' - ret = '' - if address: - if address.city: - ret += address.city - if address.state_id: - if address.state_id.name: - if ret: - ret += ', ' - ret += address.state_id.name - if address.zip: - if ret: - ret += ' ' - ret += address.zip - return ret def get_lines(self, voucher_lines): result = [] diff --git a/addons/account_check_writing/report/check_print_bottom.rml b/addons/account_check_writing/report/check_print_bottom.rml index bb499a8aac1..f9add2fe60b 100644 --- a/addons/account_check_writing/report/check_print_bottom.rml +++ b/addons/account_check_writing/report/check_print_bottom.rml @@ -281,10 +281,7 @@ [[ voucher.partner_id.name ]] - [[ voucher.partner_id.street or removeParentNode('para') ]] - [[ voucher.partner_id.street2 or removeParentNode('para') ]] - [[ get_zip_line(voucher.partner_id) ]] - [[ voucher.partner_id.country_id.name]] + [[ display_address(voucher.partner_id) or removeParentNode('para') ]] diff --git a/addons/account_check_writing/report/check_print_middle.rml b/addons/account_check_writing/report/check_print_middle.rml index 5a2f83f20a2..b1fffca662d 100644 --- a/addons/account_check_writing/report/check_print_middle.rml +++ b/addons/account_check_writing/report/check_print_middle.rml @@ -237,10 +237,7 @@ [[ voucher.partner_id.name ]] - [[ voucher.partner_id.street or removeParentNode('para') ]] - [[ voucher.partner_id.street2 or removeParentNode('para') ]] - [[ get_zip_line(voucher.partner_id) ]] - [[ voucher.partner_id.country_id.name]] + [[ display_address(voucher.partner_id) or removeParentNode('para') ]] diff --git a/addons/account_check_writing/report/check_print_top.rml b/addons/account_check_writing/report/check_print_top.rml index 41526605f47..9a4d633e680 100644 --- a/addons/account_check_writing/report/check_print_top.rml +++ b/addons/account_check_writing/report/check_print_top.rml @@ -153,9 +153,7 @@ [[ voucher.partner_id.name ]] - [[ voucher.partner_id.street2 or removeParentNode('para') ]] - [[ get_zip_line(voucher.partner_id) ]] - [[ voucher.partner_id.country_id.name]] + [[ display_address(voucher.partner_id) or removeParentNode('para') ]] From 8d3086df280ffd8bc37981f6e531f6eb80345d04 Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Tue, 2 Oct 2012 20:15:47 +0530 Subject: [PATCH 15/38] [IMP]: Use display_address() bzr revid: atp@tinyerp.com-20121002144547-kpbo8wv694qipvm0 --- addons/account_payment/report/order.rml | 6 +----- addons/l10n_fr_hr_payroll/report/fiche_paye.rml | 4 +--- addons/l10n_in_hr_payroll/report/report_payslip_details.rml | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml index 973588e5410..44a9485e6d8 100644 --- a/addons/account_payment/report/order.rml +++ b/addons/account_payment/report/order.rml @@ -159,11 +159,7 @@ [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.name or '']] - [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street or '']] - [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street2 or removeParentNode('para')]] - [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.zip or '']] [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.city or '']] - [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.state and o.mode.bank_id.bank.state.name or removeParentNode('para') ]] - [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.country and o.mode.bank_id.bank.country.name or '']] + [[ o.mode and o.mode.bank_id.bank and display_address(o.mode.bank_id.bank)]] diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml index 5221b00c462..76c6eb9dedf 100644 --- a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml +++ b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml @@ -290,9 +290,7 @@ [[o.employee_id.name or '_']] - [[o.employee_id.address_home_id.street or '_' ]] - [[o.employee_id.address_home_id.street2 or '' ]] - [[o.employee_id.address_home_id.zip or '_' ]] [[o.employee_id.address_home_id.city or '' ]] + [[display_address(o.employee_id.address_home_id) or '_' ]] diff --git a/addons/l10n_in_hr_payroll/report/report_payslip_details.rml b/addons/l10n_in_hr_payroll/report/report_payslip_details.rml index 76bf65c98ac..c4ce55bfa41 100644 --- a/addons/l10n_in_hr_payroll/report/report_payslip_details.rml +++ b/addons/l10n_in_hr_payroll/report/report_payslip_details.rml @@ -234,7 +234,7 @@ - [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]] + [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]] From bdae7c2850398c2c6ca983fcbc6831cc40ffb58e Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Tue, 2 Oct 2012 22:10:01 +0530 Subject: [PATCH 16/38] [IMP]: ADD currency symbol with amount bzr revid: atp@tinyerp.com-20121002164001-s8r2ivug8ghi36af --- addons/account/report/account_print_overdue.rml | 2 +- addons/account_payment/report/order.rml | 14 +++++++++----- addons/account_payment/report/payment_order.py | 6 ------ .../report/all_closed_cashbox_of_the_day.rml | 2 +- addons/point_of_sale/report/pos_details.rml | 4 ++-- addons/point_of_sale/report/pos_payment_report.rml | 2 +- .../report/pos_payment_report_user.rml | 2 +- 7 files changed, 15 insertions(+), 17 deletions(-) diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml index 83d3162cf6d..31f5c25a9b3 100644 --- a/addons/account/report/account_print_overdue.rml +++ b/addons/account/report/account_print_overdue.rml @@ -261,7 +261,7 @@ Balance : - [[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]] + [[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0)), currency_obj = company.currency_id) ]] diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml index 44a9485e6d8..30181f84512 100644 --- a/addons/account_payment/report/order.rml +++ b/addons/account_payment/report/order.rml @@ -159,7 +159,11 @@ [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.name or '']] - [[ o.mode and o.mode.bank_id.bank and display_address(o.mode.bank_id.bank)]] + [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street or '']] + [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.street2 or removeParentNode('para')]] + [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.zip or '']] [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.city or '']] + [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.state and o.mode.bank_id.bank.state.name or removeParentNode('para') ]] + [[ o.mode and o.mode.bank_id.bank and o.mode.bank_id.bank.country and o.mode.bank_id.bank.country.name or '']] @@ -252,10 +256,10 @@ [[line.date=='False' and '-' or formatLang(line.date,date=True) ]] - [[formatLang(line.amount) or '-' ]] [[get_company_currency_symbol()]] + [[formatLang(line.amount, currency_obj= user.company_id and user.company_id.currency_id) or '-' ]] - [[ formatLang(line.amount_currency) ]] [[ line.currency.symbol]] + [[ formatLang(line.amount_currency, currency_obj= line.currency)]] @@ -271,10 +275,10 @@ Total: - [[ formatLang(get_amount_total(o)) or '' ]] [[get_company_currency_symbol()]] + [[ formatLang(get_amount_total(o), currency_obj= user.company_id and user.company_id.currency_id) or '' ]] - [[ formatLang(get_amount_total_in_currency(o)) or '' ]] [[get_company_currency_symbol()]] + [[ formatLang(get_amount_total_in_currency(o), currency_obj= user.company_id and user.company_id.currency_id) or '' ]] diff --git a/addons/account_payment/report/payment_order.py b/addons/account_payment/report/payment_order.py index 0b2a8061906..0a87d281471 100644 --- a/addons/account_payment/report/payment_order.py +++ b/addons/account_payment/report/payment_order.py @@ -32,7 +32,6 @@ class payment_order(report_sxw.rml_parse): 'time': time, 'get_invoice_name': self._get_invoice_name, 'get_company_currency': self._get_company_currency, - 'get_company_currency_symbol': self._get_company_currency_symbol, 'get_amount_total_in_currency': self._get_amount_total_in_currency, 'get_amount_total': self._get_amount_total, 'get_account_name': self._get_account_name, @@ -72,11 +71,6 @@ class payment_order(report_sxw.rml_parse): user = pool.get('res.users').browse(self.cr, self.uid, self.uid) return user.company_id and user.company_id.currency_id and user.company_id.currency_id.symbol or False - def _get_company_currency_symbol(self): - pool = pooler.get_pool(self.cr.dbname) - user = pool.get('res.users').browse(self.cr, self.uid, self.uid) - return user.company_id and user.company_id.currency_id and user.company_id.currency_id.symbol or False - def _get_account_name(self,bank_id): if bank_id: pool = pooler.get_pool(self.cr.dbname) diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml index 4b7088cb86f..30ef8242a85 100644 --- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml +++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml @@ -210,7 +210,7 @@ [[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]] - [[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]] [[company.currency_id.symbol]] + [[ formatLang(get_sub_total(user,statement['journal_id'],statement['date']), currency_obj = company.currency_id )]] diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml index aeecc82f7ef..e7c4c756e64 100644 --- a/addons/point_of_sale/report/pos_details.rml +++ b/addons/point_of_sale/report/pos_details.rml @@ -289,7 +289,7 @@ [[ p['name'] or removeParentNode('para') ]] - [[ formatLang(p['amount']) or removeParentNode('tr') ]] [[ company.currency_id.symbol ]] + [[ formatLang(p['amount'], currency_obj = company.currency_id) or removeParentNode('tr') ]] @@ -320,7 +320,7 @@ [[ p['name'] or removeParentNode('para') ]] - [[ formatLang(p['sum'], dp='Account') or removeParentNode('tr') ]] [[ company.currency_id.symbol ]] + [[ formatLang(p['sum'], dp='Account', currency_obj = company.currency_id) or removeParentNode('tr') ]] diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml index 1e43b44cf05..bcc4b9ec261 100644 --- a/addons/point_of_sale/report/pos_payment_report.rml +++ b/addons/point_of_sale/report/pos_payment_report.rml @@ -201,7 +201,7 @@ Net Total: - [[ formatLang(pos_payment_total(o)) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]] + [[ formatLang(pos_payment_total(o), currency_obj = company.currency_id) or removeParentNode('blockTable')]] diff --git a/addons/point_of_sale/report/pos_payment_report_user.rml b/addons/point_of_sale/report/pos_payment_report_user.rml index f945890d984..1d89d28c5f9 100644 --- a/addons/point_of_sale/report/pos_payment_report_user.rml +++ b/addons/point_of_sale/report/pos_payment_report_user.rml @@ -194,7 +194,7 @@ Total: - [[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]] [[company.currency_id.symbol]] + [[ formatLang(pos_payment_user_total(data['form'], currency_obj = company.currency_id)) or removeParentNode('blockTable')]] From 3d6520b3ff06385d28fc4f4e3cb8beef4237276e Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Wed, 3 Oct 2012 11:33:46 +0530 Subject: [PATCH 17/38] [FIX]hr_payroll: Fix if address is not defined. bzr revid: atp@tinyerp.com-20121003060346-tdakbm44iumvynw8 --- addons/hr_payroll/report/report_payslip.rml | 3 ++- addons/hr_payroll/report/report_payslip_details.rml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/hr_payroll/report/report_payslip.rml b/addons/hr_payroll/report/report_payslip.rml index bbf8716379a..990419ee5f1 100644 --- a/addons/hr_payroll/report/report_payslip.rml +++ b/addons/hr_payroll/report/report_payslip.rml @@ -197,7 +197,8 @@ - [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]] + [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]] + [[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]] diff --git a/addons/hr_payroll/report/report_payslip_details.rml b/addons/hr_payroll/report/report_payslip_details.rml index 7d8575a9fe1..4ace0ad2f82 100644 --- a/addons/hr_payroll/report/report_payslip_details.rml +++ b/addons/hr_payroll/report/report_payslip_details.rml @@ -234,7 +234,8 @@ - [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]] + [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]] + [[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]] From 9b01d91679d45ab334fc2acb5379bc7042990b4b Mon Sep 17 00:00:00 2001 From: "pankita shah (Open ERP)" Date: Wed, 3 Oct 2012 12:44:21 +0530 Subject: [PATCH 18/38] [IMP] currency in l10_in_hr_payroll bzr revid: shp@tinyerp.com-20121003071421-c5kd08mhiumoh6fv --- .../report_hr_salary_employee_bymonth.rml | 26 +++++++++---------- .../report/report_hr_yearly_salary_detail.rml | 4 +-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml index 0c0353a4045..6368a644f4b 100644 --- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml +++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml @@ -234,7 +234,7 @@ - [[ formatLang(e[13]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[13],currency_obj= company.currency_id)]] @@ -248,40 +248,40 @@ Total - [[ formatLang(t[1]) or removeParentNode('para') ]] [[company.currency_id.symbol]] + [[ formatLang(t[1],currency_obj= company.currency_id) or removeParentNode('para') ]] - [[ formatLang(t[2]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[2],currency_obj= company.currency_id) or removeParentNode('para')]] - [[ formatLang(t[3]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[3],currency_obj= company.currency_id) or removeParentNode('para')]] - [[ formatLang(t[4]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[4],currency_obj= company.currency_id) or removeParentNode('para')]] - [[ formatLang(t[5]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[5],currency_obj= company.currency_id) or removeParentNode('para')]] - [[ formatLang(t[6]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[6],currency_obj= company.currency_id) or removeParentNode('para')]] - [[ formatLang(t[7]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[7],currency_obj= company.currency_id) or removeParentNode('para')]] ] - [[ formatLang(t[8]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[8],currency_obj= company.currency_id) or removeParentNode('para')]] - [[ formatLang(t[9]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[9],currency_obj= company.currency_id) or removeParentNode('para')]] - [[ formatLang(t[10]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[10],currency_obj= company.currency_id) or removeParentNode('para')]] - [[ formatLang(t[11]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[11],currency_obj= company.currency_id) or removeParentNode('para')]] - [[ formatLang(t[12]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[12],currency_obj= company.currency_id) or removeParentNode('para')]] [[ formatLang(get_total(), currency_obj = company.currency_id)]] diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml index 7fa127b0bd3..502eaa7b0ff 100644 --- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml +++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml @@ -478,7 +478,7 @@ - [[ formatLang(e1[13]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e1[13],currency_obj= company.currency_id) ]] @@ -571,7 +571,7 @@ - [[ formatLang(e2[13]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e2[13],currency_obj= company.currency_id) ]] From b5c7b1403ef8640f384ed7540101786dd2df6b32 Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Mon, 8 Oct 2012 23:24:58 +0530 Subject: [PATCH 19/38] [IMP]: Change address using display_address() in follow-up report and overdue report. bzr revid: atp@tinyerp.com-20121008175458-1vqh34vuyw1zimkq --- .../account/report/account_print_overdue.py | 23 ------------------- .../account/report/account_print_overdue.rml | 7 +----- .../report/account_followup_print.py | 6 ----- .../report/account_followup_print.rml | 7 +----- 4 files changed, 2 insertions(+), 41 deletions(-) diff --git a/addons/account/report/account_print_overdue.py b/addons/account/report/account_print_overdue.py index 1b617e9afa4..4ddedc102f5 100644 --- a/addons/account/report/account_print_overdue.py +++ b/addons/account/report/account_print_overdue.py @@ -29,34 +29,11 @@ class Overdue(report_sxw.rml_parse): super(Overdue, self).__init__(cr, uid, name, context=context) self.localcontext.update( { 'time': time, - 'adr_get': self._adr_get, 'getLines': self._lines_get, 'tel_get': self._tel_get, 'message': self._message, }) self.context = context - def _adr_get(self, partner, type): - res = [] - res_partner = pooler.get_pool(self.cr.dbname).get('res.partner') - addresses = res_partner.address_get(self.cr, self.uid, [partner.id], [type]) - adr_id = addresses and addresses[type] or False - result = { - 'name': False, - 'street': False, - 'street2': False, - 'city': False, - 'zip': False, - 'state_id':False, - 'country_id': False, - } - if adr_id: - result = res_partner.read(self.cr, self.uid, [adr_id], context=self.context.copy()) - result[0]['country_id'] = result[0]['country_id'] and result[0]['country_id'][1] or False - result[0]['state_id'] = result[0]['state_id'] and result[0]['state_id'][1] or False - return result - - res.append(result) - return res def _tel_get(self,partner): if not partner: diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml index 31f5c25a9b3..34f026d26b5 100644 --- a/addons/account/report/account_print_overdue.rml +++ b/addons/account/report/account_print_overdue.rml @@ -126,15 +126,10 @@ - [[ repeatIn(adr_get(o, 'invoice'),'addr') ]] [[ o.title.name or '' ]] [[ o.name ]] - [[ addr['street'] ]] - [[ addr['street2'] or removeParentNode('para') ]] - [[ addr['zip'] ]] [[ addr['city'] ]] - [[ addr['state_id'] or removeParentNode('para')]] - [[ addr['country_id'] ]] + [[ display_address(o.partner_id)] ]] diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py index 8d64ce30f6b..593430691aa 100644 --- a/addons/account_followup/report/account_followup_print.py +++ b/addons/account_followup/report/account_followup_print.py @@ -30,7 +30,6 @@ class report_rappel(report_sxw.rml_parse): self.localcontext.update({ 'time': time, 'ids_to_objects': self._ids_to_objects, - 'adr_get': self._adr_get, 'getLines': self._lines_get, 'get_text': self._get_text }) @@ -43,11 +42,6 @@ class report_rappel(report_sxw.rml_parse): all_lines.append(line) return all_lines - def _adr_get(self, stat_line, type): - res_partner = pooler.get_pool(self.cr.dbname).get('res.partner') - adr = res_partner.address_get(self.cr, self.uid, [stat_line.partner_id.id], [type])[type] - return adr and res_partner.read(self.cr, self.uid, [adr]) or [{}] - def _lines_get(self, stat_by_partner_line): pool = pooler.get_pool(self.cr.dbname) moveline_obj = pool.get('account.move.line') diff --git a/addons/account_followup/report/account_followup_print.rml b/addons/account_followup/report/account_followup_print.rml index 3d096ecf3ac..7f2242991de 100644 --- a/addons/account_followup/report/account_followup_print.rml +++ b/addons/account_followup/report/account_followup_print.rml @@ -129,15 +129,10 @@ - [[ repeatIn(adr_get(o,'invoice'),'a' )]] [[ o.partner_id.name or '' ]] - [[ a['street'] or '']] - [[ a['street2'] or removeParentNode('para') ]] - [[ a['zip'] or '' ]] [[ a['city'] or '' ]] - [[( a['state_id'] and a['state_id'][1]) or removeParentNode('para') ]] - [[( a['country_id'] and a['country_id'][1]) or '']] + [[ display_address(o.partner_id) or '']] From 884aecd5df0c9760a14888dcab6b8f5d6b1655bb Mon Sep 17 00:00:00 2001 From: Vishmita Date: Tue, 9 Oct 2012 19:07:04 +0530 Subject: [PATCH 20/38] [IMP]replace callenabled for on_pager_action bzr revid: vja@tinyerp.com-20121009133704-d2xzc6zssbzzmlwn --- addons/web/static/src/js/view_form.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 8e7364ee50a..898f776db8f 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -459,7 +459,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM } this.$pager.on('click','a[data-pager-action]',function() { var action = $(this).data('pager-action'); - self.on_pager_action(action); + self.trigger('pager_action',self.on_pager_action(action)); }); this.do_update_pager(); }, @@ -3372,9 +3372,8 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ controller.on_record_loaded.add_last(function() { once.resolve(); }); - controller.on_pager_action.add_first(function() { - self.save_any_view(); - }); + controller.on('pager_action',self,self.save_any_view); + } else if (view_type == "graph") { self.reload_current_view() } From 0d257305d3ea7eb551cc6b323def2d90b1a5cada Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 11 Oct 2012 12:58:54 +0530 Subject: [PATCH 21/38] [IMP]replace callbackenable from datetime on_change event. bzr revid: vme@tinyerp.com-20121011072854-l87h37b8apbnzuiu --- addons/web/static/src/js/view_form.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index afb5e258c0b..e30a6b2cea5 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2448,6 +2448,7 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({ return instance.web.format_value(v, {"widget": this.type_of_date}); }, on_change: function() { + this.trigger('datetime_on_change'); if (this.is_valid_()) { this.set_value_from_ui_(); } @@ -2473,9 +2474,9 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(instanc initialize_content: function() { if (!this.get("effective_readonly")) { this.datewidget = this.build_widget(); - this.datewidget.on_change.add_last(_.bind(function() { + this.datewidget.on('datetime_on_change', this,_.bind(function() { this.set({'value': this.datewidget.get_value()}); - }, this)); + }, this)) this.datewidget.appendTo(this.$el); this.setupFocus(this.datewidget.$input); } From c85340e995bc56a7246f18e5bf8fb4332ea70455 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 11 Oct 2012 13:03:31 +0530 Subject: [PATCH 22/38] [IMP] bzr revid: vme@tinyerp.com-20121011073331-w5xhv6kbr2taphfz --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index e30a6b2cea5..ee119f55e67 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2476,7 +2476,7 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(instanc this.datewidget = this.build_widget(); this.datewidget.on('datetime_on_change', this,_.bind(function() { this.set({'value': this.datewidget.get_value()}); - }, this)) + }, this)); this.datewidget.appendTo(this.$el); this.setupFocus(this.datewidget.$input); } From bc44da05a1dc1b1d1f4233ad8835ded02ddf1fe9 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Thu, 11 Oct 2012 11:40:02 +0200 Subject: [PATCH 23/38] [IMP] reports: use of FormatLang(amount, currency_obj=...) instead of printing currency.symbol directly in the report bzr revid: qdp-launchpad@openerp.com-20121011094002-7unxi6bi2hh2u6k5 --- addons/account/report/account_print_overdue.rml | 2 +- addons/account_payment/report/order.rml | 6 +++--- .../account_voucher/report/account_voucher_print.rml | 4 ++-- addons/l10n_be/wizard/l10n_be_vat_intra_print.rml | 4 ++-- .../report/all_closed_cashbox_of_the_day.py | 2 +- .../report/all_closed_cashbox_of_the_day.rml | 2 +- addons/point_of_sale/report/pos_details_summary.rml | 12 ++++++------ addons/point_of_sale/report/pos_receipt.rml | 8 ++++---- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml index 34f026d26b5..577cb9142a2 100644 --- a/addons/account/report/account_print_overdue.rml +++ b/addons/account/report/account_print_overdue.rml @@ -236,7 +236,7 @@ [[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['credit'] or 0) or (y['account_id']['type'] == 'payable' and y['debit'] * -1 or 0)), getLines(o), 0))) ]] - [[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] < time.strftime('%Y-%m-%d'), getLines(o)), 0))) ]] [[ company.currency_id.symbol ]] + [[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] < time.strftime('%Y-%m-%d'), getLines(o)), 0)), currency_obj=company.currency_id) ]] diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml index 30181f84512..7ad897890e4 100644 --- a/addons/account_payment/report/order.rml +++ b/addons/account_payment/report/order.rml @@ -256,7 +256,7 @@ [[line.date=='False' and '-' or formatLang(line.date,date=True) ]] - [[formatLang(line.amount, currency_obj= user.company_id and user.company_id.currency_id) or '-' ]] + [[formatLang(line.amount, currency_obj= user.company_id.currency_id) or '-' ]] [[ formatLang(line.amount_currency, currency_obj= line.currency)]] @@ -275,10 +275,10 @@ Total: - [[ formatLang(get_amount_total(o), currency_obj= user.company_id and user.company_id.currency_id) or '' ]] + [[ formatLang(get_amount_total(o), currency_obj= user.company_id.currency_id) or '' ]] - [[ formatLang(get_amount_total_in_currency(o), currency_obj= user.company_id and user.company_id.currency_id) or '' ]] + [[ formatLang(get_amount_total_in_currency(o), currency_obj= user.company_id.currency_id) or '' ]] diff --git a/addons/account_voucher/report/account_voucher_print.rml b/addons/account_voucher/report/account_voucher_print.rml index 923e900887a..9f0f2e1f07e 100644 --- a/addons/account_voucher/report/account_voucher_print.rml +++ b/addons/account_voucher/report/account_voucher_print.rml @@ -219,7 +219,7 @@ [[ p['pname'] ]] - [[ p['amount'] ]] [[ voucher.currency_id.symbol ]] + [[ formatLang(p['amount'], currency_obj=voucher.currency_id) ]] @@ -323,7 +323,7 @@ - [[ voucher.amount ]] [[ voucher.currency_id.symbol ]] + [[ formatLang(voucher.amount, currency_obj=voucher.currency_id) ]] diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml b/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml index 415f3a08f1f..ff1a2c2064d 100644 --- a/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml +++ b/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml @@ -108,7 +108,7 @@ [[ l['code'] (l['intra_code']) ]] - [[ l['amount'] or O.OO ]] [[ company.currency_id.symbol ]] + [[ formatLang(l['amount'], currency_obj=company.currency_id) ]] @@ -129,7 +129,7 @@ Total: - [[ data['form']['amountsum'] or 0.00 ]] [[ company.currency_id.symbol ]] + [[ formatLang(data['form']['amountsum'], currency_obj=company.currency_id) ]] diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py index 0e75e7f7ae1..dc3b432728f 100644 --- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py +++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py @@ -73,7 +73,7 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse): if res: return res[0]['bal'] else: - return False + return 0 def _get_sub_total(self, user, data, date): res={} diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml index 30ef8242a85..4f16031c8b3 100644 --- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml +++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml @@ -207,7 +207,7 @@ [[ statement['closing_date'] ]] - [[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]] + [[ formatLang(get_bal(statement), currency_obj = company.currency_id)]] [[ formatLang(get_sub_total(user,statement['journal_id'],statement['date']), currency_obj = company.currency_id )]] diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml index d12cdec2598..b1c71db7d40 100644 --- a/addons/point_of_sale/report/pos_details_summary.rml +++ b/addons/point_of_sale/report/pos_details_summary.rml @@ -204,7 +204,7 @@ [[ p[0] ]] - [[ p[1] ]] [[company.currency_id.symbol]] + [[ formatLang(p[1], currency_obj=company.currency_id) ]] @@ -235,7 +235,7 @@ [[ t[0] ]] - [[ '%.2f' % (t[1],) ]] [[company.currency_id.symbol]] + [[ formatLang(t[1], currency_obj=company.currency_id) ]] @@ -280,7 +280,7 @@ Total invoiced - [[ '%.2f' % getsuminvoice(objects) ]] [[ company.currency_id.symbol ]] + [[ formatLang(getsuminvoice(objects), currency_obj=company.currency_id) ]] @@ -288,7 +288,7 @@ Total discount - [[ '%.2f' % getsumdisc(objects) ]] [[ company.currency_id.symbol ]] + [[ formatLang(getsumdisc(objects), currency_obj=company.currency_id) ]] @@ -296,7 +296,7 @@ Total paid - [[ '%.2f' % getpaidtotal(objects) ]] [[ company.currency_id.symbol ]] + [[ formatLang(getpaidtotal(objects), currency_obj=company.currency_id) ]] @@ -304,7 +304,7 @@ Total of the day - [[ '%.2f' % gettotalofthaday(objects) ]] [[ company.currency_id.symbol ]] + [[ formatLang(gettotalofthaday(objects), currency_obj=company.currency_id) ]] diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml index 484d125ab82..d7b8b08ad29 100644 --- a/addons/point_of_sale/report/pos_receipt.rml +++ b/addons/point_of_sale/report/pos_receipt.rml @@ -108,7 +108,7 @@ [[o.state=='cancel' and o.statement_ids and '-' or '']][['%.f' % line.qty ]] - [[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % net(line.id) ]] [[company.currency_id.symbol]] [[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ '%.2f' % line.discount ]]%) [[company.currency_id.symbol]] + [[o.state=='cancel' and o.statement_ids and '-' or '']][[ formatLang(net(line.id), currency_obj=company.currency_id) ]] [[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ formatLang(line.discount, currency_obj=company.currency_id) ]]) @@ -118,7 +118,7 @@ Taxes : - [[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_tax]] [[company.currency_id.symbol]] + [[o.state=='cancel' and o.statement_ids and '-' or '']][[formatLang(o.amount_tax, currency_obj=company.currency_id)]] @@ -128,7 +128,7 @@ Total : - [[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_total]] [[company.currency_id.symbol]] + [[o.state=='cancel' and o.statement_ids and '-' or '']][[formatLang(o.amount_total, currency_obj=company.currency_id)]] @@ -157,7 +157,7 @@ - [[ '%.2f' %(d['amt'] or 0) ]] [[company.currency_id.symbol]] + [[ formatLang(d['amt'] or 0, currency_obj=company.currency_id) ]] From b13ee21296c151cfb82ac8ede020efe83734649a Mon Sep 17 00:00:00 2001 From: Vishmita Date: Thu, 11 Oct 2012 16:13:41 +0530 Subject: [PATCH 24/38] [IMP]replace callenabled for on_controller_inited bzr revid: vja@tinyerp.com-20121011104341-7r4fr4l687bn9qqe --- addons/web/static/src/js/view_form.js | 2 +- addons/web/static/src/js/views.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index afb5e258c0b..efb5b5816f5 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3372,7 +3372,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ var def = $.Deferred().then(function() { self.initial_is_loaded.resolve(); }); - this.viewmanager.on_controller_inited.add_last(function(view_type, controller) { + this.viewmanager.on("controller_inited", self, function(view_type, controller) { controller.o2m = self; if (view_type == "list") { if (self.get("effective_readonly")) { diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index f985e5f6dc8..ba6c95f96c1 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -409,6 +409,7 @@ instance.web.ViewManager = instance.web.Widget.extend({ this.flags = flags || {}; this.registry = instance.web.views; this.views_history = []; + this.on("controller_inited",this.on_controller_inited); }, /** * @returns {jQuery.Deferred} initial view loading promise @@ -532,7 +533,7 @@ instance.web.ViewManager = instance.web.Widget.extend({ this.views[view_type].controller = controller; this.views[view_type].deferred.resolve(view_type); return $.when(view_promise).then(function() { - self.on_controller_inited(view_type, controller); + self.trigger("controller_inited",view_type, controller); if (self.searchview && self.flags.auto_search && view.controller.searchable !== false) { From c6fa315737cbbc805c21969654e54068583198f5 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 11 Oct 2012 18:51:22 +0530 Subject: [PATCH 25/38] [IMP]do_save method with trigger. bzr revid: vme@tinyerp.com-20121011132122-m8qq603wk4gla0fq --- addons/web/static/src/js/view_form.js | 1 + addons/web_view_editor/static/src/js/view_editor.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index ccd46a52cc6..68a47259cec 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -830,6 +830,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM */ do_save: function(prepend_on_create) { var self = this; + this.trigger("form_save"); return this.mutating_mutex.exec(function() { return self.is_initialized.pipe(function() { try { var form_invalid = false, diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js index 40d333afa0f..6d3e2818b49 100644 --- a/addons/web_view_editor/static/src/js/view_editor.js +++ b/addons/web_view_editor/static/src/js/view_editor.js @@ -1017,7 +1017,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ controller.on("on_button_cancel", self, function(){ action_manager.destroy(); }); - controller.do_save.add_last(function(){ + controller.on("form_save", self, function(){ action_manager.destroy(); var value =controller.fields.name.get('value'); self.add_node_dialog.$el.find('select[id=field_value]').append($("").attr("value",value).text(value)); From 8b2731d819125bec6b67a46d26898be30264933f Mon Sep 17 00:00:00 2001 From: Vishmita Date: Thu, 11 Oct 2012 19:00:31 +0530 Subject: [PATCH 26/38] [FIX]Improve code bzr revid: vja@tinyerp.com-20121011133031-83azb0qwjpq1b0aq --- addons/web/static/src/js/views.js | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index ba6c95f96c1..4172344c66e 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -409,7 +409,6 @@ instance.web.ViewManager = instance.web.Widget.extend({ this.flags = flags || {}; this.registry = instance.web.views; this.views_history = []; - this.on("controller_inited",this.on_controller_inited); }, /** * @returns {jQuery.Deferred} initial view loading promise @@ -533,7 +532,7 @@ instance.web.ViewManager = instance.web.Widget.extend({ this.views[view_type].controller = controller; this.views[view_type].deferred.resolve(view_type); return $.when(view_promise).then(function() { - self.trigger("controller_inited",view_type, controller); + self.trigger("controller_inited",view_type,controller); if (self.searchview && self.flags.auto_search && view.controller.searchable !== false) { @@ -653,14 +652,6 @@ instance.web.ViewManager = instance.web.Widget.extend({ controller.do_search(results.domain, results.context, groupby || []); }); }, - /** - * Event launched when a controller has been inited. - * - * @param {String} view_type type of view - * @param {String} view the inited controller - */ - on_controller_inited: function(view_type, view) { - }, /** * Called when one of the view want to execute an action */ From 53e6a97f3375b028b334beaa4e872bcc3860bbd3 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Fri, 12 Oct 2012 05:09:42 +0000 Subject: [PATCH 27/38] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20121012050942-nfure19k43lzib3e --- openerp/addons/base/i18n/ab.po | 4 +- openerp/addons/base/i18n/af.po | 4 +- openerp/addons/base/i18n/am.po | 4 +- openerp/addons/base/i18n/ar.po | 4 +- openerp/addons/base/i18n/bg.po | 4 +- openerp/addons/base/i18n/bs.po | 4 +- openerp/addons/base/i18n/ca.po | 4 +- openerp/addons/base/i18n/cs.po | 4 +- openerp/addons/base/i18n/da.po | 4 +- openerp/addons/base/i18n/de.po | 4 +- openerp/addons/base/i18n/el.po | 4 +- openerp/addons/base/i18n/en_GB.po | 4 +- openerp/addons/base/i18n/es.po | 4 +- openerp/addons/base/i18n/es_AR.po | 4 +- openerp/addons/base/i18n/es_CL.po | 4 +- openerp/addons/base/i18n/es_CR.po | 4 +- openerp/addons/base/i18n/es_EC.po | 4 +- openerp/addons/base/i18n/es_MX.po | 4 +- openerp/addons/base/i18n/et.po | 4 +- openerp/addons/base/i18n/eu.po | 4 +- openerp/addons/base/i18n/fa.po | 226 ++++++++++++++------------- openerp/addons/base/i18n/fa_AF.po | 4 +- openerp/addons/base/i18n/fi.po | 4 +- openerp/addons/base/i18n/fr.po | 4 +- openerp/addons/base/i18n/gl.po | 4 +- openerp/addons/base/i18n/gu.po | 4 +- openerp/addons/base/i18n/he.po | 4 +- openerp/addons/base/i18n/hr.po | 4 +- openerp/addons/base/i18n/hu.po | 16 +- openerp/addons/base/i18n/hy.po | 4 +- openerp/addons/base/i18n/id.po | 4 +- openerp/addons/base/i18n/is.po | 4 +- openerp/addons/base/i18n/it.po | 4 +- openerp/addons/base/i18n/ja.po | 4 +- openerp/addons/base/i18n/ka.po | 4 +- openerp/addons/base/i18n/kk.po | 4 +- openerp/addons/base/i18n/ko.po | 4 +- openerp/addons/base/i18n/lt.po | 4 +- openerp/addons/base/i18n/lv.po | 4 +- openerp/addons/base/i18n/mk.po | 4 +- openerp/addons/base/i18n/mn.po | 4 +- openerp/addons/base/i18n/nb.po | 4 +- openerp/addons/base/i18n/nl.po | 15 +- openerp/addons/base/i18n/nl_BE.po | 4 +- openerp/addons/base/i18n/pl.po | 8 +- openerp/addons/base/i18n/pt.po | 4 +- openerp/addons/base/i18n/pt_BR.po | 4 +- openerp/addons/base/i18n/ro.po | 4 +- openerp/addons/base/i18n/ru.po | 4 +- openerp/addons/base/i18n/sk.po | 4 +- openerp/addons/base/i18n/sl.po | 4 +- openerp/addons/base/i18n/sq.po | 4 +- openerp/addons/base/i18n/sr.po | 4 +- openerp/addons/base/i18n/sr@latin.po | 4 +- openerp/addons/base/i18n/sv.po | 4 +- openerp/addons/base/i18n/th.po | 4 +- openerp/addons/base/i18n/tlh.po | 4 +- openerp/addons/base/i18n/tr.po | 4 +- openerp/addons/base/i18n/uk.po | 4 +- openerp/addons/base/i18n/ur.po | 4 +- openerp/addons/base/i18n/vi.po | 4 +- openerp/addons/base/i18n/zh_CN.po | 4 +- openerp/addons/base/i18n/zh_HK.po | 4 +- openerp/addons/base/i18n/zh_TW.po | 4 +- 64 files changed, 254 insertions(+), 251 deletions(-) diff --git a/openerp/addons/base/i18n/ab.po b/openerp/addons/base/i18n/ab.po index 6186cb742ec..ebd3bbc9178 100644 --- a/openerp/addons/base/i18n/ab.po +++ b/openerp/addons/base/i18n/ab.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:09+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:00+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po index 10c4ef3a73d..39b53936197 100644 --- a/openerp/addons/base/i18n/af.po +++ b/openerp/addons/base/i18n/af.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:09+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:00+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/am.po b/openerp/addons/base/i18n/am.po index 27aaf0c5a05..74bdf694446 100644 --- a/openerp/addons/base/i18n/am.po +++ b/openerp/addons/base/i18n/am.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:10+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:00+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/ar.po b/openerp/addons/base/i18n/ar.po index 180e7fc450e..a8e993c9d2d 100644 --- a/openerp/addons/base/i18n/ar.po +++ b/openerp/addons/base/i18n/ar.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:10+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:00+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/bg.po b/openerp/addons/base/i18n/bg.po index cb97a8e030b..c9f16a47376 100644 --- a/openerp/addons/base/i18n/bg.po +++ b/openerp/addons/base/i18n/bg.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:10+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:01+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/bs.po b/openerp/addons/base/i18n/bs.po index 138f14299fd..7bb40fc9a61 100644 --- a/openerp/addons/base/i18n/bs.po +++ b/openerp/addons/base/i18n/bs.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:10+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:01+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/ca.po b/openerp/addons/base/i18n/ca.po index 823ff68dda8..1cb4016b6dd 100644 --- a/openerp/addons/base/i18n/ca.po +++ b/openerp/addons/base/i18n/ca.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:11+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:01+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/cs.po b/openerp/addons/base/i18n/cs.po index f35a33d13a4..29612c9a0be 100644 --- a/openerp/addons/base/i18n/cs.po +++ b/openerp/addons/base/i18n/cs.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:11+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:01+0000\n" +"X-Generator: Launchpad (build 16130)\n" "X-Poedit-Language: Czech\n" #. module: base diff --git a/openerp/addons/base/i18n/da.po b/openerp/addons/base/i18n/da.po index 2a2ed7015c9..91954085a73 100644 --- a/openerp/addons/base/i18n/da.po +++ b/openerp/addons/base/i18n/da.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:11+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:01+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/de.po b/openerp/addons/base/i18n/de.po index 8b79ca7b746..5e2f55c70a4 100644 --- a/openerp/addons/base/i18n/de.po +++ b/openerp/addons/base/i18n/de.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:12+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:02+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/el.po b/openerp/addons/base/i18n/el.po index 494dd7644b9..a9a20427187 100644 --- a/openerp/addons/base/i18n/el.po +++ b/openerp/addons/base/i18n/el.po @@ -12,8 +12,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:12+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:03+0000\n" +"X-Generator: Launchpad (build 16130)\n" "X-Poedit-Country: GREECE\n" "X-Poedit-Language: Greek\n" "X-Poedit-SourceCharset: utf-8\n" diff --git a/openerp/addons/base/i18n/en_GB.po b/openerp/addons/base/i18n/en_GB.po index dd91a5c2cd6..4ae7f2fb5b3 100644 --- a/openerp/addons/base/i18n/en_GB.po +++ b/openerp/addons/base/i18n/en_GB.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:17+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:08+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/es.po b/openerp/addons/base/i18n/es.po index 1f9565339c8..22d1a7100c8 100644 --- a/openerp/addons/base/i18n/es.po +++ b/openerp/addons/base/i18n/es.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:16+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:06+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/es_AR.po b/openerp/addons/base/i18n/es_AR.po index 81edd41b083..e855282ca1f 100644 --- a/openerp/addons/base/i18n/es_AR.po +++ b/openerp/addons/base/i18n/es_AR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:17+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:08+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/es_CL.po b/openerp/addons/base/i18n/es_CL.po index aedc3181be1..7c54dc867bf 100644 --- a/openerp/addons/base/i18n/es_CL.po +++ b/openerp/addons/base/i18n/es_CL.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:17+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:08+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/es_CR.po b/openerp/addons/base/i18n/es_CR.po index 636ed963d30..7494ec52b04 100644 --- a/openerp/addons/base/i18n/es_CR.po +++ b/openerp/addons/base/i18n/es_CR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:18+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:08+0000\n" +"X-Generator: Launchpad (build 16130)\n" "Language: \n" #. module: base diff --git a/openerp/addons/base/i18n/es_EC.po b/openerp/addons/base/i18n/es_EC.po index 84617d0a2bc..d7304775587 100644 --- a/openerp/addons/base/i18n/es_EC.po +++ b/openerp/addons/base/i18n/es_EC.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:18+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:09+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/es_MX.po b/openerp/addons/base/i18n/es_MX.po index 3e7f975f118..67e9aa9956a 100644 --- a/openerp/addons/base/i18n/es_MX.po +++ b/openerp/addons/base/i18n/es_MX.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:18+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:09+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/et.po b/openerp/addons/base/i18n/et.po index 9d8b95b83c9..9fe26471d0d 100644 --- a/openerp/addons/base/i18n/et.po +++ b/openerp/addons/base/i18n/et.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:11+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:02+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/eu.po b/openerp/addons/base/i18n/eu.po index cf88512fe08..61ed6fda3ba 100644 --- a/openerp/addons/base/i18n/eu.po +++ b/openerp/addons/base/i18n/eu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:10+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:00+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/fa.po b/openerp/addons/base/i18n/fa.po index 98f1b514c4b..4ec2a4611ef 100644 --- a/openerp/addons/base/i18n/fa.po +++ b/openerp/addons/base/i18n/fa.po @@ -9,8 +9,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:14+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:05+0000\n" +"X-Generator: Launchpad (build 16130)\n" "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n" "X-Poedit-Language: Persian\n" @@ -165,7 +165,7 @@ msgstr "پنجره هدف" #. module: base #: model:ir.module.module,shortdesc:base.module_sale_analytic_plans msgid "Sales Analytic Distribution" -msgstr "" +msgstr "تحلیل توزیع فروش" #. module: base #: model:ir.module.module,shortdesc:base.module_web_process @@ -175,7 +175,7 @@ msgstr "روند" #. module: base #: model:ir.module.module,shortdesc:base.module_analytic_journal_billing_rate msgid "Billing Rates on Contracts" -msgstr "" +msgstr "نرخ صورت حساب در قراردادها" #. module: base #: code:addons/base/res/res_users.py:558 @@ -195,7 +195,7 @@ msgstr "" #: code:addons/osv.py:129 #, python-format msgid "Constraint Error" -msgstr "" +msgstr "خطا در محدودیت" #. module: base #: model:ir.model,name:base.model_ir_ui_view_custom @@ -286,7 +286,7 @@ msgstr "تعداد پیمانه‌ها" #. module: base #: help:multi_company.default,company_dest_id:0 msgid "Company to store the current record" -msgstr "" +msgstr "شرکت ذخیره رکورد جاری" #. module: base #: field:res.partner.bank.type.field,size:0 @@ -361,7 +361,7 @@ msgstr "مدیریت شریک" #. module: base #: model:ir.module.category,name:base.module_category_customer_relationship_management msgid "Customer Relationship Management" -msgstr "" +msgstr "مدیریت ارتباط با مشتری" #. module: base #: view:ir.module.module:0 @@ -397,7 +397,7 @@ msgstr "تاریخ بروزرسانی" #. module: base #: model:ir.module.module,shortdesc:base.module_base_action_rule msgid "Automated Action Rules" -msgstr "" +msgstr "قوانین عملیات خودکار" #. module: base #: view:ir.attachment:0 @@ -527,7 +527,7 @@ msgstr "" #. module: base #: view:ir.values:0 msgid "Action Binding" -msgstr "" +msgstr "عمل اجباری" #. module: base #: model:res.country,name:base.gf @@ -659,7 +659,7 @@ msgstr "تَردست‌ها" #. module: base #: model:res.partner.category,name:base.res_partner_category_miscellaneoussuppliers0 msgid "Miscellaneous Suppliers" -msgstr "" +msgstr "تولیدکنندگان متفرقه" #. module: base #: code:addons/base/ir/ir_model.py:287 @@ -755,7 +755,7 @@ msgstr "حسابداری - رومانی" #. module: base #: view:partner.wizard.ean.check:0 msgid "Want to check Ean ? " -msgstr "" +msgstr "آیا میخواهید بررسی شود؟ " #. module: base #: help:ir.actions.server,mobile:0 @@ -771,7 +771,7 @@ msgstr "" #. module: base #: view:ir.mail_server:0 msgid "Security and Authentication" -msgstr "" +msgstr "امنیت و احراز هویت" #. module: base #: view:base.language.export:0 @@ -814,32 +814,32 @@ msgstr "کامبوج، پادشاهی" #: field:base.language.import,overwrite:0 #: field:base.language.install,overwrite:0 msgid "Overwrite Existing Terms" -msgstr "" +msgstr "بازنویسی قوانین موجود" #. module: base #: model:ir.model,name:base.model_base_language_import msgid "Language Import" -msgstr "" +msgstr "ورود زبان" #. module: base #: help:ir.cron,interval_number:0 msgid "Repeat every x." -msgstr "" +msgstr "تکرار هر X." #. module: base #: selection:base.language.install,lang:0 msgid "Albanian / Shqip" -msgstr "" +msgstr "آلبانیایی / Shqip" #. module: base #: model:ir.ui.menu,name:base.menu_crm_config_opportunity msgid "Opportunities" -msgstr "" +msgstr "فرصت" #. module: base #: model:ir.model,name:base.model_base_language_export msgid "base.language.export" -msgstr "" +msgstr "پایه.زبان.خروج" #. module: base #: help:ir.actions.server,write_id:0 @@ -858,7 +858,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_document_webdav msgid "Shared Repositories (WebDAV)" -msgstr "" +msgstr "منابع مشترک" #. module: base #: model:ir.module.module,description:base.module_import_google @@ -870,7 +870,7 @@ msgstr "" #. module: base #: view:res.users:0 msgid "Email Preferences" -msgstr "" +msgstr "تنظیمات ایمیل" #. module: base #: model:ir.module.module,description:base.module_audittrail @@ -904,7 +904,7 @@ msgstr "همکاران من" #. module: base #: view:ir.actions.report.xml:0 msgid "XML Report" -msgstr "" +msgstr "گزارش XML" #. module: base #: model:res.country,name:base.es @@ -914,7 +914,7 @@ msgstr "اسپانیا" #. module: base #: view:base.module.update:0 msgid "Please be patient, as this operation may take a few seconds..." -msgstr "" +msgstr "لطفا منتظر بمانید ممکن است این عملیات طولانی شود." #. module: base #: help:ir.actions.act_window,domain:0 @@ -926,12 +926,12 @@ msgstr "" #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade #: model:ir.model,name:base.model_base_module_upgrade msgid "Module Upgrade" -msgstr "" +msgstr "به روز رسانی ماژول" #. module: base #: selection:base.language.install,lang:0 msgid "Spanish (UY) / Español (UY)" -msgstr "" +msgstr "اسپانیایی / Español (UY)" #. module: base #: field:res.partner,mobile:0 @@ -947,7 +947,7 @@ msgstr "عمان" #. module: base #: model:ir.module.module,shortdesc:base.module_mrp msgid "MRP" -msgstr "" +msgstr "برنامه ریزی ساخت منابع" #. module: base #: report:ir.module.reference.graph:0 @@ -962,7 +962,7 @@ msgstr "نیوئه" #. module: base #: model:ir.module.module,shortdesc:base.module_membership msgid "Membership Management" -msgstr "" +msgstr "مدیریت عضویت" #. module: base #: selection:ir.module.module,license:0 @@ -984,12 +984,12 @@ msgstr "هند" #: model:ir.actions.act_window,name:base.res_request_link-act #: model:ir.ui.menu,name:base.menu_res_request_link_act msgid "Request Reference Types" -msgstr "" +msgstr "درخواست انواع مرجع" #. module: base #: model:ir.module.module,shortdesc:base.module_google_base_account msgid "Google Users" -msgstr "" +msgstr "کاربران گوگل" #. module: base #: help:ir.server.object.lines,value:0 @@ -1026,6 +1026,8 @@ msgstr "بایگانی TGZ" msgid "" "Users added to this group are automatically added in the following groups." msgstr "" +"کاربرانی که به این گروه اضافه میشوند به صورت خودکار به گروه های زیر افزوده " +"میشوند." #. module: base #: view:res.lang:0 @@ -1052,7 +1054,7 @@ msgstr "نوع" #. module: base #: field:ir.mail_server,smtp_user:0 msgid "Username" -msgstr "" +msgstr "نام کاربری" #. module: base #: code:addons/orm.py:398 @@ -1071,13 +1073,13 @@ msgstr "گوام (آمریکا)" #: code:addons/base/res/res_users.py:558 #, python-format msgid "Setting empty passwords is not allowed for security reasons!" -msgstr "" +msgstr "به دلایل امنیتی کلمه عبور نمیتواند خالی باشد!" #. module: base #: code:addons/base/ir/ir_mail_server.py:192 #, python-format msgid "Connection test failed!" -msgstr "" +msgstr "آزمایش ارتباط ناموفق بود!" #. module: base #: selection:ir.actions.server,state:0 @@ -1116,7 +1118,7 @@ msgstr "" #. module: base #: field:ir.module.module,contributors:0 msgid "Contributors" -msgstr "" +msgstr "شرکت کنندگان" #. module: base #: model:ir.module.module,description:base.module_project_planning @@ -1147,7 +1149,7 @@ msgstr "" #. module: base #: selection:base.language.install,lang:0 msgid "Slovak / Slovenský jazyk" -msgstr "" +msgstr "اسلواکی / Slovenský jazyk" #. module: base #: selection:base.language.install,lang:0 @@ -1162,7 +1164,7 @@ msgstr "اوگاندا" #. module: base #: field:ir.model.access,perm_unlink:0 msgid "Delete Access" -msgstr "" +msgstr "حذف دسترسی" #. module: base #: model:res.country,name:base.ne @@ -1172,7 +1174,7 @@ msgstr "نیجر" #. module: base #: selection:base.language.install,lang:0 msgid "Chinese (HK)" -msgstr "" +msgstr "چینی" #. module: base #: model:res.country,name:base.ba @@ -1190,17 +1192,17 @@ msgstr "" #. module: base #: selection:base.language.install,lang:0 msgid "Spanish (GT) / Español (GT)" -msgstr "" +msgstr "اسپانیایی / Español (GT)" #. module: base #: field:ir.mail_server,smtp_port:0 msgid "SMTP Port" -msgstr "" +msgstr "پورت SMTP" #. module: base #: model:ir.module.module,shortdesc:base.module_import_sugarcrm msgid "SugarCRM Import" -msgstr "" +msgstr "ورود SugarCRM" #. module: base #: view:res.lang:0 @@ -1217,12 +1219,12 @@ msgstr "" #: code:addons/base/module/wizard/base_language_install.py:55 #, python-format msgid "Language Pack" -msgstr "" +msgstr "بسته زبان" #. module: base #: model:ir.module.module,shortdesc:base.module_web_tests msgid "Tests" -msgstr "" +msgstr "آزمونها" #. module: base #: field:ir.ui.view_sc,res_id:0 @@ -1242,7 +1244,7 @@ msgstr "URL کنش" #. module: base #: field:base.module.import,module_name:0 msgid "Module Name" -msgstr "" +msgstr "نام ماژول" #. module: base #: model:res.country,name:base.mh @@ -1253,7 +1255,7 @@ msgstr "جزایر مارشال" #: code:addons/base/ir/ir_model.py:368 #, python-format msgid "Changing the model of a field is forbidden!" -msgstr "" +msgstr "تغییر مدل این فیلد ممنوع است" #. module: base #: model:res.country,name:base.ht @@ -1279,13 +1281,13 @@ msgstr "" #. module: base #: field:ir.module.category,parent_id:0 msgid "Parent Application" -msgstr "" +msgstr "برنامه اصلی" #. module: base #: code:addons/base/res/res_users.py:222 #, python-format msgid "Operation Canceled" -msgstr "" +msgstr "عملیات لغوشده" #. module: base #: help:base.language.export,lang:0 @@ -1296,17 +1298,17 @@ msgstr "برای برونش زبانی نو، چیزی را برنگزینید." #: model:ir.module.module,shortdesc:base.module_document #: model:ir.module.module,shortdesc:base.module_knowledge msgid "Document Management System" -msgstr "" +msgstr "سیستم مدیریت اسناد" #. module: base #: model:ir.module.module,shortdesc:base.module_crm_claim msgid "Claims Management" -msgstr "" +msgstr "مدیریت ادعا" #. module: base #: model:ir.ui.menu,name:base.menu_purchase_root msgid "Purchases" -msgstr "" +msgstr "خریدها" #. module: base #: model:res.country,name:base.md @@ -1349,7 +1351,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_account_sequence msgid "Entries Sequence Numbering" -msgstr "" +msgstr "مرتب سازی ورودی ها" #. module: base #: model:ir.model,name:base.model_ir_exports @@ -1416,7 +1418,7 @@ msgstr "" #. module: base #: view:wizard.ir.model.menu.create:0 msgid "Create _Menu" -msgstr "" +msgstr "ایجاد منو" #. module: base #: field:res.payterm,name:0 @@ -1461,12 +1463,12 @@ msgstr "" msgid "" "If you check this box, your customized translations will be overwritten and " "replaced by the official ones." -msgstr "" +msgstr "اگر این گزینه فعال باشد، ترجمه شما جایگزین ترجمه های قبلی میشود." #. module: base #: field:ir.actions.report.xml,report_rml:0 msgid "Main report file path" -msgstr "" +msgstr "مسیر فایل گزارش اصلی" #. module: base #: model:ir.actions.act_window,name:base.ir_action_report_xml @@ -1512,7 +1514,7 @@ msgstr "ورود" #: model:ir.actions.act_window,name:base.action_wizard_update_translations #: model:ir.ui.menu,name:base.menu_wizard_update_translations msgid "Synchronize Terms" -msgstr "" +msgstr "هماهنگ سازی قوانین" #. module: base #: view:ir.actions.server:0 @@ -1542,18 +1544,18 @@ msgstr "" #. module: base #: model:ir.ui.menu,name:base.menu_tools msgid "Tools" -msgstr "" +msgstr "ابزار" #. module: base #: selection:ir.property,type:0 msgid "Float" -msgstr "" +msgstr "شناور" #. module: base #: model:ir.module.category,name:base.module_category_warehouse_management #: model:ir.module.module,shortdesc:base.module_stock msgid "Warehouse Management" -msgstr "" +msgstr "مدیریت انبار" #. module: base #: model:ir.model,name:base.model_res_request_link @@ -1570,7 +1572,7 @@ msgstr "آگهگان تردست" #: model:ir.actions.act_window,name:base.action_wizard_lang_export #: model:ir.ui.menu,name:base.menu_wizard_lang_export msgid "Export Translation" -msgstr "" +msgstr "خروج ترجمه" #. module: base #: help:res.log,secondary:0 @@ -1582,7 +1584,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_lu msgid "Luxembourg - Accounting" -msgstr "" +msgstr "حسابداری - لوکزامبرگ" #. module: base #: model:res.country,name:base.tp @@ -1753,27 +1755,27 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_html_view msgid "Html View" -msgstr "" +msgstr "مشاهده HTML" #. module: base #: field:res.currency,position:0 msgid "Symbol position" -msgstr "" +msgstr "جایگاه نماد" #. module: base #: model:ir.module.module,shortdesc:base.module_process msgid "Enterprise Process" -msgstr "" +msgstr "فرآیند سازمانی" #. module: base #: help:ir.cron,function:0 msgid "Name of the method to be called when this job is processed." -msgstr "" +msgstr "نام این روش زمانی که این عمل در حال انجام است به آن داده میشود." #. module: base #: model:ir.module.module,shortdesc:base.module_hr_evaluation msgid "Employee Appraisals" -msgstr "" +msgstr "ارزیابی کارکنان" #. module: base #: selection:ir.actions.server,state:0 @@ -1790,7 +1792,7 @@ msgstr " STOCK_COPY" #. module: base #: field:res.company,rml_footer1:0 msgid "General Information Footer" -msgstr "" +msgstr "اطلاعات عمومی پاورقی" #. module: base #: view:res.lang:0 @@ -1822,7 +1824,7 @@ msgstr "مدل پیوست" #. module: base #: field:res.partner.bank,footer:0 msgid "Display on Reports" -msgstr "" +msgstr "نمایش در گزارش" #. module: base #: model:ir.module.module,description:base.module_l10n_cn @@ -1897,7 +1899,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_account_chart msgid "Template of Charts of Accounts" -msgstr "" +msgstr "قالب نمودار حساب ها" #. module: base #: field:res.partner.address,type:0 @@ -1907,7 +1909,7 @@ msgstr "نوع نشانی" #. module: base #: view:ir.ui.menu:0 msgid "Full Path" -msgstr "" +msgstr "آدرس کامل" #. module: base #: model:ir.module.module,description:base.module_l10n_br @@ -1973,7 +1975,7 @@ msgstr "" #. module: base #: view:ir.ui.view:0 msgid "Advanced" -msgstr "" +msgstr "پیشرفته" #. module: base #: model:res.country,name:base.fi @@ -1984,12 +1986,12 @@ msgstr "فنلاند" #: code:addons/base/res/res_company.py:156 #, python-format msgid "Website: " -msgstr "" +msgstr "وب سایت " #. module: base #: model:ir.ui.menu,name:base.menu_administration msgid "Settings" -msgstr "" +msgstr "تنظیمات" #. module: base #: selection:ir.actions.act_window,view_type:0 @@ -2003,12 +2005,12 @@ msgstr "درخت" #. module: base #: model:ir.module.module,shortdesc:base.module_analytic_multicurrency msgid "Multi-Currency in Analytic" -msgstr "" +msgstr "تحلیل چند ارزی" #. module: base #: view:base.language.export:0 msgid "https://help.launchpad.net/Translations" -msgstr "" +msgstr "https://help.launchpad.net/Translations" #. module: base #: field:ir.actions.act_window,view_mode:0 @@ -2020,7 +2022,7 @@ msgstr "حالت نمایش" msgid "" "Display this bank account on the footer of printed documents like invoices " "and sales orders." -msgstr "" +msgstr "نمایش حساب بانکی در پاورقی اسناد چاپی مانند فاکتورها و سفارشات" #. module: base #: view:base.language.import:0 @@ -2032,7 +2034,7 @@ msgstr "" #. module: base #: view:res.log:0 msgid "Logs" -msgstr "" +msgstr "گزارشات" #. module: base #: selection:base.language.install,lang:0 @@ -2042,7 +2044,7 @@ msgstr "اسپانیایی / Español" #. module: base #: selection:base.language.install,lang:0 msgid "Korean (KP) / 한국어 (KP)" -msgstr "" +msgstr "کره / 한국어 (KP)" #. module: base #: view:base.module.update:0 @@ -2090,7 +2092,7 @@ msgstr "نشان" #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_cr msgid "Costa Rica - Accounting" -msgstr "" +msgstr "حسابداری - کاستاریکا" #. module: base #: view:ir.module.module:0 @@ -2120,12 +2122,12 @@ msgstr "" #. module: base #: field:ir.values,action_id:0 msgid "Action (change only)" -msgstr "" +msgstr "عملیات (فقط تغییر)" #. module: base #: model:ir.module.module,shortdesc:base.module_subscription msgid "Recurring Documents" -msgstr "" +msgstr "اسناد دوره ای" #. module: base #: model:res.country,name:base.bs @@ -2163,7 +2165,7 @@ msgstr "تعداد پیمانه‌های بروزرسانده" #. module: base #: field:ir.cron,function:0 msgid "Method" -msgstr "" +msgstr "روش" #. module: base #: view:res.partner.event:0 @@ -2173,7 +2175,7 @@ msgstr "شرح کلی" #. module: base #: view:workflow.activity:0 msgid "Workflow Activity" -msgstr "" +msgstr "فعالیت گردش کار" #. module: base #: model:ir.actions.act_window,help:base.action_ui_view @@ -2185,7 +2187,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_base_setup msgid "Initial Setup Tools" -msgstr "" +msgstr "ابزار تنظیمات اولیه" #. module: base #: field:ir.actions.act_window,groups_id:0 @@ -2209,7 +2211,7 @@ msgstr "گروه‌ها" #. module: base #: selection:base.language.install,lang:0 msgid "Spanish (CL) / Español (CL)" -msgstr "" +msgstr "اسپانیایی / Español (CL)" #. module: base #: model:res.country,name:base.bz @@ -2242,12 +2244,12 @@ msgstr "" #. module: base #: model:ir.actions.act_window,name:base.action_res_widget_wizard msgid "Homepage Widgets Management" -msgstr "" +msgstr "مدیریت ابزارک های صفحه اصلی" #. module: base #: field:res.company,rml_header1:0 msgid "Report Header / Company Slogan" -msgstr "" +msgstr "سربرگ گزارش / شعار شرکت" #. module: base #: model:res.country,name:base.pl @@ -2270,7 +2272,7 @@ msgstr "" #. module: base #: view:workflow:0 msgid "Workflow Editor" -msgstr "" +msgstr "ویرایشگر گردش کار" #. module: base #: selection:ir.module.module,state:0 @@ -2297,7 +2299,7 @@ msgstr "" #. module: base #: field:ir.mail_server,smtp_debug:0 msgid "Debugging" -msgstr "" +msgstr "اشکال‌زدایی" #. module: base #: model:ir.module.module,description:base.module_crm_helpdesk @@ -2317,7 +2319,7 @@ msgstr "" #. module: base #: sql_constraint:ir.ui.view_sc:0 msgid "Shortcut for this menu already exists!" -msgstr "" +msgstr "میانبر این منو موجود است" #. module: base #: model:ir.module.module,description:base.module_resource @@ -2337,12 +2339,12 @@ msgstr "" #. module: base #: view:ir.rule:0 msgid "Groups (no group = global)" -msgstr "" +msgstr "گروه ها (بدون گروه = عمومی)" #. module: base #: selection:res.users,view:0 msgid "Simplified" -msgstr "" +msgstr "ساده‌ شده" #. module: base #: model:res.country,name:base.st @@ -2357,7 +2359,7 @@ msgstr "سیاهه" #. module: base #: selection:base.language.install,lang:0 msgid "Portugese (BR) / Português (BR)" -msgstr "" +msgstr "پرتقالی / Português (BR)" #. module: base #: model:res.country,name:base.bb @@ -2406,7 +2408,7 @@ msgstr "نرخ کنونی" #. module: base #: model:ir.module.module,shortdesc:base.module_idea msgid "Ideas" -msgstr "" +msgstr "‌ایده‌ها" #. module: base #: model:ir.module.module,shortdesc:base.module_sale_crm @@ -2433,22 +2435,22 @@ msgstr "هدف کنش" #. module: base #: model:ir.module.module,shortdesc:base.module_base_calendar msgid "Calendar Layer" -msgstr "" +msgstr "لایه تقویم" #. module: base #: model:ir.actions.report.xml,name:base.report_ir_model_overview msgid "Model Overview" -msgstr "" +msgstr "بازنگری مدل" #. module: base #: model:ir.module.module,shortdesc:base.module_product_margin msgid "Margins by Products" -msgstr "" +msgstr "حاشیه های محصولات" #. module: base #: model:ir.ui.menu,name:base.menu_invoiced msgid "Invoicing" -msgstr "" +msgstr "صورتحساب" #. module: base #: field:ir.ui.view_sc,name:0 @@ -2483,13 +2485,13 @@ msgstr "درونش / برونش" #. module: base #: model:ir.actions.todo.category,name:base.category_tools_customization_config msgid "Tools / Customization" -msgstr "" +msgstr "ابزار / شخصی سازی" #. module: base #: field:ir.model.data,res_id:0 #: field:ir.values,res_id:0 msgid "Record ID" -msgstr "" +msgstr "شناسه ثبت شده" #. module: base #: field:ir.actions.server,email:0 @@ -2567,13 +2569,13 @@ msgstr "نگاشت‌های فیلد" #: code:addons/base/publisher_warranty/publisher_warranty.py:163 #, python-format msgid "Error during communication with the publisher warranty server." -msgstr "" +msgstr "خطا در هنگام ارتباط با سرور ناشر گارانتی" #. module: base #: model:res.groups,name:base.group_sale_manager #: model:res.groups,name:base.group_tool_manager msgid "Manager" -msgstr "" +msgstr "مدیر" #. module: base #: model:ir.ui.menu,name:base.menu_custom @@ -2605,17 +2607,17 @@ msgstr "لیتوانی" #: model:ir.model,name:base.model_partner_clear_ids #: view:partner.clear.ids:0 msgid "Clear IDs" -msgstr "" +msgstr "پاک کردن شناسه ها" #. module: base #: view:res.groups:0 msgid "Inherited" -msgstr "" +msgstr "موروثی" #. module: base #: field:ir.model.fields,serialization_field_id:0 msgid "Serialization Field" -msgstr "" +msgstr "رشته فیلد" #. module: base #: model:ir.module.category,description:base.module_category_report_designer @@ -2649,7 +2651,7 @@ msgstr "" #: model:ir.actions.act_window,name:base.res_log_act_window #: model:ir.ui.menu,name:base.menu_res_log_act_window msgid "Client Logs" -msgstr "" +msgstr "ثبت مشتری" #. module: base #: code:addons/orm.py:1883 @@ -2670,7 +2672,7 @@ msgstr "" #: code:addons/base/module/wizard/base_update_translations.py:38 #, python-format msgid "Error!" -msgstr "" +msgstr "خطا!" #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_fr_rib @@ -2690,7 +2692,7 @@ msgstr "کنش‌های تکرار" #. module: base #: help:multi_company.default,company_id:0 msgid "Company where the user is connected" -msgstr "" +msgstr "شرکتی که کاربر از آن وصل شده" #. module: base #: field:publisher_warranty.contract,date_stop:0 @@ -2732,7 +2734,7 @@ msgstr "جزیره‌ی نورفولک" #. module: base #: selection:base.language.install,lang:0 msgid "Korean (KR) / 한국어 (KR)" -msgstr "" +msgstr "کره / 한국어 (KR)" #. module: base #: help:ir.model.fields,model:0 @@ -2758,14 +2760,14 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_stock_planning msgid "Master Procurement Schedule" -msgstr "" +msgstr "کارشناس ارشد برنامه ریز تدارکات" #. module: base #: model:ir.model,name:base.model_ir_module_category #: field:ir.module.module,application:0 #: field:res.groups,category_id:0 msgid "Application" -msgstr "" +msgstr "برنامه" #. module: base #: selection:publisher_warranty.contract,state:0 @@ -2804,7 +2806,7 @@ msgstr "" #. module: base #: field:ir.actions.client,params_store:0 msgid "Params storage" -msgstr "" +msgstr "پارامترهای ذخیره سازی" #. module: base #: code:addons/base/module/module.py:409 @@ -2851,7 +2853,7 @@ msgstr "" #. module: base #: model:res.widget,title:base.facebook_widget msgid "Facebook" -msgstr "" +msgstr "فیسبوک" #. module: base #: model:res.country,name:base.am @@ -2862,12 +2864,12 @@ msgstr "ارمنستان" #: model:ir.actions.act_window,name:base.ir_property_form #: model:ir.ui.menu,name:base.menu_ir_property_form_all msgid "Configuration Parameters" -msgstr "" +msgstr "پارامترهای پیکربندی" #. module: base #: constraint:ir.cron:0 msgid "Invalid arguments" -msgstr "" +msgstr "آرگومان‌های نامعتبر" #. module: base #: model:res.country,name:base.se @@ -2906,7 +2908,7 @@ msgstr "نوع حساب بانکی" #: field:res.config,config_logo:0 #: field:res.config.installer,config_logo:0 msgid "Image" -msgstr "" +msgstr "تصویر" #. module: base #: view:ir.actions.server:0 diff --git a/openerp/addons/base/i18n/fa_AF.po b/openerp/addons/base/i18n/fa_AF.po index 4455b4b1bc2..59c8c758790 100644 --- a/openerp/addons/base/i18n/fa_AF.po +++ b/openerp/addons/base/i18n/fa_AF.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:18+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:09+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/fi.po b/openerp/addons/base/i18n/fi.po index a636d8a94c2..b9beaf709f1 100644 --- a/openerp/addons/base/i18n/fi.po +++ b/openerp/addons/base/i18n/fi.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:11+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:02+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po index 5401ac31f42..e4a1a52c5b3 100644 --- a/openerp/addons/base/i18n/fr.po +++ b/openerp/addons/base/i18n/fr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:12+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:02+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/gl.po b/openerp/addons/base/i18n/gl.po index 4d020749af9..e792b065d9c 100644 --- a/openerp/addons/base/i18n/gl.po +++ b/openerp/addons/base/i18n/gl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:12+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:03+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/gu.po b/openerp/addons/base/i18n/gu.po index da4a5d6d519..d6ec727bf97 100644 --- a/openerp/addons/base/i18n/gu.po +++ b/openerp/addons/base/i18n/gu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:12+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:03+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/he.po b/openerp/addons/base/i18n/he.po index dc41897f839..f8fdf675216 100644 --- a/openerp/addons/base/i18n/he.po +++ b/openerp/addons/base/i18n/he.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:12+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:03+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/hr.po b/openerp/addons/base/i18n/hr.po index 9006415c054..0d93cb32df3 100644 --- a/openerp/addons/base/i18n/hr.po +++ b/openerp/addons/base/i18n/hr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:15+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:06+0000\n" +"X-Generator: Launchpad (build 16130)\n" "Language: hr\n" #. module: base diff --git a/openerp/addons/base/i18n/hu.po b/openerp/addons/base/i18n/hu.po index d421d8874de..21fb2b5761c 100644 --- a/openerp/addons/base/i18n/hu.po +++ b/openerp/addons/base/i18n/hu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:12+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:03+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh @@ -218,7 +218,7 @@ msgstr "ir.ui.view.custom" #: code:addons/base/ir/ir_model.py:313 #, python-format msgid "Renaming sparse field \"%s\" is not allowed" -msgstr "" +msgstr "Nem megengedett a \"%s\" ritka mező átnevezése" #. module: base #: model:res.country,name:base.sz @@ -234,12 +234,12 @@ msgstr "létrehozva." #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_tr msgid "Turkey - Accounting" -msgstr "" +msgstr "Török - könyvelés" #. module: base #: model:ir.module.module,shortdesc:base.module_mrp_subproduct msgid "MRP Subproducts" -msgstr "" +msgstr "MRP altermékek" #. module: base #: code:addons/base/module/module.py:390 @@ -272,7 +272,7 @@ msgstr "Inuktitut / ᐃᓄᒃᑎᑐᑦ" #: model:ir.module.category,name:base.module_category_sales_management #: model:ir.module.module,shortdesc:base.module_sale msgid "Sales Management" -msgstr "" +msgstr "Értékesítés menedzsment" #. module: base #: view:res.partner:0 @@ -368,12 +368,12 @@ msgstr "Varázsló Neve" #. module: base #: model:res.groups,name:base.group_partner_manager msgid "Partner Manager" -msgstr "" +msgstr "Partner kapcsolati felelős" #. module: base #: model:ir.module.category,name:base.module_category_customer_relationship_management msgid "Customer Relationship Management" -msgstr "" +msgstr "Ügyfél kapcsolati irányítás" #. module: base #: view:ir.module.module:0 diff --git a/openerp/addons/base/i18n/hy.po b/openerp/addons/base/i18n/hy.po index 038dd4c0a68..1458f997356 100644 --- a/openerp/addons/base/i18n/hy.po +++ b/openerp/addons/base/i18n/hy.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:10+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:00+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/id.po b/openerp/addons/base/i18n/id.po index 57806edb71c..fff6fde2d02 100644 --- a/openerp/addons/base/i18n/id.po +++ b/openerp/addons/base/i18n/id.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:13+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:03+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/is.po b/openerp/addons/base/i18n/is.po index e5fa01a9dbd..6a8c075d62e 100644 --- a/openerp/addons/base/i18n/is.po +++ b/openerp/addons/base/i18n/is.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:13+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:03+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/it.po b/openerp/addons/base/i18n/it.po index cf39f48fe37..a02be400545 100644 --- a/openerp/addons/base/i18n/it.po +++ b/openerp/addons/base/i18n/it.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:13+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:04+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po index 8a6a41057ec..2d9e2dc9163 100644 --- a/openerp/addons/base/i18n/ja.po +++ b/openerp/addons/base/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:13+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:04+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/ka.po b/openerp/addons/base/i18n/ka.po index 00a06bf9ba3..ad970a9b0a3 100644 --- a/openerp/addons/base/i18n/ka.po +++ b/openerp/addons/base/i18n/ka.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:12+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:02+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/kk.po b/openerp/addons/base/i18n/kk.po index b17421be2f6..ff29e547a38 100644 --- a/openerp/addons/base/i18n/kk.po +++ b/openerp/addons/base/i18n/kk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:13+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:04+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/ko.po b/openerp/addons/base/i18n/ko.po index 7a568c31b84..5f36c28683c 100644 --- a/openerp/addons/base/i18n/ko.po +++ b/openerp/addons/base/i18n/ko.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:13+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:04+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/lt.po b/openerp/addons/base/i18n/lt.po index e08c3f152b9..fdb6451b3f4 100644 --- a/openerp/addons/base/i18n/lt.po +++ b/openerp/addons/base/i18n/lt.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:14+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:04+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/lv.po b/openerp/addons/base/i18n/lv.po index 27705b72e48..7f8d4ab10e4 100644 --- a/openerp/addons/base/i18n/lv.po +++ b/openerp/addons/base/i18n/lv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:14+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:04+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/mk.po b/openerp/addons/base/i18n/mk.po index 2d66015cdb7..e02c1544aaf 100644 --- a/openerp/addons/base/i18n/mk.po +++ b/openerp/addons/base/i18n/mk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:14+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:04+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/mn.po b/openerp/addons/base/i18n/mn.po index 1264b368a92..014d461f446 100644 --- a/openerp/addons/base/i18n/mn.po +++ b/openerp/addons/base/i18n/mn.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:14+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:05+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/nb.po b/openerp/addons/base/i18n/nb.po index 2a83f20f87f..a485a20f257 100644 --- a/openerp/addons/base/i18n/nb.po +++ b/openerp/addons/base/i18n/nb.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:14+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:05+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/nl.po b/openerp/addons/base/i18n/nl.po index 4ec2d171e4d..88fcc4ff3fb 100644 --- a/openerp/addons/base/i18n/nl.po +++ b/openerp/addons/base/i18n/nl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:11+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:01+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh @@ -12085,7 +12085,7 @@ msgstr "Wizards welke worden gestart" #: model:ir.module.category,name:base.module_category_manufacturing #: model:ir.ui.menu,name:base.menu_mrp_root msgid "Manufacturing" -msgstr "Productiebeheer" +msgstr "Productie" #. module: base #: model:res.country,name:base.km @@ -15550,10 +15550,11 @@ msgid "" "1,06,500;[1,2,-1] will represent it to be 106,50,0;[3] will represent it as " "106,500. Provided ',' as the thousand separator in each case." msgstr "" -"Het scheidingsformaat moet zoals [,n] zijn waarin 0 < n: -1 eindigt de " -"scheiding. Bijv. [3,2,-1] geeft op 106500 het volgende resultaat: 1,06,500. " -"[1,2,-1] geeft 106,50,0; [3] geeft 106,500. Er is in deze voorbeelden " -"uitgegaan van ',' als scheidingsteken." +"De instellingen voor het scheidingsteken heeft het formaat [,n] waarbij n > " +"0 gerekend vanaf het decimaalteken. -1 eindigt de scheiding. Bijv. [3,2,-1] " +"geeft op 106500 het volgende resultaat: 1,06,500. [1,2,-1] geeft 106,50,0; " +"[3] geeft 106,500. Er is in deze voorbeelden uitgegaan van ',' als " +"scheidingsteken." #. module: base #: field:ir.module.module,auto_install:0 diff --git a/openerp/addons/base/i18n/nl_BE.po b/openerp/addons/base/i18n/nl_BE.po index 1313f114d81..c217bcd4738 100644 --- a/openerp/addons/base/i18n/nl_BE.po +++ b/openerp/addons/base/i18n/nl_BE.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:17+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:08+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/pl.po b/openerp/addons/base/i18n/pl.po index 4ad08ff73d8..62537c66f30 100644 --- a/openerp/addons/base/i18n/pl.po +++ b/openerp/addons/base/i18n/pl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:14+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:05+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh @@ -29,7 +29,7 @@ msgstr "Inna konfiguracja" #. module: base #: selection:ir.property,type:0 msgid "DateTime" -msgstr "" +msgstr "Data i godzina" #. module: base #: model:ir.module.module,shortdesc:base.module_project_mailgate @@ -83,7 +83,7 @@ msgstr "Kod (np:en__US)" #: field:workflow.transition,wkf_id:0 #: field:workflow.workitem,wkf_id:0 msgid "Workflow" -msgstr "Obieg" +msgstr "Przebieg procesu" #. module: base #: selection:ir.sequence,implementation:0 diff --git a/openerp/addons/base/i18n/pt.po b/openerp/addons/base/i18n/pt.po index 11e1ff3a38e..bb7183732b8 100644 --- a/openerp/addons/base/i18n/pt.po +++ b/openerp/addons/base/i18n/pt.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:15+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:05+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/pt_BR.po b/openerp/addons/base/i18n/pt_BR.po index eb3b7918c24..1a212229730 100644 --- a/openerp/addons/base/i18n/pt_BR.po +++ b/openerp/addons/base/i18n/pt_BR.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:17+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:08+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/ro.po b/openerp/addons/base/i18n/ro.po index 8f673e6138f..03d0526aa40 100644 --- a/openerp/addons/base/i18n/ro.po +++ b/openerp/addons/base/i18n/ro.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:15+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:05+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po index 57175fa581f..ebd9440ce32 100644 --- a/openerp/addons/base/i18n/ru.po +++ b/openerp/addons/base/i18n/ru.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:15+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:06+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/sk.po b/openerp/addons/base/i18n/sk.po index ec4981d65af..f3328eb9821 100644 --- a/openerp/addons/base/i18n/sk.po +++ b/openerp/addons/base/i18n/sk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:15+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:06+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/sl.po b/openerp/addons/base/i18n/sl.po index 6f5fea1a902..c8a34480cfa 100644 --- a/openerp/addons/base/i18n/sl.po +++ b/openerp/addons/base/i18n/sl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:15+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:06+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/sq.po b/openerp/addons/base/i18n/sq.po index f0ae2c5c50f..7a90c192789 100644 --- a/openerp/addons/base/i18n/sq.po +++ b/openerp/addons/base/i18n/sq.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:10+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:00+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/sr.po b/openerp/addons/base/i18n/sr.po index d1da84e99c3..507b51c2ee2 100644 --- a/openerp/addons/base/i18n/sr.po +++ b/openerp/addons/base/i18n/sr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:15+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:06+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/sr@latin.po b/openerp/addons/base/i18n/sr@latin.po index c7ead346847..32ac03d03d4 100644 --- a/openerp/addons/base/i18n/sr@latin.po +++ b/openerp/addons/base/i18n/sr@latin.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:19+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:09+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/sv.po b/openerp/addons/base/i18n/sv.po index 693f4042c34..7d2558438d9 100644 --- a/openerp/addons/base/i18n/sv.po +++ b/openerp/addons/base/i18n/sv.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:16+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/th.po b/openerp/addons/base/i18n/th.po index 5c973f1c0f8..384802714a4 100644 --- a/openerp/addons/base/i18n/th.po +++ b/openerp/addons/base/i18n/th.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:16+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/tlh.po b/openerp/addons/base/i18n/tlh.po index 7c81a8298b4..92eaebf3d47 100644 --- a/openerp/addons/base/i18n/tlh.po +++ b/openerp/addons/base/i18n/tlh.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:16+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/tr.po b/openerp/addons/base/i18n/tr.po index 890ce6474dc..7cbd382b60c 100644 --- a/openerp/addons/base/i18n/tr.po +++ b/openerp/addons/base/i18n/tr.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:16+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/uk.po b/openerp/addons/base/i18n/uk.po index 84c39337199..0f21a89e35f 100644 --- a/openerp/addons/base/i18n/uk.po +++ b/openerp/addons/base/i18n/uk.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:16+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/ur.po b/openerp/addons/base/i18n/ur.po index 58b2ffd8cdf..1c6c02994f8 100644 --- a/openerp/addons/base/i18n/ur.po +++ b/openerp/addons/base/i18n/ur.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:16+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/vi.po b/openerp/addons/base/i18n/vi.po index b071215c34c..d1db64fc445 100644 --- a/openerp/addons/base/i18n/vi.po +++ b/openerp/addons/base/i18n/vi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:17+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/zh_CN.po b/openerp/addons/base/i18n/zh_CN.po index b6261de14ba..0c224f68fdf 100644 --- a/openerp/addons/base/i18n/zh_CN.po +++ b/openerp/addons/base/i18n/zh_CN.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:18+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:09+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/zh_HK.po b/openerp/addons/base/i18n/zh_HK.po index daf05edeaac..1fb09268685 100644 --- a/openerp/addons/base/i18n/zh_HK.po +++ b/openerp/addons/base/i18n/zh_HK.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:17+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh diff --git a/openerp/addons/base/i18n/zh_TW.po b/openerp/addons/base/i18n/zh_TW.po index 4951c2fff9a..0eceae202ab 100644 --- a/openerp/addons/base/i18n/zh_TW.po +++ b/openerp/addons/base/i18n/zh_TW.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-10-04 05:18+0000\n" -"X-Generator: Launchpad (build 16061)\n" +"X-Launchpad-Export-Date: 2012-10-12 05:08+0000\n" +"X-Generator: Launchpad (build 16130)\n" #. module: base #: model:res.country,name:base.sh From 833c7bdc521783aac25efe63b7f59bed65be7570 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Fri, 12 Oct 2012 11:50:04 +0530 Subject: [PATCH 28/38] [FIX]Change name of the event and 'on_pager_action' function bzr revid: vja@tinyerp.com-20121012062004-2an59ci8z5o9ijpu --- addons/web/static/src/js/view_form.js | 9 +++++---- addons/web_diagram/static/src/js/diagram.js | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index a648bbe10e9..75ab275d80b 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -431,8 +431,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM do_notify_change: function() { this.$el.add(this.$buttons).addClass('oe_form_dirty'); }, - on_pager_action: function(action) { + execute_pager_action: function(action) { if (this.can_be_discarded()) { + this.trigger('pager_action_executed'); switch (action) { case 'first': this.dataset.index = 0; @@ -464,7 +465,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM } this.$pager.on('click','a[data-pager-action]',function() { var action = $(this).data('pager-action'); - self.trigger('pager_action',self.on_pager_action(action)); + self.execute_pager_action(action); }); this.do_update_pager(); }, @@ -799,7 +800,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM $.when(this.has_been_loaded).then(function() { if (self.datarecord.id && confirm(_t("Do you really want to delete this record?"))) { self.dataset.unlink([self.datarecord.id]).then(function() { - self.on_pager_action('next'); + self.execute_pager_action('next'); def.resolve(); }); } else { @@ -3387,7 +3388,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ controller.on("load_record", self, function(){ once.resolve(); }); - controller.on('pager_action',self,self.save_any_view); + controller.on('pager_action_executed',self,self.save_any_view); } else if (view_type == "graph") { self.reload_current_view() } diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js index 9fd74853c3c..f9a6bac812f 100644 --- a/addons/web_diagram/static/src/js/diagram.js +++ b/addons/web_diagram/static/src/js/diagram.js @@ -57,7 +57,7 @@ instance.web.DiagramView = instance.web.View.extend({ this.$el.find('div.oe_diagram_pager button[data-pager-action]').click(function() { var action = $(this).data('pager-action'); - self.on_pager_action(action); + self.execute_pager_action(action); }); this.do_update_pager(); From ffb5a9c802ba4b0eed4196ff109c20e1c3381625 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Fri, 12 Oct 2012 14:08:27 +0530 Subject: [PATCH 29/38] [IMP]method name change. bzr revid: vme@tinyerp.com-20121012083827-hq8xrnn333foyiu3 --- addons/web/static/src/js/view_form.js | 22 +++++++++---------- .../web/static/src/js/view_list_editable.js | 2 +- .../static/src/js/view_editor.js | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 68a47259cec..54540fba801 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -747,7 +747,8 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM }, on_button_save: function() { var self = this; - return this.do_save().then(function(result) { + return this.save().then(function(result) { + self.trigger("save"); self.to_view_mode(); }); }, @@ -824,13 +825,12 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM * record or saving an existing one depending on whether the record * already has an id property. * - * @param {Boolean} [prepend_on_create=false] if ``do_save`` creates a new + * @param {Boolean} [prepend_on_create=false] if ``save`` creates a new * record, should that record be inserted at the start of the dataset (by * default, records are added at the end) */ - do_save: function(prepend_on_create) { + save: function(prepend_on_create) { var self = this; - this.trigger("form_save"); return this.mutating_mutex.exec(function() { return self.is_initialized.pipe(function() { try { var form_invalid = false, @@ -1001,7 +1001,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM }, recursive_save: function() { var self = this; - return $.when(this.do_save()).pipe(function(res) { + return $.when(this.save()).pipe(function(res) { if (self.dataset.parent_view) return self.dataset.parent_view.recursive_save(); }); @@ -1032,7 +1032,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM return true; }, sidebar_context: function () { - return this.do_save().pipe(_.bind(function() {return this.get_fields_values();}, this)); + return this.save().pipe(_.bind(function() {return this.get_fields_values();}, this)); }, open_defaults_dialog: function () { var self = this; @@ -3521,7 +3521,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ if (!view.is_initialized.isResolved()) { return false; } - var res = $.when(view.do_save()); + var res = $.when(view.save()); if (!res.isResolved() && !res.isRejected()) { console.warn("Asynchronous get_value() is not supported in form view."); } @@ -3717,7 +3717,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({ var self = this; this.ensure_saved().pipe(function () { if (parent_form) - return parent_form.do_save(); + return parent_form.save(); else return $.when(); }).then(function () { @@ -3856,7 +3856,7 @@ instance.web.form.One2ManyFormView = instance.web.FormView.extend({ this._super(data); var self = this; this.$buttons.find('button.oe_form_button_create').click(function() { - self.do_save().then(self.on_button_new); + self.save().then(self.on_button_new); }); }, do_notify_change: function() { @@ -4432,7 +4432,7 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({ })); var $snbutton = self.$buttonpane.find(".oe_abstractformpopup-form-save-new"); $snbutton.click(function() { - $.when(self.view_form.do_save()).then(function() { + $.when(self.view_form.save()).then(function() { self.view_form.reload_mutex.exec(function() { self.view_form.on_button_new(); }); @@ -4440,7 +4440,7 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({ }); var $sbutton = self.$buttonpane.find(".oe_abstractformpopup-form-save"); $sbutton.click(function() { - $.when(self.view_form.do_save()).then(function() { + $.when(self.view_form.save()).then(function() { self.view_form.reload_mutex.exec(function() { self.check_exit(); }); diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js index fe0f525fe3f..4bf61895a09 100644 --- a/addons/web/static/src/js/view_list_editable.js +++ b/addons/web/static/src/js/view_list_editable.js @@ -724,7 +724,7 @@ openerp.web.list_editable = function (instance) { save: function () { var self = this; return this.form - .do_save(this.delegate.prepends_on_create()) + .save(this.delegate.prepends_on_create()) .pipe(function (result) { var created = result.created && !self.record.id; if (created) { diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js index 6d3e2818b49..63dc864c916 100644 --- a/addons/web_view_editor/static/src/js/view_editor.js +++ b/addons/web_view_editor/static/src/js/view_editor.js @@ -1017,7 +1017,7 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({ controller.on("on_button_cancel", self, function(){ action_manager.destroy(); }); - controller.on("form_save", self, function(){ + controller.on("save", self, function(){ action_manager.destroy(); var value =controller.fields.name.get('value'); self.add_node_dialog.$el.find('select[id=field_value]').append($("").attr("value",value).text(value)); From 31a42989a7e35641d4241c3c88e846c8d71dcfa5 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Fri, 12 Oct 2012 14:19:00 +0530 Subject: [PATCH 30/38] [IMP]Improve Code bzr revid: vja@tinyerp.com-20121012084900-zja87nszeh3q1ree --- addons/web/static/src/js/view_form.js | 2 +- addons/web_diagram/static/src/js/diagram.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 75ab275d80b..55b5434d1c5 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -433,7 +433,6 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM }, execute_pager_action: function(action) { if (this.can_be_discarded()) { - this.trigger('pager_action_executed'); switch (action) { case 'first': this.dataset.index = 0; @@ -449,6 +448,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM break; } this.reload(); + this.trigger('pager_action_executed'); } }, init_pager: function() { diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js index f9a6bac812f..572a91c019e 100644 --- a/addons/web_diagram/static/src/js/diagram.js +++ b/addons/web_diagram/static/src/js/diagram.js @@ -348,7 +348,7 @@ instance.web.DiagramView = instance.web.View.extend({ }); }, - on_pager_action: function(action) { + execute_pager_action: function(action) { switch (action) { case 'first': this.dataset.index = 0; @@ -381,7 +381,7 @@ instance.web.DiagramView = instance.web.View.extend({ do_show: function() { this.do_push_state({}); - return $.when(this._super(), this.on_pager_action('reload')); + return $.when(this._super(), this.execute_pager_action('reload')); } }); }; From f5216c706ae47ba23d265121f101e9d78d3f1407 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Fri, 12 Oct 2012 14:24:17 +0530 Subject: [PATCH 31/38] [FIX]move the trigger function bzr revid: vja@tinyerp.com-20121012085417-rrql4iyrevscyt80 --- addons/web/static/src/js/views.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 4172344c66e..e6439c28efe 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -532,12 +532,12 @@ instance.web.ViewManager = instance.web.Widget.extend({ this.views[view_type].controller = controller; this.views[view_type].deferred.resolve(view_type); return $.when(view_promise).then(function() { - self.trigger("controller_inited",view_type,controller); if (self.searchview && self.flags.auto_search && view.controller.searchable !== false) { self.searchview.ready.then(self.searchview.do_search); } + self.trigger("controller_inited",view_type,controller); }); }, set_title: function(title) { From d17b33aea6cf3a198eb243a281e4feea48f22a6a Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 12 Oct 2012 11:06:44 +0200 Subject: [PATCH 32/38] [FIX] problem with field reference bzr revid: nicolas.vanhoren@openerp.com-20121012090644-8wy3z4mr6080oa7b --- addons/web/static/src/js/view_form.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 963aafc1db8..fe49dc1b514 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -1660,6 +1660,8 @@ instance.web.form.FormDialog = instance.web.Dialog.extend({ }); instance.web.form.compute_domain = function(expr, fields) { + if (! (expr instanceof Array)) + return !! expr; var stack = []; for (var i = expr.length - 1; i >= 0; i--) { var ex = expr[i]; @@ -4638,6 +4640,7 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(instan destroy_content: function() { if (this.fm) { this.fm.destroy(); + this.fm = undefined; } }, initialize_content: function() { @@ -4659,9 +4662,7 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(instan modifiers: JSON.stringify({readonly: this.get('effective_readonly')}), }}); this.selection.on("change:value", this, this.on_selection_changed); - this.selection.setElement(this.$(".oe_form_view_reference_selection")); - this.selection.renderElement(); - this.selection.start(); + this.selection.appendTo(this.$(".oe_form_view_reference_selection")); this.selection .on('focused', null, function () {self.trigger('focused')}) .on('blurred', null, function () {self.trigger('blurred')}); @@ -4671,9 +4672,7 @@ instance.web.form.FieldReference = instance.web.form.AbstractField.extend(instan modifiers: JSON.stringify({readonly: this.get('effective_readonly')}), }}); this.m2o.on("change:value", this, this.data_changed); - this.m2o.setElement(this.$(".oe_form_view_reference_m2o")); - this.m2o.renderElement(); - this.m2o.start(); + this.m2o.appendTo(this.$(".oe_form_view_reference_m2o")); this.m2o .on('focused', null, function () {self.trigger('focused')}) .on('blurred', null, function () {self.trigger('blurred')}); From 942ca6cf164e0faf3f2b75c712c916f91ebf6a3a Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Fri, 12 Oct 2012 15:57:28 +0530 Subject: [PATCH 33/38] [IMP] bzr revid: vme@tinyerp.com-20121012102728-coosthdgxz17z20q --- addons/web/static/src/js/view_form.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index d03c95d6192..a7026a7181e 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2378,7 +2378,10 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({ var self = this; this.$input = this.$el.find('input.oe_datepicker_master'); this.$input_picker = this.$el.find('input.oe_datepicker_container'); - this.$input.change(this.on_change); + this.$input.change(function(){ + self.datetime_changed(); + }); + this.picker({ onClose: this.on_picker_select, onSelect: this.on_picker_select, @@ -2446,11 +2449,11 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({ format_client: function(v) { return instance.web.format_value(v, {"widget": this.type_of_date}); }, - on_change: function() { - this.trigger('datetime_on_change'); + datetime_changed: function() { if (this.is_valid_()) { this.set_value_from_ui_(); } + this.trigger("datetime_changed"); } }); @@ -2473,7 +2476,7 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(instanc initialize_content: function() { if (!this.get("effective_readonly")) { this.datewidget = this.build_widget(); - this.datewidget.on('datetime_on_change', this,_.bind(function() { + this.datewidget.on('datetime_changed', this, _.bind(function() { this.set({'value': this.datewidget.get_value()}); }, this)); this.datewidget.appendTo(this.$el); From 0602cd5748c46582175109208af58e40af96bb59 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Fri, 12 Oct 2012 16:01:04 +0530 Subject: [PATCH 34/38] [IMP]trigger event when date is valid. bzr revid: vme@tinyerp.com-20121012103104-pe3w6qs02nygfyb7 --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index a7026a7181e..fa8b8713a8f 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2452,8 +2452,8 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({ datetime_changed: function() { if (this.is_valid_()) { this.set_value_from_ui_(); + this.trigger("datetime_changed"); } - this.trigger("datetime_changed"); } }); From db64cf70977a774ca5890ace6fb119bccadb4f7f Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Fri, 12 Oct 2012 15:01:40 +0200 Subject: [PATCH 35/38] [FIX] Fixed naming related to datetime widget changes. bzr revid: vta@openerp.com-20121012130140-a1nzawstkgy8a9lx --- addons/web/static/src/js/view_form.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 983dd5e6f82..ee790d8f94a 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2380,7 +2380,7 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({ this.$input = this.$el.find('input.oe_datepicker_master'); this.$input_picker = this.$el.find('input.oe_datepicker_container'); this.$input.change(function(){ - self.datetime_changed(); + self.change_datetime(); }); this.picker({ @@ -2450,7 +2450,7 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({ format_client: function(v) { return instance.web.format_value(v, {"widget": this.type_of_date}); }, - datetime_changed: function() { + change_datetime: function() { if (this.is_valid_()) { this.set_value_from_ui_(); this.trigger("datetime_changed"); From e70d879accfd93751fa6ecd7fea1acfd9cc7e4ef Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 12 Oct 2012 14:54:18 +0200 Subject: [PATCH 36/38] [FIX] add option to avoid actions to be pushed as state. Used for login and action extracted from hash. Full state of client actions is pushed. bzr revid: chs@openerp.com-20121012125418-jbw3iut85riepz47 --- addons/web/static/src/js/chrome.js | 9 ++++----- addons/web/static/src/js/views.js | 6 +++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index d7272d8d83f..2cf7ab4e5f8 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1021,15 +1021,13 @@ instance.web.WebClient = instance.web.Client.extend({ var state = $.bbq.getState(true); var action = { - 'type': 'ir.actions.client', - 'tag': 'login', - 'params': state + type: 'ir.actions.client', + tag: 'login', + _push_me: false, }; this.action_manager.do_action(action); this.action_manager.inner_widget.on('login_successful', this, function() { - this.do_push_state(state); - this._current_state = null; // ensure the state will be loaded this.show_application(); // will load the state we just pushed }); }, @@ -1105,6 +1103,7 @@ instance.web.WebClient = instance.web.Client.extend({ }); }); } else { + state._push_me = false; // no need to push state back... this.action_manager.do_load_state(state, !!this._current_state); } } diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 47a06e37ddc..cb4f440110d 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -164,6 +164,10 @@ instance.web.ActionManager = instance.web.Widget.extend({ state = state || {}; if (this.getParent() && this.getParent().do_push_state) { if (this.inner_action) { + if (this.inner_action._push_me === false) { + // this action has been explicitly marked as not pushable + return; + } state['title'] = this.inner_action.name; if(this.inner_action.type == 'ir.actions.act_window') { state['model'] = this.inner_action.res_model; @@ -172,7 +176,7 @@ instance.web.ActionManager = instance.web.Widget.extend({ state['action'] = this.inner_action.id; } else if (this.inner_action.type == 'ir.actions.client') { state['action'] = this.inner_action.tag; - //state = _.extend(this.inner_action.params || {}, state); + state = _.extend(this.inner_action.params || {}, state); } } if(!this.dialog) { From 40d2a376ca8e6ea7c66ebf77a13b11f48257977e Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 12 Oct 2012 15:01:40 +0200 Subject: [PATCH 37/38] [IMP] help debugging xhr calls bzr revid: chs@openerp.com-20121012130140-qgi8ret2oxoeko6d --- addons/web/static/src/js/data.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index ce85e0ac43f..8338ce8c7c0 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -280,7 +280,8 @@ instance.web.Model = instance.web.Class.extend({ kwargs = args; args = []; } - return instance.session.rpc('/web/dataset/call_kw', { + var debug = instance.session.debug ? '/'+this.name+':'+method : ''; + return instance.session.rpc('/web/dataset/call_kw' + debug, { model: this.name, method: method, args: args, From 49c1c88962dbd4c47fefa33d190a8a6ff6b940c2 Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Fri, 12 Oct 2012 15:10:44 +0200 Subject: [PATCH 38/38] [FIX] Fixed naming related to selected_elements. bzr revid: vta@openerp.com-20121012131044-w4afp0shefzwlo7t --- addons/web/static/src/js/view_form.js | 20 ++++++++++---------- addons/web_diagram/static/src/js/diagram.js | 4 ++-- addons/web_gantt/static/src/js/gantt.js | 2 +- addons/web_kanban/static/src/js/kanban.js | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index ee790d8f94a..266092ebdfe 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2881,7 +2881,7 @@ instance.web.form.CompletionFieldMixin = { self.build_domain(), new instance.web.CompoundContext(self.build_context(), context || {}) ); - pop.on("select_elements",self,function(element_ids) { + pop.on("elements_selected", self, function(element_ids) { self.add_id(element_ids[0]); self.focus(); }); @@ -3600,7 +3600,7 @@ instance.web.form.One2ManyViewManager = instance.web.ViewManager.extend({ form_view_options: {'not_interactible_on_create':true}, readonly: self.o2m.get("effective_readonly") }); - pop.on("select_elements", self, function() { + pop.on("elements_selected", self, function() { self.o2m.reload_current_view(); }); }, @@ -3686,7 +3686,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({ self.o2m.build_domain(), self.o2m.build_context() ); - pop.on("select_elements", self, function() { + pop.on("elements_selected", self, function() { self.o2m.reload_current_view(); }); } @@ -4123,7 +4123,7 @@ instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends in this.m2m_field.build_context() ); var self = this; - pop.on("select_elements", self, function(element_ids) { + pop.on("elements_selected", self, function(element_ids) { _.each(element_ids, function(one_id) { if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) { self.dataset.set_ids([].concat(self.dataset.ids, [one_id])); @@ -4238,7 +4238,7 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend( new instance.web.CompoundDomain(this.build_domain(), ["!", ["id", "in", this.dataset.ids]]), this.build_context() ); - pop.on("select_elements", self, function(element_ids) { + pop.on("elements_selected", self, function(element_ids) { _.each(element_ids, function(one_id) { if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) { self.dataset.set_ids([].concat(self.dataset.ids, [one_id])); @@ -4458,12 +4458,12 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({ self.view_form.do_show(); }); }, - elements_selected: function(element_ids) { - this.trigger("select_elements",element_ids); + select_elements: function(element_ids) { + this.trigger("elements_selected", element_ids); }, check_exit: function(no_destroy) { if (this.created_elements.length > 0) { - this.elements_selected(this.created_elements); + this.select_elements(this.created_elements); this.created_elements = []; } this.destroy(); @@ -4574,7 +4574,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend }); var $sbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-select"); $sbutton.click(function() { - self.elements_selected(self.selected_ids); + self.select_elements(self.selected_ids); self.destroy(); }); }); @@ -4616,7 +4616,7 @@ instance.web.form.SelectCreateListView = instance.web.ListView.extend({ this.popup.new_object(); }, select_record: function(index) { - this.popup.elements_selected([this.dataset.ids[index]]); + this.popup.select_elements([this.dataset.ids[index]]); this.popup.destroy(); }, do_select: function(ids, records) { diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js index 8672c9a0742..4bae1aed3db 100644 --- a/addons/web_diagram/static/src/js/diagram.js +++ b/addons/web_diagram/static/src/js/diagram.js @@ -273,7 +273,7 @@ instance.web.DiagramView = instance.web.View.extend({ self.dataset.domain, self.context || self.dataset.context ); - pop.on("select_elements", self, function(element_ids) { + pop.on("elements_selected", self, function(element_ids) { self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_diagram_loaded); }); @@ -325,7 +325,7 @@ instance.web.DiagramView = instance.web.View.extend({ this.dataset.domain, this.context || this.dataset.context ); - pop.on("select_elements", self, function(element_ids) { + pop.on("elements_selected", self, function(element_ids) { self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_diagram_loaded); }); // We want to destroy the dummy edge after a creation cancel. This destroys it even if we save the changes. diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js index 32bfea8e212..01de4f69b61 100644 --- a/addons/web_gantt/static/src/js/gantt.js +++ b/addons/web_gantt/static/src/js/gantt.js @@ -222,7 +222,7 @@ instance.web_gantt.GanttView = instance.web.View.extend({ on_task_create: function() { var self = this; var pop = new instance.web.form.SelectCreatePopup(this); - pop.on("select_elements", self, function() { + pop.on("elements_selected", self, function() { self.reload(); }); pop.select_element( diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 37aea87e50e..d884fa6e6a2 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1067,7 +1067,7 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({ [], {"default_name": self.$input.val()} ); - pop.on("select_elements", self, function(element_ids) { + pop.on("elements_selected", self, function(element_ids) { self.$input.val(""); self.trigger('added', element_ids[0]); });