Select the period and the journal you want to fill.
diff --git a/addons/account/static/src/css/account_move_line_quickadd.css b/addons/account/static/src/css/account_move_line_quickadd.css
new file mode 100644
index 00000000000..6d7690c4490
--- /dev/null
+++ b/addons/account/static/src/css/account_move_line_quickadd.css
@@ -0,0 +1,4 @@
+.openerp .oe_vm_switch_tree_account_move_line_quickadd:after {
+ padding: 2px;
+ content: "i";
+}
diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py
index a455bc835ce..c7f9ab016c4 100644
--- a/addons/anonymization/anonymization.py
+++ b/addons/anonymization/anonymization.py
@@ -543,7 +543,7 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
fixes = group(fixes, ('model_name', 'field_name'))
for line in data:
- table_name = self.pool.get(line['model_id'])._table
+ table_name = self.pool.get(line['model_id'])._table if self.pool.get(line['model_id']) else None
# check if custom sql exists:
key = (line['model_id'], line['field_id'])
diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py
index 9c3cfea2fb1..05279b6ef8e 100644
--- a/addons/l10n_ca/__openerp__.py
+++ b/addons/l10n_ca/__openerp__.py
@@ -30,7 +30,14 @@ This is the module to manage the English and French - Canadian accounting chart
Canadian accounting charts and localizations.
""",
- 'depends': ['base', 'account', 'base_iban', 'base_vat', 'account_chart'],
+ 'depends': [
+ 'base',
+ 'account',
+ 'base_iban',
+ 'base_vat',
+ 'account_chart',
+ 'account_anglo_saxon'
+ ],
'data': [
'account_chart_en.xml',
'account_tax_code_en.xml',
diff --git a/addons/l10n_ca/account_chart_en.xml b/addons/l10n_ca/account_chart_en.xml
index acb4fa4802b..0a596bcd4f6 100644
--- a/addons/l10n_ca/account_chart_en.xml
+++ b/addons/l10n_ca/account_chart_en.xml
@@ -6,393 +6,570 @@
0
Account Chart CA EN
+
view
-
+
-
- 1
-
- view
-
- ASSETS
-
-
-
- 11
-
- view
-
- CURRENT ASSETS
-
-
-
- 111
-
- view
-
- CASH
-
+
+ 1
+
+ view
+
+ ASSETS
+
+
+
+ 11
+
+ view
+
+ CURRENT ASSETS
+
+
+
+ 111
+
+ view
+
+ CASH
+
-
- 1111
-
- liquidity
-
- Checking Account
-
+
+ 112
+
+ view
+
+ TREASURY OR TREASURY EQUIVALENTS
+
-
- 112
-
- view
-
- TREASURY OR TREASURY EQUIVALENTS
-
+
+ 113
+
+ view
+
+ CERTIFICATES OF DEPOSITS
+
-
- 113
-
- view
-
- CERTIFICATES OF DEPOSITS
-
+
+ 114
+
+ view
+
+ STOCKS
+
-
- 114
-
- view
-
- STOCKS
-
+
+ 1141
+
+ other
+
+ Stock In Hand
+
-
- 115
-
- view
-
- ACCOUNTS RECEIVABLES
-
+
+ 1145
+
+ other
+
+ Stock Delivered But Not Billed
+
-
- 1151
-
- receivable
-
-
- Customers Account
-
+
+ 115
+
+ view
+
+ ACCOUNTS RECEIVABLES
+
-
- 1152
-
- view
-
- ALLOWANCE FOR DOUBTFUL ACCOUNTS
-
+
+ 1151
+
+ receivable
+
+
+ Customers Account
+
-
- 116
-
- view
-
- PREPAID EXPENSES
-
+
+ 1152
+
+ view
+
+ ALLOWANCE FOR DOUBTFUL ACCOUNTS
+
-
- 117
-
- view
-
- INVESTMENTS HELD FOR TRADING
-
+
+ 116
+
+ view
+
+ PREPAID EXPENSES
+
-
- 118
-
- view
-
- TAXES RECEIVABLES
-
+
+ 117
+
+ view
+
+ INVESTMENTS HELD FOR TRADING
+
-
- 1181
-
- other
-
-
- GST receivable
-
+
+ 118
+
+ view
+
+ TAXES RECEIVABLES
+
-
- 1182
-
- other
-
-
- PST/QST receivable
-
+
+ 1181
+
+ other
+
+
+ GST receivable
+
-
- 1183
-
- other
-
-
- HST receivable
-
+
+ 1182
+
+ other
+
+
+ PST/QST receivable
+
-
- 15
-
- view
-
- NON-CURRENT ASSETS
-
+
+ 1183
+
+ other
+
+
+ HST receivable
+
-
- 151
-
- view
-
- INVESTMENTS AVAILABLE FOR SALE
-
+
+ 15
+
+ view
+
+ NON-CURRENT ASSETS
+
-
- 152
-
- view
-
- TANGIBLE ASSETS
-
+
+ 151
+
+ view
+
+ INVESTMENTS AVAILABLE FOR SALE
+
-
- 1527
-
- view
-
- ACCUMULATED DEPRECIATIONS
-
+
+ 152
+
+ view
+
+ TANGIBLE ASSETS
+
-
- 153
-
- view
-
- INTANGIBLE ASSETS
-
+
+ 1527
+
+ view
+
+ ACCUMULATED DEPRECIATIONS
+
-
- 1531
-
- view
-
- PATENTS, TRADEMARKS AND COPYRIGHTS
-
+
+ 153
+
+ view
+
+ INTANGIBLE ASSETS
+
-
+
+ 1531
+
+ view
+
+ PATENTS, TRADEMARKS AND COPYRIGHTS
+
-
- 2
-
- view
-
- LIABILITIES
-
+
-
- 21
-
- view
-
- CURRENT LIABILITIES
-
+
+ 2
+
+ view
+
+ LIABILITIES
+
-
- 211
-
- view
-
- ACCOUNTS PAYABLES
-
+
+ 21
+
+ view
+
+ CURRENT LIABILITIES
+
-
- 2111
-
- payable
-
-
- Suppliers Account
-
+
+ 211
+
+ view
+
+ ACCOUNTS PAYABLES
+
-
- 212
-
- view
-
- TAXES PAYABLES
-
+
+ 2111
+
+ payable
+
+
+ Suppliers Account
+
-
- 2121
-
- other
-
-
- GST to pay
-
+
+ 212
+
+ view
+
+ OTHER ACCOUNTS PAYABLES
+
-
- 2122
-
- other
-
-
- PST/QST to pay
-
+
+ 213
+
+ view
+
+ TAXES PAYABLES
+
-
- 2123
-
- other
-
-
- HST to pay
-
+
+ 2131
+
+ other
+
+
+ GST to pay
+
-
- 213
-
- view
-
- CURRENT FINANCIAL DEBTS
-
+
+ 2132
+
+ other
+
+
+ PST/QST to pay
+
-
- 25
-
- view
-
- NON-CURRENT LIABILITIES
-
+
+ 2133
+
+ other
+
+
+ HST to pay
+
-
- 251
-
- view
-
- NON-CURRENT FINANCIAL DEBTS
-
+
+ 214
+
+ view
+
+ LABOUR TAXES TO PAY
+
-
- 252
-
- view
-
- PROVISIONS FOR PENSIONS AND OTHER POST-EMPLOYMENT ADVANTAGES
-
+
+ 2141
+
+ view
+
+ CANADIAN REVENU AGENCY
+
-
- 253
-
- view
-
- DEFERRED TAXES
-
+
+ 21411
+
+ view
+
+ EMPLOYMENT INSURANCE TO PAY
+
-
- 259
-
- view
-
- OTHER NON-CURRENT LIABILITIES
-
+
+ 214111
+
+ other
+
+ EI - Employees Contribution
+
-
+
+ 214112
+
+ other
+
+ EI - Employer Contribution
+
-
- 3
-
- view
-
- EQUITY
-
+
+ 21412
+
+ other
+
+ Federal Income Tax
+
-
- 31
-
- view
-
- SHARE CAPITAL
-
+
+ 2142
+
+ view
+
+ PROVINCIAL REVENU AGENCY
+
-
- 32
-
- view
-
- PREMIUMS
-
+
+ 21421
+
+ other
+
+ Health Services Fund to pay
+
-
- 33
-
- view
-
- RETAINED EARNINGS
-
+
+ 21422
+
+ view
+
+ ANNUITIES TO PAY
+
-
- 34
-
- view
-
- DIVIDENDS
-
+
+ 214221
+
+ other
+
+ Annuities - Employees Contribution
+
-
- 35
-
- view
-
- TRANSLATION ADJUSTMENTS
-
+
+ 214222
+
+ other
+
+ Annuities - Employer Contribution
+
-
- 36
-
- view
-
- CONTRIBUTED SURPLUS
-
+
+ 21423
+
+ view
+
+ PARENTAL INSURANCE PLAN TO PAY
+
-
+
+ 214231
+
+ other
+
+ PAP - Employee Contribution
+
-
- 4
-
- view
-
- INCOMES
-
+
+ 214232
+
+ other
+
+ PAP - Employer Contribution
+
-
- 41
-
- view
-
- OPERATING INCOMES
-
+
+ 21424
+
+ other
+
+ Labour Health and Safety to pay
+
-
- 411
-
- other
-
- Inside Sales
-
+
+ 21425
+
+ other
+
+ Labour Standards to pay
+
+
+
+ 21426
+
+ other
+
+ Provincial Income Tax
+
+
+
+ 215
+
+ view
+
+ CURRENT FINANCIAL DEBTS
+
+
+
+ 216
+
+ view
+
+ LIABILITIES ASSETS HELD FOR TRANSFER
+
+
+
+ 217
+
+ view
+
+ STOCK LIABILITIES
+
+
+
+ 2171
+
+ other
+
+ Stock Received But Not Billed
+
+
+
+ 25
+
+ view
+
+ NON-CURRENT LIABILITIES
+
+
+
+ 251
+
+ view
+
+ NON-CURRENT FINANCIAL DEBTS
+
+
+
+ 252
+
+ view
+
+ PROVISIONS FOR PENSIONS AND OTHER POST-EMPLOYMENT ADVANTAGES
+
+
+
+ 254
+
+ view
+
+ DEFERRED TAXES
+
+
+
+ 259
+
+ view
+
+ OTHER NON-CURRENT LIABILITIES
+
+
+
+
+
+ 3
+
+ view
+
+ EQUITY
+
+
+
+ 31
+
+ view
+
+ SHARE CAPITAL
+
+
+
+ 32
+
+ view
+
+ PREMIUMS
+
+
+
+ 33
+
+ view
+
+ RETAINED EARNINGS
+
+
+
+ 34
+
+ view
+
+ DIVIDENDS
+
+
+
+ 35
+
+ view
+
+ TRANSLATION ADJUSTMENTS
+
+
+
+ 36
+
+ view
+
+ CONTRIBUTED SURPLUS
+
+
+
+
+
+ 4
+
+ view
+
+ INCOMES
+
+
+
+ 41
+
+ view
+
+ OPERATING INCOMES
+
+
+
+ 411
+
+ other
+
+ Inside Sales
+
412
@@ -418,223 +595,238 @@
International Sales
-
- 419
-
- view
-
- OTHER OPERATING INCOMES
-
+
+ 419
+
+ view
+
+ OTHER OPERATING INCOMES
+
-
- 42
-
- view
-
- NON-OPERATING INCOMES
-
+
+ 42
+
+ view
+
+ NON-OPERATING INCOMES
+
-
- 421
-
- view
-
- INTERESTS
-
+
+ 425
+
+ view
+
+ INTERESTS
+
-
- 429
-
- view
-
- OTHER NON-OPERATING INCOMES
-
+
+ 429
+
+ view
+
+ OTHER NON-OPERATING INCOMES
+
-
+
-
- 5
-
- view
-
- EXPENSES
-
+
+ 5
+
+ view
+
+ EXPENSES
+
-
- 51
-
- view
-
- OPERATING EXPENSES
-
+
+ 51
+
+ view
+
+ OPERATING EXPENSES
+
-
- 511
-
- view
-
- COST OF GOODS SOLD
-
+
+ 511
+
+ view
+
+ COST OF GOODS SOLD
+
-
- 5111
-
- other
-
- Inside Purchases
-
+
+ 5111
+
+ other
+
+ Inside Purchases
+
-
- 5112
-
- other
-
- Purchases in harmonized provinces
-
+
+ 5112
+
+ other
+
+ Purchases in harmonized provinces
+
-
- 5113
-
- other
-
- Purchases in non-harmonized provinces
-
+
+ 5113
+
+ other
+
+ Purchases in non-harmonized provinces
+
-
- 5114
-
- other
-
- International Purchases
-
+
+ 5114
+
+ other
+
+ International Purchases
+
-
- 512
-
- view
-
- LABOUR EXPENSES
-
+
+ 512
+
+ view
+
+ LABOUR EXPENSES
+
-
- 5121
-
- other
-
- Salaries, wages and commissions
-
+
+ 51201
+
+ other
+
+ Salaries, wages and commissions
+
-
- 5122
-
- other
-
- Holidays
-
+
+ 51202
+
+ other
+
+ Holidays
+
-
- 5123
-
- other
-
- Employment Insurance
-
+
+ 51203
+
+ other
+
+ Employment Insurance
+
-
- 5124
-
- other
-
- Health Services Fund
-
+
+ 51204
+
+ other
+
+ Health Services Fund
+
-
- 5125
-
- other
-
- Annuities
-
+
+ 51205
+
+ other
+
+ Annuities
+
-
- 5126
-
- other
-
- Parental Insurance
-
+
+ 51206
+
+ other
+
+ Parental Insurance
+
-
- 5127
-
- other
-
- Labour Health and Safety
-
+
+ 51207
+
+ other
+
+ Labour Health and Safety
+
-
- 5128
-
- other
-
- Labour Standards
-
+
+ 51208
+
+ other
+
+ Labour Standards
+
-
- 513
-
- view
-
- SALES EXPENSES
-
+
+ 51209
+
+ other
+
+ Federal Income Tax
+
-
- 514
-
- view
-
- GENERAL EXPENSES
-
+
+ 51210
+
+ other
+
+ Provincial Income Tax
+
+
+ 513
+
+ view
+
+ SALES EXPENSES
+
-
- 515
-
- view
-
- RESEARCH AND DEVELOPMENT EXPENSES
-
+
+ 514
+
+ view
+
+ GENERAL EXPENSES
+
-
- 519
-
- view
-
- OTHER OPERATING EXPENSES
-
+
+ 515
+
+ view
+
+ RESEARCH AND DEVELOPMENT EXPENSES
+
-
- 55
-
- view
-
- NON-OPERATING EXPENSES
-
+
+ 519
+
+ view
+
+ OTHER OPERATING EXPENSES
+
-
- 551
-
- view
-
- INTEREST EXPENSES
-
+
+ 55
+
+ view
+
+ NON-OPERATING EXPENSES
+
-
- 559
-
- view
-
- OTHER NON-OPERATING EXPENSES
-
+
+ 551
+
+ view
+
+ INTERESTS EXPENSES
+
+
+
+ 559
+
+ view
+
+ OTHER NON-OPERATING EXPENSES
+
diff --git a/addons/l10n_ca/account_chart_fr.xml b/addons/l10n_ca/account_chart_fr.xml
index dbf4f9aad7c..c168833b733 100644
--- a/addons/l10n_ca/account_chart_fr.xml
+++ b/addons/l10n_ca/account_chart_fr.xml
@@ -2,7 +2,7 @@
-
+
0
view
@@ -10,663 +10,831 @@
Account Chart CA FR
-
+
-
- 1
-
- view
-
- ACTIF
-
+
+ 1
+
+ view
+
+ ACTIF
+
+
+
+ 11
+
+ view
+
+ ACTIFS COURANTS
+
+
+
+ 111
+
+ view
+
+ ENCAISSE
+
+
+
+ 112
+
+ view
+
+ TRÉSORERIE OU ÉQUIVALENTS DE TRÉSORERIE
+
+
+
+ 113
+
+ view
+
+ CERTIFICATS DE DÉPÔTS
+
+
+
+ 114
+
+ view
+
+ STOCKS
+
+
+
+ 1141
+
+ other
+
+ Stock
+
+
+
+ 1145
+
+ other
+
+ Stock expédié non-facturé
+
+
+
+ 115
+
+ view
+
+ COMPTES CLIENTS
+
+
+
+ 1151
+
+ receivable
+
+
+ Comptes clients
+
+
+
+ 1152
+
+ view
+
+ PROVISION POUR CRÉANCES DOUTEUSES
+
+
+
+ 116
+
+ view
+
+ FRAIS PAYÉS D'AVANCE
+
+
+
+ 117
+
+ view
+
+ PLACEMENTS DÉTENUS À DES FINS DE TRANSACTION
+
+
+
+ 118
+
+ view
+
+ IMPÔTS À RECEVOIR
+
+
+
+ 1181
+
+ other
+
+
+ TPS à recevoir
+
+
+
+ 1182
+
+ other
+
+
+ TVP/TVQ à recevoir
+
+
+
+ 1183
+
+ other
+
+
+ TVH à recevoir
+
+
+
+ 15
+
+ view
+
+ ACTIFS NON-COURANTS
+
+
+
+ 151
+
+ view
+
+ PLACEMENTS DISPONIBLES À LA VENTE
+
+
+
+ 152
+
+ view
+
+ IMMOBILISATIONS CORPORELLES
+
+
+
+ 1527
+
+ view
+
+ AMORTISSEMENTS CUMULÉS
+
+
+
+ 153
+
+ view
+
+ IMMOBILISATIONS INCORPORELLES
+
+
+
+ 1531
+
+ view
+
+ BREVETS, MARQUES DE COMMERCE ET DROITS D'AUTEURS
+
+
+
+
+
+ 2
+
+ view
+
+ PASSIF
+
+
+
+ 21
+
+ view
+
+ PASSIFS COURANTS
+
+
+
+ 211
+
+ view
+
+ FOURNISSEURS ET COMPTES RATTACHÉS
+
+
+
+ 2111
+
+ payable
+
+
+ Comptes fournisseurs
+
+
+
+ 212
+
+ view
+
+ AUTRES COMPTES CRÉDITEURS
+
+
+
+ 213
+
+ view
+
+ IMPÔTS À PAYER
+
+
+
+ 2131
+
+ other
+
+
+ TPS à payer
+
+
+
+ 2132
+
+ other
+
+
+ TVP/TVQ à payer
+
+
+
+ 2133
+
+ other
+
+
+ TVH à payer
+
+
+
+ 214
+
+ view
+
+ IMPÔTS LIÉS AUX SALAIRES À PAYER
+
+
+
+ 2141
+
+ view
+
+ AGENCE DU REVENU DU CANADA
+
+
+
+ 21411
+
+ view
+
+ ASSURANCE EMPLOI À PAYER
+
+
+
+ 214111
+
+ other
+
+ AE - Contribution des employés
+
+
+
+ 214112
+
+ other
+
+ AE - Contribution de l'employeur
+
+
+
+ 21412
+
+ other
+
+ Impôt fédéral sur les revenus
+
+
+
+ 2142
+
+ view
+
+ AGENCE DU REVENU PROVINCIAL
+
+
+
+ 21421
+
+ other
+
+ Fond des Services de Santé à payer
+
+
+
+ 21422
+
+ view
+
+ RENTES À PAYER
+
+
+
+ 214221
+
+ other
+
+ Rentes - Contribution des employés
+
+
+
+ 214222
+
+ other
+
+ Rentes - Contribution de l'employeur
+
+
+
+ 21423
+
+ view
+
+ ASSURANCE PARENTALE À PAYER
+
-
- 11
-
- view
-
- ACTIFS COURANTS
-
+
+ 214231
+
+ other
+
+ AP - Contribution des employés
+
-
- 111
-
- view
-
- ENCAISSE
-
+
+ 214232
+
+ other
+
+ AP - Contribution de l'employeur
+
-
- 1111
-
- liquidity
-
- Compte chèque
-
+
+ 21424
+
+ other
+
+ Santé et Sécurité au Travail à payer
+
-
- 1112
-
- liquidity
-
- Petite caisse
-
+
+ 21425
+
+ other
+
+ Normes du Travail à payer
+
-
- 112
-
- view
-
- TRÉSORERIE OU ÉQUIVALENTS DE TRÉSORERIE
-
+
+ 21426
+
+ other
+
+ Impôt provincial sur les revenus
+
-
- 113
-
- view
-
- CERTIFICATS DE DÉPÔTS
-
+
+ 215
+
+ view
+
+ DETTES FINANCIÈRES COURANTES
+
-
- 114
-
- view
-
- STOCKS
-
+
+ 216
+
+ view
+
+ PASSIFS LIÉS AUX ACTIFS DÉTENUS EN VUE DE LEUR CESSION
+
-
- 115
-
- view
-
- COMPTES CLIENTS
-
+
+ 217
+
+ view
+
+ PASSIFS DE STOCK
+
-
- 1151
-
- receivable
-
-
- Comptes clients
-
+
+ 2171
+
+ other
+
+ Stock reçu non facturé
+
-
- 1152
-
- view
-
- PROVISION POUR CRÉANCES DOUTEUSES
-
+
+ 25
+
+ view
+
+ PASSIFS NON-COURANTS
+
-
- 116
-
- view
-
- FRAIS PAYÉS D'AVANCE
-
+
+ 251
+
+ view
+
+ DETTES FINANCIÈRES NON-COURANTES
+
-
- 117
-
- view
-
- PLACEMENTS DÉTENUS À DES FINS DE TRANSACTION
-
+
+ 252
+
+ view
+
+ PROVISIONS POUR RETRAITES ET AUTRES AVANTAGES POSTÉRIEURS À L'EMPLOI
+
-
- 118
-
- view
-
- IMPÔTS À RECEVOIR
-
+
+ 253
+
+ view
+
+ IMPÔTS DIFFÉRÉS
+
+
+
+ 254
+
+ view
+
+ AUTRES PASSIFS NON-COURANTS
+
-
- 1181
-
- other
-
-
- TPS à recevoir
-
+
-
- 1182
-
- other
-
-
- TVP/TVQ à recevoir
-
+
+ 3
+
+ view
+
+ CAPITAUX PROPRES
+
-
- 1183
-
- other
-
-
- TVH à recevoir
-
+
+ 31
+
+ view
+
+ CAPITAL-ACTIONS
+
-
- 15
-
- view
-
- ACTIFS NON-COURANTS
-
+
+ 32
+
+ view
+
+ PRIMES
+
-
- 151
-
- view
-
- PLACEMENTS DISPONIBLES À LA VENTE
-
+
+ 33
+
+ view
+
+ BÉNÉFICES NON RÉPARTIS
+
-
- 152
-
- view
-
- IMMOBILISATIONS CORPORELLES
-
+
+ 34
+
+ view
+
+ DIVIDENDES
+
-
- 1527
-
- view
-
- AMORTISSEMENTS CUMULÉS
-
+
+ 35
+
+ view
+
+ ÉCARTS DE CONVERSION
+
-
- 153
-
- view
-
- IMMOBILISATIONS INCORPORELLES
-
+
+ 36
+
+ view
+
+ SURPLUS D'APPORT
+
-
- 1531
-
- view
-
- BREVETS, MARQUES DE COMMERCE ET DROITS D'AUTEURS
-
-
-
-
-
- 2
-
- view
-
- PASSIF
-
-
-
- 21
-
- view
-
- PASSIFS COURANTS
-
-
-
- 211
-
- view
-
- FOURNISSEURS ET COMPTES RATTACHÉS
-
-
-
- 2111
-
- payable
-
-
- Comptes fournisseurs
-
-
-
- 212
-
- view
-
- AUTRES COMPTES CRÉDITEURS
-
-
-
- 213
-
- view
-
- IMPÔTS À PAYER
-
-
-
- 2131
-
- other
-
-
- TPS à payer
-
-
-
- 2132
-
- other
-
-
- TVP/TVQ à payer
-
-
-
- 2133
-
- other
-
-
- TVH à payer
-
-
-
- 214
-
- view
-
- DETTES FINANCIÈRES COURANTES
-
-
-
- 215
-
- view
-
- PASSIFS LIÉS AUX ACTIFS DÉTENUS EN VUE DE LEUR CESSION
-
-
-
- 25
-
- view
-
- PASSIFS NON-COURANTS
-
-
-
- 251
-
- view
-
- DETTES FINANCIÈRES NON-COURANTES
-
-
-
- 252
-
- view
-
- PROVISIONS POUR RETRAITES ET AUTRES AVANTAGES POSTÉRIEURS À L'EMPLOI
-
-
-
- 253
-
- view
-
- IMPÔTS DIFFÉRÉS
-
-
-
- 254
-
- view
-
- AUTRES PASSIFS NON-COURANTS
-
-
-
-
-
- 3
-
- view
-
- CAPITAUX PROPRES
-
-
-
- 31
-
- view
-
- CAPITAL-ACTIONS
-
-
-
- 32
-
- view
-
- PRIMES
-
-
-
- 33
-
- view
-
- BÉNÉFICES NON RÉPARTIS
-
-
-
- 34
-
- view
-
- DIVIDENDES
-
-
-
- 35
-
- view
-
- ÉCARTS DE CONVERSION
-
-
-
- 36
-
- view
-
- SURPLUS D'APPORT
-
-
-
- 39
-
- view
-
- AUTRES ÉLÉMENTS DU RÉSULTAT GLOBAL
-
+
+ 39
+
+ view
+
+ AUTRES ÉLÉMENTS DU RÉSULTAT GLOBAL
+
-
- 4
-
- view
-
- PRODUITS
-
+
+ 4
+
+ view
+
+ PRODUITS
+
-
- 41
-
- view
-
- PRODUITS D'EXPLOITATION
-
+
+ 41
+
+ view
+
+ PRODUITS D'EXPLOITATION
+
-
- 411
-
- other
-
- Ventes
-
+
+ 411
+
+ other
+
+ Ventes
+
-
- 412
-
- other
-
- Ventes avec des provinces harmonisées
-
-
-
- 413
-
- other
-
- Ventes avec des provinces non-harmonisées
-
+
+ 412
+
+ other
+
+ Ventes avec des provinces harmonisées
+
+
+
+ 413
+
+ other
+
+ Ventes avec des provinces non-harmonisées
+
-
- 414
-
- other
-
- Ventes à l'étranger
-
+
+ 414
+
+ other
+
+ Ventes à l'étranger
+
-
- 419
-
- view
-
- AUTRES PRODUITS D'EXPLOITATION
-
+
+ 419
+
+ view
+
+ AUTRES PRODUITS D'EXPLOITATION
+
-
- 42
-
- view
-
- PRODUITS NON LIÉS À L'EXPLOITATION
-
+
+ 42
+
+ view
+
+ PRODUITS NON LIÉS À L'EXPLOITATION
+
-
- 425
-
- view
-
- INTÉRÊTS
-
+
+ 425
+
+ view
+
+ INTÉRÊTS
+
-
- 429
-
- view
-
- AUTRES PRODUITS NON LIÉS À L'EXPLOITATION
-
+
+ 429
+
+ view
+
+ AUTRES PRODUITS NON LIÉS À L'EXPLOITATION
+
-
+
-
- 5
-
- view
-
- CHARGES
-
+
+ 5
+
+ view
+
+ CHARGES
+
-
- 51
-
- view
-
- CHARGES D'EXPLOITATION
-
+
+ 51
+
+ view
+
+ CHARGES D'EXPLOITATION
+
-
- 511
-
- view
-
- COÛT DES PRODUITS VENDUS
-
-
+
+ 511
+
+ view
+
+ COÛT DES PRODUITS VENDUS
+
+
- 5111
-
- other
-
- Achats
-
+ 5111
+
+ other
+
+ Achats
+
-
- 5112
-
- other
-
- Achats dans des provinces harmonisées
-
-
-
- 5113
-
- other
-
- Achats dans des provinces non-harmonisées
-
+
+ 5112
+
+ other
+
+ Achats dans des provinces harmonisées
+
+
+
+ 5113
+
+ other
+
+ Achats dans des provinces non-harmonisées
+
-
- 5114
-
- other
-
- Achats à l'étranger
-
+
+ 5114
+
+ other
+
+ Achats à l'étranger
+
-
- 512
-
- view
-
- SALAIRES ET CHARGES SOCIALES
-
+
+ 512
+
+ view
+
+ SALAIRES ET CHARGES SOCIALES
+
-
- 51201
-
- other
-
- Salaires
-
+
+ 51201
+
+ other
+
+ Salaires
+
-
- 51202
-
- other
-
- Vacances
-
+
+ 51202
+
+ other
+
+ Vacances
+
-
- 51203
-
- other
-
- Assurance Emploi
-
+
+ 51203
+
+ other
+
+ Assurance Emploi
+
-
- 51204
-
- other
-
- Fonds des services de santé
-
+
+ 51204
+
+ other
+
+ Fonds des services de santé
+
-
- 51205
-
- other
-
- Rentes
-
+
+ 51205
+
+ other
+
+ Rentes
+
-
- 51206
-
- other
-
- Assurance parental
-
+
+ 51206
+
+ other
+
+ Assurance parentale
+
-
- 51207
-
- other
-
- Santé et sécurité au travail
-
+
+ 51207
+
+ other
+
+ Santé et sécurité au travail
+
-
- 51208
-
- other
-
- Normes du travail
-
+
+ 51208
+
+ other
+
+ Normes du travail
+
-
- 513
-
- view
-
- FRAIS SUR VENTE
-
+
+ 51209
+
+ other
+
+ Impôt fédéral
+
-
- 514
-
- view
-
- FRAIS GÉNÉRAUX
-
+
+ 51210
+
+ other
+
+ Impôt provincial
+
-
- 515
-
- view
-
- FRAIS DE RECHERCHE ET DÉVELOPPEMENT
-
+
+ 513
+
+ view
+
+ FRAIS SUR VENTE
+
-
- 519
-
- view
-
- AUTRES FRAIS D'EXPLOITATION
-
+
+ 514
+
+ view
+
+ FRAIS GÉNÉRAUX
+
-
- 52
-
- view
-
- FRAIS NON LIÉS À L'EXPLOITATION
-
+
+ 515
+
+ view
+
+ FRAIS DE RECHERCHE ET DÉVELOPPEMENT
+
-
- 521
-
- view
-
- INTÉRÊTS DÉBITEURS
-
+
+ 519
+
+ view
+
+ AUTRES FRAIS D'EXPLOITATION
+
-
- 529
-
- view
-
- AUTRES FRAIS NON LIÉS À L'EXPLOITATION
-
+
+ 52
+
+ view
+
+ FRAIS NON LIÉS À L'EXPLOITATION
+
+
+
+ 521
+
+ view
+
+ INTÉRÊTS DÉBITEURS
+
+
+
+ 529
+
+ view
+
+ AUTRES FRAIS NON LIÉS À L'EXPLOITATION
+
diff --git a/addons/l10n_ca/account_chart_template_en.xml b/addons/l10n_ca/account_chart_template_en.xml
index 6ddfa567d98..635fa7b8bb1 100644
--- a/addons/l10n_ca/account_chart_template_en.xml
+++ b/addons/l10n_ca/account_chart_template_en.xml
@@ -8,11 +8,29 @@
Canada - Chart of Accounts for english-speaking provinces
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ property_stock_valuation_account_id
+
+
+
+
diff --git a/addons/l10n_ca/account_chart_template_fr.xml b/addons/l10n_ca/account_chart_template_fr.xml
index 02f4deee714..7d1cc0a9ae2 100644
--- a/addons/l10n_ca/account_chart_template_fr.xml
+++ b/addons/l10n_ca/account_chart_template_fr.xml
@@ -1,18 +1,36 @@
-
+
-
-
- Canada - Plan comptable pour les provinces francophones
-
-
-
-
-
-
-
-
+
+
+ Canada - Plan comptable pour les provinces francophones
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+ property_stock_valuation_account_id
+
+
+
+
+
+
+
diff --git a/addons/l10n_ca/account_tax_en.xml b/addons/l10n_ca/account_tax_en.xml
index f185f7f9198..1ff884ac361 100644
--- a/addons/l10n_ca/account_tax_en.xml
+++ b/addons/l10n_ca/account_tax_en.xml
@@ -25,8 +25,8 @@
percent
1
-
-
+
+
@@ -42,8 +42,8 @@
0.700000
percent
2
-
-
+
+
@@ -72,8 +72,8 @@
percent
1
-
-
+
+
@@ -89,8 +89,8 @@
0.100000
percent
2
-
-
+
+
@@ -118,9 +118,8 @@
0.050000
percent
1
-
-
-
+
+
@@ -130,14 +129,14 @@
- TVQ for sales - 9.5%
+ TVQ for sales - 9.975%
TVQ
sale
- 0.095000
+ 0.099750
percent
2
-
-
+
+
@@ -166,8 +165,8 @@
percent
1
-
-
+
+
@@ -183,8 +182,8 @@
0.050000
percent
2
-
-
+
+
@@ -201,8 +200,8 @@
sale
0.120000
percent
-
-
+
+
@@ -216,8 +215,8 @@
sale
0.130000
percent
-
-
+
+
@@ -231,8 +230,8 @@
sale
0.135000
percent
-
-
+
+
@@ -246,8 +245,8 @@
sale
0.150000
percent
-
-
+
+
@@ -263,8 +262,8 @@
sale
0.050000
percent
-
-
+
+
@@ -388,7 +387,6 @@
0.050000
percent
1
-
@@ -400,10 +398,10 @@
- TVQ for purchases - 9.5%
+ TVQ for purchases - 9.975%
TVQ
purchase
- 0.095000
+ 0.099750
percent
2
diff --git a/addons/l10n_ca/account_tax_fr.xml b/addons/l10n_ca/account_tax_fr.xml
index 169bfe4f20b..b344feeec83 100644
--- a/addons/l10n_ca/account_tax_fr.xml
+++ b/addons/l10n_ca/account_tax_fr.xml
@@ -118,7 +118,6 @@
0.050000
percent
1
-
@@ -130,10 +129,10 @@
- TVQ sur les ventes - 9.5%
+ TVQ sur les ventes - 9.975%
TVQ
sale
- 0.095000
+ 0.099750
percent
2
@@ -388,7 +387,6 @@
0.050000
percent
1
-
@@ -400,10 +398,10 @@
- TVQ sur les achats - 9.5%
+ TVQ sur les achats - 9.975%
TVQ
purchase
- 0.095000
+ 0.099750
percent
2
diff --git a/addons/l10n_ca/fiscal_templates_fr.xml b/addons/l10n_ca/fiscal_templates_fr.xml
index 722517366a8..3ba13d6642e 100644
--- a/addons/l10n_ca/fiscal_templates_fr.xml
+++ b/addons/l10n_ca/fiscal_templates_fr.xml
@@ -10,22 +10,22 @@
- Régime Provinces Harmonisées (12%)
+ Régime Provinces Harmonisées à 12% (BC)
- Régime Provinces Harmonisées (13%)
+ Régime Provinces Harmonisées à 13% (NB, ON, NL)
- Régime Provinces Harmonisées (13.5%)
+ Régime Provinces Harmonisées à 13.5% ()
- Régime Provinces Harmonisées (15%)
+ Régime Provinces Harmonisées à 15% (NS)
diff --git a/addons/l10n_et/__init__.py b/addons/l10n_et/__init__.py
new file mode 100644
index 00000000000..506fada4738
--- /dev/null
+++ b/addons/l10n_et/__init__.py
@@ -0,0 +1,20 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+# Copyright (C) 2012 Michael Telahun Makonnen .
+# All Rights Reserved.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
diff --git a/addons/l10n_et/__openerp__.py b/addons/l10n_et/__openerp__.py
new file mode 100644
index 00000000000..f788e9c52d5
--- /dev/null
+++ b/addons/l10n_et/__openerp__.py
@@ -0,0 +1,59 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+# Copyright (C) 2012 Michael Telahun Makonnen .
+# All Rights Reserved.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+##############################################################################
+
+{
+ 'name': 'Ethiopia - Accounting',
+ 'version': '1.0',
+ 'category': 'Localization/Account Charts',
+ 'description': """
+Base Module for Ethiopian Localization
+======================================
+
+This is the latest Ethiopian OpenERP localization and consists of:
+ - Chart of Accounts
+ - VAT tax structure
+ - Withholding tax structure
+ - Regional State listings
+ """,
+ 'author':'Michael Telahun Makonnen ',
+ 'website':'http://miketelahun.wordpress.com',
+ 'depends': [
+ 'base_vat',
+ 'account_chart',
+ ],
+ 'init_xml': [
+ 'data/account.account.type.csv',
+ 'data/account.account.template.csv',
+ 'data/account.tax.code.template.csv',
+ 'data/account.chart.template.csv',
+ 'data/account.tax.template.csv',
+ 'data/res.country.state.csv',
+ ],
+ 'update_xml': [
+ 'l10n_et_wizard.xml',
+ ],
+ 'test': [
+ ],
+ 'demo_xml': [
+ ],
+ 'installable': True,
+ 'active': False,
+}
\ No newline at end of file
diff --git a/addons/l10n_et/data/account.account.template.csv b/addons/l10n_et/data/account.account.template.csv
new file mode 100644
index 00000000000..42b20174d74
--- /dev/null
+++ b/addons/l10n_et/data/account.account.template.csv
@@ -0,0 +1,138 @@
+"id","code","name","type","user_type:id","parent_id:id","reconcile"
+"l10n_et0","0","Ethiopia","view","l10n_et_view","",""
+"l10n_et1000","1000","REVENUE","view","l10n_et_view","l10n_et0",""
+"l10n_et1100","1100","Sales of Goods and Services","other","l10n_et_income","l10n_et1000",""
+"l10n_et2000","2000","ASSETS","view","l10n_et_view","l10n_et0",""
+"l10n_et2100","2100-2199","Cash and Cash Equivalents","view","l10n_et_view","l10n_et2000",""
+"l10n_et2102","2102","Cash at bank in foreigh currency","liquidity","l10n_et_current_assets","l10n_et2100",""
+"l10n_et2104","2104","Letter of Credit restricted account","liquidity","l10n_et_current_assets","l10n_et2100",""
+"l10n_et2440","2105","Investments current assets","view","l10n_et_view","l10n_et2100",""
+"l10n_et2110","2110","Cash on hand and at bank","view","l10n_et_view","l10n_et2100",""
+"l10n_et2200","2200-2299","Receivables","view","l10n_et_view","l10n_et2000",""
+"l10n_et220119","2201-2219","Accounts Receivable","view","l10n_et_view","l10n_et2200",""
+"l10n_et2201","2201","Suspense","receivable","l10n_et_receivable","l10n_et220119",""
+"l10n_et2202","2202","Cash shortage","receivable","l10n_et_receivable","l10n_et220119",""
+"l10n_et2203","2203","Advance to staff","receivable","l10n_et_receivable","l10n_et220119",""
+"l10n_et2204","2204","Cash Registers","receivable","l10n_et_receivable","l10n_et220119",""
+"l10n_et2211","2211","Trade Debtors","receivable","l10n_et_receivable","l10n_et220119","True"
+"l10n_et2212","2212","VAT Receivable on Purchases","receivable","l10n_et_input_tax","l10n_et220119",""
+"l10n_et2213","2213","Withholding Receivable on Sales","receivable","l10n_et_input_tax","l10n_et220119",""
+"l10n_et2214","2214","VAT Withholding Receivable on Sales","receivable","l10n_et_input_tax","l10n_et220119",""
+"l10n_et2250","2250","Prepayments","view","l10n_et_view","l10n_et2200",""
+"l10n_et2251","2251","Advance to contractors","other","l10n_et_current_assets","l10n_et2250",""
+"l10n_et2252","2252","Advance to consultant","other","l10n_et_current_assets","l10n_et2250",""
+"l10n_et2253","2253","Advance to supplier","other","l10n_et_current_assets","l10n_et2250",""
+"l10n_et2274","2254","Other Debtors","other","l10n_et_current_assets","l10n_et2200",""
+"l10n_et2301","2301","Goods in Transit","other","l10n_et_current_assets","l10n_et2000",""
+"l10n_et2351","2351","Stock","other","l10n_et_current_assets","l10n_et2000",""
+"l10n_et2400","2400-2499","Production Stock","view","l10n_et_view","l10n_et2000",""
+"l10n_et2411","2411","Work in Progress","other","l10n_et_current_assets","l10n_et2400",""
+"l10n_et2412","2412","Finished Goods","other","l10n_et_current_assets","l10n_et2400",""
+"l10n_et2500","2500","Fixed Assets","view","l10n_et_view","l10n_et2000",""
+"l10n_et250019","2501-2519","Construction in Progress","view","l10n_et_view","l10n_et2500",""
+"l10n_et2501","2501","Construction of buildings","other","l10n_et_asset","l10n_et250019",""
+"l10n_et2503","2503","Construction of infrastructure","other","l10n_et_asset","l10n_et250019",""
+"l10n_et2520","2520-2599","Property and Equipment","view","l10n_et_view","l10n_et2500",""
+"l10n_et2521","2521","Vehicles and other vehicular transport","other","l10n_et_asset","l10n_et2520",""
+"l10n_et2522","2522","Aircraft, boats, etc","other","l10n_et_asset","l10n_et2520",""
+"l10n_et2523","2523","Plant machinery and equipment","other","l10n_et_asset","l10n_et2520",""
+"l10n_et2525","2525","Buildings","other","l10n_et_asset","l10n_et2520",""
+"l10n_et2527","2527","Infrastructure","other","l10n_et_asset","l10n_et2520",""
+"l10n_et2529","2529","Furnishings and fixtures","other","l10n_et_asset","l10n_et2520",""
+"l10n_et2530","2530","Livestock and tansport animals","other","l10n_et_asset","l10n_et2520",""
+"l10n_et2700","2700","Long Term Loans","view","l10n_et_view","l10n_et2000",""
+"l10n_et2800","2800","Investments","view","l10n_et_view","l10n_et2000",""
+"l10n_et3000","3000","LIABILITIES","view","l10n_et_view","l10n_et0",""
+"l10n_et300099","3000-3099","Payables","view","l10n_et_view","l10n_et3000",""
+"l10n_et300019","3000-3019","Accounts Payable","view","l10n_et_view","l10n_et300099",""
+"l10n_et3001","3001","Grace period payables","payable","l10n_et_payable","l10n_et300019",""
+"l10n_et3002","3002","Trade Creditors","payable","l10n_et_payable","l10n_et300019","True"
+"l10n_et3003","3003","Pension contribution payable","payable","l10n_et_payable","l10n_et300019",""
+"l10n_et3004","3004","Salary payable","payable","l10n_et_payable","l10n_et300019",""
+"l10n_et3006","3006","Witholding Payable","payable","l10n_et_output_tax","l10n_et300019",""
+"l10n_et3007","3007","VAT Payable","Payable","l10n_et_output_tax","l10n_et300019",""
+"l10n_et3008","3008","Federal Income Tax","payable","l10n_et_output_tax","l10n_et300019",""
+"l10n_et3050","3050","Deposits","view","l10n_et_view","l10n_et300099",""
+"l10n_et3054","3054","Other deposits","other","l10n_et_current_liabilities","l10n_et3050",""
+"l10n_et3060","3060","Retentions","view","l10n_et_view","l10n_et300099",""
+"l10n_et3061","3061","Retention on contract","other","l10n_et_current_liabilities","l10n_et3060",""
+"l10n_et3100","3100","Long-Term Debt","view","l10n_et_view","l10n_et3000",""
+"l10n_et310049","3100-3149","Local Loans","view","l10n_et_view","l10n_et3100",""
+"l10n_et3103","3103","Commercial Loan","other","l10n_et_liability","l10n_et310049",""
+"l10n_et3150","3150-3179","Foreign Loans","view","l10n_et_view","l10n_et3100",""
+"l10n_et3153","3153","Commercial Loan","other","l10n_et_liability","l10n_et3150",""
+"l10n_et4000","4000","NET ASSETS/EQUITY","view","l10n_et_view","l10n_et0",""
+"l10n_et4001","4010","Share capital / equity","other","l10n_et_equity","l10n_et4000",""
+"l10n_et4004","4020","Reserves","other","l10n_et_equity","l10n_et4000",""
+"l10n_et4100","4100","Profit and loss account","other","l10n_et_profit_and_loss","l10n_et4000",""
+"l10n_et5000","5000","COST OF GOODS SOLD","view","l10n_et_view","l10n_et0",""
+"l10n_et5111","5111","Cost of Goods and Services","other","l10n_et_expense","l10n_et5000",""
+"l10n_et5901","5901","Inventory Adjustments","other","l10n_et_expense","l10n_et5000",""
+"l10n_et5911","5911","Purchase Returns and Allowances","other","l10n_et_expense","l10n_et5000",""
+"l10n_et5921","5921","Other","other","l10n_et_expense","l10n_et5000",""
+"l10n_et6000","6000","EXPENSES","view","l10n_et_view","l10n_et0",""
+"l10n_et6100","6100","PERSONNEL SERVICES","view","l10n_et_view","l10n_et6000",""
+"l10n_et6110","6110","Compensation","view","l10n_et_view","l10n_et6100",""
+"l10n_et6111","6111","Salaries to permanent staff","other","l10n_et_expense","l10n_et6110",""
+"l10n_et6113","6113","Wages to contract staff","other","l10n_et_expense","l10n_et6110",""
+"l10n_et6114","6114","Wages to casual staff","other","l10n_et_expense","l10n_et6110",""
+"l10n_et6115","6115","Wages to external contract staff","other","l10n_et_expense","l10n_et6110",""
+"l10n_et6116","6116","Miscellaneous payments to staff","other","l10n_et_expense","l10n_et6110",""
+"l10n_et6120","6120","Allowances/benefits","view","l10n_et_view","l10n_et6100",""
+"l10n_et6121","6121","Allowances to permanent staff","other","l10n_et_expense","l10n_et6120",""
+"l10n_et6123","6123","Allowances to contract staff","other","l10n_et_expense","l10n_et6120",""
+"l10n_et6124","6124","Allowances to external contract staff","other","l10n_et_expense","l10n_et6120",""
+"l10n_et6130","6130","Pension Contributions","view","l10n_et_view","l10n_et6100",""
+"l10n_et6131","6131","Contribution to permanent staff pensions","other","l10n_et_expense","l10n_et6130",""
+"l10n_et6200","6200","GOODS AND SERVICES","view","l10n_et_view","l10n_et6000",""
+"l10n_et6210","6210-20","Goods and Supplies","view","l10n_et_view","l10n_et6200",""
+"l10n_et6211","6211","Uniforms, clothing, bedding","other","l10n_et_expense","l10n_et6210",""
+"l10n_et6212","6212","Office supplies","other","l10n_et_expense","l10n_et6210",""
+"l10n_et6213","6213","Printing","other","l10n_et_expense","l10n_et6210",""
+"l10n_et6214","6214","Medical supplies","other","l10n_et_expense","l10n_et6210",""
+"l10n_et6215","6215","Educational supplies","other","l10n_et_expense","l10n_et6210",""
+"l10n_et6216","6216","Food","other","l10n_et_expense","l10n_et6210",""
+"l10n_et6217","6217","Fuel and lubricants","other","l10n_et_expense","l10n_et6210",""
+"l10n_et6218","6218","Other material and supplies","other","l10n_et_expense","l10n_et6210",""
+"l10n_et6219","6219","Miscellaneous equipment","other","l10n_et_expense","l10n_et6210",""
+"l10n_et6221","6221","Agriculture, forestry and marine inputs","other","l10n_et_expense","l10n_et6210",""
+"l10n_et6222","6222","Veterinary supplies and drugs","other","l10n_et_expense","l10n_et6210",""
+"l10n_et6223","6223","Research and development supplies","other","l10n_et_expense","l10n_et6210",""
+"l10n_et6230","6230","Travelling and Official Entertainment Services","view","l10n_et_view","l10n_et6200",""
+"l10n_et6231","6231","Per diem","other","l10n_et_expense","l10n_et6230",""
+"l10n_et6232","6232","Transport fees","other","l10n_et_expense","l10n_et6230",""
+"l10n_et6233","6233","Official entertainment","other","l10n_et_expense","l10n_et6230",""
+"l10n_et6240","6240","Maintenance and Repair Services","view","l10n_et_view","l10n_et6200",""
+"l10n_et6241","6241","Maintenance and repair of vehicles and other transport","other","l10n_et_expense","l10n_et6240",""
+"l10n_et6243","6243","Maintenance and repair of plant, machinery, and equipment","other","l10n_et_expense","l10n_et6240",""
+"l10n_et6244","6244","Maintenance and repair of buildings, furnishings and fixtures","other","l10n_et_expense","l10n_et6240",""
+"l10n_et6245","6245","Maintenance and repair of infrastructure","other","l10n_et_expense","l10n_et6240",""
+"l10n_et6250","6250","Contracted Services","view","l10n_et_view","l10n_et6200",""
+"l10n_et6251","6251","Contracted professional services","other","l10n_et_expense","l10n_et6250",""
+"l10n_et6252","6252","Rent","other","l10n_et_expense","l10n_et6250",""
+"l10n_et6253","6253","Advertising","other","l10n_et_expense","l10n_et6250",""
+"l10n_et6254","6254","Insurance","other","l10n_et_expense","l10n_et6250",""
+"l10n_et6255","6255","Freight","other","l10n_et_expense","l10n_et6250",""
+"l10n_et6256","6256","Fees and charges","other","l10n_et_expense","l10n_et6250",""
+"l10n_et6257","6257","Electricity charges","other","l10n_et_expense","l10n_et6250",""
+"l10n_et6258","6258","Telecommunication charges","other","l10n_et_expense","l10n_et6250",""
+"l10n_et6259","6259","Water and other utilities","other","l10n_et_expense","l10n_et6250",""
+"l10n_et6270","6270","Training Services","view","l10n_et_view","l10n_et6200",""
+"l10n_et6271","6271","Local training","other","l10n_et_expense","l10n_et6270",""
+"l10n_et6272","6272","External training","other","l10n_et_expense","l10n_et6270",""
+"l10n_et6300","6300","FIXED ASSETS AND CONSTRUCTION","view","l10n_et_view","l10n_et6000",""
+"l10n_et6310","6310","Fixed Assets","view","l10n_et_view","l10n_et6300",""
+"l10n_et6311","6311","Depreciation of vehicles and other vehicular transport","other","l10n_et_expense","l10n_et6310",""
+"l10n_et6313","6313","Depreciation of plant, machinery and equipment","other","l10n_et_expense","l10n_et6310",""
+"l10n_et6314","6314","Depreciation of buildings, furnishings and fixtures","other","l10n_et_expense","l10n_et6310",""
+"l10n_et6315","6315","Depreciation of livestock and transport animals","other","l10n_et_expense","l10n_et6310",""
+"l10n_et6320","6320","Construction","view","l10n_et_view","l10n_et6300",""
+"l10n_et6321","6321","Pre-construction activities","other","l10n_et_expense","l10n_et6320",""
+"l10n_et6322","6322","Construction of buildings","other","l10n_et_expense","l10n_et6320",""
+"l10n_et6324","6324","Construction of infrastructure","other","l10n_et_expense","l10n_et6320",""
+"l10n_et6400","6400","OTHER PAYMENTS","view","l10n_et_view","l10n_et6000",""
+"l10n_et6430","6430","Debt Payments","view","l10n_et_view","l10n_et6400",""
+"l10n_et6431","6431","Payments on the principal of foreign debt","other","l10n_et_expense","l10n_et6430",""
+"l10n_et6432","6432","Payments of interest and bank charges on foreign debt","other","l10n_et_expense","l10n_et6430",""
+"l10n_et6433","6433","Payments on the principal of local debt","other","l10n_et_expense","l10n_et6430",""
+"l10n_et6434","6434","Payments of interest and bank charges on local debt","other","l10n_et_expense","l10n_et6430",""
diff --git a/addons/l10n_et/data/account.account.type.csv b/addons/l10n_et/data/account.account.type.csv
new file mode 100644
index 00000000000..5eac2c92e73
--- /dev/null
+++ b/addons/l10n_et/data/account.account.type.csv
@@ -0,0 +1,14 @@
+"id","name","code","close_method","report_type"
+"l10n_et_asset","Fixed Assets","fixed_assets","Balance","asset"
+"l10n_et_current_assets","Current Assets","current_assets","Balance","asset"
+"l10n_et_equity","Equity","equity","Balance","liability"
+"l10n_et_expense","Expense","expense","None","expense"
+"l10n_et_income","Income","income","None","income"
+"l10n_et_liability","Long-Term Liabilities","liability","Balance","liability"
+"l10n_et_current_liabilities","Current Liabilities","current_liabilities","Balance","liability"
+"l10n_et_payable","Payable","payable","unreconciled","liability"
+"l10n_et_receivable","Receivable","receivable","unreconciled","asset"
+"l10n_et_output_tax","Output Tax","output_tax","unreconciled","liability"
+"l10n_et_input_tax","Input Tax","input_tax","unreconciled","asset"
+"l10n_et_profit_and_loss","Profit and Loss","profit_and_loss","None","none"
+"l10n_et_view","View","view","None","/"
diff --git a/addons/l10n_et/data/account.chart.template.csv b/addons/l10n_et/data/account.chart.template.csv
new file mode 100644
index 00000000000..de24c43bad2
--- /dev/null
+++ b/addons/l10n_et/data/account.chart.template.csv
@@ -0,0 +1,2 @@
+"id","name","account_root_id:id","tax_code_root_id:id","bank_account_view_id:id","property_account_receivable:id","property_account_payable:id","property_account_expense_categ:id","property_account_income_categ:id"
+"l10n_et","Ethiopia Tax and Account Chart Template","l10n_et0","tc_01","l10n_et2110","l10n_et2211","l10n_et3002","l10n_et2301","l10n_et1100"
diff --git a/addons/l10n_et/data/account.tax.code.template.csv b/addons/l10n_et/data/account.tax.code.template.csv
new file mode 100644
index 00000000000..25986a5d9e8
--- /dev/null
+++ b/addons/l10n_et/data/account.tax.code.template.csv
@@ -0,0 +1,31 @@
+"id","code","name","parent_id:id","notprintable","sign"
+"tc_01",0,"FDRE",,,1.0
+"tc_02",100,"Taxable Purchases - VAT","tc_01",False,1.0
+"tc_03",110,"Taxable Purchase VAT Out of Scope","tc_02",False,1.0
+"tc_04",120,"Taxable Purchase VAT Exempt","tc_02",False,1.0
+"tc_05",130,"Taxable Purchase VAT Rated 0%","tc_02",False,1.0
+"tc_06",140,"Taxable Purchase VAT Rated 15%","tc_02",False,1.0
+"tc_07",200,"Taxable Purchases - Witholding","tc_01",False,1.0
+"tc_08",220,"Taxable 2% Withholding on Purchases","tc_07",False,1.0
+"tc_09",225,"Taxable 35% Withholding on Purchases","tc_07",False,1.0
+"tc_10",250,"Taxable Sales - VAT","tc_01",False,1.0
+"tc_11",255,"Taxable Sales VAT Out of Scope (Sales)","tc_10",False,1.0
+"tc_12",260,"Taxable Sales VAT Exempt","tc_10",False,1.0
+"tc_13",265,"Taxable Sales VAT Rated 0%","tc_10",False,1.0
+"tc_14",270,"Taxable Sales VAT Rated 15%","tc_10",False,1.0
+"tc_15",280,"Taxable Sales - Withholding","tc_01",False,1.0
+"tc_16",285,"Taxable 2% Withholding on Sales","tc_15",False,1.0
+"tc_17",290,"Taxable 35% Withholding on Sales","tc_15",False,1.0
+"tc_18",295,"Taxable VAT Withholding on Sales","tc_15",False,1.0
+"tc_19",300,"Net VAT to be Paid/Reclaimed","tc_01",False,1.0
+"tc_20",310,"Purchase VAT","tc_19",False,1.0
+"tc_21",311,"Purchase VAT Rated 15%","tc_20",False,-1.0
+"tc_22",320,"Sales VAT","tc_19",False,1.0
+"tc_23",321,"Sales VAT Rated 15%","tc_22",False,1.0
+"tc_24",400,"Withholding on Purchases","tc_01",False,1.0
+"tc_25",410,"2% Withholding on Purchases","tc_24",False,-1.0
+"tc_26",420,"35% Withholding on Purchases","tc_24",False,-1.0
+"tc_27",500,"Withholding on Sales","tc_01",False,1.0
+"tc_28",510,"2% Withheld on Sales","tc_27",False,1.0
+"tc_29",520,"35% Withheld on Sales","tc_27",False,1.0
+"tc_30",530,"VAT Withheld on Sales","tc_27",False,1.0
diff --git a/addons/l10n_et/data/account.tax.template.csv b/addons/l10n_et/data/account.tax.template.csv
new file mode 100644
index 00000000000..39f71126de0
--- /dev/null
+++ b/addons/l10n_et/data/account.tax.template.csv
@@ -0,0 +1,14 @@
+"id","description","chart_template_id:id","type_tax_use","name","base_code_id:id","tax_code_id:id","ref_base_code_id:id","ref_tax_code_id:id","amount","account_collected_id:id","account_paid_id:id","base_sign","tax_sign","ref_base_sign","ref_tax_sign","type"
+"id_tax03","","l10n_et","sale","VAT 15% rated sales","tc_14","tc_23","tc_14","tc_23","0.15","l10n_et3007","l10n_et3007","1.0","1.0","-1.0","-1.0","percent"
+"id_tax04","","l10n_et","sale","VAT 0% rated sales","tc_13",,"tc_13",,"","l10n_et3007","l10n_et3007","1.0","1.0","-1.0","-1.0","percent"
+"id_tax06","","l10n_et","sale","VAT Exempt rated sales","tc_12",,"tc_12",,"","l10n_et3007","l10n_et3007","1.0","1.0","-1.0","-1.0","percent"
+"id_tax11","","l10n_et","sale","VAT Out of Scope rated sales","tc_11",,"tc_11",,"","l10n_et3007","l10n_et3007","1.0","1.0","-1.0","-1.0","percent"
+"id_tax02","","l10n_et","sale","Withholding 2% rated sales","tc_16","tc_28","tc_16","tc_28","-0.02","l10n_et3006","l10n_et3006","1.0","1.0","-1.0","-1.0","percent"
+"id_tax13","","l10n_et","sale","Withholding 35% rated sales","tc_17","tc_29","tc_17","tc_29","-0.35","l10n_et3006","l10n_et3006","1.0","1.0","-1.0","-1.0","percent"
+"id_tax14","","l10n_et","sale","Withholding VAT 15% rated sales","tc_18","tc_30","tc_18","tc_30","-0.15","l10n_et3006","l10n_et3006","1.0","1.0","-1.0","-1.0","percent"
+"id_tax08","","l10n_et","purchase","VAT 15% rated purchases","tc_06","tc_21","tc_06","tc_21","0.15","l10n_et2212","l10n_et2212","1.0","1.0","-1.0","-1.0","percent"
+"id_tax07","","l10n_et","purchase","VAT 0% rated purchases","tc_05",,"tc_05",,"","l10n_et2212","l10n_et2212","1.0","1.0","-1.0","-1.0","percent"
+"id_tax10","","l10n_et","purchase","VAT Exempt rated purchases","tc_04",,"tc_04",,"","l10n_et2212","l10n_et2212","1.0","1.0","-1.0","-1.0","percent"
+"id_tax09","","l10n_et","purchase","VAT Out of Scope rated purchases","tc_03",,"tc_03",,"","l10n_et2212","l10n_et2212","1.0","1.0","-1.0","-1.0","percent"
+"id_tax05","","l10n_et","purchase","Withholding 2% rated purchases","tc_08","tc_25","tc_08","tc_25","-0.02","l10n_et2213","l10n_et2213","1.0","1.0","-1.0","-1.0","percent"
+"id_tax12","","l10n_et","purchase","Withholding 35% rated purchases","tc_09","tc_26","tc_09","tc_26","-0.35","l10n_et2213","l10n_et2213","1.0","1.0","-1.0","-1.0","percent"
diff --git a/addons/l10n_et/data/res.country.state.csv b/addons/l10n_et/data/res.country.state.csv
new file mode 100644
index 00000000000..5f4019593bc
--- /dev/null
+++ b/addons/l10n_et/data/res.country.state.csv
@@ -0,0 +1,12 @@
+"id","country_id:id","code","name"
+"state_et_1","base.et","AA","Addis Ababa"
+"state_et_2","base.et","AF","Afar"
+"state_et_3","base.et","AM","Amhara"
+"state_et_4","base.et","BN","Benishangul-Gumuz"
+"state_et_5","base.et","DR","Dire Dawa"
+"state_et_6","base.et","GM","Gambella Peoples"
+"state_et_7","base.et","HR","Harrari Peoples"
+"state_et_8","base.et","OR","Oromia"
+"state_et_9","base.et","SM","Somalia"
+"state_et_10","base.et","SP","Southern Peoples, Nations, and Nationalities"
+"state_et_11","base.et","TG","Tigray"
diff --git a/addons/l10n_et/l10n_et_wizard.xml b/addons/l10n_et/l10n_et_wizard.xml
new file mode 100644
index 00000000000..cbbb56b7989
--- /dev/null
+++ b/addons/l10n_et/l10n_et_wizard.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ open
+
+
+
diff --git a/addons/l10n_et/static/src/img/icon.png b/addons/l10n_et/static/src/img/icon.png
new file mode 100644
index 00000000000..bfc19370906
Binary files /dev/null and b/addons/l10n_et/static/src/img/icon.png differ
diff --git a/addons/portal_anonymous/security/ir.model.access.csv b/addons/portal_anonymous/security/ir.model.access.csv
index 24c29200230..a26b600288d 100644
--- a/addons/portal_anonymous/security/ir.model.access.csv
+++ b/addons/portal_anonymous/security/ir.model.access.csv
@@ -1,3 +1,3 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_mail_message_portal,mail.message.portal,mail.model_mail_message,portal.group_anonymous,1,0,1,0
+access_mail_message_portal,mail.message.portal,mail.model_mail_message,portal.group_anonymous,1,0,0,0
access_res_partner,res.partner,base.model_res_partner,portal.group_anonymous,1,0,0,0
diff --git a/addons/portal_crm/contact.py b/addons/portal_crm/contact.py
index 1cc10344d67..3d2ef024de1 100644
--- a/addons/portal_crm/contact.py
+++ b/addons/portal_crm/contact.py
@@ -105,7 +105,7 @@ class crm_contact_us(osv.TransientModel):
leads to a message_subscribe_user, that triggers access right issues.
"""
empty_values = dict((k, False) if k != 'name' else (k, '') for k, v in values.iteritems())
- return super(crm_contact_us, self).create(cr, uid, empty_values, {'mail_nosubscribe': True})
+ return super(crm_contact_us, self).create(cr, SUPERUSER_ID, empty_values, {'mail_nosubscribe': True})
def submit(self, cr, uid, ids, context=None):
""" When the form is submitted, redirect the user to a "Thanks" message """
diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml
index 0d8ca0676b6..a3182cd5b1c 100644
--- a/addons/portal_hr_employees/hr_employee_view.xml
+++ b/addons/portal_hr_employees/hr_employee_view.xml
@@ -44,7 +44,7 @@
- Meet the team
+ Our Team
hr.employee
kanban
@@ -60,7 +60,7 @@
- Meet the team
+ Our Team