diff --git a/addons/l10n_ch/__terp__.py b/addons/l10n_ch/__terp__.py index 80dc95baf8e..873a6a05a25 100755 --- a/addons/l10n_ch/__terp__.py +++ b/addons/l10n_ch/__terp__.py @@ -8,10 +8,14 @@ "category" : "Localisation/Europe", "website": "http://www.tinyerp.com", "depends" : ["base", "account"], + #"init_xml" : ["zip_code_default.xml"], "init_xml" : [],#"zip_code_default.xml" "demo_xml" : ["vaudtax_data_demo.xml"], - # "update_xml" : ["vaudtax_data.xml","account_vat.xml","base_config.xml","account_config.xml"], - "update_xml" : ["dta/dta_view.xml","v11/v11_view.xml","v11/v11_wizard.xml"], + "update_xml" : [ + "vaudtax_data.xml","account_vat.xml","base_config.xml","account_config.xml", + "bvr/bvr_report.xml", "bvr/company_view.xml", + "dta/dta_view.xml","v11/v11_view.xml","v11/v11_wizard.xml" + ], "active": False, "installable": True, } diff --git a/addons/l10n_ch/bvr/__init__.py b/addons/l10n_ch/bvr/__init__.py index 450bd78cdfc..8187fbfa790 100644 --- a/addons/l10n_ch/bvr/__init__.py +++ b/addons/l10n_ch/bvr/__init__.py @@ -27,3 +27,4 @@ ############################################################################## import bvr +import company diff --git a/addons/l10n_ch/bvr/bvr.py b/addons/l10n_ch/bvr/bvr.py index c375605fb2f..838c7708685 100644 --- a/addons/l10n_ch/bvr/bvr.py +++ b/addons/l10n_ch/bvr/bvr.py @@ -55,4 +55,10 @@ class account_invoice_bvr(report_sxw.rml_parse): 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/bvr.rml', parser=account_invoice_bvr) + +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 index 82bdc98eecb..0dd6d27bacf 100644 --- a/addons/l10n_ch/bvr/bvr.rml +++ b/addons/l10n_ch/bvr/bvr.rml @@ -2,8 +2,8 @@ @@ -14,21 +14,25 @@ - + + + + - - - - - - + + + + + + - - + + + @@ -40,57 +44,73 @@ [[ repeatIn(objects,'o') ]][[ setLang(o.partner_id.lang) ]] - Header of Document - + + + + + + + + + [[ 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 ]] - - - - + - Versement pour : - Banque Cantonale Vaudoise - 1001 Lausanne + [[ user.company_id.partner_id.name ]] + [[ user.company_id.partner_id.address[0].name ]] + [[ user.company_id.partner_id.address[0].street ]] + [[ user.company_id.partner_id.address[0].street2 ]] + [[ user.company_id.partner_id.address[0].zip ]] [[ user.company_id.partner_id.address[0].country_id.name ]] - Versement pour : - Banque Cantonale Vaudoise - 1001 Lausanne - - - Motif : + [[ user.company_id.partner_id.name ]] + [[ user.company_id.partner_id.address[0].name ]] + [[ user.company_id.partner_id.address[0].street ]] + [[ user.company_id.partner_id.address[0].street2 ]] + [[ user.company_id.partner_id.address[0].zip ]] [[ user.company_id.partner_id.address[0].country_id.name ]] + + + + [[ mod10r(o.number).rjust(27,'0') ]] - En faveur de : - ALCO SA - 1022 Chavanne-Lausanne + + + - En faveur de : - ALCO SA - 1022 Chavanne-Lausanne - - - + @@ -102,31 +122,10 @@ - compte : [[mod10r(user.company_id.partner_id.bank_ids[0].iban) or '']] + [[ ('%.2f' % o.amount_total)[:-3] +' . '+ ('%.2f' % o.amount_total)[-2:] ]] - compte : [[mod10r(user.company_id.partner_id.bank_ids[0].iban) or '']] - - - - - - - - - - - - - - - CHF [[ '%.2f' % o.amount_total ]] - - - CHF [[ '%.2f' % o.amount_total ]] - - - [[ mod10r(o.number).rjust(27,'0')]] + [[ ('%.2f' % o.amount_total)[:-3] +' . '+ ('%.2f' % o.amount_total)[-2:] ]] @@ -136,51 +135,35 @@ - Versé par - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] - [[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]] - - - + - Versé par - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] - [[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]] + + + - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + @@ -188,10 +171,7 @@ 01[[mod10r('%.2f' % o.amount_total).rjust(11,'0')]]> - [[ mod10r(o.number).rjust(27,'0')]]+ - - - [[mod10r(user.company_id.partner_id.bank_ids[0].iban)]]> + [[ mod10r(o.number).rjust(27,'0')]]+ [[user.company_id.bvr_number]]> @@ -199,7 +179,6 @@ - diff --git a/addons/l10n_ch/bvr/bvr_report.xml b/addons/l10n_ch/bvr/bvr_report.xml index 82027a50dfd..3d569613f2d 100644 --- a/addons/l10n_ch/bvr/bvr_report.xml +++ b/addons/l10n_ch/bvr/bvr_report.xml @@ -3,10 +3,10 @@ diff --git a/addons/l10n_ch_bvr/__init__.py b/addons/l10n_ch/bvr/company.py similarity index 78% rename from addons/l10n_ch_bvr/__init__.py rename to addons/l10n_ch/bvr/company.py index 450bd78cdfc..585a4302ca7 100644 --- a/addons/l10n_ch_bvr/__init__.py +++ b/addons/l10n_ch/bvr/company.py @@ -1,7 +1,9 @@ +# -*- encoding: utf-8 -*- ############################################################################## # -# Copyright (c) 2004 TINY SPRL. (http://tiny.be) All Rights Reserved. -# Fabien Pinckaers +# Copyright (c) 2004-2006 TINY SPRL. (http://tiny.be) All Rights Reserved. +# +# $Id: account.py 1005 2005-07-25 08:41:42Z nicoe $ # # WARNING: This program as such is intended to be used by professional # programmers who take the whole responsability of assessing all potential @@ -26,4 +28,13 @@ # ############################################################################## -import bvr +import netsvc +from osv import fields, osv + +class res_company(osv.osv): + _inherit = "res.company" + _columns = { + 'bvr_number': fields.char('BVR Number', size=9) + } +res_company() + diff --git a/addons/l10n_ch/bvr/company_view.xml b/addons/l10n_ch/bvr/company_view.xml new file mode 100644 index 00000000000..9fec6011c9f --- /dev/null +++ b/addons/l10n_ch/bvr/company_view.xml @@ -0,0 +1,18 @@ + + + + + res.company.form.inherit.bvr + res.company + form + + + + + + + + + + + diff --git a/addons/l10n_ch_bvr/__terp__.py b/addons/l10n_ch_bvr/__terp__.py deleted file mode 100644 index ea7c64ddd2f..00000000000 --- a/addons/l10n_ch_bvr/__terp__.py +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name" : "Localisation for Switzerland - BVR and DTA Support", - "version" : "1.0", - "author" : "Tiny", - "category" : "Localisation/Europe", - "depends" : ["l10n_ch"], - "init_xml" : [], - "update_xml" : ["bvr/bvr_report.xml"], - "demo_xml" : [], - "active": True, - "installable": True -} diff --git a/addons/l10n_ch_bvr/account_demo.xml b/addons/l10n_ch_bvr/account_demo.xml deleted file mode 100644 index 98793851804..00000000000 --- a/addons/l10n_ch_bvr/account_demo.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/addons/l10n_ch_bvr/account_vat.xml b/addons/l10n_ch_bvr/account_vat.xml deleted file mode 100644 index 076bcc9ddb7..00000000000 --- a/addons/l10n_ch_bvr/account_vat.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - -# -# Tax Code Definitions -# - - - TVA Net - - - - - Solde de TVA a payer a l'AFC - 150 - - - - - TVA Due (TVA a payer) - 100 - - - - Impot préalable (TVA a récupérer) - 110 - - - - Impot préalable sur investissements (TVA a récupérer) - 111 - - - - - Base de calcul de TVA - - - - - - - Chiffre d'affaires imposable - 080 - - - - Chiffre d'affaires imposable a 7.6% - 070 - - - - Chiffre d'affaires imposable a 2.4% - 071 - - - - Chiffre d'affaires imposable a 3.6% - 074 - - - - - Acquisition de biens et services - - - - - Acquisition de biens et services - 110 - - - - Acquisition de biens d'investissements - 111 - - - - - - - - - # - # TVA - Taxe sur la Valeur Ajoutée - # - - - TVA 2.4% - - percent - - - - - - - - - - TVA 3.6% - - percent - - - - - - - - - - TVA 7.6% - - percent - - - - - - - - - - - - TVA 2.4% sur investissements - - percent - - - - - - - - - - TVA 3.6% sur investissements - - percent - - - - - - - - - - TVA 7.6% sur investissements - - percent - - - - - - - - - - - TVA 0% Exportations - - percent - - - - - - - - - - - - diff --git a/addons/l10n_ch_bvr/bvr/__init__.py b/addons/l10n_ch_bvr/bvr/__init__.py deleted file mode 100644 index 450bd78cdfc..00000000000 --- a/addons/l10n_ch_bvr/bvr/__init__.py +++ /dev/null @@ -1,29 +0,0 @@ -############################################################################## -# -# Copyright (c) 2004 TINY SPRL. (http://tiny.be) All Rights Reserved. -# Fabien Pinckaers -# -# 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 bvr diff --git a/addons/l10n_ch_bvr/bvr/bvr.py b/addons/l10n_ch_bvr/bvr/bvr.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/addons/l10n_ch_bvr/bvr/bvr.rml b/addons/l10n_ch_bvr/bvr/bvr.rml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/addons/l10n_ch_bvr/bvr/bvr_report.xml b/addons/l10n_ch_bvr/bvr/bvr_report.xml deleted file mode 100644 index 6061670f3fd..00000000000 --- a/addons/l10n_ch_bvr/bvr/bvr_report.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - diff --git a/addons/purchase_journal/purchase_journal_report.py b/addons/purchase_journal/purchase_journal_report.py index 358a7e5c0bd..ead3cb50081 100644 --- a/addons/purchase_journal/purchase_journal_report.py +++ b/addons/purchase_journal/purchase_journal_report.py @@ -36,15 +36,14 @@ class report_purchase_journal_purchase(osv.osv): _columns = { 'name': fields.date('Month', readonly=True), 'state': fields.selection([ - ('draft','Quotation'), - ('waiting_date','Waiting Schedule'), - ('manual','Manual in progress'), - ('progress','In progress'), - ('shipping_except','Shipping Exception'), - ('invoice_except','Invoice Exception'), - ('done','Done'), - ('cancel','Cancel') - ], 'Order State', readonly=True), + ('draft', 'Request for Quotation'), + ('wait', 'Waiting'), + ('confirmed', 'Confirmed'), + ('approved', 'Approved'), + ('except_ship', 'Shipping Exception'), + ('except_invoice', 'Invoice Exception'), + ('done', 'Done'), ('cancel', 'Cancelled')], 'Order State', readonly=True, + select=True), 'journal_id':fields.many2one('purchase_journal.purchase.journal', 'Journal', readonly=True, relate=True), 'quantity': fields.float('Quantities', readonly=True), 'price_total': fields.float('Total Price', readonly=True), diff --git a/addons/purchase_journal/purchase_journal_view.xml b/addons/purchase_journal/purchase_journal_view.xml index 94df7223766..7aa1b45c737 100644 --- a/addons/purchase_journal/purchase_journal_view.xml +++ b/addons/purchase_journal/purchase_journal_view.xml @@ -113,9 +113,8 @@ purchase.order - + - @@ -127,7 +126,6 @@ -