From 1ed668755f5f31b63f745d50b9154a42a46e3314 Mon Sep 17 00:00:00 2001 From: pinky <> Date: Tue, 16 Jan 2007 08:17:35 +0000 Subject: [PATCH] Modifs bzr revid: pinky-fdcbe9f70bfbdc5b4f528886b4e9bfd7d6b30778 --- addons/l10n_ch/bvr/__init__.py | 3 +- addons/l10n_ch/bvr/bvr.py | 64 ---------- addons/l10n_ch/bvr/bvr.rml | 221 --------------------------------- 3 files changed, 2 insertions(+), 286 deletions(-) delete mode 100644 addons/l10n_ch/bvr/bvr.py delete mode 100644 addons/l10n_ch/bvr/bvr.rml diff --git a/addons/l10n_ch/bvr/__init__.py b/addons/l10n_ch/bvr/__init__.py index 450bd78cdfc..1150d16dcff 100644 --- a/addons/l10n_ch/bvr/__init__.py +++ b/addons/l10n_ch/bvr/__init__.py @@ -26,4 +26,5 @@ # ############################################################################## -import bvr +import report +import wizard diff --git a/addons/l10n_ch/bvr/bvr.py b/addons/l10n_ch/bvr/bvr.py deleted file mode 100644 index 838c7708685..00000000000 --- a/addons/l10n_ch/bvr/bvr.py +++ /dev/null @@ -1,64 +0,0 @@ -############################################################################## -# -# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved. -# -# WARNING: This program as such is intended to be used by professional -# programmers who take the whole responsability of assessing all potential -# consequences resulting from its eventual inadequacies and bugs -# End users who are looking for a ready-to-use solution with commercial -# garantees and support are strongly adviced to contract a Free Software -# Service Company -# -# This program is Free Software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -############################################################################## - -import time -from report import report_sxw - -class account_invoice_bvr(report_sxw.rml_parse): - def __init__(self, cr, uid, name, context): - super(account_invoice_bvr, self).__init__(cr, uid, name, context) - self.localcontext.update({ - 'time': time, - 'user':self.pool.get("res.users").browse(cr,uid,uid), - 'mod10r': self._mod10r, - }) - - def _mod10r(self,nbr): - """ - Input arg : account or invoice number - Output return: the same number completed with the recursive mod10 - key - """ - - codec=[0,9,4,6,8,2,7,1,3,5] - report = 0 - result="" - for chiffre in nbr: - - if not chiffre.isdigit(): - continue - - report = codec[ (int(chiffre) +report) % 10 ] - result += chiffre - return result + str((10-report) % 10) - -report_sxw.report_sxw( - 'report.l10n_ch.bvr', - 'account.invoice', - 'addons/l10n_ch/bvr/bvr.rml', - parser=account_invoice_bvr, - header=False) diff --git a/addons/l10n_ch/bvr/bvr.rml b/addons/l10n_ch/bvr/bvr.rml deleted file mode 100644 index 1e73b8d6abb..00000000000 --- a/addons/l10n_ch/bvr/bvr.rml +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [[ repeatIn(objects,'o') ]][[ setLang(o.partner_id.lang) ]] - - - - - - - - - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] - [[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]] - [[ o.address_invoice_id.street ]] - [[ o.address_invoice_id.street2 or '' ]] - [[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]] - [[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]] - [[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]] - - - - - - - Subject: Invoice - [[ o.number ]] - - - - Dear customer, - Here is the BVR to allow you to pay the invoice ' [[ o.name ]]', reference: [[ o.number ]]. - Thanks, - - - - [[ user.signature ]] - - - - - [[ user.company_id.partner_id.name ]] - [[ user.company_id.partner_id.address[0].street ]] - [[ (user.company_id.partner_id.address[0].street2 or '')]] - [[ user.company_id.partner_id.address[0].zip ]] [[ user.company_id.partner_id.address[0].city ]] - - [[ user.company_id.partner_id.name ]] - [[ user.company_id.partner_id.address[0].street ]] - [[ (user.company_id.partner_id.address[0].street2 or '')]] - [[ user.company_id.partner_id.address[0].zip ]] [[ user.company_id.partner_id.address[0].city ]] - - - [[ mod10r(o.number).rjust(27,'0') ]] - - [[ ('%.2f' % o.amount_total)[:-3] ]] - [[ ('%.2f' % o.amount_total)[:-3] ]] - - [[ ('%.2f' % o.amount_total)[-2:] ]] - [[ ('%.2f' % o.amount_total)[-2:] ]] - - - 01[[mod10r('%.2f' % o.amount_total).rjust(11,'0')]]>[[ mod10r(o.number).rjust(27,'0')]]+ [[user.company_id.bvr_number.split('-')[0]+(user.company_id.bvr_number.split('-')[1]).rjust(6,'0')+user.company_id.bvr_number.split('-')[2] ]] - - - - - - - -