From 4f0074193f95595ba15fa81a4a01837733c7308c Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Tue, 15 Jan 2013 16:21:31 +0100 Subject: [PATCH 01/78] [FIX] report_webkit - ir_report xml view lp bug: https://launchpad.net/bugs/1099880 fixed bzr revid: yannick.vaucher@camptocamp.com-20130115152131-84q6nto42w6zk24t --- addons/report_webkit/ir_report_view.xml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/addons/report_webkit/ir_report_view.xml b/addons/report_webkit/ir_report_view.xml index e9f9ebd2234..8eca63e57b4 100644 --- a/addons/report_webkit/ir_report_view.xml +++ b/addons/report_webkit/ir_report_view.xml @@ -7,11 +7,15 @@ - - - + + + + + - + + + From 489c5df81440202236ab37ffb2fade69f85b906e Mon Sep 17 00:00:00 2001 From: Peter Langenberg Date: Tue, 5 Feb 2013 09:37:06 +0100 Subject: [PATCH 02/78] [FIX]l10n_be_invoice_bba error message when duplicating lp bug: https://launchpad.net/bugs/1115472 fixed bzr revid: pl@agaplan.eu-20130205083706-sekknxzcl30ni9bn --- addons/l10n_be_invoice_bba/invoice.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py index a23dabd7c51..97cc4ed5d7c 100644 --- a/addons/l10n_be_invoice_bba/invoice.py +++ b/addons/l10n_be_invoice_bba/invoice.py @@ -199,6 +199,18 @@ class account_invoice(osv.osv): '\nPlease create manually a unique BBA Structured Communication.')) return super(account_invoice, self).write(cr, uid, ids, vals, context) + def copy(self, cr, uid, ids, default=None, context=None): + default = default or {} + invoice = self.browse(cr, uid, ids, context=context) + reference_type = invoice.reference_type or 'none' + default['reference_type'] = reference_type + if reference_type == 'bba': + partner = invoice.partner_id + default['reference'] = self.generate_bbacomm(cr, uid, ids, + invoice.type, reference_type, + partner.id, '', context=context)['value']['reference'] + return super(account_invoice, self).copy(cr, uid, ids, default, context=context) + _columns = { 'reference': fields.char('Communication', size=64, help="The partner reference of this invoice."), 'reference_type': fields.selection(_get_reference_type, 'Communication Type', From 964bb5a7caa44a71268ed438950ffe2dd4bf26db Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Mon, 11 Feb 2013 11:42:49 +0100 Subject: [PATCH 03/78] [FIX] report_webkit - __openerp__.py descriptor, correct explanation on how to set the wkhtmltopdf path lp bug: https://launchpad.net/bugs/1113418 fixed bzr revid: yannick.vaucher@camptocamp.com-20130211104249-ipobmq3a2q8ycygu --- addons/report_webkit/__openerp__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py index 5b88cb78eb4..ec71ee37b0c 100644 --- a/addons/report_webkit/__openerp__.py +++ b/addons/report_webkit/__openerp__.py @@ -62,8 +62,9 @@ This module requires the ``wkthtmltopdf`` library to render HTML documents as PDF. Version 0.9.9 or later is necessary, and can be found at http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows (32bits). -After installing the library on the OpenERP Server machine, you need to set the -path to the ``wkthtmltopdf`` executable file on each Company. +After installing the library on the OpenERP Server machine, you need to set +the path to the ``wkthtmltopdf`` executable file in a system parameter named ``webkit_path`` +in Settings -> Customization -> Low Level Object -> System Parameters If you are experiencing missing header/footer problems on Linux, be sure to install a 'static' version of the library. The default ``wkhtmltopdf`` on From 61ba9cbd10d7c16655f89421843a08c33b43e4c8 Mon Sep 17 00:00:00 2001 From: Amit Dodiya Date: Thu, 21 Mar 2013 10:57:24 +0530 Subject: [PATCH 04/78] [FIX] account_invoice: due date is reset to current date when we have no payment term and due date is manually defined bzr revid: ado@tinyerp.com-20130321052724-ck8ly3e5leo6cd2a --- addons/account/account_invoice.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index b4705245268..d68f9786e21 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -539,10 +539,13 @@ class account_invoice(osv.osv): def onchange_payment_term_date_invoice(self, cr, uid, ids, payment_term_id, date_invoice): res = {} + inv_record = self.browse(cr, uid, ids) if not date_invoice: date_invoice = time.strftime('%Y-%m-%d') - if not payment_term_id: - return {'value':{'date_due': date_invoice}} #To make sure the invoice has a due date when no payment term + if not payment_term_id and inv_record.date_due: + return {'value':{'date_due': inv_record.date_due}} #To make sure the invoice due date should contain due date which is entered by user when there is no payment term defined + if not payment_term_id and not inv_record.date_due: + return {'value':{'date_due': date_invoice}} #To make sure that the invoice due date contain current date when there is no payment term and no due date defined pterm_list = self.pool.get('account.payment.term').compute(cr, uid, payment_term_id, value=1, date_ref=date_invoice) if pterm_list: pterm_list = [line[0] for line in pterm_list] From 5e5345791c2c9c101b1627776e812e511acf1f25 Mon Sep 17 00:00:00 2001 From: Peter Langenberg <> Date: Fri, 22 Mar 2013 15:39:31 +0530 Subject: [PATCH 05/78] [FIX]l10n_be: Intracom VAT Declaration -> mask amountsum wrong (Case: Ref 590279) bzr revid: skh@tinyerp.com-20130322100931-k09u7hyucfmgdco6 --- addons/l10n_be/wizard/l10n_be_vat_intra.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra.py b/addons/l10n_be/wizard/l10n_be_vat_intra.py index ffd42290ed0..5baf61e997d 100644 --- a/addons/l10n_be/wizard/l10n_be_vat_intra.py +++ b/addons/l10n_be/wizard/l10n_be_vat_intra.py @@ -206,7 +206,7 @@ class partner_vat_intra(osv.osv_memory): 'intra_code': row['intra_code'], 'code': intra_code}) - xmldict.update({'dnum': dnum, 'clientnbr': str(seq), 'amountsum': amount_sum, 'partner_wo_vat': p_count}) + xmldict.update({'dnum': dnum, 'clientnbr': str(seq), 'amountsum': '%.2f' % amount_sum, 'partner_wo_vat': p_count}) return xmldict def create_xml(self, cursor, user, ids, context=None): From 5e9679a2e1647e5638f1605697d52e04b6c9d09b Mon Sep 17 00:00:00 2001 From: Amit Dodiya Date: Mon, 13 May 2013 16:10:53 +0530 Subject: [PATCH 06/78] [FIX]sale_line_to_invoice: while creating invoice from sale order line the tax is not added on invoice bzr revid: ado@tinyerp.com-20130513104053-46zb10ajjr5ev1ar --- addons/sale/wizard/sale_line_invoice.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py index e6121b23dd8..ed072c40663 100644 --- a/addons/sale/wizard/sale_line_invoice.py +++ b/addons/sale/wizard/sale_line_invoice.py @@ -55,6 +55,7 @@ class sale_order_line_make_invoice(osv.osv_memory): @return: """ + inv_obj = self.pool.get('account.invoice') a = order.partner_id.property_account_receivable.id if order.partner_id and order.partner_id.property_payment_term.id: pay_term = order.partner_id.property_payment_term.id @@ -76,7 +77,8 @@ class sale_order_line_make_invoice(osv.osv_memory): 'company_id': order.company_id and order.company_id.id or False, 'date_invoice': fields.date.today(), } - inv_id = self.pool.get('account.invoice').create(cr, uid, inv) + inv_id = inv_obj.create(cr, uid, inv) + inv_obj.button_reset_taxes(cr, uid, [inv_id], context=context) return inv_id sales_order_line_obj = self.pool.get('sale.order.line') From c877df2ec4e67f82b918435ed134f911ce8ab617 Mon Sep 17 00:00:00 2001 From: "Dharti Ratani (Open ERP)" Date: Thu, 23 May 2013 12:55:49 +0530 Subject: [PATCH 07/78] [FIX]Added record rules for documents of a directory as per the permissions defined in document access_permission.rst bzr revid: dhr@tinyerp.com-20130523072549-9gruk52goe4xhvy2 --- .../document/security/document_security.xml | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml index a7ec76eafac..2588ec4cc17 100644 --- a/addons/document/security/document_security.xml +++ b/addons/document/security/document_security.xml @@ -37,5 +37,30 @@ + + + + ['|','|','|',('parent_id','=',False) , ('parent_id.group_ids','in',[g.id for g in user.groups_id]), ('parent_id.user_id', '=', user.id), '&', ('parent_id.user_id', '=', False), ('parent_id.group_ids','=',False), '|','|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] + Read public documents + + + + + + + + + + + [ '|', ('parent_id.user_id', '=', user.id), '&', ('parent_id.group_ids','in',[g.id for g in user.groups_id]), ('parent_id.user_id','=',False), '|','|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])] + Document modify own document + + + + + + + + From 1a1d9b67e83f0dc625508ecd9f88e0cfcbb43089 Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Mon, 3 Jun 2013 19:27:49 +0200 Subject: [PATCH 08/78] [IMP] report_webkit - remove separator and colspan bzr revid: yannick.vaucher@camptocamp.com-20130603172749-rxr7f333junwc725 --- addons/report_webkit/ir_report_view.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/report_webkit/ir_report_view.xml b/addons/report_webkit/ir_report_view.xml index 8eca63e57b4..37260628396 100644 --- a/addons/report_webkit/ir_report_view.xml +++ b/addons/report_webkit/ir_report_view.xml @@ -12,9 +12,8 @@ - - - + + From fd4c5ad7cee6ada509504b16c1ffc4c1d56cc46d Mon Sep 17 00:00:00 2001 From: Chirag Date: Fri, 7 Jun 2013 12:29:19 +0530 Subject: [PATCH 09/78] [FIX] Fixed dashboard loses first level of grouping. bzr revid: chirag@chirag-desktop-20130607065919-htu00zf0aw2vniu4 --- addons/board/static/src/js/dashboard.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js index 3489b686e1b..ebd8df4cf83 100644 --- a/addons/board/static/src/js/dashboard.js +++ b/addons/board/static/src/js/dashboard.js @@ -381,6 +381,10 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({ _.each(data.contexts, context.add, context); _.each(data.domains, domain.add, domain); + context.add({ + group_by: instance.web.pyeval.eval('groupbys', data.groupbys || []) + }); + var c = instance.web.pyeval.eval('context', context); for(var k in c) { if (c.hasOwnProperty(k) && /^search_default_/.test(k)) { From 822dec4fca99281a2d2075b842943c17def47fd2 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Sat, 8 Jun 2013 19:25:46 -0400 Subject: [PATCH 10/78] [FIX] child_depend = True on top level taxes lp bug: https://launchpad.net/bugs/1189050 fixed bzr revid: maxime.chambreuil@savoirfairelinux.com-20130608232546-jki0xjwsr6madyyk --- addons/l10n_ca/account_tax_en.xml | 8 ++++++++ addons/l10n_ca/account_tax_fr.xml | 10 ++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/addons/l10n_ca/account_tax_en.xml b/addons/l10n_ca/account_tax_en.xml index afe505f27f5..4984b5eb6e0 100644 --- a/addons/l10n_ca/account_tax_en.xml +++ b/addons/l10n_ca/account_tax_en.xml @@ -13,6 +13,7 @@ sale 1 percent + @@ -60,6 +61,7 @@ 1 1 percent + @@ -106,6 +108,7 @@ sale 1 percent + @@ -151,6 +154,7 @@ sale 1 percent + @@ -279,6 +283,7 @@ purchase 1 percent + @@ -326,6 +331,7 @@ 1 1 percent + @@ -372,6 +378,7 @@ purchase 1 percent + @@ -417,6 +424,7 @@ purchase 1 percent + diff --git a/addons/l10n_ca/account_tax_fr.xml b/addons/l10n_ca/account_tax_fr.xml index c34f329be3a..607e71cbd13 100644 --- a/addons/l10n_ca/account_tax_fr.xml +++ b/addons/l10n_ca/account_tax_fr.xml @@ -13,6 +13,7 @@ sale 1 percent + @@ -58,8 +59,8 @@ TPSTVP_PE_SALE sale 1 - 1 percent + @@ -106,6 +107,7 @@ sale 1 percent + @@ -151,6 +153,7 @@ sale 1 percent + @@ -279,6 +282,7 @@ purchase 1 percent + @@ -324,8 +328,8 @@ TPSTVP_PE_PURC purchase 1 - 1 percent + @@ -372,6 +376,7 @@ purchase 1 percent + @@ -417,6 +422,7 @@ purchase 1 percent + From d00985c2e57eb1badc10058bcdffae4c791b1d08 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Sat, 8 Jun 2013 20:00:53 -0400 Subject: [PATCH 11/78] [FIX] child_depend set twice on some taxes bzr revid: maxime.chambreuil@savoirfairelinux.com-20130609000053-g4n2jz6g34moulu5 --- addons/l10n_ca/account_tax_en.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/l10n_ca/account_tax_en.xml b/addons/l10n_ca/account_tax_en.xml index 4984b5eb6e0..8c1d2b6c292 100644 --- a/addons/l10n_ca/account_tax_en.xml +++ b/addons/l10n_ca/account_tax_en.xml @@ -59,7 +59,6 @@ GSTPST_PE_SALE sale 1 - 1 percent @@ -329,7 +328,6 @@ GSTPST_PE_PURC purchase 1 - 1 percent From f80fcbbc6a4e7d0b9cb1ac55748bb12da2c408b6 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Sat, 8 Jun 2013 20:10:52 -0400 Subject: [PATCH 12/78] [IMP] Bump version bzr revid: maxime.chambreuil@savoirfairelinux.com-20130609001052-zixi0xotq2h2rwk1 --- addons/l10n_ca/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py index 945327a06bc..fc1486ec59a 100644 --- a/addons/l10n_ca/__openerp__.py +++ b/addons/l10n_ca/__openerp__.py @@ -20,7 +20,7 @@ ############################################################################## { 'name': 'Canada - Accounting', - 'version': '1.1', + 'version': '1.2', 'author': 'Savoir-faire Linux', 'website': 'http://www.savoirfairelinux.com', 'category': 'Localization/Account Charts', From 35707831d51ae9bdf149d7f94b40a2a70b0d6be8 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Thu, 20 Jun 2013 15:40:30 -0400 Subject: [PATCH 13/78] [IMP] Fix fiscal positions lp bug: https://launchpad.net/bugs/1192629 fixed bzr revid: maxime.chambreuil@gmail.com-20130620194030-i7h07e9rf2jsgft4 --- addons/l10n_ca/__openerp__.py | 2 +- addons/l10n_ca/account_chart_en.xml | 56 +- addons/l10n_ca/account_chart_fr.xml | 56 +- addons/l10n_ca/account_tax_code_en.xml | 60 ++ addons/l10n_ca/account_tax_code_fr.xml | 60 ++ addons/l10n_ca/account_tax_en.xml | 344 +++--- addons/l10n_ca/account_tax_fr.xml | 312 +++--- addons/l10n_ca/doc/Taxes.csv | 22 + addons/l10n_ca/fiscal_templates_en.xml | 1335 +++++++++++++++++------- addons/l10n_ca/fiscal_templates_fr.xml | 1335 +++++++++++++++++------- 10 files changed, 2431 insertions(+), 1151 deletions(-) create mode 100644 addons/l10n_ca/doc/Taxes.csv diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py index 945327a06bc..71f3d1068fc 100644 --- a/addons/l10n_ca/__openerp__.py +++ b/addons/l10n_ca/__openerp__.py @@ -20,7 +20,7 @@ ############################################################################## { 'name': 'Canada - Accounting', - 'version': '1.1', + 'version': '1.3', 'author': 'Savoir-faire Linux', 'website': 'http://www.savoirfairelinux.com', 'category': 'Localization/Account Charts', diff --git a/addons/l10n_ca/account_chart_en.xml b/addons/l10n_ca/account_chart_en.xml index 0a596bcd4f6..49467431d5e 100644 --- a/addons/l10n_ca/account_chart_en.xml +++ b/addons/l10n_ca/account_chart_en.xml @@ -147,10 +147,36 @@ 1183 + view + + HST receivable + + + + 11831 + other - HST receivable + HST receivable - 13% + + + + 11832 + + other + + + HST receivable - 14% + + + + 11833 + + other + + + HST receivable - 15% @@ -273,10 +299,36 @@ 2133 + view + + HST to pay + + + + 21331 + other - HST to pay + HST to pay - 13% + + + + 21332 + + other + + + HST to pay - 14% + + + + 21333 + + other + + + HST to pay - 15% diff --git a/addons/l10n_ca/account_chart_fr.xml b/addons/l10n_ca/account_chart_fr.xml index c168833b733..a16249b7c7e 100644 --- a/addons/l10n_ca/account_chart_fr.xml +++ b/addons/l10n_ca/account_chart_fr.xml @@ -146,10 +146,36 @@ 1183 + view + + TVH à recevoir + + + + 11831 + other - TVH à recevoir + TVH à recevoir - 13% + + + + 11832 + + other + + + TVH à recevoir - 14% + + + + 11833 + + other + + + TVH à recevoir - 15% @@ -272,10 +298,36 @@ 2133 + view + + TVH à payer + + + + 21331 + other - TVH à payer + TVH à payer - 13% + + + + 21332 + + other + + + TVH à payer - 14% + + + + 21333 + + other + + + TVH à payer - 15% diff --git a/addons/l10n_ca/account_tax_code_en.xml b/addons/l10n_ca/account_tax_code_en.xml index d446f431c96..77698ae14de 100644 --- a/addons/l10n_ca/account_tax_code_en.xml +++ b/addons/l10n_ca/account_tax_code_en.xml @@ -31,6 +31,21 @@ + + HST paid - 13% + + + + + HST paid - 14% + + + + + HST paid - 15% + + + Taxes received @@ -51,6 +66,21 @@ + + HST received - 13% + + + + + HST received - 14% + + + + + HST received - 15% + + + Taxes Base @@ -76,6 +106,21 @@ + + Base of HST for Sales - 13% + + + + + Base of HST for Sales - 14% + + + + + Base of HST for Sales - 15% + + + Base of Purchases Tax @@ -96,5 +141,20 @@ + + Base of HST for Purchases - 13% + + + + + Base of HST for Purchases - 14% + + + + + Base of HST for Purchases - 15% + + + diff --git a/addons/l10n_ca/account_tax_code_fr.xml b/addons/l10n_ca/account_tax_code_fr.xml index 2b6acd2b992..d9eb175d3b5 100644 --- a/addons/l10n_ca/account_tax_code_fr.xml +++ b/addons/l10n_ca/account_tax_code_fr.xml @@ -31,6 +31,21 @@ + + TVH payée - 13% + + + + + TVH payée - 14% + + + + + TVH payée - 15% + + + Taxes reçues @@ -51,6 +66,21 @@ + + TVH reçue - 13% + + + + + TVH reçue - 14% + + + + + TVH reçue - 15% + + + Base de taxes @@ -76,6 +106,21 @@ + + Base de la TVH pour les ventes - 13% + + + + + Base de la TVH pour les ventes - 14% + + + + + Base de la TVH pour les ventes - 15% + + + Base des taxes d'achats @@ -96,5 +141,20 @@ + + Base de la TVH pour les achats - 13% + + + + + Base de la TVH pour les achats - 14% + + + + + Base de la TVH pour les achats - 15% + + + diff --git a/addons/l10n_ca/account_tax_en.xml b/addons/l10n_ca/account_tax_en.xml index afe505f27f5..7188e62995c 100644 --- a/addons/l10n_ca/account_tax_en.xml +++ b/addons/l10n_ca/account_tax_en.xml @@ -4,6 +4,53 @@ + + + + + GST + PST for sales (BC) + GSTPST_BC_SALE + sale + 1 + percent + 1 + + + + + GST for sales - 5% (BC) + GST + sale + 0.050000 + percent + 1 + + + + + + + + + + + + + PST for sales - 7% + PST + sale + 0.070000 + percent + 2 + + + + + + + + + @@ -13,6 +60,7 @@ sale 1 percent + 1 @@ -50,62 +98,16 @@ - - - - - GST + PST for sales (PE) - GSTPST_PE_SALE - sale - 1 - 1 - percent - - - - - GST for sales - 5% (PE) - GST - sale - 0.050000 - percent - 1 - - - - - - - - - - - - - PST for sale - 10% - PST - sale - 0.100000 - percent - 2 - - - - - - - - - - GST + TVQ for sales - GSTTVQ_SALE + GST + QST for sales + GSTQST_SALE sale 1 percent + 1 @@ -127,8 +129,8 @@ - TVQ for sales - 9.975% - TVQ + QST for sales - 9.975% + QST sale 0.099750 percent @@ -151,6 +153,7 @@ sale 1 percent + 1 @@ -190,64 +193,49 @@ - - - TVH for sales - 12% - TVH12_SALE - sale - 0.120000 - percent - - - - - - - - - TVH for sales - 13% - TVH13_SALE + HST for sales - 13% + HST13_SALE sale 0.130000 percent - - - - - - + + + + + + - + - TVH for sales - 13.5% - TVH135_SALE + HST for sales - 14% + HST14_SALE sale - 0.135000 + 0.14000 percent - - - - - - + + + + + + - TVH for sales - 15% - TVH15_SALE + HST for sales - 15% + HST15_SALE sale 0.150000 percent - - - - - - + + + + + + @@ -270,6 +258,53 @@ + + + + + GST + PST for purchases (BC) + GSTPST_BC_PURC + purchase + 1 + percent + 1 + + + + + GST for purchases - 5% (BC) + GST + purchase + 0.050000 + percent + 1 + + + + + + + + + + + + + PST for purchases - 7% + PST + purchase + 0.070000 + percent + 2 + + + + + + + + + @@ -279,6 +314,7 @@ purchase 1 percent + 1 @@ -316,62 +352,16 @@ - - - - - GST + PST for purchases (PE) - GSTPST_PE_PURC - purchase - 1 - 1 - percent - - - - - GST for purchases - 5% (PE) - GST - purchase - 0.050000 - percent - 1 - - - - - - - - - - - - - PST for purchases - 10% - PST - purchase - 0.100000 - percent - 2 - - - - - - - - - - GST + TVQ for purchases - GSTTVQ_PURC + GST + QST for purchases + GSTQST_PURC purchase 1 percent + 1 @@ -393,8 +383,8 @@ - TVQ for purchases - 9.975% - TVQ + QST for purchases - 9.975% + QST purchase 0.099750 percent @@ -417,6 +407,7 @@ purchase 1 percent + 1 @@ -456,64 +447,49 @@ - - - TVH for purchases - 12% - TVH12_PURC - purchase - 0.120000 - percent - - - - - - - - - TVH for purchases - 13% - TVH13_PURC + HST for purchases - 13% + HST13_PURC purchase 0.130000 percent - - - - - - + + + + + + - + - TVH for purchases - 13.5% - TVH135_PURC + HST for purchases - 14% + HST14_PURC purchase - 0.135000 + 0.140000 percent - - - - - - + + + + + + - TVH for purchases - 15% - TVH15_PURC + HST for purchases - 15% + HST15_PURC purchase 0.150000 percent - - - - - - + + + + + + diff --git a/addons/l10n_ca/account_tax_fr.xml b/addons/l10n_ca/account_tax_fr.xml index c34f329be3a..aff18123fd7 100644 --- a/addons/l10n_ca/account_tax_fr.xml +++ b/addons/l10n_ca/account_tax_fr.xml @@ -4,6 +4,53 @@ + + + + + TPS + TVP sur les ventes (BC) + TPSTVP_BC_SALE + sale + 1 + 1 + percent + + + + + TPS sur les ventes - 5% (BC) + TPS + sale + 0.050000 + percent + 1 + + + + + + + + + + + + + TVP sur les ventes - 7% + TVP + sale + 0.070000 + percent + 2 + + + + + + + + + @@ -13,6 +60,7 @@ sale 1 percent + 1 @@ -50,53 +98,6 @@ - - - - - TPS + TVP sur les ventes (PE) - TPSTVP_PE_SALE - sale - 1 - 1 - percent - - - - - TPS sur les ventes - 5% (PE) - TPS - sale - 0.050000 - percent - 1 - - - - - - - - - - - - - TVP for sale - 10% - TVP - sale - 0.100000 - percent - 2 - - - - - - - - - @@ -106,6 +107,7 @@ sale 1 percent + 1 @@ -151,6 +153,7 @@ sale 1 percent + 1 @@ -190,21 +193,6 @@ - - - TVH sur les ventes - 12% - TVH12_SALE - sale - 0.120000 - percent - - - - - - - - TVH sur les ventes - 13% @@ -212,27 +200,27 @@ sale 0.130000 percent - - - - - - + + + + + + - + - TVH sur les ventes - 13.5% - TVH135_SALE + TVH sur les ventes - 14% + TVH14_SALE sale - 0.135000 + 0.140000 percent - - - - - - + + + + + + @@ -242,12 +230,12 @@ sale 0.150000 percent - - - - - - + + + + + + @@ -270,6 +258,53 @@ + + + + + TPS + TVP sur les achats (BC) + TPSTVP_BC_PURC + purchase + 1 + percent + 1 + + + + + TPS sur les achats - 5% (BC) + TPS + purchase + 0.050000 + percent + 1 + + + + + + + + + + + + + TVP sur les achats - 7% + TVP + purchase + 0.070000 + percent + 2 + + + + + + + + + @@ -279,6 +314,7 @@ purchase 1 percent + 1 @@ -316,53 +352,6 @@ - - - - - TPS + TVP sur les achats (PE) - TPSTVP_PE_PURC - purchase - 1 - 1 - percent - - - - - TPS sur les achats - 5% (PE) - TPS - purchase - 0.050000 - percent - 1 - - - - - - - - - - - - - TVP sur les achats - 10% - TVP - purchase - 0.100000 - percent - 2 - - - - - - - - - @@ -372,6 +361,7 @@ purchase 1 percent + 1 @@ -417,6 +407,7 @@ purchase 1 percent + 1 @@ -456,21 +447,6 @@ - - - TVH sur les achats - 12% - TVH12_PURC - purchase - 0.120000 - percent - - - - - - - - TVH sur les achats - 13% @@ -478,27 +454,27 @@ purchase 0.130000 percent - - - - - - + + + + + + - + - TVH sur les achats - 13.5% - TVH135_PURC + TVH sur les achats - 14% + TVH14_PURC purchase - 0.135000 + 0.140000 percent - - - - - - + + + + + + @@ -508,12 +484,12 @@ purchase 0.150000 percent - - - - - - + + + + + + diff --git a/addons/l10n_ca/doc/Taxes.csv b/addons/l10n_ca/doc/Taxes.csv new file mode 100644 index 00000000000..b23d88a979e --- /dev/null +++ b/addons/l10n_ca/doc/Taxes.csv @@ -0,0 +1,22 @@ +,Product/Service is delivered in,,,,,,,,,,,, +Supplier is in ,Alberta,British Columbia,Manitoba,New Brunswick,"Newfoundland +And Labrador",Nova Scotia,"Northwest +Territories",Nunavut,Ontario,"Prince Edward +Islands",Quebec,Saskatchewan,Yukon +Alberta,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% +British Columbia,GST – 5%,"GST – 5% +PST – 7%",GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% +Manitoba,GST – 5%,GST – 5%,"GST – 5% +PST – 7%",HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% +New Brunswick,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% +Newfoundland and Labrador,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% +Nova Scotia,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% +Northwest Territories,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% +Nunavut,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% +Ontario,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% +Prince Edward Islands,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% +Quebec,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,"GST – 5% +QST – 9,975%",GST – 5%,GST – 5% +Saskatchewan,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,"GST – 5% +PST – 5%",GST – 5% +Yukon,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% diff --git a/addons/l10n_ca/fiscal_templates_en.xml b/addons/l10n_ca/fiscal_templates_en.xml index a3bab5b89dd..f92dc59cb30 100644 --- a/addons/l10n_ca/fiscal_templates_en.xml +++ b/addons/l10n_ca/fiscal_templates_en.xml @@ -4,653 +4,1194 @@ - - Provincial Regime (PROV) + + Alberta (AB) - - Harmonized Provinces Regime (12%) (BC) + + British Columbia (BC) - - Harmonized Provinces Regime (13%) (ON, NB, NL) + + Manitoba (MB) - - Harmonized Provinces Regime (13.5%) + + New Brunswick (NB) - - Harmonized Provinces Regime (15%) (NS) + + Newfoundland and Labrador (NL) - - Non-Harmonized Provinces Regime (AB, MB, SK, PE, NT, NU, YT) + + Nova Scotia (NS) - - International Regime (INTL) + + Northwest Territories (NT) - + + Nunavut (NU) + + - + + Ontario (ON) + + - - - - + + Prince Edward Islands (PE) + - - - - + + Quebec (QC) + - - - - + + Saskatchewan (SK) + - - - - + + Yukon (YT) + - - - + + International (INTL) + - + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + + + - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + - - - - + + + + - - - + + + + - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + - + + + + + - - - - + + + + - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + + + + + + - + + + + + + + + + + - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + - - - - + + + + - - - + + + + - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + - + + + + + - - - - + + + + - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + + + - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + - - - - + + + + - - - + + + + - + + + + + - - - - + + + + - - - - + + + + + + - - - - + + + + - - - - + + + + - - - + + + + - + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/addons/l10n_ca/fiscal_templates_fr.xml b/addons/l10n_ca/fiscal_templates_fr.xml index b01ab0985ea..4c4bc0c23b0 100644 --- a/addons/l10n_ca/fiscal_templates_fr.xml +++ b/addons/l10n_ca/fiscal_templates_fr.xml @@ -4,653 +4,1194 @@ - - Régime Provincial (PROV) + + Alberta (AB) - - Régime Provinces Harmonisées à 12% (BC) + + Colombie-Britannique (BC) - - Régime Provinces Harmonisées à 13% (NB, ON, NL) + + Manitoba (MB) - - Régime Provinces Harmonisées à 13.5% () + + Nouveau Brunswick (NB) - - Régime Provinces Harmonisées à 15% (NS) + + Terre-Neuve et Labrador (NL) - - Régime Provinces Non-Harmonisées (AB, MB, SK, PE, NT, NU, YT) + + Nouvelle Écosse (NS) - - Régime International (INTL) + + Territoires du Nord-Ouest (NT) - + + Nunavut (NU) + + - + + Ontario (ON) + + - - - - + + Les Îles du Prince Edward (PE) + - - - - + + Québec (QC) + - - - - + + Saskatchewan (SK) + - - - - + + Yukon (YT) + - - - + + International (INTL) + - + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + + + - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + + - - - - + + + + - - - + + + + - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + - + + + + + - - - - + + + + - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + + + + + + - + + + + + + + + + + - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + - - - - + + + + - - - + + + + - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + - + + + + + - - - - + + + + - - - - + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + + + - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + - - - - + + + + - - - + + + + - + + + + + - - - - + + + + - - - - + + + + + + - - - - + + + + - - - - + + + + - - - + + + + - + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + From a30a6dbd14b4b7b49ca153497bc19963f6159dca Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Thu, 20 Jun 2013 18:32:45 -0400 Subject: [PATCH 14/78] [FIX] Tax Name and Fiscal Position source tax constraints [ADD] International mapping in fiscal positions [DEL] Account mapping in fiscal positions bzr revid: maxime.chambreuil@gmail.com-20130620223245-62qcvto6s1bfmrsm --- addons/l10n_ca/account_tax_code_fr.xml | 72 +++--- addons/l10n_ca/account_tax_en.xml | 36 +-- addons/l10n_ca/account_tax_fr.xml | 300 ++++++++++++------------ addons/l10n_ca/doc/Taxes.csv | 45 ++-- addons/l10n_ca/fiscal_templates_en.xml | 298 +++++++++++++++++------ addons/l10n_ca/fiscal_templates_fr.xml | 312 ++++++++++++++++++------- 6 files changed, 676 insertions(+), 387 deletions(-) diff --git a/addons/l10n_ca/account_tax_code_fr.xml b/addons/l10n_ca/account_tax_code_fr.xml index d9eb175d3b5..ac4414922e2 100644 --- a/addons/l10n_ca/account_tax_code_fr.xml +++ b/addons/l10n_ca/account_tax_code_fr.xml @@ -16,34 +16,34 @@ - + TPS payée - + TVP/TVQ payée - + TVH payée - + TVH payée - 13% - + - + TVH payée - 14% - + - + TVH payée - 15% - + @@ -51,34 +51,34 @@ - + TPS reçue - + TVP/TVQ reçue - + TVH reçue - + TVH reçue - 13% - + - + TVH reçue - 14% - + - + TVH reçue - 15% - + @@ -91,34 +91,34 @@ - + Base de la TPS pour les ventes - + Base de la TVP/TVQ pour les ventes - + Base de la TVH pour les ventes - + Base de la TVH pour les ventes - 13% - + - + Base de la TVH pour les ventes - 14% - + - + Base de la TVH pour les ventes - 15% - + @@ -126,34 +126,34 @@ - + Base de la TPS pour les achats - + Base de la TVP/TVQ pour les achats - + Base de la TVH pour les achats - + Base de la TVH pour les achats - 13% - + - + Base de la TVH pour les achats - 14% - + - + Base de la TVH pour les achats - 15% - + diff --git a/addons/l10n_ca/account_tax_en.xml b/addons/l10n_ca/account_tax_en.xml index 7188e62995c..7c34930f2dc 100644 --- a/addons/l10n_ca/account_tax_en.xml +++ b/addons/l10n_ca/account_tax_en.xml @@ -36,7 +36,7 @@ - PST for sales - 7% + PST for sales - 7% (BC) PST sale 0.070000 @@ -83,7 +83,7 @@ - PST for sales - 7% + PST for sales - 7% (MB) PST sale 0.070000 @@ -100,7 +100,7 @@ - + GST + QST for sales GSTQST_SALE @@ -110,7 +110,7 @@ 1 - + GST for sales - 5% (QC) GST @@ -124,10 +124,10 @@ - + - + QST for sales - 9.975% QST @@ -141,7 +141,7 @@ - + @@ -230,8 +230,8 @@ sale 0.150000 percent - - + + @@ -290,7 +290,7 @@ - PST for purchases - 7% + PST for purchases - 7% (BC) PST purchase 0.070000 @@ -337,7 +337,7 @@ - PST for purchases - 7% + PST for purchases - 7% (MB) PST purchase 0.070000 @@ -354,7 +354,7 @@ - + GST + QST for purchases GSTQST_PURC @@ -364,7 +364,7 @@ 1 - + GST for purchases - 5% (QC) GST @@ -378,10 +378,10 @@ - + - + QST for purchases - 9.975% QST @@ -395,7 +395,7 @@ - + @@ -484,8 +484,8 @@ purchase 0.150000 percent - - + + diff --git a/addons/l10n_ca/account_tax_fr.xml b/addons/l10n_ca/account_tax_fr.xml index aff18123fd7..2868bdc9cd9 100644 --- a/addons/l10n_ca/account_tax_fr.xml +++ b/addons/l10n_ca/account_tax_fr.xml @@ -6,7 +6,7 @@ - + TPS + TVP sur les ventes (BC) TPSTVP_BC_SALE @@ -16,7 +16,7 @@ percent - + TPS sur les ventes - 5% (BC) TPS @@ -27,16 +27,16 @@ - - - - - + + + + + - + - TVP sur les ventes - 7% + TVP sur les ventes - 7% (BC) TVP sale 0.070000 @@ -44,16 +44,16 @@ 2 - - - - - + + + + + - + TPS + TVP sur les ventes (MB) TPSTVP_MB_SALE @@ -63,7 +63,7 @@ 1 - + TPS sur les ventes - 5% (MB) TPS @@ -74,16 +74,16 @@ - - - - - + + + + + - + - TVP sur les ventes - 7% + TVP sur les ventes - 7% (MB) TVP sale 0.070000 @@ -91,16 +91,16 @@ 2 - - - - - + + + + + - + TPS + TVQ sur les ventes TPSTVQ_SALE @@ -110,7 +110,7 @@ 1 - + TPS sur les ventes - 5% (QC) TPS @@ -120,11 +120,11 @@ 1 - - - - - + + + + + @@ -137,16 +137,16 @@ 2 - - - - - + + + + + - + TPS + TVP sur les ventes (SK) TPSTVP_SK_SALE @@ -156,7 +156,7 @@ 1 - + TPS sur les ventes - 5% (SK) TPS @@ -167,14 +167,14 @@ - - - - - + + + + + - + TVP sur les ventes - 5% (SK) TVP @@ -184,16 +184,16 @@ 2 - - - - - + + + + + - + TVH sur les ventes - 13% TVH13_SALE @@ -202,13 +202,13 @@ percent - - - - + + + + - + TVH sur les ventes - 14% TVH14_SALE @@ -217,30 +217,30 @@ percent - - - - + + + + - + TVH sur les ventes - 15% TVH15_SALE sale 0.150000 percent - - - - - - + + + + + + - + TPS sur les ventes - 5% TPS_SALE @@ -249,10 +249,10 @@ percent - - - - + + + + @@ -260,7 +260,7 @@ - + TPS + TVP sur les achats (BC) TPSTVP_BC_PURC @@ -270,7 +270,7 @@ 1 - + TPS sur les achats - 5% (BC) TPS @@ -281,16 +281,16 @@ - - - - - + + + + + - + - TVP sur les achats - 7% + TVP sur les achats - 7% (BC) TVP purchase 0.070000 @@ -298,16 +298,16 @@ 2 - - - - - + + + + + - + TPS + TVP sur les achats (MB) TPSTVP_MB_PURC @@ -317,7 +317,7 @@ 1 - + TPS sur les achats - 5% (MB) TPS @@ -328,16 +328,16 @@ - - - - - + + + + + - + - TVP sur les achats - 7% + TVP sur les achats - 7% (MB) TVP purchase 0.070000 @@ -345,16 +345,16 @@ 2 - - - - - + + + + + - + TPS + TVQ sur les achats TPSTVQ_PURC @@ -364,7 +364,7 @@ 1 - + TPS sur les achats - 5% (QC) TPS @@ -374,11 +374,11 @@ 1 - - - - - + + + + + @@ -391,16 +391,16 @@ 2 - - - - - + + + + + - + TPS + TVP sur les achats (SK) TPSTVP_SK_PURC @@ -410,7 +410,7 @@ 1 - + TPS sur les achats - 5% (SK) TPS @@ -421,14 +421,14 @@ - - - - - + + + + + - + TVP sur les achats - 5% (SK) TVP @@ -438,16 +438,16 @@ 2 - - - - - + + + + + - + TVH sur les achats - 13% TVH13_PURC @@ -456,13 +456,13 @@ percent - - - - + + + + - + TVH sur les achats - 14% TVH14_PURC @@ -471,30 +471,30 @@ percent - - - - + + + + - + TVH sur les achats - 15% TVH15_PURC purchase 0.150000 percent - - - - - - + + + + + + - + TPS sur les achats - 5% TPS_PURC @@ -503,10 +503,10 @@ percent - - - - + + + + diff --git a/addons/l10n_ca/doc/Taxes.csv b/addons/l10n_ca/doc/Taxes.csv index b23d88a979e..695d0168034 100644 --- a/addons/l10n_ca/doc/Taxes.csv +++ b/addons/l10n_ca/doc/Taxes.csv @@ -1,22 +1,23 @@ -,Product/Service is delivered in,,,,,,,,,,,, -Supplier is in ,Alberta,British Columbia,Manitoba,New Brunswick,"Newfoundland -And Labrador",Nova Scotia,"Northwest -Territories",Nunavut,Ontario,"Prince Edward -Islands",Quebec,Saskatchewan,Yukon -Alberta,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% -British Columbia,GST – 5%,"GST – 5% -PST – 7%",GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% -Manitoba,GST – 5%,GST – 5%,"GST – 5% -PST – 7%",HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% -New Brunswick,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% -Newfoundland and Labrador,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% -Nova Scotia,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% -Northwest Territories,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% -Nunavut,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% -Ontario,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% -Prince Edward Islands,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% -Quebec,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,"GST – 5% -QST – 9,975%",GST – 5%,GST – 5% -Saskatchewan,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,"GST – 5% -PST – 5%",GST – 5% -Yukon,GST – 5%,GST – 5%,GST – 5%,HST – 13%,HST – 13%,HST – 15%,GST – 5%,GST – 5%,HST – 13%,HST – 14%,GST – 5%,GST – 5%,GST – 5% +;Product/Service is delivered in;;;;;;;;;;;;; +Supplier is in ;Alberta;British Columbia;Manitoba;New Brunswick;"Newfoundland +And Labrador";Nova Scotia;"Northwest +Territories";Nunavut;Ontario;"Prince Edward +Islands";Quebec;Saskatchewan;Yukon;International +Alberta;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%; +British Columbia;GST – 5%;"GST – 5% +PST – 7%";GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%; +Manitoba;GST – 5%;GST – 5%;"GST – 5% +PST – 7%";HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%; +New Brunswick;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%; +Newfoundland and Labrador;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%; +Nova Scotia;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%; +Northwest Territories;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%; +Nunavut;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%; +Ontario;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%; +Prince Edward Islands;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%; +Quebec;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;"GST – 5% +QST – 9,975%";GST – 5%;GST – 5%; +Saskatchewan;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;"GST – 5% +PST – 5%";GST – 5%; +Yukon;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%; +International;;;;;;;;;;;;;; diff --git a/addons/l10n_ca/fiscal_templates_en.xml b/addons/l10n_ca/fiscal_templates_en.xml index f92dc59cb30..cffa1c23c8a 100644 --- a/addons/l10n_ca/fiscal_templates_en.xml +++ b/addons/l10n_ca/fiscal_templates_en.xml @@ -106,6 +106,11 @@ + + + + + @@ -158,6 +163,12 @@ + + + + + + @@ -176,6 +187,11 @@ + + + + + @@ -226,6 +242,12 @@ + + + + + + @@ -244,6 +266,11 @@ + + + + + @@ -296,6 +323,12 @@ + + + + + + @@ -314,6 +347,11 @@ + + + + + @@ -364,6 +402,12 @@ + + + + + + @@ -382,6 +426,11 @@ + + + + + @@ -450,68 +499,106 @@ - + + + + + + + + + + + + + + + + + + + @@ -538,8 +625,8 @@ - - + + @@ -586,132 +673,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -786,6 +953,18 @@ + + + + + + + + + + + + @@ -862,6 +1041,11 @@ + + + + + @@ -915,13 +1099,13 @@ - + - + @@ -936,6 +1120,11 @@ + + + + + @@ -1012,6 +1201,11 @@ + + + + + @@ -1086,113 +1280,63 @@ + + + + + + - - - - - + Already created by ab2intl_sale + + + + --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/addons/l10n_ca/fiscal_templates_fr.xml b/addons/l10n_ca/fiscal_templates_fr.xml index 4c4bc0c23b0..e6ae764e40a 100644 --- a/addons/l10n_ca/fiscal_templates_fr.xml +++ b/addons/l10n_ca/fiscal_templates_fr.xml @@ -10,7 +10,7 @@ - Colombie-Britannique (BC) + British Columbia (BC) @@ -20,22 +20,22 @@ - Nouveau Brunswick (NB) + New Brunswick (NB) - Terre-Neuve et Labrador (NL) + Newfoundland and Labrador (NL) - Nouvelle Écosse (NS) + Nova Scotia (NS) - Territoires du Nord-Ouest (NT) + Northwest Territories (NT) @@ -50,12 +50,12 @@ - Les Îles du Prince Edward (PE) + Prince Edward Islands (PE) - Québec (QC) + Quebec (QC) @@ -106,6 +106,11 @@ + + + + + @@ -158,6 +163,12 @@ + + + + + + @@ -176,6 +187,11 @@ + + + + + @@ -226,6 +242,12 @@ + + + + + + @@ -244,6 +266,11 @@ + + + + + @@ -296,6 +323,12 @@ + + + + + + @@ -314,6 +347,11 @@ + + + + + @@ -364,6 +402,12 @@ + + + + + + @@ -382,6 +426,11 @@ + + + + + @@ -450,68 +499,106 @@ - + + + + + + + + + + + + + + + + + + + @@ -538,8 +625,8 @@ - - + + @@ -586,132 +673,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -786,6 +953,18 @@ + + + + + + + + + + + + @@ -862,6 +1041,11 @@ + + + + + @@ -915,13 +1099,13 @@ - + - + @@ -936,6 +1120,11 @@ + + + + + @@ -1012,6 +1201,11 @@ + + + + + @@ -1086,113 +1280,63 @@ + + + + + + - - - - - + Already created by ab2intl_sale + + + + --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + From 98b635c3f11c44214e2ec56710de5243f9a6deb9 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Fri, 21 Jun 2013 21:26:26 -0400 Subject: [PATCH 15/78] [IMP] Documentation bzr revid: maxime.chambreuil@gmail.com-20130622012626-hk1e2wfexewwfuve --- addons/l10n_ca/__openerp__.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py index fc1486ec59a..46edd918d56 100644 --- a/addons/l10n_ca/__openerp__.py +++ b/addons/l10n_ca/__openerp__.py @@ -29,6 +29,28 @@ This is the module to manage the English and French - Canadian accounting chart =========================================================================================== Canadian accounting charts and localizations. + +Fiscal positions +---------------- + +When considering taxes to be applied, it is the province where the delivery occurs that matters. +Therefore we decided to implement the general case in the fiscal positions: delivery is the +responsibility of the supplier and done at the customer location. + +Some examples: + +1) You have a customer from another province and you deliver to his province. +On the customer, set the fiscal position to his province. + +2) You have a customer from another province. However this customer comes to your location +with their truck to pick up products. On the customer, do not set any fiscal position. + +3) An international supplier doesn't charge you any tax. Tax are charged at customs +by the customs broker. On the supplier, set the fiscal position to International. + +4) An international supplier charge you your provincial tax. They are registered with your +provincial government and remit taxes themselves. On the supplier, do not set any fiscal +position. """, 'depends': [ 'base', From 39c0210f8e12c87bbe24002f68530a68f7dc34c1 Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Fri, 21 Jun 2013 21:40:40 -0400 Subject: [PATCH 16/78] [IMP] Forgot one rule (intl2ab) bzr revid: maxime.chambreuil@savoirfairelinux.com-20130622014040-v3mr2qmhcww4m5hv --- addons/l10n_ca/fiscal_templates_en.xml | 7 +++++++ addons/l10n_ca/fiscal_templates_fr.xml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/addons/l10n_ca/fiscal_templates_en.xml b/addons/l10n_ca/fiscal_templates_en.xml index cffa1c23c8a..e7473a9a970 100644 --- a/addons/l10n_ca/fiscal_templates_en.xml +++ b/addons/l10n_ca/fiscal_templates_en.xml @@ -111,6 +111,13 @@ + + + + + + + diff --git a/addons/l10n_ca/fiscal_templates_fr.xml b/addons/l10n_ca/fiscal_templates_fr.xml index e6ae764e40a..35245ce59f9 100644 --- a/addons/l10n_ca/fiscal_templates_fr.xml +++ b/addons/l10n_ca/fiscal_templates_fr.xml @@ -111,6 +111,13 @@ + + + + + + + From ee693b30c1c7e4f8d066cd1ef158cacf1870e7df Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Fri, 21 Jun 2013 22:57:28 -0400 Subject: [PATCH 17/78] [IMP] Add accounts mapping to fiscal positions bzr revid: maxime.chambreuil@savoirfairelinux.com-20130622025728-ctugr41b0fulyr4i --- addons/l10n_ca/fiscal_templates_en.xml | 198 +++++++++++++++++++++++++ addons/l10n_ca/fiscal_templates_fr.xml | 198 +++++++++++++++++++++++++ 2 files changed, 396 insertions(+) diff --git a/addons/l10n_ca/fiscal_templates_en.xml b/addons/l10n_ca/fiscal_templates_en.xml index e7473a9a970..334384b4c64 100644 --- a/addons/l10n_ca/fiscal_templates_en.xml +++ b/addons/l10n_ca/fiscal_templates_en.xml @@ -1345,5 +1345,203 @@ --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/l10n_ca/fiscal_templates_fr.xml b/addons/l10n_ca/fiscal_templates_fr.xml index 35245ce59f9..d4a3b8067e2 100644 --- a/addons/l10n_ca/fiscal_templates_fr.xml +++ b/addons/l10n_ca/fiscal_templates_fr.xml @@ -1345,5 +1345,203 @@ --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From f8c8b74c80cafe4a931bd708598347562520f39d Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Fri, 21 Jun 2013 23:14:03 -0400 Subject: [PATCH 18/78] [FIX] Typo bzr revid: maxime.chambreuil@savoirfairelinux.com-20130622031403-89lakq6kzyy3xvfq --- addons/l10n_ca/fiscal_templates_en.xml | 4 ++-- addons/l10n_ca/fiscal_templates_fr.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/l10n_ca/fiscal_templates_en.xml b/addons/l10n_ca/fiscal_templates_en.xml index 334384b4c64..5bdd72b0c1d 100644 --- a/addons/l10n_ca/fiscal_templates_en.xml +++ b/addons/l10n_ca/fiscal_templates_en.xml @@ -1534,13 +1534,13 @@ - + - + diff --git a/addons/l10n_ca/fiscal_templates_fr.xml b/addons/l10n_ca/fiscal_templates_fr.xml index d4a3b8067e2..465f53a1229 100644 --- a/addons/l10n_ca/fiscal_templates_fr.xml +++ b/addons/l10n_ca/fiscal_templates_fr.xml @@ -1534,13 +1534,13 @@ - + - + From 66f63b3015c26c9863324e99e2a5334c24b03cfd Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Fri, 21 Jun 2013 23:30:26 -0400 Subject: [PATCH 19/78] [IMP] Documentation bzr revid: maxime.chambreuil@savoirfairelinux.com-20130622033026-isqkcje1k4t6iu36 --- addons/l10n_ca/__openerp__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py index 46edd918d56..6ba9907b088 100644 --- a/addons/l10n_ca/__openerp__.py +++ b/addons/l10n_ca/__openerp__.py @@ -34,18 +34,18 @@ Fiscal positions ---------------- When considering taxes to be applied, it is the province where the delivery occurs that matters. -Therefore we decided to implement the general case in the fiscal positions: delivery is the +Therefore we decided to implement the most common case in the fiscal positions: delivery is the responsibility of the supplier and done at the customer location. Some examples: -1) You have a customer from another province and you deliver to his province. +1) You have a customer from another province and you deliver to his location. On the customer, set the fiscal position to his province. 2) You have a customer from another province. However this customer comes to your location with their truck to pick up products. On the customer, do not set any fiscal position. -3) An international supplier doesn't charge you any tax. Tax are charged at customs +3) An international supplier doesn't charge you any tax. Taxes are charged at customs by the customs broker. On the supplier, set the fiscal position to International. 4) An international supplier charge you your provincial tax. They are registered with your From 2fc0bad9639f0588ef195c382cd4c6820227c7bd Mon Sep 17 00:00:00 2001 From: Maxime Chambreuil Date: Wed, 26 Jun 2013 17:42:44 -0400 Subject: [PATCH 20/78] [FIX] Wrong account type bzr revid: maxime.chambreuil@savoirfairelinux.com-20130626214244-8qtjsphulr3ss0rh --- addons/l10n_ca/account_chart_fr.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/l10n_ca/account_chart_fr.xml b/addons/l10n_ca/account_chart_fr.xml index a16249b7c7e..000283ba6aa 100644 --- a/addons/l10n_ca/account_chart_fr.xml +++ b/addons/l10n_ca/account_chart_fr.xml @@ -724,7 +724,7 @@ 5112 other - + Achats dans des provinces harmonisées @@ -732,7 +732,7 @@ 5113 other - + Achats dans des provinces non-harmonisées @@ -740,7 +740,7 @@ 5114 other - + Achats à l'étranger From 0ef9e378994cc2cddfccd79e78e55836f8fa26d0 Mon Sep 17 00:00:00 2001 From: "RGA(OpenERP)" <> Date: Tue, 2 Jul 2013 17:10:49 +0530 Subject: [PATCH 21/78] [FIX] Drag & Drop of incomming shipments in calendar view don't write max/min date bzr revid: rgaopenerp-20130702114049-nap90vsqbjekuf8r --- addons/stock/stock.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 8b564a5e024..a1356476747 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -562,12 +562,11 @@ class stock_picking(osv.osv): ids = [ids] for pick in self.browse(cr, uid, ids, context=context): sql_str = """update stock_move set - date='%s' + date_expected='%s' where picking_id=%d """ % (value, pick.id) - if pick.max_date: - sql_str += " and (date='" + pick.max_date + "' or date>'" + value + "')" + sql_str += " and (date_expected='" + pick.max_date + "')" cr.execute(sql_str) return True @@ -584,11 +583,11 @@ class stock_picking(osv.osv): ids = [ids] for pick in self.browse(cr, uid, ids, context=context): sql_str = """update stock_move set - date='%s' + date_expected='%s' where picking_id=%s """ % (value, pick.id) if pick.min_date: - sql_str += " and (date='" + pick.min_date + "' or date<'" + value + "')" + sql_str += " and (date_expected='" + pick.min_date + "')" cr.execute(sql_str) return True From aa202d87ef55ec12f212f8489831544a8b9a65ce Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Wed, 3 Jul 2013 12:22:56 +0530 Subject: [PATCH 22/78] [IMP] visible produce button on 'Ready to Produce' state in mo bzr revid: fka@tinyerp.com-20130703065256-wn65bwb8xzovbfef --- addons/mrp/mrp_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 562fa29bd26..c73a25d029a 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -620,8 +620,8 @@