Fix milestone duplication

This commit is contained in:
Guillem Barba 2015-06-01 14:17:09 +02:00
parent aeb772b2dd
commit ae2cdd2b20
2 changed files with 9 additions and 4 deletions

View File

@ -76,10 +76,10 @@ class Sale:
sales_by_milestone_group = {}
for sale in sales:
group = None
if sale.milestone_group_type:
group = sale.milestone_group_type.compute_milestone_group(sale)
elif sale.milestone_group:
if sale.milestone_group:
group = sale.milestone_group
elif sale.milestone_group_type:
group = sale.milestone_group_type.compute_milestone_group(sale)
if group:
milestones_to_confirm += [m for m in group.milestones
if m.state == 'draft']

View File

@ -276,6 +276,8 @@ Create a Sale with lines with service products and goods products::
0
>>> group = sale.milestone_group
>>> group.reload()
>>> len(group.milestones)
2
>>> remainder_milestone, = [x for x in group.milestones
... if x.invoice_method == 'remainder']
>>> fixed_milestone, = [x for x in group.milestones
@ -304,7 +306,10 @@ Make shipments::
Check remainder_milestone Milestone::
>>> group.reload()
>>> len(group.milestones)
2
>>> remainder_milestone.reload()
>>> invoice = remainder_milestone.invoice
>>> invoice.untaxed_amount
Decimal('180.00')
Decimal('280.00')