From aa577ed82e82439074e623510cb243f84dc112f4 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 25 Apr 2012 18:25:13 +0530 Subject: [PATCH] serial no fixes: sle creation through import data --- erpnext/patches/april_2012/serial_no_fixes.py | 6 + erpnext/patches/patch_list.py | 5 + erpnext/stock/doctype/serial_no/serial_no.py | 19 +- erpnext/stock/doctype/serial_no/serial_no.txt | 728 ++++++++++-------- .../doctype/stock_ledger/stock_ledger.py | 1 + 5 files changed, 414 insertions(+), 345 deletions(-) create mode 100644 erpnext/patches/april_2012/serial_no_fixes.py diff --git a/erpnext/patches/april_2012/serial_no_fixes.py b/erpnext/patches/april_2012/serial_no_fixes.py new file mode 100644 index 0000000000..b4fcf759bd --- /dev/null +++ b/erpnext/patches/april_2012/serial_no_fixes.py @@ -0,0 +1,6 @@ +def execute(): + import webnotes + from webnotes.modules.module_manager import reload_doc + reload_doc('stock', 'doctype', 'serial_no') + + webnotes.conn.sql("update `tabSerial No` set sle_exists = 1") diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py index 987f0048f1..65448859d2 100644 --- a/erpnext/patches/patch_list.py +++ b/erpnext/patches/patch_list.py @@ -247,5 +247,10 @@ patch_list = [ 'patch_file': 'update_appraisal_permission', 'description': 'updated permission in appraisal' }, + { + 'patch_module': 'patches.april_2012', + 'patch_file': 'serial_no_fixes', + 'description': 'fixes for sle creation while import' + }, ] diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py index 2384171f6a..88f1bf21a6 100644 --- a/erpnext/stock/doctype/serial_no/serial_no.py +++ b/erpnext/stock/doctype/serial_no/serial_no.py @@ -71,10 +71,13 @@ class DocType(TransactionBase): self.validate_warehouse() self.validate_item() + def on_update(self): + if self.doc.warehouse and self.doc.status == 'In Store' and cint(self.doc.sle_exists) == 0 and \ + not sql("select name from `tabStock Ledger Entry` where serial_no = %s and ifnull(is_cancelled, 'No') = 'No'", self.doc.name): + self.make_stock_ledger_entry(1) + webnotes.conn.set(self.doc, 'sle_exists', 1) + - # ------------------------ - # make stock ledger entry - # ------------------------ def make_stock_ledger_entry(self, qty): from webnotes.model.code import get_obj values = [{ @@ -91,21 +94,13 @@ class DocType(TransactionBase): 'incoming_rate' : self.doc.purchase_rate, 'company' : self.doc.company, 'fiscal_year' : self.doc.fiscal_year, - 'is_cancelled' : 'No', # is_cancelled is always 'No' because while deleted it can not find creation entry if it not created directly, voucher no != serial no. + 'is_cancelled' : 'No', # is_cancelled is always 'No' because while deleted it can not find creation entry if it not created directly, voucher no != serial no 'batch_no' : '', 'serial_no' : self.doc.name }] get_obj('Stock Ledger', 'Stock Ledger').update_stock(values) - # ---------- - # on update - # ---------- - def on_update(self): - if self.doc.localname and self.doc.warehouse and self.doc.status == 'In Store' and not sql("select name from `tabStock Ledger Entry` where serial_no = '%s' and ifnull(is_cancelled, 'No') = 'No'" % (self.doc.name)): - self.make_stock_ledger_entry(1) - - # --------- # on trash # --------- diff --git a/erpnext/stock/doctype/serial_no/serial_no.txt b/erpnext/stock/doctype/serial_no/serial_no.txt index df42c7f1aa..4f2f265bfa 100644 --- a/erpnext/stock/doctype/serial_no/serial_no.txt +++ b/erpnext/stock/doctype/serial_no/serial_no.txt @@ -3,113 +3,65 @@ # These values are common in all dictionaries { - 'creation': '2010-08-08 17:09:23', + 'creation': '2009-07-06 12:41:38', 'docstatus': 0, - 'modified': '2012-01-31 15:53:38', - 'modified_by': 'Administrator', - 'owner': 'Administrator' + 'modified': '2012-04-25 18:17:26', + 'modified_by': u'Administrator', + 'owner': u'Administrator' }, # These values are common for all DocType { - '_last_update': '1325570647', + '_last_update': u'1335356535', 'allow_trash': 1, - 'autoname': 'field:serial_no', - 'colour': 'White:FFF', - 'default_print_format': 'Standard', + 'autoname': u'field:serial_no', + 'colour': u'White:FFF', + 'default_print_format': u'Standard', 'doctype': 'DocType', - 'document_type': 'Master', - 'module': 'Stock', + 'document_type': u'Master', + 'module': u'Stock', 'name': '__common__', - 'search_fields': 'item_code,status', - 'section_style': 'Tabbed', - 'server_code_error': ' ', + 'search_fields': u'item_code,status', + 'section_style': u'Tabbed', + 'server_code_error': u' ', 'show_in_menu': 0, - 'subject': 'Item Code: %(item_code)s, Warehouse: %(warehouse)s', - 'tag_fields': 'status', - 'version': 191 + 'subject': u'Item Code: %(item_code)s, Warehouse: %(warehouse)s', + 'tag_fields': u'status', + 'version': 193 }, # These values are common for all DocField { - 'doctype': 'DocField', + 'doctype': u'DocField', 'name': '__common__', - 'parent': 'Serial No', - 'parentfield': 'fields', - 'parenttype': 'DocType' + 'parent': u'Serial No', + 'parentfield': u'fields', + 'parenttype': u'DocType' }, # These values are common for all DocPerm { - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'name': '__common__', - 'parent': 'Serial No', - 'parentfield': 'permissions', - 'parenttype': 'DocType', + 'parent': u'Serial No', + 'parentfield': u'permissions', + 'parenttype': u'DocType', 'read': 1 }, # DocType, Serial No { 'doctype': 'DocType', - 'name': 'Serial No' - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': 'DocPerm', - 'permlevel': 1, - 'role': 'Material Manager', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': 'DocPerm', - 'permlevel': 0, - 'role': 'Material Manager', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': 'DocPerm', - 'permlevel': 1, - 'role': 'Material User', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': 'DocPerm', - 'permlevel': 0, - 'role': 'Material User', - 'submit': 0, - 'write': 0 + 'name': u'Serial No' }, # DocPerm { 'cancel': 1, 'create': 1, - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 0, - 'role': 'System Manager', + 'role': u'System Manager', 'write': 1 }, @@ -117,212 +69,275 @@ { 'cancel': 1, 'create': 1, - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 0, - 'role': 'Material Master Manager', + 'role': u'Material Master Manager', 'write': 1 }, # DocPerm { - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 1, - 'role': 'System Manager' + 'role': u'System Manager' }, # DocPerm { - 'doctype': 'DocPerm', + 'doctype': u'DocPerm', 'permlevel': 1, - 'role': 'Sales Master Manager' + 'role': u'Sales Master Manager' + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Material Manager', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Material Manager', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 1, + 'role': u'Material User', + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': u'DocPerm', + 'permlevel': 0, + 'role': u'Material User', + 'submit': 0, + 'write': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'label': 'Details', - 'oldfieldtype': 'Section Break', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Details', + 'oldfieldtype': u'Section Break', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', 'permlevel': 0 }, # DocField { - 'default': 'In Store', - 'doctype': 'DocField', - 'fieldname': 'status', - 'fieldtype': 'Select', + 'default': u'In Store', + 'doctype': u'DocField', + 'fieldname': u'status', + 'fieldtype': u'Select', + 'hidden': 0, 'in_filter': 1, - 'label': 'Status', + 'label': u'Status', 'no_copy': 1, - 'oldfieldname': 'status', - 'oldfieldtype': 'Select', - 'options': '\nIn Store\nDelivered\nNot in Use\nPurchase Returned', + 'oldfieldname': u'status', + 'oldfieldtype': u'Select', + 'options': u'\nIn Store\nDelivered\nNot in Use\nPurchase Returned', 'permlevel': 1, + 'print_hide': 0, 'reqd': 1, 'search_index': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'serial_no', - 'fieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'serial_no', + 'fieldtype': u'Data', + 'hidden': 0, 'in_filter': 0, - 'label': 'Serial No', + 'label': u'Serial No', 'no_copy': 1, - 'oldfieldname': 'serial_no', - 'oldfieldtype': 'Data', + 'oldfieldname': u'serial_no', + 'oldfieldtype': u'Data', 'permlevel': 0, + 'print_hide': 0, 'reqd': 1, 'search_index': 1 }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'item_code', - 'fieldtype': 'Link', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'item_code', + 'fieldtype': u'Link', + 'hidden': 0, 'in_filter': 1, - 'label': 'Item Code', - 'oldfieldname': 'item_code', - 'oldfieldtype': 'Link', - 'options': 'Item', + 'label': u'Item Code', + 'oldfieldname': u'item_code', + 'oldfieldtype': u'Link', + 'options': u'Item', 'permlevel': 0, + 'print_hide': 0, 'reqd': 1, 'search_index': 0, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'item_name', - 'fieldtype': 'Data', - 'label': 'Item Name', + 'doctype': u'DocField', + 'fieldname': u'item_name', + 'fieldtype': u'Data', + 'label': u'Item Name', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'description', - 'fieldtype': 'Text', + 'doctype': u'DocField', + 'fieldname': u'description', + 'fieldtype': u'Text', + 'hidden': 0, 'in_filter': 1, - 'label': 'Description', - 'oldfieldname': 'description', - 'oldfieldtype': 'Text', + 'label': u'Description', + 'oldfieldname': u'description', + 'oldfieldtype': u'Text', 'permlevel': 1, + 'print_hide': 0, + 'reqd': 0, 'search_index': 0, - 'width': '300px' + 'width': u'300px' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'item_group', - 'fieldtype': 'Link', + 'doctype': u'DocField', + 'fieldname': u'item_group', + 'fieldtype': u'Link', + 'hidden': 0, 'in_filter': 0, - 'label': 'Item Group', - 'oldfieldname': 'item_group', - 'oldfieldtype': 'Link', - 'options': 'Item Group', + 'label': u'Item Group', + 'oldfieldname': u'item_group', + 'oldfieldtype': u'Link', + 'options': u'Item Group', 'permlevel': 1, + 'print_hide': 0, 'reqd': 1, 'search_index': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'brand', - 'fieldtype': 'Link', + 'doctype': u'DocField', + 'fieldname': u'brand', + 'fieldtype': u'Link', + 'hidden': 0, 'in_filter': 0, - 'label': 'Brand', - 'oldfieldname': 'brand', - 'oldfieldtype': 'Link', - 'options': 'Brand', + 'label': u'Brand', + 'oldfieldname': u'brand', + 'oldfieldtype': u'Link', + 'options': u'Brand', 'permlevel': 1, + 'print_hide': 0, 'reqd': 0, 'search_index': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'label': 'Purchase Details', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Purchase Details', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', 'permlevel': 0, - 'width': '50%' + 'width': u'50%' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'purchase_document_type', - 'fieldtype': 'Select', - 'label': 'Purchase Document Type', + 'doctype': u'DocField', + 'fieldname': u'purchase_document_type', + 'fieldtype': u'Select', + 'label': u'Purchase Document Type', 'no_copy': 1, - 'options': '\nPurchase Receipt\nStock Entry', + 'options': u'\nPurchase Receipt\nStock Entry', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'purchase_document_no', - 'fieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'purchase_document_no', + 'fieldtype': u'Data', 'hidden': 0, - 'label': 'Purchase Document No', + 'label': u'Purchase Document No', 'no_copy': 1, 'permlevel': 0 }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'purchase_date', - 'fieldtype': 'Date', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'purchase_date', + 'fieldtype': u'Date', + 'hidden': 0, 'in_filter': 1, - 'label': 'Purchase Date', + 'label': u'Purchase Date', 'no_copy': 1, - 'oldfieldname': 'purchase_date', - 'oldfieldtype': 'Date', + 'oldfieldname': u'purchase_date', + 'oldfieldtype': u'Date', 'permlevel': 0, + 'print_hide': 0, 'reqd': 0, 'search_index': 0, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'purchase_time', - 'fieldtype': 'Time', - 'label': 'Incoming Time', + 'doctype': u'DocField', + 'fieldname': u'purchase_time', + 'fieldtype': u'Time', + 'label': u'Incoming Time', 'no_copy': 1, 'permlevel': 0, 'reqd': 1 @@ -330,336 +345,367 @@ # DocField { - 'doctype': 'DocField', - 'fieldname': 'purchase_rate', - 'fieldtype': 'Currency', + 'doctype': u'DocField', + 'fieldname': u'purchase_rate', + 'fieldtype': u'Currency', + 'hidden': 0, 'in_filter': 0, - 'label': 'Incoming Rate', + 'label': u'Incoming Rate', 'no_copy': 1, - 'oldfieldname': 'purchase_rate', - 'oldfieldtype': 'Currency', + 'oldfieldname': u'purchase_rate', + 'oldfieldtype': u'Currency', 'permlevel': 0, + 'print_hide': 0, 'reqd': 1, 'search_index': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', 'permlevel': 0, - 'width': '50%' + 'width': u'50%' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'warehouse', - 'fieldtype': 'Link', + 'doctype': u'DocField', + 'fieldname': u'warehouse', + 'fieldtype': u'Link', + 'hidden': 0, 'in_filter': 1, - 'label': 'Warehouse', + 'label': u'Warehouse', 'no_copy': 1, - 'oldfieldname': 'warehouse', - 'oldfieldtype': 'Link', - 'options': 'Warehouse', + 'oldfieldname': u'warehouse', + 'oldfieldtype': u'Link', + 'options': u'Warehouse', 'permlevel': 0, + 'print_hide': 0, 'reqd': 0, 'search_index': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'supplier', - 'fieldtype': 'Link', + 'doctype': u'DocField', + 'fieldname': u'supplier', + 'fieldtype': u'Link', 'in_filter': 1, - 'label': 'Supplier', + 'label': u'Supplier', 'no_copy': 1, - 'options': 'Supplier', + 'options': u'Supplier', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'supplier_name', - 'fieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'supplier_name', + 'fieldtype': u'Data', 'in_filter': 1, - 'label': 'Supplier Name', + 'label': u'Supplier Name', 'no_copy': 1, 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'address_display', - 'fieldtype': 'Text', - 'label': 'Supplier Address', + 'doctype': u'DocField', + 'fieldname': u'address_display', + 'fieldtype': u'Text', + 'label': u'Supplier Address', 'no_copy': 1, 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'label': 'Delivery Details', - 'oldfieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Delivery Details', + 'oldfieldtype': u'Column Break', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', 'permlevel': 0, - 'width': '50%' + 'width': u'50%' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'delivery_document_type', - 'fieldtype': 'Select', + 'doctype': u'DocField', + 'fieldname': u'delivery_document_type', + 'fieldtype': u'Select', 'in_filter': 1, - 'label': 'Delivery Document Type', + 'label': u'Delivery Document Type', 'no_copy': 1, - 'options': '\nDelivery Note\nReceivable Voucher\nStock Entry', + 'options': u'\nDelivery Note\nReceivable Voucher\nStock Entry', 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'delivery_document_no', - 'fieldtype': 'Data', + 'doctype': u'DocField', + 'fieldname': u'delivery_document_no', + 'fieldtype': u'Data', 'in_filter': 1, - 'label': 'Delivery Document No', + 'label': u'Delivery Document No', 'no_copy': 1, 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'customer_address', - 'fieldtype': 'Text', - 'label': 'Customer Address', - 'oldfieldname': 'customer_address', - 'oldfieldtype': 'Text', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'delivery_date', - 'fieldtype': 'Date', - 'label': 'Delivery Date', - 'no_copy': 1, - 'oldfieldname': 'delivery_date', - 'oldfieldtype': 'Date', + 'doctype': u'DocField', + 'fieldname': u'customer_address', + 'fieldtype': u'Text', + 'hidden': 0, + 'label': u'Customer Address', + 'oldfieldname': u'customer_address', + 'oldfieldtype': u'Text', 'permlevel': 1, + 'print_hide': 0, + 'reqd': 0 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'delivery_date', + 'fieldtype': u'Date', + 'hidden': 0, + 'label': u'Delivery Date', + 'no_copy': 1, + 'oldfieldname': u'delivery_date', + 'oldfieldtype': u'Date', + 'permlevel': 1, + 'print_hide': 0, + 'reqd': 0, 'search_index': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'delivery_time', - 'fieldtype': 'Time', - 'label': 'Delivery Time', + 'doctype': u'DocField', + 'fieldname': u'delivery_time', + 'fieldtype': u'Time', + 'label': u'Delivery Time', 'no_copy': 1, 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'is_cancelled', - 'fieldtype': 'Select', + 'doctype': u'DocField', + 'fieldname': u'is_cancelled', + 'fieldtype': u'Select', 'hidden': 1, - 'label': 'Is Cancelled', - 'oldfieldname': 'is_cancelled', - 'oldfieldtype': 'Select', - 'options': '\nYes\nNo', + 'label': u'Is Cancelled', + 'oldfieldname': u'is_cancelled', + 'oldfieldtype': u'Select', + 'options': u'\nYes\nNo', 'permlevel': 0, - 'report_hide': 1 + 'print_hide': 0, + 'report_hide': 1, + 'reqd': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', 'permlevel': 0, - 'width': '50%' + 'width': u'50%' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'customer', - 'fieldtype': 'Link', + 'doctype': u'DocField', + 'fieldname': u'customer', + 'fieldtype': u'Link', + 'hidden': 0, 'in_filter': 1, - 'label': 'Customer', + 'label': u'Customer', 'no_copy': 1, - 'oldfieldname': 'customer', - 'oldfieldtype': 'Link', - 'options': 'Customer', + 'oldfieldname': u'customer', + 'oldfieldtype': u'Link', + 'options': u'Customer', 'permlevel': 1, 'print_hide': 1, + 'reqd': 0, 'search_index': 0, - 'trigger': 'Client' + 'trigger': u'Client' }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'customer_name', - 'fieldtype': 'Data', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'customer_name', + 'fieldtype': u'Data', + 'hidden': 0, 'in_filter': 1, - 'label': 'Customer Name', + 'label': u'Customer Name', 'no_copy': 1, - 'oldfieldname': 'customer_name', - 'oldfieldtype': 'Data', + 'oldfieldname': u'customer_name', + 'oldfieldtype': u'Data', 'permlevel': 1, + 'print_hide': 0, + 'reqd': 0, 'search_index': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'delivery_address', - 'fieldtype': 'Text', - 'label': 'Delivery Address', + 'doctype': u'DocField', + 'fieldname': u'delivery_address', + 'fieldtype': u'Text', + 'label': u'Delivery Address', 'no_copy': 1, 'permlevel': 1 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'territory', - 'fieldtype': 'Link', + 'doctype': u'DocField', + 'fieldname': u'territory', + 'fieldtype': u'Link', + 'hidden': 0, 'in_filter': 1, - 'label': 'Territory', + 'label': u'Territory', 'no_copy': 1, - 'oldfieldname': 'territory', - 'oldfieldtype': 'Link', - 'options': 'Territory', + 'oldfieldname': u'territory', + 'oldfieldtype': u'Link', + 'options': u'Territory', 'permlevel': 1, 'print_hide': 1, - 'report_hide': 0 + 'report_hide': 0, + 'reqd': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'label': 'Warranty / AMC Details', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'Warranty / AMC Details', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', 'permlevel': 0, - 'width': '50%' + 'width': u'50%' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'maintenance_status', - 'fieldtype': 'Select', + 'doctype': u'DocField', + 'fieldname': u'maintenance_status', + 'fieldtype': u'Select', + 'hidden': 0, 'in_filter': 1, - 'label': 'Maintenance Status', + 'label': u'Maintenance Status', 'no_copy': 0, - 'oldfieldname': 'maintenance_status', - 'oldfieldtype': 'Select', - 'options': '\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC', + 'oldfieldname': u'maintenance_status', + 'oldfieldtype': u'Select', + 'options': u'\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC', 'permlevel': 0, + 'print_hide': 0, + 'reqd': 0, 'search_index': 1, - 'width': '150px' + 'width': u'150px' }, # DocField { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'warranty_period', - 'fieldtype': 'Int', - 'label': 'Warranty Period (Days)', - 'oldfieldname': 'warranty_period', - 'oldfieldtype': 'Int', + 'colour': u'White:FFF', + 'doctype': u'DocField', + 'fieldname': u'warranty_period', + 'fieldtype': u'Int', + 'hidden': 0, + 'label': u'Warranty Period (Days)', + 'oldfieldname': u'warranty_period', + 'oldfieldtype': u'Int', 'permlevel': 0, - 'trigger': 'Client', - 'width': '150px' + 'print_hide': 0, + 'reqd': 0, + 'trigger': u'Client', + 'width': u'150px' }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', + 'doctype': u'DocField', + 'fieldtype': u'Column Break', 'permlevel': 0, - 'width': '50%' + 'width': u'50%' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'warranty_expiry_date', - 'fieldtype': 'Date', + 'doctype': u'DocField', + 'fieldname': u'warranty_expiry_date', + 'fieldtype': u'Date', + 'hidden': 0, 'in_filter': 1, - 'label': 'Warranty Expiry Date', - 'oldfieldname': 'warranty_expiry_date', - 'oldfieldtype': 'Date', + 'label': u'Warranty Expiry Date', + 'oldfieldname': u'warranty_expiry_date', + 'oldfieldtype': u'Date', 'permlevel': 0, - 'width': '150px' + 'print_hide': 0, + 'reqd': 0, + 'width': u'150px' }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'amc_expiry_date', - 'fieldtype': 'Date', + 'doctype': u'DocField', + 'fieldname': u'amc_expiry_date', + 'fieldtype': u'Date', + 'hidden': 0, 'in_filter': 1, - 'label': 'AMC Expiry Date', - 'oldfieldname': 'amc_expiry_date', - 'oldfieldtype': 'Date', + 'label': u'AMC Expiry Date', + 'oldfieldname': u'amc_expiry_date', + 'oldfieldtype': u'Date', 'permlevel': 0, + 'print_hide': 0, + 'reqd': 0, 'search_index': 0, - 'width': '150px' + 'width': u'150px' }, # DocField { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'label': 'More Info', + 'doctype': u'DocField', + 'fieldtype': u'Section Break', + 'label': u'More Info', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'serial_no_details', - 'fieldtype': 'Text Editor', - 'label': 'Serial No Details', + 'doctype': u'DocField', + 'fieldname': u'serial_no_details', + 'fieldtype': u'Text Editor', + 'label': u'Serial No Details', 'permlevel': 0 }, # DocField { - 'doctype': 'DocField', - 'fieldname': 'company', - 'fieldtype': 'Select', + 'doctype': u'DocField', + 'fieldname': u'company', + 'fieldtype': u'Select', 'in_filter': 1, - 'label': 'Company', - 'options': 'link:Company', + 'label': u'Company', + 'options': u'link:Company', 'permlevel': 0, 'reqd': 1, 'search_index': 1 @@ -667,12 +713,12 @@ # DocField { - 'doctype': 'DocField', - 'fieldname': 'fiscal_year', - 'fieldtype': 'Select', + 'doctype': u'DocField', + 'fieldname': u'fiscal_year', + 'fieldtype': u'Select', 'in_filter': 1, - 'label': 'Fiscal Year', - 'options': 'link:Fiscal Year', + 'label': u'Fiscal Year', + 'options': u'link:Fiscal Year', 'permlevel': 0, 'reqd': 1, 'search_index': 1 @@ -680,12 +726,28 @@ # DocField { - 'doctype': 'DocField', - 'fieldname': 'trash_reason', - 'fieldtype': 'Small Text', - 'label': 'Trash Reason', - 'oldfieldname': 'trash_reason', - 'oldfieldtype': 'Small Text', - 'permlevel': 1 + 'doctype': u'DocField', + 'fieldname': u'trash_reason', + 'fieldtype': u'Small Text', + 'hidden': 0, + 'label': u'Trash Reason', + 'oldfieldname': u'trash_reason', + 'oldfieldtype': u'Small Text', + 'permlevel': 1, + 'print_hide': 0, + 'reqd': 0 + }, + + # DocField + { + 'doctype': u'DocField', + 'fieldname': u'sle_exists', + 'fieldtype': u'Check', + 'hidden': 1, + 'label': u'sle_exists', + 'no_copy': 1, + 'permlevel': 1, + 'print_hide': 1, + 'report_hide': 1 } ] \ No newline at end of file diff --git a/erpnext/stock/doctype/stock_ledger/stock_ledger.py b/erpnext/stock/doctype/stock_ledger/stock_ledger.py index 35b4f8882e..1d3aabe57f 100644 --- a/erpnext/stock/doctype/stock_ledger/stock_ledger.py +++ b/erpnext/stock/doctype/stock_ledger/stock_ledger.py @@ -128,6 +128,7 @@ class DocType: s.modified = nowdate() s.modified_by = session['user'] s.serial_no = serial_no + s.sle_exists = 1 s.fiscal_year = obj.doc.fiscal_year s.company = obj.doc.company s.save(new_rec)