From 2a0b111726bf47b15daffb2feadcf203bee9f536 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Fri, 17 Jun 2016 15:43:42 +0530 Subject: [PATCH] [fix] mark completed docuemts on document flow --- .../purchase_invoice/purchase_invoice.py | 18 +++++++++--------- .../doctype/sales_invoice/sales_invoice.py | 18 +++++++++--------- .../doctype/purchase_order/purchase_order.py | 12 ++++++------ .../selling/doctype/sales_order/sales_order.py | 15 +++++++++------ .../doctype/delivery_note/delivery_note.py | 13 +++++++------ .../purchase_receipt/purchase_receipt.py | 12 ++++++------ 6 files changed, 46 insertions(+), 42 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index ceba01ee372..8d7f6534d9d 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -35,6 +35,15 @@ class PurchaseInvoice(BuyingController): 'percent_join_field': 'purchase_order', 'overflow_type': 'billing' }] + + self.prev_link_mapper = { + "Purchase Order": { + "fieldname": "purchase_order" + }, + "Purchase Receipt": { + "fieldname": "purchase_receipt" + } + } def validate(self): if not self.is_opening: @@ -665,15 +674,6 @@ class PurchaseInvoice(BuyingController): self.due_date = None def get_link_filters(self, for_doctype): - self.prev_link_mapper = { - "Purchase Order": { - "fieldname": "purchase_order" - }, - "Purchase Receipt": { - "fieldname": "purchase_receipt" - } - } - return super(PurchaseInvoice, self).get_link_filters(for_doctype) @frappe.whitelist() diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 377f9faea41..bbbbccf22f1 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -38,6 +38,15 @@ class SalesInvoice(SellingController): 'keyword': 'Billed', 'overflow_type': 'billing' }] + + self.prev_link_mapper = { + "Sales Order": { + "fieldname": "sales_order" + }, + "Delivery Note": { + "fieldname": "delivery_note" + } + } def set_indicator(self): """Set indicator for portal""" @@ -698,15 +707,6 @@ class SalesInvoice(SellingController): self.due_date = None def get_link_filters(self, for_doctype): - self.prev_link_mapper = { - "Sales Order": { - "fieldname": "sales_order" - }, - "Delivery Note": { - "fieldname": "delivery_note" - } - } - return super(SalesInvoice, self).get_link_filters(for_doctype) def get_list_context(context=None): diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py index 49a44e99056..9c7288c0650 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order.py @@ -32,6 +32,12 @@ class PurchaseOrder(BuyingController): 'percent_join_field': 'prevdoc_docname', 'overflow_type': 'order' }] + + self.prev_link_mapper = { + "Supplier Quotation": { + "fieldname": "supplier_quotation" + } + } def validate(self): super(PurchaseOrder, self).validate() @@ -236,12 +242,6 @@ class PurchaseOrder(BuyingController): item.received_qty = item.qty def get_link_filters(self, for_doctype): - self.prev_link_mapper = { - "Supplier Quotation": { - "fieldname": "supplier_quotation" - } - } - return super(PurchaseOrder, self).get_link_filters(for_doctype) @frappe.whitelist() diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index 63e307db30f..a34c12afa9e 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -21,6 +21,15 @@ form_grid_templates = { class WarehouseRequired(frappe.ValidationError): pass class SalesOrder(SellingController): + def __init__(self, arg1, arg2=None): + super(SalesOrder, self).__init__(arg1, arg2) + + self.prev_link_mapper = { + "Quotation": { + "fieldname": "prevdoc_docname" + } + } + def validate(self): super(SalesOrder, self).validate() @@ -308,12 +317,6 @@ class SalesOrder(SellingController): cint(reference_doc.repeat_on_day_of_month))) def get_link_filters(self, for_doctype): - self.prev_link_mapper = { - "Quotation": { - "fieldname": "prevdoc_docname" - } - } - return super(SalesOrder, self).get_link_filters(for_doctype) def get_list_context(context=None): diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py index be6c7971e50..7d0cdcd1f55 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note.py @@ -60,7 +60,14 @@ class DeliveryNote(SellingController): 'source_field': '-1 * qty', 'extra_cond': """ and exists (select name from `tabDelivery Note` where name=`tabDelivery Note Item`.parent and is_return=1)""" }] + + self.prev_link_mapper = { + "Sales Order": { + "fieldname": "against_sales_order" + } + } + def before_print(self): def toggle_print_hide(meta, fieldname): df = meta.get_field(fieldname) @@ -284,12 +291,6 @@ class DeliveryNote(SellingController): self.load_from_db() def get_link_filters(self, for_doctype): - self.prev_link_mapper = { - "Sales Order": { - "fieldname": "against_sales_order" - } - } - return super(DeliveryNote, self).get_link_filters(for_doctype) def update_billed_amount_based_on_so(so_detail, update_modified=True): diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py index bfcecbde36d..751d3219328 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py @@ -45,6 +45,12 @@ class PurchaseReceipt(BuyingController): # 'overflow_type': 'receipt', 'extra_cond': """ and exists (select name from `tabPurchase Receipt` where name=`tabPurchase Receipt Item`.parent and is_return=1)""" }] + + self.prev_link_mapper = { + "Purchase Order": { + "fieldname": "prevdoc_docname" + } + } def validate(self): super(PurchaseReceipt, self).validate() @@ -334,12 +340,6 @@ class PurchaseReceipt(BuyingController): self.load_from_db() def get_link_filters(self, for_doctype): - self.prev_link_mapper = { - "Purchase Order": { - "fieldname": "prevdoc_docname" - } - } - return super(PurchaseReceipt, self).get_link_filters(for_doctype) def update_billed_amount_based_on_po(po_detail, update_modified=True):