Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[FIX] account_sale_stock_report_non_billed: Extra exception conditions 

- Not all the linked move lines may be in state done, so date_done may
  have False value.
- Dates passed by context may be converted to string by the web client,
  so we make a defensive conversion call.

Refinement of #953

TT44980
pull/1067/head
Pedro M. Baeza 2023-09-08 15:21:08 +02:00
parent 4f3d2ba6ed
commit de311bb3e1
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
account_sale_stock_report_non_billed/models/stock_move.py
View File

@ -108,26 +108,33 @@ class StockMove(models.Model):
) * self.sale_line_id.price_reduce ) * self.sale_line_id.price_reduce
@api.depends("sale_line_id") @api.depends("sale_line_id")
@api.depends_context("non_billed_date") @api.depends_context(
"non_billed_date", "non_billed_date_start", "non_billed_invoice_date_start"
)
def _compute_not_invoiced_values(self): def _compute_not_invoiced_values(self):
for move in self: for move in self:
if not self.env.context.get("non_billed_date") or not self.env.context.get( context = self.env.context
if not context.get("non_billed_date") or not context.get(
"non_billed_date_start" "non_billed_date_start"
): ):
move.quantity_not_invoiced = 0 move.quantity_not_invoiced = 0
move.price_not_invoiced = 0 move.price_not_invoiced = 0
continue continue
date_start = self.env.context["non_billed_date_start"] date_start = fields.Date.from_string(context["non_billed_date_start"])
date_end = self.env.context["non_billed_date"] date_end = fields.Date.from_string(context["non_billed_date"])
invoices_not_cancel = move.invoice_line_ids.filtered( invoices_not_cancel = move.invoice_line_ids.filtered(
lambda l: l.move_id.state != "cancel" lambda l: l.move_id.state != "cancel"
) )
moves_in_date = invoices_not_cancel.mapped("move_line_ids").filtered( moves_in_date = invoices_not_cancel.mapped("move_line_ids").filtered(
lambda m: m.date_done >= date_start and m.date_done <= date_end lambda m: m.state == "done"
and m.date_done >= date_start
and m.date_done <= date_end
) )
invoice_date_start = False invoice_date_start = False
if self.env.context.get("non_billed_invoice_date_start", False): if context.get("non_billed_invoice_date_start"):
invoice_date_start = self.env.context["non_billed_invoice_date_start"] invoice_date_start = fields.Date.from_string(
context["non_billed_invoice_date_start"]
)
inv_lines = moves_in_date.mapped("invoice_line_ids").filtered( inv_lines = moves_in_date.mapped("invoice_line_ids").filtered(
lambda l: l.check_invoice_line_in_date( lambda l: l.check_invoice_line_in_date(
date_end, date_end,