"):
- homepage = frappe.get_doc('Homepage', 'Homepage')
- homepage.company = erpnext.get_default_company() or frappe.get_all("Company")[0].name
- if '
' in header:
- homepage.tag_line = header.split('')[1].split('
')[0] or 'Default Website'
- else:
- homepage.tag_line = 'Default Website'
- homepage.setup_items()
- homepage.save()
-
- website_settings.home_page = 'home'
- website_settings.save()
-
diff --git a/erpnext/patches/v7_0/update_maintenance_module_in_doctype.py b/erpnext/patches/v7_0/update_maintenance_module_in_doctype.py
deleted file mode 100644
index 4c0c6a9313..0000000000
--- a/erpnext/patches/v7_0/update_maintenance_module_in_doctype.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.db.set_value("DocType", "Maintenance Schedule", "module", "Maintenance")
- frappe.db.set_value("DocType", "Maintenance Schedule Detail", "module", "Maintenance")
- frappe.db.set_value("DocType", "Maintenance Schedule Item", "module", "Maintenance")
- frappe.db.set_value("DocType", "Maintenance Visit", "module", "Maintenance")
- frappe.db.set_value("DocType", "Maintenance Visit Purpose", "module", "Maintenance")
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/update_mins_to_first_response.py b/erpnext/patches/v7_0/update_mins_to_first_response.py
deleted file mode 100644
index 16681357e6..0000000000
--- a/erpnext/patches/v7_0/update_mins_to_first_response.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-from frappe.core.doctype.communication.communication import update_mins_to_first_communication
-
-def execute():
- frappe.reload_doctype('Issue')
- frappe.reload_doctype('Opportunity')
-
- for doctype in ('Issue', 'Opportunity'):
- frappe.db.sql('update tab{0} set mins_to_first_response=0'.format(doctype))
- for parent in frappe.get_all(doctype, order_by='creation desc', limit=500):
- parent_doc = frappe.get_doc(doctype, parent.name)
- for communication in frappe.get_all('Communication',
- filters={'reference_doctype': doctype, 'reference_name': parent.name,
- 'communication_medium': 'Email'},
- order_by = 'creation asc', limit=2):
-
- communication_doc = frappe.get_doc('Communication', communication.name)
-
- update_mins_to_first_communication(parent_doc, communication_doc)
-
- if parent_doc.mins_to_first_response:
- continue
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/update_missing_employee_in_timesheet.py b/erpnext/patches/v7_0/update_missing_employee_in_timesheet.py
deleted file mode 100644
index 54d492b265..0000000000
--- a/erpnext/patches/v7_0/update_missing_employee_in_timesheet.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- if frappe.db.table_exists("Time Log") and "employee" in frappe.db.get_table_columns("Time Log"):
- timesheet = frappe.db.sql("""select tl.employee as employee, ts.name as name,
- tl.modified as modified, tl.modified_by as modified_by, tl.creation as creation, tl.owner as owner
- from
- `tabTimesheet` ts, `tabTimesheet Detail` tsd, `tabTime Log` tl
- where
- tsd.parent = ts.name and tl.from_time = tsd.from_time and tl.to_time = tsd.to_time
- and tl.hours = tsd.hours and tl.billing_rate = tsd.billing_rate and tsd.idx=1
- and tl.docstatus < 2 and (ts.employee = '' or ts.employee is null)""", as_dict=1)
-
- for data in timesheet:
- ts_doc = frappe.get_doc('Timesheet', data.name)
- if len(ts_doc.time_logs) == 1:
- frappe.db.sql(""" update `tabTimesheet` set creation = %(creation)s,
- owner = %(owner)s, modified = %(modified)s, modified_by = %(modified_by)s,
- employee = %(employee)s where name = %(name)s""", data)
diff --git a/erpnext/patches/v7_0/update_mode_of_payment_type.py b/erpnext/patches/v7_0/update_mode_of_payment_type.py
deleted file mode 100644
index 9292a1be1b..0000000000
--- a/erpnext/patches/v7_0/update_mode_of_payment_type.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe.utils import flt
-
-def execute():
- frappe.reload_doc('accounts', 'doctype', 'mode_of_payment')
-
- frappe.db.sql(""" update `tabMode of Payment` set type = 'Cash' where (type is null or type = '') and name = 'Cash'""")
-
- for data in frappe.db.sql("""select name from `tabSales Invoice` where is_pos=1 and docstatus<2 and
- (ifnull(paid_amount, 0) - ifnull(change_amount, 0)) > ifnull(grand_total, 0) and modified > '2016-05-01'""", as_dict=1):
- if data.name:
- si_doc = frappe.get_doc("Sales Invoice", data.name)
- remove_payment = []
- mode_of_payment = [d.mode_of_payment for d in si_doc.payments if flt(d.amount) > 0]
- if mode_of_payment != set(mode_of_payment):
- for payment_data in si_doc.payments:
- if payment_data.idx != 1 and payment_data.amount == si_doc.grand_total:
- remove_payment.append(payment_data)
- frappe.db.sql(""" delete from `tabSales Invoice Payment`
- where name = %(name)s""", {'name': payment_data.name})
-
- if len(remove_payment) > 0:
- for d in remove_payment:
- si_doc.remove(d)
-
- si_doc.set_paid_amount()
- si_doc.db_set("paid_amount", si_doc.paid_amount, update_modified = False)
- si_doc.db_set("base_paid_amount", si_doc.base_paid_amount, update_modified = False)
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/update_party_status.py b/erpnext/patches/v7_0/update_party_status.py
deleted file mode 100644
index 0c6b4ea598..0000000000
--- a/erpnext/patches/v7_0/update_party_status.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- return
- # for party_type in ('Customer', 'Supplier'):
- # frappe.reload_doctype(party_type)
- #
- # # set all as default status
- # frappe.db.sql('update `tab{0}` set status=%s'.format(party_type), default_status[party_type])
- #
- # for doctype in status_depends_on[party_type]:
- # filters = get_filters_for(doctype)
- # parties = frappe.get_all(doctype, fields="{0} as party".format(party_type.lower()),
- # filters=filters, limit_page_length=1)
- #
- # parties = filter(None, [p.party for p in parties])
- #
- # if parties:
- # frappe.db.sql('update `tab{0}` set status="Open" where name in ({1})'.format(party_type,
- # ', '.join(len(parties) * ['%s'])), parties)
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/update_prevdoc_values_for_supplier_quotation_item.py b/erpnext/patches/v7_0/update_prevdoc_values_for_supplier_quotation_item.py
deleted file mode 100644
index e90de50c1e..0000000000
--- a/erpnext/patches/v7_0/update_prevdoc_values_for_supplier_quotation_item.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype('Supplier Quotation Item')
- for data in frappe.db.sql(""" select prevdoc_docname, prevdoc_detail_docname, name
- from `tabSupplier Quotation Item` where prevdoc_docname is not null""", as_dict=True):
- frappe.db.set_value("Supplier Quotation Item", data.name, "material_request", data.prevdoc_docname)
- frappe.db.set_value("Supplier Quotation Item", data.name, "material_request_item", data.prevdoc_detail_docname)
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/update_project_in_gl_entry.py b/erpnext/patches/v7_0/update_project_in_gl_entry.py
deleted file mode 100644
index d99e9a41e3..0000000000
--- a/erpnext/patches/v7_0/update_project_in_gl_entry.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype("GL Entry")
-
- for doctype in ("Delivery Note", "Sales Invoice", "Stock Entry"):
- frappe.db.sql("""
- update `tabGL Entry` gle, `tab{0}` dt
- set gle.project = dt.project
- where gle.voucher_type=%s and gle.voucher_no = dt.name
- and ifnull(gle.cost_center, '') != '' and ifnull(dt.project, '') != ''
- """.format(doctype), doctype)
-
- for doctype in ("Purchase Receipt", "Purchase Invoice"):
- frappe.db.sql("""
- update `tabGL Entry` gle, `tab{0} Item` dt
- set gle.project = dt.project
- where gle.voucher_type=%s and gle.voucher_no = dt.parent and gle.cost_center=dt.cost_center
- and ifnull(gle.cost_center, '') != '' and ifnull(dt.project, '') != ''
- """.format(doctype), doctype)
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/update_refdoc_in_landed_cost_voucher.py b/erpnext/patches/v7_0/update_refdoc_in_landed_cost_voucher.py
deleted file mode 100644
index 2d562bb40e..0000000000
--- a/erpnext/patches/v7_0/update_refdoc_in_landed_cost_voucher.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- if "purchase_receipt" not in frappe.db.get_table_columns("Landed Cost Purchase Receipt"):
- return
-
- frappe.reload_doctype("Landed Cost Purchase Receipt")
-
- frappe.db.sql("""
- update `tabLanded Cost Purchase Receipt`
- set receipt_document_type = 'Purchase Receipt', receipt_document = purchase_receipt
- where (receipt_document is null or receipt_document = '')
- and (purchase_receipt is not null and purchase_receipt != '')
- """)
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/update_status_for_timesheet.py b/erpnext/patches/v7_0/update_status_for_timesheet.py
deleted file mode 100644
index 117c40c59f..0000000000
--- a/erpnext/patches/v7_0/update_status_for_timesheet.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.db.sql("""update
- `tabTimesheet` as ts,
- (
- select min(from_time)as from_time, max(to_time) as to_time, parent from `tabTimesheet Detail` group by parent
- ) as tsd
- set ts.status = 'Submitted', ts.start_date = tsd.from_time, ts.end_date = tsd.to_time
- where tsd.parent = ts.name and ts.status = 'Draft' and ts.docstatus =1""")
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/update_status_of_po_so.py b/erpnext/patches/v7_0/update_status_of_po_so.py
deleted file mode 100644
index d630e8f0f2..0000000000
--- a/erpnext/patches/v7_0/update_status_of_po_so.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.utils import cint, flt
-
-def execute():
- update_po_per_received_per_billed()
- update_so_per_delivered_per_billed()
- update_status()
-
-def update_po_per_received_per_billed():
- frappe.db.sql("""
- update
- `tabPurchase Order`
- set
- `tabPurchase Order`.per_received = round((select sum(if(qty > ifnull(received_qty, 0),
- ifnull(received_qty, 0), qty)) / sum(qty) *100 from `tabPurchase Order Item`
- where parent = `tabPurchase Order`.name), 2),
- `tabPurchase Order`.per_billed = ifnull(round((select sum( if(amount > ifnull(billed_amt, 0),
- ifnull(billed_amt, 0), amount)) / sum(amount) *100 from `tabPurchase Order Item`
- where parent = `tabPurchase Order`.name), 2), 0)
- where
- net_total > 0
- """)
-
-def update_so_per_delivered_per_billed():
- frappe.db.sql("""
- update
- `tabSales Order`
- set
- `tabSales Order`.per_delivered = round((select sum( if(qty > ifnull(delivered_qty, 0),
- ifnull(delivered_qty, 0), qty)) / sum(qty) *100 from `tabSales Order Item`
- where parent = `tabSales Order`.name), 2),
- `tabSales Order`.per_billed = ifnull(round((select sum( if(amount > ifnull(billed_amt, 0),
- ifnull(billed_amt, 0), amount)) / sum(amount) *100 from `tabSales Order Item`
- where parent = `tabSales Order`.name), 2), 0)
- where
- net_total > 0
- """)
-
-def update_status():
- frappe.db.sql("""
- update
- `tabSales Order`
- set status = (Case when status = 'Closed' then 'Closed'
- When per_delivered < 100 and per_billed < 100 and docstatus = 1 then 'To Deliver and Bill'
- when per_delivered = 100 and per_billed < 100 and docstatus = 1 then 'To Bill'
- when per_delivered < 100 and per_billed = 100 and docstatus = 1 then 'To Deliver'
- when per_delivered = 100 and per_billed = 100 and docstatus = 1 then 'Completed'
- when order_type = 'Maintenance' and per_billed = 100 and docstatus = 1 then 'Completed'
- when docstatus = 2 then 'Cancelled'
- else 'Draft'
- End)""")
-
- frappe.db.sql("""
- update
- `tabPurchase Order`
- set status = (Case when status = 'Closed' then 'Closed'
- when status = 'Delivered' then 'Delivered'
- When per_received < 100 and per_billed < 100 and docstatus = 1 then 'To Receive and Bill'
- when per_received = 100 and per_billed < 100 and docstatus = 1 then 'To Bill'
- when per_received < 100 and per_billed = 100 and docstatus = 1 then 'To Receive'
- when per_received = 100 and per_billed = 100 and docstatus = 1 then 'Completed'
- when docstatus = 2 then 'Cancelled'
- else 'Draft'
- End)""")
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/update_status_of_zero_amount_sales_order.py b/erpnext/patches/v7_0/update_status_of_zero_amount_sales_order.py
deleted file mode 100644
index 9b2b24785a..0000000000
--- a/erpnext/patches/v7_0/update_status_of_zero_amount_sales_order.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- for data in frappe.get_all('Sales Order', fields = ["name"], filters = [["docstatus", "=", "1"], ["grand_total", "=", "0"]]):
- sales_order = frappe.get_doc('Sales Order', data.name)
- sales_order.set_status(update=True, update_modified = False)
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/update_timesheet_communications.py b/erpnext/patches/v7_0/update_timesheet_communications.py
deleted file mode 100644
index 203471ea8f..0000000000
--- a/erpnext/patches/v7_0/update_timesheet_communications.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- if frappe.db.table_exists("Time Log"):
- timesheet = frappe.db.sql("""SELECT ts.name AS name, tl.name AS timelogname,
- tl.modified AS modified, tl.modified_by AS modified_by, tl.creation AS creation, tl.owner AS owner
- FROM
- `tabTimesheet` ts, `tabTimesheet Detail` tsd, `tabTime Log` tl
- WHERE
- tsd.parent = ts.name AND tl.from_time = tsd.from_time AND tl.to_time = tsd.to_time
- AND tl.hours = tsd.hours AND tl.billing_rate = tsd.billing_rate AND tsd.idx=1
- AND tl.docstatus < 2""", as_dict=1)
-
- for data in timesheet:
- frappe.db.sql(""" update `tabTimesheet` set creation = %(creation)s,
- owner = %(owner)s, modified = %(modified)s, modified_by = %(modified_by)s
- where name = %(name)s""", data)
-
- frappe.db.sql("""
- update
- tabCommunication
- set
- reference_doctype = "Timesheet", reference_name = %(timesheet)s
- where
- reference_doctype = "Time Log" and reference_name = %(timelog)s
- """, {'timesheet': data.name, 'timelog': data.timelogname}, auto_commit=1)
diff --git a/erpnext/patches/v7_1/__init__.py b/erpnext/patches/v7_1/__init__.py
deleted file mode 100644
index 519ff49eac..0000000000
--- a/erpnext/patches/v7_1/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
\ No newline at end of file
diff --git a/erpnext/patches/v7_1/add_account_user_role_for_timesheet.py b/erpnext/patches/v7_1/add_account_user_role_for_timesheet.py
deleted file mode 100644
index 7372b0cc5f..0000000000
--- a/erpnext/patches/v7_1/add_account_user_role_for_timesheet.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- if not frappe.db.get_value('DocPerm', {'parent': 'Timesheet', 'role': 'Accounts User', 'permlevel': 1}):
- doc = frappe.get_doc('DocType', 'Timesheet')
- doc.append('permissions', {
- 'role': "Accounts User",
- 'permlevel': 0,
- 'read': 1,
- 'write': 1,
- 'create': 1,
- 'delete': 1,
- 'submit': 1,
- 'cancel': 1,
- 'amend': 1,
- 'report': 1,
- 'email': 1
- })
-
- doc.append('permissions', {
- 'role': "Accounts User",
- 'permlevel': 1,
- 'read': 1,
- 'write': 1
- })
-
- doc.save(ignore_permissions=True)
\ No newline at end of file
diff --git a/erpnext/patches/v7_1/add_field_for_task_dependent.py b/erpnext/patches/v7_1/add_field_for_task_dependent.py
deleted file mode 100644
index 65b1c74e87..0000000000
--- a/erpnext/patches/v7_1/add_field_for_task_dependent.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype('Task')
- for t in frappe.get_all('Task', fields=['name']):
- task = frappe.get_doc('Task', t.name)
- task.update_depends_on()
- if task.depends_on_tasks:
- task.db_set('depends_on_tasks', task.depends_on_tasks, update_modified=False)
diff --git a/erpnext/patches/v7_1/fix_link_for_customer_from_lead.py b/erpnext/patches/v7_1/fix_link_for_customer_from_lead.py
deleted file mode 100644
index 33f809fe37..0000000000
--- a/erpnext/patches/v7_1/fix_link_for_customer_from_lead.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- for c in frappe.db.sql('select name from tabCustomer where ifnull(lead_name,"")!=""'):
- customer = frappe.get_doc('Customer', c[0])
- customer.update_lead_status()
\ No newline at end of file
diff --git a/erpnext/patches/v7_1/move_sales_invoice_from_parent_to_child_timesheet.py b/erpnext/patches/v7_1/move_sales_invoice_from_parent_to_child_timesheet.py
deleted file mode 100644
index d1ec7c697e..0000000000
--- a/erpnext/patches/v7_1/move_sales_invoice_from_parent_to_child_timesheet.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc('projects', 'doctype', 'timesheet_detail')
- frappe.reload_doc('accounts', 'doctype', 'sales_invoice_timesheet')
-
- frappe.db.sql(""" update
- `tabTimesheet` as ts,
- (select
- sum(billing_amount) as billing_amount, sum(billing_hours) as billing_hours, time_sheet
- from `tabSales Invoice Timesheet` where docstatus = 1 group by time_sheet
- ) as sit
- set
- ts.total_billed_amount = sit.billing_amount, ts.total_billed_hours = sit.billing_hours,
- ts.per_billed = ((sit.billing_amount * 100)/ts.total_billable_amount)
- where ts.name = sit.time_sheet and ts.docstatus = 1""")
-
- frappe.db.sql(""" update `tabTimesheet Detail` tsd, `tabTimesheet` ts set tsd.sales_invoice = ts.sales_invoice
- where tsd.parent = ts.name and ts.sales_invoice is not null""")
\ No newline at end of file
diff --git a/erpnext/patches/v7_1/rename_field_timesheet.py b/erpnext/patches/v7_1/rename_field_timesheet.py
deleted file mode 100644
index 3690a2e79d..0000000000
--- a/erpnext/patches/v7_1/rename_field_timesheet.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe.model.utils.rename_field import rename_field
-
-def execute():
- doctype = 'Timesheet'
- fields_dict = {'total_billing_amount': 'total_billable_amount', 'total_billing_hours': 'total_billable_hours'}
-
- for old_fieldname, new_fieldname in fields_dict.items():
- if old_fieldname in frappe.db.get_table_columns(doctype):
- rename_field(doctype, old_fieldname, new_fieldname)
diff --git a/erpnext/patches/v7_1/rename_quality_inspection_field.py b/erpnext/patches/v7_1/rename_quality_inspection_field.py
deleted file mode 100644
index 3b5a7d95eb..0000000000
--- a/erpnext/patches/v7_1/rename_quality_inspection_field.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe.model.utils.rename_field import *
-
-def execute():
- for doctype in ("Purchase Receipt Item", "Delivery Note Item"):
- frappe.reload_doctype(doctype)
-
- table_columns = frappe.db.get_table_columns(doctype)
- if "qa_no" in table_columns:
- rename_field(doctype, "qa_no", "quality_inspection")
-
- frappe.reload_doctype("Item")
- rename_field("Item", "inspection_required", "inspection_required_before_purchase")
-
- frappe.reload_doc('stock', 'doctype', 'quality_inspection')
- frappe.db.sql("""
- update
- `tabQuality Inspection`
- set
- reference_type = 'Purchase Receipt', reference_name = purchase_receipt_no
- where
- ifnull(purchase_receipt_no, '') != '' and inspection_type = 'Incoming'
- """)
-
- frappe.db.sql("""
- update
- `tabQuality Inspection`
- set
- reference_type = 'Delivery Note', reference_name = delivery_note_no
- where
- ifnull(delivery_note_no, '') != '' and inspection_type = 'Outgoing'
- """)
-
- for old_fieldname in ["purchase_receipt_no", "delivery_note_no"]:
- update_reports("Quality Inspection", old_fieldname, "reference_name")
- update_users_report_view_settings("Quality Inspection", old_fieldname, "reference_name")
- update_property_setters("Quality Inspection", old_fieldname, "reference_name")
diff --git a/erpnext/patches/v7_1/repost_stock_for_deleted_bins_for_merging_items.py b/erpnext/patches/v7_1/repost_stock_for_deleted_bins_for_merging_items.py
deleted file mode 100644
index aca21085cc..0000000000
--- a/erpnext/patches/v7_1/repost_stock_for_deleted_bins_for_merging_items.py
+++ /dev/null
@@ -1,44 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from erpnext.stock.stock_balance import repost_stock
-
-def execute():
- frappe.reload_doc('manufacturing', 'doctype', 'work_order_item')
- frappe.reload_doc('manufacturing', 'doctype', 'work_order')
-
- modified_items = frappe.db.sql_list("""
- select name from `tabItem`
- where is_stock_item=1 and modified >= '2016-10-31'
- """)
-
- if not modified_items:
- return
-
- item_warehouses_with_transactions = []
- transactions = ("Sales Order Item", "Material Request Item", "Purchase Order Item",
- "Stock Ledger Entry", "Packed Item")
-
- for doctype in transactions:
- item_warehouses_with_transactions += list(frappe.db.sql("""
- select distinct item_code, warehouse
- from `tab{0}` where docstatus=1 and item_code in ({1})"""
- .format(doctype, ', '.join(['%s']*len(modified_items))), tuple(modified_items)))
-
- item_warehouses_with_transactions += list(frappe.db.sql("""
- select distinct production_item, fg_warehouse
- from `tabWork Order` where docstatus=1 and production_item in ({0})"""
- .format(', '.join(['%s']*len(modified_items))), tuple(modified_items)))
-
- item_warehouses_with_transactions += list(frappe.db.sql("""
- select distinct pr_item.item_code, pr_item.source_warehouse
- from `tabWork Order` pr, `tabWork Order Item` pr_item
- where pr_item.parent and pr.name and pr.docstatus=1 and pr_item.item_code in ({0})"""
- .format(', '.join(['%s']*len(modified_items))), tuple(modified_items)))
-
- item_warehouses_with_bin = list(frappe.db.sql("select distinct item_code, warehouse from `tabBin`"))
-
- item_warehouses_with_missing_bin = list(
- set(item_warehouses_with_transactions) - set(item_warehouses_with_bin))
-
- for item_code, warehouse in item_warehouses_with_missing_bin:
- repost_stock(item_code, warehouse)
diff --git a/erpnext/patches/v7_1/save_stock_settings.py b/erpnext/patches/v7_1/save_stock_settings.py
deleted file mode 100644
index d3f0263c10..0000000000
--- a/erpnext/patches/v7_1/save_stock_settings.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- stock_settings = frappe.get_doc('Stock Settings')
-
- if stock_settings.default_warehouse \
- and not frappe.db.exists("Warehouse", stock_settings.default_warehouse):
- stock_settings.default_warehouse = None
-
- if stock_settings.stock_uom and not frappe.db.exists("UOM", stock_settings.stock_uom):
- stock_settings.stock_uom = None
-
- stock_settings.flags.ignore_mandatory = True
- stock_settings.save()
diff --git a/erpnext/patches/v7_1/set_budget_against_as_cost_center.py b/erpnext/patches/v7_1/set_budget_against_as_cost_center.py
deleted file mode 100644
index dd9a432cf0..0000000000
--- a/erpnext/patches/v7_1/set_budget_against_as_cost_center.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc("accounts", "doctype", "budget")
- frappe.db.sql("""
- update
- `tabBudget`
- set
- budget_against = 'Cost Center'
- """)
diff --git a/erpnext/patches/v7_1/set_currency_exchange_date.py b/erpnext/patches/v7_1/set_currency_exchange_date.py
deleted file mode 100644
index 2a2d420f21..0000000000
--- a/erpnext/patches/v7_1/set_currency_exchange_date.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype("Currency Exchange")
- frappe.db.sql("""
- update `tabCurrency Exchange`
- set `date` = '2010-01-01'
- where date is null or date = '0000-00-00'
- """)
\ No newline at end of file
diff --git a/erpnext/patches/v7_1/set_prefered_contact_email.py b/erpnext/patches/v7_1/set_prefered_contact_email.py
deleted file mode 100644
index 3b68e22269..0000000000
--- a/erpnext/patches/v7_1/set_prefered_contact_email.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype('User')
- for d in frappe.get_all("Employee"):
- employee = frappe.get_doc("Employee", d.name)
- if employee.company_email:
- employee.prefered_contact_email = "Company Email"
- employee.prefered_email = employee.company_email
- elif employee.personal_email:
- employee.prefered_contact_email = "Personal Email"
- employee.prefered_email = employee.personal_email
- elif employee.user_id:
- employee.prefered_contact_email = "User ID"
- employee.prefered_email = employee.user_id
- employee.db_update()
diff --git a/erpnext/patches/v7_1/set_sales_person_status.py b/erpnext/patches/v7_1/set_sales_person_status.py
deleted file mode 100644
index 929beac27f..0000000000
--- a/erpnext/patches/v7_1/set_sales_person_status.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc('setup','doctype','sales_person')
- frappe.db.sql("""update `tabSales Person` set enabled=1
- where (employee is null or employee = ''
- or employee IN (select employee from tabEmployee where status != "Left"))""")
diff --git a/erpnext/patches/v7_1/set_student_guardian.py b/erpnext/patches/v7_1/set_student_guardian.py
deleted file mode 100644
index 093c0bf6d9..0000000000
--- a/erpnext/patches/v7_1/set_student_guardian.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- if frappe.db.exists("DocType", "Guardian"):
-
- # 'Schools' module changed to the 'Education'
- # frappe.reload_doc("schools", "doctype", "student")
- # frappe.reload_doc("schools", "doctype", "student_guardian")
- # frappe.reload_doc("schools", "doctype", "student_sibling")
-
- frappe.reload_doc("education", "doctype", "student")
- frappe.reload_doc("education", "doctype", "student_guardian")
- frappe.reload_doc("education", "doctype", "student_sibling")
- if "student" not in frappe.db.get_table_columns("Guardian"):
- return
- guardian = frappe.get_all("Guardian", fields=["name", "student"])
- for d in guardian:
- if d.student:
- student = frappe.get_doc("Student", d.student)
- if student:
- student.append("guardians", {"guardian": d.name})
- student.save()
diff --git a/erpnext/patches/v7_1/set_total_amount_currency_in_je.py b/erpnext/patches/v7_1/set_total_amount_currency_in_je.py
deleted file mode 100644
index 8426ddcd7d..0000000000
--- a/erpnext/patches/v7_1/set_total_amount_currency_in_je.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from erpnext import get_default_currency
-
-def execute():
- frappe.reload_doc("accounts", "doctype", "journal_entry")
-
- frappe.db.sql(""" update `tabJournal Entry` set total_amount_currency = %s
- where ifnull(multi_currency, 0) = 0
- and (pay_to_recd_from is not null or pay_to_recd_from != "") """, get_default_currency())
-
- for je in frappe.db.sql(""" select name from `tabJournal Entry` where multi_currency = 1
- and (pay_to_recd_from is not null or pay_to_recd_from != "")""", as_dict=1):
-
- doc = frappe.get_doc("Journal Entry", je.name)
- for d in doc.get('accounts'):
- if d.party_type and d.party:
- total_amount_currency = d.account_currency
-
- elif frappe.db.get_value("Account", d.account, "account_type") in ["Bank", "Cash"]:
- total_amount_currency = d.account_currency
-
- frappe.db.set_value("Journal Entry", je.name, "total_amount_currency",
- total_amount_currency, update_modified=False)
diff --git a/erpnext/patches/v7_1/update_bom_base_currency.py b/erpnext/patches/v7_1/update_bom_base_currency.py
deleted file mode 100644
index 9a59209ea5..0000000000
--- a/erpnext/patches/v7_1/update_bom_base_currency.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from erpnext import get_default_currency
-
-def execute():
- frappe.reload_doc("manufacturing", "doctype", "bom")
- frappe.reload_doc("manufacturing", "doctype", "bom_item")
- frappe.reload_doc("manufacturing", "doctype", "bom_explosion_item")
- frappe.reload_doc("manufacturing", "doctype", "bom_operation")
- frappe.reload_doc("manufacturing", "doctype", "bom_scrap_item")
-
- frappe.db.sql(""" update `tabBOM Operation` set base_hour_rate = hour_rate,
- base_operating_cost = operating_cost """)
-
- frappe.db.sql(""" update `tabBOM Item` set base_rate = rate, base_amount = amount """)
- frappe.db.sql(""" update `tabBOM Scrap Item` set base_rate = rate, base_amount = amount """)
-
- frappe.db.sql(""" update `tabBOM` set `tabBOM`.base_operating_cost = `tabBOM`.operating_cost,
- `tabBOM`.base_raw_material_cost = `tabBOM`.raw_material_cost,
- `tabBOM`.currency = (select default_currency from `tabCompany` where name = `tabBOM`.company)""")
diff --git a/erpnext/patches/v7_1/update_component_type.py b/erpnext/patches/v7_1/update_component_type.py
deleted file mode 100644
index 24ca0570e0..0000000000
--- a/erpnext/patches/v7_1/update_component_type.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe.utils import flt
-
-def execute():
- frappe.reload_doc('Payroll', 'doctype', 'salary_component')
- sal_components = frappe.db.sql("""
- select DISTINCT salary_component, parentfield from `tabSalary Detail`""", as_dict=True)
-
- if sal_components:
- for sal_component in sal_components:
- if sal_component.parentfield == "earnings":
- frappe.db.sql("""update `tabSalary Component` set type='Earning' where salary_component=%(sal_comp)s""",{"sal_comp": sal_component.salary_component})
- else:
- frappe.db.sql("""update `tabSalary Component` set type='Deduction' where salary_component=%(sal_comp)s""",{"sal_comp": sal_component.salary_component})
\ No newline at end of file
diff --git a/erpnext/patches/v7_1/update_invoice_status.py b/erpnext/patches/v7_1/update_invoice_status.py
deleted file mode 100644
index 851af80f7a..0000000000
--- a/erpnext/patches/v7_1/update_invoice_status.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc('accounts', 'doctype', 'sales_invoice')
- frappe.reload_doc('accounts', 'doctype', 'purchase_invoice')
-
- frappe.db.sql("""
- update
- `tabPurchase Invoice`
- set
- status = (Case When outstanding_amount = 0 and docstatus = 1 and is_return = 0 then 'Paid'
- when due_date < CURDATE() and outstanding_amount > 0 and docstatus =1 then 'Overdue'
- when due_date >= CURDATE() and outstanding_amount > 0 and docstatus =1 then 'Unpaid'
- when outstanding_amount < 0 and docstatus =1 then 'Debit Note Issued'
- when is_return = 1 and docstatus =1 then 'Return'
- when docstatus = 2 then 'Cancelled'
- else 'Draft'
- End)""")
-
- frappe.db.sql("""
- update
- `tabSales Invoice`
- set status = (Case When outstanding_amount = 0 and docstatus = 1 and is_return = 0 then 'Paid'
- when due_date < CURDATE() and outstanding_amount > 0 and docstatus =1 then 'Overdue'
- when due_date >= CURDATE() and outstanding_amount > 0 and docstatus =1 then 'Unpaid'
- when outstanding_amount < 0 and docstatus =1 then 'Credit Note Issued'
- when is_return = 1 and docstatus =1 then 'Return'
- when docstatus = 2 then 'Cancelled'
- else 'Draft'
- End)""")
\ No newline at end of file
diff --git a/erpnext/patches/v7_1/update_lead_source.py b/erpnext/patches/v7_1/update_lead_source.py
deleted file mode 100644
index a2a48a62e1..0000000000
--- a/erpnext/patches/v7_1/update_lead_source.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-
-def execute():
- from erpnext.setup.setup_wizard.operations.install_fixtures import default_lead_sources
-
- frappe.reload_doc('crm', 'doctype', 'lead_source')
-
- frappe.local.lang = frappe.db.get_default("lang") or 'en'
-
- for s in default_lead_sources:
- insert_lead_source(_(s))
-
- # get lead sources in existing forms (customized)
- # and create a document if not created
- for d in ['Lead', 'Opportunity', 'Quotation', 'Sales Order', 'Delivery Note', 'Sales Invoice']:
- sources = frappe.db.sql_list('select distinct source from `tab{0}`'.format(d))
- for s in sources:
- if s and s not in default_lead_sources:
- insert_lead_source(s)
-
- # remove customization for source
- for p in frappe.get_all('Property Setter', {'doc_type':d, 'field_name':'source', 'property':'options'}):
- frappe.delete_doc('Property Setter', p.name)
-
-def insert_lead_source(s):
- if not frappe.db.exists('Lead Source', s):
- frappe.get_doc(dict(doctype='Lead Source', source_name=s)).insert()
diff --git a/erpnext/patches/v7_1/update_missing_salary_component_type.py b/erpnext/patches/v7_1/update_missing_salary_component_type.py
deleted file mode 100644
index 824f2b881f..0000000000
--- a/erpnext/patches/v7_1/update_missing_salary_component_type.py
+++ /dev/null
@@ -1,50 +0,0 @@
-from __future__ import unicode_literals
-
-import frappe
-from frappe.utils import cstr
-
-'''
-Some components do not have type set, try and guess whether they turn up in
-earnings or deductions in existing salary slips
-'''
-
-def execute():
- frappe.reload_doc("accounts", "doctype", "salary_component_account")
- frappe.reload_doc("Payroll", "doctype", "salary_component")
- frappe.reload_doc("Payroll", "doctype", "taxable_salary_slab")
-
- for s in frappe.db.sql('''select name, type, salary_component_abbr from `tabSalary Component`
- where ifnull(type, "")="" or ifnull(salary_component_abbr, "") = ""''', as_dict=1):
-
- component = frappe.get_doc('Salary Component', s.name)
-
- # guess
- if not s.type:
- guess = frappe.db.sql('''select
- parentfield from `tabSalary Detail`
- where salary_component=%s limit 1''', s.name)
-
- if guess:
- component.type = 'Earning' if guess[0][0]=='earnings' else 'Deduction'
-
- else:
- component.type = 'Deduction'
-
- if not s.salary_component_abbr:
- abbr = ''.join([c[0] for c in component.salary_component.split()]).upper()
-
- abbr_count = frappe.db.sql("""
- select
- count(name)
- from
- `tabSalary Component`
- where
- salary_component_abbr = %s or salary_component_abbr like %s
- """, (abbr, abbr + "-%%"))
-
- if abbr_count and abbr_count[0][0] > 0:
- abbr = abbr + "-" + cstr(abbr_count[0][0])
-
- component.salary_component_abbr = abbr
-
- component.save()
diff --git a/erpnext/patches/v7_1/update_portal_roles.py b/erpnext/patches/v7_1/update_portal_roles.py
deleted file mode 100644
index 482586b8ef..0000000000
--- a/erpnext/patches/v7_1/update_portal_roles.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype('Role')
- frappe.reload_doctype('User')
- for role_name in ('Customer', 'Supplier', 'Student'):
- if frappe.db.exists('Role', role_name):
- frappe.db.set_value('Role', role_name, 'desk_access', 0)
- else:
- frappe.get_doc(dict(doctype='Role', role_name=role_name, desk_access=0)).insert()
-
-
- # set customer, supplier roles
- for c in frappe.get_all('Contact', fields=['user'], filters={'ifnull(user, "")': ('!=', '')}):
- user = frappe.get_doc('User', c.user)
- user.flags.ignore_validate = True
- user.flags.ignore_mandatory = True
- user.save()
-
-
diff --git a/erpnext/patches/v7_1/update_total_billing_hours.py b/erpnext/patches/v7_1/update_total_billing_hours.py
deleted file mode 100644
index b9c96028f5..0000000000
--- a/erpnext/patches/v7_1/update_total_billing_hours.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc('projects', 'doctype', 'timesheet_detail')
- frappe.reload_doc('accounts', 'doctype', 'sales_invoice_timesheet')
-
- frappe.db.sql("""update tabTimesheet set total_billable_hours=total_hours
- where total_billable_amount>0 and docstatus = 1""")
-
- frappe.db.sql("""update `tabTimesheet Detail` set billing_hours=hours where docstatus < 2""")
-
- frappe.db.sql(""" update `tabSales Invoice Timesheet` set billing_hours = (select total_billable_hours from `tabTimesheet`
- where name = time_sheet) where time_sheet is not null""")
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/__init__.py b/erpnext/patches/v7_2/__init__.py
deleted file mode 100644
index baffc48825..0000000000
--- a/erpnext/patches/v7_2/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/patches/v7_2/arrear_leave_encashment_as_salary_component.py b/erpnext/patches/v7_2/arrear_leave_encashment_as_salary_component.py
deleted file mode 100644
index d2583b9422..0000000000
--- a/erpnext/patches/v7_2/arrear_leave_encashment_as_salary_component.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- # frappe.reload_doctype('Salary Slip', 'Salary Component')
- frappe.reload_doc("Payroll", "doctype", "Salary Slip")
- frappe.reload_doc("Payroll", "doctype", "Salary Component")
- salary_components = [['Arrear', "ARR"], ['Leave Encashment', 'LENC']]
- for salary_component, salary_abbr in salary_components:
- if not frappe.db.exists('Salary Component', salary_component):
- sal_comp = frappe.get_doc({
- "doctype": "Salary Component",
- "salary_component": salary_component,
- "type": "Earning",
- "salary_component_abbr": salary_abbr
- }).insert()
-
- salary_slips = frappe.db.sql("""select name, arrear_amount, leave_encashment_amount from `tabSalary Slip`
- where docstatus !=2 and (arrear_amount > 0 or leave_encashment_amount > 0)""", as_dict=True)
-
- for salary_slip in salary_slips:
- doc = frappe.get_doc('Salary Slip', salary_slip.name)
-
- if salary_slip.get("arrear_amount") > 0:
- r = doc.append('earnings', {
- 'salary_component': 'Arrear',
- 'amount': salary_slip.arrear_amount
- })
- r.db_update()
-
- if salary_slip.get("leave_encashment_amount") > 0:
- r = doc.append('earnings', {
- 'salary_component': 'Leave Encashment',
- 'amount': salary_slip.leave_encashment_amount
- })
- r.db_update()
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/contact_address_links.py b/erpnext/patches/v7_2/contact_address_links.py
deleted file mode 100644
index 200434c208..0000000000
--- a/erpnext/patches/v7_2/contact_address_links.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe.core.doctype.dynamic_link.dynamic_link import deduplicate_dynamic_links
-from frappe.utils import update_progress_bar
-
-def execute():
- frappe.reload_doc('core', 'doctype', 'dynamic_link')
- frappe.reload_doc('contacts', 'doctype', 'contact')
- frappe.reload_doc('contacts', 'doctype', 'address')
- map_fields = (
- ('Customer', 'customer'),
- ('Supplier', 'supplier'),
- ('Lead', 'lead'),
- ('Sales Partner', 'sales_partner')
- )
- for doctype in ('Contact', 'Address'):
- if frappe.db.has_column(doctype, 'customer'):
- items = frappe.get_all(doctype)
- for i, doc in enumerate(items):
- doc = frappe.get_doc(doctype, doc.name)
- dirty = False
- for field in map_fields:
- if doc.get(field[1]):
- doc.append('links', dict(link_doctype=field[0], link_name=doc.get(field[1])))
- dirty = True
-
- if dirty:
- deduplicate_dynamic_links(doc)
- doc.update_children()
-
- update_progress_bar('Updating {0}'.format(doctype), i, len(items))
- print
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/delete_fleet_management_module_def.py b/erpnext/patches/v7_2/delete_fleet_management_module_def.py
deleted file mode 100644
index 542ac11e3f..0000000000
--- a/erpnext/patches/v7_2/delete_fleet_management_module_def.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- if frappe.db.exists('Module Def', 'Fleet Management'):
- frappe.db.sql("""delete from `tabModule Def`
- where module_name = 'Fleet Management'""")
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/empty_supplied_items_for_non_subcontracted.py b/erpnext/patches/v7_2/empty_supplied_items_for_non_subcontracted.py
deleted file mode 100644
index ec6f8afc3a..0000000000
--- a/erpnext/patches/v7_2/empty_supplied_items_for_non_subcontracted.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- for doctype in ["Purchase Order", "Purchase Invoice", "Purchase Receipt"]:
- child_table = 'Purchase Receipt Item Supplied' if doctype != 'Purchase Order' else 'Purchase Order Item Supplied'
- for data in frappe.db.sql(""" select distinct `tab{doctype}`.name from `tab{doctype}` , `tab{child_table}`
- where `tab{doctype}`.name = `tab{child_table}`.parent and `tab{doctype}`.docstatus != 2
- and `tab{doctype}`.is_subcontracted = 'No' """.format(doctype = doctype, child_table = child_table), as_dict=1):
- frappe.db.sql(""" delete from `tab{child_table}`
- where parent = %s and parenttype = %s""".format(child_table= child_table), (data.name, doctype))
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/make_all_assessment_group.py b/erpnext/patches/v7_2/make_all_assessment_group.py
deleted file mode 100644
index f3ec628374..0000000000
--- a/erpnext/patches/v7_2/make_all_assessment_group.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- if not frappe.db.exists({"doctype": "Assessment Group","assessment_group_name": "All Assessment Groups"}):
- frappe.reload_doc("education", "doctype", "assessment_group")
- doc = frappe.new_doc("Assessment Group")
- doc.assessment_group_name = "All Assessment Groups"
- doc.is_group = 1
- doc.flags.ignore_mandatory = True
- doc.save()
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/mark_students_active.py b/erpnext/patches/v7_2/mark_students_active.py
deleted file mode 100644
index 7289e4a915..0000000000
--- a/erpnext/patches/v7_2/mark_students_active.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- # 'Schools' module changed to the 'Education'
- # frappe.reload_doc('schools', 'doctype', 'student_group_student')
-
- frappe.reload_doc('education', 'doctype', 'student_group_student')
- frappe.db.sql("update `tabStudent Group Student` set active=1")
diff --git a/erpnext/patches/v7_2/rename_att_date_attendance.py b/erpnext/patches/v7_2/rename_att_date_attendance.py
deleted file mode 100644
index 7f06d8f123..0000000000
--- a/erpnext/patches/v7_2/rename_att_date_attendance.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe.model.utils.rename_field import update_reports, update_users_report_view_settings, update_property_setters
-
-def execute():
- if "att_date" not in frappe.db.get_table_columns("Attendance"):
- return
- frappe.reload_doc("hr", "doctype", "attendance")
- frappe.db.sql("""update `tabAttendance`
- set attendance_date = att_date
- where attendance_date is null or attendance_date = '0000-00-00'""")
-
- update_reports("Attendance", "att_date", "attendance_date")
- update_users_report_view_settings("Attendance", "att_date", "attendance_date")
- update_property_setters("Attendance", "att_date", "attendance_date")
diff --git a/erpnext/patches/v7_2/rename_evaluation_criteria.py b/erpnext/patches/v7_2/rename_evaluation_criteria.py
deleted file mode 100644
index c6520b1b72..0000000000
--- a/erpnext/patches/v7_2/rename_evaluation_criteria.py
+++ /dev/null
@@ -1,39 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe.model.utils.rename_field import rename_field
-
-def execute():
- # 'Schools' module changed to the 'Education'
-
-
- frappe.rename_doc("DocType", "Evaluation Criteria", "Assessment Criteria", force=True)
- # frappe.reload_doc("schools", "doctype", "assessment_criteria")
- frappe.reload_doc("education", "doctype", "assessment_criteria")
- if 'evaluation_criteria' in frappe.db.get_table_columns('Assessment Criteria'):
- rename_field("Assessment Criteria", "evaluation_criteria", "assessment_criteria")
-
- frappe.rename_doc("DocType", "Assessment Evaluation Criteria", "Assessment Plan Criteria", force=True)
- # frappe.reload_doc("schools", "doctype", "assessment_plan_criteria")
- frappe.reload_doc("education", "doctype", "assessment_plan_criteria")
- if 'evaluation_criteria' in frappe.db.get_table_columns('Assessment Plan'):
- rename_field("Assessment Plan Criteria", "evaluation_criteria", "assessment_criteria")
-
- # frappe.reload_doc("schools", "doctype", "assessment_plan")
- frappe.reload_doc("education", "doctype", "assessment_plan")
- rename_field("Assessment Plan", "evaluation_criterias", "assessment_criteria")
-
- # frappe.reload_doc("schools", "doctype", "assessment_result_detail")
- frappe.reload_doc("education", "doctype", "assessment_result_detail")
- if 'evaluation_criteria' in frappe.db.get_table_columns('Assessment Result Detail'):
- rename_field("Assessment Result Detail", "evaluation_criteria", "assessment_criteria")
-
- frappe.rename_doc("DocType", "Course Evaluation Criteria", "Course Assessment Criteria", force=True)
- # frappe.reload_doc("schools", "doctype", "course_assessment_criteria")
- frappe.reload_doc("education", "doctype", "course_assessment_criteria")
- if 'evaluation_criteria' in frappe.db.get_table_columns('Course Assessment Criteria'):
- rename_field("Course Assessment Criteria", "evaluation_criteria", "assessment_criteria")
-
- # frappe.reload_doc("schools", "doctype", "course")
- frappe.reload_doc("education", "doctype", "course")
- if 'evaluation_criteria' in frappe.db.get_table_columns('Course'):
- rename_field("Course", "evaluation_criterias", "assessment_criteria")
diff --git a/erpnext/patches/v7_2/set_null_value_to_fields.py b/erpnext/patches/v7_2/set_null_value_to_fields.py
deleted file mode 100644
index 6388be438d..0000000000
--- a/erpnext/patches/v7_2/set_null_value_to_fields.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- fields = {"Cost Center": "project", "Project": "cost_center"}
- for budget_against, field in fields.items():
- frappe.db.sql(""" update `tabBudget` set {field} = null
- where budget_against = %s """.format(field = field), budget_against)
diff --git a/erpnext/patches/v7_2/setup_auto_close_settings.py b/erpnext/patches/v7_2/setup_auto_close_settings.py
deleted file mode 100644
index 4eef2b9c8a..0000000000
--- a/erpnext/patches/v7_2/setup_auto_close_settings.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- # update the selling settings and set the close_opportunity_after_days
- frappe.reload_doc("selling", "doctype", "selling_settings")
- frappe.db.set_value("Selling Settings", "Selling Settings", "close_opportunity_after_days", 15)
-
- # Auto close Replied opportunity
- frappe.db.sql("""update `tabOpportunity` set status='Closed' where status='Replied'
- and date_sub(curdate(), interval 15 Day)>modified""")
-
- # create Support Settings doctype and update close_issue_after_days
- frappe.reload_doc("support", "doctype", "support_settings")
- frappe.db.set_value("Support Settings", "Support Settings", "close_issue_after_days", 7)
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/stock_uom_in_selling.py b/erpnext/patches/v7_2/stock_uom_in_selling.py
deleted file mode 100644
index d029555747..0000000000
--- a/erpnext/patches/v7_2/stock_uom_in_selling.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype('Sales Order')
- frappe.reload_doctype('Sales Invoice')
- frappe.reload_doctype('Quotation')
- frappe.reload_doctype('Delivery Note')
-
- doctype_list = ['Sales Order Item', 'Delivery Note Item', 'Quotation Item', 'Sales Invoice Item']
-
- for doctype in doctype_list:
- frappe.reload_doctype(doctype)
- frappe.db.sql("""update `tab{doctype}`
- set uom = stock_uom, conversion_factor = 1, stock_qty = qty""".format(doctype=doctype))
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/update_abbr_in_salary_slips.py b/erpnext/patches/v7_2/update_abbr_in_salary_slips.py
deleted file mode 100644
index 57432fe986..0000000000
--- a/erpnext/patches/v7_2/update_abbr_in_salary_slips.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc('Payroll', 'doctype', 'Salary Slip')
- if not frappe.db.has_column('Salary Detail', 'abbr'):
- return
-
- salary_details = frappe.db.sql("""select abbr, salary_component, name from `tabSalary Detail`
- where abbr is null or abbr = ''""", as_dict=True)
-
- for salary_detail in salary_details:
- salary_component_abbr = frappe.get_value("Salary Component", salary_detail.salary_component, "salary_component_abbr")
- frappe.db.sql("""update `tabSalary Detail` set abbr = %s where name = %s""",(salary_component_abbr, salary_detail.name))
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/update_assessment_modules.py b/erpnext/patches/v7_2/update_assessment_modules.py
deleted file mode 100644
index 2b5e774d46..0000000000
--- a/erpnext/patches/v7_2/update_assessment_modules.py
+++ /dev/null
@@ -1,51 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe.model.utils.rename_field import rename_field
-
-def execute():
- #Rename Grading Structure to Grading Scale
- if not frappe.db.exists("DocType", "Grading Scale"):
- frappe.rename_doc("DocType", "Grading Structure", "Grading Scale", force=True)
- if not frappe.db.exists("DocType", "Grading Scale Interval"):
- frappe.rename_doc("DocType", "Grade Interval", "Grading Scale Interval", force=True)
-
- # frappe.reload_doc("schools", "doctype", "grading_scale_interval")
- frappe.reload_doc("education", "doctype", "grading_scale_interval")
- if "to_score" in frappe.db.get_table_columns("Grading Scale Interval"):
- rename_field("Grading Scale Interval", "to_score", "threshold")
-
- if not frappe.db.exists("DocType", "Assessment Plan"):
- frappe.rename_doc("DocType", "Assessment", "Assessment Plan", force=True)
-
- # 'Schools' module changed to the 'Education'
- # frappe.reload_doc("schools", "doctype", "assessment_plan")
-
- #Rename Assessment Results
- frappe.reload_doc("education", "doctype", "assessment_plan")
- if "grading_structure" in frappe.db.get_table_columns("Assessment Plan"):
- rename_field("Assessment Plan", "grading_structure", "grading_scale")
-
- # frappe.reload_doc("schools", "doctype", "assessment_result")
- # frappe.reload_doc("schools", "doctype", "assessment_result_detail")
- # frappe.reload_doc("schools", "doctype", "assessment_criteria")
- frappe.reload_doc("education", "doctype", "assessment_result")
- frappe.reload_doc("education", "doctype", "assessment_result_detail")
- frappe.reload_doc("education", "doctype", "assessment_criteria")
-
-
- for assessment in frappe.get_all("Assessment Plan",
- fields=["name", "grading_scale"], filters = [["docstatus", "!=", 2 ]]):
- for stud_result in frappe.db.sql("select * from `tabAssessment Result` where parent= %s",
- assessment.name, as_dict=True):
- if stud_result.result:
- assessment_result = frappe.new_doc("Assessment Result")
- assessment_result.student = stud_result.student
- assessment_result.student_name = stud_result.student_name
- assessment_result.assessment_plan = assessment.name
- assessment_result.grading_scale = assessment.grading_scale
- assessment_result.total_score = stud_result.result
- assessment_result.flags.ignore_validate = True
- assessment_result.flags.ignore_mandatory = True
- assessment_result.save()
-
- frappe.db.sql("""delete from `tabAssessment Result` where parent != '' or parent is not null""")
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/update_attendance_docstatus.py b/erpnext/patches/v7_2/update_attendance_docstatus.py
deleted file mode 100644
index a69052657d..0000000000
--- a/erpnext/patches/v7_2/update_attendance_docstatus.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc("education", "doctype", "student_attendance")
- frappe.db.sql('''
- update `tabStudent Attendance` set
- docstatus=0
- where
- docstatus=1''')
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/update_doctype_status.py b/erpnext/patches/v7_2/update_doctype_status.py
deleted file mode 100644
index c66f3f2e73..0000000000
--- a/erpnext/patches/v7_2/update_doctype_status.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- doctypes = ["Opportunity", "Quotation", "Sales Order", "Sales Invoice", "Purchase Invoice", "Purchase Order", "Delivery Note", "Purchase Receipt"]
- for doctype in doctypes:
- frappe.db.sql(""" update `tab{doctype}` set status = 'Draft'
- where status = 'Cancelled' and docstatus = 0 """.format(doctype = doctype))
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/update_guardian_name_in_student_master.py b/erpnext/patches/v7_2/update_guardian_name_in_student_master.py
deleted file mode 100644
index 9f589ef00e..0000000000
--- a/erpnext/patches/v7_2/update_guardian_name_in_student_master.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe.model.utils.rename_field import rename_field
-
-def execute():
- # 'Schools' module changed to the 'Education'
- # frappe.reload_doc("schools", "doctype", "student_guardian")
- frappe.reload_doc("education", "doctype", "student_guardian")
-
- student_guardians = frappe.get_all("Student Guardian", fields=["guardian"])
- for student_guardian in student_guardians:
- guardian_name = frappe.db.get_value("Guardian", student_guardian.guardian, "guardian_name")
- frappe.db.sql("update `tabStudent Guardian` set guardian_name = %s where guardian= %s",
- (guardian_name, student_guardian.guardian))
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/update_party_type.py b/erpnext/patches/v7_2/update_party_type.py
deleted file mode 100644
index 147f5a3643..0000000000
--- a/erpnext/patches/v7_2/update_party_type.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc('setup', 'doctype', 'party_type')
- make_party_type()
-
-def make_party_type():
- for party_type in ["Customer", "Supplier", "Employee"]:
- if not frappe.db.get_value("Party Type", party_type):
- doc = frappe.new_doc("Party Type")
- doc.party_type = party_type
- doc.save(ignore_permissions=True)
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/update_salary_slips.py b/erpnext/patches/v7_2/update_salary_slips.py
deleted file mode 100644
index 9fcce62d8f..0000000000
--- a/erpnext/patches/v7_2/update_salary_slips.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from erpnext.payroll.doctype.payroll_entry.payroll_entry import get_month_details
-from frappe.utils import cint
-
-def execute():
- frappe.reload_doc("Payroll", "doctype", "Salary Slip")
- if not frappe.db.has_column('Salary Slip', 'fiscal_year'):
- return
-
- salary_slips = frappe.db.sql("""select month, name, fiscal_year from `tabSalary Slip`
- where (month is not null and month != '') and
- start_date is null and end_date is null and docstatus != 2""", as_dict=True)
-
- for salary_slip in salary_slips:
- if not cint(salary_slip.month):
- continue
- get_start_end_date = get_month_details(salary_slip.fiscal_year, cint(salary_slip.month))
- start_date = get_start_end_date['month_start_date']
- end_date = get_start_end_date['month_end_date']
- frappe.db.sql("""update `tabSalary Slip` set start_date = %s, end_date = %s where name = %s""",
- (start_date, end_date, salary_slip.name))
\ No newline at end of file
diff --git a/erpnext/patches/v7_2/update_website_for_variant.py b/erpnext/patches/v7_2/update_website_for_variant.py
deleted file mode 100644
index e8eef6e7da..0000000000
--- a/erpnext/patches/v7_2/update_website_for_variant.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- # variant must have show_in_website = 0
- frappe.reload_doctype('Item')
- frappe.db.sql('''
- update tabItem set
- show_variant_in_website = 1,
- show_in_website = 0
- where
- show_in_website=1
- and ifnull(variant_of, "")!=""''')
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/__init__.py b/erpnext/patches/v8_0/__init__.py
deleted file mode 100644
index baffc48825..0000000000
--- a/erpnext/patches/v8_0/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/patches/v8_0/addresses_linked_to_lead.py b/erpnext/patches/v8_0/addresses_linked_to_lead.py
deleted file mode 100644
index b5f2234228..0000000000
--- a/erpnext/patches/v8_0/addresses_linked_to_lead.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.db.sql("""UPDATE `tabDynamic Link` SET link_doctype = 'Lead' WHERE link_doctype = 'Load'""")
diff --git a/erpnext/patches/v8_0/change_in_words_varchar_length.py b/erpnext/patches/v8_0/change_in_words_varchar_length.py
deleted file mode 100644
index 68ff95b5ed..0000000000
--- a/erpnext/patches/v8_0/change_in_words_varchar_length.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- doctypes = frappe.db.sql_list("""select parent from tabDocField where fieldname = 'in_words'""")
-
- for dt in doctypes:
- for fieldname in ("in_words", "base_in_words"):
- frappe.db.sql("alter table `tab{0}` change column `{1}` `{2}` varchar(255)"
- .format(dt, fieldname, fieldname))
-
- frappe.db.sql("""alter table `tabJournal Entry`
- change column `total_amount_in_words` `total_amount_in_words` varchar(255)""")
diff --git a/erpnext/patches/v8_0/create_address_doc_from_address_field_in_company.py b/erpnext/patches/v8_0/create_address_doc_from_address_field_in_company.py
deleted file mode 100644
index cf1bc5af05..0000000000
--- a/erpnext/patches/v8_0/create_address_doc_from_address_field_in_company.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- # new field address_html is created in place of address field for the company's address in PR #8754 (without patch)
- # so here is the patch for moving the address details in the address doc
- company_list = []
- if 'address' in frappe.db.get_table_columns('Company'):
- company_list = frappe.db.sql('''select name, address from `tabCompany`
- where address is not null and address != ""''', as_dict=1)
-
- for company in company_list:
- add_list = company.address.split(" ")
- if ',' in company.address:
- add_list = company.address.rpartition(',')
- elif ' ' in company.address:
- add_list = company.address.rpartition(' ')
- else:
- add_list = [company.address, None, company.address]
-
- doc = frappe.get_doc({
- "doctype":"Address",
- "address_line1": add_list[0],
- "city": add_list[2],
- "links": [{
- "link_doctype": "Company",
- "link_name": company.name
- }]
- })
- doc.save()
diff --git a/erpnext/patches/v8_0/create_domain_docs.py b/erpnext/patches/v8_0/create_domain_docs.py
deleted file mode 100644
index 3ef4f3c1bb..0000000000
--- a/erpnext/patches/v8_0/create_domain_docs.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-import erpnext
-
-def execute():
- """Create domain documents"""
- frappe.reload_doc("core", "doctype", "domain")
- frappe.reload_doc("core", "doctype", "domain_settings")
- frappe.reload_doc("core", "doctype", "has_domain")
- frappe.reload_doc("core", "doctype", "role")
-
- for domain in ("Distribution", "Manufacturing", "Retail", "Services", "Education"):
- if not frappe.db.exists({"doctype": "Domain", "domain": domain}):
- create_domain(domain)
-
- # set domain in domain settings based on company domain
-
- domains = []
- condition = ""
- company = erpnext.get_default_company()
- if company:
- condition = " and name={0}".format(frappe.db.escape(company))
-
- domains = frappe.db.sql_list("select distinct domain from `tabCompany` where domain != 'Other' {0}".format(condition))
-
- if not domains:
- return
-
- domain_settings = frappe.get_doc("Domain Settings", "Domain Settings")
- checked_domains = [row.domain for row in domain_settings.active_domains]
-
- for domain in domains:
- # check and ignore if the domains is already checked in domain settings
- if domain in checked_domains:
- continue
-
- if not frappe.db.get_value("Domain", domain):
- # user added custom domain in companies domain field
- create_domain(domain)
-
- row = domain_settings.append("active_domains", dict(domain=domain))
-
- domain_settings.save(ignore_permissions=True)
-
-def create_domain(domain):
- # create new domain
-
- doc = frappe.new_doc("Domain")
- doc.domain = domain
- doc.db_update()
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/delete_bin_indexes.py b/erpnext/patches/v8_0/delete_bin_indexes.py
deleted file mode 100644
index 12cacdb952..0000000000
--- a/erpnext/patches/v8_0/delete_bin_indexes.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-# -*- coding: utf-8 -*-
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- # delete bin indexes
- unwanted_indexes = ["item_code", "warehouse"]
-
- for k in unwanted_indexes:
- try:
- frappe.db.sql("drop index {0} on `tabBin`".format(k))
- except:
- pass
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/delete_schools_depricated_doctypes.py b/erpnext/patches/v8_0/delete_schools_depricated_doctypes.py
deleted file mode 100644
index 09a78ed3ca..0000000000
--- a/erpnext/patches/v8_0/delete_schools_depricated_doctypes.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2017, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- """ delete doctypes """
-
- if frappe.db.exists("DocType", "Grading Structure"):
- frappe.delete_doc("DocType", "Grading Structure", force=1)
-
- if frappe.db.exists("DocType", "Grade Interval"):
- frappe.delete_doc("DocType", "Grade Interval", force=1)
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/disable_instructor_role.py b/erpnext/patches/v8_0/disable_instructor_role.py
deleted file mode 100644
index 4ba78d172c..0000000000
--- a/erpnext/patches/v8_0/disable_instructor_role.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- """
- disable the instructor role for companies with domain other than
- Education.
- """
-
- domains = frappe.db.sql_list("select domain from tabCompany")
- if "Education" not in domains:
- if frappe.db.exists("Role", "Instructor"):
- role = frappe.get_doc("Role", "Instructor")
- role.disabled = 1
- role.save(ignore_permissions=True)
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/enable_booking_asset_depreciation_automatically.py b/erpnext/patches/v8_0/enable_booking_asset_depreciation_automatically.py
deleted file mode 100644
index 1088d702dd..0000000000
--- a/erpnext/patches/v8_0/enable_booking_asset_depreciation_automatically.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.db.set_value("Accounts Settings", None,
- "book_asset_depreciation_entry_automatically", 1)
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/fix_status_for_invoices_with_negative_outstanding.py b/erpnext/patches/v8_0/fix_status_for_invoices_with_negative_outstanding.py
deleted file mode 100644
index 2e7f360c97..0000000000
--- a/erpnext/patches/v8_0/fix_status_for_invoices_with_negative_outstanding.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- for dt, status in [["Sales Invoice", "Credit Note Issued"], ["Purchase Invoice", "Debit Note Issued"]]:
- invoices = frappe.db.sql("""
- select name
- from `tab{0}`
- where
- status = %s
- and outstanding_amount < 0
- and docstatus=1
- and is_return=0
- """.format(dt), status)
-
- for inv in invoices:
- return_inv = frappe.db.sql("""select name from `tab{0}`
- where is_return=1 and return_against=%s and docstatus=1""".format(dt), inv[0])
- if not return_inv:
- frappe.db.sql("update `tab{0}` set status='Paid' where name = %s".format(dt), inv[0])
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/make_payments_table_blank_for_non_pos_invoice.py b/erpnext/patches/v8_0/make_payments_table_blank_for_non_pos_invoice.py
deleted file mode 100644
index 9750fb7222..0000000000
--- a/erpnext/patches/v8_0/make_payments_table_blank_for_non_pos_invoice.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype('Sales Invoice')
-
- frappe.db.sql("""
- delete from
- `tabSales Invoice Payment`
- where
- parent in (select name from `tabSales Invoice` where is_pos = 0)
- """)
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/merge_student_batch_and_student_group.py b/erpnext/patches/v8_0/merge_student_batch_and_student_group.py
deleted file mode 100644
index fb9021fd68..0000000000
--- a/erpnext/patches/v8_0/merge_student_batch_and_student_group.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.utils.rename_field import *
-from frappe.model.mapper import get_mapped_doc
-
-
-def execute():
- # for converting student batch into student group
- for doctype in ["Student Group", "Student Group Student", 'Program Enrollment',
- "Student Group Instructor", "Student Attendance", "Student", "Student Batch Name"]:
- # 'Schools' module changed to the 'Education'
- # frappe.reload_doc("schools", "doctype", frappe.scrub(doctype))
-
- frappe.reload_doc("education", "doctype", frappe.scrub(doctype))
-
- if frappe.db.table_exists("Student Batch"):
- student_batches = frappe.db.sql('''select name as student_group_name, student_batch_name as batch,
- program, academic_year, academic_term from `tabStudent Batch`''', as_dict=1)
-
- for student_batch in student_batches:
- # create student batch name if does not exists !!
- if student_batch.get("batch") and not frappe.db.exists("Student Batch Name", student_batch.get("batch")):
- frappe.get_doc({
- "doctype": "Student Batch Name",
- "batch_name": student_batch.get("batch")
- }).insert(ignore_permissions=True)
-
- student_batch.update({"doctype":"Student Group", "group_based_on": "Batch"})
- doc = frappe.get_doc(student_batch)
-
- if frappe.db.sql("SHOW COLUMNS FROM `tabStudent Batch Student` LIKE 'active'"):
- cond = ", active"
- else:
- cond = " "
- student_list = frappe.db.sql('''select student, student_name {cond} from `tabStudent Batch Student`
- where parent=%s'''.format(cond=cond), (doc.student_group_name), as_dict=1)
-
- if student_list:
- for i, student in enumerate(student_list):
- student.update({"group_roll_number": i+1})
- doc.extend("students", student_list)
-
- instructor_list = None
- if frappe.db.table_exists("Student Batch Instructor"):
- instructor_list = frappe.db.sql('''select instructor, instructor_name from `tabStudent Batch Instructor`
- where parent=%s''', (doc.student_group_name), as_dict=1)
- if instructor_list:
- doc.extend("instructors", instructor_list)
- doc.save()
-
- # delete the student batch and child-table
- if frappe.db.table_exists("Student Batch"):
- frappe.delete_doc("DocType", "Student Batch", force=1)
- if frappe.db.table_exists("Student Batch Student"):
- frappe.delete_doc("DocType", "Student Batch Student", force=1)
- if frappe.db.table_exists("Student Batch Instructor"):
- frappe.delete_doc("DocType", "Student Batch Instructor", force=1)
-
- # delete the student batch creation tool
- if frappe.db.table_exists("Student Batch Creation Tool"):
- frappe.delete_doc("DocType", "Student Batch Creation Tool", force=1)
-
- # delete the student batch creation tool
- if frappe.db.table_exists("Attendance Tool Student"):
- frappe.delete_doc("DocType", "Attendance Tool Student", force=1)
-
- # change the student batch to student group in the student attendance
- table_columns = frappe.db.get_table_columns("Student Attendance")
- if "student_batch" in table_columns:
- rename_field("Student Attendance", "student_batch", "student_group")
diff --git a/erpnext/patches/v8_0/move_account_head_from_account_to_warehouse_for_inventory.py b/erpnext/patches/v8_0/move_account_head_from_account_to_warehouse_for_inventory.py
deleted file mode 100644
index b59d81831f..0000000000
--- a/erpnext/patches/v8_0/move_account_head_from_account_to_warehouse_for_inventory.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype("Warehouse")
- frappe.db.sql("""
- update
- `tabWarehouse`
- set
- account = (select name from `tabAccount`
- where account_type = 'Stock' and
- warehouse = `tabWarehouse`.name and is_group = 0 limit 1)""")
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/move_perpetual_inventory_setting.py b/erpnext/patches/v8_0/move_perpetual_inventory_setting.py
deleted file mode 100644
index 78322d4575..0000000000
--- a/erpnext/patches/v8_0/move_perpetual_inventory_setting.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype('Company')
- enabled = frappe.db.get_single_value("Accounts Settings", "auto_accounting_for_stock") or 0
- for data in frappe.get_all('Company', fields = ["name"]):
- doc = frappe.get_doc('Company', data.name)
- doc.enable_perpetual_inventory = enabled
- doc.db_update()
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/rename_is_sample_item_to_allow_zero_valuation_rate.py b/erpnext/patches/v8_0/rename_is_sample_item_to_allow_zero_valuation_rate.py
deleted file mode 100644
index e517df5fdb..0000000000
--- a/erpnext/patches/v8_0/rename_is_sample_item_to_allow_zero_valuation_rate.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe.model.utils.rename_field import rename_field
-
-def execute():
-
- doc_list = ["Purchase Invoice Item", "Stock Entry Detail", "Delivery Note Item",
- "Purchase Receipt Item", "Sales Invoice Item"]
-
- for doctype in doc_list:
- frappe.reload_doctype(doctype)
- if "is_sample_item" in frappe.db.get_table_columns(doctype):
- rename_field(doctype, "is_sample_item", "allow_zero_valuation_rate")
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/rename_items_in_status_field_of_material_request.py b/erpnext/patches/v8_0/rename_items_in_status_field_of_material_request.py
deleted file mode 100644
index 5ad862a436..0000000000
--- a/erpnext/patches/v8_0/rename_items_in_status_field_of_material_request.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.db.sql(
- """
- UPDATE `tabMaterial Request`
- SET status = CASE
- WHEN docstatus = 2 THEN 'Cancelled'
- WHEN docstatus = 0 THEN 'Draft'
- ELSE CASE
- WHEN status = 'Stopped' THEN 'Stopped'
- WHEN status != 'Stopped' AND per_ordered = 0 THEN 'Pending'
- WHEN per_ordered < 100 AND per_ordered > 0 AND status != 'Stopped'
- THEN 'Partially Ordered'
- WHEN per_ordered = 100 AND material_request_type = 'Purchase'
- AND status != 'Stopped' THEN 'Ordered'
- WHEN per_ordered = 100 AND material_request_type = 'Material Transfer'
- AND status != 'Stopped' THEN 'Transferred'
- WHEN per_ordered = 100 AND material_request_type = 'Material Issue'
- AND status != 'Stopped' THEN 'Issued'
- END
- END
- """
- )
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/rename_total_margin_to_rate_with_margin.py b/erpnext/patches/v8_0/rename_total_margin_to_rate_with_margin.py
deleted file mode 100644
index 4065438796..0000000000
--- a/erpnext/patches/v8_0/rename_total_margin_to_rate_with_margin.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-from frappe.model.utils.rename_field import rename_field
-
-def execute():
- """
- Rename Total Margin field to Rate With Margin in
- "Sales Order Item", "Sales Invoice Item", "Delivery Note Item",
- "Quotation Item"
- """
-
- for d in ("Sales Order Item", "Sales Invoice Item",
- "Delivery Note Item", "Quotation Item"):
- frappe.reload_doctype(d)
- rename_field_if_exists(d, "total_margin", "rate_with_margin")
-
-
-def rename_field_if_exists(doctype, old_fieldname, new_fieldname):
- try:
- rename_field(doctype, old_fieldname, new_fieldname)
- except Exception as e:
- if e.args[0] != 1054:
- raise
diff --git a/erpnext/patches/v8_0/repost_reserved_qty_for_multiple_sales_uom.py b/erpnext/patches/v8_0/repost_reserved_qty_for_multiple_sales_uom.py
deleted file mode 100644
index 3030b8e2f3..0000000000
--- a/erpnext/patches/v8_0/repost_reserved_qty_for_multiple_sales_uom.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from erpnext.stock.stock_balance import update_bin_qty, get_reserved_qty
-
-def execute():
- for doctype in ("Sales Order Item", "Bin"):
- frappe.reload_doctype(doctype)
-
- repost_for = frappe.db.sql("""select distinct item_code, warehouse
- from `tabSales Order Item` where docstatus=1 and uom != stock_uom and
- exists(select name from tabItem where name=`tabSales Order Item`.item_code and ifnull(is_stock_item, 0)=1)""")
-
- for item_code, warehouse in repost_for:
- update_bin_qty(item_code, warehouse, {
- "reserved_qty": get_reserved_qty(item_code, warehouse)
- })
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/revert_manufacturers_table_from_item.py b/erpnext/patches/v8_0/revert_manufacturers_table_from_item.py
deleted file mode 100644
index 60cbb33b80..0000000000
--- a/erpnext/patches/v8_0/revert_manufacturers_table_from_item.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- if frappe.db.exists("DocType", "Item Manufacturer"):
- frappe.reload_doctype("Item")
- item_manufacturers = frappe.db.sql("""
- select parent, manufacturer, manufacturer_part_no
- from `tabItem Manufacturer`
- """, as_dict=1)
-
- for im in item_manufacturers:
- frappe.db.sql("""
- update tabItem
- set manufacturer=%s, manufacturer_part_no=%s
- where name=%s
- """, (im.manufacturer, im.manufacturer_part_no, im.parent))
-
- frappe.delete_doc("DocType", "Item Manufacturer")
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/save_system_settings.py b/erpnext/patches/v8_0/save_system_settings.py
deleted file mode 100644
index d479ece8a6..0000000000
--- a/erpnext/patches/v8_0/save_system_settings.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.utils import cint
-
-def execute():
- """
- save system settings document
- """
-
- frappe.reload_doc("core", "doctype", "system_settings")
- doc = frappe.get_doc("System Settings")
- doc.flags.ignore_mandatory = True
-
- if cint(doc.currency_precision) == 0:
- doc.currency_precision = ''
-
- doc.save(ignore_permissions=True)
diff --git a/erpnext/patches/v8_0/set_null_to_serial_nos_for_disabled_sales_invoices.py b/erpnext/patches/v8_0/set_null_to_serial_nos_for_disabled_sales_invoices.py
deleted file mode 100644
index 197d6ded61..0000000000
--- a/erpnext/patches/v8_0/set_null_to_serial_nos_for_disabled_sales_invoices.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from erpnext.stock.stock_balance import update_bin_qty, get_reserved_qty
-
-def execute():
- frappe.db.sql("""
- update
- `tabSales Invoice Item`
- set serial_no = NULL
- where
- parent in (select name from `tabSales Invoice` where update_stock = 0 and docstatus = 1)""")
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/set_project_copied_from.py b/erpnext/patches/v8_0/set_project_copied_from.py
deleted file mode 100644
index d4287978cf..0000000000
--- a/erpnext/patches/v8_0/set_project_copied_from.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype("Project")
-
- frappe.db.sql('''
- UPDATE `tabProject`
- SET copied_from=name
- WHERE copied_from is NULL
- ''')
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/set_sales_invoice_serial_number_from_delivery_note.py b/erpnext/patches/v8_0/set_sales_invoice_serial_number_from_delivery_note.py
deleted file mode 100644
index 8a4ef4086b..0000000000
--- a/erpnext/patches/v8_0/set_sales_invoice_serial_number_from_delivery_note.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from erpnext.stock.stock_balance import update_bin_qty, get_reserved_qty
-
-def execute():
- """ Set the Serial Numbers in Sales Invoice Item from Delivery Note Item """
-
- frappe.reload_doc("stock", "doctype", "serial_no")
-
- frappe.db.sql(""" update `tabSales Invoice Item` sii inner join
- `tabDelivery Note Item` dni on sii.dn_detail=dni.name and sii.qty=dni.qty
- set sii.serial_no=dni.serial_no where sii.parent IN (select si.name
- from `tabSales Invoice` si where si.update_stock=0 and si.docstatus=1)""")
-
- items = frappe.db.sql(""" select sii.parent, sii.serial_no from `tabSales Invoice Item` sii
- left join `tabSales Invoice` si on sii.parent=si.name
- where si.docstatus=1 and si.update_stock=0""", as_dict=True)
-
- for item in items:
- sales_invoice = item.get("parent", None)
- serial_nos = item.get("serial_no", "")
-
- if not sales_invoice or not serial_nos:
- continue
-
- serial_nos = ["{}".format(frappe.db.escape(no)) for no in serial_nos.split("\n")]
-
- frappe.db.sql("""
- UPDATE
- `tabSerial No`
- SET
- sales_invoice={sales_invoice}
- WHERE
- name in ({serial_nos})
- """.format(
- sales_invoice=frappe.db.escape(sales_invoice),
- serial_nos=",".join(serial_nos)
- )
- )
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/update_customer_pos_id.py b/erpnext/patches/v8_0/update_customer_pos_id.py
deleted file mode 100644
index a772ae90c5..0000000000
--- a/erpnext/patches/v8_0/update_customer_pos_id.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype("Customer")
- frappe.db.sql(""" update `tabCustomer` set customer_pos_id = name """)
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/update_production_orders.py b/erpnext/patches/v8_0/update_production_orders.py
deleted file mode 100644
index 8e993cc102..0000000000
--- a/erpnext/patches/v8_0/update_production_orders.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- # reload schema
- for doctype in ("Work Order", "Work Order Item", "Work Order Operation",
- "BOM Item", "BOM Explosion Item", "BOM"):
- frappe.reload_doctype(doctype)
-
- frappe.reload_doc("stock", "doctype", "item")
- frappe.reload_doc("stock", "doctype", "item_default")
-
- # fetch all draft and submitted work orders
- fields = ["name"]
- if "source_warehouse" in frappe.db.get_table_columns("Work Order"):
- fields.append("source_warehouse")
-
- wo_orders = frappe.get_all("Work Order", filters={"docstatus": ["!=", 2]}, fields=fields)
-
- count = 0
- for p in wo_orders:
- wo_order = frappe.get_doc("Work Order", p.name)
- count += 1
-
- # set required items table
- wo_order.set_required_items()
-
- for item in wo_order.get("required_items"):
- # set source warehouse based on parent
- if not item.source_warehouse and "source_warehouse" in fields:
- item.source_warehouse = wo_order.get("source_warehouse")
- item.db_update()
-
- if wo_order.docstatus == 1:
- # update transferred qty based on Stock Entry, it also updates db
- wo_order.update_transaferred_qty_for_required_items()
-
- # Set status where it was 'Unstopped', as it is deprecated
- if wo_order.status == "Unstopped":
- status = wo_order.get_status()
- wo_order.db_set("status", status)
- elif wo_order.status == "Stopped":
- wo_order.update_reserved_qty_for_production()
-
- if count % 200 == 0:
- frappe.db.commit()
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/update_sales_cost_in_project.py b/erpnext/patches/v8_0/update_sales_cost_in_project.py
deleted file mode 100644
index 1a29fc4db4..0000000000
--- a/erpnext/patches/v8_0/update_sales_cost_in_project.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc("projects", "doctype", "project")
-
- frappe.db.sql("""
- update `tabProject` p
- set total_sales_amount = ifnull((select sum(base_grand_total)
- from `tabSales Order` where project=p.name and docstatus=1), 0)
- """)
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/update_status_as_paid_for_completed_expense_claim.py b/erpnext/patches/v8_0/update_status_as_paid_for_completed_expense_claim.py
deleted file mode 100644
index 19d27b206b..0000000000
--- a/erpnext/patches/v8_0/update_status_as_paid_for_completed_expense_claim.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- """ set status as Paid in Expense Claim if total_sactioned_amount
- and total_amount_reimbursed is equal """
-
- frappe.reload_doctype('Expense Claim')
-
- frappe.db.sql("""
- update
- `tabExpense Claim`
- set status = 'Paid'
- where
- total_sanctioned_amount = total_amount_reimbursed
- """)
diff --git a/erpnext/patches/v8_0/update_stock_qty_value_in_bom_item.py b/erpnext/patches/v8_0/update_stock_qty_value_in_bom_item.py
deleted file mode 100644
index 1f937bb8af..0000000000
--- a/erpnext/patches/v8_0/update_stock_qty_value_in_bom_item.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc('manufacturing', 'doctype', 'bom_item')
- frappe.reload_doc('manufacturing', 'doctype', 'bom_explosion_item')
- frappe.reload_doc('manufacturing', 'doctype', 'bom_scrap_item')
- frappe.db.sql("update `tabBOM Item` set stock_qty = qty, uom = stock_uom, conversion_factor = 1")
- frappe.db.sql("update `tabBOM Explosion Item` set stock_qty = qty")
- if "qty" in frappe.db.get_table_columns("BOM Scrap Item"):
- frappe.db.sql("update `tabBOM Scrap Item` set stock_qty = qty")
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/update_stock_qty_value_in_purchase_invoice.py b/erpnext/patches/v8_0/update_stock_qty_value_in_purchase_invoice.py
deleted file mode 100644
index be5cf3aed7..0000000000
--- a/erpnext/patches/v8_0/update_stock_qty_value_in_purchase_invoice.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc('accounts', 'doctype', 'purchase_invoice_item')
- frappe.db.sql("update `tabPurchase Invoice Item` set stock_qty = qty, stock_uom = uom")
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/update_student_groups_from_student_batches.py b/erpnext/patches/v8_0/update_student_groups_from_student_batches.py
deleted file mode 100644
index ae24fe4a14..0000000000
--- a/erpnext/patches/v8_0/update_student_groups_from_student_batches.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.utils.rename_field import *
-from frappe.model.mapper import get_mapped_doc
-
-
-def execute():
- if frappe.db.table_exists("Student Batch"):
- student_batches = frappe.db.sql('''select name from `tabStudent Batch`''', as_dict=1)
-
- for student_batch in student_batches:
- if frappe.db.exists("Student Group", student_batch.get("name")):
- student_group = frappe.get_doc("Student Group", student_batch.get("name"))
-
- if frappe.db.table_exists("Student Batch Student"):
- current_student_list = frappe.db.sql_list('''select student from `tabStudent Group Student`
- where parent=%s''', (student_group.name))
- batch_student_list = frappe.db.sql_list('''select student from `tabStudent Batch Student`
- where parent=%s''', (student_group.name))
-
- student_list = list(set(batch_student_list)-set(current_student_list))
- if student_list:
- student_group.extend("students", [{"student":d} for d in student_list])
-
- if frappe.db.table_exists("Student Batch Instructor"):
- current_instructor_list = frappe.db.sql_list('''select instructor from `tabStudent Group Instructor`
- where parent=%s''', (student_group.name))
- batch_instructor_list = frappe.db.sql_list('''select instructor from `tabStudent Batch Instructor`
- where parent=%s''', (student_group.name))
-
- instructor_list = list(set(batch_instructor_list)-set(current_instructor_list))
- if instructor_list:
- student_group.extend("instructors", [{"instructor":d} for d in instructor_list])
-
- student_group.save()
diff --git a/erpnext/patches/v8_0/update_supplier_address_in_stock_entry.py b/erpnext/patches/v8_0/update_supplier_address_in_stock_entry.py
deleted file mode 100644
index a2173048fd..0000000000
--- a/erpnext/patches/v8_0/update_supplier_address_in_stock_entry.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- # copy supplier_address to address_display, and set supplier_address to blank
-
- stock_entries = frappe.db.sql(""" select name, purchase_order, supplier_address from `tabStock Entry`
- where ifnull(supplier_address, '') <> ''""", as_dict=True)
-
- frappe.reload_doc('stock', 'doctype', 'stock_entry')
-
- for stock_entry in stock_entries:
- # move supplier address to address_display, and fetch the supplier address from purchase order
-
- se = frappe.get_doc("Stock Entry", stock_entry.get("name"))
- se.address_display = stock_entry.get("supplier_address")
- se.supplier_address = frappe.db.get_value("Purchase Order", stock_entry.get("purchase_order"),"supplier_address") or None
-
- se.db_update()
diff --git a/erpnext/patches/v8_1/__init__.py b/erpnext/patches/v8_1/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/erpnext/patches/v8_1/add_hsn_sac_codes.py b/erpnext/patches/v8_1/add_hsn_sac_codes.py
deleted file mode 100644
index 0fce96a8d4..0000000000
--- a/erpnext/patches/v8_1/add_hsn_sac_codes.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from erpnext.regional.india.setup import setup
-
-def execute():
- company = frappe.get_all('Company', filters = {'country': 'India'})
- if not company:
- return
-
- # call setup for india
- setup(patch=True)
\ No newline at end of file
diff --git a/erpnext/patches/v8_1/add_indexes_in_transaction_doctypes.py b/erpnext/patches/v8_1/add_indexes_in_transaction_doctypes.py
deleted file mode 100644
index 4631602606..0000000000
--- a/erpnext/patches/v8_1/add_indexes_in_transaction_doctypes.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- for dt in ("Sales Order Item", "Purchase Order Item",
- "Material Request Item", "Work Order Item", "Packed Item"):
- frappe.get_doc("DocType", dt).run_module_method("on_doctype_update")
\ No newline at end of file
diff --git a/erpnext/patches/v8_1/allow_invoice_copy_to_edit_after_submit.py b/erpnext/patches/v8_1/allow_invoice_copy_to_edit_after_submit.py
deleted file mode 100644
index 4c606af424..0000000000
--- a/erpnext/patches/v8_1/allow_invoice_copy_to_edit_after_submit.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- inv_copy_options = "ORIGINAL FOR RECIPIENT\nDUPLICATE FOR TRANSPORTER\nDUPLICATE FOR SUPPLIER\nTRIPLICATE FOR SUPPLIER"
-
- frappe.db.sql("""update `tabCustom Field` set allow_on_submit=1, options=%s
- where fieldname='invoice_copy' and dt = 'Sales Invoice'
- """, inv_copy_options)
-
- frappe.db.sql("""update `tabCustom Field` set read_only=1
- where fieldname='gst_state_number' and dt = 'Address'
- """)
diff --git a/erpnext/patches/v8_1/delete_deprecated_reports.py b/erpnext/patches/v8_1/delete_deprecated_reports.py
deleted file mode 100644
index 3e0fdee719..0000000000
--- a/erpnext/patches/v8_1/delete_deprecated_reports.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- """ delete deprecated reports """
-
- reports = [
- "Monthly Salary Register", "Customer Addresses And Contacts",
- "Supplier Addresses And Contacts"
- ]
-
- for report in reports:
- if frappe.db.exists("Report", report):
- check_and_update_auto_email_report(report)
- frappe.db.commit()
-
- frappe.delete_doc("Report", report, ignore_permissions=True)
-
-def check_and_update_auto_email_report(report):
- """ delete or update auto email report for deprecated report """
-
- auto_email_report = frappe.db.get_value("Auto Email Report", {"report": report})
- if not auto_email_report:
- return
-
- if report == "Monthly Salary Register":
- frappe.delete_doc("Auto Email Report", auto_email_report)
-
- elif report in ["Customer Addresses And Contacts", "Supplier Addresses And Contacts"]:
- frappe.db.set_value("Auto Email Report", auto_email_report, "report", report)
\ No newline at end of file
diff --git a/erpnext/patches/v8_1/gst_fixes.py b/erpnext/patches/v8_1/gst_fixes.py
deleted file mode 100644
index 34255eb0a4..0000000000
--- a/erpnext/patches/v8_1/gst_fixes.py
+++ /dev/null
@@ -1,62 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe.custom.doctype.custom_field.custom_field import create_custom_field
-from erpnext.regional.address_template.setup import set_up_address_templates
-
-
-def execute():
- company = frappe.get_all('Company', filters = {'country': 'India'})
- if not company:
- return
-
- update_existing_custom_fields()
- add_custom_fields()
- set_up_address_templates(default_country='India')
- frappe.reload_doc("regional", "print_format", "gst_tax_invoice")
-
-
-def update_existing_custom_fields():
- frappe.db.sql("""update `tabCustom Field` set label = 'HSN/SAC'
- where fieldname='gst_hsn_code' and label='GST HSN Code'
- """)
-
- frappe.db.sql("""update `tabCustom Field` set print_hide = 1
- where fieldname in ('customer_gstin', 'supplier_gstin', 'company_gstin')
- """)
-
- frappe.db.sql("""update `tabCustom Field` set insert_after = 'address_display'
- where fieldname in ('customer_gstin', 'supplier_gstin')
- """)
-
- frappe.db.sql("""update `tabCustom Field` set insert_after = 'company_address_display'
- where fieldname = 'company_gstin'
- """)
-
- frappe.db.sql("""update `tabCustom Field` set insert_after = 'description'
- where fieldname='gst_hsn_code' and dt in ('Sales Invoice Item', 'Purchase Invoice Item')
- """)
-
-
-def add_custom_fields():
- hsn_sac_field = dict(fieldname='gst_hsn_code', label='HSN/SAC',
- fieldtype='Data', options='item_code.gst_hsn_code', insert_after='description')
-
- custom_fields = {
- 'Address': [
- dict(fieldname='gst_state_number', label='GST State Number',
- fieldtype='Int', insert_after='gst_state'),
- ],
- 'Sales Invoice': [
- dict(fieldname='invoice_copy', label='Invoice Copy',
- fieldtype='Select', insert_after='project', print_hide=1, allow_on_submit=1,
- options='ORIGINAL FOR RECIPIENT\nDUPLICATE FOR TRANSPORTER\nTRIPLICATE FOR SUPPLIER'),
- ],
- 'Sales Order Item': [hsn_sac_field],
- 'Delivery Note Item': [hsn_sac_field],
- 'Purchase Order Item': [hsn_sac_field],
- 'Purchase Receipt Item': [hsn_sac_field]
- }
-
- for doctype, fields in custom_fields.items():
- for df in fields:
- create_custom_field(doctype, df)
diff --git a/erpnext/patches/v8_1/remove_sales_invoice_from_returned_serial_no.py b/erpnext/patches/v8_1/remove_sales_invoice_from_returned_serial_no.py
deleted file mode 100644
index 3962f8f1f2..0000000000
--- a/erpnext/patches/v8_1/remove_sales_invoice_from_returned_serial_no.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype("Serial No")
-
- frappe.db.sql("""
- update
- `tabSerial No`
- set
- sales_invoice = NULL
- where
- sales_invoice in (select return_against from
- `tabSales Invoice` where docstatus =1 and is_return=1)
- and sales_invoice is not null and sales_invoice !='' """)
\ No newline at end of file
diff --git a/erpnext/patches/v8_1/removed_report_support_hours.py b/erpnext/patches/v8_1/removed_report_support_hours.py
deleted file mode 100644
index 0936b2231b..0000000000
--- a/erpnext/patches/v8_1/removed_report_support_hours.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.db.sql(""" update `tabAuto Email Report` set report = %s
- where name = %s""", ('Support Hour Distribution', 'Support Hours'))
-
- frappe.db.sql(""" update `tabCustom Role` set report = %s
- where report = %s""", ('Support Hour Distribution', 'Support Hours'))
-
- frappe.delete_doc('Report', 'Support Hours')
\ No newline at end of file
diff --git a/erpnext/patches/v8_1/set_delivery_date_in_so_item.py b/erpnext/patches/v8_1/set_delivery_date_in_so_item.py
deleted file mode 100644
index af2d28b857..0000000000
--- a/erpnext/patches/v8_1/set_delivery_date_in_so_item.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype("Sales Order")
- frappe.reload_doctype("Sales Order Item")
-
- if "final_delivery_date" in frappe.db.get_table_columns("Sales Order"):
- frappe.db.sql("""
- update `tabSales Order`
- set delivery_date = final_delivery_date
- where (delivery_date is null or delivery_date = '0000-00-00')
- and order_type = 'Sales'""")
-
- frappe.db.sql("""
- update `tabSales Order` so, `tabSales Order Item` so_item
- set so_item.delivery_date = so.delivery_date
- where so.name = so_item.parent
- and so.order_type = 'Sales'
- and (so_item.delivery_date is null or so_item.delivery_date = '0000-00-00')
- and (so.delivery_date is not null and so.delivery_date != '0000-00-00')
- """)
\ No newline at end of file
diff --git a/erpnext/patches/v8_1/update_expense_claim_status.py b/erpnext/patches/v8_1/update_expense_claim_status.py
deleted file mode 100644
index 4c1b85a13f..0000000000
--- a/erpnext/patches/v8_1/update_expense_claim_status.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype('Expense Claim')
-
- for data in frappe.db.sql(""" select name from `tabExpense Claim`
- where (docstatus=1 and total_sanctioned_amount=0 and status = 'Paid') or
- (docstatus = 1 and approval_status = 'Rejected' and total_sanctioned_amount > 0)""", as_dict=1):
- doc = frappe.get_doc('Expense Claim', data.name)
- if doc.approval_status == 'Rejected':
- for d in doc.expenses:
- d.db_set("sanctioned_amount", 0, update_modified = False)
- doc.db_set("total_sanctioned_amount", 0, update_modified = False)
-
- frappe.db.sql(""" delete from `tabGL Entry` where voucher_type = 'Expense Claim'
- and voucher_no = %s""", (doc.name))
-
- doc.set_status()
- doc.db_set("status", doc.status, update_modified = False)
\ No newline at end of file
diff --git a/erpnext/patches/v8_1/update_gst_state.py b/erpnext/patches/v8_1/update_gst_state.py
deleted file mode 100644
index 7aaf2d5ff3..0000000000
--- a/erpnext/patches/v8_1/update_gst_state.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from erpnext.regional.india import states
-
-def execute():
- company = frappe.get_all('Company', filters = {'country': 'India'})
- if not company:
- return
-
- if not frappe.db.get_value("Custom Field", filters={'fieldname':'gst_state'}):
- return
-
- frappe.db.sql("update `tabCustom Field` set options=%s where fieldname='gst_state'", '\n'.join(states))
- frappe.db.sql("update `tabAddress` set gst_state='Chhattisgarh' where gst_state='Chattisgarh'")
- frappe.db.sql("update `tabAddress` set gst_state_number='05' where gst_state='Uttarakhand'")
diff --git a/erpnext/patches/v8_10/__init__.py b/erpnext/patches/v8_10/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/erpnext/patches/v8_10/change_default_customer_credit_days.py b/erpnext/patches/v8_10/change_default_customer_credit_days.py
deleted file mode 100644
index 992be17da0..0000000000
--- a/erpnext/patches/v8_10/change_default_customer_credit_days.py
+++ /dev/null
@@ -1,89 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-
-def execute():
- frappe.reload_doc("selling", "doctype", "customer")
- frappe.reload_doc("buying", "doctype", "supplier")
- frappe.reload_doc("setup", "doctype", "supplier_type")
- frappe.reload_doc("accounts", "doctype", "payment_term")
- frappe.reload_doc("accounts", "doctype", "payment_terms_template_detail")
- frappe.reload_doc("accounts", "doctype", "payment_terms_template")
-
- payment_terms = []
- records = []
- for doctype in ("Customer", "Supplier", "Supplier Type"):
- credit_days = frappe.db.sql("""
- SELECT DISTINCT `credit_days`, `credit_days_based_on`, `name`
- from `tab{0}`
- where
- ((credit_days_based_on='Fixed Days' or credit_days_based_on is null)
- and credit_days is not null)
- or credit_days_based_on='Last Day of the Next Month'
- """.format(doctype))
-
- credit_records = ((record[0], record[1], record[2]) for record in credit_days)
- for days, based_on, party_name in credit_records:
- if based_on == "Fixed Days":
- pyt_template_name = 'Default Payment Term - N{0}'.format(days)
- else:
- pyt_template_name = 'Default Payment Term - EO2M'
-
- if not frappe.db.exists("Payment Terms Template", pyt_template_name):
- payment_term = make_payment_term(days, based_on)
- template = make_template(payment_term)
- else:
- template = frappe.get_doc("Payment Terms Template", pyt_template_name)
-
- payment_terms.append('WHEN `name`={0} THEN {1}'.format(frappe.db.escape(party_name), template.template_name))
- records.append(frappe.db.escape(party_name))
-
- begin_query_str = "UPDATE `tab{0}` SET `payment_terms` = CASE ".format(doctype)
- value_query_str = " ".join(payment_terms)
- cond_query_str = " ELSE `payment_terms` END WHERE "
-
- if records:
- frappe.db.sql(
- begin_query_str + value_query_str + cond_query_str + '`name` IN %s',
- (records,)
- )
-
-
-def make_template(payment_term):
- doc = frappe.new_doc('Payment Terms Template Detail')
- doc.payment_term = payment_term.payment_term_name
- doc.due_date_based_on = payment_term.due_date_based_on
- doc.invoice_portion = payment_term.invoice_portion
- doc.description = payment_term.description
- doc.credit_days = payment_term.credit_days
- doc.credit_months = payment_term.credit_months
-
- template = frappe.new_doc('Payment Terms Template')
- template.template_name = 'Default Payment Term - {0}'.format(payment_term.payment_term_name)
- template.append('terms', doc)
- template.save()
-
- return template
-
-
-def make_payment_term(days, based_on):
- based_on_map = {
- 'Fixed Days': 'Day(s) after invoice date',
- 'Last Day of the Next Month': 'Month(s) after the end of the invoice month'
- }
-
- doc = frappe.new_doc('Payment Term')
- doc.due_date_based_on = based_on_map.get(based_on)
- doc.invoice_portion = 100
-
- if based_on == 'Fixed Days':
- doc.credit_days = days
- doc.description = 'Net payable within {0} days'.format(days)
- doc.payment_term_name = 'N{0}'.format(days)
- else:
- doc.credit_months = 1
- doc.description = 'Net payable by the end of next month'
- doc.payment_term_name = 'EO2M'
-
- doc.save()
- return doc
diff --git a/erpnext/patches/v8_3/__init__.py b/erpnext/patches/v8_3/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/erpnext/patches/v8_3/set_restrict_to_domain_for_module_def.py b/erpnext/patches/v8_3/set_restrict_to_domain_for_module_def.py
deleted file mode 100644
index 6c4c6d5bd8..0000000000
--- a/erpnext/patches/v8_3/set_restrict_to_domain_for_module_def.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- """ set the restrict to domain in module def """
- pass
\ No newline at end of file
diff --git a/erpnext/patches/v8_3/update_company_total_sales.py b/erpnext/patches/v8_3/update_company_total_sales.py
deleted file mode 100644
index 78efecb387..0000000000
--- a/erpnext/patches/v8_3/update_company_total_sales.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from erpnext.setup.doctype.company.company import update_company_current_month_sales, update_company_monthly_sales
-
-def execute():
- '''Update company monthly sales history based on sales invoices'''
- frappe.reload_doctype("Company")
- companies = [d['name'] for d in frappe.get_list("Company")]
-
- for company in companies:
- update_company_current_month_sales(company)
- update_company_monthly_sales(company)
diff --git a/erpnext/patches/v8_4/__init__.py b/erpnext/patches/v8_4/__init__.py
deleted file mode 100644
index baffc48825..0000000000
--- a/erpnext/patches/v8_4/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/patches/v8_4/make_scorecard_records.py b/erpnext/patches/v8_4/make_scorecard_records.py
deleted file mode 100644
index 73afa277b4..0000000000
--- a/erpnext/patches/v8_4/make_scorecard_records.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-from erpnext.buying.doctype.supplier_scorecard.supplier_scorecard import make_default_records
-def execute():
- frappe.reload_doc('buying', 'doctype', 'supplier_scorecard_variable')
- frappe.reload_doc('buying', 'doctype', 'supplier_scorecard_standing')
- make_default_records()
\ No newline at end of file
diff --git a/erpnext/patches/v8_5/__init__.py b/erpnext/patches/v8_5/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/erpnext/patches/v8_5/fix_tax_breakup_for_non_invoice_docs.py b/erpnext/patches/v8_5/fix_tax_breakup_for_non_invoice_docs.py
deleted file mode 100644
index 82beba3770..0000000000
--- a/erpnext/patches/v8_5/fix_tax_breakup_for_non_invoice_docs.py
+++ /dev/null
@@ -1,48 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from erpnext.regional.india.setup import make_custom_fields
-from erpnext.controllers.taxes_and_totals import get_itemised_tax_breakup_html
-
-def execute():
- companies = [d.name for d in frappe.get_all('Company', filters = {'country': 'India'})]
- if not companies:
- return
-
- make_custom_fields()
-
- # update invoice copy value
- values = ["Original for Recipient", "Duplicate for Transporter",
- "Duplicate for Supplier", "Triplicate for Supplier"]
- for d in values:
- frappe.db.sql("update `tabSales Invoice` set invoice_copy=%s where invoice_copy=%s", (d, d))
-
- # update tax breakup in transactions made after 1st July 2017
- doctypes = ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice",
- "Supplier Quotation", "Purchase Order", "Purchase Receipt", "Purchase Invoice"]
-
- for doctype in doctypes:
- frappe.reload_doctype(doctype)
-
- date_field = "posting_date"
- if doctype in ["Quotation", "Sales Order", "Supplier Quotation", "Purchase Order"]:
- date_field = "transaction_date"
-
- records = [d.name for d in frappe.get_all(doctype, filters={
- "docstatus": ["!=", 2],
- date_field: [">=", "2017-07-01"],
- "company": ["in", companies],
- "total_taxes_and_charges": [">", 0],
- "other_charges_calculation": ""
- })]
- if records:
- frappe.db.sql("""
- update `tab%s Item` dt_item
- set gst_hsn_code = (select gst_hsn_code from tabItem where name=dt_item.item_code)
- where parent in (%s)
- and (gst_hsn_code is null or gst_hsn_code = '')
- """ % (doctype, ', '.join(['%s']*len(records))), tuple(records))
-
- for record in records:
- doc = frappe.get_doc(doctype, record)
- html = get_itemised_tax_breakup_html(doc)
- doc.db_set("other_charges_calculation", html, update_modified=False)
\ No newline at end of file
diff --git a/erpnext/patches/v8_5/remove_project_type_property_setter.py b/erpnext/patches/v8_5/remove_project_type_property_setter.py
deleted file mode 100644
index 70a08f5377..0000000000
--- a/erpnext/patches/v8_5/remove_project_type_property_setter.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- ps = frappe.db.get_value('Property Setter', dict(doc_type='Project', field_name='project_type',
- property='options'))
- if ps:
- frappe.delete_doc('Property Setter', ps)
-
- project_types = frappe.db.sql_list('select distinct project_type from tabProject')
-
- for project_type in project_types:
- if project_type and not frappe.db.exists("Project Type", project_type):
- p_type = frappe.get_doc({
- "doctype": "Project Type",
- "project_type": project_type
- })
- p_type.insert()
\ No newline at end of file
diff --git a/erpnext/patches/v8_5/remove_quotations_route_in_sidebar.py b/erpnext/patches/v8_5/remove_quotations_route_in_sidebar.py
deleted file mode 100644
index 2d7df4a179..0000000000
--- a/erpnext/patches/v8_5/remove_quotations_route_in_sidebar.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype("Portal Settings")
-
- frappe.db.sql("""
- delete from
- `tabPortal Menu Item`
- where
- (route = '/quotations' and title = 'Supplier Quotation')
- or (route = '/quotation' and title = 'Quotations')
- """)
\ No newline at end of file
diff --git a/erpnext/patches/v8_5/set_default_mode_of_payment.py b/erpnext/patches/v8_5/set_default_mode_of_payment.py
deleted file mode 100644
index 34ecbb0a3c..0000000000
--- a/erpnext/patches/v8_5/set_default_mode_of_payment.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype("POS Profile")
- frappe.reload_doctype("Sales Invoice Payment")
-
- frappe.db.sql("""
- update
- `tabSales Invoice Payment`
- set `tabSales Invoice Payment`.default = 1
- where
- `tabSales Invoice Payment`.parenttype = 'POS Profile'
- and `tabSales Invoice Payment`.idx=1""")
\ No newline at end of file
diff --git a/erpnext/patches/v8_5/update_customer_group_in_POS_profile.py b/erpnext/patches/v8_5/update_customer_group_in_POS_profile.py
deleted file mode 100644
index 2661914401..0000000000
--- a/erpnext/patches/v8_5/update_customer_group_in_POS_profile.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype('POS Profile')
- customer_group = frappe.db.get_single_value('Selling Settings', 'customer_group')
- if customer_group:
- frappe.db.sql(""" update `tabPOS Profile`
- set customer_group = %s where customer_group is null """, (customer_group))
\ No newline at end of file
diff --git a/erpnext/patches/v8_5/update_existing_data_in_project_type.py b/erpnext/patches/v8_5/update_existing_data_in_project_type.py
deleted file mode 100644
index 497da0602e..0000000000
--- a/erpnext/patches/v8_5/update_existing_data_in_project_type.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc("projects", "doctype", "project_type")
- frappe.reload_doc("projects", "doctype", "project")
-
- project_types = ["Internal", "External", "Other"]
-
- for project_type in project_types:
- if not frappe.db.exists("Project Type", project_type):
- p_type = frappe.get_doc({
- "doctype": "Project Type",
- "project_type": project_type
- })
- p_type.insert()
\ No newline at end of file
diff --git a/erpnext/patches/v8_6/__init__.py b/erpnext/patches/v8_6/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/erpnext/patches/v8_6/point_sms_doctype_module_to_frappe_core.py b/erpnext/patches/v8_6/point_sms_doctype_module_to_frappe_core.py
deleted file mode 100644
index 014a74abe3..0000000000
--- a/erpnext/patches/v8_6/point_sms_doctype_module_to_frappe_core.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.db.sql('''UPDATE `tabDocType` SET module="Core"
- WHERE name IN ("SMS Parameter", "SMS Settings");''')
\ No newline at end of file
diff --git a/erpnext/patches/v8_6/rename_bom_update_tool.py b/erpnext/patches/v8_6/rename_bom_update_tool.py
deleted file mode 100644
index ef5f335e45..0000000000
--- a/erpnext/patches/v8_6/rename_bom_update_tool.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.delete_doc_if_exists("DocType", "BOM Replace Tool")
-
- frappe.reload_doctype("BOM")
- frappe.db.sql("update tabBOM set conversion_rate=1 where conversion_rate is null or conversion_rate=0")
- frappe.db.sql("update tabBOM set set_rate_of_sub_assembly_item_based_on_bom=1")
\ No newline at end of file
diff --git a/erpnext/patches/v8_6/set_write_permission_for_quotation_for_sales_manager.py b/erpnext/patches/v8_6/set_write_permission_for_quotation_for_sales_manager.py
deleted file mode 100644
index db4f94748e..0000000000
--- a/erpnext/patches/v8_6/set_write_permission_for_quotation_for_sales_manager.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- # Set write permission to permlevel 1 for sales manager role in Quotation doctype
- frappe.db.sql(""" update `tabCustom DocPerm` set `tabCustom DocPerm`.write = 1
- where `tabCustom DocPerm`.parent = 'Quotation' and `tabCustom DocPerm`.role = 'Sales Manager'
- and `tabCustom DocPerm`.permlevel = 1 """)
\ No newline at end of file
diff --git a/erpnext/patches/v8_6/update_timesheet_company_from_PO.py b/erpnext/patches/v8_6/update_timesheet_company_from_PO.py
deleted file mode 100644
index 2d46bee7ca..0000000000
--- a/erpnext/patches/v8_6/update_timesheet_company_from_PO.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype('Timesheet')
- company = frappe.get_all('Company')
-
- #Check more than one company exists
- if len(company) > 1:
- frappe.db.sql(""" update `tabTimesheet` set `tabTimesheet`.company =
- (select company from `tabWork Order` where name = `tabTimesheet`.work_order)
- where workn_order is not null and work_order !=''""")
\ No newline at end of file
diff --git a/erpnext/patches/v8_7/__init__.py b/erpnext/patches/v8_7/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/erpnext/patches/v8_7/fix_purchase_receipt_status.py b/erpnext/patches/v8_7/fix_purchase_receipt_status.py
deleted file mode 100644
index 99ecb44214..0000000000
--- a/erpnext/patches/v8_7/fix_purchase_receipt_status.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- # there is no more status called "Submitted", there was an old issue that used
- # to set it as Submitted, fixed in this commit
- frappe.db.sql("""
- update
- `tabPurchase Receipt`
- set
- status = 'To Bill'
- where
- status = 'Submitted'""")
\ No newline at end of file
diff --git a/erpnext/patches/v8_7/make_subscription_from_recurring_data.py b/erpnext/patches/v8_7/make_subscription_from_recurring_data.py
deleted file mode 100644
index 2932749116..0000000000
--- a/erpnext/patches/v8_7/make_subscription_from_recurring_data.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.utils import today
-
-def execute():
- frappe.reload_doc('accounts', 'doctype', 'subscription')
- frappe.reload_doc('selling', 'doctype', 'sales_order')
- frappe.reload_doc('selling', 'doctype', 'quotation')
- frappe.reload_doc('buying', 'doctype', 'purchase_order')
- frappe.reload_doc('buying', 'doctype', 'supplier_quotation')
- frappe.reload_doc('accounts', 'doctype', 'sales_invoice')
- frappe.reload_doc('accounts', 'doctype', 'purchase_invoice')
- frappe.reload_doc('stock', 'doctype', 'purchase_receipt')
- frappe.reload_doc('stock', 'doctype', 'delivery_note')
- frappe.reload_doc('accounts', 'doctype', 'journal_entry')
- frappe.reload_doc('accounts', 'doctype', 'payment_entry')
-
- for doctype in ['Sales Order', 'Sales Invoice', 'Purchase Order', 'Purchase Invoice']:
- date_field = "transaction_date"
- if doctype in ("Sales Invoice", "Purchase Invoice"):
- date_field = "posting_date"
-
- for data in get_data(doctype, date_field):
- make_subscription(doctype, data, date_field)
-
-def get_data(doctype, date_field):
- return frappe.db.sql(""" select name, from_date, end_date, recurring_type, recurring_id,
- next_date, notify_by_email, notification_email_address, recurring_print_format,
- repeat_on_day_of_month, submit_on_creation, docstatus, {0}
- from `tab{1}` where is_recurring = 1 and next_date >= %s and docstatus < 2
- order by next_date desc
- """.format(date_field, doctype), today(), as_dict=1)
-
-def make_subscription(doctype, data, date_field):
- if data.name == data.recurring_id:
- start_date = data.get(date_field)
- else:
- start_date = frappe.db.get_value(doctype, data.recurring_id, date_field)
-
- doc = frappe.get_doc({
- 'doctype': 'Subscription',
- 'reference_doctype': doctype,
- 'reference_document': data.recurring_id,
- 'start_date': start_date,
- 'end_date': data.end_date,
- 'frequency': data.recurring_type,
- 'repeat_on_day': data.repeat_on_day_of_month,
- 'notify_by_email': data.notify_by_email,
- 'recipients': data.notification_email_address,
- 'next_schedule_date': data.next_date,
- 'submit_on_creation': data.submit_on_creation
- }).insert(ignore_permissions=True)
-
- if data.docstatus == 1:
- doc.submit()
\ No newline at end of file
diff --git a/erpnext/patches/v8_8/__init__.py b/erpnext/patches/v8_8/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/erpnext/patches/v8_8/add_new_fields_in_accounts_settings.py b/erpnext/patches/v8_8/add_new_fields_in_accounts_settings.py
deleted file mode 100644
index bd25f15d78..0000000000
--- a/erpnext/patches/v8_8/add_new_fields_in_accounts_settings.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-
-def execute():
- frappe.db.sql(
- "INSERT INTO `tabSingles` (`doctype`, `field`, `value`) VALUES ('Accounts Settings', 'allow_stale', '1'), "
- "('Accounts Settings', 'stale_days', '1')"
- )
diff --git a/erpnext/patches/v8_8/set_bom_rate_as_per_uom.py b/erpnext/patches/v8_8/set_bom_rate_as_per_uom.py
deleted file mode 100644
index 5b169cdff2..0000000000
--- a/erpnext/patches/v8_8/set_bom_rate_as_per_uom.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.db.sql("""
- update `tabBOM Item`
- set rate = rate * conversion_factor
- where uom != stock_uom and docstatus < 2
- and conversion_factor not in (0, 1)
- """)
\ No newline at end of file
diff --git a/erpnext/patches/v8_9/__init__.py b/erpnext/patches/v8_9/__init__.py
deleted file mode 100644
index 8b13789179..0000000000
--- a/erpnext/patches/v8_9/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/erpnext/patches/v8_9/add_setup_progress_actions.py b/erpnext/patches/v8_9/add_setup_progress_actions.py
deleted file mode 100644
index 77501073cf..0000000000
--- a/erpnext/patches/v8_9/add_setup_progress_actions.py
+++ /dev/null
@@ -1,47 +0,0 @@
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-
-def execute():
- """Add setup progress actions"""
- if not frappe.db.exists('DocType', 'Setup Progress') or not frappe.db.exists('DocType', 'Setup Progress Action'):
- return
-
- frappe.reload_doc("setup", "doctype", "setup_progress")
- frappe.reload_doc("setup", "doctype", "setup_progress_action")
-
- actions = [
- {"action_name": "Add Company", "action_doctype": "Company", "min_doc_count": 1, "is_completed": 1,
- "domains": '[]' },
- {"action_name": "Set Sales Target", "action_doctype": "Company", "min_doc_count": 99,
- "action_document": frappe.defaults.get_defaults().get("company") or '',
- "action_field": "monthly_sales_target", "is_completed": 0,
- "domains": '["Manufacturing", "Services", "Retail", "Distribution"]' },
- {"action_name": "Add Customers", "action_doctype": "Customer", "min_doc_count": 1, "is_completed": 0,
- "domains": '["Manufacturing", "Services", "Retail", "Distribution"]' },
- {"action_name": "Add Suppliers", "action_doctype": "Supplier", "min_doc_count": 1, "is_completed": 0,
- "domains": '["Manufacturing", "Services", "Retail", "Distribution"]' },
- {"action_name": "Add Products", "action_doctype": "Item", "min_doc_count": 1, "is_completed": 0,
- "domains": '["Manufacturing", "Services", "Retail", "Distribution"]' },
- {"action_name": "Add Programs", "action_doctype": "Program", "min_doc_count": 1, "is_completed": 0,
- "domains": '["Education"]' },
- {"action_name": "Add Instructors", "action_doctype": "Instructor", "min_doc_count": 1, "is_completed": 0,
- "domains": '["Education"]' },
- {"action_name": "Add Courses", "action_doctype": "Course", "min_doc_count": 1, "is_completed": 0,
- "domains": '["Education"]' },
- {"action_name": "Add Rooms", "action_doctype": "Room", "min_doc_count": 1, "is_completed": 0,
- "domains": '["Education"]' },
- {"action_name": "Add Users", "action_doctype": "User", "min_doc_count": 4, "is_completed": 0,
- "domains": '[]' },
- {"action_name": "Add Letterhead", "action_doctype": "Letter Head", "min_doc_count": 1, "is_completed": 0,
- "domains": '[]' }
- ]
-
- setup_progress = frappe.get_doc("Setup Progress", "Setup Progress")
- setup_progress.actions = []
- for action in actions:
- setup_progress.append("actions", action)
-
- setup_progress.save(ignore_permissions=True)
-
diff --git a/erpnext/patches/v8_9/delete_gst_doctypes_for_outside_india_accounts.py b/erpnext/patches/v8_9/delete_gst_doctypes_for_outside_india_accounts.py
deleted file mode 100644
index f67af90555..0000000000
--- a/erpnext/patches/v8_9/delete_gst_doctypes_for_outside_india_accounts.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- company = frappe.get_all('Company', filters = {'country': 'India'})
- if not company:
- if frappe.db.exists("DocType", "GST Settings"):
- frappe.delete_doc("DocType", "GST Settings")
- frappe.delete_doc("DocType", "GST HSN Code")
-
- for report_name in ('GST Sales Register', 'GST Purchase Register',
- 'GST Itemised Sales Register', 'GST Itemised Purchase Register'):
-
- frappe.delete_doc('Report', report_name)
\ No newline at end of file
diff --git a/erpnext/patches/v8_9/remove_employee_from_salary_structure_parent.py b/erpnext/patches/v8_9/remove_employee_from_salary_structure_parent.py
deleted file mode 100644
index 808ae6d527..0000000000
--- a/erpnext/patches/v8_9/remove_employee_from_salary_structure_parent.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- if 'employee' in frappe.db.get_table_columns("Salary Structure"):
- frappe.db.sql("alter table `tabSalary Structure` drop column employee")
diff --git a/erpnext/patches/v8_9/rename_company_sales_target_field.py b/erpnext/patches/v8_9/rename_company_sales_target_field.py
deleted file mode 100644
index 5433eb673e..0000000000
--- a/erpnext/patches/v8_9/rename_company_sales_target_field.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe.model.utils.rename_field import rename_field
-
-def execute():
- frappe.reload_doc("setup", "doctype", "company")
- if frappe.db.has_column('Company', 'sales_target'):
- rename_field("Company", "sales_target", "monthly_sales_target")
diff --git a/erpnext/patches/v8_9/set_default_customer_group.py b/erpnext/patches/v8_9/set_default_customer_group.py
deleted file mode 100644
index cbbe09daf5..0000000000
--- a/erpnext/patches/v8_9/set_default_customer_group.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- selling_settings = frappe.get_single('Selling Settings')
- selling_settings.set_default_customer_group_and_territory()
- selling_settings.flags.ignore_mandatory = True
- selling_settings.save()
diff --git a/erpnext/patches/v8_9/set_default_fields_in_variant_settings.py b/erpnext/patches/v8_9/set_default_fields_in_variant_settings.py
deleted file mode 100644
index a550d093fa..0000000000
--- a/erpnext/patches/v8_9/set_default_fields_in_variant_settings.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc('stock', 'doctype', 'item_variant_settings')
- frappe.reload_doc('stock', 'doctype', 'variant_field')
-
- doc = frappe.get_doc('Item Variant Settings')
- doc.set_default_fields()
- doc.save()
\ No newline at end of file
diff --git a/erpnext/patches/v8_9/set_member_party_type.py b/erpnext/patches/v8_9/set_member_party_type.py
deleted file mode 100644
index 33bbc11a93..0000000000
--- a/erpnext/patches/v8_9/set_member_party_type.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- if not frappe.db.exists("Party Type", "Member"):
- frappe.reload_doc("non_profit", "doctype", "member")
- party = frappe.new_doc("Party Type")
- party.party_type = "Member"
- party.save()
diff --git a/erpnext/patches/v8_9/set_print_zero_amount_taxes.py b/erpnext/patches/v8_9/set_print_zero_amount_taxes.py
deleted file mode 100644
index 3c508eaa09..0000000000
--- a/erpnext/patches/v8_9/set_print_zero_amount_taxes.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-from erpnext.setup.install import create_print_zero_amount_taxes_custom_field
-
-def execute():
- frappe.reload_doc('printing', 'doctype', 'print_style')
- frappe.reload_doc('printing', 'doctype', 'print_settings')
- create_print_zero_amount_taxes_custom_field()
\ No newline at end of file
diff --git a/erpnext/patches/v8_9/update_billing_gstin_for_indian_account.py b/erpnext/patches/v8_9/update_billing_gstin_for_indian_account.py
deleted file mode 100644
index 24e20409c1..0000000000
--- a/erpnext/patches/v8_9/update_billing_gstin_for_indian_account.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- company = frappe.get_all('Company', filters = {'country': 'India'})
-
- if company:
- for doctype in ['Sales Invoice', 'Delivery Note']:
- frappe.db.sql(""" update `tab{0}`
- set billing_address_gstin = (select gstin from `tabAddress`
- where name = customer_address)
- where customer_address is not null and customer_address != ''""".format(doctype))
\ No newline at end of file
diff --git a/erpnext/patches/v9_0/__init__.py b/erpnext/patches/v9_0/__init__.py
deleted file mode 100644
index baffc48825..0000000000
--- a/erpnext/patches/v9_0/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/patches/v9_0/add_healthcare_domain.py b/erpnext/patches/v9_0/add_healthcare_domain.py
deleted file mode 100644
index 3c0433b9d4..0000000000
--- a/erpnext/patches/v9_0/add_healthcare_domain.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- domain = 'Healthcare'
- if not frappe.db.exists('Domain', domain):
- frappe.get_doc({
- 'doctype': 'Domain',
- 'domain': domain
- }).insert(ignore_permissions=True)
\ No newline at end of file
diff --git a/erpnext/patches/v9_0/add_user_to_child_table_in_pos_profile.py b/erpnext/patches/v9_0/add_user_to_child_table_in_pos_profile.py
deleted file mode 100644
index 8a8c8064dd..0000000000
--- a/erpnext/patches/v9_0/add_user_to_child_table_in_pos_profile.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- if frappe.db.table_exists("POS Profile User"):
- frappe.reload_doc('accounts', 'doctype', 'pos_profile_user')
-
- frappe.db.sql(""" update `tabPOS Profile User`,
- (select `tabPOS Profile User`.name from `tabPOS Profile User`, `tabPOS Profile`
- where `tabPOS Profile`.name = `tabPOS Profile User`.parent
- group by `tabPOS Profile User`.user, `tabPOS Profile`.company) as pfu
- set
- `tabPOS Profile User`.default = 1
- where `tabPOS Profile User`.name = pfu.name""")
- else:
- doctype = 'POS Profile'
- frappe.reload_doc('accounts', 'doctype', doctype)
- frappe.reload_doc('accounts', 'doctype', 'pos_profile_user')
- frappe.reload_doc('accounts', 'doctype', 'pos_item_group')
- frappe.reload_doc('accounts', 'doctype', 'pos_customer_group')
-
- for doc in frappe.get_all(doctype):
- _doc = frappe.get_doc(doctype, doc.name)
- user = frappe.db.get_value(doctype, doc.name, 'user')
-
- if not user: continue
-
- _doc.append('applicable_for_users', {
- 'user': user,
- 'default': 1
- })
-
- _doc.flags.ignore_validate = True
- _doc.flags.ignore_mandatory = True
- _doc.save()
\ No newline at end of file
diff --git a/erpnext/patches/v9_0/copy_old_fees_field_data.py b/erpnext/patches/v9_0/copy_old_fees_field_data.py
deleted file mode 100644
index 14278209c7..0000000000
--- a/erpnext/patches/v9_0/copy_old_fees_field_data.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- # 'Schools' module changed to the 'Education'
- # frappe.reload_doc("schools", "doctype", "fees")
- frappe.reload_doc("education", "doctype", "fees")
-
- if "total_amount" not in frappe.db.get_table_columns("Fees"):
- return
-
- frappe.db.sql("""update tabFees set grand_total=total_amount where grand_total = 0.0""")
\ No newline at end of file
diff --git a/erpnext/patches/v9_0/remove_non_existing_warehouse_from_stock_settings.py b/erpnext/patches/v9_0/remove_non_existing_warehouse_from_stock_settings.py
deleted file mode 100644
index c685bbc681..0000000000
--- a/erpnext/patches/v9_0/remove_non_existing_warehouse_from_stock_settings.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- default_warehouse = frappe.db.get_value("Stock Settings", None, "default_warehouse")
- if default_warehouse:
- if not frappe.db.get_value("Warehouse", {"name": default_warehouse}):
- frappe.db.set_value("Stock Settings", None, "default_warehouse", "")
\ No newline at end of file
diff --git a/erpnext/patches/v9_0/remove_subscription_module.py b/erpnext/patches/v9_0/remove_subscription_module.py
deleted file mode 100644
index 493873f3e8..0000000000
--- a/erpnext/patches/v9_0/remove_subscription_module.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- if frappe.db.exists('Module Def', 'Subscription'):
- frappe.db.sql(""" delete from `tabModule Def` where name = 'Subscription'""")
\ No newline at end of file
diff --git a/erpnext/patches/v9_0/revert_manufacturing_user_role.py b/erpnext/patches/v9_0/revert_manufacturing_user_role.py
deleted file mode 100644
index f38b7f29ce..0000000000
--- a/erpnext/patches/v9_0/revert_manufacturing_user_role.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- if 'Manufacturing' in frappe.get_active_domains(): return
-
- role = 'Manufacturing User'
- frappe.db.set_value('Role', role, 'restrict_to_domain', '')
- frappe.db.set_value('Role', role, 'disabled', 0)
-
- users = frappe.get_all('Has Role', filters = {
- 'parenttype': 'User',
- 'role': ('in', ['System Manager', 'Manufacturing Manager'])
- }, fields=['parent'], as_list=1)
-
- for user in users:
- _user = frappe.get_doc('User', user[0])
- _user.append('roles', {
- 'role': role
- })
- _user.flags.ignore_validate = True
- _user.save()
diff --git a/erpnext/patches/v9_0/set_pos_profile_name.py b/erpnext/patches/v9_0/set_pos_profile_name.py
deleted file mode 100644
index a3a9735215..0000000000
--- a/erpnext/patches/v9_0/set_pos_profile_name.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- doctype = 'POS Profile'
- frappe.reload_doctype(doctype)
-
- for pos in frappe.get_all(doctype, filters={'disabled': 0}):
- doc = frappe.get_doc(doctype, pos.name)
-
- if not doc.user: continue
-
- try:
- pos_profile_name = doc.user + ' - ' + doc.company
- doc.flags.ignore_validate = True
- doc.flags.ignore_mandatory = True
- doc.save()
-
- frappe.rename_doc(doctype, doc.name, pos_profile_name, force=True)
- except frappe.LinkValidationError:
- frappe.db.set_value("POS Profile", doc.name, 'disabled', 1)
diff --git a/erpnext/patches/v9_0/set_schedule_date_for_material_request_and_purchase_order.py b/erpnext/patches/v9_0/set_schedule_date_for_material_request_and_purchase_order.py
deleted file mode 100644
index 3d012978fa..0000000000
--- a/erpnext/patches/v9_0/set_schedule_date_for_material_request_and_purchase_order.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- for doctype in ("Material Request", "Purchase Order"):
- frappe.reload_doctype(doctype)
- frappe.reload_doctype(doctype + " Item")
-
- if not frappe.db.has_column(doctype, "schedule_date"):
- continue
-
- #Update only submitted MR
- for record in frappe.get_all(doctype, filters= [["docstatus", "=", 1]], fields=["name"]):
- doc = frappe.get_doc(doctype, record)
- if doc.items:
- if not doc.schedule_date:
- schedule_dates = [d.schedule_date for d in doc.items if d.schedule_date]
- if len(schedule_dates) > 0:
- min_schedule_date = min(schedule_dates)
- frappe.db.set_value(doctype, record,
- "schedule_date", min_schedule_date, update_modified=False)
\ No newline at end of file
diff --git a/erpnext/patches/v9_0/set_shipping_type_for_existing_shipping_rules.py b/erpnext/patches/v9_0/set_shipping_type_for_existing_shipping_rules.py
deleted file mode 100644
index 5092695b7d..0000000000
--- a/erpnext/patches/v9_0/set_shipping_type_for_existing_shipping_rules.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype("Shipping Rule")
-
- # default "calculate_based_on"
- frappe.db.sql('''update `tabShipping Rule`
- set calculate_based_on = "Net Weight"
- where ifnull(calculate_based_on, '') = '' ''')
-
- # default "shipping_rule_type"
- frappe.db.sql('''update `tabShipping Rule`
- set shipping_rule_type = "Selling"
- where ifnull(shipping_rule_type, '') = '' ''')
diff --git a/erpnext/patches/v9_0/set_uoms_in_variant_field.py b/erpnext/patches/v9_0/set_uoms_in_variant_field.py
deleted file mode 100644
index 9e783d99be..0000000000
--- a/erpnext/patches/v9_0/set_uoms_in_variant_field.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-
-def execute():
- doc = frappe.get_doc('Item Variant Settings')
- variant_field_names = [vf.field_name for vf in doc.fields]
- if 'uoms' not in variant_field_names:
- doc.append(
- 'fields', {
- 'field_name': 'uoms'
- }
- )
- doc.save()
diff --git a/erpnext/patches/v9_0/set_variant_item_description.py b/erpnext/patches/v9_0/set_variant_item_description.py
deleted file mode 100644
index 82d6148508..0000000000
--- a/erpnext/patches/v9_0/set_variant_item_description.py
+++ /dev/null
@@ -1,46 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe.utils import cstr
-
-def execute():
- '''
- Issue:
- While copying data from template item to variant item,
- the system appending description multiple times to the respective variant.
-
- Purpose:
- Check variant description,
- if variant have user defined description remove all system appended descriptions
- else replace multiple system generated descriptions with single description
-
- Steps:
- 1. Get all variant items
- 2. Create system generated variant description
- 3. If variant have user defined description, remove all system generated descriptions
- 4. If variant description only contains system generated description,
- replace multiple descriptions by new description.
- '''
- for item in frappe.db.sql(""" select name from tabItem
- where ifnull(variant_of, '') != '' """,as_dict=1):
- variant = frappe.get_doc("Item", item.name)
- temp_variant_description = '\n'
-
- if variant.attributes:
- for d in variant.attributes:
- temp_variant_description += "
" + d.attribute + ": " + cstr(d.attribute_value) + "
"
-
- variant_description = variant.description.replace(temp_variant_description, '').rstrip()
- if variant_description:
- splitted_desc = variant.description.strip().split(temp_variant_description)
-
- if len(splitted_desc) > 2:
- if splitted_desc[0] == '':
- variant_description = temp_variant_description + variant_description
- elif splitted_desc[1] == '' or splitted_desc[1] == '\n':
- variant_description += temp_variant_description
- variant.db_set('description', variant_description, update_modified=False)
- else:
- variant.db_set('description', variant_description, update_modified=False)
-
- else:
- variant.db_set('description', temp_variant_description, update_modified=False)
\ No newline at end of file
diff --git a/erpnext/patches/v9_0/student_admission_childtable_migrate.py b/erpnext/patches/v9_0/student_admission_childtable_migrate.py
deleted file mode 100644
index a5712c76dc..0000000000
--- a/erpnext/patches/v9_0/student_admission_childtable_migrate.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- # 'Schools' module changed to the 'Education'
- # frappe.reload_doc('schools', 'doctype', 'Student Admission Program')
- # frappe.reload_doc('schools', 'doctype', 'student_admission')
- frappe.reload_doc('education', 'doctype', 'Student Admission Program')
- frappe.reload_doc('education', 'doctype', 'student_admission')
-
- if "program" not in frappe.db.get_table_columns("Student Admission"):
- return
-
- student_admissions = frappe.get_all("Student Admission", fields=["name", "application_fee", \
- "naming_series_for_student_applicant", "program", "introduction", "eligibility"])
- for student_admission in student_admissions:
- doc = frappe.get_doc("Student Admission", student_admission.name)
- doc.append("program_details", {
- "program": student_admission.get("program"),
- "application_fee": student_admission.get("application_fee"),
- "applicant_naming_series": student_admission.get("naming_series_for_student_applicant"),
- })
- if student_admission.eligibility and student_admission.introduction:
- doc.introduction = student_admission.introduction + "
" + \
- student_admission.eligibility + "
"
- doc.flags.ignore_validate = True
- doc.flags.ignore_mandatory = True
- doc.save()
diff --git a/erpnext/patches/v9_0/update_employee_loan_details.py b/erpnext/patches/v9_0/update_employee_loan_details.py
deleted file mode 100644
index ef8d32855f..0000000000
--- a/erpnext/patches/v9_0/update_employee_loan_details.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc('Payroll', 'doctype', 'salary_slip_loan')
- frappe.reload_doc('Payroll', 'doctype', 'salary_slip')
-
- for data in frappe.db.sql(""" select name,
- start_date, end_date, total_loan_repayment
- from
- `tabSalary Slip`
- where
- docstatus < 2 and ifnull(total_loan_repayment, 0) > 0""", as_dict=1):
- salary_slip = frappe.get_doc('Salary Slip', data.name)
- salary_slip.set_loan_repayment()
-
- if salary_slip.total_loan_repayment == data.total_loan_repayment:
- for row in salary_slip.loans:
- row.db_update()
-
- salary_slip.db_update()
diff --git a/erpnext/patches/v9_0/update_multi_uom_fields_in_material_request.py b/erpnext/patches/v9_0/update_multi_uom_fields_in_material_request.py
deleted file mode 100644
index 45610ed5a7..0000000000
--- a/erpnext/patches/v9_0/update_multi_uom_fields_in_material_request.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype('Material Request')
- frappe.reload_doctype('Material Request Item')
-
- frappe.db.sql(""" update `tabMaterial Request Item`
- set stock_uom = uom, stock_qty = qty, conversion_factor = 1.0""")
\ No newline at end of file
diff --git a/erpnext/patches/v9_1/__init__.py b/erpnext/patches/v9_1/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/erpnext/patches/v9_1/create_issue_opportunity_type.py b/erpnext/patches/v9_1/create_issue_opportunity_type.py
deleted file mode 100644
index aa8bbd1e79..0000000000
--- a/erpnext/patches/v9_1/create_issue_opportunity_type.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-
-def execute():
- # delete custom field if exists
- for doctype, fieldname in (('Issue', 'issue_type'), ('Opportunity', 'opportunity_type')):
- custom_field = frappe.db.get_value("Custom Field", {"fieldname": fieldname, 'dt': doctype})
- if custom_field:
- frappe.delete_doc("Custom Field", custom_field, ignore_permissions=True)
-
- frappe.reload_doc('support', 'doctype', 'issue_type')
- frappe.reload_doc('support', 'doctype', 'issue')
- frappe.reload_doc('crm', 'doctype', 'opportunity_type')
- frappe.reload_doc('crm', 'doctype', 'opportunity')
-
- # rename enquiry_type -> opportunity_type
- from frappe.model.utils.rename_field import rename_field
- rename_field('Opportunity', 'enquiry_type', 'opportunity_type')
-
- # create values if already set
- for opts in (('Issue', 'issue_type', 'Issue Type'),
- ('Opportunity', 'opportunity_type', 'Opportunity Type')):
- for d in frappe.db.sql('select distinct {0} from `tab{1}`'.format(opts[1], opts[0])):
- if d[0] and not frappe.db.exists(opts[2], d[0]):
- frappe.get_doc(dict(doctype = opts[2], name=d[0])).insert()
-
- # fixtures
- for name in ('Hub', _('Sales'), _('Support'), _('Maintenance')):
- if not frappe.db.exists('Opportunity Type', name):
- frappe.get_doc(dict(doctype = 'Opportunity Type', name=name)).insert()
diff --git a/erpnext/patches/v9_2/__init__.py b/erpnext/patches/v9_2/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/erpnext/patches/v9_2/delete_healthcare_domain_default_items.py b/erpnext/patches/v9_2/delete_healthcare_domain_default_items.py
deleted file mode 100644
index 54ae18b8e2..0000000000
--- a/erpnext/patches/v9_2/delete_healthcare_domain_default_items.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe.utils import getdate
-
-def execute():
- domain_settings = frappe.get_doc('Domain Settings')
- active_domains = [d.domain for d in domain_settings.active_domains]
-
- if "Healthcare" not in active_domains:
- items = ["TTT", "MCH", "LDL", "GTT", "HDL", "BILT", "BILD", "BP", "BS"]
- for item_code in items:
- try:
- item = frappe.db.get_value("Item", {"item_code": item_code}, ["name", "creation"], as_dict=1)
- if item and getdate(item.creation) >= getdate("2017-11-10"):
- frappe.delete_doc("Item", item.name)
- except:
- pass
\ No newline at end of file
diff --git a/erpnext/patches/v9_2/delete_process_payroll.py b/erpnext/patches/v9_2/delete_process_payroll.py
deleted file mode 100644
index 91c49f577f..0000000000
--- a/erpnext/patches/v9_2/delete_process_payroll.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.delete_doc("DocType", "Process Payroll")
diff --git a/erpnext/patches/v9_2/remove_company_from_patient.py b/erpnext/patches/v9_2/remove_company_from_patient.py
deleted file mode 100644
index 1a50088f23..0000000000
--- a/erpnext/patches/v9_2/remove_company_from_patient.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- if frappe.db.exists("DocType", "Patient"):
- if 'company' in frappe.db.get_table_columns("Patient"):
- frappe.db.sql("alter table `tabPatient` drop column company")
diff --git a/erpnext/patches/v9_2/rename_net_weight_in_item_master.py b/erpnext/patches/v9_2/rename_net_weight_in_item_master.py
deleted file mode 100644
index cad979deab..0000000000
--- a/erpnext/patches/v9_2/rename_net_weight_in_item_master.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe.model.utils.rename_field import rename_field
-
-def execute():
- frappe.reload_doc("stock", "doctype", "item")
- if frappe.db.has_column('Item', 'net_weight'):
- rename_field("Item", "net_weight", "weight_per_unit")
diff --git a/erpnext/patches/v9_2/rename_translated_domains_in_en.py b/erpnext/patches/v9_2/rename_translated_domains_in_en.py
deleted file mode 100644
index e5a9e2461f..0000000000
--- a/erpnext/patches/v9_2/rename_translated_domains_in_en.py
+++ /dev/null
@@ -1,39 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-from frappe.model.rename_doc import rename_doc
-
-def execute():
- frappe.reload_doc('stock', 'doctype', 'item')
- language = frappe.get_single("System Settings").language
-
- if language and language.startswith('en'): return
-
- frappe.local.lang = language
-
- all_domains = frappe.get_hooks("domains")
-
- for domain in all_domains:
- translated_domain = _(domain, lang=language)
- if frappe.db.exists("Domain", translated_domain):
- #if domain already exists merged translated_domain and domain
- merge = False
- if frappe.db.exists("Domain", domain):
- merge=True
-
- rename_doc("Domain", translated_domain, domain, ignore_permissions=True, merge=merge)
-
- domain_settings = frappe.get_single("Domain Settings")
- active_domains = [d.domain for d in domain_settings.active_domains]
-
- try:
- for domain in active_domains:
- domain = frappe.get_doc("Domain", domain)
- domain.setup_domain()
-
- if int(frappe.db.get_single_value('System Settings', 'setup_complete')):
- domain.setup_sidebar_items()
- domain.setup_desktop_icons()
- domain.set_default_portal_role()
- except frappe.LinkValidationError:
- pass
\ No newline at end of file
diff --git a/erpnext/patches/v9_2/repost_reserved_qty_for_production.py b/erpnext/patches/v9_2/repost_reserved_qty_for_production.py
deleted file mode 100644
index 040e655bd8..0000000000
--- a/erpnext/patches/v9_2/repost_reserved_qty_for_production.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc("stock", "doctype", "bin")
- bins = frappe.db.sql("select name from `tabBin` where reserved_qty_for_production > 0")
- for d in bins:
- bin_doc = frappe.get_doc("Bin", d[0])
- bin_doc.update_reserved_qty_for_production()
diff --git a/erpnext/patches/v9_2/set_item_name_in_production_order.py b/erpnext/patches/v9_2/set_item_name_in_production_order.py
deleted file mode 100644
index 1f490e62c8..0000000000
--- a/erpnext/patches/v9_2/set_item_name_in_production_order.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
-
- frappe.db.sql("""
- update `tabBOM Item` bom, `tabWork Order Item` po_item
- set po_item.item_name = bom.item_name,
- po_item.description = bom.description
- where po_item.item_code = bom.item_code
- and (po_item.item_name is null or po_item.description is null)
- """)
diff --git a/erpnext/payroll/doctype/payroll_entry/payroll_entry.py b/erpnext/payroll/doctype/payroll_entry/payroll_entry.py
index 3953b463f1..7a70679db4 100644
--- a/erpnext/payroll/doctype/payroll_entry/payroll_entry.py
+++ b/erpnext/payroll/doctype/payroll_entry/payroll_entry.py
@@ -665,6 +665,8 @@ def get_employee_list(filters):
emp_list = remove_payrolled_employees(emp_list, filters.start_date, filters.end_date)
return emp_list
+ return []
+
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
def employee_query(doctype, txt, searchfield, start, page_len, filters):
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index d1583f1473..39a6024e2c 100755
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -232,7 +232,7 @@ def get_project(doctype, txt, searchfield, start, page_len, filters):
meta = frappe.get_meta(doctype)
searchfields = meta.get_search_fields()
search_columns = ", " + ", ".join(searchfields) if searchfields else ''
- search_cond = " or " + " or ".join([field + " like %(txt)s" for field in searchfields])
+ search_cond = " or " + " or ".join(field + " like %(txt)s" for field in searchfields)
return frappe.db.sql(""" select name {search_columns} from `tabProject`
where %(key)s like %(txt)s
diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py
index a3e4577f90..c8bd80fca0 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -87,8 +87,8 @@ class Timesheet(Document):
def set_dates(self):
if self.docstatus < 2 and self.time_logs:
- start_date = min([getdate(d.from_time) for d in self.time_logs])
- end_date = max([getdate(d.to_time) for d in self.time_logs])
+ start_date = min(getdate(d.from_time) for d in self.time_logs)
+ end_date = max(getdate(d.to_time) for d in self.time_logs)
if start_date and end_date:
self.start_date = getdate(start_date)
diff --git a/erpnext/projects/report/project_summary/project_summary.py b/erpnext/projects/report/project_summary/project_summary.py
index 2c7bb49cfb..98dd617f9b 100644
--- a/erpnext/projects/report/project_summary/project_summary.py
+++ b/erpnext/projects/report/project_summary/project_summary.py
@@ -122,7 +122,7 @@ def get_report_summary(data):
if not data:
return None
- avg_completion = sum([project.percent_complete for project in data]) / len(data)
+ avg_completion = sum(project.percent_complete for project in data) / len(data)
total = sum([project.total_tasks for project in data])
total_overdue = sum([project.overdue_tasks for project in data])
completed = sum([project.completed_tasks for project in data])
diff --git a/erpnext/public/js/controllers/accounts.js b/erpnext/public/js/controllers/accounts.js
index ceeecb28a2..7b997a1153 100644
--- a/erpnext/public/js/controllers/accounts.js
+++ b/erpnext/public/js/controllers/accounts.js
@@ -156,31 +156,31 @@ cur_frm.cscript.validate_taxes_and_charges = function(cdt, cdn) {
var d = locals[cdt][cdn];
var msg = "";
- if(d.account_head && !d.description) {
+ if (d.account_head && !d.description) {
// set description from account head
d.description = d.account_head.split(' - ').slice(0, -1).join(' - ');
}
- if(!d.charge_type && (d.row_id || d.rate || d.tax_amount)) {
+ if (!d.charge_type && (d.row_id || d.rate || d.tax_amount)) {
msg = __("Please select Charge Type first");
d.row_id = "";
d.rate = d.tax_amount = 0.0;
- } else if((d.charge_type == 'Actual' || d.charge_type == 'On Net Total') && d.row_id) {
+ } else if ((d.charge_type == 'Actual' || d.charge_type == 'On Net Total' || d.charge_type == 'On Paid Amount') && d.row_id) {
msg = __("Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total'");
d.row_id = "";
- } else if((d.charge_type == 'On Previous Row Amount' || d.charge_type == 'On Previous Row Total') && d.row_id) {
+ } else if ((d.charge_type == 'On Previous Row Amount' || d.charge_type == 'On Previous Row Total') && d.row_id) {
if (d.idx == 1) {
msg = __("Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row");
d.charge_type = '';
} else if (!d.row_id) {
msg = __("Please specify a valid Row ID for row {0} in table {1}", [d.idx, __(d.doctype)]);
d.row_id = "";
- } else if(d.row_id && d.row_id >= d.idx) {
+ } else if (d.row_id && d.row_id >= d.idx) {
msg = __("Cannot refer row number greater than or equal to current row number for this Charge type");
d.row_id = "";
}
}
- if(msg) {
+ if (msg) {
frappe.validated = false;
refresh_field("taxes");
frappe.throw(msg);
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 2e133bed2e..e5a5fcfe3b 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -12,7 +12,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
if (in_list(["Sales Order", "Quotation"], item.parenttype) && item.blanket_order_rate) {
effective_item_rate = item.blanket_order_rate;
}
- if(item.margin_type == "Percentage"){
+ if (item.margin_type == "Percentage") {
item.rate_with_margin = flt(effective_item_rate)
+ flt(effective_item_rate) * ( flt(item.margin_rate_or_amount) / 100);
} else {
@@ -22,7 +22,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
item_rate = flt(item.rate_with_margin , precision("rate", item));
- if(item.discount_percentage){
+ if (item.discount_percentage) {
item.discount_amount = flt(item.rate_with_margin) * flt(item.discount_percentage) / 100;
}
@@ -73,15 +73,18 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
},
_calculate_taxes_and_totals: function() {
- this.validate_conversion_rate();
- this.calculate_item_values();
- this.initialize_taxes();
- this.determine_exclusive_rate();
- this.calculate_net_total();
- this.calculate_taxes();
- this.manipulate_grand_total_for_inclusive_tax();
- this.calculate_totals();
- this._cleanup();
+ frappe.run_serially([
+ () => this.validate_conversion_rate(),
+ () => this.calculate_item_values(),
+ () => this.update_item_tax_map(),
+ () => this.initialize_taxes(),
+ () => this.determine_exclusive_rate(),
+ () => this.calculate_net_total(),
+ () => this.calculate_taxes(),
+ () => this.manipulate_grand_total_for_inclusive_tax(),
+ () => this.calculate_totals(),
+ () => this._cleanup()
+ ]);
},
validate_conversion_rate: function() {
@@ -263,6 +266,65 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
frappe.model.round_floats_in(this.frm.doc, ["total", "base_total", "net_total", "base_net_total"]);
},
+ update_item_tax_map: function() {
+ let me = this;
+ let item_codes = [];
+ let item_rates = {};
+ $.each(this.frm.doc.items || [], function(i, item) {
+ if (item.item_code) {
+ // Use combination of name and item code in case same item is added multiple times
+ item_codes.push([item.item_code, item.name]);
+ item_rates[item.name] = item.net_rate;
+ }
+ });
+
+ if (item_codes.length) {
+ return this.frm.call({
+ method: "erpnext.stock.get_item_details.get_item_tax_info",
+ args: {
+ company: me.frm.doc.company,
+ tax_category: cstr(me.frm.doc.tax_category),
+ item_codes: item_codes,
+ item_rates: item_rates
+ },
+ callback: function(r) {
+ if (!r.exc) {
+ $.each(me.frm.doc.items || [], function(i, item) {
+ if (item.name && r.message.hasOwnProperty(item.name)) {
+ item.item_tax_template = r.message[item.name].item_tax_template;
+ item.item_tax_rate = r.message[item.name].item_tax_rate;
+ me.add_taxes_from_item_tax_template(item.item_tax_rate);
+ } else {
+ item.item_tax_template = "";
+ item.item_tax_rate = "{}";
+ }
+ });
+ }
+ }
+ });
+ }
+ },
+
+ add_taxes_from_item_tax_template: function(item_tax_map) {
+ let me = this;
+
+ if (item_tax_map && cint(frappe.defaults.get_default("add_taxes_from_item_tax_template"))) {
+ if (typeof (item_tax_map) == "string") {
+ item_tax_map = JSON.parse(item_tax_map);
+ }
+
+ $.each(item_tax_map, function(tax, rate) {
+ let found = (me.frm.doc.taxes || []).find(d => d.account_head === tax);
+ if (!found) {
+ let child = frappe.model.add_child(me.frm.doc, "taxes");
+ child.charge_type = "On Net Total";
+ child.account_head = tax;
+ child.rate = 0;
+ }
+ });
+ }
+ },
+
calculate_taxes: function() {
var me = this;
this.frm.doc.rounding_adjustment = 0;
@@ -406,6 +468,11 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
let tax_detail = tax.item_wise_tax_detail;
let key = item.item_code || item.item_name;
+ if(typeof (tax_detail) == "string") {
+ tax.item_wise_tax_detail = JSON.parse(tax.item_wise_tax_detail);
+ tax_detail = tax.item_wise_tax_detail;
+ }
+
let item_wise_tax_amount = current_tax_amount * this.frm.doc.conversion_rate;
if (tax_detail && tax_detail[key])
item_wise_tax_amount += tax_detail[key][1];
@@ -464,7 +531,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
},
calculate_totals: function() {
- // Changing sequence can cause rounding_adjustmentng issue and on-screen discrepency
+ // Changing sequence can because of rounding adjustment issue and on-screen discrepancy
var me = this;
var tax_count = this.frm.doc["taxes"] ? this.frm.doc["taxes"].length : 0;
this.frm.doc.grand_total = flt(tax_count
@@ -562,6 +629,8 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
tax.item_wise_tax_detail = JSON.stringify(tax.item_wise_tax_detail);
});
}
+
+ this.frm.refresh_fields();
},
set_discount_amount: function() {
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 982b1fe1eb..89fed3bf0d 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -6,6 +6,7 @@ frappe.provide('erpnext.accounts.dimensions');
erpnext.TransactionController = erpnext.taxes_and_totals.extend({
setup: function() {
this._super();
+ let me = this;
frappe.flags.hide_serial_batch_dialog = true;
frappe.ui.form.on(this.frm.doctype + " Item", "rate", function(frm, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn);
@@ -43,8 +44,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
cur_frm.cscript.calculate_stock_uom_rate(frm, cdt, cdn);
});
-
-
frappe.ui.form.on(this.frm.cscript.tax_table, "rate", function(frm, cdt, cdn) {
cur_frm.cscript.calculate_taxes_and_totals();
});
@@ -121,7 +120,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}
});
- var me = this;
if(this.frm.fields_dict["items"].grid.get_field('batch_no')) {
this.frm.set_query("batch_no", "items", function(doc, cdt, cdn) {
return me.set_query_for_batch(doc, cdt, cdn);
@@ -564,6 +562,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
name: me.frm.doc.name,
project: item.project || me.frm.doc.project,
qty: item.qty || 1,
+ net_rate: item.rate,
stock_qty: item.stock_qty,
conversion_factor: item.conversion_factor,
weight_per_unit: item.weight_per_unit,
@@ -720,26 +719,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
});
},
- add_taxes_from_item_tax_template: function(item_tax_map) {
- let me = this;
-
- if(item_tax_map && cint(frappe.defaults.get_default("add_taxes_from_item_tax_template"))) {
- if(typeof (item_tax_map) == "string") {
- item_tax_map = JSON.parse(item_tax_map);
- }
-
- $.each(item_tax_map, function(tax, rate) {
- let found = (me.frm.doc.taxes || []).find(d => d.account_head === tax);
- if(!found) {
- let child = frappe.model.add_child(me.frm.doc, "taxes");
- child.charge_type = "On Net Total";
- child.account_head = tax;
- child.rate = 0;
- }
- });
- }
- },
-
serial_no: function(doc, cdt, cdn) {
var me = this;
var item = frappe.get_doc(cdt, cdn);
@@ -843,9 +822,9 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
frappe.run_serially([
() => me.frm.script_manager.trigger("currency"),
- () => me.update_item_tax_map(),
() => me.apply_default_taxes(),
- () => me.apply_pricing_rule()
+ () => me.apply_pricing_rule(),
+ () => me.calculate_taxes_and_totals()
]);
}
}
@@ -1824,7 +1803,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
callback: function(r) {
if(!r.exc) {
item.item_tax_rate = r.message;
- me.add_taxes_from_item_tax_template(item.item_tax_rate);
me.calculate_taxes_and_totals();
}
}
@@ -1835,43 +1813,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}
},
- update_item_tax_map: function() {
- var me = this;
- var item_codes = [];
- $.each(this.frm.doc.items || [], function(i, item) {
- if(item.item_code) {
- item_codes.push(item.item_code);
- }
- });
- if(item_codes.length) {
- return this.frm.call({
- method: "erpnext.stock.get_item_details.get_item_tax_info",
- args: {
- company: me.frm.doc.company,
- tax_category: cstr(me.frm.doc.tax_category),
- item_codes: item_codes
- },
- callback: function(r) {
- if(!r.exc) {
- $.each(me.frm.doc.items || [], function(i, item) {
- if(item.item_code && r.message.hasOwnProperty(item.item_code)) {
- if (!item.item_tax_template) {
- item.item_tax_template = r.message[item.item_code].item_tax_template;
- item.item_tax_rate = r.message[item.item_code].item_tax_rate;
- }
- me.add_taxes_from_item_tax_template(item.item_tax_rate);
- } else {
- item.item_tax_template = "";
- item.item_tax_rate = "{}";
- }
- });
- me.calculate_taxes_and_totals();
- }
- }
- });
- }
- },
is_recurring: function() {
// set default values for recurring documents
diff --git a/erpnext/public/js/payment/payments.js b/erpnext/public/js/payment/payments.js
index 0d656bc1fb..ddf8706809 100644
--- a/erpnext/public/js/payment/payments.js
+++ b/erpnext/public/js/payment/payments.js
@@ -8,24 +8,23 @@ erpnext.payments = erpnext.stock.StockController.extend({
this.dialog = new frappe.ui.Dialog({
title: 'Payment'
});
-
+
this.dialog.show();
this.$body = this.dialog.body;
this.set_payment_primary_action();
this.make_keyboard();
- this.select_text()
+ this.select_text();
},
- select_text: function(){
- var me = this;
- $(this.$body).find('.form-control').click(function(){
+ select_text() {
+ $(this.$body).find('.form-control').click(function() {
$(this).select();
- })
+ });
},
- set_payment_primary_action: function(){
+ set_payment_primary_action: function() {
var me = this;
-
+
this.dialog.set_primary_action(__("Submit"), function() {
// Allow no ZERO payment
$.each(me.frm.doc.payments, function (index, data) {
@@ -38,20 +37,20 @@ erpnext.payments = erpnext.stock.StockController.extend({
})
},
- make_keyboard: function(){
+ make_keyboard: function() {
var me = this;
$(this.$body).empty();
$(this.$body).html(frappe.render_template('pos_payment', this.frm.doc))
this.show_payment_details();
- this.bind_keyboard_event()
- this.clear_amount()
+ this.bind_keyboard_event();
+ this.clear_amount();
},
- make_multimode_payment: function(){
+ make_multimode_payment: function() {
var me = this;
- if(this.frm.doc.change_amount > 0){
- me.payment_val = me.doc.outstanding_amount
+ if (this.frm.doc.change_amount > 0) {
+ me.payment_val = me.doc.outstanding_amount;
}
this.payments = frappe.model.add_child(this.frm.doc, 'Multi Mode Payment', "payments");
@@ -59,11 +58,11 @@ erpnext.payments = erpnext.stock.StockController.extend({
this.payments.amount = flt(this.payment_val);
},
- show_payment_details: function(){
+ show_payment_details: function() {
var me = this;
var multimode_payments = $(this.$body).find('.multimode-payments').empty();
- if(this.frm.doc.payments.length){
- $.each(this.frm.doc.payments, function(index, data){
+ if (this.frm.doc.payments.length) {
+ $.each(this.frm.doc.payments, function(index, data) {
$(frappe.render_template('payment_details', {
mode_of_payment: data.mode_of_payment,
amount: data.amount,
@@ -84,92 +83,90 @@ erpnext.payments = erpnext.stock.StockController.extend({
}
},
- set_outstanding_amount: function(){
+ set_outstanding_amount: function() {
this.selected_mode = $(this.$body).find(repl("input[idx='%(idx)s']",{'idx': this.idx}));
- this.highlight_selected_row()
- this.payment_val = 0.0
- if(this.frm.doc.outstanding_amount > 0 && flt(this.selected_mode.val()) == 0.0){
+ this.highlight_selected_row();
+ this.payment_val = 0.0;
+ if (this.frm.doc.outstanding_amount > 0 && flt(this.selected_mode.val()) == 0.0) {
//When user first time click on row
this.payment_val = flt(this.frm.doc.outstanding_amount / this.frm.doc.conversion_rate, precision("outstanding_amount"))
this.selected_mode.val(format_currency(this.payment_val, this.frm.doc.currency));
- this.update_payment_amount()
- }else if(flt(this.selected_mode.val()) > 0){
+ this.update_payment_amount();
+ } else if (flt(this.selected_mode.val()) > 0) {
//If user click on existing row which has value
this.payment_val = flt(this.selected_mode.val());
}
this.selected_mode.select()
this.bind_amount_change_event();
},
-
- bind_keyboard_event: function(){
- var me = this;
+
+ bind_keyboard_event() {
this.payment_val = '';
this.bind_form_control_event();
this.bind_numeric_keys_event();
},
- bind_form_control_event: function(){
+ bind_form_control_event: function() {
var me = this;
- $(this.$body).find('.pos-payment-row').click(function(){
+ $(this.$body).find('.pos-payment-row').click(function() {
me.idx = $(this).attr("idx");
- me.set_outstanding_amount()
- })
-
- $(this.$body).find('.form-control').click(function(){
+ me.set_outstanding_amount();
+ });
+
+ $(this.$body).find('.form-control').click(function() {
me.idx = $(this).attr("idx");
me.set_outstanding_amount();
me.update_paid_amount(true);
- })
-
- $(this.$body).find('.write_off_amount').change(function(){
+ });
+
+ $(this.$body).find('.write_off_amount').change(function() {
me.write_off_amount(flt($(this).val()), precision("write_off_amount"));
- })
-
- $(this.$body).find('.change_amount').change(function(){
+ });
+
+ $(this.$body).find('.change_amount').change(function() {
me.change_amount(flt($(this).val()), precision("change_amount"));
- })
+ });
},
- highlight_selected_row: function(){
- var me = this;
- var selected_row = $(this.$body).find(repl(".pos-payment-row[idx='%(idx)s']",{'idx': this.idx}));
- $(this.$body).find('.pos-payment-row').removeClass('selected-payment-mode')
- selected_row.addClass('selected-payment-mode')
+ highlight_selected_row() {
+ var selected_row = $(this.$body).find(repl(".pos-payment-row[idx='%(idx)s']", {'idx': this.idx}));
+ $(this.$body).find('.pos-payment-row').removeClass('selected-payment-mode');
+ selected_row.addClass('selected-payment-mode');
$(this.$body).find('.amount').attr('disabled', true);
this.selected_mode.attr('disabled', false);
},
-
- bind_numeric_keys_event: function(){
+
+ bind_numeric_keys_event: function() {
var me = this;
$(this.$body).find('.pos-keyboard-key').click(function(){
me.payment_val += $(this).text();
- me.selected_mode.val(format_currency(me.payment_val, me.frm.doc.currency))
- me.idx = me.selected_mode.attr("idx")
- me.update_paid_amount()
- })
-
- $(this.$body).find('.delete-btn').click(function(){
+ me.selected_mode.val(format_currency(me.payment_val, me.frm.doc.currency));
+ me.idx = me.selected_mode.attr("idx");
+ me.update_paid_amount();
+ });
+
+ $(this.$body).find('.delete-btn').click(function() {
me.payment_val = cstr(flt(me.selected_mode.val())).slice(0, -1);
me.selected_mode.val(format_currency(me.payment_val, me.frm.doc.currency));
- me.idx = me.selected_mode.attr("idx")
+ me.idx = me.selected_mode.attr("idx");
me.update_paid_amount();
})
},
-
- bind_amount_change_event: function(){
+
+ bind_amount_change_event() {
var me = this;
- this.selected_mode.change(function(){
+ this.selected_mode.change(function() {
me.payment_val = flt($(this).val()) || 0.0;
- me.selected_mode.val(format_currency(me.payment_val, me.frm.doc.currency))
- me.idx = me.selected_mode.attr("idx")
- me.update_payment_amount()
- })
+ me.selected_mode.val(format_currency(me.payment_val, me.frm.doc.currency));
+ me.idx = me.selected_mode.attr("idx");
+ me.update_payment_amount();
+ });
},
clear_amount: function() {
var me = this;
- $(this.$body).find('.clr').click(function(e){
+ $(this.$body).find('.clr').click(function(e) {
e.stopPropagation();
me.idx = $(this).attr("idx");
me.selected_mode = $(me.$body).find(repl("input[idx='%(idx)s']",{'idx': me.idx}));
@@ -177,50 +174,48 @@ erpnext.payments = erpnext.stock.StockController.extend({
me.selected_mode.val(0.0);
me.highlight_selected_row();
me.update_payment_amount();
- })
+ });
},
- write_off_amount: function(write_off_amount) {
- var me = this;
-
+ write_off_amount(write_off_amount) {
this.frm.doc.write_off_amount = flt(write_off_amount, precision("write_off_amount"));
this.frm.doc.base_write_off_amount = flt(this.frm.doc.write_off_amount * this.frm.doc.conversion_rate,
precision("base_write_off_amount"));
- this.calculate_outstanding_amount(false)
- this.show_amounts()
+ this.calculate_outstanding_amount(false);
+ this.show_amounts();
},
change_amount: function(change_amount) {
var me = this;
this.frm.doc.change_amount = flt(change_amount, precision("change_amount"));
- this.calculate_write_off_amount()
- this.show_amounts()
+ this.calculate_write_off_amount();
+ this.show_amounts();
},
update_paid_amount: function(update_write_off) {
var me = this;
- if(in_list(['change_amount', 'write_off_amount'], this.idx)){
+ if (in_list(['change_amount', 'write_off_amount'], this.idx)) {
var value = me.selected_mode.val();
- if(me.idx == 'change_amount'){
- me.change_amount(value)
- } else{
+ if (me.idx == 'change_amount') {
+ me.change_amount(value);
+ } else {
if(flt(value) == 0 && update_write_off && me.frm.doc.outstanding_amount > 0) {
value = flt(me.frm.doc.outstanding_amount / me.frm.doc.conversion_rate, precision(me.idx));
}
- me.write_off_amount(value)
+ me.write_off_amount(value);
}
- }else{
- this.update_payment_amount()
+ } else {
+ this.update_payment_amount();
}
},
- update_payment_amount: function(){
+ update_payment_amount: function() {
var me = this;
- $.each(this.frm.doc.payments, function(index, data){
- if(cint(me.idx) == cint(data.idx)){
- data.amount = flt(me.selected_mode.val(), 2)
+ $.each(this.frm.doc.payments, function(index, data) {
+ if (cint(me.idx) == cint(data.idx)) {
+ data.amount = flt(me.selected_mode.val(), 2);
}
})
@@ -228,12 +223,12 @@ erpnext.payments = erpnext.stock.StockController.extend({
this.show_amounts();
},
- show_amounts: function(){
+ show_amounts: function() {
var me = this;
$(this.$body).find(".write_off_amount").val(format_currency(this.frm.doc.write_off_amount, this.frm.doc.currency));
$(this.$body).find('.paid_amount').text(format_currency(this.frm.doc.paid_amount, this.frm.doc.currency));
- $(this.$body).find('.change_amount').val(format_currency(this.frm.doc.change_amount, this.frm.doc.currency))
- $(this.$body).find('.outstanding_amount').text(format_currency(this.frm.doc.outstanding_amount, frappe.get_doc(":Company", this.frm.doc.company).default_currency))
+ $(this.$body).find('.change_amount').val(format_currency(this.frm.doc.change_amount, this.frm.doc.currency));
+ $(this.$body).find('.outstanding_amount').text(format_currency(this.frm.doc.outstanding_amount, frappe.get_doc(":Company", this.frm.doc.company).default_currency));
this.update_invoice();
}
})
\ No newline at end of file
diff --git a/erpnext/regional/india/setup.py b/erpnext/regional/india/setup.py
index 229e0c031e..3e0b9b733b 100644
--- a/erpnext/regional/india/setup.py
+++ b/erpnext/regional/india/setup.py
@@ -27,6 +27,9 @@ def setup_company_independent_fixtures(patch=False):
add_print_formats()
def add_hsn_sac_codes():
+ if frappe.flags.in_test and frappe.flags.created_hsn_codes:
+ return
+
# HSN codes
with open(os.path.join(os.path.dirname(__file__), 'hsn_code_data.json'), 'r') as f:
hsn_codes = json.loads(f.read())
@@ -38,6 +41,9 @@ def add_hsn_sac_codes():
sac_codes = json.loads(f.read())
create_hsn_codes(sac_codes, code_field="sac_code")
+ if frappe.flags.in_test:
+ frappe.flags.created_hsn_codes = True
+
def create_hsn_codes(data, code_field):
for d in data:
hsn_code = frappe.new_doc('GST HSN Code')
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 51d86ff0bf..818888c0c1 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -75,7 +75,7 @@ class Customer(TransactionBase):
self.loyalty_program_tier = customer.loyalty_program_tier
if self.sales_team:
- if sum([member.allocated_percentage or 0 for member in self.sales_team]) != 100:
+ if sum(member.allocated_percentage or 0 for member in self.sales_team) != 100:
frappe.throw(_("Total contribution percentage should be equal to 100"))
def check_customer_group_change(self):
diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index 246f9234a4..e4f8a47581 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -50,7 +50,7 @@ class Quotation(SellingController):
self.customer_name = company_name or lead_name
def update_opportunity(self, status):
- for opportunity in list(set([d.prevdoc_docname for d in self.get("items")])):
+ for opportunity in set(d.prevdoc_docname for d in self.get("items")):
if opportunity:
self.update_opportunity_status(status, opportunity)
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index d9e52e1d69..551f715bd5 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -151,7 +151,7 @@ class SalesOrder(SellingController):
frappe.db.sql("update `tabOpportunity` set status = %s where name=%s",(flag,enq[0][0]))
def update_prevdoc_status(self, flag=None):
- for quotation in list(set([d.prevdoc_docname for d in self.get("items")])):
+ for quotation in set(d.prevdoc_docname for d in self.get("items")):
if quotation:
doc = frappe.get_doc("Quotation", quotation)
if doc.docstatus==2:
diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js
index b24048d1ce..d05541b634 100644
--- a/erpnext/setup/doctype/company/company.js
+++ b/erpnext/setup/doctype/company/company.js
@@ -269,7 +269,7 @@ erpnext.company.setup_queries = function(frm) {
["expenses_included_in_asset_valuation", {"account_type": "Expenses Included In Asset Valuation"}],
["capital_work_in_progress_account", {"account_type": "Capital Work in Progress"}],
["asset_received_but_not_billed", {"account_type": "Asset Received But Not Billed"}],
- ["unrealized_profit_loss_account", {"root_type": "Liability"},]
+ ["unrealized_profit_loss_account", {"root_type": ["in", ["Liability", "Asset"]]}]
], function(i, v) {
erpnext.company.set_custom_query(frm, v);
});
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index 077538d479..27e023c1e5 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -54,7 +54,7 @@ class Company(NestedSet):
def validate_abbr(self):
if not self.abbr:
- self.abbr = ''.join([c[0] for c in self.company_name.split()]).upper()
+ self.abbr = ''.join(c[0] for c in self.company_name.split()).upper()
self.abbr = self.abbr.strip()
@@ -335,7 +335,7 @@ class Company(NestedSet):
clear_defaults_cache()
def abbreviate(self):
- self.abbr = ''.join([c[0].upper() for c in self.company_name.split()])
+ self.abbr = ''.join(c[0].upper() for c in self.company_name.split())
def on_trash(self):
"""
diff --git a/erpnext/setup/doctype/item_group/item_group.py b/erpnext/setup/doctype/item_group/item_group.py
index bff806d547..db31d6d699 100644
--- a/erpnext/setup/doctype/item_group/item_group.py
+++ b/erpnext/setup/doctype/item_group/item_group.py
@@ -139,7 +139,7 @@ def get_product_list_for_group(product_group=None, start=0, limit=10, search=Non
# return child item groups if the type is of "Is Group"
return get_child_groups_for_list_in_html(item_group, start, limit, search)
- child_groups = ", ".join([frappe.db.escape(i[0]) for i in get_child_groups(product_group)])
+ child_groups = ", ".join(frappe.db.escape(i[0]) for i in get_child_groups(product_group))
# base query
query = """select I.name, I.item_name, I.item_code, I.route, I.image, I.website_image, I.thumbnail, I.item_group,
@@ -239,7 +239,7 @@ def get_item_for_list_in_html(context):
return frappe.get_template(products_template).render(context)
def get_group_item_count(item_group):
- child_groups = ", ".join(['"' + i[0] + '"' for i in get_child_groups(item_group)])
+ child_groups = ", ".join('"' + i[0] + '"' for i in get_child_groups(item_group))
return frappe.db.sql("""select count(*) from `tabItem`
where docstatus = 0 and show_in_website = 1
and (item_group in (%s)
diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py
index 8fdda565d2..508e17c340 100644
--- a/erpnext/stock/doctype/batch/batch.py
+++ b/erpnext/stock/doctype/batch/batch.py
@@ -304,7 +304,7 @@ def validate_serial_no_with_batch(serial_nos, item_code):
frappe.throw(_("The serial no {0} does not belong to item {1}")
.format(get_link_to_form("Serial No", serial_nos[0]), get_link_to_form("Item", item_code)))
- serial_no_link = ','.join([get_link_to_form("Serial No", sn) for sn in serial_nos])
+ serial_no_link = ','.join(get_link_to_form("Serial No", sn) for sn in serial_nos)
message = "Serial Nos" if len(serial_nos) > 1 else "Serial No"
frappe.throw(_("There is no batch found against the {0}: {1}")
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index cce51cb9b1..dd31965fac 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -264,7 +264,7 @@ class DeliveryNote(SellingController):
"""
Validate that if packed qty exists, it should be equal to qty
"""
- if not any([flt(d.get('packed_qty')) for d in self.get("items")]):
+ if not any(flt(d.get('packed_qty')) for d in self.get("items")):
return
has_error = False
for d in self.get("items"):
diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.py b/erpnext/stock/doctype/delivery_trip/delivery_trip.py
index 81e730126e..9ec28d8981 100644
--- a/erpnext/stock/doctype/delivery_trip/delivery_trip.py
+++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.py
@@ -68,7 +68,7 @@ class DeliveryTrip(Document):
delete (bool, optional): Defaults to `False`. `True` if driver details need to be emptied, else `False`.
"""
- delivery_notes = list(set([stop.delivery_note for stop in self.delivery_stops if stop.delivery_note]))
+ delivery_notes = list(set(stop.delivery_note for stop in self.delivery_stops if stop.delivery_note))
update_fields = {
"driver": self.driver,
@@ -136,8 +136,8 @@ class DeliveryTrip(Document):
# Include last leg in the final distance calculation
self.uom = self.default_distance_uom
- total_distance = sum([leg.get("distance", {}).get("value", 0.0)
- for leg in directions.get("legs")]) # in meters
+ total_distance = sum(leg.get("distance", {}).get("value", 0.0)
+ for leg in directions.get("legs")) # in meters
self.total_distance = total_distance * self.uom_conversion_factor
else:
idx += len(route) - 1
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index dd815404fa..fbd30cf6c7 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -122,6 +122,7 @@ class Item(WebsiteGenerator):
self.validate_auto_reorder_enabled_in_stock_settings()
self.cant_change()
self.update_show_in_website()
+ self.validate_item_tax_net_rate_range()
if not self.is_new():
self.old_item_group = frappe.db.get_value(self.doctype, self.name, "item_group")
@@ -485,6 +486,11 @@ class Item(WebsiteGenerator):
if self.disabled:
self.show_in_website = False
+ def validate_item_tax_net_rate_range(self):
+ for tax in self.get('taxes'):
+ if flt(tax.maximum_net_rate) < flt(tax.minimum_net_rate):
+ frappe.throw(_("Row #{0}: Maximum Net Rate cannot be greater than Minimum Net Rate"))
+
def update_template_tables(self):
template = frappe.get_doc("Item", self.variant_of)
diff --git a/erpnext/stock/doctype/item_tax/item_tax.json b/erpnext/stock/doctype/item_tax/item_tax.json
index ae36efc7e3..fb100967f3 100644
--- a/erpnext/stock/doctype/item_tax/item_tax.json
+++ b/erpnext/stock/doctype/item_tax/item_tax.json
@@ -1,4 +1,5 @@
{
+ "actions": [],
"creation": "2013-02-22 01:28:01",
"doctype": "DocType",
"editable_grid": 1,
@@ -6,7 +7,9 @@
"field_order": [
"item_tax_template",
"tax_category",
- "valid_from"
+ "valid_from",
+ "minimum_net_rate",
+ "maximum_net_rate"
],
"fields": [
{
@@ -33,11 +36,24 @@
"fieldtype": "Date",
"in_list_view": 1,
"label": "Valid From"
+ },
+ {
+ "fieldname": "maximum_net_rate",
+ "fieldtype": "Float",
+ "in_list_view": 1,
+ "label": "Maximum Net Rate"
+ },
+ {
+ "fieldname": "minimum_net_rate",
+ "fieldtype": "Float",
+ "in_list_view": 1,
+ "label": "Minimum Net Rate"
}
],
"idx": 1,
"istable": 1,
- "modified": "2020-06-25 01:40:28.859752",
+ "links": [],
+ "modified": "2021-06-03 13:20:06.982303",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item Tax",
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
index 83109469fc..5df4d8743f 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
@@ -78,7 +78,7 @@ class LandedCostVoucher(Document):
.format(item.idx, item.item_code))
def set_total_taxes_and_charges(self):
- self.total_taxes_and_charges = sum([flt(d.base_amount) for d in self.get("taxes")])
+ self.total_taxes_and_charges = sum(flt(d.base_amount) for d in self.get("taxes"))
def set_applicable_charges_on_item(self):
if self.get('taxes') and self.distribute_charges_based_on != 'Distribute Manually':
@@ -104,15 +104,15 @@ class LandedCostVoucher(Document):
based_on = self.distribute_charges_based_on.lower()
if based_on != 'distribute manually':
- total = sum([flt(d.get(based_on)) for d in self.get("items")])
+ total = sum(flt(d.get(based_on)) for d in self.get("items"))
else:
# consider for proportion while distributing manually
- total = sum([flt(d.get('applicable_charges')) for d in self.get("items")])
+ total = sum(flt(d.get('applicable_charges')) for d in self.get("items"))
if not total:
frappe.throw(_("Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'").format(based_on))
- total_applicable_charges = sum([flt(d.applicable_charges) for d in self.get("items")])
+ total_applicable_charges = sum(flt(d.applicable_charges) for d in self.get("items"))
precision = get_field_precision(frappe.get_meta("Landed Cost Item").get_field("applicable_charges"),
currency=frappe.get_cached_value('Company', self.company, "default_currency"))
diff --git a/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py b/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
index 984ae46c66..32b08f60c4 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
+++ b/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
@@ -311,7 +311,7 @@ def create_landed_cost_voucher(receipt_document_type, receipt_document, company,
def distribute_landed_cost_on_items(lcv):
based_on = lcv.distribute_charges_based_on.lower()
- total = sum([flt(d.get(based_on)) for d in lcv.get("items")])
+ total = sum(flt(d.get(based_on)) for d in lcv.get("items"))
for item in lcv.get("items"):
item.applicable_charges = flt(item.get(based_on)) * flt(lcv.total_taxes_and_charges) / flt(total)
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.py b/erpnext/stock/doctype/packing_slip/packing_slip.py
index 2008bffcd3..4a843e0fde 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.py
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.py
@@ -88,9 +88,9 @@ class PackingSlip(Document):
rows = [d.item_code for d in self.get("items")]
# also pick custom fields from delivery note
- custom_fields = ', '.join(['dni.`{0}`'.format(d.fieldname)
+ custom_fields = ', '.join('dni.`{0}`'.format(d.fieldname)
for d in frappe.get_meta("Delivery Note Item").get_custom_fields()
- if d.fieldtype not in no_value_fields])
+ if d.fieldtype not in no_value_fields)
if custom_fields:
custom_fields = ', ' + custom_fields
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index 5095a80214..8d9b675bed 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -246,7 +246,7 @@ class TestPurchaseReceipt(unittest.TestCase):
pr = make_purchase_receipt(item_code="_Test FG Item", qty=10, rate=500, is_subcontracted="Yes")
self.assertEqual(len(pr.get("supplied_items")), 2)
- rm_supp_cost = sum([d.amount for d in pr.get("supplied_items")])
+ rm_supp_cost = sum(d.amount for d in pr.get("supplied_items"))
self.assertEqual(pr.get("items")[0].rm_supp_cost, flt(rm_supp_cost, 2))
pr.cancel()
diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py
index 5ecc9f8140..b236f6a999 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.py
+++ b/erpnext/stock/doctype/serial_no/serial_no.py
@@ -613,7 +613,7 @@ def fetch_serial_numbers(filters, qty, do_not_include=[]):
batch_nos = filters.get("batch_no")
expiry_date = filters.get("expiry_date")
if batch_nos:
- batch_no_condition = """and sr.batch_no in ({}) """.format(', '.join(["'%s'" % d for d in batch_nos]))
+ batch_no_condition = """and sr.batch_no in ({}) """.format(', '.join("'%s'" % d for d in batch_nos))
if expiry_date:
batch_join_selection = "LEFT JOIN `tabBatch` batch on sr.batch_no = batch.name "
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index 93a6fc0e0a..1a25994b24 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -986,7 +986,10 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
items_add: function(doc, cdt, cdn) {
var row = frappe.get_doc(cdt, cdn);
- this.frm.script_manager.copy_from_first_row("items", row, ["expense_account", "cost_center"]);
+
+ if (!(row.expense_account && row.cost_center)) {
+ this.frm.script_manager.copy_from_first_row("items", row, ["expense_account", "cost_center"]);
+ }
if(!row.s_warehouse) row.s_warehouse = this.frm.doc.from_warehouse;
if(!row.t_warehouse) row.t_warehouse = this.frm.doc.to_warehouse;
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 2f76bc7d56..560ceaa917 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -465,7 +465,7 @@ class StockEntry(StockController):
"""
# Set rate for outgoing items
outgoing_items_cost = self.set_rate_for_outgoing_items(reset_outgoing_rate, raise_error_if_no_rate)
- finished_item_qty = sum([d.transfer_qty for d in self.items if d.is_finished_item])
+ finished_item_qty = sum(d.transfer_qty for d in self.items if d.is_finished_item)
# Set basic rate for incoming items
for d in self.get('items'):
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index d1dcdc21c8..746cbbf601 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -436,18 +436,22 @@ def get_barcode_data(items_list):
return itemwise_barcode
@frappe.whitelist()
-def get_item_tax_info(company, tax_category, item_codes):
+def get_item_tax_info(company, tax_category, item_codes, item_rates=None):
out = {}
if isinstance(item_codes, string_types):
item_codes = json.loads(item_codes)
+ if isinstance(item_rates, string_types):
+ item_rates = json.loads(item_rates)
+
for item_code in item_codes:
- if not item_code or item_code in out:
+ if not item_code or item_code[1] in out:
continue
- out[item_code] = {}
- item = frappe.get_cached_doc("Item", item_code)
- get_item_tax_template({"company": company, "tax_category": tax_category}, item, out[item_code])
- out[item_code]["item_tax_rate"] = get_item_tax_map(company, out[item_code].get("item_tax_template"), as_json=True)
+ out[item_code[1]] = {}
+ item = frappe.get_cached_doc("Item", item_code[0])
+ args = {"company": company, "tax_category": tax_category, "net_rate": item_rates[item_code[1]]}
+ get_item_tax_template(args, item, out[item_code[1]])
+ out[item_code[1]]["item_tax_rate"] = get_item_tax_map(company, out[item_code[1]].get("item_tax_template"), as_json=True)
return out
@@ -478,12 +482,13 @@ def _get_item_tax_template(args, taxes, out=None, for_validate=False):
for tax in taxes:
tax_company = frappe.get_value("Item Tax Template", tax.item_tax_template, 'company')
- if tax.valid_from and tax_company == args['company']:
+ if (tax.valid_from or tax.maximum_net_rate) and tax_company == args['company']:
# In purchase Invoice first preference will be given to supplier invoice date
# if supplier date is not present then posting date
validation_date = args.get('transaction_date') or args.get('bill_date') or args.get('posting_date')
- if getdate(tax.valid_from) <= getdate(validation_date):
+ if getdate(tax.valid_from) <= getdate(validation_date) \
+ and is_within_valid_range(args, tax):
taxes_with_validity.append(tax)
else:
if tax_company == args['company']:
@@ -502,12 +507,25 @@ def _get_item_tax_template(args, taxes, out=None, for_validate=False):
if not taxes_with_validity and (not taxes_with_no_validity):
return None
+ # do not change if already a valid template
+ if args.get('item_tax_template') in taxes:
+ return args.get('item_tax_template')
+
for tax in taxes:
if cstr(tax.tax_category) == cstr(args.get("tax_category")):
out["item_tax_template"] = tax.item_tax_template
return tax.item_tax_template
return None
+def is_within_valid_range(args, tax):
+ if not flt(tax.maximum_net_rate):
+ # No range specified, just ignore
+ return True
+ elif flt(tax.minimum_net_rate) <= flt(args.get('net_rate')) <= flt(tax.maximum_net_rate):
+ return True
+
+ return False
+
@frappe.whitelist()
def get_item_tax_map(company, item_tax_template, as_json=True):
item_tax_map = {}
diff --git a/erpnext/stock/report/item_price_stock/item_price_stock.py b/erpnext/stock/report/item_price_stock/item_price_stock.py
index 5296211fae..db7498bb21 100644
--- a/erpnext/stock/report/item_price_stock/item_price_stock.py
+++ b/erpnext/stock/report/item_price_stock/item_price_stock.py
@@ -89,7 +89,7 @@ def get_item_price_qty_data(filters):
{conditions}"""
.format(conditions=conditions), filters, as_dict=1)
- price_list_names = list(set([item.price_list_name for item in item_results]))
+ price_list_names = list(set(item.price_list_name for item in item_results))
buying_price_map = get_price_map(price_list_names, buying=1)
selling_price_map = get_price_map(price_list_names, selling=1)
diff --git a/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py b/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py
index 2f70523264..2e13aa0b04 100644
--- a/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py
+++ b/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py
@@ -66,7 +66,7 @@ def get_consumed_items(condition):
purpose is NULL
or purpose not in ({})
)
- """.format(', '.join([f"'{p}'" for p in purpose_to_exclude]))
+ """.format(', '.join(f"'{p}'" for p in purpose_to_exclude))
condition = condition.replace("posting_date", "sle.posting_date")
consumed_items = frappe.db.sql("""
diff --git a/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py b/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py
index 276e42ee43..8fffbccab3 100644
--- a/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py
+++ b/erpnext/stock/report/product_bundle_balance/product_bundle_balance.py
@@ -141,7 +141,7 @@ def get_stock_ledger_entries(filters, items):
return []
item_conditions_sql = ' and sle.item_code in ({})' \
- .format(', '.join([frappe.db.escape(i) for i in items]))
+ .format(', '.join(frappe.db.escape(i) for i in items))
conditions = get_sle_conditions(filters)
diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py
index bbd73e9112..b6a8063189 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.py
+++ b/erpnext/stock/report/stock_balance/stock_balance.py
@@ -157,7 +157,7 @@ def get_stock_ledger_entries(filters, items):
item_conditions_sql = ''
if items:
item_conditions_sql = ' and sle.item_code in ({})'\
- .format(', '.join([frappe.db.escape(i, percent=False) for i in items]))
+ .format(', '.join(frappe.db.escape(i, percent=False) for i in items))
conditions = get_conditions(filters)
@@ -253,7 +253,7 @@ def get_items(filters):
def get_item_details(items, sle, filters):
item_details = {}
if not items:
- items = list(set([d.item_code for d in sle]))
+ items = list(set(d.item_code for d in sle))
if not items:
return item_details
@@ -291,7 +291,7 @@ def get_item_reorder_details(items):
select parent, warehouse, warehouse_reorder_qty, warehouse_reorder_level
from `tabItem Reorder`
where parent in ({0})
- """.format(', '.join([frappe.db.escape(i, percent=False) for i in items])), as_dict=1)
+ """.format(', '.join(frappe.db.escape(i, percent=False) for i in items)), as_dict=1)
return dict((d.parent + d.warehouse, d) for d in item_reorder_details)
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py
index 36996e9674..8909f217f4 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.py
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.py
@@ -115,7 +115,7 @@ def get_stock_ledger_entries(filters, items):
item_conditions_sql = ''
if items:
item_conditions_sql = 'and sle.item_code in ({})'\
- .format(', '.join([frappe.db.escape(i) for i in items]))
+ .format(', '.join(frappe.db.escape(i) for i in items))
sl_entries = frappe.db.sql("""
SELECT
@@ -169,7 +169,7 @@ def get_items(filters):
def get_item_details(items, sl_entries, include_uom):
item_details = {}
if not items:
- items = list(set([d.item_code for d in sl_entries]))
+ items = list(set(d.item_code for d in sl_entries))
if not items:
return item_details
diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index b2825fc26f..fc82c789cc 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -521,7 +521,7 @@ class update_entries_after(object):
fields=["purchase_rate", "name", "company"],
filters = {'name': ('in', serial_nos)})
- incoming_values = sum([flt(d.purchase_rate) for d in all_serial_nos if d.company==sle.company])
+ incoming_values = sum(flt(d.purchase_rate) for d in all_serial_nos if d.company==sle.company)
# Get rate for serial nos which has been transferred to other company
invalid_serial_nos = [d.name for d in all_serial_nos if d.company!=sle.company]
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.py b/erpnext/support/doctype/warranty_claim/warranty_claim.py
index a3428a25af..a20e7a801b 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.py
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.py
@@ -29,7 +29,7 @@ class WarrantyClaim(TransactionBase):
where t2.parent = t1.name and t2.prevdoc_docname = %s and t1.docstatus!=2""",
(self.name))
if lst:
- lst1 = ','.join([x[0] for x in lst])
+ lst1 = ','.join(x[0] for x in lst)
frappe.throw(_("Cancel Material Visit {0} before cancelling this Warranty Claim").format(lst1))
else:
frappe.db.set(self, 'status', 'Cancelled')
diff --git a/erpnext/utilities/product.py b/erpnext/utilities/product.py
index 66d6cd3888..70b41767d6 100644
--- a/erpnext/utilities/product.py
+++ b/erpnext/utilities/product.py
@@ -131,6 +131,6 @@ def get_non_stock_item_status(item_code, item_warehouse_field):
if frappe.db.exists("Product Bundle", item_code):
items = frappe.get_doc("Product Bundle", item_code).get_all_children()
bundle_warehouse = frappe.db.get_value('Item', item_code, item_warehouse_field)
- return all([ get_qty_in_stock(d.item_code, item_warehouse_field, bundle_warehouse).in_stock for d in items ])
+ return all(get_qty_in_stock(d.item_code, item_warehouse_field, bundle_warehouse).in_stock for d in items)
else:
return 1
diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py
index f99da58e46..db997263c1 100644
--- a/erpnext/utilities/transaction_base.py
+++ b/erpnext/utilities/transaction_base.py
@@ -147,7 +147,7 @@ class TransactionBase(StatusUpdater):
if hasattr(self, "prev_link_mapper") and self.prev_link_mapper.get(for_doctype):
fieldname = self.prev_link_mapper[for_doctype]["fieldname"]
- values = filter(None, tuple([item.as_dict()[fieldname] for item in self.items]))
+ values = filter(None, tuple(item.as_dict()[fieldname] for item in self.items))
if values:
ret = {
@@ -180,7 +180,7 @@ def validate_uom_is_integer(doc, uom_field, qty_fields, child_dt=None):
if isinstance(qty_fields, string_types):
qty_fields = [qty_fields]
- distinct_uoms = list(set([d.get(uom_field) for d in doc.get_all_children()]))
+ distinct_uoms = list(set(d.get(uom_field) for d in doc.get_all_children()))
integer_uoms = list(filter(lambda uom: frappe.db.get_value("UOM", uom,
"must_be_whole_number", cache=True) or None, distinct_uoms))