From c2b77cc2447ab9cb4c8a203c9185beca54152e31 Mon Sep 17 00:00:00 2001 From: Andres Calle Date: Fri, 14 Apr 2023 02:01:27 +0000 Subject: [PATCH] [ADD] l10n_ec: Improve accounts in chart template - Adds early pay discounts, cash dicounts accounts - Sets the ecuadorian chart of accounts as updatable (same as most localizations) - Fix the account type, many should be liability current and not liability payable (otherwise the usage of these accounts affects the payable/receivable reports) closes odoo/odoo#121579 X-original-commit: ba837dc3023327dd5bdb3cf579c59e76cbe73bbf Signed-off-by: Josse Colpaert --- .../data/template/account.account-ec.csv | 54 ++++++++++--------- addons/l10n_ec/models/template_ec.py | 8 +-- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/addons/l10n_ec/data/template/account.account-ec.csv b/addons/l10n_ec/data/template/account.account-ec.csv index 0d6dfcfd036..4c7e6e02975 100644 --- a/addons/l10n_ec/data/template/account.account-ec.csv +++ b/addons/l10n_ec/data/template/account.account-ec.csv @@ -9,10 +9,10 @@ "ec1102050102","1102050102","Accounts receivable from unrelated foreign customers","True","asset_receivable","Cuentas por cobrar clientes no relacionados extranjeros" "ec11020601","11020601","Local customer related notes and accounts receivable","True","asset_receivable","Documentos y cuentas por cobrar cliente relacionados locales" "ec11020602","11020602","Foreign customer related notes and accounts receivable","True","asset_receivable","Documentos y cuentas por cobrar cliente relacionados extranjeros" -"ec11020701","11020701","Salary advances","True","asset_receivable","Anticipo sueldos" -"ec11020702","11020702","Thirteenth salary advance","True","asset_receivable","Anticipo décimo tercer sueldo" -"ec11020703","11020703","Fourteenth salary advance","True","asset_receivable","Anticipo décimo cuarto sueldo" -"ec11020704","11020704","Profit sharing advance","True","asset_receivable","Anticipo utilidades" +"ec11020701","11020701","Salary advances","True","asset_current","Anticipo sueldos" +"ec11020702","11020702","Thirteenth salary advance","True","asset_current","Anticipo décimo tercer sueldo" +"ec11020703","11020703","Fourteenth salary advance","True","asset_current","Anticipo décimo cuarto sueldo" +"ec11020704","11020704","Profit sharing advance","True","asset_current","Anticipo utilidades" "ec110208","110208","Other related accounts receivable","True","asset_receivable","Otras cuentas por cobrar relacionadas" "ec110209","110209","Other accounts receivable","True","asset_receivable","Otras cuentas por cobrar" "ec110210","110210","Allowance for doubtful accounts","False","asset_current","Provision por cuentas incobrables" @@ -113,19 +113,20 @@ "ec21050102","21050102","Other local provisions","True","liability_current","Otras provisiones locales" "ec210502","210502","Provisions from abroad","True","liability_current","Provisiones del exterior" "ec2106","2106","Current portion of bonds issued","False","liability_current","Porcion corriente de obligaciones emitidas" -"ec21070101","21070101","Income tax withheld from employees","True","liability_payable","Impuesto a la renta retenido a empleados" +"ec21070101","21070101","Income tax withheld from employees","True","liability_current","Impuesto a la renta retenido a empleados" "ec210702","210702","Income tax payable for the year","True","liability_payable","Impuesto a la renta por pagar del ejercicio" -"ec21070301","21070301","Unsecured loans","True","liability_payable","Prestamos quirografarios" -"ec21070302","21070302","Mortgage loans","True","liability_payable","Prestamos hipotecarios" -"ec21070303","21070303","Employer's contribution to the iess","True","liability_payable","Aportacion patronal al iess" -"ec21070304","21070304","Personal contribution to iess","True","liability_payable","Aportacion personal al iess" -"ec21070305","21070305","Reserve funds withheld from employees","True","liability_payable","Fondos de reserva retenidos a empleados" -"ec21070306","21070306","Other current obligations with the iess","True","liability_payable","Otras obligaciones corrientes con el iess" +"ec21070301","21070301","Unsecured loans","True","liability_current","Prestamos quirografarios" +"ec21070302","21070302","Mortgage loans","True","liability_current","Prestamos hipotecarios" +"ec21070303","21070303","Employer's contribution to the iess","True","liability_current","Aportacion patronal al iess" +"ec21070304","21070304","Personal contribution to iess","True","liability_current","Aportacion personal al iess" +"ec21070305","21070305","Reserve funds withheld from employees","True","liability_current","Fondos de reserva retenidos a empleados" +"ec21070306","21070306","Other current obligations with the iess","True","liability_current","Otras obligaciones corrientes con el iess" +"ec21070307","21070307","Solidarity benefits to the IESS",True,liability_current,"Prestaciones solidarias al IESS" "ec21070401","21070401","Wages and salaries payable","True","liability_payable","Sueldos y salarios por pagar" "ec21070402","21070402","Other current employee benefit obligations","True","liability_payable","Otras obligaciones corrientes por beneficios de ley a empleados" "ec21070403","21070403","Tenths due","True","liability_payable","Décimos por pagar" -"ec210705","210705","Employee profit sharing payable for the year","True","liability_payable","Participacion trabajadores por pagar del ejercicio" -"ec210706","210706","Dividends payable","True","liability_payable","Dividendos por pagar" +"ec210705","210705","Employee profit sharing payable for the year","True","liability_current","Participacion trabajadores por pagar del ejercicio" +"ec210706","210706","Dividends payable","True","liability_current","Dividendos por pagar" "ec2108","2108","Sundry/related accounts payable","True","liability_payable","Cuentas por pagar diversas/relacionadas" "ec2109","2109","Other financial liabilities","True","liability_payable","Otros pasivos financieros" "ec2110","2110","Customer advances","True","liability_payable","Anticipos de clientes" @@ -154,7 +155,7 @@ "ec_vat_withhold_70","2114010305","VAT withholdings 70%","False","liability_current","Retenciones de iva 70%" "ec_vat_withhold_100","2114010306","VAT withholdings 100%","False","liability_current","Retenciones de iva 100%" "ec_vat_withhold_others","2114010307","Other withholdings","False","liability_current","Otras retenciones" -"ec2201","2201","Liabilities under finance leases","True","liability_payable","Pasivos por contratos de arrendamiento financiero" +"ec2201","2201","Liabilities under finance leases","True","liability_current","Pasivos por contratos de arrendamiento financiero" "ec220201","220201","Local accounts and notes payable","True","liability_payable","Cuentas y documentos por pagar locales" "ec220202","220202","Foreign accounts and notes payable","True","liability_payable","Cuentas y documentos por pagar del exterior" "ec220301","220301","Obligations with local financial institutions","True","liability_payable","Obligaciones con instituciones financieras locales" @@ -164,9 +165,9 @@ "ec2205","2205","Bonds issued","True","liability_payable","Obligaciones emitidas" "ec2206","2206","Customer advances","True","liability_payable","Anticipos de clientes" "ec220701","220701","Other non-current employee benefits","True","liability_payable","Otros beneficios no corrientes para los empleados" -"ec2208","2208","Other provisions","True","liability_payable","Otras provisiones" -"ec220901","220901","Deferred income","True","liability_payable","Ingresos diferidos" -"ec220902","220902","Deferred tax liabilities","True","liability_payable","Pasivos por impuestos diferidos" +"ec2208","2208","Other provisions","True","liability_non_current","Otras provisiones" +"ec220901","220901","Deferred income","True","liability_non_current","Ingresos diferidos" +"ec220902","220902","Deferred tax liabilities","True","liability_non_current","Pasivos por impuestos diferidos" "ec2210","2210","Other non-current liabilities","False","liability_non_current","Otros pasivos no corrientes" "ec3101","3101","Subscribed or assigned capital","False","equity","Capital suscrito o asignado" "ec3102","3102","Unpaid subscribed capital, treasury stock","False","equity","Capital suscrito no pagado, acciones en tesoreria" @@ -193,7 +194,7 @@ "ec4107","4107","Dividends","False","income","Dividendos" "ec4108","4108","Gain on fair value measurement of biological assets","False","income","Ganancia por medición a valor razonable de activos biológicos" "ec4109","4109","Other income from ordinary activities","False","income","Otros ingresos de actividades ordinarias" -"ec4110","4110","(-) discount on sales","False","income","(-) descuento en ventas" +"ec_early_pay_discount_loss","4110","(-) Early payment discount on sales","False","income","(-) Descuento pronto pago en ventas" "ec4111","4111","(-) sales returns","False","income","(-) devoluciones en ventas" "ec42","42","Gross profit","False","income","Ganancia bruta" "ec4301","4301","Dividends","False","income","Dividendos" @@ -201,7 +202,8 @@ "ec4303","4303","Gain on investments in associates / subsidiaries and others","False","income","Ganancia en inversiones en asociadas / subsidiarias y otras" "ec4304","4304","Valuation of financial instruments at fair value through profit or loss","False","income","Valuacion de instrumentos financieros a valor razonable con cambio en resultados" "ec430501","430501","Income from foreign exchange differences","False","income","Ingresos por diferecias de cambio" -"ec430502","430502","Other income","False","income","Otros ingresos" +"ec_income_cash_difference","430502","Cash difference account","False","income","Ingresos por diferencias en efectivo" +"ec430503","430503","Otras rentas","False","income","Other Income" "ec510101","510101","Beginning inventory of goods not produced by the company","False","expense_direct_cost","Inventario inicial de bienes no producidos por la compañia" "ec510102","510102","Net local purchases of goods not produced by the company","False","expense_direct_cost","Compras netas locales de bienes no producidos por la compañia" "ec510103","510103","Imports of goods not produced by the company","False","expense_direct_cost","Importaciones de bienes no producidos por la compañia" @@ -291,8 +293,8 @@ "ec52010402","52010402","Training","False","expense","Capacitacion" "ec52010403","52010403","Uniforms","False","expense","Uniformes" "ec52010404","52010404","Food","False","expense","Alimentacion" -"ec5201040501","5201040501","Employee income tax borne by the company","False","expense_direct_cost","Impuesto a la renta empleados asumido por la empresa" -"ec5201040502","5201040502","Transportation","False","expense_direct_cost","Transporte" +"ec5201040501","5201040501","Employee income tax borne by the company","False","expense","Impuesto a la renta empleados asumido por la empresa" +"ec5201040502","5201040502","Transportation","False","expense","Transporte" "ec520105","520105","Fees, commissions and per diems to natural persons","False","expense","Honorarios, comisiones y dietas a personas naturales" "ec520106","520106","Remuneration to other self-employed workers","False","expense","Remuneraciones a otros trabajadores autonomos" "ec520107","520107","Fees to foreigners for occasional services","False","expense","Honorarios a extranjeros por servicios ocasionales" @@ -373,8 +375,8 @@ "ec52020403","52020403","Uniforms","False","expense","Uniformes" "ec52020404","52020404","Food","False","expense","Alimentacion" "ec52020405","52020405","Other employee benefit plan expenses","False","expense","Otros gastos de planes de beneficios a empleados" -"ec5202040501","5202040501","Employee income tax borne by the company","False","expense_direct_cost","Impuesto a la renta empleados asumido por la empresa" -"ec5202040502","5202040502","Transportation","False","expense_direct_cost","Transporte" +"ec5202040501","5202040501","Employee income tax borne by the company","False","expense","Impuesto a la renta empleados asumido por la empresa" +"ec5202040502","5202040502","Transportation","False","expense","Transporte" "ec520205","520205","Fees, commissions and per diems to natural persons","False","expense","Honorarios, comisiones y dietas a personas naturales" "ec520206","520206","Remuneration to other self-employed workers","False","expense","Remuneraciones a otros trabajadores autonomos" "ec520207","520207","Fees to foreigners for occasional services","False","expense","Honorarios a extranjeros por servicios ocasionales" @@ -461,6 +463,6 @@ "ec520304","520304","Difference in exchange","False","expense","Diferencia en cambio" "ec520305","520305","Other financial expenses","False","expense","Otros gastos financieros" "ec520401","520401","Loss on investments in associates / subsidiaries and others","False","expense","Perdida en inversiones en asociadas / subsidiarias y otras" -"ec52040201","52040201","Other expenses","False","expense","Otros gastos" -"ec9993","9993","Cash Discount Loss","False","expense","Pérdida por descuento" -"ec9994","9994","Cash Discount Gain","False","income_other","Ganancia por descuento" +"ec_early_pay_discount_gain","52040201","(-) Early Cash Discount Gain from purchases","False","expense","(-) Descuento pronto pago en compras de servicios" +"ec_expense_cash_difference","52040202","(-) Expenses for Cash Differences","False","expense","(-) Egresos por diferencias en efectivo" +"ec_expense_others","52040203","Otros gastos","False",expense,"Other expenses" diff --git a/addons/l10n_ec/models/template_ec.py b/addons/l10n_ec/models/template_ec.py index a9f34a10c24..0a521e729d3 100644 --- a/addons/l10n_ec/models/template_ec.py +++ b/addons/l10n_ec/models/template_ec.py @@ -13,7 +13,7 @@ class AccountChartTemplate(models.AbstractModel): 'property_account_payable_id': 'ec210301', 'property_account_expense_categ_id': 'ec110307', 'property_account_income_categ_id': 'ec410201', - 'property_account_expense_id': 'ec52040201', + 'property_account_expense_id': 'ec_expense_others', 'property_stock_account_input_categ_id': 'ec110307', 'property_stock_account_output_categ_id': 'ec510102', 'property_stock_valuation_account_id': 'ec110306', @@ -31,8 +31,10 @@ class AccountChartTemplate(models.AbstractModel): 'account_default_pos_receivable_account_id': 'ec1102050101', 'income_currency_exchange_account_id': 'ec430501', 'expense_currency_exchange_account_id': 'ec520304', - 'account_journal_early_pay_discount_loss_account_id': 'ec9993', - 'account_journal_early_pay_discount_gain_account_id': 'ec9994', + 'account_journal_early_pay_discount_loss_account_id': 'ec_early_pay_discount_loss', + 'account_journal_early_pay_discount_gain_account_id': 'ec_early_pay_discount_gain', + 'default_cash_difference_income_account_id': 'ec_income_cash_difference', + 'default_cash_difference_expense_account_id': 'ec_expense_cash_difference', }, }