diff options
author | Filipp Lepalaan <filipp@mac.com> | 2015-09-30 02:08:19 +0300 |
---|---|---|
committer | Filipp Lepalaan <filipp@mac.com> | 2015-09-30 02:08:19 +0300 |
commit | 4194e8ee556f3109057fab0afb7894927b52713e (patch) | |
tree | 996cb5de38706b07bb24f519d868b29da54c0b67 /servo/views/purchases.py | |
parent | 03326a06e12de1af575c8e4b2de7e3824f6eaace (diff) | |
download | Servo-4194e8ee556f3109057fab0afb7894927b52713e.tar.gz Servo-4194e8ee556f3109057fab0afb7894927b52713e.tar.bz2 Servo-4194e8ee556f3109057fab0afb7894927b52713e.zip |
Cleanup
Diffstat (limited to 'servo/views/purchases.py')
-rw-r--r-- | servo/views/purchases.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/servo/views/purchases.py b/servo/views/purchases.py index 5a32857..7233ceb 100644 --- a/servo/views/purchases.py +++ b/servo/views/purchases.py @@ -67,8 +67,8 @@ def list_pos(request): orders = paginator.page(paginator.num_pages) data['orders'] = orders - data['form'] = form - data['total'] = all_orders.aggregate(Sum('total')) + data['form'] = form + data['total'] = all_orders.aggregate(Sum('total')) return render(request, "purchases/list_pos.html", data) @@ -92,7 +92,8 @@ def add_to_po(request, pk, product_id): def view_po(request, pk): - po = PurchaseOrder.objects.get(pk=pk) + po = get_object_or_404(PurchaseOrder, pk=pk) + products = po.purchaseorderitem_set.all() title = _('Purchase Order %d' % po.pk) return render(request, "purchases/view_po.html", locals()) @@ -158,7 +159,8 @@ def order_stock(request, po_id): if request.method == "POST": if po.submitted_at: - messages.error(request, _(u'Purchase Order %s has already been submitted') % po.pk) + msg = _(u'Purchase Order %s has already been submitted') % po.pk + messages.error(request, msg) return list_pos(request) act = GsxAccount.default(request.user) @@ -201,12 +203,12 @@ def delete_po(request, po_id): @permission_required('servo.add_purchaseorder') def create_po(request, product_id=None, order_id=None): po = PurchaseOrder(created_by=request.user) - location = request.user.get_location() - po.location = location + po.location = request.user.get_location() po.save() if order_id is not None: po.sales_order_id = order_id + po.save() for i in ServiceOrderItem.objects.filter(order_id=order_id): po.add_product(i, amount=1, user=request.user) |