[IMP] commission_simple: allow use of lambda in inherit of commission result lines
This commit is contained in:
committed by
Florian da Costa
parent
1060dd60f6
commit
c530ea0e9a
@@ -75,3 +75,7 @@ class CommissionResult(models.Model):
|
|||||||
'salesman_period_company_unique',
|
'salesman_period_company_unique',
|
||||||
'unique(company_id, partner_id, date_range_id)',
|
'unique(company_id, partner_id, date_range_id)',
|
||||||
'A commission result already exists for this salesman/agent for the same period.')]
|
'A commission result already exists for this salesman/agent for the same period.')]
|
||||||
|
|
||||||
|
def _prepare_xlsx_lines(self):
|
||||||
|
self.ensure_one()
|
||||||
|
return self.line_ids.sorted(key=lambda x: x.move_id.invoice_date)
|
||||||
|
|||||||
@@ -53,14 +53,11 @@ class CommissionResultXlsx(models.AbstractModel):
|
|||||||
sheet.write(i, col_vals['pos'], col_vals['label'], styles['col_title'])
|
sheet.write(i, col_vals['pos'], col_vals['label'], styles['col_title'])
|
||||||
sheet.set_column(col_vals['pos'], col_vals['pos'], col_vals['width'])
|
sheet.set_column(col_vals['pos'], col_vals['pos'], col_vals['width'])
|
||||||
# table content
|
# table content
|
||||||
for line in result.line_ids.sorted(key=self._prepare_sort_field()):
|
for line in result._prepare_xlsx_lines():
|
||||||
i += 1
|
i += 1
|
||||||
for col_key, value in line._prepare_commission_xlsx().items():
|
for col_key, value in line._prepare_commission_xlsx().items():
|
||||||
sheet.write(i, coldict[col_key]["pos"], value, styles[coldict[col_key]["style"]])
|
sheet.write(i, coldict[col_key]["pos"], value, styles[coldict[col_key]["style"]])
|
||||||
|
|
||||||
def _prepare_sort_field(self):
|
|
||||||
return "date"
|
|
||||||
|
|
||||||
def _prepare_xlsx_cols(self):
|
def _prepare_xlsx_cols(self):
|
||||||
cols = [ # key, label, width, style_suffix
|
cols = [ # key, label, width, style_suffix
|
||||||
("inv.name", _("Invoice"), 14, False),
|
("inv.name", _("Invoice"), 14, False),
|
||||||
|
|||||||
Reference in New Issue
Block a user