audrius/contract
1
0
Fork 1
mirror of https://github.com/OCA/contract.git synced 2025-02-13 17:57:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

[14.0][FIX] Travis

Browse Source
This commit is contained in:
Freni-OSI
2021-04-07 16:41:41 +05:30
committed by Jesús Feliciano Valdez Cruz [Vauxoo]
parent 599773c924
commit 781328f29b
11 changed files with 232 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
contract_sale_generation/models/contract_line.py
View File

@@ -5,7 +5,7 @@ from odoo import api, models
class ContractLine(models.Model):
_inherit = 'contract.line'
_inherit = "contract.line"
@api.multi
def _prepare_sale_line(self, order_id=False, sale_values=False):
@@ -14,22 +14,30 @@ class ContractLine(models.Model):
self.last_date_invoiced, self.recurring_next_date
)
sale_line_vals = {
'product_id': self.product_id.id,
'product_uom_qty': self._get_quantity_to_invoice(*dates),
'uom_id': self.uom_id.id,
'discount': self.discount,
'contract_line_id': self.id,
'display_type': self.display_type,
"product_id": self.product_id.id,
"product_uom_qty": self._get_quantity_to_invoice(*dates),
"uom_id": self.uom_id.id,
"discount": self.discount,
"contract_line_id": self.id,
"display_type": self.display_type,
}
if order_id:
sale_line_vals['order_id'] = order_id.id
order_line = self.env['sale.order.line'].with_context(
force_company=self.contract_id.company_id.id,
).new(sale_line_vals)
if sale_values and not order_id:
sale = self.env['sale.order'].with_context(
sale_line_vals["order_id"] = order_id.id
order_line = (
self.env["sale.order.line"]
.with_context(
force_company=self.contract_id.company_id.id,
).new(sale_values)
)
.new(sale_line_vals)
)
if sale_values and not order_id:
sale = (
self.env["sale.order"]
.with_context(
force_company=self.contract_id.company_id.id,
)
.new(sale_values)
)
order_line.order_id = sale
# Get other order line values from product onchange
order_line.product_id_change()
@@ -38,10 +46,10 @@ class ContractLine(models.Model):
name = self._insert_markers(dates[0], dates[1])
sale_line_vals.update(
{
'sequence': self.sequence,
'name': name,
'analytic_tag_ids': [(6, 0, self.analytic_tag_ids.ids)],
'price_unit': self.price_unit,
"sequence": self.sequence,
"name": name,
"analytic_tag_ids": [(6, 0, self.analytic_tag_ids.ids)],
"price_unit": self.price_unit,
}
)
return sale_line_vals