Modifs vor BVR
bzr revid: pinky-047118ef26c6f87d08821e6ef865b8091999602d
This commit is contained in:
pinky
parent
bf5a175366
commit
12fea2a68e
|
|
@ -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,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,3 +27,4 @@
|
|||
##############################################################################
|
||||
|
||||
import bvr
|
||||
import company
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
<document filename="test.pdf">
|
||||
<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
|
||||
<pageTemplate id="first">
|
||||
<frame id="Frame1" x1="33.0" y1="7" width="527.0" height="68.0"/>
|
||||
<frame id="first" x1="34.0" y1="28.0" width="527" height="786"/>
|
||||
<frame id="Frame1" x1="33.0" y1="32" width="527.0" height="210.0"/>
|
||||
<frame id="first" x1="34.0" y1="28.0" width="527" height="706"/>
|
||||
</pageTemplate>
|
||||
</template>
|
||||
<stylesheet>
|
||||
|
|
@ -14,21 +14,25 @@
|
|||
<blockTableStyle id="Table1">
|
||||
<blockAlignment value="LEFT"/>
|
||||
<blockValign value="TOP"/>
|
||||
<lineStyle kind="GRID" colorName="black"/>
|
||||
</blockTableStyle>
|
||||
<blockTableStyle id="Table2">
|
||||
<blockAlignment value="LEFT"/>
|
||||
<blockValign value="TOP"/>
|
||||
</blockTableStyle>
|
||||
<initialize>
|
||||
<paraStyle name="all" alignment="justify"/>
|
||||
</initialize>
|
||||
<paraStyle name="P1" fontName="Courier-Bold" fontSize="12.0" leading="15" alignment="LEFT"/>
|
||||
<paraStyle name="P2" fontName="Courier" fontSize="9.0" leading="11" alignment="LEFT"/>
|
||||
<paraStyle name="P3" fontName="Courier" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P4" fontName="Courier" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P5" fontName="Courier" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P6" fontName="Courier" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P1" fontName="Times-Roman" fontSize="11.0" leading="14"/>
|
||||
<paraStyle name="P2" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT"/>
|
||||
<paraStyle name="P3" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P4" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P5" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P6" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P7" fontName="Courier-Bold" fontSize="12.0" leading="15" alignment="LEFT"/>
|
||||
<paraStyle name="P8" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P9" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P10" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P9" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="P10" fontName="Times-Roman" fontSize="11.0" leading="14"/>
|
||||
<paraStyle name="P11" fontName="Times-Roman" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="Standard" fontName="Times-Roman"/>
|
||||
<paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
<paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
|
||||
|
|
@ -40,57 +44,73 @@
|
|||
</stylesheet>
|
||||
<story>
|
||||
<para style="P8">[[ repeatIn(objects,'o') ]]<font face="Times-Roman">[[ setLang(o.partner_id.lang) ]]</font></para>
|
||||
<para style="P9">Header of Document</para>
|
||||
<para style="P9">
|
||||
<blockTable colWidths="264.0,264.0" style="Table2">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P9">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P10">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
|
||||
<para style="P10">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
|
||||
<para style="P10">[[ o.address_invoice_id.street ]]</para>
|
||||
<para style="P10">[[ o.address_invoice_id.street2 or '' ]]</para>
|
||||
<para style="P10">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
|
||||
<para style="P10">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]]</para>
|
||||
<para style="P10">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
<para style="P11">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
<para style="P9">
|
||||
<para style="P11"><font face="Helvetica-Bold">Subject: </font>Invoice - [[ o.number ]]</para>
|
||||
<para style="P11">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
<para style="P9">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
<para style="P10">
|
||||
<para style="P11">Dear customer,</para>
|
||||
<para style="P11">Here is the BVR to allow you to pay the invoice ' <font face="Times-Roman">[[ o.name ]]</font>', reference:<font face="Times-Roman"> [[ o.number ]].</font></para>
|
||||
<para style="P11">Thanks,</para>
|
||||
<para style="P11">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
<para style="P11">[[ user.signature ]]</para>
|
||||
<currentFrame name="Frame1"/>
|
||||
<para style="P1">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
<blockTable colWidths="126.0,135.0,167.0,90.0" style="Table1">
|
||||
<blockTable colWidths="144.0,151.0,243.0" style="Table1">
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P2">Versement pour :</para>
|
||||
<para style="P2">Banque Cantonale Vaudoise</para>
|
||||
<para style="P2">1001 Lausanne</para>
|
||||
<para style="P1">[[ user.company_id.partner_id.name ]]</para>
|
||||
<para style="P1">[[ user.company_id.partner_id.address[0].name ]]</para>
|
||||
<para style="P1">[[ user.company_id.partner_id.address[0].street ]]</para>
|
||||
<para style="P1">[[ user.company_id.partner_id.address[0].street2 ]]</para>
|
||||
<para style="P1">[[ user.company_id.partner_id.address[0].zip ]] [[ user.company_id.partner_id.address[0].country_id.name ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P2">Versement pour :</para>
|
||||
<para style="P2">Banque Cantonale Vaudoise</para>
|
||||
<para style="P2">1001 Lausanne</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P3">Motif :</para>
|
||||
<para style="P1">[[ user.company_id.partner_id.name ]]</para>
|
||||
<para style="P1">[[ user.company_id.partner_id.address[0].name ]]</para>
|
||||
<para style="P1">[[ user.company_id.partner_id.address[0].street ]]</para>
|
||||
<para style="P1">[[ user.company_id.partner_id.address[0].street2 ]]</para>
|
||||
<para style="P2">[[ user.company_id.partner_id.address[0].zip ]] [[ user.company_id.partner_id.address[0].country_id.name ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P3">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
<para style="P3">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
<para style="P3">[[ mod10r(o.number).rjust(27,'0') ]]</para>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P3">En faveur de :</para>
|
||||
<para style="P3">ALCO SA</para>
|
||||
<para style="P4">1022 Chavanne-Lausanne</para>
|
||||
<para style="P4">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P3">En faveur de :</para>
|
||||
<para style="P3">ALCO SA</para>
|
||||
<para style="P3">1022 Chavanne-Lausanne</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P3">
|
||||
<para style="P4">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
</td>
|
||||
|
|
@ -102,31 +122,10 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P3">compte : <font face="Times-Roman">[[mod10r(user.company_id.partner_id.bank_ids[0].iban) or '']]</font></para>
|
||||
<para style="P4">[[ ('%.2f' % o.amount_total)[:-3] +' . '+ ('%.2f' % o.amount_total)[-2:] ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P3">compte : <font face="Times-Roman">[[mod10r(user.company_id.partner_id.bank_ids[0].iban) or '']]</font></para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P3">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P3">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P5">CHF [[ '%.2f' % o.amount_total ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P5">CHF [[ '%.2f' % o.amount_total ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P4">[[ mod10r(o.number).rjust(27,'0')]]</para>
|
||||
<para style="P4">[[ ('%.2f' % o.amount_total)[:-3] +' . '+ ('%.2f' % o.amount_total)[-2:] ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P3">
|
||||
|
|
@ -136,51 +135,35 @@
|
|||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P2">Versé par</para>
|
||||
<para style="P2">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
|
||||
<para style="P2">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P2">
|
||||
<para style="P5">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P3">Versé par</para>
|
||||
<para style="P2">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
|
||||
<para style="P3">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
|
||||
<para style="P5">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P3">
|
||||
<para style="P5">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P5">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P3">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P3">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P3">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P3">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<para style="P3">
|
||||
<para style="P5">
|
||||
<font color="white"> </font>
|
||||
</para>
|
||||
</td>
|
||||
|
|
@ -188,10 +171,7 @@
|
|||
<para style="P6">01<font face="Times-Roman">[[mod10r('%.2f' % o.amount_total).rjust(11,'0')]]></font></para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P4">[[ mod10r(o.number).rjust(27,'0')]]+</para>
|
||||
</td>
|
||||
<td>
|
||||
<para style="P4">[[mod10r(user.company_id.partner_id.bank_ids[0].iban)]]></para>
|
||||
<para style="P3">[[ mod10r(o.number).rjust(27,'0')]]+ [[user.company_id.bvr_number]]></para>
|
||||
</td>
|
||||
</tr>
|
||||
</blockTable>
|
||||
|
|
@ -199,7 +179,6 @@
|
|||
<font color="white"> </font>
|
||||
</para>
|
||||
<frameEnd/>
|
||||
<pageBreak/>
|
||||
</story>
|
||||
</document>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@
|
|||
<data>
|
||||
<report
|
||||
id="account_invoice_bvr"
|
||||
string="BVR report"
|
||||
string="BVR A4 Sheet"
|
||||
model="account.invoice"
|
||||
name="l10n_ch.bvr"
|
||||
rml="l10n_ch_bvr/bvr/bvr.rml"
|
||||
rml="l10n_ch/bvr/bvr.rml"
|
||||
auto="False"
|
||||
/>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
# -*- encoding: utf-8 -*-
|
||||
##############################################################################
|
||||
#
|
||||
# Copyright (c) 2004 TINY SPRL. (http://tiny.be) All Rights Reserved.
|
||||
# Fabien Pinckaers <fp@tiny.Be>
|
||||
# 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()
|
||||
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
<?xml version="1.0"?>
|
||||
<terp>
|
||||
<data>
|
||||
<record model="ir.ui.view" id="company_form_view">
|
||||
<field name="name">res.company.form.inherit.bvr</field>
|
||||
<field name="model">res.company</field>
|
||||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="base.view_company_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="rml_footer2" position="after">
|
||||
<field name="bvr_number"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
</data>
|
||||
</terp>
|
||||
|
||||
|
||||
|
|
@ -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
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<terp>
|
||||
<data noupdate="1">
|
||||
|
||||
</data>
|
||||
</terp>
|
||||
|
|
@ -1,179 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<terp>
|
||||
<data noupdate="True">
|
||||
|
||||
#
|
||||
# Tax Code Definitions
|
||||
#
|
||||
|
||||
<record model="account.tax.code" id="vat_code_net">
|
||||
<field name="name">TVA Net</field>
|
||||
<field name="code"></field>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code" id="vat_code_balance_net">
|
||||
<field name="name">Solde de TVA a payer a l'AFC</field>
|
||||
<field name="code">150</field>
|
||||
<field name="parent_id" ref="vat_code_net"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code" id="vat_code_due_tva">
|
||||
<field name="name">TVA Due (TVA a payer)</field>
|
||||
<field name="code">100</field>
|
||||
<field name="parent_id" ref="vat_code_balance_net"/>
|
||||
</record>
|
||||
<record model="account.tax.code" id="vat_code_payable">
|
||||
<field name="name">Impot préalable (TVA a récupérer)</field>
|
||||
<field name="code">110</field>
|
||||
<field name="parent_id" ref="vat_code_balance_net"/>
|
||||
</record>
|
||||
<record model="account.tax.code" id="vat_code_payable_invest">
|
||||
<field name="name">Impot préalable sur investissements (TVA a récupérer)</field>
|
||||
<field name="code">111</field>
|
||||
<field name="parent_id" ref="vat_code_balance_net"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code" id="vat_code_base_net">
|
||||
<field name="name">Base de calcul de TVA</field>
|
||||
<field name="code"></field>
|
||||
<field name="parent_id" ref="vat_code_net"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record model="account.tax.code" id="vat_code_base_due">
|
||||
<field name="name">Chiffre d'affaires imposable</field>
|
||||
<field name="code">080</field>
|
||||
<field name="parent_id" ref="vat_code_base_net"/>
|
||||
</record>
|
||||
<record model="account.tax.code" id="vat_code_due_76">
|
||||
<field name="name">Chiffre d'affaires imposable a 7.6%</field>
|
||||
<field name="code">070</field>
|
||||
<field name="parent_id" ref="vat_code_base_due"/>
|
||||
</record>
|
||||
<record model="account.tax.code" id="vat_code_due_24">
|
||||
<field name="name">Chiffre d'affaires imposable a 2.4%</field>
|
||||
<field name="code">071</field>
|
||||
<field name="parent_id" ref="vat_code_base_due"/>
|
||||
</record>
|
||||
<record model="account.tax.code" id="vat_code_due_36">
|
||||
<field name="name">Chiffre d'affaires imposable a 3.6%</field>
|
||||
<field name="code">074</field>
|
||||
<field name="parent_id" ref="vat_code_base_due"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code" id="vat_code_receivable_net">
|
||||
<field name="name">Acquisition de biens et services</field>
|
||||
<field name="code"></field>
|
||||
<field name="parent_id" ref="vat_code_base_net"/>
|
||||
</record>
|
||||
<record model="account.tax.code" id="vat_code_receivable_base">
|
||||
<field name="name">Acquisition de biens et services</field>
|
||||
<field name="code">110</field>
|
||||
<field name="parent_id" ref="vat_code_receivable_net"/>
|
||||
</record>
|
||||
<record model="account.tax.code" id="vat_code_receivable_base_invest">
|
||||
<field name="name">Acquisition de biens d'investissements</field>
|
||||
<field name="code">111</field>
|
||||
<field name="parent_id" ref="vat_code_receivable_net"/>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#
|
||||
# TVA - Taxe sur la Valeur Ajoutée
|
||||
#
|
||||
|
||||
<record model="account.tax" id="vat_24">
|
||||
<field name="name">TVA 2.4%</field>
|
||||
<field name="amount" eval="0.024"/>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="vat_payable24"/>
|
||||
<field name="account_paid_id" ref="vat_refund24"/>
|
||||
|
||||
<field name="base_code_id" ref="vat_code_due_24"/>
|
||||
<field name="tax_code_id" ref="vat_code_due_tva"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_receivable_base"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable"/>
|
||||
</record>
|
||||
<record model="account.tax" id="vat_36">
|
||||
<field name="name">TVA 3.6%</field>
|
||||
<field name="amount" eval="0.036"/>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="vat_payable36"/>
|
||||
<field name="account_paid_id" ref="vat_refund36"/>
|
||||
|
||||
<field name="base_code_id" ref="vat_code_due_36"/>
|
||||
<field name="tax_code_id" ref="vat_code_due_tva"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_receivable_base"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable"/>
|
||||
</record>
|
||||
<record model="account.tax" id="vat_76">
|
||||
<field name="name">TVA 7.6%</field>
|
||||
<field name="amount" eval="0.076"/>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="vat_payable76"/>
|
||||
<field name="account_paid_id" ref="vat_refund76"/>
|
||||
|
||||
<field name="base_code_id" ref="vat_code_due_76"/>
|
||||
<field name="tax_code_id" ref="vat_code_due_tva"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_receivable_base"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable"/>
|
||||
</record>
|
||||
|
||||
|
||||
<record model="account.tax" id="vat_24_invest">
|
||||
<field name="name">TVA 2.4% sur investissements</field>
|
||||
<field name="amount" eval="0.024"/>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="vat_payable24"/>
|
||||
<field name="account_paid_id" ref="vat_refund24"/>
|
||||
|
||||
<field name="base_code_id" ref="vat_code_due_base"/>
|
||||
<field name="tax_code_id" ref="vat_code_due_tva"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_receivable_base_invest"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable_invest"/>
|
||||
</record>
|
||||
<record model="account.tax" id="vat_36_invest">
|
||||
<field name="name">TVA 3.6% sur investissements</field>
|
||||
<field name="amount" eval="0.036"/>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="vat_payable36"/>
|
||||
<field name="account_paid_id" ref="vat_refund36"/>
|
||||
|
||||
<field name="base_code_id" ref="vat_code_due_base"/>
|
||||
<field name="tax_code_id" ref="vat_code_due_tva"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_receivable_base_invest"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable_invest"/>
|
||||
</record>
|
||||
<record model="account.tax" id="vat_76_invest">
|
||||
<field name="name">TVA 7.6% sur investissements</field>
|
||||
<field name="amount" eval="0.076"/>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="vat_payable76"/>
|
||||
<field name="account_paid_id" ref="vat_refund76"/>
|
||||
|
||||
<field name="base_code_id" ref="vat_code_due_base"/>
|
||||
<field name="tax_code_id" ref="vat_code_due_tva"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_receivable_base_invest"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable_invest"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax" id="vat_XO">
|
||||
<field name="name">TVA 0% Exportations</field>
|
||||
<field name="amount" eval="0.00"/>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="vat_payable76"/>
|
||||
<field name="account_paid_id" ref="vat_refund76"/>
|
||||
|
||||
<field name="base_code_id" ref="vat_code_due_base"/>
|
||||
<field name="tax_code_id" ref="vat_code_due_tva"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_receivable_base"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable"/>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</terp>
|
||||
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
##############################################################################
|
||||
#
|
||||
# Copyright (c) 2004 TINY SPRL. (http://tiny.be) All Rights Reserved.
|
||||
# Fabien Pinckaers <fp@tiny.Be>
|
||||
#
|
||||
# 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
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||
<terp>
|
||||
<data>
|
||||
<report
|
||||
id="account_invoice_bvr"
|
||||
string="Bvr report"
|
||||
model="account.invoice"
|
||||
name="l10n_ch.bvr"
|
||||
rml="l10n_ch/bvr/bvr.rml"
|
||||
auto="False"
|
||||
/>
|
||||
|
||||
</data>
|
||||
</terp>
|
||||
|
||||
|
||||
|
|
@ -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),
|
||||
|
|
|
|||
|
|
@ -113,9 +113,8 @@
|
|||
<field name="model">purchase.order</field>
|
||||
<field name="inherit_id" ref="purchase.purchase_order_form" />
|
||||
<field name="arch" type="xml">
|
||||
<field name="client_order_ref" position="after">
|
||||
<field name="date_approve" position="after">
|
||||
<field name="journal_id" select="1"/>
|
||||
<field name="invoice_type_id" select="1"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
|
@ -127,7 +126,6 @@
|
|||
<field name="arch" type="xml">
|
||||
<field name="state" position="after">
|
||||
<field name="journal_id"/>
|
||||
<field name="invoice_type_id"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
|||
Loading…
Reference in New Issue