[tryton-debian-vcs] tryton-modules-account-fr branch debian updated. debian/3.0.0-3-4-gf06bbe3
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Apr 22 13:05:09 UTC 2014
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-fr.git;a=commitdiff;h=debian/3.0.0-3-4-gf06bbe3
commit f06bbe33ad31767e840e45adc8aa96f6018a8b23
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:59:33 2014 +0200
Bumping minimal required Python version to 2.7.
diff --git a/debian/control b/debian/control
index bea6f5e..1dac5a4 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=tryton/tryton-modules-account-fr.git
Vcs-Git: git://anonscm.debian.org/tryton/tryton-modules-account-fr.git
-X-Python-Version: >= 2.6
+X-Python-Version: >= 2.7
Package: tryton-modules-account-fr
Architecture: all
commit 9ba6bf36a765de9fe26b39f26b93e11fa5bd4926
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:45:30 2014 +0200
Updating copyright.
diff --git a/debian/copyright b/debian/copyright
index ee3fd5a..7e13f69 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2010-2013 Cédric Krier
+Copyright: 2010-2014 Cédric Krier
2010-2011 Bertrand Chenal
2010-2013 Nicolas Évrard
- 2010-2013 B2CK SPRL
+ 2010-2014 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 79f601e59f23650c91197e82d37b65a0d5542bfc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Apr 22 14:20:34 2014 +0200
Merging upstream version 3.2.0.
diff --git a/CHANGELOG b/CHANGELOG
index a162b66..0704fff 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 3.2.0 - 2014-04-21
+* Bug fixes (see mercurial logs for details)
+* New tax rates for 2014
+
Version 3.0.0 - 2013-10-21
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 9d44076..2a589ac 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2010-2013 Cédric Krier.
+Copyright (C) 2010-2014 Cédric Krier.
Copyright (C) 2010-2011 Bertrand Chenal.
Copyright (C) 2010-2013 Nicolas Évrard.
-Copyright (C) 2010-2013 B2CK SPRL.
+Copyright (C) 2010-2014 B2CK SPRL.
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
diff --git a/INSTALL b/INSTALL
index d1073b5..6979773 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_account_fr
Prerequisites
-------------
- * Python 2.6 or later (http://www.python.org/)
+ * Python 2.7 or later (http://www.python.org/)
* trytond (http://www.tryton.org/)
* trytond_account (http://www.tryton.org/)
diff --git a/MANIFEST.in b/MANIFEST.in
index 44969c7..f858323 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,10 +1,8 @@
include INSTALL
include README
-include TODO
include COPYRIGHT
include CHANGELOG
include LICENSE
include tryton.cfg
include *.xml
-include *.odt
include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index c65ebb9..8f98000 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_account_fr
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module with French chart of accounts
Home-page: http://www.tryton.org/
Author: Tryton
-Author-email: UNKNOWN
+Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.0/
+Download-URL: http://downloads.tryton.org/3.2/
Description: trytond_account_fr
==================
@@ -43,6 +43,7 @@ Description: trytond_account_fr
http://www.tryton.org/
+Keywords: tryton account chart french
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -53,7 +54,6 @@ Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: French
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/__init__.py b/__init__.py
index c86640b..0d2f89a 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,2 +1,12 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
+
+from trytond.pool import Pool
+from account import *
+
+
+def register():
+ Pool.register(
+ TaxTemplate,
+ TaxRuleTemplate,
+ module='account_fr', type_='model')
diff --git a/account.py b/account.py
new file mode 100644
index 0000000..cd6597f
--- /dev/null
+++ b/account.py
@@ -0,0 +1,70 @@
+#This file is part of Tryton. The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+from sql import Table
+
+from trytond.pool import PoolMeta
+from trytond.transaction import Transaction
+
+
+__all__ = ['TaxTemplate', 'TaxRuleTemplate']
+__metaclass__ = PoolMeta
+
+
+class TaxTemplate:
+ __name__ = 'account.tax.template'
+
+ @classmethod
+ def __register__(cls, module_name):
+ cursor = Transaction().cursor
+ model_data = Table('ir_model_data')
+
+ # Migration from 3.0: new tax rates
+ if module_name == 'account_fr':
+ for old_id, new_id in (
+ ('tva_vente_19_6', 'tva_vente_taux_normal'),
+ ('tva_vente_7', 'tva_vente_taux_intermediaire'),
+ ('tva_vente_intracommunautaire_19_6',
+ 'tva_vente_intracommunautaire_taux_normal'),
+ ('tva_vente_intracommunautaire_7',
+ 'tva_vente_intracommunautaire_taux_intermediaire'),
+ ('tva_achat_19_6', 'tva_achat_taux_normal'),
+ ('tva_achat_7', 'tva_achat_taux_intermediaire'),
+ ('tva_achat_intracommunautaire_19_6',
+ 'tva_achat_intracommunautaire_taux_normal'),
+ ):
+ cursor.execute(*model_data.select(model_data.id,
+ where=(model_data.fs_id == new_id)
+ & (model_data.module == module_name)))
+ if cursor.fetchone():
+ continue
+ cursor.execute(*model_data.update(
+ columns=[model_data.fs_id],
+ values=[new_id],
+ where=(model_data.fs_id == old_id)
+ & (model_data.module == module_name)))
+
+ super(TaxTemplate, cls).__register__(module_name)
+
+
+class TaxRuleTemplate:
+ __name__ = 'account.tax.rule.template'
+
+ @classmethod
+ def __register__(cls, module_name):
+ cursor = Transaction().cursor
+ model_data = Table('ir_model_data')
+
+ if module_name == 'account_fr':
+ for old_id, new_id in (
+ ('tax_rule_ventes_intracommunautaires_19_6',
+ 'tax_rule_ventes_intracommunautaires_taux_normal'),
+ ('tax_rule_ventes_intracommunautaires_7',
+ 'tax_rule_ventes_intracommunautaires_taux_intermediaire'),
+ ):
+ cursor.execute(*model_data.update(
+ columns=[model_data.fs_id],
+ values=[new_id],
+ where=(model_data.fs_id == old_id)
+ & (model_data.module == module_name)))
+
+ super(TaxRuleTemplate, cls).__register__(module_name)
diff --git a/account_fr.xml b/account_fr.xml
index 9bc1190..53f3a89 100644
--- a/account_fr.xml
+++ b/account_fr.xml
@@ -5147,7 +5147,7 @@
<record model="account.account.template" id="4282">
<field name="name">Dettes provisionnées pour congés à payer</field>
<field name="code">4282</field>
- <field name="type" ref="creances_autres"/>
+ <field name="type" ref="dettes_fiscales_sociales"/>
<field name="kind">other</field>
<field name="reconcile" eval="True"/>
<field name="parent" ref="428"/>
@@ -5155,7 +5155,7 @@
<record model="account.account.template" id="4284">
<field name="name">Dettes provisionnées pour participation des salariés aux résultats</field>
<field name="code">4284</field>
- <field name="type" ref="creances_autres"/>
+ <field name="type" ref="dettes_fiscales_sociales"/>
<field name="kind">other</field>
<field name="reconcile" eval="True"/>
<field name="parent" ref="428"/>
@@ -5163,7 +5163,7 @@
<record model="account.account.template" id="4286">
<field name="name">Autres charges à payer</field>
<field name="code">4286</field>
- <field name="type" ref="creances_autres"/>
+ <field name="type" ref="dettes_fiscales_sociales"/>
<field name="kind">other</field>
<field name="reconcile" eval="True"/>
<field name="parent" ref="428"/>
@@ -5208,7 +5208,7 @@
<record model="account.account.template" id="4382">
<field name="name">Charges sociales sur congés à payer</field>
<field name="code">4382</field>
- <field name="type" ref="creances_autres"/>
+ <field name="type" ref="dettes_fiscales_sociales"/>
<field name="kind">other</field>
<field name="reconcile" eval="True"/>
<field name="parent" ref="438"/>
@@ -5216,7 +5216,7 @@
<record model="account.account.template" id="4386">
<field name="name">Autres charges à payer</field>
<field name="code">4386</field>
- <field name="type" ref="creances_autres"/>
+ <field name="type" ref="dettes_fiscales_sociales"/>
<field name="kind">other</field>
<field name="reconcile" eval="True"/>
<field name="parent" ref="438"/>
@@ -5323,7 +5323,7 @@
<record model="account.account.template" id="444">
<field name="name">État - Impôts sur les bénéfices</field>
<field name="code">444</field>
- <field name="type" ref="creances_autres"/>
+ <field name="type" ref="dettes_fiscales_sociales"/>
<field name="kind">other</field>
<field name="reconcile" eval="True"/>
<field name="parent" ref="44"/>
@@ -5353,7 +5353,7 @@
<record model="account.account.template" id="44551">
<field name="name">T.V.A. à décaisser</field>
<field name="code">44551</field>
- <field name="type" ref="creances_autres"/>
+ <field name="type" ref="dettes_fiscales_sociales"/>
<field name="kind">other</field>
<field name="reconcile" eval="True"/>
<field name="parent" ref="4455"/>
@@ -5361,7 +5361,7 @@
<record model="account.account.template" id="44558">
<field name="name">Taxes assimilées à la T.V.A.</field>
<field name="code">44558</field>
- <field name="type" ref="creances_autres"/>
+ <field name="type" ref="dettes_fiscales_sociales"/>
<field name="kind">other</field>
<field name="reconcile" eval="True"/>
<field name="parent" ref="4455"/>
@@ -5422,7 +5422,7 @@
<record model="account.account.template" id="44571">
<field name="name">T.V.A. collectée</field>
<field name="code">44571</field>
- <field name="type" ref="creances_autres"/>
+ <field name="type" ref="dettes_fiscales_sociales"/>
<field name="kind">other</field>
<field name="reconcile" eval="True"/>
<field name="parent" ref="4457"/>
@@ -5430,7 +5430,7 @@
<record model="account.account.template" id="44578">
<field name="name">Taxes assimilées à la T.V.A.</field>
<field name="code">44578</field>
- <field name="type" ref="creances_autres"/>
+ <field name="type" ref="dettes_fiscales_sociales"/>
<field name="kind">other</field>
<field name="reconcile" eval="True"/>
<field name="parent" ref="4457"/>
@@ -5469,7 +5469,7 @@
<record model="account.account.template" id="44584">
<field name="name">T.V.A. récupérée d'avance</field>
<field name="code">44584</field>
- <field name="type" ref="creances_autres"/>
+ <field name="type" ref="dettes_fiscales_sociales"/>
<field name="kind">other</field>
<field name="reconcile" eval="True"/>
<field name="parent" ref="4458"/>
@@ -5485,7 +5485,7 @@
<record model="account.account.template" id="44587">
<field name="name">Taxes sur le chiffre d'affaires sur factures à établir</field>
<field name="code">44587</field>
- <field name="type" ref="creances_autres"/>
+ <field name="type" ref="dettes_fiscales_sociales"/>
<field name="kind">other</field>
<field name="reconcile" eval="True"/>
<field name="parent" ref="4458"/>
@@ -5569,16 +5569,16 @@
<record model="account.account.template" id="4551">
<field name="name">Principal</field>
<field name="code">4551</field>
- <field name="type" ref="creances_autres"/>
- <field name="kind">receivable</field>
+ <field name="type" ref="emprunts_dettes_financieres_diverses"/>
+ <field name="kind">payable</field>
<field name="reconcile" eval="True"/>
<field name="parent" ref="455"/>
</record>
<record model="account.account.template" id="4558">
<field name="name">Intérêts courus</field>
<field name="code">4558</field>
- <field name="type" ref="creances_autres"/>
- <field name="kind">receivable</field>
+ <field name="type" ref="emprunts_dettes_financieres_diverses"/>
+ <field name="kind">payable</field>
<field name="reconcile" eval="True"/>
<field name="parent" ref="455"/>
</record>
@@ -6184,21 +6184,21 @@
<record model="account.account.template" id="5121">
<field name="name">Comptes en monnaie nationale</field>
<field name="code">5121</field>
- <field name="type" ref="emprunts_dettes_etablissements_credit"/>
+ <field name="type" ref="disponibilites"/>
<field name="kind">other</field>
<field name="parent" ref="fr_pcg_cash"/>
</record>
<record model="account.account.template" id="5124">
<field name="name">Comptes en devises</field>
<field name="code">5124</field>
- <field name="type" ref="emprunts_dettes_etablissements_credit"/>
+ <field name="type" ref="disponibilites"/>
<field name="kind">other</field>
<field name="parent" ref="fr_pcg_cash"/>
</record>
<record model="account.account.template" id="514">
<field name="name">Chèques postaux</field>
<field name="code">514</field>
- <field name="type" ref="emprunts_dettes_etablissements_credit"/>
+ <field name="type" ref="disponibilites"/>
<field name="kind">other</field>
<field name="parent" ref="51"/>
</record>
diff --git a/setup.py b/setup.py
index d299d04..1449e5b 100644
--- a/setup.py
+++ b/setup.py
@@ -11,33 +11,51 @@ import ConfigParser
def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+def get_require_version(name):
+ if minor_version % 2:
+ require = '%s >= %s.%s.dev0, < %s.%s'
+ else:
+ require = '%s >= %s.%s, < %s.%s'
+ require %= (name, major_version, minor_version,
+ major_version, minor_version + 1)
+ return require
+
config = ConfigParser.ConfigParser()
config.readfp(open('tryton.cfg'))
info = dict(config.items('tryton'))
for key in ('depends', 'extras_depend', 'xml'):
if key in info:
info[key] = info[key].strip().splitlines()
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+version = info.get('version', '0.0.1')
+major_version, minor_version, _ = version.split('.', 2)
major_version = int(major_version)
minor_version = int(minor_version)
+name = 'trytond_account_fr'
+
+download_url = 'http://downloads.tryton.org/%s.%s/' % (
+ major_version, minor_version)
+if minor_version % 2:
+ version = '%s.%s.dev0' % (major_version, minor_version)
+ download_url = (
+ 'hg+http://hg.tryton.org/modules/%s#egg=%s-%s' % (
+ name[8:], name, version))
requires = []
for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
- requires.append('trytond_%s >= %s.%s, < %s.%s' %
- (dep, major_version, minor_version, major_version,
- minor_version + 1))
-requires.append('trytond >= %s.%s, < %s.%s' %
- (major_version, minor_version, major_version, minor_version + 1))
+ requires.append(get_require_version('trytond_%s' % dep))
+requires.append(get_require_version('trytond'))
-setup(name='trytond_account_fr',
- version=info.get('version', '0.0.1'),
+setup(name=name,
+ version=version,
description='Tryton module with French chart of accounts',
long_description=read('README'),
author='Tryton',
+ author_email='issue_tracker at tryton.org',
url='http://www.tryton.org/',
- download_url=("http://downloads.tryton.org/" +
- info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
+ download_url=download_url,
+ keywords='tryton account chart french',
package_dir={'trytond.modules.account_fr': '.'},
packages=[
'trytond.modules.account_fr',
@@ -56,7 +74,6 @@ setup(name='trytond_account_fr',
'License :: OSI Approved :: GNU General Public License (GPL)',
'Natural Language :: French',
'Operating System :: OS Independent',
- 'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Topic :: Office/Business',
'Topic :: Office/Business :: Financial :: Accounting',
diff --git a/tax_fr.xml b/tax_fr.xml
index 634bedf..64b3edf 100644
--- a/tax_fr.xml
+++ b/tax_fr.xml
@@ -83,6 +83,13 @@ this repository contains the full copyright notices and license terms. -->
<field name="account" ref="root"/>
</record>
+ <record model="account.tax.code.template" id="tax_code_0207b">
+ <field name="name">Taux normal 20%</field>
+ <field name="code">0207</field>
+ <field name="parent" ref="tax_code_imposables_base"/>
+ <field name="account" ref="root"/>
+ </record>
+
<record model="account.tax.code.template" id="tax_code_0105b">
<field name="name">Taux réduit 5,5%</field>
<field name="code">0105</field>
@@ -97,6 +104,13 @@ this repository contains the full copyright notices and license terms. -->
<field name="account" ref="root"/>
</record>
+ <record model="account.tax.code.template" id="tax_code_0151b">
+ <field name="name">Taux réduit 10%</field>
+ <field name="code">0151</field>
+ <field name="parent" ref="tax_code_imposables_base"/>
+ <field name="account" ref="root"/>
+ </record>
+
<record model="account.tax.code.template" id="tax_code_0201b">
<field name="name">Taux normal 8,5%</field>
<field name="code">0201</field>
@@ -187,6 +201,13 @@ this repository contains the full copyright notices and license terms. -->
<field name="account" ref="root"/>
</record>
+ <record model="account.tax.code.template" id="tax_code_0207">
+ <field name="name">Taux normal 20%</field>
+ <field name="code">0207</field>
+ <field name="parent" ref="tax_code_imposables"/>
+ <field name="account" ref="root"/>
+ </record>
+
<record model="account.tax.code.template" id="tax_code_0105">
<field name="name">Taux réduit 5,5%</field>
<field name="code">0105</field>
@@ -201,6 +222,13 @@ this repository contains the full copyright notices and license terms. -->
<field name="account" ref="root"/>
</record>
+ <record model="account.tax.code.template" id="tax_code_0151">
+ <field name="name">Taux réduit 10%</field>
+ <field name="code">0151</field>
+ <field name="parent" ref="tax_code_imposables"/>
+ <field name="account" ref="root"/>
+ </record>
+
<record model="account.tax.code.template" id="tax_code_0201">
<field name="name">Taux normal 8,5%</field>
<field name="code">0201</field>
@@ -560,10 +588,46 @@ this repository contains the full copyright notices and license terms. -->
<field name="kind">purchase</field>
</record>
+ <record model="account.tax.template" id="tva_vente_taux_normal">
+ <field name="name">T.V.A. Vente Taux Normal</field>
+ <field name="description">T.V.A. Taux Normal</field>
+ <field name="group" ref="group_tva_vente"/>
+ <field name="rate" eval="None"/>
+ <field name="type">none</field>
+ <field name="invoice_account" eval="None"/>
+ <field name="credit_note_account" eval="None"/>
+ <field name="invoice_base_code" eval="None"/>
+ <field name="invoice_tax_code" eval="None"/>
+ <field name="credit_note_base_code" eval="None"/>
+ <field name="credit_note_base_sign" eval="None"/>
+ <field name="credit_note_tax_code" eval="None"/>
+ <field name="credit_note_tax_sign" eval="None"/>
+ <field name="account" ref="root"/>
+ </record>
+
+ <record model="account.tax.template" id="tva_vente_20">
+ <field name="name">T.V.A. Vente 20%</field>
+ <field name="description">T.V.A. 20%</field>
+ <field name="parent" ref="tva_vente_taux_normal"/>
+ <field name="start_date">2014-01-01</field>
+ <field name="rate" eval="Decimal('.20')"/>
+ <field name="type">percentage</field>
+ <field name="invoice_account" ref="44571"/>
+ <field name="credit_note_account" ref="44571"/>
+ <field name="invoice_base_code" ref="tax_code_0207b"/>
+ <field name="invoice_tax_code" ref="tax_code_0207"/>
+ <field name="credit_note_base_code" ref="tax_code_0207b"/>
+ <field name="credit_note_base_sign" eval="Decimal('-1')"/>
+ <field name="credit_note_tax_code" ref="tax_code_0207"/>
+ <field name="credit_note_tax_sign" eval="Decimal('-1')"/>
+ <field name="account" ref="root"/>
+ </record>
+
<record model="account.tax.template" id="tva_vente_19_6">
<field name="name">T.V.A. Vente 19,6%</field>
<field name="description">T.V.A. 19,6%</field>
- <field name="group" ref="group_tva_vente"/>
+ <field name="parent" ref="tva_vente_taux_normal"/>
+ <field name="end_date">2013-12-31</field>
<field name="rate" eval="Decimal('.196')"/>
<field name="type">percentage</field>
<field name="invoice_account" ref="44571"/>
@@ -577,19 +641,37 @@ this repository contains the full copyright notices and license terms. -->
<field name="account" ref="root"/>
</record>
- <record model="account.tax.template" id="tva_vente_8_5">
- <field name="name">T.V.A. Vente 8,5%</field>
- <field name="description">T.V.A. 8,5%</field>
+ <record model="account.tax.template" id="tva_vente_taux_intermediaire">
+ <field name="name">T.V.A. Vente Taux Intermédiaire</field>
+ <field name="description">T.V.A. Taux Intermédiaire</field>
<field name="group" ref="group_tva_vente"/>
- <field name="rate" eval="Decimal('.085')"/>
+ <field name="rate" eval="None"/>
+ <field name="type">none</field>
+ <field name="invoice_account" eval="None"/>
+ <field name="credit_note_account" eval="None"/>
+ <field name="invoice_base_code" eval="None"/>
+ <field name="invoice_tax_code" eval="None"/>
+ <field name="credit_note_base_code" eval="None"/>
+ <field name="credit_note_base_sign" eval="None"/>
+ <field name="credit_note_tax_code" eval="None"/>
+ <field name="credit_note_tax_sign" eval="None"/>
+ <field name="account" ref="root"/>
+ </record>
+
+ <record model="account.tax.template" id="tva_vente_10">
+ <field name="name">T.V.A. Vente 10%</field>
+ <field name="description">T.V.A. 10%</field>
+ <field name="parent" ref="tva_vente_taux_intermediaire"/>
+ <field name="start_date">2014-01-01</field>
+ <field name="rate" eval="Decimal('.10')"/>
<field name="type">percentage</field>
<field name="invoice_account" ref="44571"/>
<field name="credit_note_account" ref="44571"/>
- <field name="invoice_base_code" ref="tax_code_0201b"/>
- <field name="invoice_tax_code" ref="tax_code_0201"/>
- <field name="credit_note_base_code" ref="tax_code_0201b"/>
+ <field name="invoice_base_code" ref="tax_code_0151b"/>
+ <field name="invoice_tax_code" ref="tax_code_0151"/>
+ <field name="credit_note_base_code" ref="tax_code_0151b"/>
<field name="credit_note_base_sign" eval="Decimal('-1')"/>
- <field name="credit_note_tax_code" ref="tax_code_0201"/>
+ <field name="credit_note_tax_code" ref="tax_code_0151"/>
<field name="credit_note_tax_sign" eval="Decimal('-1')"/>
<field name="account" ref="root"/>
</record>
@@ -597,7 +679,8 @@ this repository contains the full copyright notices and license terms. -->
<record model="account.tax.template" id="tva_vente_7">
<field name="name">T.V.A. Vente 7%</field>
<field name="description">T.V.A. 7%</field>
- <field name="group" ref="group_tva_vente"/>
+ <field name="parent" ref="tva_vente_taux_intermediaire"/>
+ <field name="end_date">2013-12-31</field>
<field name="rate" eval="Decimal('.07')"/>
<field name="type">percentage</field>
<field name="invoice_account" ref="44571"/>
@@ -611,6 +694,23 @@ this repository contains the full copyright notices and license terms. -->
<field name="account" ref="root"/>
</record>
+ <record model="account.tax.template" id="tva_vente_8_5">
+ <field name="name">T.V.A. Vente 8,5%</field>
+ <field name="description">T.V.A. 8,5%</field>
+ <field name="group" ref="group_tva_vente"/>
+ <field name="rate" eval="Decimal('.085')"/>
+ <field name="type">percentage</field>
+ <field name="invoice_account" ref="44571"/>
+ <field name="credit_note_account" ref="44571"/>
+ <field name="invoice_base_code" ref="tax_code_0201b"/>
+ <field name="invoice_tax_code" ref="tax_code_0201"/>
+ <field name="credit_note_base_code" ref="tax_code_0201b"/>
+ <field name="credit_note_base_sign" eval="Decimal('-1')"/>
+ <field name="credit_note_tax_code" ref="tax_code_0201"/>
+ <field name="credit_note_tax_sign" eval="Decimal('-1')"/>
+ <field name="account" ref="root"/>
+ </record>
+
<record model="account.tax.template" id="tva_vente_5_5">
<field name="name">T.V.A. Vente 5,5%</field>
<field name="description">T.V.A. 5,5%</field>
@@ -645,10 +745,43 @@ this repository contains the full copyright notices and license terms. -->
<field name="account" ref="root"/>
</record>
+ <record model="account.tax.template" id="tva_vente_intracommunautaire_taux_normal">
+ <field name="name">T.V.A. Vente Intracommunautaire Taux Normal</field>
+ <field name="description">T.V.A. Taux Normal</field>
+ <field name="group" ref="group_tva_vente"/>
+ <field name="rate" eval="None"/>
+ <field name="type">none</field>
+ <field name="invoice_account" eval="None"/>
+ <field name="credit_note_account" eval="None"/>
+ <field name="invoice_base_code" eval="None"/>
+ <field name="invoice_tax_code" eval="None"/>
+ <field name="credit_note_base_code" eval="None"/>
+ <field name="credit_note_base_sign" eval="None"/>
+ <field name="credit_note_tax_code" eval="None"/>
+ <field name="credit_note_tax_sign" eval="None"/>
+ <field name="account" ref="root"/>
+ </record>
+
+ <record model="account.tax.template" id="tva_vente_intracommunautaire_20">
+ <field name="name">T.V.A. Vente Intracommunautaire 20%</field>
+ <field name="description">T.V.A. 20%</field>
+ <field name="parent" ref="tva_vente_intracommunautaire_taux_normal"/>
+ <field name="start_date">2014-01-01</field>
+ <field name="rate" eval="Decimal('.20')"/>
+ <field name="type">percentage</field>
+ <field name="invoice_account" ref="4452"/>
+ <field name="credit_note_account" ref="4452"/>
+ <field name="invoice_tax_code" ref="tax_code_0034"/>
+ <field name="credit_note_tax_code" ref="tax_code_0034"/>
+ <field name="credit_note_tax_sign" eval="Decimal('-1')"/>
+ <field name="account" ref="root"/>
+ </record>
+
<record model="account.tax.template" id="tva_vente_intracommunautaire_19_6">
<field name="name">T.V.A. Vente Intracommunautaire 19,6%</field>
<field name="description">T.V.A. 19,6%</field>
- <field name="group" ref="group_tva_vente"/>
+ <field name="parent" ref="tva_vente_intracommunautaire_taux_normal"/>
+ <field name="end_date">2013-12-31</field>
<field name="rate" eval="Decimal('.196')"/>
<field name="type">percentage</field>
<field name="invoice_account" ref="4452"/>
@@ -659,11 +792,31 @@ this repository contains the full copyright notices and license terms. -->
<field name="account" ref="root"/>
</record>
- <record model="account.tax.template" id="tva_vente_intracommunautaire_8_5">
- <field name="name">T.V.A. Vente Intracommunautaire 8,5%</field>
- <field name="description">T.V.A. 8,5%</field>
+ <record model="account.tax.template"
+ id="tva_vente_intracommunautaire_taux_intermediaire">
+ <field name="name">T.V.A. Vente Intracommunautaire Taux Intermédiaire</field>
+ <field name="description">T.V.A. Taux Intermédiaire</field>
<field name="group" ref="group_tva_vente"/>
- <field name="rate" eval="Decimal('.085')"/>
+ <field name="rate" eval="None"/>
+ <field name="type">none</field>
+ <field name="invoice_account" eval="None"/>
+ <field name="credit_note_account" eval="None"/>
+ <field name="invoice_base_code" eval="None"/>
+ <field name="invoice_tax_code" eval="None"/>
+ <field name="credit_note_base_code" eval="None"/>
+ <field name="credit_note_base_sign" eval="None"/>
+ <field name="credit_note_tax_code" eval="None"/>
+ <field name="credit_note_tax_sign" eval="None"/>
+ <field name="account" ref="root"/>
+ </record>
+
+ <record model="account.tax.template" id="tva_vente_intracommunautaire_10">
+ <field name="name">T.V.A. Vente Intracommunautaire 10%</field>
+ <field name="description">T.V.A. 10%</field>
+ <field name="parent"
+ ref="tva_vente_intracommunautaire_taux_intermediaire"/>
+ <field name="start_date">2014-01-01</field>
+ <field name="rate" eval="Decimal('.10')"/>
<field name="type">percentage</field>
<field name="invoice_account" ref="4452"/>
<field name="credit_note_account" ref="4452"/>
@@ -676,7 +829,9 @@ this repository contains the full copyright notices and license terms. -->
<record model="account.tax.template" id="tva_vente_intracommunautaire_7">
<field name="name">T.V.A. Vente Intracommunautaire 7%</field>
<field name="description">T.V.A. 7%</field>
- <field name="group" ref="group_tva_vente"/>
+ <field name="parent"
+ ref="tva_vente_intracommunautaire_taux_intermediaire"/>
+ <field name="end_date">2013-12-31</field>
<field name="rate" eval="Decimal('.07')"/>
<field name="type">percentage</field>
<field name="invoice_account" ref="4452"/>
@@ -687,6 +842,20 @@ this repository contains the full copyright notices and license terms. -->
<field name="account" ref="root"/>
</record>
+ <record model="account.tax.template" id="tva_vente_intracommunautaire_8_5">
+ <field name="name">T.V.A. Vente Intracommunautaire 8,5%</field>
+ <field name="description">T.V.A. 8,5%</field>
+ <field name="group" ref="group_tva_vente"/>
+ <field name="rate" eval="Decimal('.085')"/>
+ <field name="type">percentage</field>
+ <field name="invoice_account" ref="4452"/>
+ <field name="credit_note_account" ref="4452"/>
+ <field name="invoice_tax_code" ref="tax_code_0034"/>
+ <field name="credit_note_tax_code" ref="tax_code_0034"/>
+ <field name="credit_note_tax_sign" eval="Decimal('-1')"/>
+ <field name="account" ref="root"/>
+ </record>
+
<record model="account.tax.template" id="tva_vente_intracommunautaire_5_5">
<field name="name">T.V.A. Vente Intracommunautaire 5,5%</field>
<field name="description">T.V.A. 5,5%</field>
@@ -729,10 +898,43 @@ this repository contains the full copyright notices and license terms. -->
<field name="account" ref="root"/>
</record>
+ <record model="account.tax.template" id="tva_achat_taux_normal">
+ <field name="name">T.V.A. Achat Taux Normal</field>
+ <field name="description">T.V.A. Taux Normal</field>
+ <field name="group" ref="group_tva_achat"/>
+ <field name="rate" eval="None"/>
+ <field name="type">none</field>
+ <field name="invoice_account" eval="None"/>
+ <field name="credit_note_account" eval="None"/>
+ <field name="invoice_base_code" eval="None"/>
+ <field name="invoice_tax_code" eval="None"/>
+ <field name="credit_note_base_code" eval="None"/>
+ <field name="credit_note_base_sign" eval="None"/>
+ <field name="credit_note_tax_code" eval="None"/>
+ <field name="credit_note_tax_sign" eval="None"/>
+ <field name="account" ref="root"/>
+ </record>
+
+ <record model="account.tax.template" id="tva_achat_20">
+ <field name="name">T.V.A. Achat 20%</field>
+ <field name="description">T.V.A. 20%</field>
+ <field name="parent" ref="tva_achat_taux_normal"/>
+ <field name="start_date">2014-01-01</field>
+ <field name="rate" eval="Decimal('.20')"/>
+ <field name="type">percentage</field>
+ <field name="invoice_account" ref="44566"/>
+ <field name="credit_note_account" ref="44566"/>
+ <field name="invoice_tax_code" ref="tax_code_0702"/>
+ <field name="credit_note_tax_code" ref="tax_code_0702"/>
+ <field name="credit_note_tax_sign" eval="Decimal('-1')"/>
+ <field name="account" ref="root"/>
+ </record>
+
<record model="account.tax.template" id="tva_achat_19_6">
<field name="name">T.V.A. Achat 19,6%</field>
<field name="description">T.V.A. 19,6%</field>
- <field name="group" ref="group_tva_achat"/>
+ <field name="parent" ref="tva_achat_taux_normal"/>
+ <field name="end_date">2013-12-31</field>
<field name="rate" eval="Decimal('.196')"/>
<field name="type">percentage</field>
<field name="invoice_account" ref="44566"/>
@@ -743,11 +945,29 @@ this repository contains the full copyright notices and license terms. -->
<field name="account" ref="root"/>
</record>
- <record model="account.tax.template" id="tva_achat_8_5">
- <field name="name">T.V.A. Achat 8,5%</field>
- <field name="description">T.V.A. 8,5%</field>
+ <record model="account.tax.template" id="tva_achat_taux_intermediaire">
+ <field name="name">T.V.A. Achat Taux Intermédiaire</field>
+ <field name="description">T.V.A. Taux Intermédiaire</field>
<field name="group" ref="group_tva_achat"/>
- <field name="rate" eval="Decimal('.085')"/>
+ <field name="rate" eval="None"/>
+ <field name="type">none</field>
+ <field name="invoice_account" eval="None"/>
+ <field name="credit_note_account" eval="None"/>
+ <field name="invoice_base_code" eval="None"/>
+ <field name="invoice_tax_code" eval="None"/>
+ <field name="credit_note_base_code" eval="None"/>
+ <field name="credit_note_base_sign" eval="None"/>
+ <field name="credit_note_tax_code" eval="None"/>
+ <field name="credit_note_tax_sign" eval="None"/>
+ <field name="account" ref="root"/>
+ </record>
+
+ <record model="account.tax.template" id="tva_achat_10">
+ <field name="name">T.V.A. Achat 10%</field>
+ <field name="description">T.V.A. 10%</field>
+ <field name="parent" ref="tva_achat_taux_intermediaire"/>
+ <field name="start_date">2014-01-01</field>
+ <field name="rate" eval="Decimal('.10')"/>
<field name="type">percentage</field>
<field name="invoice_account" ref="44566"/>
<field name="credit_note_account" ref="44566"/>
@@ -760,7 +980,8 @@ this repository contains the full copyright notices and license terms. -->
<record model="account.tax.template" id="tva_achat_7">
<field name="name">T.V.A. Achat 7%</field>
<field name="description">T.V.A. 7%</field>
- <field name="group" ref="group_tva_achat"/>
+ <field name="parent" ref="tva_achat_taux_intermediaire"/>
+ <field name="end_date">2013-12-31</field>
<field name="rate" eval="Decimal('.07')"/>
<field name="type">percentage</field>
<field name="invoice_account" ref="44566"/>
@@ -771,6 +992,20 @@ this repository contains the full copyright notices and license terms. -->
<field name="account" ref="root"/>
</record>
+ <record model="account.tax.template" id="tva_achat_8_5">
+ <field name="name">T.V.A. Achat 8,5%</field>
+ <field name="description">T.V.A. 8,5%</field>
+ <field name="group" ref="group_tva_achat"/>
+ <field name="rate" eval="Decimal('.085')"/>
+ <field name="type">percentage</field>
+ <field name="invoice_account" ref="44566"/>
+ <field name="credit_note_account" ref="44566"/>
+ <field name="invoice_tax_code" ref="tax_code_0702"/>
+ <field name="credit_note_tax_code" ref="tax_code_0702"/>
+ <field name="credit_note_tax_sign" eval="Decimal('-1')"/>
+ <field name="account" ref="root"/>
+ </record>
+
<record model="account.tax.template" id="tva_achat_5_5">
<field name="name">T.V.A. Achat 5,5%</field>
<field name="description">T.V.A. 5,5%</field>
@@ -799,9 +1034,68 @@ this repository contains the full copyright notices and license terms. -->
<field name="account" ref="root"/>
</record>
+ <record model="account.tax.template"
+ id="tva_achat_intracommunautaire_taux_normal">
+ <field name="name">T.V.A. Achat Intracommunautaire Taux Normal</field>
+ <field name="description">T.V.A. Taux Normal</field>
+ <field name="group" ref="group_tva_achat"/>
+ <field name="rate" eval="None"/>
+ <field name="type">none</field>
+ <field name="invoice_account" eval="None"/>
+ <field name="credit_note_account" eval="None"/>
+ <field name="invoice_base_code" eval="None"/>
+ <field name="invoice_tax_code" eval="None"/>
+ <field name="credit_note_base_code" eval="None"/>
+ <field name="credit_note_base_sign" eval="None"/>
+ <field name="credit_note_tax_code" eval="None"/>
+ <field name="credit_note_tax_sign" eval="None"/>
+ <field name="account" ref="root"/>
+ </record>
+
+ <record model="account.tax.template"
+ id="tva_achat_intracommunautaire_20">
+ <field name="name">T.V.A. Achat Intracommunautaire 20%</field>
+ <field name="description">T.V.A. 20%</field>
+ <field name="parent" ref="tva_achat_intracommunautaire_taux_normal"/>
+ <field name="start_date">2014-01-01</field>
+ <field name="group" ref="group_tva_achat"/>
+ <field name="type">none</field>
+ <field name="account" ref="root"/>
+ </record>
+ <record model="account.tax.template"
+ id="tva_achat_intracommunautaire_20_1">
+ <field name="name">T.V.A. Achat Intracommunautaire 20% (1)</field>
+ <field name="description">T.V.A. 20%</field>
+ <field name="parent" ref="tva_achat_intracommunautaire_20"/>
+ <field name="rate" eval="Decimal('.20')"/>
+ <field name="type">percentage</field>
+ <field name="invoice_account" ref="44566"/>
+ <field name="credit_note_account" ref="44566"/>
+ <field name="invoice_base_code" ref="tax_code_0033"/>
+ <field name="invoice_tax_code" ref="tax_code_0702"/>
+ <field name="credit_note_base_code" ref="tax_code_0033"/>
+ <field name="credit_note_base_sign" eval="Decimal('-1')"/>
+ <field name="credit_note_tax_code" ref="tax_code_0702"/>
+ <field name="credit_note_tax_sign" eval="Decimal('-1')"/>
+ <field name="account" ref="root"/>
+ </record>
+ <record model="account.tax.template"
+ id="tva_achat_intracommunautaire_20_2">
+ <field name="name">T.V.A. Achat Intracommunautaire 20% (2)</field>
+ <field name="description">T.V.A. 20%</field>
+ <field name="parent" ref="tva_achat_intracommunautaire_20"/>
+ <field name="rate" eval="-Decimal('.20')"/>
+ <field name="type">percentage</field>
+ <field name="invoice_account" ref="4452"/>
+ <field name="credit_note_account" ref="4452"/>
+ <field name="account" ref="root"/>
+ </record>
+
<record model="account.tax.template" id="tva_achat_intracommunautaire_19_6">
<field name="name">T.V.A. Achat Intracommunautaire 19,6%</field>
<field name="description">T.V.A. 19,6%</field>
+ <field name="parent" ref="tva_achat_intracommunautaire_taux_normal"/>
+ <field name="end_date">2013-12-31</field>
<field name="group" ref="group_tva_achat"/>
<field name="type">none</field>
<field name="account" ref="root"/>
@@ -922,11 +1216,11 @@ this repository contains the full copyright notices and license terms. -->
<field name="account" ref="root"/>
</record>
<record model="account.tax.rule.line.template"
- id="tax_rule_ventes_intracommunautaires_19_6">
+ id="tax_rule_ventes_intracommunautaires_taux_normal">
<field name="rule" ref="tax_rule_ventes_intracommunautaires"/>
<field name="group" ref="group_tva_vente"/>
- <field name="origin_tax" ref="tva_vente_19_6"/>
- <field name="tax" ref="tva_vente_intracommunautaire_19_6"/>
+ <field name="origin_tax" ref="tva_vente_taux_normal"/>
+ <field name="tax" ref="tva_vente_intracommunautaire_taux_normal"/>
</record>
<record model="account.tax.rule.line.template"
id="tax_rule_ventes_intracommunautaires_8_5">
@@ -936,11 +1230,11 @@ this repository contains the full copyright notices and license terms. -->
<field name="tax" ref="tva_vente_intracommunautaire_8_5"/>
</record>
<record model="account.tax.rule.line.template"
- id="tax_rule_ventes_intracommunautaires_7">
+ id="tax_rule_ventes_intracommunautaires_taux_intermediaire">
<field name="rule" ref="tax_rule_ventes_intracommunautaires"/>
<field name="group" ref="group_tva_vente"/>
- <field name="origin_tax" ref="tva_vente_7"/>
- <field name="tax" ref="tva_vente_intracommunautaire_7"/>
+ <field name="origin_tax" ref="tva_vente_taux_intermediaire"/>
+ <field name="tax" ref="tva_vente_intracommunautaire_taux_intermediaire"/>
</record>
<record model="account.tax.rule.line.template"
id="tax_rule_ventes_intracommunautaires_5_5">
diff --git a/tryton.cfg b/tryton.cfg
index 7ee0aa6..f43884c 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.0
+version=3.2.0
depends:
account
xml:
diff --git a/trytond_account_fr.egg-info/PKG-INFO b/trytond_account_fr.egg-info/PKG-INFO
index 57bfca1..e9e2d23 100644
--- a/trytond_account_fr.egg-info/PKG-INFO
+++ b/trytond_account_fr.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-account-fr
-Version: 3.0.0
+Version: 3.2.0
Summary: Tryton module with French chart of accounts
Home-page: http://www.tryton.org/
Author: Tryton
-Author-email: UNKNOWN
+Author-email: issue_tracker at tryton.org
License: GPL-3
-Download-URL: http://downloads.tryton.org/3.0/
+Download-URL: http://downloads.tryton.org/3.2/
Description: trytond_account_fr
==================
@@ -43,6 +43,7 @@ Description: trytond_account_fr
http://www.tryton.org/
+Keywords: tryton account chart french
Platform: UNKNOWN
Classifier: Development Status :: 5 - Production/Stable
Classifier: Environment :: Plugins
@@ -53,7 +54,6 @@ Classifier: Intended Audience :: Legal Industry
Classifier: License :: OSI Approved :: GNU General Public License (GPL)
Classifier: Natural Language :: French
Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.6
Classifier: Programming Language :: Python :: 2.7
Classifier: Topic :: Office/Business
Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/trytond_account_fr.egg-info/SOURCES.txt b/trytond_account_fr.egg-info/SOURCES.txt
index d21d42d..c92ad96 100644
--- a/trytond_account_fr.egg-info/SOURCES.txt
+++ b/trytond_account_fr.egg-info/SOURCES.txt
@@ -9,6 +9,7 @@ setup.py
tax_fr.xml
tryton.cfg
./__init__.py
+./account.py
trytond_account_fr.egg-info/PKG-INFO
trytond_account_fr.egg-info/SOURCES.txt
trytond_account_fr.egg-info/dependency_links.txt
diff --git a/trytond_account_fr.egg-info/requires.txt b/trytond_account_fr.egg-info/requires.txt
index 20cadd2..94be88b 100644
--- a/trytond_account_fr.egg-info/requires.txt
+++ b/trytond_account_fr.egg-info/requires.txt
@@ -1,2 +1,2 @@
-trytond_account >= 3.0, < 3.1
-trytond >= 3.0, < 3.1
\ No newline at end of file
+trytond_account >= 3.2, < 3.3
+trytond >= 3.2, < 3.3
\ No newline at end of file
--
tryton-modules-account-fr
More information about the tryton-debian-vcs
mailing list