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: Date can't be comparated with bool

pull/1058/head
CarlosRoca13 2022-11-22 15:47:05 +01:00 committed by Carlos Roca
parent ed5f6d3239
commit e229ebc5d0
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
account_sale_stock_report_non_billed/models/stock_move.py
View File

@ -108,29 +108,30 @@ 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("date_check_invoiced_moves") @api.depends_context("non_billed_date")
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("date_check_invoiced_moves"): if not self.env.context.get("non_billed_date") or not self.env.context.get(
"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.get("date_check_invoiced_moves_start", False) date_start = self.env.context["non_billed_date_start"]
date_end = self.env.context.get("date_check_invoiced_moves", False) date_end = self.env.context["non_billed_date"]
if date_start:
date_start = fields.Date.from_string(date_start)
if date_end:
date_end = fields.Date.from_string(date_start)
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.date_done >= date_start and m.date_done <= date_end
) )
invoice_date_start = False
if self.env.context.get("non_billed_invoice_date_start", False):
invoice_date_start = self.env.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,
date_start=date_start, date_start=invoice_date_start,
) )
) )
qty_to_invoice = ( qty_to_invoice = (

8
account_sale_stock_report_non_billed/wizard/account_sale_stock_report_non_billed_wiz.py
View File

@ -118,11 +118,15 @@ class AccountSaleStockReportNonBilledWiz(models.TransientModel):
search_view_id = self.env.ref( search_view_id = self.env.ref(
"account_sale_stock_report_non_billed.view_move_search" "account_sale_stock_report_non_billed.view_move_search"
).id ).id
context = dict(self.env.context, date_check_invoiced_moves=self.date_check) context = dict(
self.env.context,
non_billed_date=self.date_check,
non_billed_date_start=self.stock_move_non_billed_threshold,
)
if self.interval_restrict_invoices: if self.interval_restrict_invoices:
context = dict( context = dict(
context, context,
date_check_invoiced_moves_start=self.stock_move_non_billed_threshold, non_billed_invoice_date_start=self.stock_move_non_billed_threshold,
) )
action = { action = {
"type": "ir.actions.act_window", "type": "ir.actions.act_window",