Skip to content
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

[16.0][FIX+IMP] l10n_br_sale: Casos Sem Operação Fiscal ou Fora do Brasil #3598

Open
wants to merge 2 commits into
base: 16.0
Choose a base branch
from
Open

[16.0][FIX+IMP] l10n_br_sale: Casos Sem Operação Fiscal ou Fora do Brasil #3598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53e00fb
[FIX] l10n_br_sale: Cases without Fiscal Operation
mbcosta Jan 28, 2025
d43c2ee
[FIX] l10n_br_sale: Amounts case without OP Fiscal
mbcosta Jan 28, 2025
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: 8 additions & 2 deletions l10n_br_sale/models/sale_order.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ class SaleOrder(models.Model):

@api.model
def _default_fiscal_operation(self):
return self.env.company.sale_fiscal_operation_id
# O IF permite testar casos Sem OP Fiscal, por exemplo o módulo delivery
# TODO: Avaliar a necessidade do IF depois da separação entre
# os Testes e os Dados de Demonstração
if self.env.company.country_id.code == "BR":
return self.env.company.sale_fiscal_operation_id
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aqui, se for fora do Brasil, a operação na empresa seria False e daria no mesmo não? O codio anterior era até mais simples no caso, não se vale a pena mudar aqui... Perdi algo?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rvalyi inclui o IF para permitir rodar os testes do módulo delivery sem erros mesmo com o l10n_br_sale_stock e l10n_br_delivery instalados

$ odoo -d test -u delivery --workers 0 --stop-after-init --test-enable

Sem isso acontece os erros que estão no primeiro comentário, os testes do delivery até onde vi já foram separados dos Dados de Demonstração mas ao rodar os testes a Empresa está com o país "US" e com a "Operação Fiscal de Vendas Padrão" preenchida, eu deixei um TODO

    # O IF permite testar casos Sem OP Fiscal, por exemplo o módulo delivery
    # TODO: Avaliar a necessidade do IF depois da separação entre
    #   os Testes e os Dados de Demonstração

Bom isso permite rodar tanto os testes do delivery quanto toda a cadeia de módulos que herdam o módulo, mas se acharem melhor posso remover esse IF


@api.model
def _default_copy_note(self):
Expand Down Expand Up @@ -100,8 +104,10 @@ def _get_amount_lines(self):
)
def _compute_amounts(self):
"""Compute the total amounts of the SO."""
for order in self:
result = super()._compute_amounts()
for order in self.filtered(lambda ln: ln.fiscal_operation_id):
order._compute_fiscal_amount()
return result

# TODO v16 override _compute_tax_totals ?

Expand Down
4 changes: 2 additions & 2 deletions l10n_br_sale/models/sale_order_line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class SaleOrderLine(models.Model):

@api.model
def _default_fiscal_operation(self):
return self.env.company.sale_fiscal_operation_id
return self.order_id.fiscal_operation_id

@api.model
def _fiscal_operation_domain(self):
Expand Down Expand Up @@ -180,7 +180,7 @@ def _get_protected_fields(self):
def _compute_amount(self):
"""Compute the amounts of the SO line."""
result = super()._compute_amount()
for line in self:
for line in self.filtered(lambda ln: ln.fiscal_operation_id):
# Update taxes fields
line._update_fiscal_taxes()
# Call mixin compute method
Expand Down