From de19be82671fc2aa4c02afcdde8b4cbffe795b28 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Tue, 12 Oct 2010 16:05:39 +0530 Subject: [PATCH 01/50] [ADD] Event: Demo for registration bzr revid: mra@mra-laptop-20101012103539-fa1f1zm02xs9o83y --- addons/event/event_demo.xml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml index 4603a9cf141..a82b0ac9a0f 100644 --- a/addons/event/event_demo.xml +++ b/addons/event/event_demo.xml @@ -91,5 +91,38 @@ + + + + + + + 5 + Ticket for Opera + 24.00 + + + + + + + 10 + Ticket for Opera + 24.00 + + + + + + + + + 6 + Ticket for Concert + 15.50 + + + + From 4f608437ec8d9d71c91fdc25388931f93899888b Mon Sep 17 00:00:00 2001 From: vra Date: Tue, 12 Oct 2010 16:22:58 +0530 Subject: [PATCH 02/50] [ADD][IMP] account_analytic_plan: added m2o for analytic distribution and replace this with the reference of analytic account object m2o and small improvement in account view. bzr revid: vra@tinyerp.com-20101012105258-dwxrql2esxp5fss9 --- addons/account/account_view.xml | 2 +- .../account_analytic_plans.py | 42 +++++++++ .../account_analytic_plans_view.xml | 88 +++++++++++++++---- 3 files changed, 114 insertions(+), 18 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 6612f628292..d4d17df3a7a 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1471,7 +1471,7 @@ - + diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py index 0e3ec4b33ca..fa3e4a24635 100644 --- a/addons/account_analytic_plans/account_analytic_plans.py +++ b/addons/account_analytic_plans/account_analytic_plans.py @@ -336,6 +336,10 @@ class account_move_line(osv.osv): analytic_line_obj.create(cr, uid, al_vals, context=context) return True + def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False): + result = super(osv.osv, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu) + return result + account_move_line() class account_invoice(osv.osv): @@ -425,4 +429,42 @@ class sale_order_line(osv.osv): sale_order_line() + +class account_bank_statement(osv.osv): + _inherit = "account.bank.statement" + _name = "account.bank.statement" + + def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, st_line_number, context=None): + account_move_line_pool = self.pool.get('account.move.line') + account_bank_statement_line_pool = self.pool.get('account.bank.statement.line') + st_line = account_bank_statement_line_pool.browse(cr, uid, st_line_id, context) + result = super(account_bank_statement,self).create_move_from_st_line(cr, uid, st_line_id, company_currency_id, st_line_number, context=context) + move = st_line.move_ids and st_line.move_ids[0] or False + if move: + for line in move.line_id: + account_move_line_pool.write(cr, uid, [line.id], {'analytics_id':st_line.analytics_id.id}, context=context) + return result + + def button_confirm_bank(self, cr, uid, ids, context=None): + super(account_bank_statement,self).button_confirm_bank(cr, uid, ids, context=context) + for st in self.browse(cr, uid, ids, context): + for st_line in st.line_ids: + if st_line.analytics_id: + if not st.journal_id.analytic_journal_id: + raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (st.journal_id.name,)) + if not st_line.amount: + continue + return True + +account_bank_statement() + + +class account_bank_statement_line(osv.osv): + _inherit = "account.bank.statement.line" + _name = "account.bank.statement.line" + _columns = { + 'analytics_id': fields.many2one('account.analytic.plan.instance', 'Analytic Distribution'), + } +account_bank_statement_line() + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml index 1b3a6c8987a..a09b69df442 100644 --- a/addons/account_analytic_plans/account_analytic_plans_view.xml +++ b/addons/account_analytic_plans/account_analytic_plans_view.xml @@ -16,17 +16,19 @@ - - - account.move.form.inherit - account.move - form - - - - - - + + account.move.form.inherit + account.move + form + + + + + + + + + @@ -44,12 +46,37 @@ form - - + + + + account.move.line.form.inherit1 + account.move.line + form + 2 + + + + + + + + + + account.move.line.tree.inherit + account.move.line + tree + 2 + + + + + + + @@ -60,7 +87,7 @@ form - + @@ -73,7 +100,7 @@ 2 - + @@ -92,11 +119,11 @@
- + - + @@ -258,5 +285,32 @@ + + account.bank.statement.form.inherit + account.bank.statement + form + + + + + + + + + + + + + account.bank.statement.form.inherit_1 + account.bank.statement + form + + + + + + + + From ed0ccd6c3bf360b60ba6024b7f945e3f92af74ec Mon Sep 17 00:00:00 2001 From: vth Date: Tue, 12 Oct 2010 17:23:15 +0530 Subject: [PATCH 03/50] [IMP] account_analytic_default : add group by and filter in search view bzr revid: vth@tinyerp.com-20101012115315-adg21e4peyc3yhba --- addons/account/project/project_view.xml | 2 ++ .../account_analytic_default.py | 16 ++++++++-------- .../account_analytic_default_view.xml | 17 ++++++++++++++++- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 809f69673fe..6795ae6a0f8 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -14,6 +14,8 @@ + + diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py index ebc78956a93..b41c9b9e5d2 100644 --- a/addons/account_analytic_default/account_analytic_default.py +++ b/addons/account_analytic_default/account_analytic_default.py @@ -29,14 +29,14 @@ class account_analytic_default(osv.osv): _rec_name = "analytic_id" _order = "sequence" _columns = { - 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of analytic distribution."), - 'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'), - 'product_id': fields.many2one('product.product', 'Product', ondelete='cascade'), - 'partner_id': fields.many2one('res.partner', 'Partner', ondelete='cascade'), - 'user_id': fields.many2one('res.users', 'User', ondelete='cascade'), - 'company_id': fields.many2one('res.company', 'Company', ondelete='cascade'), - 'date_start': fields.date('Start Date'), - 'date_stop': fields.date('End Date'), + 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of analytic distribution"), + 'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account' , help="Analytical Account"), + 'product_id': fields.many2one('product.product', 'Product', ondelete='cascade', help="select a product which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this product, it will automatically take this as an analytical account)"), + 'partner_id': fields.many2one('res.partner', 'Partner', ondelete='cascade', help="select a partner which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this partner, it will automatically take this as an analytical account)"), + 'user_id': fields.many2one('res.users', 'User', ondelete='cascade', help="select a user which will use analytical account specified in analytic default"), + 'company_id': fields.many2one('res.company', 'Company', ondelete='cascade', help="select a company which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this company, it will automatically take this as an analytical account)"), + 'date_start': fields.date('Start Date', help="Default start date for this Analytical Account"), + 'date_stop': fields.date('End Date', help="Default end date for this Analytical Account"), } def account_get(self, cr, uid, product_id=None, partner_id=None, user_id=None, date=None, context=None): diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml index 5aad1f3521d..02e734733a6 100644 --- a/addons/account_analytic_default/account_analytic_default_view.xml +++ b/addons/account_analytic_default/account_analytic_default_view.xml @@ -6,7 +6,7 @@ account.analytic.default tree - + @@ -44,11 +44,25 @@ search + + + + + + + + + + + + + + @@ -59,6 +73,7 @@ form tree,form + {"search_default_current":1} Date: Tue, 12 Oct 2010 17:45:34 +0530 Subject: [PATCH 04/50] [IMP]hr_payroll: replaced ' ' instead of '0.0' in employee detail and yearly salary reports. bzr revid: vra@tinyerp.com-20101012121534-v4dre24uck5c3knk --- .../report/report_employees_detail.py | 9 +- .../report/report_employees_detail.rml | 98 +++++++++---------- .../hr_payroll/report/report_year_report.rml | 50 +++++----- .../hr_payroll/report/report_year_salary.py | 21 ++-- 4 files changed, 92 insertions(+), 86 deletions(-) diff --git a/addons/hr_payroll/report/report_employees_detail.py b/addons/hr_payroll/report/report_employees_detail.py index efa4c1ee236..67481dc1a7d 100644 --- a/addons/hr_payroll/report/report_employees_detail.py +++ b/addons/hr_payroll/report/report_employees_detail.py @@ -192,8 +192,13 @@ class employees_salary_report(rml_parse.rml_parse): append_index = len(result) - 1 tot += line.total else: - result.append(0.00) - res[mnth] = 0.00 + if mnth == 'None': + result.append('') + res[mnth] = '' + self.month_total_list[cnt] = '' + else: + result.append(0.00) + res[mnth] = 0.00 if not res: result.append(0.00) res = {} diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml index 542e370eb34..6d8e6b18fc8 100644 --- a/addons/hr_payroll/report/report_employees_detail.rml +++ b/addons/hr_payroll/report/report_employees_detail.rml @@ -408,40 +408,40 @@ [[ e1[0] ]] - [[ formatLang(e1[1]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e1[1]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[2]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e1[2]) or removeParentNode('para')]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[3]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e1[3]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[4]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e1[4]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[5]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e1[5]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[6]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e1[6]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[7]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e1[7]) or removeParentNode('para')]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[8]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e1[8]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[9]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e1[9]) or removeParentNode('para')]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[10]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e1[10]) or removeParentNode('para')]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[11]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e1[11]) or removeParentNode('para')]] [[ company.currency_id.symbol ]] - [[ formatLang(e1[12]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e1[12]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]] [[ formatLang(e1[13]) ]] [[ company.currency_id.symbol ]] @@ -464,40 +464,40 @@ [[ e2[0] ]] - [[ formatLang(e2[1]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e2[1]) or removeParentNode('para')]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[2]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e2[2]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[3]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e2[3]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[4]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e2[4]) or removeParentNode('para')]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[5]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e2[5]) or removeParentNode('para')]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[6]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e2[6]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[7]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e2[7]) or removeParentNode('para')]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[8]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e2[8]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[9]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e2[9]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[10]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e2[10]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[11]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e2[11]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]] - [[ formatLang(e2[12]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e2[12]) or removeParentNode('para')]] [[ company.currency_id.symbol ]] [[ formatLang(e2[13]) ]] [[ company.currency_id.symbol ]] @@ -520,40 +520,40 @@ [[ e3[0] ]] - [[ formatLang(e3[1]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e3[1]) or removeParentNode('para') ]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[2]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e3[2]) or removeParentNode('para')]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[3]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e3[3]) or removeParentNode('para')]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[4]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e3[4]) or removeParentNode('para')]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[5]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e3[5]) or removeParentNode('para')]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[6]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e3[6]) or removeParentNode('para')]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[7]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e3[7]) or removeParentNode('para')]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[8]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e3[8]) or removeParentNode('para')]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[9]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e3[9]) or removeParentNode('para')]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[10]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e3[10]) or removeParentNode('para')]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[11]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e3[11]) or removeParentNode('para')]] [[ company.currency_id.symbol ]] - [[ formatLang(e3[12]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e3[12]) or removeParentNode('para')]] [[ company.currency_id.symbol ]] [[ formatLang(e3[13]) ]] [[ company.currency_id.symbol ]] @@ -568,40 +568,40 @@ [[ get_monthly_total()[0] ]] - [[ formatLang(get_monthly_total()[1]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[1]) or removeParentNode('para') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[2]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[2]) or removeParentNode('para') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[3]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[3]) or removeParentNode('para') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[4]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[4]) or removeParentNode('para') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[5]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[5]) or removeParentNode('para') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[6]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[6]) or removeParentNode('para') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[7]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[7]) or removeParentNode('para') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[8]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[8]) or removeParentNode('para') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[9]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[9]) or removeParentNode('para') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[10]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[10]) or removeParentNode('para') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[11]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[11]) or removeParentNode('para') ]][[ company.currency_id.symbol ]] - [[ formatLang(get_monthly_total()[12]) ]][[ company.currency_id.symbol ]] + [[ formatLang(get_monthly_total()[12]) or removeParentNode('para') ]][[ company.currency_id.symbol ]] [[ formatLang(get_total()) ]][[ company.currency_id.symbol ]] @@ -616,4 +616,4 @@ - \ No newline at end of file + diff --git a/addons/hr_payroll/report/report_year_report.rml b/addons/hr_payroll/report/report_year_report.rml index 212bb59e7b3..da988e94f7e 100755 --- a/addons/hr_payroll/report/report_year_report.rml +++ b/addons/hr_payroll/report/report_year_report.rml @@ -201,40 +201,40 @@ [[ e[0] ]] - [[ formatLang(e[1]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[1]) or removeParentNode('para') ]] [[company.currency_id.symbol]] - [[ formatLang(e[2]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[2]) or removeParentNode('para') ]] [[company.currency_id.symbol]] - [[ formatLang(e[3]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[3]) or removeParentNode('para')]] [[company.currency_id.symbol]] - [[ formatLang(e[4]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[4]) or removeParentNode('para') ]] [[company.currency_id.symbol]] - [[ formatLang(e[5]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[5]) or removeParentNode('para')]] [[company.currency_id.symbol]] - [[ formatLang(e[6]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[6]) or removeParentNode('para')]] [[company.currency_id.symbol]] - [[ formatLang(e[7]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[7]) or removeParentNode('para')]] [[company.currency_id.symbol]] - [[ formatLang(e[8]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[8]) or removeParentNode('para')]] [[company.currency_id.symbol]] - [[ formatLang(e[9]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[9]) or removeParentNode('para')]] [[company.currency_id.symbol]] - [[ formatLang(e[10]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[10]) or removeParentNode('para')]] [[company.currency_id.symbol]] - [[ formatLang(e[11]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[11]) or removeParentNode('para')]] [[company.currency_id.symbol]] - [[ formatLang(e[12]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[12]) or removeParentNode('para')]] [[company.currency_id.symbol]] [[ formatLang(e[13]) ]] [[company.currency_id.symbol]] @@ -251,40 +251,40 @@ Total - [[ formatLang(t[1]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[1]) or removeParentNode('para') ]] [[company.currency_id.symbol]] - [[ formatLang(t[2]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[2]) or removeParentNode('para')]] [[company.currency_id.symbol]] - [[ formatLang(t[3]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[3]) or removeParentNode('para')]] [[company.currency_id.symbol]] - [[ formatLang(t[4]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[4]) or removeParentNode('para')]] [[company.currency_id.symbol]] - [[ formatLang(t[5]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[5]) or removeParentNode('para')]] [[company.currency_id.symbol]] - [[ formatLang(t[6]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[6]) or removeParentNode('para')]] [[company.currency_id.symbol]] - [[ formatLang(t[7]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[7]) or removeParentNode('para')]] [[company.currency_id.symbol]] - [[ formatLang(t[8]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[8]) or removeParentNode('para')]] [[company.currency_id.symbol]] - [[ formatLang(t[9]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[9]) or removeParentNode('para')]] [[company.currency_id.symbol]] - [[ formatLang(t[10]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[10]) or removeParentNode('para')]] [[company.currency_id.symbol]] - [[ formatLang(t[11]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[11]) or removeParentNode('para')]] [[company.currency_id.symbol]] - [[ formatLang(t[12]) ]] [[company.currency_id.symbol]] + [[ formatLang(t[12]) or removeParentNode('para')]] [[company.currency_id.symbol]] [[ formatLang(get_total()) ]] [[company.currency_id.symbol]] @@ -296,4 +296,4 @@ - \ No newline at end of file + diff --git a/addons/hr_payroll/report/report_year_salary.py b/addons/hr_payroll/report/report_year_salary.py index 0a7857582d4..2db2d7d7e2d 100755 --- a/addons/hr_payroll/report/report_year_salary.py +++ b/addons/hr_payroll/report/report_year_salary.py @@ -67,17 +67,16 @@ class year_salary_report(rml_parse.rml_parse): query = "select net from hr_payslip where employee_id = "+str(emp_id.id)+" and to_char(date,'mm-yyyy') like '%"+mnth+"%' and state = 'done' " self.cr.execute(query) sal = self.cr.fetchall() + if sal: + ls1.append(sal[0][0]) + tol += sal[0][0] + tol_mnths[cnt] = tol_mnths[cnt] + sal[0][0] + else: + ls1.append(0.00) + tol_mnths[cnt] = 0.0 else: - sal = [(0.0,)] - try: - ls1.append(sal[0][0]) - except: - ls1.append(0) - try: - tol += sal[0][0] - tol_mnths[cnt] = tol_mnths[cnt] + sal[0][0] - except: - tol += 0 + ls1.append('') + tol_mnths[cnt] = '' cnt = cnt + 1 cnt = 1 ls1.append(tol) @@ -92,6 +91,8 @@ class year_salary_report(rml_parse.rml_parse): def get_total(self): for item in self.mnths_tol: for count in range(1,len(item)): + if item[count] == '': + continue self.total += item[count] return self.total From cb9c10692c3a1345c0af3ade9deb3d62b0bd0e02 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Tue, 12 Oct 2010 18:01:26 +0530 Subject: [PATCH 05/50] [REF] bzr revid: mra@mra-laptop-20101012123126-4j4da4oip5cv9wlk --- addons/event/event.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/event/event.py b/addons/event/event.py index 5c510ede613..04e38594af0 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -19,10 +19,11 @@ # ############################################################################## +import time + from crm import crm from osv import fields, osv from tools.translate import _ -import time import tools import decimal_precision as dp @@ -34,6 +35,7 @@ class event_type(osv.osv): _columns = { 'name': fields.char('Event type', size=64, required=True), } + event_type() class event_event(osv.osv): @@ -714,5 +716,4 @@ class event_registration_badge(osv.osv): } event_registration_badge() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file From d3e0e55823157b309817487d3578051fe9271c9c Mon Sep 17 00:00:00 2001 From: vth Date: Tue, 12 Oct 2010 18:20:12 +0530 Subject: [PATCH 06/50] [IMP] event : in dashboard replace the 'unpaid invoice' with a list of 'unconfirmed registration' bzr revid: vth@tinyerp.com-20101012125012-1exazwxmfn8uegjt --- addons/event/board_association_view.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml index 6b223b2c4d0..6fe9638c6b6 100644 --- a/addons/event/board_association_view.xml +++ b/addons/event/board_association_view.xml @@ -49,18 +49,16 @@ name="%(act_event_view)d" colspan="4"/> + domain="[('state','=','draft')]"/> - - From d3ec53d235c471149ef8e4353d01db526f00e03a Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Tue, 12 Oct 2010 18:20:50 +0530 Subject: [PATCH 07/50] [IMP] account_budget: Remove object account.budget.post.dotation and Report correction bzr revid: psi@tinyerp.co.in-20101012125050-j9vpgsg2y6cw9i4j --- addons/account_budget/__openerp__.py | 2 - addons/account_budget/account_budget.py | 61 +--- addons/account_budget/account_budget_demo.xml | 149 ---------- addons/account_budget/account_budget_view.xml | 24 -- addons/account_budget/i18n/account_budget.pot | 35 +-- addons/account_budget/i18n/ar.po | 35 +-- addons/account_budget/i18n/bg.po | 35 +-- addons/account_budget/i18n/bs.po | 35 +-- addons/account_budget/i18n/ca.po | 35 +-- addons/account_budget/i18n/cs.po | 35 +-- addons/account_budget/i18n/de.po | 35 +-- addons/account_budget/i18n/el.po | 35 +-- addons/account_budget/i18n/es.po | 35 +-- addons/account_budget/i18n/es_AR.po | 35 +-- addons/account_budget/i18n/es_EC.po | 35 +-- addons/account_budget/i18n/et.po | 35 +-- addons/account_budget/i18n/fi.po | 35 +-- addons/account_budget/i18n/fr.po | 35 +-- addons/account_budget/i18n/gl.po | 35 +-- addons/account_budget/i18n/hi.po | 35 +-- addons/account_budget/i18n/hr.po | 35 +-- addons/account_budget/i18n/hu.po | 35 +-- addons/account_budget/i18n/id.po | 35 +-- addons/account_budget/i18n/it.po | 35 +-- addons/account_budget/i18n/ko.po | 35 +-- addons/account_budget/i18n/lt.po | 35 +-- addons/account_budget/i18n/nl.po | 35 +-- addons/account_budget/i18n/nl_BE.po | 35 +-- addons/account_budget/i18n/oc.po | 35 +-- addons/account_budget/i18n/pl.po | 35 +-- addons/account_budget/i18n/pt.po | 35 +-- addons/account_budget/i18n/pt_BR.po | 35 +-- addons/account_budget/i18n/ro.po | 35 +-- addons/account_budget/i18n/ru.po | 35 +-- addons/account_budget/i18n/sl.po | 35 +-- addons/account_budget/i18n/sq.po | 35 +-- addons/account_budget/i18n/sv.po | 35 +-- addons/account_budget/i18n/tlh.po | 35 +-- addons/account_budget/i18n/tr.po | 35 +-- addons/account_budget/i18n/uk.po | 35 +-- addons/account_budget/i18n/vi.po | 35 +-- addons/account_budget/i18n/zh_CN.po | 35 +-- addons/account_budget/i18n/zh_TW.po | 35 +-- addons/account_budget/report/budget_report.py | 187 +++++++++--- .../account_budget/report/budget_report.rml | 272 ++++++------------ .../security/ir.model.access.csv | 1 - addons/account_budget/wizard/__init__.py | 2 - .../account_budget_crossovered_report.py | 8 +- .../wizard/account_budget_report.py | 17 +- .../wizard/account_budget_report_view.xml | 76 ++--- .../wizard/account_budget_spread.py | 43 --- .../wizard/account_budget_spread_view.xml | 36 --- 52 files changed, 325 insertions(+), 1918 deletions(-) delete mode 100644 addons/account_budget/wizard/account_budget_spread.py delete mode 100644 addons/account_budget/wizard/account_budget_spread_view.xml diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py index dfe1640a290..d73efdce399 100644 --- a/addons/account_budget/__openerp__.py +++ b/addons/account_budget/__openerp__.py @@ -49,13 +49,11 @@ Three reports are available: 'update_xml': [ 'security/ir.model.access.csv', 'security/account_budget_security.xml', - 'wizard/account_budget_spread_view.xml', 'account_budget_view.xml', 'account_budget_report.xml', 'account_budget_workflow.xml', 'wizard/account_budget_analytic_view.xml', 'wizard/account_budget_report_view.xml', - 'wizard/account_budget_spread_view.xml', 'wizard/account_budget_crossovered_summary_report_view.xml', 'wizard/account_budget_crossovered_report_view.xml', ], diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py index 8726eca929c..b85e089016e 100644 --- a/addons/account_budget/account_budget.py +++ b/addons/account_budget/account_budget.py @@ -34,12 +34,11 @@ def strToDate(dt): # Budgets # --------------------------------------------------------- class account_budget_post(osv.osv): - _name = 'account.budget.post' - _description = 'Budgetary Position' + _name = "account.budget.post" + _description = "Budgetary Position" _columns = { 'code': fields.char('Code', size=64, required=True), 'name': fields.char('Name', size=256, required=True), - 'dotation_ids': fields.one2many('account.budget.post.dotation', 'post_id', 'Spreading'), 'account_ids': fields.many2many('account.account', 'account_budget_rel', 'budget_id', 'account_id', 'Accounts'), 'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'general_budget_id', 'Budget Lines'), 'company_id': fields.many2one('res.company', 'Company', required=True), @@ -49,60 +48,8 @@ class account_budget_post(osv.osv): } _order = "name" - def spread(self, cr, uid, ids, fiscalyear_id=False, amount=0.0): - dobj = self.pool.get('account.budget.post.dotation') - obj_fiscalyear = self.pool.get('account.fiscalyear') - for o in self.browse(cr, uid, ids): - # delete dotations for this post - dobj.unlink(cr, uid, dobj.search(cr, uid, [('post_id','=',o.id)])) - - # create one dotation per period in the fiscal year, and spread the total amount/quantity over those dotations - fy = obj_fiscalyear.browse(cr, uid, [fiscalyear_id])[0] - num = len(fy.period_ids) - for p in fy.period_ids: - dobj.create(cr, uid, {'post_id': o.id, 'period_id': p.id, 'amount': amount/num}) - return True - account_budget_post() -class account_budget_post_dotation(osv.osv): - def _tot_planned(self, cr, uid, ids, name, args, context): - obj_budget_lines = self.pool.get('crossovered.budget.lines') - res = {} - for line in self.browse(cr, uid, ids): - if line.period_id: - obj_period = self.pool.get('account.period').browse(cr, uid, line.period_id.id) - - budget_id = line.post_id and line.post_id.id or False - query="SELECT id FROM crossovered_budget_lines WHERE \ - general_budget_id= %s AND (date_from >=%s AND date_from <= %s ) \ - OR (date_to >=%s AND date_to <= %s) OR (date_from < %s AND date_to > %s)" - cr.execute(query, (budget_id, obj_period.date_start, obj_period.date_stop, obj_period.date_start, obj_period.date_stop, obj_period.date_start, obj_period.date_stop,)) - res1 = cr.fetchall() - tot_planned = 0.00 - for record in res1: - obj_lines = obj_budget_lines.browse(cr, uid, record[0]) - count_days = min(strToDate(obj_period.date_stop), strToDate(obj_lines.date_to)) - max(strToDate(obj_period.date_start), strToDate(obj_lines.date_from)) - days_in_period = count_days.days + 1 - count_days = strToDate(obj_lines.date_to) - strToDate(obj_lines.date_from) - total_days_of_rec = count_days.days + 1 - tot_planned += obj_lines.planned_amount / total_days_of_rec * days_in_period - res[line.id] = tot_planned - else: - res[line.id] = 0.00 - return res - - _name = 'account.budget.post.dotation' - _description = "Budget Dotation" - _columns = { - 'name': fields.char('Name', size=64), - 'post_id': fields.many2one('account.budget.post', 'Item', select=True), - 'period_id': fields.many2one('account.period', 'Period'), - 'amount': fields.float('Amount', digits=(16,2)), - 'tot_planned': fields.function(_tot_planned, method=True, string='Total Planned Amount', type='float', store=True), - } - -account_budget_post_dotation() class crossovered_budget(osv.osv): _name = "crossovered.budget" @@ -252,10 +199,10 @@ class crossovered_budget_lines(osv.osv): crossovered_budget_lines() class account_analytic_account(osv.osv): - _inherit = 'account.analytic.account' + _inherit = "account.analytic.account" _columns = { - 'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'analytic_account_id', 'Budget Lines'), + 'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'analytic_account_id', 'Budget Lines'), } account_analytic_account() diff --git a/addons/account_budget/account_budget_demo.xml b/addons/account_budget/account_budget_demo.xml index 7c4c6e3ea15..c6218321b76 100644 --- a/addons/account_budget/account_budget_demo.xml +++ b/addons/account_budget/account_budget_demo.xml @@ -17,155 +17,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml index d6c4b82e960..a6e01c3405c 100644 --- a/addons/account_budget/account_budget_view.xml +++ b/addons/account_budget/account_budget_view.xml @@ -25,30 +25,6 @@ - - account.budget.post.dotation.form - account.budget.post.dotation - form - -
- - - - - -
- - account.budget.post.dotation.tree - account.budget.post.dotation - tree - - - - - - - - Budgetary Positions diff --git a/addons/account_budget/i18n/account_budget.pot b/addons/account_budget/i18n/account_budget.pot index e7da108f209..e710967ae40 100644 --- a/addons/account_budget/i18n/account_budget.pot +++ b/addons/account_budget/i18n/account_budget.pot @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01:51+0000\n" -"PO-Revision-Date: 2009-08-28 16:01:51+0000\n" +"PO-Revision-Date: 2009-10-12 13:20:51+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -62,11 +62,6 @@ msgstr "" msgid "Confirmed" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -261,7 +256,6 @@ msgstr "" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "" @@ -293,17 +287,6 @@ msgstr "" msgid "Budget" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -321,17 +304,6 @@ msgstr "" msgid "Cancelled" msgstr "" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -366,11 +338,6 @@ msgstr "" msgid "Code" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/ar.po b/addons/account_budget/i18n/ar.po index 81afee41f66..fb11bc9021f 100644 --- a/addons/account_budget/i18n/ar.po +++ b/addons/account_budget/i18n/ar.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-02-03 06:24+0000\n" +"PO-Revision-Date: 2010-10-12 13:24+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -64,11 +64,6 @@ msgstr "" msgid "Confirmed" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -270,7 +265,6 @@ msgstr "" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "" @@ -302,17 +296,6 @@ msgstr "" msgid "Budget" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -330,17 +313,6 @@ msgstr "" msgid "Cancelled" msgstr "" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -375,11 +347,6 @@ msgstr "" msgid "Code" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/bg.po b/addons/account_budget/i18n/bg.po index 43d9f2367f3..c01f8dfec8a 100644 --- a/addons/account_budget/i18n/bg.po +++ b/addons/account_budget/i18n/bg.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 21:01+0000\n" +"PO-Revision-Date: 2010-10-12 13:20+0000\n" "Last-Translator: lem0na \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -66,11 +66,6 @@ msgstr "" msgid "Confirmed" msgstr "Потвърдено" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Период" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -297,7 +292,6 @@ msgstr "Теоритично количество" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Име" @@ -329,17 +323,6 @@ msgstr "Редове" msgid "Budget" msgstr "Бюджет" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Обект" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Сума" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -357,17 +340,6 @@ msgstr "Бюджети" msgid "Cancelled" msgstr "Отказан" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "Парично дарение" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "Парични дарения" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -402,11 +374,6 @@ msgstr "Печат на бюджети" msgid "Code" msgstr "Код" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "Общо планирана сума" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/bs.po b/addons/account_budget/i18n/bs.po index 4e0fa8cc685..f0dfde2b822 100644 --- a/addons/account_budget/i18n/bs.po +++ b/addons/account_budget/i18n/bs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 21:01+0000\n" +"PO-Revision-Date: 2010-10-12 15:01+0000\n" "Last-Translator: adnan \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -65,11 +65,6 @@ msgstr "" msgid "Confirmed" msgstr "Potvrđeno" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Period" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -271,7 +266,6 @@ msgstr "Teoretski iznos" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Naziv" @@ -303,17 +297,6 @@ msgstr "Retci" msgid "Budget" msgstr "Proračun" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Stavka" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Iznos" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -331,17 +314,6 @@ msgstr "Proračuni" msgid "Cancelled" msgstr "Poništeno" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "Proračunska nadarbina" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "Proračunske nadarbine" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -376,11 +348,6 @@ msgstr "Ispis proračuna" msgid "Code" msgstr "Šifra" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "Ukupni planirani iznos" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/ca.po b/addons/account_budget/i18n/ca.po index e978bd4da7d..88d9587eb4d 100644 --- a/addons/account_budget/i18n/ca.po +++ b/addons/account_budget/i18n/ca.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-03 11:08+0000\n" +"PO-Revision-Date: 2010-10-12 15:08+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -66,11 +66,6 @@ msgstr "" msgid "Confirmed" msgstr "Confirmat" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Període" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -302,7 +297,6 @@ msgstr "Import teòric" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Nom" @@ -334,17 +328,6 @@ msgstr "Línies" msgid "Budget" msgstr "Pressupost" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Element" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Import" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -362,17 +345,6 @@ msgstr "Pressupostos" msgid "Cancelled" msgstr "Cancel·lat" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "Dotació al pressupost" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "Dotacions al pressupost" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -407,11 +379,6 @@ msgstr "Imprimeix pressupostos" msgid "Code" msgstr "Codi" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "Import total previst" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/cs.po b/addons/account_budget/i18n/cs.po index 76e41f4cc12..1d2c9264638 100644 --- a/addons/account_budget/i18n/cs.po +++ b/addons/account_budget/i18n/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-18 06:21+0000\n" +"PO-Revision-Date: 2010-10-12 15:21+0000\n" "Last-Translator: Kuvaly [LCT] \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -64,11 +64,6 @@ msgstr "" msgid "Confirmed" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Perioda" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -270,7 +265,6 @@ msgstr "" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Jméno" @@ -302,17 +296,6 @@ msgstr "" msgid "Budget" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -330,17 +313,6 @@ msgstr "" msgid "Cancelled" msgstr "" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -375,11 +347,6 @@ msgstr "" msgid "Code" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/de.po b/addons/account_budget/i18n/de.po index 5e78acf0545..78bd498e78f 100644 --- a/addons/account_budget/i18n/de.po +++ b/addons/account_budget/i18n/de.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 21:01+0000\n" +"PO-Revision-Date: 2010-10-12 15:01+0000\n" "Last-Translator: Ferdinand-chricar \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -66,11 +66,6 @@ msgstr "" msgid "Confirmed" msgstr "Bestätigt" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Periode" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -289,7 +284,6 @@ msgstr "Planwert" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Name" @@ -321,17 +315,6 @@ msgstr "Positionen" msgid "Budget" msgstr "Budget" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Pos." - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Betrag" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -349,17 +332,6 @@ msgstr "Budgets" msgid "Cancelled" msgstr "Abgebrochen" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "Budgetrahmen" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "Budgetrahmen" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -394,11 +366,6 @@ msgstr "Druck Budgets..." msgid "Code" msgstr "Kurzbez." -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "Gesamtsumme Planung" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/el.po b/addons/account_budget/i18n/el.po index fd8f896fa38..3f2d8ef0f2b 100644 --- a/addons/account_budget/i18n/el.po +++ b/addons/account_budget/i18n/el.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 21:02+0000\n" +"PO-Revision-Date: 2010-10-12 15:02+0000\n" "Last-Translator: mga (Open ERP) \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" @@ -67,11 +67,6 @@ msgstr "" msgid "Confirmed" msgstr "Επιβεβαιωμένο" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Περίοδος" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -298,7 +293,6 @@ msgstr "Θεωρητικό Ποσό" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Όνομα" @@ -330,17 +324,6 @@ msgstr "Γραμμές" msgid "Budget" msgstr "Προϋπολογισμός" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Είδος" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Ποσό" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -358,17 +341,6 @@ msgstr "Προϋπολογισμοί" msgid "Cancelled" msgstr "Ακυρωμένο" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "Budget Dotation" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "Budget Dotations" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -403,11 +375,6 @@ msgstr "Εκτύπωση Προϋπολογισμών" msgid "Code" msgstr "Κωδικας" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "Συνολικά Μελετηθέν Ποσό" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/es.po b/addons/account_budget/i18n/es.po index 45eada63f1b..40c6b273851 100644 --- a/addons/account_budget/i18n/es.po +++ b/addons/account_budget/i18n/es.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 21:02+0000\n" +"PO-Revision-Date: 2010-10-12 15:02+0000\n" "Last-Translator: Jordi Esteve (www.zikzakmedia.com) " "\n" "Language-Team: \n" @@ -67,11 +67,6 @@ msgstr "" msgid "Confirmed" msgstr "Confirmado" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Período" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -303,7 +298,6 @@ msgstr "Importe teórico" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Nombre" @@ -335,17 +329,6 @@ msgstr "Líneas" msgid "Budget" msgstr "Presupuesto" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Item" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Importe" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -363,17 +346,6 @@ msgstr "Presupuestos" msgid "Cancelled" msgstr "Cancelado" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "Dotación presupuestaria" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "Dotaciones presupuestarias" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -408,11 +380,6 @@ msgstr "Imprimir presupuestos" msgid "Code" msgstr "Código" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "Importe total previsto" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/es_AR.po b/addons/account_budget/i18n/es_AR.po index b0824416e41..cedb35d2365 100644 --- a/addons/account_budget/i18n/es_AR.po +++ b/addons/account_budget/i18n/es_AR.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-14 16:22+0000\n" +"PO-Revision-Date: 2010-10-12 15:22+0000\n" "Last-Translator: Silvana Herrera \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -66,11 +66,6 @@ msgstr "" msgid "Confirmed" msgstr "Confirmada" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Período" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -302,7 +297,6 @@ msgstr "Importe teórico" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Nombre" @@ -334,17 +328,6 @@ msgstr "Líneas" msgid "Budget" msgstr "Presupuesto" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Item" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Importe" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -362,17 +345,6 @@ msgstr "Presupuestos" msgid "Cancelled" msgstr "Cancelado" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "Dotación del presupuesto" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "Dotaciones del presupuesto" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -407,11 +379,6 @@ msgstr "Imprimir presupuestos" msgid "Code" msgstr "Código" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "Importe total previsto" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/es_EC.po b/addons/account_budget/i18n/es_EC.po index 54d05867b87..c9d781c68a0 100644 --- a/addons/account_budget/i18n/es_EC.po +++ b/addons/account_budget/i18n/es_EC.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-09-17 17:37+0000\n" +"PO-Revision-Date: 2010-10-12 15:37+0000\n" "Last-Translator: Jordi Esteve (www.zikzakmedia.com) " "\n" "Language-Team: \n" @@ -67,11 +67,6 @@ msgstr "" msgid "Confirmed" msgstr "Confirmado" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Período" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -303,7 +298,6 @@ msgstr "Importe teórico" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Nombre" @@ -335,17 +329,6 @@ msgstr "Líneas" msgid "Budget" msgstr "Presupuesto" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Item" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Importe" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -363,17 +346,6 @@ msgstr "Presupuestos" msgid "Cancelled" msgstr "Cancelado" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "Dotación presupuestaria" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "Dotaciones presupuestarias" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -408,11 +380,6 @@ msgstr "Imprimir presupuestos" msgid "Code" msgstr "Código" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "Importe total previsto" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/et.po b/addons/account_budget/i18n/et.po index 06c29e55956..7edf1d0dc16 100644 --- a/addons/account_budget/i18n/et.po +++ b/addons/account_budget/i18n/et.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 21:03+0000\n" +"PO-Revision-Date: 2010-10-12 15:03+0000\n" "Last-Translator: lyyser \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -65,11 +65,6 @@ msgstr "" msgid "Confirmed" msgstr "Kinnitatud" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Periood" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -271,7 +266,6 @@ msgstr "Teoreetiline summa" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Nimi" @@ -303,17 +297,6 @@ msgstr "Read" msgid "Budget" msgstr "Eelarve" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Ese" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Kogus" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -331,17 +314,6 @@ msgstr "Eelarved" msgid "Cancelled" msgstr "Tühistatud" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "Eelarve dotatsioon" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "Eelarve dotatsioonid" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -376,11 +348,6 @@ msgstr "Prindi eelarved" msgid "Code" msgstr "Kood" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "Kogu planeeritud summa" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/fi.po b/addons/account_budget/i18n/fi.po index 00858c1f4d6..d51159ee9e8 100644 --- a/addons/account_budget/i18n/fi.po +++ b/addons/account_budget/i18n/fi.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 15:28+0000\n" +"PO-Revision-Date: 2010-10-12 15:28+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" @@ -71,11 +71,6 @@ msgstr "" msgid "Confirmed" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Jakso" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -277,7 +272,6 @@ msgstr "" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Nimi" @@ -309,17 +303,6 @@ msgstr "" msgid "Budget" msgstr "Budjetti" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -337,17 +320,6 @@ msgstr "Budjetit" msgid "Cancelled" msgstr "Peruutettu" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -382,11 +354,6 @@ msgstr "Tulosta budjetit" msgid "Code" msgstr "Koodi" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/fr.po b/addons/account_budget/i18n/fr.po index 23a9145796d..bbcbc951d73 100644 --- a/addons/account_budget/i18n/fr.po +++ b/addons/account_budget/i18n/fr.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-17 09:34+0000\n" +"PO-Revision-Date: 2010-10-12 15:34+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -66,11 +66,6 @@ msgstr "" msgid "Confirmed" msgstr "Confirmé" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Période" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -272,7 +267,6 @@ msgstr "Montant Théorique" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Nom" @@ -304,17 +298,6 @@ msgstr "Lignes" msgid "Budget" msgstr "Budget" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Élément" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Montant" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -332,17 +315,6 @@ msgstr "Budgets" msgid "Cancelled" msgstr "Annulé" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "Dotation du Budget" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "Dotations du Budget" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -377,11 +349,6 @@ msgstr "Imprimer les Budgets" msgid "Code" msgstr "Code" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "Montant Total Planifié" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/gl.po b/addons/account_budget/i18n/gl.po index c5cde9ac29a..ab09deaa83a 100644 --- a/addons/account_budget/i18n/gl.po +++ b/addons/account_budget/i18n/gl.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: account-budget-es\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 12:36+0000\n" +"PO-Revision-Date: 2010-10-12 15:36+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: Galego \n" "MIME-Version: 1.0\n" @@ -68,11 +68,6 @@ msgstr "" msgid "Confirmed" msgstr "Confirmada" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Período" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -302,7 +297,6 @@ msgstr "Importe teórico" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Nome" @@ -334,17 +328,6 @@ msgstr "Liñas" msgid "Budget" msgstr "Presuposto" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Elemento" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Importe" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -362,17 +345,6 @@ msgstr "Presupostos" msgid "Cancelled" msgstr "Cancelado" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "Dotación ao presuposto" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "Dotacións ao presuposto" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -407,11 +379,6 @@ msgstr "Imprimir presupostos" msgid "Code" msgstr "Código" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "Importe total previsto" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/hi.po b/addons/account_budget/i18n/hi.po index 60360d052cd..42829cbe9f8 100644 --- a/addons/account_budget/i18n/hi.po +++ b/addons/account_budget/i18n/hi.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 13:30+0000\n" +"PO-Revision-Date: 2010-10-12 15:30+0000\n" "Last-Translator: vir (Open ERP) \n" "Language-Team: Hindi \n" "MIME-Version: 1.0\n" @@ -65,11 +65,6 @@ msgstr "" msgid "Confirmed" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "अवधि" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -271,7 +266,6 @@ msgstr "Theoritical राशि" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "" @@ -303,17 +297,6 @@ msgstr "" msgid "Budget" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -331,17 +314,6 @@ msgstr "" msgid "Cancelled" msgstr "" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -376,11 +348,6 @@ msgstr "प्रिंट बजट" msgid "Code" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/hr.po b/addons/account_budget/i18n/hr.po index 500b3297394..1bf5ab636ce 100644 --- a/addons/account_budget/i18n/hr.po +++ b/addons/account_budget/i18n/hr.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 21:04+0000\n" +"PO-Revision-Date: 2010-10-12 15:04+0000\n" "Last-Translator: Goran Kliska (Aplikacija d.o.o.) \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -65,11 +65,6 @@ msgstr "" msgid "Confirmed" msgstr "Potvrđeno" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Razdoblje" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -271,7 +266,6 @@ msgstr "Teoretski iznos" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Naziv" @@ -303,17 +297,6 @@ msgstr "Retci" msgid "Budget" msgstr "Budžet" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Stavka" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Iznos" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -331,17 +314,6 @@ msgstr "Budžeti" msgid "Cancelled" msgstr "Otkazano" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -376,11 +348,6 @@ msgstr "" msgid "Code" msgstr "Šifra" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "Ukupni planirani iznos" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/hu.po b/addons/account_budget/i18n/hu.po index f8145ec51e8..23aa5719552 100644 --- a/addons/account_budget/i18n/hu.po +++ b/addons/account_budget/i18n/hu.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-02-03 06:37+0000\n" +"PO-Revision-Date: 2010-10-12 15:37+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -64,11 +64,6 @@ msgstr "" msgid "Confirmed" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -270,7 +265,6 @@ msgstr "" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Név" @@ -302,17 +296,6 @@ msgstr "" msgid "Budget" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -330,17 +313,6 @@ msgstr "" msgid "Cancelled" msgstr "" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -375,11 +347,6 @@ msgstr "" msgid "Code" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/id.po b/addons/account_budget/i18n/id.po index c5a77c794a5..65ef0c4eaa1 100644 --- a/addons/account_budget/i18n/id.po +++ b/addons/account_budget/i18n/id.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 21:05+0000\n" +"PO-Revision-Date: 2010-10-12 15:05+0000\n" "Last-Translator: mga (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -64,11 +64,6 @@ msgstr "" msgid "Confirmed" msgstr "Dikonfirmasi" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Periode" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -270,7 +265,6 @@ msgstr "" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Nama" @@ -302,17 +296,6 @@ msgstr "" msgid "Budget" msgstr "Anggaran" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Item" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -330,17 +313,6 @@ msgstr "Anggaran" msgid "Cancelled" msgstr "Dibatalkan" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -375,11 +347,6 @@ msgstr "" msgid "Code" msgstr "Kode" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/it.po b/addons/account_budget/i18n/it.po index 07938f06357..9b0e416482b 100644 --- a/addons/account_budget/i18n/it.po +++ b/addons/account_budget/i18n/it.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-09-29 10:12+0000\n" +"PO-Revision-Date: 2010-10-12 15:12+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -66,11 +66,6 @@ msgstr "" msgid "Confirmed" msgstr "Confermato" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Periodo" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -272,7 +267,6 @@ msgstr "Importo teorico" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Nome" @@ -304,17 +298,6 @@ msgstr "Linee" msgid "Budget" msgstr "Budget" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Elemento" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Importo" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -332,17 +315,6 @@ msgstr "Budget" msgid "Cancelled" msgstr "Annullato" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "Dotazione di bilancio" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "Dotazione di bilancio" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -377,11 +349,6 @@ msgstr "Stampa Badget" msgid "Code" msgstr "Codice" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "Totale Importo pianificato" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/ko.po b/addons/account_budget/i18n/ko.po index 2479f7414c8..c9419c9c41f 100644 --- a/addons/account_budget/i18n/ko.po +++ b/addons/account_budget/i18n/ko.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 12:44+0000\n" +"PO-Revision-Date: 2010-10-12 15:44+0000\n" "Last-Translator: ekodaq \n" "Language-Team: Korean \n" "MIME-Version: 1.0\n" @@ -65,11 +65,6 @@ msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포 msgid "Confirmed" msgstr "확정됨" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "기간" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -288,7 +283,6 @@ msgstr "이론적 금액" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "이름" @@ -320,17 +314,6 @@ msgstr "라인" msgid "Budget" msgstr "예산" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "아이템" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "금액" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -348,17 +331,6 @@ msgstr "예산" msgid "Cancelled" msgstr "취소됨" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "예산 교부금" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "예산 교부금" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -393,11 +365,6 @@ msgstr "예산 인쇄" msgid "Code" msgstr "코드" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "계획된 전체 금액" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/lt.po b/addons/account_budget/i18n/lt.po index f212f095b20..b86ace61fd1 100644 --- a/addons/account_budget/i18n/lt.po +++ b/addons/account_budget/i18n/lt.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-09-09 07:05+0000\n" +"PO-Revision-Date: 2010-10-12 15:05+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -64,11 +64,6 @@ msgstr "" msgid "Confirmed" msgstr "Patvirtinta" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Periodas" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -270,7 +265,6 @@ msgstr "" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Pavadinimas" @@ -302,17 +296,6 @@ msgstr "Eilutės" msgid "Budget" msgstr "Biudžetas" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Suma" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -330,17 +313,6 @@ msgstr "Biudžetai" msgid "Cancelled" msgstr "Nutrauktas" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -375,11 +347,6 @@ msgstr "Spausdinti biudžetus" msgid "Code" msgstr "Kodas" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/nl.po b/addons/account_budget/i18n/nl.po index ea9f1dd1af2..8b53629ae46 100644 --- a/addons/account_budget/i18n/nl.po +++ b/addons/account_budget/i18n/nl.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 21:06+0000\n" +"PO-Revision-Date: 2010-10-12 14:06+0000\n" "Last-Translator: mga (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -65,11 +65,6 @@ msgstr "" msgid "Confirmed" msgstr "Bevestigd" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Periode" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -291,7 +286,6 @@ msgstr "Theoretisch bedrag" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Naam" @@ -323,17 +317,6 @@ msgstr "Regels" msgid "Budget" msgstr "Budget" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Item" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Bedrag" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -351,17 +334,6 @@ msgstr "Budgetten" msgid "Cancelled" msgstr "Geannuleerd" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "Budgettoewijzing" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "Budgettoewijzingen" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -396,11 +368,6 @@ msgstr "Budgetten afdrukken" msgid "Code" msgstr "Code" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "Totaal begroot bedrag" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/nl_BE.po b/addons/account_budget/i18n/nl_BE.po index 9af44ee63c2..be101bbcf28 100644 --- a/addons/account_budget/i18n/nl_BE.po +++ b/addons/account_budget/i18n/nl_BE.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-04-24 15:00+0000\n" +"PO-Revision-Date: 2010-10-12 14:00+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -65,11 +65,6 @@ msgstr "" msgid "Confirmed" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -271,7 +266,6 @@ msgstr "" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "" @@ -303,17 +297,6 @@ msgstr "" msgid "Budget" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -331,17 +314,6 @@ msgstr "" msgid "Cancelled" msgstr "" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -376,11 +348,6 @@ msgstr "" msgid "Code" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/oc.po b/addons/account_budget/i18n/oc.po index b87c5855c2d..3e2c90aa548 100644 --- a/addons/account_budget/i18n/oc.po +++ b/addons/account_budget/i18n/oc.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 21:07+0000\n" +"PO-Revision-Date: 2010-10-12 14:07+0000\n" "Last-Translator: Cédric VALMARY (Tot en òc) \n" "Language-Team: Occitan (post 1500) \n" "MIME-Version: 1.0\n" @@ -67,11 +67,6 @@ msgstr "" msgid "Confirmed" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Periòde" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -273,7 +268,6 @@ msgstr "" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Nom" @@ -305,17 +299,6 @@ msgstr "Linhas" msgid "Budget" msgstr "Budgèt" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Element" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Soma" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -333,17 +316,6 @@ msgstr "" msgid "Cancelled" msgstr "Anullat" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -378,11 +350,6 @@ msgstr "" msgid "Code" msgstr "Còde" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/pl.po b/addons/account_budget/i18n/pl.po index eff25d46997..1882110e12f 100644 --- a/addons/account_budget/i18n/pl.po +++ b/addons/account_budget/i18n/pl.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 21:07+0000\n" +"PO-Revision-Date: 2010-10-12 14:07+0000\n" "Last-Translator: Jarosław Ogrodnik \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -66,11 +66,6 @@ msgstr "" msgid "Confirmed" msgstr "Potwierdzone" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Okres" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -294,7 +289,6 @@ msgstr "Kwota teoretyczna" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Nazwa" @@ -326,17 +320,6 @@ msgstr "Pozycje" msgid "Budget" msgstr "Budżet" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Element" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Kwota" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -354,17 +337,6 @@ msgstr "Budżety" msgid "Cancelled" msgstr "Anulowano" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "Dotacja budżetu" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "Dotacje budżetu" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -399,11 +371,6 @@ msgstr "Drukuj budżety" msgid "Code" msgstr "Kod" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "Suma planowanych kwot" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/pt.po b/addons/account_budget/i18n/pt.po index a39f048956e..731f6f5ce43 100644 --- a/addons/account_budget/i18n/pt.po +++ b/addons/account_budget/i18n/pt.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 21:07+0000\n" +"PO-Revision-Date: 2010-10-12 14:07+0000\n" "Last-Translator: mga (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -65,11 +65,6 @@ msgstr "" msgid "Confirmed" msgstr "Confirmado" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Período" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -271,7 +266,6 @@ msgstr "Montante teórico" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Nome" @@ -303,17 +297,6 @@ msgstr "Linhas" msgid "Budget" msgstr "Orçamento" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Item" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Montante" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -331,17 +314,6 @@ msgstr "Orçamentos" msgid "Cancelled" msgstr "Cancelado" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -376,11 +348,6 @@ msgstr "Imprimir orçamentos" msgid "Code" msgstr "Código" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "Montante total planeado." - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/pt_BR.po b/addons/account_budget/i18n/pt_BR.po index 75b214ed34d..37c94bca44a 100644 --- a/addons/account_budget/i18n/pt_BR.po +++ b/addons/account_budget/i18n/pt_BR.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 21:07+0000\n" +"PO-Revision-Date: 2010-10-12 14:07+0000\n" "Last-Translator: mga (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -66,11 +66,6 @@ msgstr "" msgid "Confirmed" msgstr "Confirmado" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Período" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -295,7 +290,6 @@ msgstr "Valor Estimado" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Nome" @@ -327,17 +321,6 @@ msgstr "Linhas" msgid "Budget" msgstr "Orçamento" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Item" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Valor" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -355,17 +338,6 @@ msgstr "Orçamentos" msgid "Cancelled" msgstr "Cancelado" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "Dotação Orçamentária" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "Dotações Orçamentárias" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -400,11 +372,6 @@ msgstr "Imprimir Orçamentos" msgid "Code" msgstr "Código" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "Valor Total Planejado" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/ro.po b/addons/account_budget/i18n/ro.po index 57c2b467fbc..a7b637749b8 100644 --- a/addons/account_budget/i18n/ro.po +++ b/addons/account_budget/i18n/ro.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-17 09:33+0000\n" +"PO-Revision-Date: 2010-10-12 14:33+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -66,11 +66,6 @@ msgstr "" msgid "Confirmed" msgstr "Confirmat" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Perioadă" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -297,7 +292,6 @@ msgstr "Suma teoretică" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Nume" @@ -329,17 +323,6 @@ msgstr "Linii" msgid "Budget" msgstr "Buget" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Element" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Sumă" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -357,17 +340,6 @@ msgstr "Bugete" msgid "Cancelled" msgstr "Anulat" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "Dotare bugetară" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "Dotări bugetare" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -402,11 +374,6 @@ msgstr "Tipărire bugete" msgid "Code" msgstr "Cod" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "Suma totală planificată" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/ru.po b/addons/account_budget/i18n/ru.po index b165e1439d5..ad662f96944 100644 --- a/addons/account_budget/i18n/ru.po +++ b/addons/account_budget/i18n/ru.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 21:08+0000\n" +"PO-Revision-Date: 2010-10-12 14:08+0000\n" "Last-Translator: mga (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -66,11 +66,6 @@ msgstr "" msgid "Confirmed" msgstr "Подтверждено" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Период" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -272,7 +267,6 @@ msgstr "" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Имя" @@ -304,17 +298,6 @@ msgstr "Строк" msgid "Budget" msgstr "Бюджет" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Элемент" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Сумма" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -332,17 +315,6 @@ msgstr "Бюджеты" msgid "Cancelled" msgstr "Отменено" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "Бюджетная дотация" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "Бюджетные дотации" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -377,11 +349,6 @@ msgstr "Печать бюджетов" msgid "Code" msgstr "Код" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "Запланировано всего" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/sl.po b/addons/account_budget/i18n/sl.po index fb8ab700dff..4884056f036 100644 --- a/addons/account_budget/i18n/sl.po +++ b/addons/account_budget/i18n/sl.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 21:09+0000\n" +"PO-Revision-Date: 2010-10-12 14:09+0000\n" "Last-Translator: mga (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -65,11 +65,6 @@ msgstr "" msgid "Confirmed" msgstr "Potrjeno" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Obdobje" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -271,7 +266,6 @@ msgstr "Teoretični znesek" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Naziv" @@ -303,17 +297,6 @@ msgstr "Postavke" msgid "Budget" msgstr "Proračun" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "Element" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Znesek" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -331,17 +314,6 @@ msgstr "Proračuni" msgid "Cancelled" msgstr "Preklicano" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -376,11 +348,6 @@ msgstr "Izpiši proračune" msgid "Code" msgstr "Oznaka" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "Skupni načrtovani znesek" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/sq.po b/addons/account_budget/i18n/sq.po index 83f6cba0d44..a1cd17b21fa 100644 --- a/addons/account_budget/i18n/sq.po +++ b/addons/account_budget/i18n/sq.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 14:42+0000\n" +"PO-Revision-Date: 2010-10-12 14:42+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Albanian \n" "MIME-Version: 1.0\n" @@ -65,11 +65,6 @@ msgstr "" msgid "Confirmed" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -271,7 +266,6 @@ msgstr "" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "" @@ -303,17 +297,6 @@ msgstr "" msgid "Budget" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -331,17 +314,6 @@ msgstr "" msgid "Cancelled" msgstr "" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -376,11 +348,6 @@ msgstr "" msgid "Code" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/sv.po b/addons/account_budget/i18n/sv.po index 9e5a466bd05..69bc52d6152 100644 --- a/addons/account_budget/i18n/sv.po +++ b/addons/account_budget/i18n/sv.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-04-10 09:38+0000\n" +"PO-Revision-Date: 2010-10-12 14:38+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -65,11 +65,6 @@ msgstr "" msgid "Confirmed" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -271,7 +266,6 @@ msgstr "" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Namn" @@ -303,17 +297,6 @@ msgstr "" msgid "Budget" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -331,17 +314,6 @@ msgstr "Budgetar" msgid "Cancelled" msgstr "" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -376,11 +348,6 @@ msgstr "" msgid "Code" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/tlh.po b/addons/account_budget/i18n/tlh.po index 474fee684c9..cce9c961224 100644 --- a/addons/account_budget/i18n/tlh.po +++ b/addons/account_budget/i18n/tlh.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-02-03 06:24+0000\n" +"PO-Revision-Date: 2010-10-12 14:24+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -64,11 +64,6 @@ msgstr "" msgid "Confirmed" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -270,7 +265,6 @@ msgstr "" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "" @@ -302,17 +296,6 @@ msgstr "" msgid "Budget" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -330,17 +313,6 @@ msgstr "" msgid "Cancelled" msgstr "" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -375,11 +347,6 @@ msgstr "" msgid "Code" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po index f4c72790f56..53d6f7d9f6f 100644 --- a/addons/account_budget/i18n/tr.po +++ b/addons/account_budget/i18n/tr.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-09-09 07:04+0000\n" +"PO-Revision-Date: 2010-10-12 14:04+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -64,11 +64,6 @@ msgstr "" msgid "Confirmed" msgstr "Onaylandı" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Dönem" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -270,7 +265,6 @@ msgstr "Kurumsal Tutar" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Adı" @@ -302,17 +296,6 @@ msgstr "" msgid "Budget" msgstr "Bütçe" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Miktar" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -330,17 +313,6 @@ msgstr "Bütçeler" msgid "Cancelled" msgstr "İptal Edildi" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "Bütçe Ödeneği" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "Bütçe Ödenekleri" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -375,11 +347,6 @@ msgstr "Bütçeleri Yazdır" msgid "Code" msgstr "Kodu" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "Toplam Planl. Tutar" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/uk.po b/addons/account_budget/i18n/uk.po index 420efaf9b0c..8c4fd5d9640 100644 --- a/addons/account_budget/i18n/uk.po +++ b/addons/account_budget/i18n/uk.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 16:49+0000\n" +"PO-Revision-Date: 2010-10-12 14:49+0000\n" "Last-Translator: Eugene Babiy \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -65,11 +65,6 @@ msgstr "" msgid "Confirmed" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "Період" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -271,7 +266,6 @@ msgstr "" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "Назва" @@ -303,17 +297,6 @@ msgstr "Рядки" msgid "Budget" msgstr "Бюджет" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "Сума" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -331,17 +314,6 @@ msgstr "" msgid "Cancelled" msgstr "" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -376,11 +348,6 @@ msgstr "" msgid "Code" msgstr "Код" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/vi.po b/addons/account_budget/i18n/vi.po index e908238a8a5..89b0ada492f 100644 --- a/addons/account_budget/i18n/vi.po +++ b/addons/account_budget/i18n/vi.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-02 14:42+0000\n" +"PO-Revision-Date: 2010-10-12 14:42+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Vietnamese \n" "MIME-Version: 1.0\n" @@ -65,11 +65,6 @@ msgstr "" msgid "Confirmed" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -271,7 +266,6 @@ msgstr "" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "" @@ -303,17 +297,6 @@ msgstr "" msgid "Budget" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -331,17 +314,6 @@ msgstr "" msgid "Cancelled" msgstr "" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -376,11 +348,6 @@ msgstr "" msgid "Code" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/zh_CN.po b/addons/account_budget/i18n/zh_CN.po index ed5a3a4368d..2d512a9276a 100644 --- a/addons/account_budget/i18n/zh_CN.po +++ b/addons/account_budget/i18n/zh_CN.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-09-29 08:58+0000\n" +"PO-Revision-Date: 2010-10-12 14:58+0000\n" "Last-Translator: Black Jack \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -64,11 +64,6 @@ msgstr "对象名必须要以X_开头并且不能含有特殊字符!" msgid "Confirmed" msgstr "已确认" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "会计期间" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -288,7 +283,6 @@ msgstr "理论金额" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "名称" @@ -320,17 +314,6 @@ msgstr "明细" msgid "Budget" msgstr "预算" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "项" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "金额" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -348,17 +331,6 @@ msgstr "预算" msgid "Cancelled" msgstr "已取消" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "预算给予" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "预算给予" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -393,11 +365,6 @@ msgstr "打印预算" msgid "Code" msgstr "代码" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "计划金额合计" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/i18n/zh_TW.po b/addons/account_budget/i18n/zh_TW.po index 900864233fe..c8ff1d77da7 100644 --- a/addons/account_budget/i18n/zh_TW.po +++ b/addons/account_budget/i18n/zh_TW.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-01-23 17:15+0000\n" +"PO-Revision-Date: 2010-10-12 14:15+0000\n" "Last-Translator: Fabien (Open ERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -64,11 +64,6 @@ msgstr "" msgid "Confirmed" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,period_id:0 -msgid "Period" -msgstr "" - #. module: account_budget #: wizard_field:account.budget.report,init,date2:0 #: wizard_field:wizard.analytic.account.budget.report,init,date_to:0 @@ -270,7 +265,6 @@ msgstr "" #. module: account_budget #: field:account.budget.post,name:0 -#: field:account.budget.post.dotation,name:0 #: field:crossovered.budget,name:0 msgid "Name" msgstr "名称" @@ -302,17 +296,6 @@ msgstr "" msgid "Budget" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,post_id:0 -msgid "Item" -msgstr "" - -#. module: account_budget -#: field:account.budget.post.dotation,amount:0 -#: wizard_field:account.budget.spread,init,amount:0 -msgid "Amount" -msgstr "" - #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 msgid "Paid Date" @@ -330,17 +313,6 @@ msgstr "" msgid "Cancelled" msgstr "" -#. module: account_budget -#: view:account.budget.post.dotation:0 -#: model:ir.model,name:account_budget.model_account_budget_post_dotation -msgid "Budget Dotation" -msgstr "" - -#. module: account_budget -#: view:account.budget.post.dotation:0 -msgid "Budget Dotations" -msgstr "" - #. module: account_budget #: rml:account.budget:0 msgid "Budget Item Detail" @@ -375,11 +347,6 @@ msgstr "" msgid "Code" msgstr "" -#. module: account_budget -#: field:account.budget.post.dotation,tot_planned:0 -msgid "Total Planned Amount" -msgstr "" - #. module: account_budget #: wizard_view:wizard.analytic.account.budget.report,init:0 msgid "Select Dates Period" diff --git a/addons/account_budget/report/budget_report.py b/addons/account_budget/report/budget_report.py index 7db3925fd4d..1a72afb28cc 100644 --- a/addons/account_budget/report/budget_report.py +++ b/addons/account_budget/report/budget_report.py @@ -22,53 +22,172 @@ import time import datetime +import pooler from report import report_sxw import operator +import osv class budget_report(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): super(budget_report, self).__init__(cr, uid, name, context=context) - self.localcontext.update( { - 'lines': self.lines, - 'budget_total': self.budget_total, - 'post_total': self.post_total, + self.localcontext.update({ + 'funct': self.funct, + 'funct_total': self.funct_total, 'time': time, }) + self.context = context - def post_total(self, post_obj, date1, date2): - def str2date(date_str): - return datetime.date.fromtimestamp(time.mktime(time.strptime(date_str, '%Y-%m-%d'))) + def funct(self, object, form, ids={}, done=None, level=1): + if not ids: + ids = self.ids + if not done: + done = {} + global tot + tot = { + 'theo':0.00, + 'pln':0.00, + 'prac':0.00, + 'perc':0.00 + } + result = [] - def interval(d1str, d2str): - return (str2date(d2str) - str2date(d1str) + datetime.timedelta(days=1)).days + budgets = self.pool.get('account.budget.post').browse(self.cr, self.uid, [object.id], self.context.copy()) + c_b_lines_obj = self.pool.get('crossovered.budget.lines') + acc_analytic_obj = self.pool.get('account.analytic.account') + for budget_id in budgets: + res = {} + budget_lines = [] + budget_ids = [] + d_from = form['date_from'] + d_to = form['date_to'] - prev = reduce(lambda x,d: x + d.amount, post_obj.dotation_ids, 0.0) - period_days = interval(date1, date2) - for d in post_obj.dotation_ids: - i = interval(d.period_id.date_start, d.period_id.date_stop) - total_days = reduce(lambda x,d: x+interval(d.period_id.date_start, d.period_id.date_stop), post_obj.dotation_ids, 0) - achievements = reduce(lambda x,l: x+l['achievements'], self.lines(post_obj, date1, date2), 0.0) - prev_1 = 1.00 - if total_days <> 0.00: - prev_1 = prev * period_days / total_days - return [{'prev': prev, 'prev_period': prev_1, 'achievements': achievements}] + for line in budget_id.crossovered_budget_line: + budget_ids.append(line.id) - def budget_total(self, post_obj, date1, date2): - res = {'prev': 0.0, 'prev_period': 0.0, 'achievements': 0.0} - r = self.post_total(post_obj, date1, date2)[0] - for k in r: - res[k] += r[k] - return [res] + if not budget_ids: + return [] - def lines(self, post_obj, date1, date2): - res = [] - for a in post_obj.account_ids: - self.cr.execute("SELECT COALESCE(SUM(debit-credit), 0) FROM account_move_line WHERE account_id=%s AND date>=%s AND date<=%s and state<>'draft'", (a.id, date1, date2)) - achievements = float(self.cr.fetchone()[0]) - res.append({'name': a.name, 'code': a.code, 'achievements': achievements}) - return res + self.cr.execute('SELECT DISTINCT(analytic_account_id) FROM crossovered_budget_lines WHERE id = ANY(%s)',(budget_ids,)) + an_ids = self.cr.fetchall() -report_sxw.report_sxw('report.account.budget', 'account.budget.post', 'addons/account_budget/report/budget_report.rml', parser=budget_report, header="internal") + context = {'wizard_date_from': d_from, 'wizard_date_to': d_to} + for i in range(0, len(an_ids)): + analytic_name = acc_analytic_obj.browse(self.cr, self.uid, [an_ids[i][0]]) + res={ + 'b_id': '-1', + 'a_id': '-1', + 'name': analytic_name[0].name, + 'status': 1, + 'theo': 0.00, + 'pln': 0.00, + 'prac': 0.00, + 'perc': 0.00 + } + result.append(res) + line_ids = c_b_lines_obj.search(self.cr, self.uid, [('id', 'in', budget_ids), ('analytic_account_id','=',an_ids[i][0])]) + line_id = c_b_lines_obj.browse(self.cr, self.uid, line_ids) + tot_theo = tot_pln = tot_prac = tot_perc = 0.00 -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file + done_budget = [] + for line in line_id: + if line.id in budget_ids: + theo = pract = 0.00 + theo = c_b_lines_obj._theo_amt(self.cr, self.uid, [line.id], context)[line.id] + pract = c_b_lines_obj._prac_amt(self.cr, self.uid, [line.id], context)[line.id] + if line.general_budget_id.id in done_budget: + for record in result: + if record['b_id'] == line.general_budget_id.id and record['a_id'] == line.analytic_account_id.id: + record['theo'] += theo + record['pln'] += line.planned_amount + record['prac'] += pract + if record['theo'] <> 0.00: + perc = (record['prac'] / record['theo']) * 100 + else: + perc = 0.00 + record['perc'] = perc + tot_theo += theo + tot_pln += line.planned_amount + tot_prac += pract + tot_perc += perc + else: + if theo <> 0.00: + perc = (pract / theo) * 100 + else: + perc = 0.00 + res1 = { + 'a_id': line.analytic_account_id.id, + 'b_id': line.general_budget_id.id, + 'name': line.general_budget_id.name, + 'status': 2, + 'theo': theo, + 'pln': line.planned_amount, + 'prac': pract, + 'perc': perc, + } + tot_theo += theo + tot_pln += line.planned_amount + tot_prac += pract + tot_perc += perc + if form['report'] == 'analytic-full': + result.append(res1) + done_budget.append(line.general_budget_id.id) + else: + + if line.general_budget_id.id in done_budget: + continue + else: + res1={ + 'a_id': line.analytic_account_id.id, + 'b_id': line.general_budget_id.id, + 'name': line.general_budget_id.name, + 'status': 2, + 'theo': 0.00, + 'pln': 0.00, + 'prac': 0.00, + 'perc': 0.00 + } + if form['report'] == 'analytic-full': + result.append(res1) + done_budget.append(line.general_budget_id.id) + if tot_theo == 0.00: + tot_perc = 0.00 + else: + tot_perc = float(tot_prac / tot_theo) * 100 + if form['report'] == 'analytic-full': + result[-(len(done_budget) +1)]['theo'] = tot_theo + tot['theo'] += tot_theo + result[-(len(done_budget) +1)]['pln'] = tot_pln + tot['pln'] += tot_pln + result[-(len(done_budget) +1)]['prac'] = tot_prac + tot['prac'] += tot_prac + result[-(len(done_budget) +1)]['perc'] = tot_perc + else: + result[-1]['theo'] = tot_theo + tot['theo'] += tot_theo + result[-1]['pln'] = tot_pln + tot['pln'] += tot_pln + result[-1]['prac'] = tot_prac + tot['prac'] += tot_prac + result[-1]['perc'] = tot_perc + if tot['theo'] == 0.00: + tot['perc'] = 0.00 + else: + tot['perc'] = float(tot['prac'] / tot['theo']) * 100 + return result + + def funct_total(self, form): + result = [] + res = {} + res = { + 'tot_theo': tot['theo'], + 'tot_pln': tot['pln'], + 'tot_prac': tot['prac'], + 'tot_perc': tot['perc'] + } + result.append(res) + return result + +report_sxw.report_sxw('report.account.budget', 'account.budget.post', 'addons/account_budget/report/budget_report.rml', parser=budget_report, header='internal') + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_budget/report/budget_report.rml b/addons/account_budget/report/budget_report.rml index 577e03af9f4..0533042822a 100644 --- a/addons/account_budget/report/budget_report.rml +++ b/addons/account_budget/report/budget_report.rml @@ -1,5 +1,5 @@ - +