From ac3f37be8fd77b207baad3ca6978eb576aa8a204 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Mon, 3 Jan 2011 18:21:58 +0100 Subject: [PATCH 1/5] [I18N] base: updated translation templates after latest changes (again) bzr revid: odo@openerp.com-20110103172158-j60duhck9fh6lv9x --- bin/addons/base/i18n/base.pot | 49 +++++++++-------------------------- 1 file changed, 12 insertions(+), 37 deletions(-) diff --git a/bin/addons/base/i18n/base.pot b/bin/addons/base/i18n/base.pot index 2276ea35711..a5507d852a8 100644 --- a/bin/addons/base/i18n/base.pot +++ b/bin/addons/base/i18n/base.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0.0-rc1\n" +"Project-Id-Version: OpenERP Server 6.0.0-rc2\n" "Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2011-01-03 09:14:30+0000\n" -"PO-Revision-Date: 2011-01-03 09:14:30+0000\n" +"POT-Creation-Date: 2011-01-03 16:57:13+0000\n" +"PO-Revision-Date: 2011-01-03 16:57:13+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -1772,11 +1772,6 @@ msgstr "" msgid "Korean (KR) / 한국어 (KR)" msgstr "" -#. module: base -#: model:res.widget,title:base.matrixise_twitter_widget -msgid "Stéphane Wirtel's tweets" -msgstr "" - #. module: base #: field:ir.actions.server,action_id:0 #: selection:ir.actions.server,state:0 @@ -3132,11 +3127,6 @@ msgstr "" msgid "If set to true, the action will not be displayed on the right toolbar of a form view." msgstr "" -#. module: base -#: model:res.country,name:base.al -msgid "Albania" -msgstr "" - #. module: base #: view:ir.attachment:0 msgid "Attached To" @@ -3696,6 +3686,11 @@ msgstr "" msgid "Workitem" msgstr "" +#. module: base +#: view:ir.actions.todo:0 +msgid "Set as Todo" +msgstr "" + #. module: base #: field:ir.actions.act_window.view,act_window_id:0 #: view:ir.actions.actions:0 @@ -4556,11 +4551,6 @@ msgstr "" msgid "Dutch / Nederlands" msgstr "" -#. module: base -#: model:res.widget,title:base.rvalyi_twitter_widget -msgid "Raphaël Valyi's tweets" -msgstr "" - #. module: base #: code:addons/base/res/res_config.py:384 #, python-format @@ -4867,11 +4857,6 @@ msgstr "" msgid "Choose between the simplified interface and the extended one" msgstr "" -#. module: base -#: model:res.widget,title:base.odony_twitter_widget -msgid "Olivier Dony's tweets" -msgstr "" - #. module: base #: model:res.country,name:base.np msgid "Nepal" @@ -6182,8 +6167,8 @@ msgid "Client Logs" msgstr "" #. module: base -#: view:ir.actions.todo:0 -msgid "Set as Todo" +#: model:res.country,name:base.al +msgid "Albania" msgstr "" #. module: base @@ -6458,7 +6443,7 @@ msgid "Module Update" msgstr "" #. module: base -#: code:addons/base/module/wizard/base_module_upgrade.py:97 +#: code:addons/base/module/wizard/base_module_upgrade.py:95 #, python-format msgid "Following modules are not installed or unknown: %s" msgstr "" @@ -8121,11 +8106,6 @@ msgstr "" msgid "Phone" msgstr "" -#. module: base -#: model:res.widget,title:base.albertnan_twitter_widget -msgid "Albert Cervera Areny's tweets" -msgstr "" - #. module: base #: field:ir.cron,active:0 #: field:ir.sequence,active:0 @@ -8281,7 +8261,7 @@ msgid "View Ordering" msgstr "" #. module: base -#: code:addons/base/module/wizard/base_module_upgrade.py:97 +#: code:addons/base/module/wizard/base_module_upgrade.py:95 #, python-format msgid "Unmet dependency !" msgstr "" @@ -8700,11 +8680,6 @@ msgstr "" msgid "Seychelles" msgstr "" -#. module: base -#: model:res.widget,title:base.nhomar_twitter_widget -msgid "Nhomar Hernandez's tweets" -msgstr "" - #. module: base #: model:ir.model,name:base.model_res_partner_bank #: view:res.partner.bank:0 From afa53f95a26d43b6eb748cd7ac0a027bdbbfd1f0 Mon Sep 17 00:00:00 2001 From: "Sbh (OpenERP)" Date: Tue, 4 Jan 2011 12:06:59 +0530 Subject: [PATCH 2/5] [IMP] project_long_term: Add start date and end date in tasks detail view bzr revid: sbh@tinyerp.com-20110104063659-rhwstzc0tch71dsq --- addons/project_long_term/project_long_term_view.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 61e0a7dd7f9..ff4cfd8575b 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -154,6 +154,8 @@ + + @@ -172,6 +174,7 @@ + From d53d76ed03ebb975dc88dd27f39905d084f19f91 Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Tue, 4 Jan 2011 14:37:34 +0530 Subject: [PATCH 3/5] [FIX] account:account entry analysis - unreconciled does not filter lp bug: https://launchpad.net/bugs/694937 fixed bzr revid: psi@tinyerp.co.in-20110104090734-1tv6bw80y95geayl --- addons/account/report/account_entries_report_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index 8eefe75838f..d2d5883e947 100755 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -80,7 +80,7 @@ - + From a6d8d9a1d5707d5636918e18a45cb56b68b6a876 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Tue, 4 Jan 2011 16:55:12 +0530 Subject: [PATCH 4/5] [REF] bzr revid: mra@mra-laptop-20110104112512-1cfblx02ihxh9x5q --- addons/account/report/account_balance.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 00fa1f58ff6..1d8fccc251f 100755 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -20,6 +20,7 @@ ############################################################################## import time + from report import report_sxw from common_report_header import common_report_header From 4c002629eeded9c42271496d559c2ab4c83d2166 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Tue, 4 Jan 2011 17:50:09 +0530 Subject: [PATCH 5/5] [REM] Account: Remove account voucher report and its related changes to yaml of reports bzr revid: mra@mra-laptop-20110104122009-zzot2zjodwpl68o2 --- addons/account/report/__init__.py | 2 - .../account/report/account_voucher_print.py | 69 --- .../account/report/account_voucher_print.rml | 470 ------------------ addons/account/test/account_report.yml | 20 +- 4 files changed, 6 insertions(+), 555 deletions(-) delete mode 100755 addons/account/report/account_voucher_print.py delete mode 100755 addons/account/report/account_voucher_print.rml diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py index 7084aa8c07f..d525d3a331b 100755 --- a/addons/account/report/__init__.py +++ b/addons/account/report/__init__.py @@ -39,8 +39,6 @@ import account_invoice_report import account_report import account_entries_report import account_analytic_entries_report -#import voucher_print -import account_voucher_print import account_balance_sheet import account_profit_loss diff --git a/addons/account/report/account_voucher_print.py b/addons/account/report/account_voucher_print.py deleted file mode 100755 index 912e0794a9c..00000000000 --- a/addons/account/report/account_voucher_print.py +++ /dev/null @@ -1,69 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved -# $Id$ -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -import time -from report import report_sxw -from tools import amount_to_text_en - -class report_voucher_move(report_sxw.rml_parse): - def __init__(self, cr, uid, name, context=None): - super(report_voucher_move, self).__init__(cr, uid, name, context=context) - self.localcontext.update({ - 'time': time, - 'convert':self.convert, - 'get_title': self.get_title, - 'debit':self.debit, - 'credit':self.credit, - }) - self.user = uid - - def convert(self, amount): - user_id = self.pool.get('res.users').browse(self.cr, self.user, [self.user])[0] - return amount_to_text_en.amount_to_text(amount, 'en', user_id.company_id.currency_id.name) - - def get_title(self, voucher): - title = '' - if voucher.journal_id: - type = voucher.journal_id.type - title = type[0].swapcase() + type[1:] + " Voucher" - return title - - def debit(self, move_ids): - debit = 0.0 - for move in move_ids: - debit +=move.debit - return debit - - def credit(self, move_ids): - credit = 0.0 - for move in move_ids: - credit +=move.credit - return credit - -report_sxw.report_sxw( - 'report.account.move.voucher', - 'account.move', - 'addons/account/report/account_voucher_print.rml', - parser=report_voucher_move,header="external" -) - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account/report/account_voucher_print.rml b/addons/account/report/account_voucher_print.rml deleted file mode 100755 index 1d8f237c132..00000000000 --- a/addons/account/report/account_voucher_print.rml +++ /dev/null @@ -1,470 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Particulars - - - Debit - - - Credit - - - - - [[ repeatIn(objects,'voucher') ]] - - - - [[ get_title(voucher) ]] - - - - - - - - - - Journal: - - - [[ voucher.journal_id.name ]] - - - Number: - - - [[ voucher.name ]] - - - - - - - State: - - - PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]] - Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]] - Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]] - Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]] - - - Ref. : - - - [[ voucher.ref]] - - - Date: - - - [[ formatLang(voucher.date , date=True) or '' ]] - - - - - - - - - - - - - Particulars - - - Debit - - - Credit - - - - - - -
- [[ repeatIn(voucher.line_id,'line_id') ]] - - - - [[ (line_id.partner_id and line_id.partner_id.name) or 'Account']] - - - [[ formatLang(line_id.debit) ]] - - - [[ formatLang(line_id.credit) ]] - - - - - [[ line_id.account_id.name ]] - - - - - - - - - - - - - - - [[ line_id.name ]]-[[voucher.ref]] - - - - - - - - - - - - - - - - -
- - - - - - - Through : - - - - - - - - - - - - - - - [[ voucher.narration or '']] - - - - - - - - - - - - - - - On Account of : - - - - - - - - - - - - - - - [[ voucher.line_id and voucher.line_id[0].name or removeParentNode('para') ]] - - - - - - - - - - - - - - - Amount (in words) : - - - - - - - - - - - - - - - [[ convert(voucher.amount) ]] - - - - - - - - - - - - - - - - - - - - - - - - - [[ formatLang(debit(voucher.line_id))]] - - - [[ formatLang(credit(voucher.line_id)) ]] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Receiver's Signature - - - - - - - - - - - - - Authorised Signatory - - - - - - - - - diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml index 312db44cd0c..d5bb6bada65 100755 --- a/addons/account/test/account_report.yml +++ b/addons/account/test/account_report.yml @@ -28,14 +28,6 @@ (data, format) = netsvc.LocalService('report.account.overdue').create(cr, uid, [ref('base.res_partner_asus'),ref('base.res_partner_agrolait'),ref('base.res_partner_c2c')], {}, {}) if tools.config['test_report_directory']: file(os.path.join(tools.config['test_report_directory'], 'account-report_overdue.'+format), 'wb+').write(data) -- - In order to test the PDF reports defined on Account Move, we will print the Voucher Report -- - !python {model: account.move}: | - import netsvc, tools, os - (data, format) = netsvc.LocalService('report.account.move.voucher').create(cr, uid, [ref('account.account_move_0')], {}, {}) - if tools.config['test_report_directory']: - file(os.path.join(tools.config['test_report_directory'], 'account-voucher-report.'+format), 'wb+').write(data) - Print the Aged Partner Balance Report - @@ -44,7 +36,7 @@ ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')],'active_id':ref('account.chart0')}) data_dict = {'chart_account_id':ref('account.chart0')} from tools import test_reports - test_reports.try_report_action(cr, uid, 'action_account_aged_balance_view',wiz_data=data_dict, context=ctx, our_module='account') + test_reports.try_report_action(cr, uid, 'action_account_aged_balance_view',wiz_data=data_dict, context=ctx, our_module='account') - Print the Account Balance Sheet in Horizontal mode - @@ -53,7 +45,7 @@ ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]}) data_dict = {'chart_account_id':ref('account.chart0'),'display_type': True} from tools import test_reports - test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account') + test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account') - Print the Account Balance Sheet in Normal mode - @@ -62,7 +54,7 @@ ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]}) data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False} from tools import test_reports - test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account') + test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account') - Print the Account Balance Report in Normal mode through the wizard - From Account Chart - @@ -157,7 +149,7 @@ ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]}) data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False} from tools import test_reports - test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account') + test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account') - Print the Profit-Loss Report in Horizontal Mode - @@ -166,7 +158,7 @@ ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]}) data_dict = {'chart_account_id':ref('account.chart0'),'display_type': True} from tools import test_reports - test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account') + test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account') - Print the Analytic Balance Report through the wizard - @@ -215,4 +207,4 @@ ctx.update({'model': 'account.analytic.account','active_ids': [ref('account.analytic_root')]}) data_dict = {} from tools import test_reports - test_reports.try_report_action(cr, uid, 'action_account_analytic_invert_balance',wiz_data=data_dict, context=ctx, our_module='account') + test_reports.try_report_action(cr, uid, 'action_account_analytic_invert_balance',wiz_data=data_dict, context=ctx, our_module='account')