x
/
distil
Code Issues Proposed changes

Merge "Return invoice status"

This commit is contained in:
Jenkins 2017-08-21 02:41:11 +00:00 committed by Gerrit Code Review
parent 6d990b6ca6 c769c1ced8
commit 2ac63f70c1
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
distil/erp/drivers/odoo.py
View File

@ -299,12 +299,13 @@ class OdooDriver(driver.BaseDriver):
'account.invoice',
'read',
ids,
['date_invoice', 'amount_total']
['date_invoice', 'amount_total', 'state']
)
for v in invoices:
result[v['date_invoice']] = {
'total_cost': round(
v['amount_total'], constants.PRICE_DIGITS)
v['amount_total'], constants.PRICE_DIGITS),
'status': v.get('state')
}
if detailed:

18
distil/tests/unit/erp/drivers/test_odoo.py
View File

@ -91,16 +91,18 @@ class TestOdooDriver(base.DistilTestCase):
odoodriver = odoo.OdooDriver(self.conf)
odoodriver.invoice.search.return_value = ['1', '2']
odoodriver.odoo.execute.return_value = [
{'date_invoice': '2017-03-31', 'amount_total': 10},
{'date_invoice': '2017-04-30', 'amount_total': 20}
{'date_invoice': '2017-03-31', 'amount_total': 10,
'state': 'paid'},
{'date_invoice': '2017-04-30', 'amount_total': 20,
'state': 'open'},
]
invoices = odoodriver.get_invoices(start, end, fake_project)
self.assertEqual(
{
'2017-03-31': {'total_cost': 10},
'2017-04-30': {'total_cost': 20}
'2017-03-31': {'total_cost': 10, 'status': 'paid'},
'2017-04-30': {'total_cost': 20, 'status': 'open'}
},
invoices
)
@ -153,8 +155,10 @@ class TestOdooDriver(base.DistilTestCase):
]
]
odoodriver.odoo.execute.return_value = [
{'id': 1, 'date_invoice': '2017-03-31', 'amount_total': 0.371},
{'id': 2, 'date_invoice': '2017-04-30', 'amount_total': 0.859}
{'id': 1, 'date_invoice': '2017-03-31', 'amount_total': 0.371,
'state': 'paid'},
{'id': 2, 'date_invoice': '2017-04-30', 'amount_total': 0.859,
'state': 'open'}
]
odoodriver.product_category_mapping = {
1: 'Compute'
@ -170,6 +174,7 @@ class TestOdooDriver(base.DistilTestCase):
{
'2017-03-31': {
'total_cost': 0.37,
'status': 'paid',
'details': {
'Compute': {
'total_cost': 0.37,
@ -196,6 +201,7 @@ class TestOdooDriver(base.DistilTestCase):
},
'2017-04-30': {
'total_cost': 0.86,
'status': 'open',
'details': {
'Compute': {
'total_cost': 0.86,