Merge with trunk_old
bzr revid: ced-4cf5f906c3625e477ad24a47b8defeab9bd5938f
This commit is contained in:
parent
e5de2aa0d5
commit
97fe54cf15
|
@ -0,0 +1,29 @@
|
|||
##############################################################################
|
||||
#
|
||||
# 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
|
|
@ -0,0 +1,12 @@
|
|||
{
|
||||
"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
|
||||
}
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0"?>
|
||||
<terp>
|
||||
<data noupdate="1">
|
||||
|
||||
</data>
|
||||
</terp>
|
|
@ -0,0 +1,179 @@
|
|||
<?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>
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
##############################################################################
|
||||
#
|
||||
# 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
|
|
@ -0,0 +1,16 @@
|
|||
<?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>
|
||||
|
||||
|
|
@ -60,5 +60,5 @@ class report_account_analytic_line_to_invoice(osv.osv):
|
|||
GROUP BY SUBSTRING(date for 7), product_id, product_uom_id, account_id
|
||||
)
|
||||
""")
|
||||
report_account_analytic_line_to_invoice()
|
||||
#report_account_analytic_line_to_invoice()
|
||||
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
<field name="description">so sweeeeeet, but so bad for your teeth...</field>
|
||||
</record>
|
||||
|
||||
|
||||
<record model="sandwich.product" id="club">
|
||||
<field name="name">club</field>
|
||||
<field name="price">2.00</field>
|
||||
|
|
|
@ -158,16 +158,16 @@
|
|||
<field name="arch" type="xml">
|
||||
<form string="Ordering of this day sandwich">
|
||||
<notebook>
|
||||
<page string="Order of the day">
|
||||
<page string="Sandwich Order">
|
||||
<separator string="Informations" colspan="4"/>
|
||||
<field name="name" colspan="3" select="1"/>
|
||||
<field name="partner" select="1"/>
|
||||
<field name="date" select="1"/>
|
||||
<separator string="Order lines" colspan="4"/>
|
||||
<field name="order_lines" colspan="3" select="1"/>
|
||||
<field name="order_lines" colspan="3"/>
|
||||
</page>
|
||||
<page string="notes">
|
||||
<field name="note" colspan="3" select="1"/>
|
||||
<field name="note" colspan="4" nolabel="1" select="1"/>
|
||||
</page>
|
||||
</notebook>
|
||||
</form>
|
||||
|
|
|
@ -7,5 +7,5 @@
|
|||
"update_xml" : ["custom_view.xml", "custom_report.xml"],
|
||||
"category" : "Enterprise Specific Modules/Travel Agencies",
|
||||
"active": False,
|
||||
"installable": False
|
||||
"installable": True
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue