Compare commits
2 Commits
75253a209a
...
ab0b471753
Author | SHA1 | Date |
---|---|---|
wilsongomez | ab0b471753 | |
wilsongomez | 98ac5dd961 |
|
@ -266,15 +266,20 @@ def create_app(dbname):
|
|||
prices2product = {p['template']: p['list_price'] for p in prices}
|
||||
|
||||
for val in values:
|
||||
if val.components_used:
|
||||
list_price = sum(k.product.list_price for k in val.components_used)
|
||||
sale_price_w_tax = sum(k.product.sale_price_w_tax for k in val.components_used)
|
||||
else:
|
||||
list_price = float(round(prices2product[template.id], 2))
|
||||
sale_price_w_tax = float(round(template.sale_price_w_tax, 2))
|
||||
template = val.template
|
||||
product = {
|
||||
'id': val.id,
|
||||
'name': template.name,
|
||||
'code': val.code,
|
||||
'quantity': val.quantity,
|
||||
'sale_price': float(round(prices2product[template.id], 2)),
|
||||
# 'sale_price_w_tax': float(round(prices2product[template.id], 2)),
|
||||
'sale_price_w_tax': float(round(template.sale_price_w_tax, 2)),
|
||||
'sale_price': list_price,
|
||||
'sale_price_w_tax': sale_price_w_tax,
|
||||
'attributes': val.attributes,
|
||||
}
|
||||
cat = val.template.categories[0]
|
||||
|
@ -338,13 +343,19 @@ def create_app(dbname):
|
|||
)
|
||||
prices2product = {p['template']: p['list_price'] for p in prices}
|
||||
for val in values:
|
||||
if val.components_used:
|
||||
list_price = sum(k.product.list_price for k in val.components_used)
|
||||
sale_price_w_tax = sum(k.product.sale_price_w_tax for k in val.components_used)
|
||||
else:
|
||||
list_price = float(prices2product[val.template.id])
|
||||
sale_price_w_tax = float(val.template.sale_price_w_tax)
|
||||
add_products({
|
||||
'id': val.id,
|
||||
'name': val.template.name,
|
||||
'code': val.code,
|
||||
'quantity': val.quantity,
|
||||
'sale_price': float(prices2product[val.template.id]),
|
||||
'sale_price_w_tax': float(val.template.sale_price_w_tax),
|
||||
'sale_price': list_price,
|
||||
'sale_price_w_tax': sale_price_w_tax,
|
||||
'categories': [c.id for c in val.template.categories],
|
||||
})
|
||||
return products
|
||||
|
@ -382,12 +393,18 @@ def create_app(dbname):
|
|||
)
|
||||
prices2product = {p['template']: p['list_price'] for p in prices}
|
||||
for val in values:
|
||||
if val.components_used:
|
||||
list_price = sum(k.product.list_price for k in val.components_used)
|
||||
sale_price_w_tax = sum(k.product.sale_price_w_tax for k in val.components_used)
|
||||
else:
|
||||
list_price = float(prices2product[val['template.']['id']])
|
||||
sale_price_w_tax = float(val['template.']['sale_price_w_tax'])
|
||||
products.append({
|
||||
'id': val['id'],
|
||||
'name': val['template.']['name'],
|
||||
'code': val['code'],
|
||||
'sale_price': float(prices2product[val['template.']['id']]),
|
||||
'sale_price_w_tax': float(val['template.']['sale_price_w_tax']),
|
||||
'sale_price': list_price,
|
||||
'sale_price_w_tax': sale_price_w_tax,
|
||||
'categories': val['template.']['categories'],
|
||||
})
|
||||
return products
|
||||
|
|
Loading…
Reference in New Issue