Skip to content

[IMP] Avoid showing red flag entries #604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stevTresCloud wants to merge 5 commits into
base: 2022-10-AC-IMP-l10n_ec_standard_v16
Choose a base branch
from
Open

[IMP] Avoid showing red flag entries #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ea74800
[FIX] account_edi: also cancel non-invoice moves
odoostan Dec 2, 2022
81d514e
[IMP] l10n_ec: update and upgrade
odoostan Dec 2, 2022
fcab54b
[FIX] Backport from master (v16 only)
odoostan Jan 23, 2023
e41e50f
[IMP] post-migration (v16 only, TOREVIEW)
odoostan Jan 23, 2023
cb883dd
[IMP] Avoid showing red flag entries
stevTresCloud Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions addons/account_edi/models/account_edi_document.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def _postprocess_post_edi_results(documents, edi_result):
attachments_to_unlink.unlink()

def _postprocess_cancel_edi_results(documents, edi_result):
invoice_ids_to_cancel = set() # Avoid duplicates
move_ids_to_cancel = set() # Avoid duplicates
attachments_to_unlink = self.env['ir.attachment']
for document in documents:
move = document.move_id
Expand All @@ -151,10 +151,10 @@ def _postprocess_cancel_edi_results(documents, edi_result):
'blocking_level': False,
})

if move.is_invoice(include_receipts=True) and move.state == 'posted':
if move.state == 'posted':
# The user requested a cancellation of the EDI and it has been approved. Then, the invoice
# can be safely cancelled.
invoice_ids_to_cancel.add(move.id)
move_ids_to_cancel.add(move.id)

if not old_attachment.res_model or not old_attachment.res_id:
attachments_to_unlink |= old_attachment
Expand All @@ -165,8 +165,8 @@ def _postprocess_cancel_edi_results(documents, edi_result):
'blocking_level': move_result.get('blocking_level', DEFAULT_BLOCKING_LEVEL) if move_result.get('error') else False,
})

if invoice_ids_to_cancel:
invoices = self.env['account.move'].browse(list(invoice_ids_to_cancel))
if move_ids_to_cancel:
invoices = self.env['account.move'].browse(list(move_ids_to_cancel))
invoices.button_draft()
invoices.button_cancel()

Expand Down
11 changes: 7 additions & 4 deletions addons/l10n_ec/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
{
"name": "Ecuadorian Accounting",
"version": "3.3",
"version": "3.4",
"description": """
Functional
----------
Expand Down Expand Up @@ -32,9 +32,9 @@
* Ecuador banks
* Partners: Consumidor Final, SRI, IESS, and also basic VAT validation
""",
"author": "OPA CONSULTING & TRESCLOUD",
"author": "TRESCLOUD, OPA CONSULTING",
"category": "Accounting/Localizations/Account Charts",
"maintainer": "OPA CONSULTING",
"maintainer": "TRESCLOUD",
"website": "https://opa-consulting.com",
"license": "LGPL-3",
"depends": [
Expand All @@ -46,6 +46,8 @@
"l10n_latam_base",
],
"data": [
# Security
"security/ir.model.access.csv",
# Chart of Accounts
"data/account_chart_template_data.xml",
"data/account_group_template_data.xml",
Expand All @@ -65,11 +67,12 @@
# Other data
"data/l10n_latam.document.type.csv",
"data/l10n_ec.sri.payment.csv",
# Views
"views/root_sri_menu.xml",
"views/account_tax_view.xml",
"views/l10n_latam_document_type_view.xml",
"views/l10n_ec_sri_payment.xml",
"views/account_journal_view.xml",
"security/ir.model.access.csv",
# Try loading CoA
"data/account_chart_template_configure_data.xml",
],
Expand Down
40 changes: 21 additions & 19 deletions addons/l10n_ec/data/account.account.template.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
id,code,name,reconcile,account_type,chart_template_id/id
l10n_ec_ifrs_liquidity_transfer,111010301,Transferencias interbancarias,TRUE,asset_current,l10n_ec_ifrs
l10n_ec_ifrs_liquidity_transfer,11010301,Transferencias interbancarias,TRUE,asset_current,l10n_ec_ifrs
ec11010401,11010401,Valores en custodia,FALSE,asset_current,l10n_ec_ifrs
ec110201,110201,Activos financieros a valor razonable con cambios en resultados,FALSE,asset_current,l10n_ec_ifrs
ec110202,110202,Activos financieros disponibles para la venta,FALSE,asset_current,l10n_ec_ifrs
Expand Down Expand Up @@ -29,13 +29,13 @@ ec110401,110401,Seguros pagados por anticipado,TRUE,asset_prepayments,l10n_ec_if
ec110402,110402,Arriendos pagados por anticipado,TRUE,asset_prepayments,l10n_ec_ifrs
ec110403,110403,Anticipos a proveedores,TRUE,asset_prepayments,l10n_ec_ifrs
ec_other_downpayments,11040401,Otros anticipos entregados,TRUE,asset_prepayments,l10n_ec_ifrs
ec_purchase_vat,11050101,Iva pagado en compras locales,FALSE,asset_current,l10n_ec_ifrs
ec_purchase_vat_assets,11050102,Iva pagado en compras locales de activos fijos,FALSE,asset_current,l10n_ec_ifrs
ec_purchase_vat_service_imports,11050103,Iva pagado en importacion de servicios,FALSE,asset_current,l10n_ec_ifrs
ec_purchase_vat_goods_imports,11050104,Iva pagado en importacion de bienes,FALSE,asset_current,l10n_ec_ifrs
ec_purchase_vat_assets_imports,11050105,Iva pagado en importacion de activos fijos,FALSE,asset_current,l10n_ec_ifrs
ec_sale_vat_outstanding_withholds,11050106,Iva pagado en retenciones de la fuente,FALSE,asset_current,l10n_ec_ifrs
ec_purchase_vat_zero,11050107,Iva en compras 0%,FALSE,asset_current,l10n_ec_ifrs
ec_purchase_vat,11050101,IVA pagado en compras locales,FALSE,asset_current,l10n_ec_ifrs
ec_purchase_vat_assets,11050102,IVA pagado en compras locales de activos fijos,FALSE,asset_current,l10n_ec_ifrs
ec_purchase_vat_service_imports,11050103,IVA pagado en importacion de servicios,FALSE,asset_current,l10n_ec_ifrs
ec_purchase_vat_goods_imports,11050104,IVA pagado en importacion de bienes,FALSE,asset_current,l10n_ec_ifrs
ec_purchase_vat_assets_imports,11050105,IVA pagado en importacion de activos fijos,FALSE,asset_current,l10n_ec_ifrs
ec_sale_vat_outstanding_withholds,11050106,IVA pagado en retenciones de la fuente,FALSE,asset_current,l10n_ec_ifrs
ec_purchase_vat_zero,11050107,IVA en compras 0%,FALSE,asset_current,l10n_ec_ifrs
ec110502,110502,Credito tributario a favor de la empresa(i.r.),FALSE,asset_current,l10n_ec_ifrs
ec110503,110503,Anticipo de impuesto a la renta,FALSE,asset_current,l10n_ec_ifrs
ec_sale_profit_withhold,110504,Retenciones en la fuente pagadas,FALSE,asset_current,l10n_ec_ifrs
Expand Down Expand Up @@ -132,11 +132,11 @@ ec2110,2110,Anticipos de clientes,TRUE,liability_payable,l10n_ec_ifrs
ec2111,2111,Pasivos directamente asociados con los activos no corrientes y operaciones discontinuadas,FALSE,liability_current,l10n_ec_ifrs
ec211201,211201,Otros beneficios a largo plazo para los empleados,TRUE,liability_payable,l10n_ec_ifrs
ec211301,211301,Retenciones judiciales,FALSE,liability_current,l10n_ec_ifrs
ec_sale_vat,2114010101,Iva cobrado en ventas locales,FALSE,liability_current,l10n_ec_ifrs
ec_sale_vat_assets,2114010102,Iva cobrado en ventas de activos fijos,FALSE,liability_current,l10n_ec_ifrs
ec_sale_vat_goods_exports,2114010103,Iva cobrado en exportacion de bienes,FALSE,liability_current,l10n_ec_ifrs
ec_sale_vat_services_exports,2114010104,Iva cobrado en exportacion de servicios,FALSE,liability_current,l10n_ec_ifrs
ec_sale_vat_zero,2114010105,Iva en ventas 0%,FALSE,liability_current,l10n_ec_ifrs
ec_sale_vat,2114010101,IVA cobrado en ventas locales,FALSE,liability_current,l10n_ec_ifrs
ec_sale_vat_assets,2114010102,IVA cobrado en ventas de activos fijos,FALSE,liability_current,l10n_ec_ifrs
ec_sale_vat_goods_exports,2114010103,IVA cobrado en exportacion de bienes,FALSE,liability_current,l10n_ec_ifrs
ec_sale_vat_services_exports,2114010104,IVA cobrado en exportacion de servicios,FALSE,liability_current,l10n_ec_ifrs
ec_sale_vat_zero,2114010105,IVA en ventas 0%,FALSE,liability_current,l10n_ec_ifrs
ret_ir_1x100,2114010201,Retenciones de la fuente 1%,FALSE,liability_current,l10n_ec_ifrs
ret_ir_1_75x100,2114010202,Retenciones de la fuente 1.75%,FALSE,liability_current,l10n_ec_ifrs
ret_ir_2x100,2114010203,Retenciones de la fuente 2%,FALSE,liability_current,l10n_ec_ifrs
Expand All @@ -147,12 +147,12 @@ ret_ir_10x100,2114010207,Retenciones de la fuente 10%,FALSE,liability_current,l1
ret_ir_15x100,2114010208,Retenciones de la fuente 15%,FALSE,liability_current,l10n_ec_ifrs
ret_ir_22x100,2114010209,Retenciones de la fuente 22%,FALSE,liability_current,l10n_ec_ifrs
ret_ir_others,2114010210,Otras retenciones,FALSE,liability_current,l10n_ec_ifrs
ec_vat_withhold_10,2114010301,Retenciones de iva 10%,FALSE,liability_current,l10n_ec_ifrs
ec_vat_withhold_20,2114010302,Retenciones de iva 20%,FALSE,liability_current,l10n_ec_ifrs
ec_vat_withhold_30,2114010303,Retenciones de iva 30%,FALSE,liability_current,l10n_ec_ifrs
ec_vat_withhold_50,2114010304,Retenciones de iva 50%,FALSE,liability_current,l10n_ec_ifrs
ec_vat_withhold_70,2114010305,Retenciones de iva 70%,FALSE,liability_current,l10n_ec_ifrs
ec_vat_withhold_100,2114010306,Retenciones de iva 100%,FALSE,liability_current,l10n_ec_ifrs
ec_vat_withhold_10,2114010301,Retenciones de IVA 10%,FALSE,liability_current,l10n_ec_ifrs
ec_vat_withhold_20,2114010302,Retenciones de IVA 20%,FALSE,liability_current,l10n_ec_ifrs
ec_vat_withhold_30,2114010303,Retenciones de IVA 30%,FALSE,liability_current,l10n_ec_ifrs
ec_vat_withhold_50,2114010304,Retenciones de IVA 50%,FALSE,liability_current,l10n_ec_ifrs
ec_vat_withhold_70,2114010305,Retenciones de IVA 70%,FALSE,liability_current,l10n_ec_ifrs
ec_vat_withhold_100,2114010306,Retenciones de IVA 100%,FALSE,liability_current,l10n_ec_ifrs
ec_vat_withhold_others,2114010307,Otras retenciones,FALSE,liability_current,l10n_ec_ifrs
ec2201,2201,Pasivos por contratos de arrendamiento financiero,TRUE,liability_payable,l10n_ec_ifrs
ec220201,220201,Cuentas y documentos por pagar locales,TRUE,liability_payable,l10n_ec_ifrs
Expand Down Expand Up @@ -274,6 +274,8 @@ ec510405,510405,Gasto por garantias en venta de productos o servicios,FALSE,expe
ec510406,510406,Mantenimiento y reparaciones,FALSE,expense_direct_cost,l10n_ec_ifrs
ec510407,510407,Suministros materiales y repuestos,FALSE,expense_direct_cost,l10n_ec_ifrs
ec51040801,51040801,Otros costos de produccion,FALSE,expense_direct_cost,l10n_ec_ifrs
ec51040802,51040802,Faltantes y sobrantes de ajustes de inventario,FALSE,expense_direct_cost,l10n_ec_ifrs
ec51040803,51040803,Desperdicios en el proceso productivo,FALSE,expense_direct_cost,l10n_ec_ifrs
ec52010101,52010101,"Sueldos, salarios y demas remuneraciones",FALSE,expense,l10n_ec_ifrs
ec52010102,52010102,Horas extra,FALSE,expense,l10n_ec_ifrs
ec52010103,52010103,Bonificaciones por desempeño,FALSE,expense,l10n_ec_ifrs
Expand Down
2 changes: 1 addition & 1 deletion addons/l10n_ec/data/account_chart_template_setup_accounts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<odoo>
<data noupdate="1">
<record id="l10n_ec_ifrs" model="account.chart.template">
<field name="name">Plan Contable NIIF Ecuador conforme Superintendencia de Compañías</field>
<field name="name">Ecuador - Plan Cuentas NIIF SupCias</field>
<field name="income_currency_exchange_account_id" ref="ec430501"/>
<field name="expense_currency_exchange_account_id" ref="ec520304"/>
<field name="property_account_receivable_id" ref="ec1102050101"/>
Expand Down
87 changes: 35 additions & 52 deletions addons/l10n_ec/data/account_fiscal_position_template.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<odoo>
<record id="fp_companies" model="account.fiscal.position.template">
<field name="chart_template_id" ref="l10n_ec_ifrs"/>
<field name="name">Sociedades - personas juridicas</field>
</record>
<record id="fp_special_taxation_companies" model="account.fiscal.position.template">
<field name="chart_template_id" ref="l10n_ec_ifrs"/>
<field name="name">Contribuyentes especiales</field>
</record>
<record id="fp_public_companies" model="account.fiscal.position.template">
<field name="chart_template_id" ref="l10n_ec_ifrs"/>
<field name="name">Sector publico y ep</field>
</record>
<record id="fp_person_obligated_accounting" model="account.fiscal.position.template">
<field name="chart_template_id" ref="l10n_ec_ifrs"/>
<field name="name">Persona natural obligada a llevar contabilidad</field>
</record>
<record id="fp_person_leases" model="account.fiscal.position.template">
<field name="chart_template_id" ref="l10n_ec_ifrs"/>
<field name="name">Persona natural no obligada - arriendos</field>
</record>
<record id="fp_person_professional" model="account.fiscal.position.template">
<field name="chart_template_id" ref="l10n_ec_ifrs"/>
<field name="name">Persona natural no obligada - profesionales</field>
</record>
<record id="fp_person_rustic" model="account.fiscal.position.template">
<field name="chart_template_id" ref="l10n_ec_ifrs"/>
<field name="name">Persona natural no obligada - liquidaciones de compras</field>
</record>
<record id="fp_person_other" model="account.fiscal.position.template">
<field name="chart_template_id" ref="l10n_ec_ifrs"/>
<field name="name">Persona natural no obligadas - emite factura o nota de venta</field>
</record>
<record id="fp_foreing_company_local" model="account.fiscal.position.template">
<field name="chart_template_id" ref="l10n_ec_ifrs"/>
<field name="name">Empresa extranjera - venta local</field>
</record>
<record id="fp_foreing_person_local" model="account.fiscal.position.template">
<field name="chart_template_id" ref="l10n_ec_ifrs"/>
<field name="name">Persona extranjera - venta local</field>
</record>
<record id="fp_foreing_company_exports" model="account.fiscal.position.template">
<field name="chart_template_id" ref="l10n_ec_ifrs"/>
<field name="name">Empresa extranjera - exportacion</field>
</record>
<record id="fp_foreing_person_exports" model="account.fiscal.position.template">
<field name="chart_template_id" ref="l10n_ec_ifrs"/>
<field name="name">Persona extranjera - exportacion</field>
</record>
<record id="fp_others" model="account.fiscal.position.template">
<field name="chart_template_id" ref="l10n_ec_ifrs"/>
<field name="name">Otras - sin cálculo automático de retención de iva</field>
</record>
<record id="fp_local" model="account.fiscal.position.template">
<field name="sequence">10</field>
<field name="chart_template_id" ref="l10n_ec_ifrs"/>
<field name="name">Régimen nacional</field>
<field name="auto_apply" eval="True"/>
<field name="vat_required" eval="True"/>
<field name="country_id" ref="base.ec"/>
</record>
<record id="fp_foreign" model="account.fiscal.position.template">
<field name="sequence">20</field>
<field name="chart_template_id" ref="l10n_ec_ifrs"/>
<field name="name">Régimen extranjero</field>
<field name="auto_apply" eval="True"/>
<field name="vat_required" eval="True"/>
</record>
<record id="fp_foreign_sale_vat12_goods" model="account.fiscal.position.tax.template">
<field name="tax_src_id" ref="l10n_ec.tax_vat_411_goods"/>
<field name="tax_dest_id" ref="l10n_ec.tax_vat_417"/>
<field name="position_id" ref="fp_foreign"/>
</record>
<record id="fp_foreign_sale_vat12_services" model="account.fiscal.position.tax.template">
<field name="tax_src_id" ref="l10n_ec.tax_vat_411_services"/>
<field name="tax_dest_id" ref="l10n_ec.tax_vat_417"/>
<field name="position_id" ref="fp_foreign"/>
</record>
<record id="fp_foreign_sale_vat0_goods" model="account.fiscal.position.tax.template">
<field name="tax_src_id" ref="l10n_ec.tax_vat_415_goods"/>
<field name="tax_dest_id" ref="l10n_ec.tax_vat_417"/>
<field name="position_id" ref="fp_foreign"/>
</record>
<record id="fp_foreign_sale_vat0_services" model="account.fiscal.position.tax.template">
<field name="tax_src_id" ref="l10n_ec.tax_vat_415_services"/>
<field name="tax_dest_id" ref="l10n_ec.tax_vat_417"/>
<field name="position_id" ref="fp_foreign"/>
</record>
</odoo>
6 changes: 3 additions & 3 deletions addons/l10n_ec/data/account_group_template_data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<record id="ec110501" model="account.group.template">
<field name="chart_template_id" eval="ref('l10n_ec.l10n_ec_ifrs')"/>
<field name="code_prefix_start">110501</field>
<field name="name">Credito tributario a favor de la empresa(iva)</field>
<field name="name">Credito tributario a favor de la empresa(IVA)</field>
<field name="parent_id" ref="ec1105"/>
</record>

Expand Down Expand Up @@ -299,7 +299,7 @@
<record id="ec21140101" model="account.group.template">
<field name="chart_template_id" eval="ref('l10n_ec.l10n_ec_ifrs')"/>
<field name="code_prefix_start">21140101</field>
<field name="name">Iva cobrado</field>
<field name="name">IVA cobrado</field>
<field name="parent_id" ref="ec211401"/>
</record>

Expand All @@ -313,7 +313,7 @@
<record id="ec21140103" model="account.group.template">
<field name="chart_template_id" eval="ref('l10n_ec.l10n_ec_ifrs')"/>
<field name="code_prefix_start">21140103</field>
<field name="name">Retenciones de iva</field>
<field name="name">Retenciones de IVA</field>
<field name="parent_id" ref="ec211401"/>
</record>

Expand Down
37 changes: 29 additions & 8 deletions addons/l10n_ec/data/account_tax_group_data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
<odoo>
<data noupdate="1">

<record id="tax_group_vat_08" model="account.tax.group">
<field name="name">VAT 8%</field>
<field name="l10n_ec_type">vat08</field>
<field name="sequence">5</field>
<field name="country_id" ref="base.ec"/>
</record>

<record id="tax_group_vat_12" model="account.tax.group">
<field name="name">VAT 12%</field>
<field name="l10n_ec_type">vat12</field>
Expand Down Expand Up @@ -30,8 +37,8 @@
<field name="country_id" ref="base.ec"/>
</record>

<record id="tax_group_vat_excempt" model="account.tax.group">
<field name="name">VAT Excempt</field>
<record id="tax_group_vat_exempt" model="account.tax.group">
<field name="name">VAT Exempt</field>
<field name="l10n_ec_type">exempt_vat</field>
<field name="sequence">50</field>
<field name="country_id" ref="base.ec"/>
Expand All @@ -51,19 +58,33 @@
<field name="country_id" ref="base.ec"/>
</record>

<record id="tax_group_withhold_vat" model="account.tax.group">
<field name="name">VAT Withhold</field>
<field name="l10n_ec_type">withhold_vat</field>
<record id="tax_group_withhold_vat_sale" model="account.tax.group">
<field name="name">VAT Withhold on Sales</field>
<field name="l10n_ec_type">withhold_vat_sale</field>
<field name="sequence">80</field>
<field name="country_id" ref="base.ec"/>
</record>

<record id="tax_group_withhold_vat_purchase" model="account.tax.group">
<field name="name">VAT Withhold on Purchases</field>
<field name="l10n_ec_type">withhold_vat_purchase</field>
<field name="sequence">80</field>
<field name="country_id" ref="base.ec"/>
</record>

<record id="tax_group_withhold_income" model="account.tax.group">
<field name="name">Profit Withhold</field>
<field name="l10n_ec_type">withhold_income_tax</field>
<record id="tax_group_withhold_income_sale" model="account.tax.group">
<field name="name">Profit Withhold on Sales</field>
<field name="l10n_ec_type">withhold_income_sale</field>
<field name="sequence">90</field>
<field name="country_id" ref="base.ec"/>
</record>

<record id="tax_group_withhold_income_purchase" model="account.tax.group">
<field name="name">Profit Withhold on Purchases</field>
<field name="l10n_ec_type">withhold_income_purchase</field>
<field name="sequence">95</field>
<field name="country_id" ref="base.ec"/>
</record>

<record id="tax_group_outflows" model="account.tax.group">
<field name="name">Exchange Outflows</field>
Expand Down
Loading