YOUR
LOGO
HERE
diff --git a/orchestra/apps/orders/actions.py b/orchestra/apps/orders/actions.py
index cc41174c..b4a053f1 100644
--- a/orchestra/apps/orders/actions.py
+++ b/orchestra/apps/orders/actions.py
@@ -37,9 +37,13 @@ class BillSelectedOrders(object):
self.options = dict(
billing_point=form.cleaned_data['billing_point'],
fixed_point=form.cleaned_data['fixed_point'],
+ is_proforma=form.cleaned_data['is_proforma'],
create_new_open=form.cleaned_data['create_new_open'],
)
- return self.select_related(request)
+ if int(request.POST.get('step')) != 3:
+ return self.select_related(request)
+ else:
+ return self.confirmation(request)
self.context.update({
'title': _("Options for billing selected orders, step 1 / 3"),
'step': 1,
@@ -55,7 +59,7 @@ class BillSelectedOrders(object):
form = BillSelectRelatedForm(request.POST, initial=self.options)
if form.is_valid():
select_related = form.cleaned_data['selected_related']
- self.options['selected_related'] = select_related
+ self.queryset = self.queryset | select_related
return self.confirmation(request)
self.context.update({
'title': _("Select related order for billing, step 2 / 3"),
@@ -89,6 +93,5 @@ class BillSelectedOrders(object):
'step': 3,
'form': form,
'bills': bills,
- 'selected_related_objects': self.options['selected_related']
})
return render(request, self.template, self.context)
diff --git a/orchestra/apps/orders/billing.py b/orchestra/apps/orders/billing.py
index d0f09b72..f9a5c4a0 100644
--- a/orchestra/apps/orders/billing.py
+++ b/orchestra/apps/orders/billing.py
@@ -2,42 +2,44 @@ import datetime
from django.utils.translation import ugettext_lazy as _
-from orchestra.apps.bills.models import Invoice, Fee, BillLine, BillSubline
+from orchestra.apps.bills.models import Invoice, Fee, ProForma, BillLine, BillSubline
class BillsBackend(object):
- def create_bills(self, account, lines):
- invoice = None
+ def create_bills(self, account, lines, **options):
+ bill = None
bills = []
+ create_new = options.get('create_new_open', False)
+ is_proforma = options.get('is_proforma', False)
for line in lines:
service = line.order.service
- if service.is_fee:
- fee, __ = Fee.objects.get_or_create(account=account, status=Fee.OPEN)
- storedline = fee.lines.create(
- rate=service.nominal_price,
- amount=line.size,
- total=line.subtotal, tax=0,
- description=self.format_period(line.ini, line.end),
- )
- self.create_sublines(storedline, line.discounts)
- bills.append(fee)
- else:
- if invoice is None:
- invoice, __ = Invoice.objects.get_or_create(account=account,
- status=Invoice.OPEN)
- bills.append(invoice)
- description = line.order.description
- if service.billing_period != service.NEVER:
- description += " %s" % self.format_period(line.ini, line.end)
- storedline = invoice.lines.create(
- description=description,
+ # Create bill if needed
+ if bill is None or service.is_fee:
+ if is_proforma:
+ if create_new:
+ bill = ProForma.objects.create(account=account)
+ else:
+ bill, __ = ProForma.objects.get_or_create(account=account,
+ status=ProForma.OPEN)
+ elif service.is_fee:
+ bill = Fee.objects.create(account=account)
+ else:
+ if create_new:
+ bill = Invoice.objects.create(account=account)
+ else:
+ bill, __ = Invoice.objects.get_or_create(account=account,
+ status=Invoice.OPEN)
+ bills.append(bill)
+ # Create bill line
+ billine = bill.lines.create(
rate=service.nominal_price,
amount=line.size,
- # TODO rename line.total > subtotal
total=line.subtotal,
tax=service.tax,
- )
- self.create_sublines(storedline, line.discounts)
+ description=self.get_line_description(line),
+ )
+ self.create_sublines(billine, line.discounts)
+ print bills
return bills
def format_period(self, ini, end):
@@ -47,6 +49,15 @@ class BillsBackend(object):
return ini
return _("{ini} to {end}").format(ini=ini, end=end)
+ def get_line_description(self, line):
+ service = line.order.service
+ if service.is_fee:
+ return self.format_period(line.ini, line.end)
+ else:
+ description = line.order.description
+ if service.billing_period != service.NEVER:
+ description += " %s" % self.format_period(line.ini, line.end)
+ return description
def create_sublines(self, line, discounts):
for discount in discounts:
diff --git a/orchestra/apps/orders/forms.py b/orchestra/apps/orders/forms.py
index f4fd970e..69fe43bf 100644
--- a/orchestra/apps/orders/forms.py
+++ b/orchestra/apps/orders/forms.py
@@ -18,11 +18,15 @@ class BillSelectedOptionsForm(AdminFormMixin, forms.Form):
label=_("fixed point"),
help_text=_("Deisgnates whether you want the billing point to be an "
"exact date, or adapt it to the billing period."))
+ is_proforma = forms.BooleanField(initial=False, required=False,
+ label=_("Pro-forma, billing simulation"),
+ help_text=_("O."))
create_new_open = forms.BooleanField(initial=False, required=False,
label=_("Create a new open bill"),
help_text=_("Deisgnates whether you want to put this orders on a new "
"open bill, or allow to reuse an existing one."))
+
def selected_related_choices(queryset):
for order in queryset:
verbose = '
{description} '
@@ -40,6 +44,7 @@ class BillSelectRelatedForm(AdminFormMixin, forms.Form):
required=False)
billing_point = forms.DateField(widget=forms.HiddenInput())
fixed_point = forms.BooleanField(widget=forms.HiddenInput(), required=False)
+ is_proforma = forms.BooleanField(widget=forms.HiddenInput(), required=False)
create_new_open = forms.BooleanField(widget=forms.HiddenInput(), required=False)
def __init__(self, *args, **kwargs):
@@ -51,8 +56,7 @@ class BillSelectRelatedForm(AdminFormMixin, forms.Form):
class BillSelectConfirmationForm(AdminFormMixin, forms.Form):
-# selected_related = forms.ModelMultipleChoiceField(queryset=Order.objects.none(),
-# widget=forms.HiddenInput(), required=False)
billing_point = forms.DateField(widget=forms.HiddenInput())
fixed_point = forms.BooleanField(widget=forms.HiddenInput(), required=False)
+ is_proforma = forms.BooleanField(widget=forms.HiddenInput(), required=False)
create_new_open = forms.BooleanField(widget=forms.HiddenInput(), required=False)
diff --git a/orchestra/apps/orders/models.py b/orchestra/apps/orders/models.py
index 6461b036..1525bb1c 100644
--- a/orchestra/apps/orders/models.py
+++ b/orchestra/apps/orders/models.py
@@ -316,7 +316,7 @@ class OrderQuerySet(models.QuerySet):
lines = service.handler.generate_bill_lines(orders, **options)
bill_lines.extend(lines)
if commit:
- bills += bill_backend.create_bills(account, bill_lines)
+ bills += bill_backend.create_bills(account, bill_lines, **options)
else:
bills += [(account, bill_lines)]
return bills
diff --git a/orchestra/apps/orders/templates/admin/orders/order/bill_selected_options.html b/orchestra/apps/orders/templates/admin/orders/order/bill_selected_options.html
index 022f3fc4..0fe70639 100644
--- a/orchestra/apps/orders/templates/admin/orders/order/bill_selected_options.html
+++ b/orchestra/apps/orders/templates/admin/orders/order/bill_selected_options.html
@@ -60,13 +60,11 @@