savoirfairelinux-openerp team mailing list archive
-
savoirfairelinux-openerp team
-
Mailing list archive
-
Message #00394
lp:~savoirfairelinux-openerp/openobject-addons/l10n_ca-cc-and-amortization into lp:openobject-addons/7.0
Marc Cassuto (SFL) has proposed merging lp:~savoirfairelinux-openerp/openobject-addons/l10n_ca-cc-and-amortization into lp:openobject-addons/7.0.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~savoirfairelinux-openerp/openobject-addons/l10n_ca-cc-and-amortization/+merge/189606
[ADD] add credit card stuff and all accounts related to amortization
--
https://code.launchpad.net/~savoirfairelinux-openerp/openobject-addons/l10n_ca-cc-and-amortization/+merge/189606
Your team Savoir-faire Linux' OpenERP is subscribed to branch lp:~savoirfairelinux-openerp/openobject-addons/l10n_ca-cc-and-amortization.
=== added file 'l10n_ca/AUTHORS.txt'
--- l10n_ca/AUTHORS.txt 1970-01-01 00:00:00 +0000
+++ l10n_ca/AUTHORS.txt 2013-10-07 13:53:31 +0000
@@ -0,0 +1,4 @@
+Maxime Chambreuil <maxime.chambreuil@xxxxxxxxxxxxxxxxxxxx>
+Pierre Lamarche <pierre.lamarche@xxxxxxxxxxxxxxxxxxxx>
+Marc Cassuto <marc.cassuto@xxxxxxxxxxxxxxxxxxxx>
+Savoir-faire Linux <contact@xxxxxxxxxxxxxxxxxxxx>
=== modified file 'l10n_ca/__openerp__.py'
--- l10n_ca/__openerp__.py 2013-06-22 03:56:58 +0000
+++ l10n_ca/__openerp__.py 2013-10-07 13:53:31 +0000
@@ -58,6 +58,7 @@
'base_iban',
'base_vat',
'account_chart',
+ 'l10n_ca_toponyms',
'account_anglo_saxon'
],
'data': [
@@ -71,7 +72,8 @@
'account_chart_template_fr.xml',
'account_tax_fr.xml',
'fiscal_templates_fr.xml',
- 'l10n_ca_wizard.xml'
+ 'l10n_ca_wizard.xml',
+ 'l10n_ca.xml'
],
'demo': [],
'installable': True,
=== modified file 'l10n_ca/account_chart_en.xml'
--- l10n_ca/account_chart_en.xml 2013-07-17 12:57:45 +0000
+++ l10n_ca/account_chart_en.xml 2013-10-07 13:53:31 +0000
@@ -37,6 +37,22 @@
<field name="name">CASH</field>
</record>
+ <record id="chart111098_en" model="account.account.template">
+ <field name="code">111098</field>
+ <field name="parent_id" ref="chart111_en"/>
+ <field name="type">liquidity</field>
+ <field name="user_type" ref="account.data_account_type_bank"/>
+ <field name="name">Outstanding customer checks</field>
+ </record>
+
+ <record id="chart111099_en" model="account.account.template">
+ <field name="code">111099</field>
+ <field name="parent_id" ref="chart111_en"/>
+ <field name="type">liquidity</field>
+ <field name="user_type" ref="account.data_account_type_bank"/>
+ <field name="name">Oustanding supplier checks</field>
+ </record>
+
<record id="chart112_en" model="account.account.template">
<field name="code">112</field>
<field name="parent_id" ref="chart11_en"/>
@@ -203,6 +219,54 @@
<field name="name">TANGIBLE ASSETS</field>
</record>
+ <record id="chart15201_en" model="account.account.template">
+ <field name="code">15201</field>
+ <field name="parent_id" ref="chart152_en"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Land</field>
+ </record>
+
+ <record id="chart15202_en" model="account.account.template">
+ <field name="code">15202</field>
+ <field name="parent_id" ref="chart152_en"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Buildings</field>
+ </record>
+
+ <record id="chart15203_en" model="account.account.template">
+ <field name="code">15203</field>
+ <field name="parent_id" ref="chart152_en"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Motor Vehicles</field>
+ </record>
+
+ <record id="chart15204_en" model="account.account.template">
+ <field name="code">15204</field>
+ <field name="parent_id" ref="chart152_en"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Computer Equipment and Software</field>
+ </record>
+
+ <record id="chart15205_en" model="account.account.template">
+ <field name="code">15205</field>
+ <field name="parent_id" ref="chart152_en"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Furniture and Fixtures</field>
+ </record>
+
+ <record id="chart15206_en" model="account.account.template">
+ <field name="code">15206</field>
+ <field name="parent_id" ref="chart152_en"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Leasehold Improvements</field>
+ </record>
+
<record id="chart1527_en" model="account.account.template">
<field name="code">1527</field>
<field name="parent_id" ref="chart152_en"/>
@@ -211,6 +275,46 @@
<field name="name">ACCUMULATED DEPRECIATIONS</field>
</record>
+ <record id="chart15272_en" model="account.account.template">
+ <field name="code">15272</field>
+ <field name="parent_id" ref="chart1527_en"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Acc. Deprec. Buildings</field>
+ </record>
+
+ <record id="chart15273_en" model="account.account.template">
+ <field name="code">15273</field>
+ <field name="parent_id" ref="chart1527_en"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Acc. Deprec. Motor Vehicles</field>
+ </record>
+
+ <record id="chart15274_en" model="account.account.template">
+ <field name="code">15274</field>
+ <field name="parent_id" ref="chart1527_en"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Acc. Deprec. Computer Equipment And Software</field>
+ </record>
+
+ <record id="chart15275_en" model="account.account.template">
+ <field name="code">15275</field>
+ <field name="parent_id" ref="chart1527_en"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Acc. Deprec. Furniture and Fixtures</field>
+ </record>
+
+ <record id="chart15276_en" model="account.account.template">
+ <field name="code">15276</field>
+ <field name="parent_id" ref="chart1527_en"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Acc. Deprec. Leasehold Improvements</field>
+ </record>
+
<record id="chart153_en" model="account.account.template">
<field name="code">153</field>
<field name="parent_id" ref="chart15_en"/>
@@ -270,6 +374,15 @@
<field name="name">OTHER ACCOUNTS PAYABLES</field>
</record>
+ <record id="chart2121_en" model="account.account.template">
+ <field name="code">2121</field>
+ <field name="parent_id" ref="chart212_en"/>
+ <field name="type">payable</field>
+ <field name="user_type" ref="account.data_account_type_payable"/>
+ <field name="reconcile" eval="True"/>
+ <field name="name">Credit Card Account</field>
+ </record>
+
<record id="chart213_en" model="account.account.template">
<field name="code">213</field>
<field name="parent_id" ref="chart21_en"/>
@@ -679,6 +792,14 @@
<field name="name">OTHER NON-OPERATING INCOMES</field>
</record>
+ <record id="chart4291_en" model="account.account.template">
+ <field name="code">4291</field>
+ <field name="parent_id" ref="chart429_en"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_income"/>
+ <field name="name">Exchange Rate Gain</field>
+ </record>
+
<!-- EXPENSES -->
<record id="chart5_en" model="account.account.template">
@@ -856,6 +977,54 @@
<field name="name">OTHER OPERATING EXPENSES</field>
</record>
+ <record id="chart5191_en" model="account.account.template">
+ <field name="code">5191</field>
+ <field name="parent_id" ref="chart519_en"/>
+ <field name="type">view</field>
+ <field name="user_type" ref="account.data_account_type_view"/>
+ <field name="name">DEPRECIATIONS</field>
+ </record>
+
+ <record id="chart51912_en" model="account.account.template">
+ <field name="code">51912</field>
+ <field name="parent_id" ref="chart5191_en"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Depreciation Buildings</field>
+ </record>
+
+ <record id="chart51913_en" model="account.account.template">
+ <field name="code">51913</field>
+ <field name="parent_id" ref="chart5191_en"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Depreciation Motor Vehicles</field>
+ </record>
+
+ <record id="chart51914_en" model="account.account.template">
+ <field name="code">51914</field>
+ <field name="parent_id" ref="chart5191_en"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Depreciation Computer Equipment And Software</field>
+ </record>
+
+ <record id="chart51915_en" model="account.account.template">
+ <field name="code">51915</field>
+ <field name="parent_id" ref="chart5191_en"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Depreciation Furniture and Fixtures</field>
+ </record>
+
+ <record id="chart51916_en" model="account.account.template">
+ <field name="code">51916</field>
+ <field name="parent_id" ref="chart5191_en"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Depreciation Leasehold Improvements</field>
+ </record>
+
<record id="chart55_en" model="account.account.template">
<field name="code">55</field>
<field name="parent_id" ref="chart5_en"/>
@@ -880,5 +1049,13 @@
<field name="name">OTHER NON-OPERATING EXPENSES</field>
</record>
+ <record id="chart5591_en" model="account.account.template">
+ <field name="code">5591</field>
+ <field name="parent_id" ref="chart559_en"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_expense"/>
+ <field name="name">Exchange Rate Loss</field>
+ </record>
+
</data>
</openerp>
=== modified file 'l10n_ca/account_chart_fr.xml'
--- l10n_ca/account_chart_fr.xml 2013-07-17 12:57:45 +0000
+++ l10n_ca/account_chart_fr.xml 2013-10-07 13:53:31 +0000
@@ -36,6 +36,22 @@
<field name="name">ENCAISSE</field>
</record>
+ <record id="chart111098_fr" model="account.account.template">
+ <field name="code">111098</field>
+ <field name="parent_id" ref="chart111_fr"/>
+ <field name="type">liquidity</field>
+ <field name="user_type" ref="account.data_account_type_bank"/>
+ <field name="name">Chèques reçus en circulation</field>
+ </record>
+
+ <record id="chart111099_fr" model="account.account.template">
+ <field name="code">111099</field>
+ <field name="parent_id" ref="chart111_fr"/>
+ <field name="type">liquidity</field>
+ <field name="user_type" ref="account.data_account_type_bank"/>
+ <field name="name">Chèques émis en circulation</field>
+ </record>
+
<record id="chart112_fr" model="account.account.template">
<field name="code">112</field>
<field name="parent_id" ref="chart11_fr"/>
@@ -202,6 +218,54 @@
<field name="name">IMMOBILISATIONS CORPORELLES</field>
</record>
+ <record id="chart15201_fr" model="account.account.template">
+ <field name="code">15201</field>
+ <field name="parent_id" ref="chart152_fr"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Terrains</field>
+ </record>
+
+ <record id="chart15202_fr" model="account.account.template">
+ <field name="code">15202</field>
+ <field name="parent_id" ref="chart152_fr"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Bâtiments</field>
+ </record>
+
+ <record id="chart15203_fr" model="account.account.template">
+ <field name="code">15203</field>
+ <field name="parent_id" ref="chart152_fr"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Véhicules automobiles</field>
+ </record>
+
+ <record id="chart15204_fr" model="account.account.template">
+ <field name="code">15204</field>
+ <field name="parent_id" ref="chart152_fr"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Matériel informatique/logiciels</field>
+ </record>
+
+ <record id="chart15205_fr" model="account.account.template">
+ <field name="code">15205</field>
+ <field name="parent_id" ref="chart152_fr"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Meubles et accessoires</field>
+ </record>
+
+ <record id="chart15206_fr" model="account.account.template">
+ <field name="code">15206</field>
+ <field name="parent_id" ref="chart152_fr"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Améliorations locatives</field>
+ </record>
+
<record id="chart1527_fr" model="account.account.template">
<field name="code">1527</field>
<field name="parent_id" ref="chart152_fr"/>
@@ -210,6 +274,46 @@
<field name="name">AMORTISSEMENTS CUMULÉS</field>
</record>
+ <record id="chart15272_fr" model="account.account.template">
+ <field name="code">15272</field>
+ <field name="parent_id" ref="chart1527_fr"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Amort. Cumul. Bâtiments</field>
+ </record>
+
+ <record id="chart15273_fr" model="account.account.template">
+ <field name="code">15273</field>
+ <field name="parent_id" ref="chart1527_fr"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Amort. Cumul. Véhicules automobiles</field>
+ </record>
+
+ <record id="chart15274_fr" model="account.account.template">
+ <field name="code">15274</field>
+ <field name="parent_id" ref="chart1527_fr"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Amort. Cumul. Matériel informatique/logiciels</field>
+ </record>
+
+ <record id="chart15275_fr" model="account.account.template">
+ <field name="code">15275</field>
+ <field name="parent_id" ref="chart1527_fr"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Amort. Cumul. Meubles et accessoires</field>
+ </record>
+
+ <record id="chart15276_fr" model="account.account.template">
+ <field name="code">15276</field>
+ <field name="parent_id" ref="chart1527_fr"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Amort. Cumul. Améliorations locatives</field>
+ </record>
+
<record id="chart153_fr" model="account.account.template">
<field name="code">153</field>
<field name="parent_id" ref="chart15_fr"/>
@@ -269,6 +373,15 @@
<field name="name">AUTRES COMPTES CRÉDITEURS</field>
</record>
+ <record id="chart2121_fr" model="account.account.template">
+ <field name="code">2121</field>
+ <field name="parent_id" ref="chart212_fr"/>
+ <field name="type">payable</field>
+ <field name="user_type" ref="account.data_account_type_payable"/>
+ <field name="reconcile" eval="True"/>
+ <field name="name">Carte de credit</field>
+ </record>
+
<record id="chart213_fr" model="account.account.template">
<field name="code">213</field>
<field name="parent_id" ref="chart21_fr"/>
@@ -686,6 +799,14 @@
<field name="name">AUTRES PRODUITS NON LIÉS À L'EXPLOITATION</field>
</record>
+ <record id="chart4291_fr" model="account.account.template">
+ <field name="code">4291</field>
+ <field name="parent_id" ref="chart429_fr"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_income"/>
+ <field name="name">Gain de taux de change</field>
+ </record>
+
<!-- CHARGES -->
<record id="chart5_fr" model="account.account.template">
@@ -864,6 +985,54 @@
<field name="name">AUTRES FRAIS D'EXPLOITATION</field>
</record>
+ <record id="chart5191_fr" model="account.account.template">
+ <field name="code">5191</field>
+ <field name="parent_id" ref="chart519_fr"/>
+ <field name="type">view</field>
+ <field name="user_type" ref="account.data_account_type_view"/>
+ <field name="name">DOTATIONS AUX AMORTISSEMENTS</field>
+ </record>
+
+ <record id="chart51912_fr" model="account.account.template">
+ <field name="code">51912</field>
+ <field name="parent_id" ref="chart5191_fr"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Dotations Amort. Bâtiments</field>
+ </record>
+
+ <record id="chart51913_fr" model="account.account.template">
+ <field name="code">51913</field>
+ <field name="parent_id" ref="chart5191_fr"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Dotations Amort. Véhicules automobiles</field>
+ </record>
+
+ <record id="chart51914_fr" model="account.account.template">
+ <field name="code">51914</field>
+ <field name="parent_id" ref="chart5191_fr"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Dotations Amort. Matériel informatique/logiciels</field>
+ </record>
+
+ <record id="chart51915_fr" model="account.account.template">
+ <field name="code">51915</field>
+ <field name="parent_id" ref="chart5191_fr"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Dotations Amort. Meubles et accessoires</field>
+ </record>
+
+ <record id="chart51916_fr" model="account.account.template">
+ <field name="code">51916</field>
+ <field name="parent_id" ref="chart5191_fr"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_asset"/>
+ <field name="name">Dotations Amort. Améliorations locatives</field>
+ </record>
+
<record id="chart52_fr" model="account.account.template">
<field name="code">52</field>
<field name="parent_id" ref="chart5_fr"/>
@@ -888,5 +1057,13 @@
<field name="name">AUTRES FRAIS NON LIÉS À L'EXPLOITATION</field>
</record>
+ <record id="chart5291_fr" model="account.account.template">
+ <field name="code">5291</field>
+ <field name="parent_id" ref="chart529_fr"/>
+ <field name="type">other</field>
+ <field name="user_type" ref="account.data_account_type_expense"/>
+ <field name="name">Perte de taux de change</field>
+ </record>
+
</data>
</openerp>
=== added file 'l10n_ca/l10n_ca.xml'
--- l10n_ca/l10n_ca.xml 1970-01-01 00:00:00 +0000
+++ l10n_ca/l10n_ca.xml 2013-10-07 13:53:31 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data noupdate="1">
+
+ <record id="sequence_credit_card_journal_en" model="ir.sequence">
+ <field name="name">Credit Card Journal</field>
+ <field eval="3" name="padding"/>
+ <field name="prefix">CCJ/%(year)s/</field>
+ </record>
+
+ <record id="l10nca_credit_card_journal_en" model="account.journal">
+ <field name="name">Credit Card Journal</field>
+ <field name="code">CCJ</field>
+ <field name="type">bank</field>
+ <field name="sequence_id" ref="sequence_credit_card_journal_en"/>
+ <field name="user_id" ref="base.user_root"/>
+ </record>
+
+ </data>
+</openerp>
+
