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

Merge PR #400 into 12.0

Browse Source 
Signed-off-by sbejaoui
This commit is contained in:
OCA-git-bot
2019-10-24 12:02:22 +00:00
parent 0968d9516c a7da17b219
commit dff239fdac
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contract_sale_invoicing/models/contract.py
View File

@@ -19,7 +19,7 @@ class ContractContract(models.Model):
if not self.invoicing_sales: if not self.invoicing_sales:
return invoices return invoices
sales = self.env['sale.order'].search([ sales = self.env['sale.order'].search([
('analytic_account_id', '=', self.analytic_account_id.id), ('analytic_account_id', '=', self.group_id.id),
('partner_invoice_id', 'child_of', ('partner_invoice_id', 'child_of',
self.partner_id.commercial_partner_id.ids), self.partner_id.commercial_partner_id.ids),
('invoice_status', '=', 'to invoice'), ('invoice_status', '=', 'to invoice'),

4
contract_sale_invoicing/tests/test_contract_sale_invoicing.py
View File

@@ -8,7 +8,7 @@ class TestContractSaleInvoicing(TestContractBase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
super(TestContractSaleInvoicing, cls).setUpClass() super(TestContractSaleInvoicing, cls).setUpClass()
cls.contract.analytic_account_id = \ cls.contract.group_id = \
cls.env['account.analytic.account'].search([], limit=1) cls.env['account.analytic.account'].search([], limit=1)
cls.product_so = cls.env.ref( cls.product_so = cls.env.ref(
'product.product_product_1') 'product.product_product_1')
@@ -23,7 +23,7 @@ class TestContractSaleInvoicing(TestContractBase):
'product_uom': cls.product_so.uom_id.id, 'product_uom': cls.product_so.uom_id.id,
'price_unit': cls.product_so.list_price})], 'price_unit': cls.product_so.list_price})],
'pricelist_id': cls.partner.property_product_pricelist.id, 'pricelist_id': cls.partner.property_product_pricelist.id,
'analytic_account_id': cls.contract.analytic_account_id.id, 'analytic_account_id': cls.contract.group_id.id,
'date_order': '2016-02-15', 'date_order': '2016-02-15',
}) })