- {% endif %} -
- {{ __("Description") }} -
-+ {{ __("Description") }} +
++
+ {% if data.value %} + + {{ __("Open BOM {0}", [data.value.bold()]) }} + {% endif %} + {% if data.item_code %} + + {{ __("Open Item {0}", [data.item_code.bold()]) }} + {% endif %} +
+
diff --git a/erpnext/manufacturing/doctype/bom/bom_tree.js b/erpnext/manufacturing/doctype/bom/bom_tree.js
index 185b9ed4bcf..60fb377f476 100644
--- a/erpnext/manufacturing/doctype/bom/bom_tree.js
+++ b/erpnext/manufacturing/doctype/bom/bom_tree.js
@@ -64,7 +64,7 @@ frappe.treeview_settings["BOM"] = {
if(node.is_root && node.data.value!="BOM") {
frappe.model.with_doc("BOM", node.data.value, function() {
var bom = frappe.model.get_doc("BOM", node.data.value);
- node.data.image = bom.image || "";
+ node.data.image = escape(bom.image) || "";
node.data.description = bom.description || "";
});
}
diff --git a/erpnext/manufacturing/doctype/bom/test_bom.py b/erpnext/manufacturing/doctype/bom/test_bom.py
index e1cca9e3ef4..57a54587269 100644
--- a/erpnext/manufacturing/doctype/bom/test_bom.py
+++ b/erpnext/manufacturing/doctype/bom/test_bom.py
@@ -2,16 +2,16 @@
# License: GNU General Public License v3. See license.txt
-from __future__ import unicode_literals
+from collections import deque
import unittest
import frappe
from frappe.utils import cstr, flt
from frappe.test_runner import make_test_records
from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import create_stock_reconciliation
from erpnext.manufacturing.doctype.bom_update_tool.bom_update_tool import update_cost
-from six import string_types
from erpnext.stock.doctype.item.test_item import make_item
from erpnext.buying.doctype.purchase_order.test_purchase_order import create_purchase_order
+from erpnext.tests.test_subcontracting import set_backflush_based_on
test_records = frappe.get_test_records('BOM')
@@ -122,7 +122,7 @@ class TestBOM(unittest.TestCase):
bom.items[0].conversion_factor = 5
bom.insert()
- bom.update_cost()
+ bom.update_cost(update_hour_rate = False)
# test amounts in selected currency
self.assertEqual(bom.items[0].rate, 300)
@@ -160,6 +160,7 @@ class TestBOM(unittest.TestCase):
def test_subcontractor_sourced_item(self):
item_code = "_Test Subcontracted FG Item 1"
+ set_backflush_based_on('Material Transferred for Subcontract')
if not frappe.db.exists('Item', item_code):
make_item(item_code, {
@@ -225,11 +226,88 @@ class TestBOM(unittest.TestCase):
supplied_items = sorted([d.rm_item_code for d in po.supplied_items])
self.assertEqual(bom_items, supplied_items)
+ def test_bom_tree_representation(self):
+ bom_tree = {
+ "Assembly": {
+ "SubAssembly1": {"ChildPart1": {}, "ChildPart2": {},},
+ "SubAssembly2": {"ChildPart3": {}},
+ "SubAssembly3": {"SubSubAssy1": {"ChildPart4": {}}},
+ "ChildPart5": {},
+ "ChildPart6": {},
+ "SubAssembly4": {"SubSubAssy2": {"ChildPart7": {}}},
+ }
+ }
+ parent_bom = create_nested_bom(bom_tree, prefix="")
+ created_tree = parent_bom.get_tree_representation()
+
+ reqd_order = level_order_traversal(bom_tree)[1:] # skip first item
+ created_order = created_tree.level_order_traversal()
+
+ self.assertEqual(len(reqd_order), len(created_order))
+
+ for reqd_item, created_item in zip(reqd_order, created_order):
+ self.assertEqual(reqd_item, created_item.item_code)
+
+
def get_default_bom(item_code="_Test FG Item 2"):
return frappe.db.get_value("BOM", {"item": item_code, "is_active": 1, "is_default": 1})
+
+
+
+def level_order_traversal(node):
+ traversal = []
+ q = deque()
+ q.append(node)
+
+ while q:
+ node = q.popleft()
+
+ for node_name, subtree in node.items():
+ traversal.append(node_name)
+ q.append(subtree)
+
+ return traversal
+
+def create_nested_bom(tree, prefix="_Test bom "):
+ """ Helper function to create a simple nested bom from tree describing item names. (along with required items)
+ """
+
+ def create_items(bom_tree):
+ for item_code, subtree in bom_tree.items():
+ bom_item_code = prefix + item_code
+ if not frappe.db.exists("Item", bom_item_code):
+ frappe.get_doc(doctype="Item", item_code=bom_item_code, item_group="_Test Item Group").insert()
+ create_items(subtree)
+ create_items(tree)
+
+ def dfs(tree, node):
+ """naive implementation for searching right subtree"""
+ for node_name, subtree in tree.items():
+ if node_name == node:
+ return subtree
+ else:
+ result = dfs(subtree, node)
+ if result is not None:
+ return result
+
+ order_of_creating_bom = reversed(level_order_traversal(tree))
+
+ for item in order_of_creating_bom:
+ child_items = dfs(tree, item)
+ if child_items:
+ bom_item_code = prefix + item
+ bom = frappe.get_doc(doctype="BOM", item=bom_item_code)
+ for child_item in child_items.keys():
+ bom.append("items", {"item_code": prefix + child_item})
+ bom.insert()
+ bom.submit()
+
+ return bom # parent bom is last bom
+
+
def reset_item_valuation_rate(item_code, warehouse_list=None, qty=None, rate=None):
- if warehouse_list and isinstance(warehouse_list, string_types):
+ if warehouse_list and isinstance(warehouse_list, str):
warehouse_list = [warehouse_list]
if not warehouse_list:
diff --git a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
index 07464e3e766..4458e6db234 100644
--- a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
+++ b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
@@ -13,10 +13,10 @@
"col_break1",
"hour_rate",
"time_in_mins",
- "batch_size",
"operating_cost",
"base_hour_rate",
"base_operating_cost",
+ "batch_size",
"image"
],
"fields": [
@@ -61,6 +61,8 @@
},
{
"description": "In minutes",
+ "fetch_from": "operation.total_operation_time",
+ "fetch_if_empty": 1,
"fieldname": "time_in_mins",
"fieldtype": "Float",
"in_list_view": 1,
@@ -104,7 +106,8 @@
"label": "Image"
},
{
- "default": "1",
+ "fetch_from": "operation.batch_size",
+ "fetch_if_empty": 1,
"fieldname": "batch_size",
"fieldtype": "Int",
"label": "Batch Size"
@@ -120,7 +123,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2020-10-13 18:14:10.018774",
+ "modified": "2021-01-12 14:48:09.596843",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "BOM Operation",
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.js b/erpnext/manufacturing/doctype/job_card/job_card.js
index 4e8dd41022b..81860c9fbcf 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.js
+++ b/erpnext/manufacturing/doctype/job_card/job_card.js
@@ -11,6 +11,16 @@ frappe.ui.form.on('Job Card', {
}
};
});
+
+ frm.set_indicator_formatter('sub_operation',
+ function(doc) {
+ if (doc.status == "Pending") {
+ return "red";
+ } else {
+ return doc.status === "Complete" ? "green" : "orange";
+ }
+ }
+ );
},
refresh: function(frm) {
@@ -31,6 +41,10 @@ frappe.ui.form.on('Job Card', {
}
}
+ if (frm.doc.docstatus == 1 && !frm.doc.is_corrective_job_card) {
+ frm.trigger('setup_corrective_job_card');
+ }
+
frm.set_query("quality_inspection", function() {
return {
query: "erpnext.stock.doctype.quality_inspection.quality_inspection.quality_inspection_query",
@@ -43,12 +57,62 @@ frappe.ui.form.on('Job Card', {
frm.trigger("toggle_operation_number");
- if (frm.doc.docstatus == 0 && (frm.doc.for_quantity > frm.doc.total_completed_qty || !frm.doc.for_quantity)
+ if (frm.doc.docstatus == 0 && !frm.is_new() &&
+ (frm.doc.for_quantity > frm.doc.total_completed_qty || !frm.doc.for_quantity)
&& (frm.doc.items || !frm.doc.items.length || frm.doc.for_quantity == frm.doc.transferred_qty)) {
frm.trigger("prepare_timer_buttons");
}
},
+ setup_corrective_job_card: function(frm) {
+ frm.add_custom_button(__('Corrective Job Card'), () => {
+ let operations = frm.doc.sub_operations.map(d => d.sub_operation).concat(frm.doc.operation);
+
+ let fields = [
+ {
+ fieldtype: 'Link', label: __('Corrective Operation'), options: 'Operation',
+ fieldname: 'operation', get_query() {
+ return {
+ filters: {
+ "is_corrective_operation": 1
+ }
+ };
+ }
+ }, {
+ fieldtype: 'Link', label: __('For Operation'), options: 'Operation',
+ fieldname: 'for_operation', get_query() {
+ return {
+ filters: {
+ "name": ["in", operations]
+ }
+ };
+ }
+ }
+ ];
+
+ frappe.prompt(fields, d => {
+ frm.events.make_corrective_job_card(frm, d.operation, d.for_operation);
+ }, __("Select Corrective Operation"));
+ }, __('Make'));
+ },
+
+ make_corrective_job_card: function(frm, operation, for_operation) {
+ frappe.call({
+ method: 'erpnext.manufacturing.doctype.job_card.job_card.make_corrective_job_card',
+ args: {
+ source_name: frm.doc.name,
+ operation: operation,
+ for_operation: for_operation
+ },
+ callback: function(r) {
+ if (r.message) {
+ frappe.model.sync(r.message);
+ frappe.set_route("Form", r.message.doctype, r.message.name);
+ }
+ }
+ });
+ },
+
operation: function(frm) {
frm.trigger("toggle_operation_number");
@@ -97,101 +161,105 @@ frappe.ui.form.on('Job Card', {
prepare_timer_buttons: function(frm) {
frm.trigger("make_dashboard");
- if (!frm.doc.job_started) {
- frm.add_custom_button(__("Start"), () => {
- if (!frm.doc.employee) {
- frappe.prompt({fieldtype: 'Link', label: __('Employee'), options: "Employee",
- fieldname: 'employee'}, d => {
- if (d.employee) {
- frm.set_value("employee", d.employee);
- } else {
- frm.events.start_job(frm);
- }
- }, __("Enter Value"), __("Start"));
+
+ if (!frm.doc.started_time && !frm.doc.current_time) {
+ frm.add_custom_button(__("Start Job"), () => {
+ if ((frm.doc.employee && !frm.doc.employee.length) || !frm.doc.employee) {
+ frappe.prompt({fieldtype: 'Table MultiSelect', label: __('Select Employees'),
+ options: "Job Card Time Log", fieldname: 'employees'}, d => {
+ frm.events.start_job(frm, "Work In Progress", d.employees);
+ }, __("Assign Job to Employee"));
} else {
- frm.events.start_job(frm);
+ frm.events.start_job(frm, "Work In Progress", frm.doc.employee);
}
}).addClass("btn-primary");
} else if (frm.doc.status == "On Hold") {
- frm.add_custom_button(__("Resume"), () => {
- frappe.flags.resume_job = 1;
- frm.events.start_job(frm);
+ frm.add_custom_button(__("Resume Job"), () => {
+ frm.events.start_job(frm, "Resume Job", frm.doc.employee);
}).addClass("btn-primary");
} else {
- frm.add_custom_button(__("Pause"), () => {
- frappe.flags.pause_job = 1;
- frm.set_value("status", "On Hold");
- frm.events.complete_job(frm);
+ frm.add_custom_button(__("Pause Job"), () => {
+ frm.events.complete_job(frm, "On Hold");
});
- frm.add_custom_button(__("Complete"), () => {
- let completed_time = frappe.datetime.now_datetime();
- frm.trigger("hide_timer");
+ frm.add_custom_button(__("Complete Job"), () => {
+ var sub_operations = frm.doc.sub_operations;
- if (frm.doc.for_quantity) {
+ let set_qty = true;
+ if (sub_operations && sub_operations.length > 1) {
+ set_qty = false;
+ let last_op_row = sub_operations[sub_operations.length - 2];
+
+ if (last_op_row.status == 'Complete') {
+ set_qty = true;
+ }
+ }
+
+ if (set_qty) {
frappe.prompt({fieldtype: 'Float', label: __('Completed Quantity'),
- fieldname: 'qty', reqd: 1, default: frm.doc.for_quantity}, data => {
- frm.events.complete_job(frm, completed_time, data.qty);
- }, __("Enter Value"), __("Complete"));
+ fieldname: 'qty', default: frm.doc.for_quantity}, data => {
+ frm.events.complete_job(frm, "Complete", data.qty);
+ }, __("Enter Value"));
} else {
- frm.events.complete_job(frm, completed_time, 0);
+ frm.events.complete_job(frm, "Complete", 0.0);
}
}).addClass("btn-primary");
}
},
- start_job: function(frm) {
- let row = frappe.model.add_child(frm.doc, 'Job Card Time Log', 'time_logs');
- row.from_time = frappe.datetime.now_datetime();
- frm.set_value('job_started', 1);
- frm.set_value('started_time' , row.from_time);
- frm.set_value("status", "Work In Progress");
-
- if (!frappe.flags.resume_job) {
- frm.set_value('current_time' , 0);
- }
-
- frm.save();
+ start_job: function(frm, status, employee) {
+ const args = {
+ job_card_id: frm.doc.name,
+ start_time: frappe.datetime.now_datetime(),
+ employees: employee,
+ status: status
+ };
+ frm.events.make_time_log(frm, args);
},
- complete_job: function(frm, completed_time, completed_qty) {
- frm.doc.time_logs.forEach(d => {
- if (d.from_time && !d.to_time) {
- d.to_time = completed_time || frappe.datetime.now_datetime();
- d.completed_qty = completed_qty || 0;
+ complete_job: function(frm, status, completed_qty) {
+ const args = {
+ job_card_id: frm.doc.name,
+ complete_time: frappe.datetime.now_datetime(),
+ status: status,
+ completed_qty: completed_qty
+ };
+ frm.events.make_time_log(frm, args);
+ },
- if(frappe.flags.pause_job) {
- let currentIncrement = moment(d.to_time).diff(moment(d.from_time),"seconds") || 0;
- frm.set_value('current_time' , currentIncrement + (frm.doc.current_time || 0));
- } else {
- frm.set_value('started_time' , '');
- frm.set_value('job_started', 0);
- frm.set_value('current_time' , 0);
- }
+ make_time_log: function(frm, args) {
+ frm.events.update_sub_operation(frm, args);
- frm.save();
+ frappe.call({
+ method: "erpnext.manufacturing.doctype.job_card.job_card.make_time_log",
+ args: {
+ args: args
+ },
+ freeze: true,
+ callback: function () {
+ frm.reload_doc();
+ frm.trigger("make_dashboard");
}
});
},
+ update_sub_operation: function(frm, args) {
+ if (frm.doc.sub_operations && frm.doc.sub_operations.length) {
+ let sub_operations = frm.doc.sub_operations.filter(d => d.status != 'Complete');
+ if (sub_operations && sub_operations.length) {
+ args["sub_operation"] = sub_operations[0].sub_operation;
+ }
+ }
+ },
+
validate: function(frm) {
if ((!frm.doc.time_logs || !frm.doc.time_logs.length) && frm.doc.started_time) {
frm.trigger("reset_timer");
}
},
- employee: function(frm) {
- if (frm.doc.job_started && !frm.doc.current_time) {
- frm.trigger("reset_timer");
- } else {
- frm.events.start_job(frm);
- }
- },
-
reset_timer: function(frm) {
frm.set_value('started_time' , '');
- frm.set_value('job_started', 0);
- frm.set_value('current_time' , 0);
},
make_dashboard: function(frm) {
@@ -297,7 +365,6 @@ frappe.ui.form.on('Job Card Time Log', {
},
to_time: function(frm) {
- frm.set_value('job_started', 0);
frm.set_value('started_time', '');
}
})
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.json b/erpnext/manufacturing/doctype/job_card/job_card.json
index 5713f697e99..046e2fd1825 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.json
+++ b/erpnext/manufacturing/doctype/job_card/job_card.json
@@ -9,38 +9,49 @@
"naming_series",
"work_order",
"bom_no",
- "workstation",
- "operation",
- "operation_row_number",
"column_break_4",
"posting_date",
"company",
- "remarks",
"production_section",
"production_item",
"item_name",
"for_quantity",
- "quality_inspection",
- "wip_warehouse",
+ "serial_no",
"column_break_12",
- "employee",
- "employee_name",
- "status",
+ "wip_warehouse",
+ "quality_inspection",
"project",
+ "batch_no",
+ "operation_section_section",
+ "operation",
+ "operation_row_number",
+ "column_break_18",
+ "workstation",
+ "employee",
+ "section_break_21",
+ "sub_operations",
"timing_detail",
"time_logs",
"section_break_13",
"total_completed_qty",
- "total_time_in_mins",
"column_break_15",
+ "total_time_in_mins",
"section_break_8",
"items",
+ "corrective_operation_section",
+ "for_job_card",
+ "is_corrective_job_card",
+ "column_break_33",
+ "hour_rate",
+ "for_operation",
"more_information",
"operation_id",
"sequence_id",
"transferred_qty",
"requested_qty",
+ "status",
"column_break_20",
+ "remarks",
"barcode",
"job_started",
"started_time",
@@ -117,13 +128,6 @@
"fieldtype": "Section Break",
"label": "Timing Detail"
},
- {
- "fieldname": "employee",
- "fieldtype": "Link",
- "in_standard_filter": 1,
- "label": "Employee",
- "options": "Employee"
- },
{
"allow_bulk_edit": 1,
"fieldname": "time_logs",
@@ -133,9 +137,11 @@
},
{
"fieldname": "section_break_13",
- "fieldtype": "Section Break"
+ "fieldtype": "Section Break",
+ "hide_border": 1
},
{
+ "default": "0",
"fieldname": "total_completed_qty",
"fieldtype": "Float",
"label": "Total Completed Qty",
@@ -160,8 +166,7 @@
"fieldname": "items",
"fieldtype": "Table",
"label": "Items",
- "options": "Job Card Item",
- "read_only": 1
+ "options": "Job Card Item"
},
{
"collapsible": 1,
@@ -251,12 +256,7 @@
"reqd": 1
},
{
- "fetch_from": "employee.employee_name",
- "fieldname": "employee_name",
- "fieldtype": "Read Only",
- "label": "Employee Name"
- },
- {
+ "collapsible": 1,
"fieldname": "production_section",
"fieldtype": "Section Break",
"label": "Production"
@@ -314,11 +314,89 @@
"label": "Quality Inspection",
"no_copy": 1,
"options": "Quality Inspection"
+ },
+ {
+ "allow_bulk_edit": 1,
+ "fieldname": "sub_operations",
+ "fieldtype": "Table",
+ "label": "Sub Operations",
+ "options": "Job Card Operation",
+ "read_only": 1
+ },
+ {
+ "fieldname": "operation_section_section",
+ "fieldtype": "Section Break",
+ "label": "Operation Section"
+ },
+ {
+ "fieldname": "column_break_18",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "section_break_21",
+ "fieldtype": "Section Break",
+ "hide_border": 1
+ },
+ {
+ "depends_on": "is_corrective_job_card",
+ "fieldname": "hour_rate",
+ "fieldtype": "Currency",
+ "label": "Hour Rate"
+ },
+ {
+ "collapsible": 1,
+ "depends_on": "is_corrective_job_card",
+ "fieldname": "corrective_operation_section",
+ "fieldtype": "Section Break",
+ "label": "Corrective Operation"
+ },
+ {
+ "default": "0",
+ "fieldname": "is_corrective_job_card",
+ "fieldtype": "Check",
+ "label": "Is Corrective Job Card",
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_33",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "for_job_card",
+ "fieldtype": "Link",
+ "label": "For Job Card",
+ "options": "Job Card",
+ "read_only": 1
+ },
+ {
+ "fetch_from": "for_job_card.operation",
+ "fetch_if_empty": 1,
+ "fieldname": "for_operation",
+ "fieldtype": "Link",
+ "label": "For Operation",
+ "options": "Operation"
+ },
+ {
+ "fieldname": "employee",
+ "fieldtype": "Table MultiSelect",
+ "label": "Employee",
+ "options": "Job Card Time Log"
+ },
+ {
+ "fieldname": "serial_no",
+ "fieldtype": "Small Text",
+ "label": "Serial No"
+ },
+ {
+ "fieldname": "batch_no",
+ "fieldtype": "Link",
+ "label": "Batch No",
+ "options": "Batch"
}
],
"is_submittable": 1,
"links": [],
- "modified": "2020-11-19 18:26:50.531664",
+ "modified": "2021-03-16 15:59:32.766484",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Job Card",
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py
index fb26062566a..420bb008039 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.py
+++ b/erpnext/manufacturing/doctype/job_card/job_card.py
@@ -5,11 +5,12 @@
from __future__ import unicode_literals
import frappe
import datetime
+import json
from frappe import _, bold
from frappe.model.mapper import get_mapped_doc
from frappe.model.document import Document
from frappe.utils import (flt, cint, time_diff_in_hours, get_datetime, getdate,
- get_time, add_to_date, time_diff, add_days, get_datetime_str, get_link_to_form)
+ get_time, add_to_date, time_diff, add_days, get_datetime_str, get_link_to_form, time_diff_in_seconds)
from erpnext.manufacturing.doctype.manufacturing_settings.manufacturing_settings import get_mins_between_operations
@@ -25,10 +26,21 @@ class JobCard(Document):
self.set_status()
self.validate_operation_id()
self.validate_sequence_id()
+ self.get_sub_operations()
+ self.update_sub_operation_status()
+
+ def get_sub_operations(self):
+ if self.operation:
+ self.sub_operations = []
+ for row in frappe.get_all("Sub Operation",
+ filters = {"parent": self.operation}, fields=["operation", "idx"]):
+ row.status = "Pending"
+ row.sub_operation = row.operation
+ self.append("sub_operations", row)
def validate_time_logs(self):
- self.total_completed_qty = 0.0
self.total_time_in_mins = 0.0
+ self.total_completed_qty = 0.0
if self.get('time_logs'):
for d in self.get('time_logs'):
@@ -44,11 +56,14 @@ class JobCard(Document):
d.time_in_mins = time_diff_in_hours(d.to_time, d.from_time) * 60
self.total_time_in_mins += d.time_in_mins
- if d.completed_qty:
+ if d.completed_qty and not self.sub_operations:
self.total_completed_qty += d.completed_qty
self.total_completed_qty = flt(self.total_completed_qty, self.precision("total_completed_qty"))
+ for row in self.sub_operations:
+ self.total_completed_qty += row.completed_qty
+
def get_overlap_for(self, args, check_next_available_slot=False):
production_capacity = 1
@@ -57,7 +72,7 @@ class JobCard(Document):
self.workstation, 'production_capacity') or 1
validate_overlap_for = " and jc.workstation = %(workstation)s "
- if self.employee:
+ if args.get("employee"):
# override capacity for employee
production_capacity = 1
validate_overlap_for = " and jc.employee = %(employee)s "
@@ -80,7 +95,7 @@ class JobCard(Document):
"to_time": args.to_time,
"name": args.name or "No Name",
"parent": args.parent or "No Name",
- "employee": self.employee,
+ "employee": args.get("employee"),
"workstation": self.workstation
}, as_dict=True)
@@ -158,6 +173,108 @@ class JobCard(Document):
row.planned_start_time = datetime.datetime.combine(start_date,
get_time(workstation_doc.working_hours[0].start_time))
+ def add_time_log(self, args):
+ last_row = []
+ employees = args.employees
+ if isinstance(employees, str):
+ employees = json.loads(employees)
+
+ if self.time_logs and len(self.time_logs) > 0:
+ last_row = self.time_logs[-1]
+
+ self.reset_timer_value(args)
+ if last_row and args.get("complete_time"):
+ for row in self.time_logs:
+ if not row.to_time:
+ row.update({
+ "to_time": get_datetime(args.get("complete_time")),
+ "operation": args.get("sub_operation"),
+ "completed_qty": args.get("completed_qty") or 0.0
+ })
+ elif args.get("start_time"):
+ new_args = {
+ "from_time": get_datetime(args.get("start_time")),
+ "operation": args.get("sub_operation"),
+ "completed_qty": 0.0
+ }
+
+ if employees:
+ for name in employees:
+ new_args.employee = name.get('employee')
+ self.add_start_time_log(new_args)
+ else:
+ self.add_start_time_log(new_args)
+
+ if not self.employee and employees:
+ self.set_employees(employees)
+
+ if self.status == "On Hold":
+ self.current_time = time_diff_in_seconds(last_row.to_time, last_row.from_time)
+
+ self.save()
+
+ def add_start_time_log(self, args):
+ self.append("time_logs", args)
+
+ def set_employees(self, employees):
+ for name in employees:
+ self.append('employee', {
+ 'employee': name.get('employee'),
+ 'completed_qty': 0.0
+ })
+
+ def reset_timer_value(self, args):
+ self.started_time = None
+
+ if args.get("status") in ["Work In Progress", "Complete"]:
+ self.current_time = 0.0
+
+ if args.get("status") == "Work In Progress":
+ self.started_time = get_datetime(args.get("start_time"))
+
+ if args.get("status") == "Resume Job":
+ args["status"] = "Work In Progress"
+
+ if args.get("status"):
+ self.status = args.get("status")
+
+ def update_sub_operation_status(self):
+ if not (self.sub_operations and self.time_logs):
+ return
+
+ operation_wise_completed_time = {}
+ for time_log in self.time_logs:
+ if time_log.operation not in operation_wise_completed_time:
+ operation_wise_completed_time.setdefault(time_log.operation,
+ frappe._dict({"status": "Pending", "completed_qty":0.0, "completed_time": 0.0, "employee": []}))
+
+ op_row = operation_wise_completed_time[time_log.operation]
+ op_row.status = "Work In Progress" if not time_log.time_in_mins else "Complete"
+ if self.status == 'On Hold':
+ op_row.status = 'Pause'
+
+ op_row.employee.append(time_log.employee)
+ if time_log.time_in_mins:
+ op_row.completed_time += time_log.time_in_mins
+ op_row.completed_qty += time_log.completed_qty
+
+ for row in self.sub_operations:
+ operation_deatils = operation_wise_completed_time.get(row.sub_operation)
+ if operation_deatils:
+ if row.status != 'Complete':
+ row.status = operation_deatils.status
+
+ row.completed_time = operation_deatils.completed_time
+ if operation_deatils.employee:
+ row.completed_time = row.completed_time / len(set(operation_deatils.employee))
+
+ if operation_deatils.completed_qty:
+ row.completed_qty = operation_deatils.completed_qty / len(set(operation_deatils.employee))
+ else:
+ row.status = 'Pending'
+ row.completed_time = 0.0
+ row.completed_qty = 0.0
+
def update_time_logs(self, row):
self.append("time_logs", {
"from_time": row.planned_start_time,
@@ -182,15 +299,18 @@ class JobCard(Document):
if self.get('operation') == d.operation:
self.append('items', {
- 'item_code': d.item_code,
- 'source_warehouse': d.source_warehouse,
- 'uom': frappe.db.get_value("Item", d.item_code, 'stock_uom'),
- 'item_name': d.item_name,
- 'description': d.description,
- 'required_qty': (d.required_qty * flt(self.for_quantity)) / doc.qty
+ "item_code": d.item_code,
+ "source_warehouse": d.source_warehouse,
+ "uom": frappe.db.get_value("Item", d.item_code, 'stock_uom'),
+ "item_name": d.item_name,
+ "description": d.description,
+ "required_qty": (d.required_qty * flt(self.for_quantity)) / doc.qty,
+ "rate": d.rate,
+ "amount": d.amount
})
def on_submit(self):
+ self.validate_transfer_qty()
self.validate_job_card()
self.update_work_order()
self.set_transferred_qty()
@@ -199,7 +319,16 @@ class JobCard(Document):
self.update_work_order()
self.set_transferred_qty()
+ def validate_transfer_qty(self):
+ if self.items and self.transferred_qty < self.for_quantity:
+ frappe.throw(_('Materials needs to be transferred to the work in progress warehouse for the job card {0}')
+ .format(self.name))
+
def validate_job_card(self):
+ if self.work_order and frappe.get_cached_value('Work Order', self.work_order, 'status') == 'Stopped':
+ frappe.throw(_("Transaction not allowed against stopped Work Order {0}")
+ .format(get_link_to_form('Work Order', self.work_order)))
+
if not self.time_logs:
frappe.throw(_("Time logs are required for {0} {1}")
.format(bold("Job Card"), get_link_to_form("Job Card", self.name)))
@@ -215,6 +344,10 @@ class JobCard(Document):
if not self.work_order:
return
+ if self.is_corrective_job_card and not cint(frappe.db.get_single_value('Manufacturing Settings',
+ 'add_corrective_operation_cost_in_finished_good_valuation')):
+ return
+
for_quantity, time_in_mins = 0, 0
from_time_list, to_time_list = [], []
@@ -225,10 +358,24 @@ class JobCard(Document):
time_in_mins = flt(data[0].time_in_mins)
wo = frappe.get_doc('Work Order', self.work_order)
- if self.operation_id:
+
+ if self.is_corrective_job_card:
+ self.update_corrective_in_work_order(wo)
+
+ elif self.operation_id:
self.validate_produced_quantity(for_quantity, wo)
self.update_work_order_data(for_quantity, time_in_mins, wo)
+ def update_corrective_in_work_order(self, wo):
+ wo.corrective_operation_cost = 0.0
+ for row in frappe.get_all('Job Card', fields = ['total_time_in_mins', 'hour_rate'],
+ filters = {'is_corrective_job_card': 1, 'docstatus': 1, 'work_order': self.work_order}):
+ wo.corrective_operation_cost += flt(row.total_time_in_mins) * flt(row.hour_rate)
+
+ wo.calculate_operating_cost()
+ wo.flags.ignore_validate_update_after_submit = True
+ wo.save()
+
def validate_produced_quantity(self, for_quantity, wo):
if self.docstatus < 2: return
@@ -248,8 +395,8 @@ class JobCard(Document):
min(from_time) as start_time, max(to_time) as end_time
FROM `tabJob Card` jc, `tabJob Card Time Log` jctl
WHERE
- jctl.parent = jc.name and jc.work_order = %s
- and jc.operation_id = %s and jc.docstatus = 1
+ jctl.parent = jc.name and jc.work_order = %s and jc.operation_id = %s
+ and jc.docstatus = 1 and IFNULL(jc.is_corrective_job_card, 0) = 0
""", (self.work_order, self.operation_id), as_dict=1)
for data in wo.operations:
@@ -271,7 +418,8 @@ class JobCard(Document):
def get_current_operation_data(self):
return frappe.get_all('Job Card',
fields = ["sum(total_time_in_mins) as time_in_mins", "sum(total_completed_qty) as completed_qty"],
- filters = {"docstatus": 1, "work_order": self.work_order, "operation_id": self.operation_id})
+ filters = {"docstatus": 1, "work_order": self.work_order, "operation_id": self.operation_id,
+ "is_corrective_job_card": 0})
def set_transferred_qty_in_job_card(self, ste_doc):
for row in ste_doc.items:
@@ -317,7 +465,7 @@ class JobCard(Document):
'docstatus': ('!=', 2)}, fields = 'sum(transferred_qty) as qty', group_by='operation_id')
if job_cards:
- qty = min([d.qty for d in job_cards])
+ qty = min(d.qty for d in job_cards)
doc.db_set('material_transferred_for_manufacturing', qty)
@@ -354,7 +502,11 @@ class JobCard(Document):
.format(bold(self.operation), work_order), OperationMismatchError)
def validate_sequence_id(self):
- if not (self.work_order and self.sequence_id): return
+ if self.is_corrective_job_card:
+ return
+
+ if not (self.work_order and self.sequence_id):
+ return
current_operation_qty = 0.0
data = self.get_current_operation_data()
@@ -376,6 +528,17 @@ class JobCard(Document):
frappe.throw(_("{0}, complete the operation {1} before the operation {2}.")
.format(message, bold(row.operation), bold(self.operation)), OperationSequenceError)
+
+@frappe.whitelist()
+def make_time_log(args):
+ if isinstance(args, str):
+ args = json.loads(args)
+
+ args = frappe._dict(args)
+ doc = frappe.get_doc("Job Card", args.job_card_id)
+ doc.validate_sequence_id()
+ doc.add_time_log(args)
+
@frappe.whitelist()
def get_operation_details(work_order, operation):
if work_order and operation:
@@ -433,7 +596,8 @@ def make_material_request(source_name, target_doc=None):
def make_stock_entry(source_name, target_doc=None):
def update_item(obj, target, source_parent):
target.t_warehouse = source_parent.wip_warehouse
- target.conversion_factor = 1
+ if not target.conversion_factor:
+ target.conversion_factor = 1
def set_missing_values(source, target):
target.purpose = "Material Transfer for Manufacture"
@@ -510,3 +674,28 @@ def get_job_details(start, end, filters=None):
events.append(job_card_data)
return events
+
+@frappe.whitelist()
+def make_corrective_job_card(source_name, operation=None, for_operation=None, target_doc=None):
+ def set_missing_values(source, target):
+ target.is_corrective_job_card = 1
+ target.operation = operation
+ target.for_operation = for_operation
+
+ target.set('time_logs', [])
+ target.set('employee', [])
+ target.set('items', [])
+ target.get_sub_operations()
+ target.get_required_items()
+ target.validate_time_logs()
+
+ doclist = get_mapped_doc("Job Card", source_name, {
+ "Job Card": {
+ "doctype": "Job Card",
+ "field_map": {
+ "name": "for_job_card",
+ },
+ }
+ }, target_doc, set_missing_values)
+
+ return doclist
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/job_card_item/job_card_item.json b/erpnext/manufacturing/doctype/job_card_item/job_card_item.json
index 100ef4ca3a3..d91530dd3b5 100644
--- a/erpnext/manufacturing/doctype/job_card_item/job_card_item.json
+++ b/erpnext/manufacturing/doctype/job_card_item/job_card_item.json
@@ -25,8 +25,7 @@
"fieldtype": "Link",
"in_list_view": 1,
"label": "Item Code",
- "options": "Item",
- "read_only": 1
+ "options": "Item"
},
{
"fieldname": "source_warehouse",
@@ -67,8 +66,7 @@
"fieldname": "required_qty",
"fieldtype": "Float",
"in_list_view": 1,
- "label": "Required Qty",
- "read_only": 1
+ "label": "Required Qty"
},
{
"fieldname": "column_break_9",
@@ -107,7 +105,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2021-02-11 13:50:13.804108",
+ "modified": "2021-04-22 18:50:00.003444",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Job Card Item",
diff --git a/erpnext/patches/v12_0/__init__.py b/erpnext/manufacturing/doctype/job_card_operation/__init__.py
similarity index 100%
rename from erpnext/patches/v12_0/__init__.py
rename to erpnext/manufacturing/doctype/job_card_operation/__init__.py
diff --git a/erpnext/manufacturing/doctype/job_card_operation/job_card_operation.json b/erpnext/manufacturing/doctype/job_card_operation/job_card_operation.json
new file mode 100644
index 00000000000..9a8692b84d9
--- /dev/null
+++ b/erpnext/manufacturing/doctype/job_card_operation/job_card_operation.json
@@ -0,0 +1,59 @@
+{
+ "actions": [],
+ "creation": "2020-12-07 16:58:38.449041",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "sub_operation",
+ "completed_time",
+ "status",
+ "completed_qty"
+ ],
+ "fields": [
+ {
+ "default": "Pending",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "in_list_view": 1,
+ "label": "Status",
+ "options": "Complete\nPause\nPending\nWork In Progress",
+ "read_only": 1
+ },
+ {
+ "description": "In mins",
+ "fieldname": "completed_time",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Completed Time",
+ "read_only": 1
+ },
+ {
+ "fieldname": "sub_operation",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Operation",
+ "options": "Operation",
+ "read_only": 1
+ },
+ {
+ "fieldname": "completed_qty",
+ "fieldtype": "Float",
+ "label": "Completed Qty",
+ "read_only": 1
+ }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2021-03-16 18:24:35.399593",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Job Card Operation",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/job_card_operation/job_card_operation.py b/erpnext/manufacturing/doctype/job_card_operation/job_card_operation.py
new file mode 100644
index 00000000000..85d72982ed3
--- /dev/null
+++ b/erpnext/manufacturing/doctype/job_card_operation/job_card_operation.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class JobCardOperation(Document):
+ pass
diff --git a/erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json b/erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json
index 9dd54dd6182..a7102d7d237 100644
--- a/erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json
+++ b/erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json
@@ -1,14 +1,17 @@
{
+ "actions": [],
"creation": "2019-03-08 23:56:43.187569",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
+ "employee",
"from_time",
"to_time",
"column_break_2",
"time_in_mins",
- "completed_qty"
+ "completed_qty",
+ "operation"
],
"fields": [
{
@@ -41,10 +44,27 @@
"in_list_view": 1,
"label": "Completed Qty",
"reqd": 1
+ },
+ {
+ "fieldname": "employee",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Employee",
+ "options": "Employee"
+ },
+ {
+ "fieldname": "operation",
+ "fieldtype": "Link",
+ "label": "Operation",
+ "no_copy": 1,
+ "options": "Operation",
+ "read_only": 1
}
],
+ "index_web_pages_for_search": 1,
"istable": 1,
- "modified": "2019-12-03 12:56:02.285448",
+ "links": [],
+ "modified": "2020-12-23 14:30:00.970916",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Job Card Time Log",
diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
index b7634da87c2..024f7847259 100644
--- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
+++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
@@ -26,7 +26,10 @@
"column_break_16",
"overproduction_percentage_for_work_order",
"other_settings_section",
- "update_bom_costs_automatically"
+ "update_bom_costs_automatically",
+ "add_corrective_operation_cost_in_finished_good_valuation",
+ "column_break_23",
+ "make_serial_no_batch_from_work_order"
],
"fields": [
{
@@ -155,13 +158,30 @@
{
"fieldname": "column_break_5",
"fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_23",
+ "fieldtype": "Column Break"
+ },
+ {
+ "default": "0",
+ "description": "System will automatically create the serial numbers / batch for the Finished Good on submission of work order",
+ "fieldname": "make_serial_no_batch_from_work_order",
+ "fieldtype": "Check",
+ "label": "Make Serial No / Batch from Work Order"
+ },
+ {
+ "default": "0",
+ "fieldname": "add_corrective_operation_cost_in_finished_good_valuation",
+ "fieldtype": "Check",
+ "label": "Add Corrective Operation Cost in Finished Good Valuation"
}
],
"icon": "icon-wrench",
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
- "modified": "2020-10-13 10:55:43.996581",
+ "modified": "2021-03-16 15:54:38.967341",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Manufacturing Settings",
@@ -178,4 +198,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/operation/operation.js b/erpnext/manufacturing/doctype/operation/operation.js
index 5c2aba6f095..102b6780e5f 100644
--- a/erpnext/manufacturing/doctype/operation/operation.js
+++ b/erpnext/manufacturing/doctype/operation/operation.js
@@ -2,7 +2,13 @@
// For license information, please see license.txt
frappe.ui.form.on('Operation', {
- refresh: function(frm) {
-
+ setup: function(frm) {
+ frm.set_query('operation', 'sub_operations', function() {
+ return {
+ filters: {
+ 'name': ['not in', [frm.doc.name]]
+ }
+ };
+ });
}
-});
+});
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/operation/operation.json b/erpnext/manufacturing/doctype/operation/operation.json
index c231fba2faa..10a97eda763 100644
--- a/erpnext/manufacturing/doctype/operation/operation.json
+++ b/erpnext/manufacturing/doctype/operation/operation.json
@@ -1,167 +1,132 @@
{
- "allow_copy": 0,
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "Prompt",
- "beta": 0,
- "creation": "2014-11-07 16:20:30.683186",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Setup",
- "editable_grid": 0,
- "engine": "InnoDB",
+ "actions": [],
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "Prompt",
+ "creation": "2014-11-07 16:20:30.683186",
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "engine": "InnoDB",
+ "field_order": [
+ "workstation",
+ "data_2",
+ "is_corrective_operation",
+ "job_card_section",
+ "create_job_card_based_on_batch_size",
+ "column_break_6",
+ "batch_size",
+ "sub_operations_section",
+ "sub_operations",
+ "total_operation_time",
+ "section_break_4",
+ "description"
+ ],
"fields": [
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "workstation",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 1,
- "in_standard_filter": 1,
- "label": "Default Workstation",
- "length": 0,
- "no_copy": 0,
- "options": "Workstation",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "workstation",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Default Workstation",
+ "options": "Workstation"
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "section_break_4",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "collapsible": 1,
+ "fieldname": "section_break_4",
+ "fieldtype": "Section Break",
+ "label": "Operation Description"
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "description",
- "fieldtype": "Text",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Description",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
+ "fieldname": "description",
+ "fieldtype": "Text",
+ "label": "Description"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "sub_operations_section",
+ "fieldtype": "Section Break",
+ "label": "Sub Operations"
+ },
+ {
+ "fieldname": "sub_operations",
+ "fieldtype": "Table",
+ "options": "Sub Operation"
+ },
+ {
+ "description": "Time in mins.",
+ "fieldname": "total_operation_time",
+ "fieldtype": "Float",
+ "label": "Total Operation Time",
+ "read_only": 1
+ },
+ {
+ "fieldname": "data_2",
+ "fieldtype": "Column Break"
+ },
+ {
+ "default": "1",
+ "depends_on": "create_job_card_based_on_batch_size",
+ "fieldname": "batch_size",
+ "fieldtype": "Int",
+ "label": "Batch Size",
+ "mandatory_depends_on": "create_job_card_based_on_batch_size"
+ },
+ {
+ "default": "0",
+ "fieldname": "create_job_card_based_on_batch_size",
+ "fieldtype": "Check",
+ "label": "Create Job Card based on Batch Size"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "job_card_section",
+ "fieldtype": "Section Break",
+ "label": "Job Card"
+ },
+ {
+ "fieldname": "column_break_6",
+ "fieldtype": "Column Break"
+ },
+ {
+ "default": "0",
+ "fieldname": "is_corrective_operation",
+ "fieldtype": "Check",
+ "label": "Is Corrective Operation"
}
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "fa fa-wrench",
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
-
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2016-11-07 05:28:27.462413",
- "modified_by": "Administrator",
- "module": "Manufacturing",
- "name": "Operation",
- "name_case": "",
- "owner": "Administrator",
+ ],
+ "icon": "fa fa-wrench",
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2021-01-12 15:09:23.593338",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Operation",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 0,
- "export": 1,
- "if_owner": 0,
- "import": 1,
- "is_custom": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Manufacturing User",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 0,
+ "create": 1,
+ "delete": 1,
+ "export": 1,
+ "import": 1,
+ "read": 1,
+ "role": "Manufacturing User",
+ "share": 1,
"write": 1
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 0,
- "export": 1,
- "if_owner": 0,
- "import": 1,
- "is_custom": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 1,
- "role": "Manufacturing Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 0,
+ "create": 1,
+ "delete": 1,
+ "export": 1,
+ "import": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Manufacturing Manager",
+ "share": 1,
"write": 1
}
- ],
- "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_seen": 0
+ ],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/operation/operation.py b/erpnext/manufacturing/doctype/operation/operation.py
index 69e83292ff8..374f32019bd 100644
--- a/erpnext/manufacturing/doctype/operation/operation.py
+++ b/erpnext/manufacturing/doctype/operation/operation.py
@@ -2,9 +2,34 @@
# For license information, please see license.txt
from __future__ import unicode_literals
+
+import frappe
+from frappe import _
from frappe.model.document import Document
class Operation(Document):
def validate(self):
if not self.description:
self.description = self.name
+
+ self.duplicate_sub_operation()
+ self.set_total_time()
+
+ def duplicate_sub_operation(self):
+ operation_list = []
+ for row in self.sub_operations:
+ if row.operation in operation_list:
+ frappe.throw(_("The operation {0} can not add multiple times")
+ .format(frappe.bold(row.operation)))
+
+ if self.name == row.operation:
+ frappe.throw(_("The operation {0} can not be the sub operation")
+ .format(frappe.bold(row.operation)))
+
+ operation_list.append(row.operation)
+
+ def set_total_time(self):
+ self.total_operation_time = 0.0
+
+ for row in self.sub_operations:
+ self.total_operation_time += row.time_in_mins
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.js b/erpnext/manufacturing/doctype/production_plan/production_plan.js
index 288c1d0cd66..d198a6962a5 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.js
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.js
@@ -4,7 +4,7 @@
frappe.ui.form.on('Production Plan', {
setup: function(frm) {
frm.custom_make_buttons = {
- 'Work Order': 'Work Order',
+ 'Work Order': 'Work Order / Subcontract PO',
'Material Request': 'Material Request',
};
@@ -68,17 +68,13 @@ frappe.ui.form.on('Production Plan', {
frm.trigger("show_progress");
if (frm.doc.status !== "Completed") {
- if (frm.doc.po_items && frm.doc.status !== "Closed") {
- frm.add_custom_button(__("Work Order"), ()=> {
- frm.trigger("make_work_order");
- }, __('Create'));
- }
+ frm.add_custom_button(__("Work Order Tree"), ()=> {
+ frappe.set_route('Tree', 'Work Order', {production_plan: frm.doc.name});
+ }, __('View'));
- if (frm.doc.mr_items && !in_list(['Material Requested', 'Closed'], frm.doc.status)) {
- frm.add_custom_button(__("Material Request"), ()=> {
- frm.trigger("make_material_request");
- }, __('Create'));
- }
+ frm.add_custom_button(__("Production Plan Summary"), ()=> {
+ frappe.set_route('query-report', 'Production Plan Summary', {production_plan: frm.doc.name});
+ }, __('View'));
if (frm.doc.status === "Closed") {
frm.add_custom_button(__("Re-open"), function() {
@@ -89,6 +85,18 @@ frappe.ui.form.on('Production Plan', {
frm.events.close_open_production_plan(frm, true);
}, __("Status"));
}
+
+ if (frm.doc.po_items && frm.doc.status !== "Closed") {
+ frm.add_custom_button(__("Work Order / Subcontract PO"), ()=> {
+ frm.trigger("make_work_order");
+ }, __('Create'));
+ }
+
+ if (frm.doc.mr_items && !in_list(['Material Requested', 'Closed'], frm.doc.status)) {
+ frm.add_custom_button(__("Material Request"), ()=> {
+ frm.trigger("make_material_request");
+ }, __('Create'));
+ }
}
}
@@ -211,16 +219,38 @@ frappe.ui.form.on('Production Plan', {
});
},
- get_items: function(frm) {
+ get_items: function (frm) {
+ frm.clear_table('prod_plan_references');
+
frappe.call({
method: "get_items",
freeze: true,
doc: frm.doc,
- callback: function() {
+ callback: function () {
refresh_field('po_items');
}
});
},
+ combine_items: function (frm) {
+ frm.clear_table('prod_plan_references');
+
+ frappe.call({
+ method: "get_items",
+ freeze: true,
+ doc: frm.doc,
+ });
+ },
+
+ get_sub_assembly_items: function(frm) {
+ frappe.call({
+ method: "get_sub_assembly_items",
+ freeze: true,
+ doc: frm.doc,
+ callback: function() {
+ refresh_field("sub_assembly_items");
+ }
+ });
+ },
get_items_for_mr: function(frm) {
if (!frm.doc.for_warehouse) {
@@ -295,8 +325,25 @@ frappe.ui.form.on('Production Plan', {
},
download_materials_required: function(frm) {
- let get_template_url = 'erpnext.manufacturing.doctype.production_plan.production_plan.download_raw_materials';
- open_url_post(frappe.request.url, { cmd: get_template_url, doc: frm.doc });
+ const fields = [{
+ fieldname: 'warehouses',
+ fieldtype: 'Table MultiSelect',
+ label: __('Warehouses'),
+ default: frm.doc.from_warehouse,
+ options: "Production Plan Material Request Warehouse",
+ get_query: function () {
+ return {
+ filters: {
+ company: frm.doc.company
+ }
+ };
+ },
+ }];
+
+ frappe.prompt(fields, (row) => {
+ let get_template_url = 'erpnext.manufacturing.doctype.production_plan.production_plan.download_raw_materials';
+ open_url_post(frappe.request.url, { cmd: get_template_url, doc: frm.doc, warehouses: row.warehouses });
+ }, __('Select Warehouses to get Stock for Materials Planning'), __('Get Stock'));
},
show_progress: function(frm) {
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.json b/erpnext/manufacturing/doctype/production_plan/production_plan.json
index f11470086af..84378956c61 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.json
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.json
@@ -28,7 +28,13 @@
"material_requests",
"select_items_to_manufacture_section",
"get_items",
+ "combine_items",
"po_items",
+ "section_break_25",
+ "prod_plan_references",
+ "section_break_24",
+ "get_sub_assembly_items",
+ "sub_assembly_items",
"material_request_planning",
"include_non_stock_items",
"include_subcontracted_items",
@@ -184,7 +190,7 @@
"depends_on": "get_items_from",
"fieldname": "get_items",
"fieldtype": "Button",
- "label": "Get Items For Work Order"
+ "label": "Get Finished Goods for Manufacture"
},
{
"fieldname": "po_items",
@@ -196,7 +202,7 @@
{
"fieldname": "material_request_planning",
"fieldtype": "Section Break",
- "label": "Material Request Planning"
+ "label": "Material Requirement Planning"
},
{
"default": "1",
@@ -234,12 +240,13 @@
},
{
"fieldname": "section_break_27",
- "fieldtype": "Section Break"
+ "fieldtype": "Section Break",
+ "hide_border": 1
},
{
"fieldname": "mr_items",
"fieldtype": "Table",
- "label": "Material Request Plan Item",
+ "label": "Raw Materials",
"no_copy": 1,
"options": "Material Request Plan Item"
},
@@ -316,13 +323,48 @@
"fieldname": "include_safety_stock",
"fieldtype": "Check",
"label": "Include Safety Stock in Required Qty Calculation"
+ },
+ {
+ "default": "0",
+ "depends_on": "eval:doc.get_items_from == 'Sales Order'",
+ "fieldname": "combine_items",
+ "fieldtype": "Check",
+ "label": "Consolidate Items"
+ },
+ {
+ "fieldname": "section_break_25",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "prod_plan_references",
+ "fieldtype": "Table",
+ "hidden": 1,
+ "label": "Production Plan Item Reference",
+ "options": "Production Plan Item Reference"
+ },
+ {
+ "fieldname": "section_break_24",
+ "fieldtype": "Section Break",
+ "hide_border": 1
+ },
+ {
+ "fieldname": "sub_assembly_items",
+ "fieldtype": "Table",
+ "label": "Sub Assembly Items",
+ "no_copy": 1,
+ "options": "Production Plan Sub Assembly Item"
+ },
+ {
+ "fieldname": "get_sub_assembly_items",
+ "fieldtype": "Button",
+ "label": "Get Sub Assembly Items"
}
],
"icon": "fa fa-calendar",
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
- "modified": "2021-03-08 11:17:25.470147",
+ "modified": "2021-06-28 20:00:33.905114",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Production Plan",
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py
index a3e23a68972..38a0ee77ad7 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py
@@ -5,10 +5,11 @@
from __future__ import unicode_literals
import frappe, json, copy
from frappe import msgprint, _
-from six import string_types, iteritems
+from six import iteritems
from frappe.model.document import Document
-from frappe.utils import cstr, flt, cint, nowdate, add_days, comma_and, now_datetime, ceil
+from frappe.utils import (flt, cint, nowdate, add_days, comma_and, now_datetime,
+ ceil, get_link_to_form, getdate)
from frappe.utils.csvutils import build_csv_response
from erpnext.manufacturing.doctype.bom.bom import validate_bom_no, get_children
from erpnext.manufacturing.doctype.work_order.work_order import get_item_details
@@ -96,8 +97,10 @@ class ProductionPlan(Document):
@frappe.whitelist()
def get_items(self):
+ self.set('po_items', [])
if self.get_items_from == "Sales Order":
self.get_so_items()
+
elif self.get_items_from == "Material Request":
self.get_mr_items()
@@ -165,9 +168,31 @@ class ProductionPlan(Document):
self.calculate_total_planned_qty()
def add_items(self, items):
- self.set('po_items', [])
+ refs = {}
for data in items:
item_details = get_item_details(data.item_code)
+ if self.combine_items:
+ if item_details.bom_no in refs:
+ refs[item_details.bom_no]['so_details'].append({
+ 'sales_order': data.parent,
+ 'sales_order_item': data.name,
+ 'qty': data.pending_qty
+ })
+ refs[item_details.bom_no]['qty'] += data.pending_qty
+ continue
+
+ else:
+ refs[item_details.bom_no] = {
+ 'qty': data.pending_qty,
+ 'po_item_ref': data.name,
+ 'so_details': []
+ }
+ refs[item_details.bom_no]['so_details'].append({
+ 'sales_order': data.parent,
+ 'sales_order_item': data.name,
+ 'qty': data.pending_qty
+ })
+
pi = self.append('po_items', {
'include_exploded_items': 1,
'warehouse': data.warehouse,
@@ -191,6 +216,23 @@ class ProductionPlan(Document):
pi.material_request_item = data.name
pi.description = data.description
+ if refs:
+ for po_item in self.po_items:
+ po_item.planned_qty = refs[po_item.bom_no]['qty']
+ po_item.pending_qty = refs[po_item.bom_no]['qty']
+ po_item.sales_order = ''
+ self.add_pp_ref(refs)
+
+ def add_pp_ref(self, refs):
+ for bom_no in refs:
+ for so_detail in refs[bom_no]['so_details']:
+ self.append('prod_plan_references', {
+ 'item_reference': refs[bom_no]['po_item_ref'],
+ 'sales_order': so_detail['sales_order'],
+ 'sales_order_item': so_detail['sales_order_item'],
+ 'qty': so_detail['qty']
+ })
+
def calculate_total_planned_qty(self):
self.total_planned_qty = 0
for d in self.po_items:
@@ -308,49 +350,88 @@ class ProductionPlan(Document):
@frappe.whitelist()
def make_work_order(self):
- wo_list = []
+ wo_list, po_list = [], []
+ subcontracted_po = {}
+
self.validate_data()
+ self.make_work_order_for_finished_goods(wo_list)
+ self.make_work_order_for_subassembly_items(wo_list, subcontracted_po)
+ self.make_subcontracted_purchase_order(subcontracted_po, po_list)
+ self.show_list_created_message('Work Order', wo_list)
+ self.show_list_created_message('Purchase Order', po_list)
+
+ def make_work_order_for_finished_goods(self, wo_list):
items_data = self.get_production_items()
for key, item in items_data.items():
+ if self.sub_assembly_items:
+ item['use_multi_level_bom'] = 0
+
work_order = self.create_work_order(item)
if work_order:
wo_list.append(work_order)
- if item.get("make_work_order_for_sub_assembly_items"):
- work_orders = self.make_work_order_for_sub_assembly_items(item)
- wo_list.extend(work_orders)
+ def make_work_order_for_subassembly_items(self, wo_list, subcontracted_po):
+ for row in self.sub_assembly_items:
+ if row.type_of_manufacturing == 'Subcontract':
+ subcontracted_po.setdefault(row.supplier, []).append(row)
+ continue
+
+ args = {}
+ self.prepare_args_for_sub_assembly_items(row, args)
+ work_order = self.create_work_order(args)
+ if work_order:
+ wo_list.append(work_order)
+
+ def make_subcontracted_purchase_order(self, subcontracted_po, purchase_orders):
+ if not subcontracted_po:
+ return
+
+ for supplier, po_list in subcontracted_po.items():
+ po = frappe.new_doc('Purchase Order')
+ po.supplier = supplier
+ po.schedule_date = getdate(po_list[0].schedule_date) if po_list[0].schedule_date else nowdate()
+ po.is_subcontracted_item = 'Yes'
+ for row in po_list:
+ args = {
+ 'item_code': row.production_item,
+ 'warehouse': row.fg_warehouse,
+ 'production_plan_sub_assembly_item': row.name,
+ 'bom': row.bom_no,
+ 'production_plan': self.name
+ }
+
+ for field in ['schedule_date', 'qty', 'uom', 'stock_uom', 'item_name',
+ 'description', 'production_plan_item']:
+ args[field] = row.get(field)
+
+ po.append('items', args)
+
+ po.set_missing_values()
+ po.flags.ignore_mandatory = True
+ po.flags.ignore_validate = True
+ po.insert()
+ purchase_orders.append(po.name)
+
+ def show_list_created_message(self, doctype, doc_list=None):
+ if not doc_list:
+ return
frappe.flags.mute_messages = False
+ if doc_list:
+ doc_list = [get_link_to_form(doctype, p) for p in doc_list]
+ msgprint(_("{0} created").format(comma_and(doc_list)))
- if wo_list:
- wo_list = ["""%s""" % \
- (p, p) for p in wo_list]
- msgprint(_("{0} created").format(comma_and(wo_list)))
- else :
- msgprint(_("No Work Orders created"))
+ def prepare_args_for_sub_assembly_items(self, row, args):
+ for field in ["production_item", "item_name", "qty", "fg_warehouse",
+ "description", "bom_no", "stock_uom", "bom_level", "production_plan_item"]:
+ args[field] = row.get(field)
- def make_work_order_for_sub_assembly_items(self, item):
- work_orders = []
- bom_data = {}
-
- get_sub_assembly_items(item.get("bom_no"), bom_data, item.get("qty"))
-
- for key, data in bom_data.items():
- data.update({
- 'qty': data.get("stock_qty"),
- 'production_plan': self.name,
- 'use_multi_level_bom': item.get("use_multi_level_bom"),
- 'company': self.company,
- 'fg_warehouse': item.get("fg_warehouse"),
- 'update_consumed_material_cost_in_project': 0
- })
-
- work_order = self.create_work_order(data)
- if work_order:
- work_orders.append(work_order)
-
- return work_orders
+ args.update({
+ "use_multi_level_bom": 0,
+ "production_plan": self.name,
+ "production_plan_sub_assembly_item": row.name
+ })
def create_work_order(self, item):
from erpnext.manufacturing.doctype.work_order.work_order import OverProductionError, get_default_warehouse
@@ -435,19 +516,43 @@ class ProductionPlan(Document):
else :
msgprint(_("No material request created"))
+ @frappe.whitelist()
+ def get_sub_assembly_items(self, manufacturing_type=None):
+ self.sub_assembly_items = []
+ for row in self.po_items:
+ bom_data = []
+ get_sub_assembly_items(row.bom_no, bom_data, row.planned_qty)
+ self.set_sub_assembly_items_based_on_level(row, bom_data, manufacturing_type)
+
+ self.save()
+
+ def set_sub_assembly_items_based_on_level(self, row, bom_data, manufacturing_type=None):
+ bom_data = sorted(bom_data, key = lambda i: i.bom_level)
+
+ for data in bom_data:
+ data.qty = data.stock_qty
+ data.production_plan_item = row.name
+ data.fg_warehouse = row.warehouse
+ data.schedule_date = row.planned_start_date
+ data.type_of_manufacturing = manufacturing_type or ("Subcontract" if data.is_sub_contracted_item
+ else "In House")
+
+ self.append("sub_assembly_items", data)
+
@frappe.whitelist()
-def download_raw_materials(doc):
- if isinstance(doc, string_types):
+def download_raw_materials(doc, warehouses=None):
+ if isinstance(doc, str):
doc = frappe._dict(json.loads(doc))
item_list = [['Item Code', 'Description', 'Stock UOM', 'Warehouse', 'Required Qty as per BOM',
- 'Projected Qty', 'Actual Qty', 'Ordered Qty', 'Reserved Qty for Production',
- 'Safety Stock', 'Required Qty']]
+ 'Projected Qty', 'Available Qty In Hand', 'Ordered Qty', 'Planned Qty',
+ 'Reserved Qty for Production', 'Safety Stock', 'Required Qty']]
- for d in get_items_for_material_requests(doc):
+ doc.warehouse = None
+ for d in get_items_for_material_requests(doc, warehouses=warehouses, get_parent_warehouse_data=True):
item_list.append([d.get('item_code'), d.get('description'), d.get('stock_uom'), d.get('warehouse'),
d.get('required_bom_qty'), d.get('projected_qty'), d.get('actual_qty'), d.get('ordered_qty'),
- d.get('reserved_qty_for_production'), d.get('safety_stock'), d.get('quantity')])
+ d.get('planned_qty'), d.get('reserved_qty_for_production'), d.get('safety_stock'), d.get('quantity')])
if not doc.get('for_warehouse'):
row = {'item_code': d.get('item_code')}
@@ -466,7 +571,7 @@ def get_exploded_items(item_details, company, bom_no, include_non_stock_items, p
ifnull(sum(bei.stock_qty/ifnull(bom.quantity, 1)), 0)*%s as qty, item.item_name,
bei.description, bei.stock_uom, item.min_order_qty, bei.source_warehouse,
item.default_material_request_type, item.min_order_qty, item_default.default_warehouse,
- item.purchase_uom, item_uom.conversion_factor
+ item.purchase_uom, item_uom.conversion_factor, item.safety_stock
from
`tabBOM Explosion Item` bei
JOIN `tabBOM` bom ON bom.name = bei.parent
@@ -618,7 +723,7 @@ def get_sales_orders(self):
@frappe.whitelist()
def get_bin_details(row, company, for_warehouse=None, all_warehouse=False):
- if isinstance(row, string_types):
+ if isinstance(row, str):
row = frappe._dict(json.loads(row))
company = frappe.db.escape(company)
@@ -636,32 +741,39 @@ def get_bin_details(row, company, for_warehouse=None, all_warehouse=False):
return frappe.db.sql(""" select ifnull(sum(projected_qty),0) as projected_qty,
ifnull(sum(actual_qty),0) as actual_qty, ifnull(sum(ordered_qty),0) as ordered_qty,
- ifnull(sum(reserved_qty_for_production),0) as reserved_qty_for_production, warehouse from `tabBin`
- where item_code = %(item_code)s {conditions}
+ ifnull(sum(reserved_qty_for_production),0) as reserved_qty_for_production, warehouse,
+ ifnull(sum(planned_qty),0) as planned_qty
+ from `tabBin` where item_code = %(item_code)s {conditions}
group by item_code, warehouse
""".format(conditions=conditions), { "item_code": row['item_code'] }, as_dict=1)
+def get_warehouse_list(warehouses, warehouse_list=None):
+ if not warehouse_list:
+ warehouse_list = []
+
+ if isinstance(warehouses, str):
+ warehouses = json.loads(warehouses)
+
+ for row in warehouses:
+ child_warehouses = frappe.db.get_descendants('Warehouse', row.get("warehouse"))
+ if child_warehouses:
+ warehouse_list.extend(child_warehouses)
+ else:
+ warehouse_list.append(row.get("warehouse"))
+
@frappe.whitelist()
-def get_items_for_material_requests(doc, warehouses=None):
- if isinstance(doc, string_types):
+def get_items_for_material_requests(doc, warehouses=None, get_parent_warehouse_data=None):
+ if isinstance(doc, str):
doc = frappe._dict(json.loads(doc))
warehouse_list = []
if warehouses:
- if isinstance(warehouses, string_types):
- warehouses = json.loads(warehouses)
-
- for row in warehouses:
- child_warehouses = frappe.db.get_descendants('Warehouse', row.get("warehouse"))
- if child_warehouses:
- warehouse_list.extend(child_warehouses)
- else:
- warehouse_list.append(row.get("warehouse"))
+ get_warehouse_list(warehouses, warehouse_list)
if warehouse_list:
warehouses = list(set(warehouse_list))
- if doc.get("for_warehouse") and doc.get("for_warehouse") in warehouses:
+ if doc.get("for_warehouse") and not get_parent_warehouse_data and doc.get("for_warehouse") in warehouses:
warehouses.remove(doc.get("for_warehouse"))
warehouse_list = None
@@ -680,6 +792,9 @@ def get_items_for_material_requests(doc, warehouses=None):
so_item_details = frappe._dict()
for data in po_items:
+ if not data.get("include_exploded_items") and doc.get("sub_assembly_items"):
+ data["include_exploded_items"] = 1
+
planned_qty = data.get('required_qty') or data.get('planned_qty')
ignore_existing_ordered_qty = data.get('ignore_existing_ordered_qty') or ignore_existing_ordered_qty
warehouse = doc.get('for_warehouse')
@@ -754,7 +869,7 @@ def get_items_for_material_requests(doc, warehouses=None):
if items:
mr_items.append(items)
- if not ignore_existing_ordered_qty and warehouses:
+ if (not ignore_existing_ordered_qty or get_parent_warehouse_data) and warehouses:
new_mr_items = []
for item in mr_items:
get_materials_from_other_locations(item, warehouses, new_mr_items, company)
@@ -811,23 +926,28 @@ def get_item_data(item_code):
# "description": item_details.get("description")
}
-def get_sub_assembly_items(bom_no, bom_data, to_produce_qty):
+def get_sub_assembly_items(bom_no, bom_data, to_produce_qty, indent=0):
data = get_children('BOM', parent = bom_no)
for d in data:
if d.expandable:
- key = (d.name, d.value)
- if key not in bom_data:
- bom_data.setdefault(key, {
- 'stock_qty': 0,
- 'description': d.description,
- 'production_item': d.item_code,
- 'item_name': d.item_name,
- 'stock_uom': d.stock_uom,
- 'uom': d.stock_uom,
- 'bom_no': d.value
- })
+ parent_item_code = frappe.get_cached_value("BOM", bom_no, "item")
+ bom_level = (frappe.get_cached_value("BOM", d.value, "bom_level")
+ if d.value else 0)
- bom_item = bom_data.get(key)
- bom_item["stock_qty"] += (d.stock_qty / d.parent_bom_qty) * flt(to_produce_qty)
+ stock_qty = (d.stock_qty / d.parent_bom_qty) * flt(to_produce_qty)
+ bom_data.append(frappe._dict({
+ 'parent_item_code': parent_item_code,
+ 'description': d.description,
+ 'production_item': d.item_code,
+ 'item_name': d.item_name,
+ 'stock_uom': d.stock_uom,
+ 'uom': d.stock_uom,
+ 'bom_no': d.value,
+ 'is_sub_contracted_item': d.is_sub_contracted_item,
+ 'bom_level': bom_level,
+ 'indent': indent,
+ 'stock_qty': stock_qty
+ }))
- get_sub_assembly_items(bom_item.get("bom_no"), bom_data, bom_item["stock_qty"])
+ if d.value:
+ get_sub_assembly_items(d.value, bom_data, stock_qty, indent=indent+1)
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py b/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py
index 09ec24a67a2..ca597f63278 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan_dashboard.py
@@ -9,5 +9,9 @@ def get_data():
'label': _('Transactions'),
'items': ['Work Order', 'Material Request']
},
+ {
+ 'label': _('Subcontract'),
+ 'items': ['Purchase Order']
+ },
]
}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
index 27335aa204b..cce1bb61b6b 100644
--- a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
@@ -100,7 +100,7 @@ class TestProductionPlan(unittest.TestCase):
def test_production_plan_sales_orders(self):
item = 'Test Production Item 1'
- so = make_sales_order(item_code=item, qty=5)
+ so = make_sales_order(item_code=item, qty=1)
sales_order = so.name
sales_order_item = so.items[0].name
@@ -124,8 +124,8 @@ class TestProductionPlan(unittest.TestCase):
wo_doc = frappe.get_doc('Work Order', work_order)
wo_doc.update({
- 'wip_warehouse': '_Test Warehouse 1 - _TC',
- 'fg_warehouse': '_Test Warehouse - _TC'
+ 'wip_warehouse': 'Work In Progress - _TC',
+ 'fg_warehouse': 'Finished Goods - _TC'
})
wo_doc.submit()
@@ -145,6 +145,58 @@ class TestProductionPlan(unittest.TestCase):
self.assertEqual(sales_orders, [])
+ def test_production_plan_combine_items(self):
+ item = 'Test Production Item 1'
+ so = make_sales_order(item_code=item, qty=1)
+
+ pln = frappe.new_doc('Production Plan')
+ pln.company = so.company
+ pln.get_items_from = 'Sales Order'
+ pln.append('sales_orders', {
+ 'sales_order': so.name,
+ 'sales_order_date': so.transaction_date,
+ 'customer': so.customer,
+ 'grand_total': so.grand_total
+ })
+ so = make_sales_order(item_code=item, qty=2)
+ pln.append('sales_orders', {
+ 'sales_order': so.name,
+ 'sales_order_date': so.transaction_date,
+ 'customer': so.customer,
+ 'grand_total': so.grand_total
+ })
+ pln.combine_items = 1
+ pln.get_items()
+ pln.submit()
+
+ self.assertTrue(pln.po_items[0].planned_qty, 3)
+
+ pln.make_work_order()
+ work_order = frappe.db.get_value('Work Order', {
+ 'production_plan_item': pln.po_items[0].name,
+ 'production_plan': pln.name
+ }, 'name')
+
+ wo_doc = frappe.get_doc('Work Order', work_order)
+ wo_doc.update({
+ 'wip_warehouse': 'Work In Progress - _TC',
+ })
+
+ wo_doc.submit()
+ so_items = []
+ for plan_reference in pln.prod_plan_references:
+ so_items.append(plan_reference.sales_order_item)
+ so_wo_qty = frappe.db.get_value('Sales Order Item', plan_reference.sales_order_item, 'work_order_qty')
+ self.assertEqual(so_wo_qty, plan_reference.qty)
+
+ wo_doc.cancel()
+ for so_item in so_items:
+ so_wo_qty = frappe.db.get_value('Sales Order Item', so_item, 'work_order_qty')
+ self.assertEqual(so_wo_qty, 0.0)
+
+ latest_plan = frappe.get_doc('Production Plan', pln.name)
+ latest_plan.cancel()
+
def test_pp_to_mr_customer_provided(self):
#Material Request from Production Plan for Customer Provided
create_item('CUST-0987', is_customer_provided_item = 1, customer = '_Test Customer', is_purchase_item = 0)
@@ -184,10 +236,10 @@ class TestProductionPlan(unittest.TestCase):
pln.append("po_items", {
"item_code": item_code,
"bom_no": frappe.db.get_value('BOM', {'item': "Test BOM 1"}),
- "planned_qty": 3,
- "make_work_order_for_sub_assembly_items": 1
+ "planned_qty": 3
})
+ pln.get_sub_assembly_items('In House')
pln.submit()
pln.make_work_order()
diff --git a/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json b/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
index d0dce53437b..f829d57475a 100644
--- a/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
+++ b/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
@@ -1,792 +1,220 @@
{
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "hash",
- "beta": 0,
- "creation": "2013-02-22 01:27:49",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "editable_grid": 1,
+ "actions": [],
+ "autoname": "hash",
+ "creation": "2013-02-22 01:27:49",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "include_exploded_items",
+ "item_code",
+ "bom_no",
+ "column_break_6",
+ "planned_qty",
+ "warehouse",
+ "planned_start_date",
+ "section_break_9",
+ "pending_qty",
+ "ordered_qty",
+ "column_break_17",
+ "description",
+ "stock_uom",
+ "produced_qty",
+ "reference_section",
+ "sales_order",
+ "sales_order_item",
+ "column_break_19",
+ "material_request",
+ "material_request_item",
+ "product_bundle_item",
+ "item_reference"
+ ],
"fields": [
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 2,
- "fetch_if_empty": 0,
- "fieldname": "include_exploded_items",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Include Exploded Items",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "columns": 1,
+ "default": "1",
+ "fieldname": "include_exploded_items",
+ "fieldtype": "Check",
+ "label": "Include Exploded Items"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 2,
- "fetch_if_empty": 0,
- "fieldname": "item_code",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Item Code",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "item_code",
- "oldfieldtype": "Link",
- "options": "Item",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "print_width": "150px",
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0,
+ "columns": 2,
+ "fieldname": "item_code",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Item Code",
+ "oldfieldname": "item_code",
+ "oldfieldtype": "Link",
+ "options": "Item",
+ "print_width": "150px",
+ "reqd": 1,
"width": "150px"
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 2,
- "fetch_if_empty": 0,
- "fieldname": "bom_no",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "BOM No",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "bom_no",
- "oldfieldtype": "Link",
- "options": "BOM",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "print_width": "100px",
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0,
+ "columns": 2,
+ "fieldname": "bom_no",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "BOM No",
+ "oldfieldname": "bom_no",
+ "oldfieldtype": "Link",
+ "options": "BOM",
+ "print_width": "100px",
+ "reqd": 1,
"width": "100px"
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "planned_qty",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Planned Qty",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "planned_qty",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "print_width": "100px",
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0,
+ "fieldname": "planned_qty",
+ "fieldtype": "Float",
+ "in_list_view": 1,
+ "label": "Planned Qty",
+ "oldfieldname": "planned_qty",
+ "oldfieldtype": "Currency",
+ "print_width": "100px",
+ "reqd": 1,
"width": "100px"
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "column_break_6",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "column_break_6",
+ "fieldtype": "Column Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "description": "If enabled, system will create the work order for the exploded items against which BOM is available.",
- "fetch_if_empty": 0,
- "fieldname": "make_work_order_for_sub_assembly_items",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Make Work Order for Sub Assembly Items",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "warehouse",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "For Warehouse",
+ "options": "Warehouse"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "",
- "fetch_if_empty": 0,
- "fieldname": "warehouse",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "For Warehouse",
- "length": 0,
- "no_copy": 0,
- "options": "Warehouse",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "default": "Today",
+ "fieldname": "planned_start_date",
+ "fieldtype": "Datetime",
+ "in_list_view": 1,
+ "label": "Planned Start Date",
+ "reqd": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "Today",
- "fetch_if_empty": 0,
- "fieldname": "planned_start_date",
- "fieldtype": "Datetime",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Planned Start Date",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "section_break_9",
+ "fieldtype": "Section Break",
+ "label": "Quantity and Description"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "section_break_9",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Quantity and Description",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "0",
- "fetch_if_empty": 0,
- "fieldname": "pending_qty",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Pending Qty",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "prevdoc_reqd_qty",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "print_width": "100px",
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0,
+ "default": "0",
+ "fieldname": "pending_qty",
+ "fieldtype": "Float",
+ "label": "Pending Qty",
+ "oldfieldname": "prevdoc_reqd_qty",
+ "oldfieldtype": "Currency",
+ "print_width": "100px",
+ "read_only": 1,
"width": "100px"
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "0",
- "fetch_if_empty": 0,
- "fieldname": "ordered_qty",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Ordered Qty",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "default": "0",
+ "fieldname": "ordered_qty",
+ "fieldtype": "Float",
+ "label": "Ordered Qty",
+ "print_hide": 1,
+ "read_only": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "0",
- "fetch_if_empty": 0,
- "fieldname": "produced_qty",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Produced Qty",
- "length": 0,
- "no_copy": 1,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "default": "0",
+ "fieldname": "produced_qty",
+ "fieldtype": "Float",
+ "label": "Produced Qty",
+ "no_copy": 1,
+ "read_only": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "column_break_17",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "column_break_17",
+ "fieldtype": "Column Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "description",
- "fieldtype": "Text Editor",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Description",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "description",
- "oldfieldtype": "Text",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "print_width": "200px",
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0,
+ "fieldname": "description",
+ "fieldtype": "Text Editor",
+ "label": "Description",
+ "oldfieldname": "description",
+ "oldfieldtype": "Text",
+ "print_width": "200px",
+ "read_only": 1,
"width": "200px"
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "stock_uom",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "UOM",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "stock_uom",
- "oldfieldtype": "Data",
- "options": "UOM",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "print_width": "80px",
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0,
+ "fieldname": "stock_uom",
+ "fieldtype": "Link",
+ "label": "UOM",
+ "oldfieldname": "stock_uom",
+ "oldfieldtype": "Data",
+ "options": "UOM",
+ "print_width": "80px",
+ "read_only": 1,
+ "reqd": 1,
"width": "80px"
- },
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "reference_section",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Reference",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "reference_section",
+ "fieldtype": "Section Break",
+ "label": "Reference"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "sales_order",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Sales Order",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "source_docname",
- "oldfieldtype": "Data",
- "options": "Sales Order",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "sales_order",
+ "fieldtype": "Link",
+ "label": "Sales Order",
+ "oldfieldname": "source_docname",
+ "oldfieldtype": "Data",
+ "options": "Sales Order",
+ "read_only": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "sales_order_item",
- "fieldtype": "Data",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Sales Order Item",
- "length": 0,
- "no_copy": 1,
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "sales_order_item",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Sales Order Item",
+ "no_copy": 1,
+ "print_hide": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "column_break_19",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "column_break_19",
+ "fieldtype": "Column Break"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "material_request",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Material Request",
- "length": 0,
- "no_copy": 0,
- "options": "Material Request",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "material_request",
+ "fieldtype": "Link",
+ "label": "Material Request",
+ "options": "Material Request",
+ "read_only": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "material_request_item",
- "fieldtype": "Data",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "material_request_item",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "material_request_item",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "material_request_item"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_if_empty": 0,
- "fieldname": "product_bundle_item",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Product Bundle Item",
- "length": 0,
- "no_copy": 1,
- "options": "Item",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "fieldname": "product_bundle_item",
+ "fieldtype": "Link",
+ "label": "Product Bundle Item",
+ "no_copy": 1,
+ "options": "Item",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "item_reference",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Item Reference"
}
- ],
- "has_web_view": 0,
- "hide_toolbar": 0,
- "idx": 1,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 1,
- "max_attachments": 0,
- "modified": "2019-04-08 23:09:57.199423",
- "modified_by": "Administrator",
- "module": "Manufacturing",
- "name": "Production Plan Item",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 0,
- "read_only": 0,
- "show_name_in_global_search": 0,
- "sort_order": "ASC",
- "track_changes": 0,
- "track_seen": 0,
- "track_views": 0
+ ],
+ "idx": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2021-06-28 18:31:06.822168",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Production Plan Item",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "ASC"
}
\ No newline at end of file
diff --git a/erpnext/patches/v4_0/__init__.py b/erpnext/manufacturing/doctype/production_plan_item_reference/__init__.py
similarity index 100%
rename from erpnext/patches/v4_0/__init__.py
rename to erpnext/manufacturing/doctype/production_plan_item_reference/__init__.py
diff --git a/erpnext/manufacturing/doctype/production_plan_item_reference/production_plan_item_reference.json b/erpnext/manufacturing/doctype/production_plan_item_reference/production_plan_item_reference.json
new file mode 100644
index 00000000000..84dee4ad284
--- /dev/null
+++ b/erpnext/manufacturing/doctype/production_plan_item_reference/production_plan_item_reference.json
@@ -0,0 +1,52 @@
+{
+ "actions": [],
+ "creation": "2021-04-22 10:32:58.896330",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "item_reference",
+ "sales_order",
+ "sales_order_item",
+ "qty"
+ ],
+ "fields": [
+ {
+ "fieldname": "sales_order",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Sales Order Reference",
+ "options": "Sales Order"
+ },
+ {
+ "fieldname": "sales_order_item",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Sales Order Item"
+ },
+ {
+ "fieldname": "qty",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "qty"
+ },
+ {
+ "fieldname": "item_reference",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Item Reference"
+ }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2021-05-07 17:03:49.707487",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Production Plan Item Reference",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_plan_item_reference/production_plan_item_reference.py b/erpnext/manufacturing/doctype/production_plan_item_reference/production_plan_item_reference.py
new file mode 100644
index 00000000000..51fbc3633b1
--- /dev/null
+++ b/erpnext/manufacturing/doctype/production_plan_item_reference/production_plan_item_reference.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class ProductionPlanItemReference(Document):
+ pass
diff --git a/erpnext/patches/v4_1/__init__.py b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/__init__.py
similarity index 100%
rename from erpnext/patches/v4_1/__init__.py
rename to erpnext/manufacturing/doctype/production_plan_sub_assembly_item/__init__.py
diff --git a/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
new file mode 100644
index 00000000000..657ee35a852
--- /dev/null
+++ b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
@@ -0,0 +1,202 @@
+{
+ "actions": [],
+ "creation": "2020-12-27 16:08:36.127199",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "production_item",
+ "item_name",
+ "fg_warehouse",
+ "parent_item_code",
+ "schedule_date",
+ "column_break_3",
+ "qty",
+ "bom_no",
+ "bom_level",
+ "type_of_manufacturing",
+ "supplier",
+ "work_order_details_section",
+ "work_order",
+ "purchase_order",
+ "production_plan_item",
+ "column_break_7",
+ "produced_qty",
+ "received_qty",
+ "indent",
+ "section_break_19",
+ "uom",
+ "stock_uom",
+ "column_break_22",
+ "description"
+ ],
+ "fields": [
+ {
+ "fetch_from": "sub_assembly_item_code.item_name",
+ "fieldname": "item_name",
+ "fieldtype": "Data",
+ "label": "Item Name",
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_3",
+ "fieldtype": "Column Break"
+ },
+ {
+ "depends_on": "eval:doc.type_of_manufacturing == \"In House\"",
+ "fieldname": "work_order_details_section",
+ "fieldtype": "Section Break",
+ "label": "Reference"
+ },
+ {
+ "fieldname": "work_order",
+ "fieldtype": "Link",
+ "label": "Work Order",
+ "options": "Work Order",
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_7",
+ "fieldtype": "Column Break"
+ },
+ {
+ "columns": 1,
+ "fieldname": "qty",
+ "fieldtype": "Float",
+ "in_list_view": 1,
+ "label": "Required Qty",
+ "read_only": 1
+ },
+ {
+ "fieldname": "purchase_order",
+ "fieldtype": "Link",
+ "label": "Purchase Order",
+ "options": "Purchase Order",
+ "read_only": 1
+ },
+ {
+ "fieldname": "received_qty",
+ "fieldtype": "Float",
+ "label": "Received Qty"
+ },
+ {
+ "fieldname": "bom_no",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Bom No",
+ "options": "BOM"
+ },
+ {
+ "fieldname": "production_plan_item",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "Production Plan Item",
+ "read_only": 1
+ },
+ {
+ "fieldname": "parent_item_code",
+ "fieldtype": "Link",
+ "label": "Finished Good",
+ "options": "Item",
+ "read_only": 1
+ },
+ {
+ "columns": 1,
+ "fetch_from": "bom_no.bom_level",
+ "fieldname": "bom_level",
+ "fieldtype": "Int",
+ "in_list_view": 1,
+ "label": "Level (BOM)",
+ "read_only": 1
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "section_break_19",
+ "fieldtype": "Section Break",
+ "label": "Item Details"
+ },
+ {
+ "fieldname": "uom",
+ "fieldtype": "Link",
+ "label": "UOM",
+ "options": "UOM",
+ "read_only": 1
+ },
+ {
+ "fieldname": "stock_uom",
+ "fieldtype": "Link",
+ "label": "Stock UOM",
+ "options": "UOM",
+ "read_only": 1
+ },
+ {
+ "fieldname": "column_break_22",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "description",
+ "fieldtype": "Small Text",
+ "label": "description",
+ "read_only": 1
+ },
+ {
+ "fieldname": "production_item",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Sub Assembly Item Code",
+ "options": "Item",
+ "read_only": 1
+ },
+ {
+ "fieldname": "indent",
+ "fieldtype": "Int",
+ "label": "Indent"
+ },
+ {
+ "fieldname": "fg_warehouse",
+ "fieldtype": "Link",
+ "label": "Target Warehouse",
+ "options": "Warehouse"
+ },
+ {
+ "fieldname": "produced_qty",
+ "fieldtype": "Data",
+ "label": "Produced Quantity",
+ "read_only": 1
+ },
+ {
+ "default": "In House",
+ "fieldname": "type_of_manufacturing",
+ "fieldtype": "Select",
+ "in_list_view": 1,
+ "label": "Manufacturing Type",
+ "options": "In House\nSubcontract"
+ },
+ {
+ "fieldname": "supplier",
+ "fieldtype": "Link",
+ "label": "Supplier",
+ "mandatory_depends_on": "eval:doc.type_of_manufacturing == 'Subcontract'",
+ "options": "Supplier"
+ },
+ {
+ "fieldname": "schedule_date",
+ "fieldtype": "Datetime",
+ "in_list_view": 1,
+ "label": "Schedule Date"
+ }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2021-06-28 20:10:56.296410",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Production Plan Sub Assembly Item",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.py b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.py
new file mode 100644
index 00000000000..6850a2eb4ed
--- /dev/null
+++ b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class ProductionPlanSubAssemblyItem(Document):
+ pass
diff --git a/erpnext/manufacturing/doctype/routing/routing.py b/erpnext/manufacturing/doctype/routing/routing.py
index 8312d7436c2..ece0db717a2 100644
--- a/erpnext/manufacturing/doctype/routing/routing.py
+++ b/erpnext/manufacturing/doctype/routing/routing.py
@@ -4,14 +4,24 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils import cint
+from frappe.utils import cint, flt
from frappe import _
from frappe.model.document import Document
class Routing(Document):
def validate(self):
+ self.calculate_operating_cost()
self.set_routing_id()
+ def on_update(self):
+ self.calculate_operating_cost()
+
+ def calculate_operating_cost(self):
+ for operation in self.operations:
+ if not operation.hour_rate:
+ operation.hour_rate = frappe.db.get_value("Workstation", operation.workstation, 'hour_rate')
+ operation.operating_cost = flt(flt(operation.hour_rate) * flt(operation.time_in_mins) / 60, 2)
+
def set_routing_id(self):
sequence_id = 0
for row in self.operations:
@@ -21,4 +31,4 @@ class Routing(Document):
frappe.throw(_("At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2}")
.format(row.idx, row.sequence_id, sequence_id))
- sequence_id = row.sequence_id
\ No newline at end of file
+ sequence_id = row.sequence_id
diff --git a/erpnext/manufacturing/doctype/routing/test_routing.py b/erpnext/manufacturing/doctype/routing/test_routing.py
index 6a38dcfa030..92f26946ab7 100644
--- a/erpnext/manufacturing/doctype/routing/test_routing.py
+++ b/erpnext/manufacturing/doctype/routing/test_routing.py
@@ -7,9 +7,7 @@ import unittest
import frappe
from frappe.test_runner import make_test_records
from erpnext.stock.doctype.item.test_item import make_item
-from erpnext.manufacturing.doctype.operation.test_operation import make_operation
from erpnext.manufacturing.doctype.job_card.job_card import OperationSequenceError
-from erpnext.manufacturing.doctype.workstation.test_workstation import make_workstation
from erpnext.manufacturing.doctype.work_order.test_work_order import make_wo_order_test_record
class TestRouting(unittest.TestCase):
@@ -48,7 +46,53 @@ class TestRouting(unittest.TestCase):
wo_doc.cancel()
wo_doc.delete()
+ def test_update_bom_operation_time(self):
+ operations = [
+ {
+ "operation": "Test Operation A",
+ "workstation": "_Test Workstation A",
+ "hour_rate_rent": 300,
+ "hour_rate_labour": 750 ,
+ "time_in_mins": 30
+ },
+ {
+ "operation": "Test Operation B",
+ "workstation": "_Test Workstation B",
+ "hour_rate_labour": 200,
+ "hour_rate_rent": 1000,
+ "time_in_mins": 20
+ }
+ ]
+
+ test_routing_operations = [
+ {
+ "operation": "Test Operation A",
+ "workstation": "_Test Workstation A",
+ "time_in_mins": 30
+ },
+ {
+ "operation": "Test Operation B",
+ "workstation": "_Test Workstation A",
+ "time_in_mins": 20
+ }
+ ]
+ setup_operations(operations)
+ routing_doc = create_routing(routing_name="Routing Test", operations=test_routing_operations)
+ bom_doc = setup_bom(item_code="_Testing Item", routing=routing_doc.name, currency = 'INR')
+ self.assertEqual(routing_doc.operations[0].time_in_mins, 30)
+ self.assertEqual(routing_doc.operations[1].time_in_mins, 20)
+ routing_doc.operations[0].time_in_mins = 90
+ routing_doc.operations[1].time_in_mins = 42.2
+ routing_doc.save()
+ bom_doc.update_cost()
+ bom_doc.reload()
+ self.assertEqual(bom_doc.operations[0].time_in_mins, 90)
+ self.assertEqual(bom_doc.operations[1].time_in_mins, 42.2)
+
+
def setup_operations(rows):
+ from erpnext.manufacturing.doctype.workstation.test_workstation import make_workstation
+ from erpnext.manufacturing.doctype.operation.test_operation import make_operation
for row in rows:
make_workstation(row)
make_operation(row)
@@ -61,12 +105,14 @@ def create_routing(**args):
if not args.do_not_save:
try:
- for operation in args.operations:
- doc.append("operations", operation)
-
doc.insert()
except frappe.DuplicateEntryError:
doc = frappe.get_doc("Routing", args.routing_name)
+ doc.delete_key('operations')
+ for operation in args.operations:
+ doc.append("operations", operation)
+
+ doc.save()
return doc
@@ -91,7 +137,7 @@ def setup_bom(**args):
name = frappe.db.get_value('BOM', {'item': args.item_code}, 'name')
if not name:
bom_doc = make_bom(item = args.item_code, raw_materials = args.get("raw_materials"),
- routing = args.routing, with_operations=1)
+ routing = args.routing, with_operations=1, currency = args.currency)
else:
bom_doc = frappe.get_doc("BOM", name)
diff --git a/erpnext/patches/v4_2/__init__.py b/erpnext/manufacturing/doctype/sub_operation/__init__.py
similarity index 100%
rename from erpnext/patches/v4_2/__init__.py
rename to erpnext/manufacturing/doctype/sub_operation/__init__.py
diff --git a/erpnext/manufacturing/doctype/sub_operation/sub_operation.js b/erpnext/manufacturing/doctype/sub_operation/sub_operation.js
new file mode 100644
index 00000000000..be9db6a4089
--- /dev/null
+++ b/erpnext/manufacturing/doctype/sub_operation/sub_operation.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Sub Operation', {
+ // refresh: function(frm) {
+
+ // }
+});
diff --git a/erpnext/manufacturing/doctype/sub_operation/sub_operation.json b/erpnext/manufacturing/doctype/sub_operation/sub_operation.json
new file mode 100644
index 00000000000..f63d2b98641
--- /dev/null
+++ b/erpnext/manufacturing/doctype/sub_operation/sub_operation.json
@@ -0,0 +1,51 @@
+{
+ "actions": [],
+ "creation": "2020-12-07 15:39:47.488519",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "operation",
+ "time_in_mins",
+ "column_break_5",
+ "description"
+ ],
+ "fields": [
+ {
+ "fieldname": "operation",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Operation",
+ "options": "Operation"
+ },
+ {
+ "description": "Time in mins",
+ "fieldname": "time_in_mins",
+ "fieldtype": "Float",
+ "in_list_view": 1,
+ "label": "Operation Time"
+ },
+ {
+ "fieldname": "column_break_5",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "description",
+ "fieldtype": "Small Text",
+ "label": "Description"
+ }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2020-12-07 18:09:18.005578",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Sub Operation",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/sub_operation/sub_operation.py b/erpnext/manufacturing/doctype/sub_operation/sub_operation.py
new file mode 100644
index 00000000000..f4b27758e9d
--- /dev/null
+++ b/erpnext/manufacturing/doctype/sub_operation/sub_operation.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class SubOperation(Document):
+ pass
diff --git a/erpnext/manufacturing/doctype/sub_operation/test_sub_operation.py b/erpnext/manufacturing/doctype/sub_operation/test_sub_operation.py
new file mode 100644
index 00000000000..d3410ca3120
--- /dev/null
+++ b/erpnext/manufacturing/doctype/sub_operation/test_sub_operation.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestSubOperation(unittest.TestCase):
+ pass
diff --git a/erpnext/manufacturing/doctype/work_order/test_work_order.py b/erpnext/manufacturing/doctype/work_order/test_work_order.py
index cb1ee92196f..68de0b29d3e 100644
--- a/erpnext/manufacturing/doctype/work_order/test_work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/test_work_order.py
@@ -389,17 +389,12 @@ class TestWorkOrder(unittest.TestCase):
ste.submit()
stock_entries.append(ste)
- job_cards = frappe.get_all('Job Card', filters = {'work_order': work_order.name})
+ job_cards = frappe.get_all('Job Card', filters = {'work_order': work_order.name}, order_by='creation asc')
self.assertEqual(len(job_cards), len(bom.operations))
for i, job_card in enumerate(job_cards):
doc = frappe.get_doc("Job Card", job_card)
- doc.append("time_logs", {
- "from_time": add_to_date(None, i),
- "hours": 1,
- "to_time": add_to_date(None, i + 1),
- "completed_qty": doc.for_quantity
- })
+ doc.time_logs[0].completed_qty = 1
doc.submit()
ste1 = frappe.get_doc(make_stock_entry(work_order.name, "Manufacture", 1))
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.js b/erpnext/manufacturing/doctype/work_order/work_order.js
index a6086fb88da..512048512ed 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.js
+++ b/erpnext/manufacturing/doctype/work_order/work_order.js
@@ -76,9 +76,9 @@ frappe.ui.form.on("Work Order", {
frm.set_query("production_item", function() {
return {
query: "erpnext.controllers.queries.item_query",
- filters:[
- ['is_stock_item', '=',1]
- ]
+ filters: {
+ "is_stock_item": 1,
+ }
};
});
@@ -141,8 +141,7 @@ frappe.ui.form.on("Work Order", {
}
if (frm.doc.docstatus === 1
- && frm.doc.operations && frm.doc.operations.length
- && frm.doc.qty != frm.doc.material_transferred_for_manufacturing) {
+ && frm.doc.operations && frm.doc.operations.length) {
const not_completed = frm.doc.operations.filter(d => {
if(d.status != 'Completed') {
@@ -190,35 +189,41 @@ frappe.ui.form.on("Work Order", {
const dialog = frappe.prompt({fieldname: 'operations', fieldtype: 'Table', label: __('Operations'),
fields: [
{
- fieldtype:'Link',
- fieldname:'operation',
+ fieldtype: 'Link',
+ fieldname: 'operation',
label: __('Operation'),
- read_only:1,
- in_list_view:1
+ read_only: 1,
+ in_list_view: 1
},
{
- fieldtype:'Link',
- fieldname:'workstation',
+ fieldtype: 'Link',
+ fieldname: 'workstation',
label: __('Workstation'),
- read_only:1,
- in_list_view:1
+ read_only: 1,
+ in_list_view: 1
},
{
- fieldtype:'Data',
- fieldname:'name',
+ fieldtype: 'Data',
+ fieldname: 'name',
label: __('Operation Id')
},
{
- fieldtype:'Float',
- fieldname:'pending_qty',
+ fieldtype: 'Float',
+ fieldname: 'pending_qty',
label: __('Pending Qty'),
},
{
- fieldtype:'Float',
- fieldname:'qty',
+ fieldtype: 'Float',
+ fieldname: 'qty',
label: __('Quantity to Manufacture'),
- read_only:0,
- in_list_view:1,
+ read_only: 0,
+ in_list_view: 1,
+ },
+ {
+ fieldtype: 'Float',
+ fieldname: 'batch_size',
+ label: __('Batch Size'),
+ read_only: 1
},
],
data: operations_data,
@@ -229,9 +234,13 @@ frappe.ui.form.on("Work Order", {
}, function(data) {
frappe.call({
method: "erpnext.manufacturing.doctype.work_order.work_order.make_job_card",
+ freeze: true,
args: {
work_order: frm.doc.name,
operations: data.operations,
+ },
+ callback: function() {
+ frm.reload_doc();
}
});
}, __("Job Card"), __("Create"));
@@ -243,13 +252,16 @@ frappe.ui.form.on("Work Order", {
if(data.completed_qty != frm.doc.qty) {
pending_qty = frm.doc.qty - flt(data.completed_qty);
- dialog.fields_dict.operations.df.data.push({
- 'name': data.name,
- 'operation': data.operation,
- 'workstation': data.workstation,
- 'qty': pending_qty,
- 'pending_qty': pending_qty,
- });
+ if (pending_qty) {
+ dialog.fields_dict.operations.df.data.push({
+ 'name': data.name,
+ 'operation': data.operation,
+ 'workstation': data.workstation,
+ 'batch_size': data.batch_size,
+ 'qty': pending_qty,
+ 'pending_qty': pending_qty
+ });
+ }
}
});
dialog.fields_dict.operations.grid.refresh();
@@ -704,6 +716,8 @@ erpnext.work_order = {
stop_work_order: function(frm, status) {
frappe.call({
method: "erpnext.manufacturing.doctype.work_order.work_order.stop_unstop",
+ freeze: true,
+ freeze_message: __("Updating Work Order status"),
args: {
work_order: frm.doc.name,
status: status
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.json b/erpnext/manufacturing/doctype/work_order/work_order.json
index cd9edeeea83..3b56854aaf3 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.json
+++ b/erpnext/manufacturing/doctype/work_order/work_order.json
@@ -21,6 +21,12 @@
"produced_qty",
"sales_order",
"project",
+ "serial_no_and_batch_for_finished_good_section",
+ "has_serial_no",
+ "has_batch_no",
+ "column_break_17",
+ "serial_no",
+ "batch_size",
"settings_section",
"allow_alternative_item",
"use_multi_level_bom",
@@ -52,16 +58,22 @@
"actual_operating_cost",
"additional_operating_cost",
"column_break_24",
+ "corrective_operation_cost",
"total_operating_cost",
"more_info",
"description",
"stock_uom",
"column_break2",
+ "references_section",
"material_request",
"material_request_item",
"sales_order_item",
+ "column_break_61",
"production_plan",
"production_plan_item",
+ "production_plan_sub_assembly_item",
+ "parent_work_order",
+ "bom_level",
"product_bundle_item",
"amended_from"
],
@@ -488,17 +500,77 @@
"fieldtype": "Float",
"label": "Lead Time",
"read_only": 1
- }
+ },
+ {
+ "collapsible": 1,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "serial_no_and_batch_for_finished_good_section",
+ "fieldtype": "Section Break",
+ "label": "Serial No and Batch for Finished Good"
+ },
+ {
+ "fieldname": "column_break_17",
+ "fieldtype": "Column Break"
+ },
+ {
+ "default": "0",
+ "fetch_from": "production_item.has_serial_no",
+ "fieldname": "has_serial_no",
+ "fieldtype": "Check",
+ "label": "Has Serial No",
+ "read_only": 1
+ },
+ {
+ "default": "0",
+ "fetch_from": "production_item.has_batch_no",
+ "fieldname": "has_batch_no",
+ "fieldtype": "Check",
+ "label": "Has Batch No",
+ "read_only": 1
+ },
+ {
+ "depends_on": "has_serial_no",
+ "fieldname": "serial_no",
+ "fieldtype": "Small Text",
+ "label": "Serial Nos",
+ "no_copy": 1
+ },
+ {
+ "default": "0",
+ "depends_on": "has_batch_no",
+ "fieldname": "batch_size",
+ "fieldtype": "Float",
+ "label": "Batch Size"
+ },
+ {
+ "allow_on_submit": 1,
+ "description": "From Corrective Job Card",
+ "fieldname": "corrective_operation_cost",
+ "fieldtype": "Currency",
+ "label": "Corrective Operation Cost",
+ "no_copy": 1,
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "production_plan_sub_assembly_item",
+ "fieldtype": "Data",
+ "label": "Production Plan Sub-assembly Item",
+ "no_copy": 1,
+ "print_hide": 1,
+ "read_only": 1
+ }
],
"icon": "fa fa-cogs",
"idx": 1,
"image_field": "image",
"is_submittable": 1,
"links": [],
- "modified": "2021-03-16 13:27:51.116484",
+ "modified": "2021-06-28 16:19:14.902699",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Work Order",
+ "nsm_parent_field": "parent_work_order",
"owner": "Administrator",
"permissions": [
{
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index 8507f5eb34c..779ae42d653 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -1,7 +1,6 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
# License: GNU General Public License v3. See license.txt
-from __future__ import unicode_literals
import frappe
import json
import math
@@ -19,18 +18,17 @@ from frappe.utils.csvutils import getlink
from erpnext.stock.utils import get_bin, validate_warehouse_company, get_latest_stock_qty
from erpnext.utilities.transaction_base import validate_uom_is_integer
from frappe.model.mapper import get_mapped_doc
+from erpnext.stock.doctype.batch.batch import make_batch
+from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos, get_auto_serial_nos, auto_make_serial_nos
class OverProductionError(frappe.ValidationError): pass
class CapacityError(frappe.ValidationError): pass
class StockOverProductionError(frappe.ValidationError): pass
class OperationTooLongError(frappe.ValidationError): pass
class ItemHasVariantError(frappe.ValidationError): pass
+class SerialNoQtyError(frappe.ValidationError):
+ pass
-from six import string_types
-
-form_grid_templates = {
- "operations": "templates/form_grid/work_order_grid.html"
-}
class WorkOrder(Document):
def onload(self):
@@ -127,7 +125,9 @@ class WorkOrder(Document):
variable_cost = self.actual_operating_cost if self.actual_operating_cost \
else self.planned_operating_cost
- self.total_operating_cost = flt(self.additional_operating_cost) + flt(variable_cost)
+
+ self.total_operating_cost = (flt(self.additional_operating_cost)
+ + flt(variable_cost) + flt(self.corrective_operation_cost))
def validate_work_order_against_so(self):
# already ordered qty
@@ -235,13 +235,20 @@ class WorkOrder(Document):
production_plan.run_method("update_produced_qty", produced_qty, self.production_plan_item)
+ def before_submit(self):
+ self.create_serial_no_batch_no()
+
def on_submit(self):
if not self.wip_warehouse:
frappe.throw(_("Work-in-Progress Warehouse is required before Submit"))
if not self.fg_warehouse:
frappe.throw(_("For Warehouse is required before Submit"))
- self.update_work_order_qty_in_so()
+ if self.production_plan and frappe.db.exists('Production Plan Item Reference',{'parent':self.production_plan}):
+ self.update_work_order_qty_in_combined_so()
+ else:
+ self.update_work_order_qty_in_so()
+
self.update_reserved_qty_for_production()
self.update_completed_qty_in_material_request()
self.update_planned_qty()
@@ -250,14 +257,82 @@ class WorkOrder(Document):
def on_cancel(self):
self.validate_cancel()
-
frappe.db.set(self,'status', 'Cancelled')
- self.update_work_order_qty_in_so()
+
+ if self.production_plan and frappe.db.exists('Production Plan Item Reference',{'parent':self.production_plan}):
+ self.update_work_order_qty_in_combined_so()
+ else:
+ self.update_work_order_qty_in_so()
+
self.delete_job_card()
self.update_completed_qty_in_material_request()
self.update_planned_qty()
self.update_ordered_qty()
self.update_reserved_qty_for_production()
+ self.delete_auto_created_batch_and_serial_no()
+
+ def create_serial_no_batch_no(self):
+ if not (self.has_serial_no or self.has_batch_no):
+ return
+
+ if not cint(frappe.db.get_single_value("Manufacturing Settings", "make_serial_no_batch_from_work_order")):
+ return
+
+ if self.has_batch_no:
+ self.create_batch_for_finished_good()
+
+ args = {
+ "item_code": self.production_item,
+ "work_order": self.name
+ }
+
+ if self.has_serial_no:
+ self.make_serial_nos(args)
+
+ def create_batch_for_finished_good(self):
+ total_qty = self.qty
+ if not self.batch_size:
+ self.batch_size = total_qty
+
+ while total_qty > 0:
+ qty = self.batch_size
+ if self.batch_size >= total_qty:
+ qty = total_qty
+
+ if total_qty > self.batch_size:
+ total_qty -= self.batch_size
+ else:
+ qty = total_qty
+ total_qty = 0
+
+ make_batch(frappe._dict({
+ "item": self.production_item,
+ "qty_to_produce": qty,
+ "reference_doctype": self.doctype,
+ "reference_name": self.name
+ }))
+
+ def delete_auto_created_batch_and_serial_no(self):
+ for row in frappe.get_all("Serial No", filters = {"work_order": self.name}):
+ frappe.delete_doc("Serial No", row.name)
+ self.db_set("serial_no", "")
+
+ for row in frappe.get_all("Batch", filters = {"reference_name": self.name}):
+ frappe.delete_doc("Batch", row.name)
+
+ def make_serial_nos(self, args):
+ serial_no_series = frappe.get_cached_value("Item", self.production_item, "serial_no_series")
+ if serial_no_series:
+ self.serial_no = get_auto_serial_nos(serial_no_series, self.qty)
+
+ if self.serial_no:
+ args.update({"serial_no": self.serial_no, "actual_qty": self.qty})
+ auto_make_serial_nos(args)
+
+ serial_nos_length = len(get_serial_nos(self.serial_no))
+ if serial_nos_length != self.qty:
+ frappe.throw(_("{0} Serial Numbers required for Item {1}. You have provided {2}.")
+ .format(self.qty, self.production_item, serial_nos_length), SerialNoQtyError)
def create_job_card(self):
manufacturing_settings_doc = frappe.get_doc("Manufacturing Settings")
@@ -265,32 +340,40 @@ class WorkOrder(Document):
enable_capacity_planning = not cint(manufacturing_settings_doc.disable_capacity_planning)
plan_days = cint(manufacturing_settings_doc.capacity_planning_for_days) or 30
- for i, row in enumerate(self.operations):
- self.set_operation_start_end_time(i, row)
-
- if not row.workstation:
- frappe.throw(_("Row {0}: select the workstation against the operation {1}")
- .format(row.idx, row.operation))
-
- original_start_time = row.planned_start_time
- job_card_doc = create_job_card(self, row,
- enable_capacity_planning=enable_capacity_planning, auto_create=True)
-
- if enable_capacity_planning and job_card_doc:
- row.planned_start_time = job_card_doc.time_logs[-1].from_time
- row.planned_end_time = job_card_doc.time_logs[-1].to_time
-
- if date_diff(row.planned_start_time, original_start_time) > plan_days:
- frappe.message_log.pop()
- frappe.throw(_("Unable to find the time slot in the next {0} days for the operation {1}.")
- .format(plan_days, row.operation), CapacityError)
-
- row.db_update()
+ for index, row in enumerate(self.operations):
+ qty = self.qty
+ while qty > 0:
+ qty = split_qty_based_on_batch_size(self, row, qty)
+ if row.job_card_qty > 0:
+ self.prepare_data_for_job_card(row, index,
+ plan_days, enable_capacity_planning)
planned_end_date = self.operations and self.operations[-1].planned_end_time
if planned_end_date:
self.db_set("planned_end_date", planned_end_date)
+ def prepare_data_for_job_card(self, row, index, plan_days, enable_capacity_planning):
+ self.set_operation_start_end_time(index, row)
+
+ if not row.workstation:
+ frappe.throw(_("Row {0}: select the workstation against the operation {1}")
+ .format(row.idx, row.operation))
+
+ original_start_time = row.planned_start_time
+ job_card_doc = create_job_card(self, row, auto_create=True,
+ enable_capacity_planning=enable_capacity_planning)
+
+ if enable_capacity_planning and job_card_doc:
+ row.planned_start_time = job_card_doc.time_logs[-1].from_time
+ row.planned_end_time = job_card_doc.time_logs[-1].to_time
+
+ if date_diff(row.planned_start_time, original_start_time) > plan_days:
+ frappe.message_log.pop()
+ frappe.throw(_("Unable to find the time slot in the next {0} days for the operation {1}.")
+ .format(plan_days, row.operation), CapacityError)
+
+ row.db_update()
+
def set_operation_start_end_time(self, idx, row):
"""Set start and end time for given operation. If first operation, set start as
`planned_start_date`, else add time diff to end time of earlier operation."""
@@ -358,52 +441,74 @@ class WorkOrder(Document):
frappe.db.set_value('Sales Order Item',
self.sales_order_item, 'work_order_qty', flt(work_order_qty/total_bundle_qty, 2))
+ def update_work_order_qty_in_combined_so(self):
+ total_bundle_qty = 1
+ if self.product_bundle_item:
+ total_bundle_qty = frappe.db.sql(""" select sum(qty) from
+ `tabProduct Bundle Item` where parent = %s""", (frappe.db.escape(self.product_bundle_item)))[0][0]
+
+ if not total_bundle_qty:
+ # product bundle is 0 (product bundle allows 0 qty for items)
+ total_bundle_qty = 1
+
+ prod_plan = frappe.get_doc('Production Plan', self.production_plan)
+ item_reference = frappe.get_value('Production Plan Item', self.production_plan_item, 'sales_order_item')
+
+ for plan_reference in prod_plan.prod_plan_references:
+ work_order_qty = 0.0
+ if plan_reference.item_reference == item_reference:
+ if self.docstatus == 1:
+ work_order_qty = flt(plan_reference.qty) / total_bundle_qty
+ frappe.db.set_value('Sales Order Item',
+ plan_reference.sales_order_item, 'work_order_qty', work_order_qty)
+
def update_completed_qty_in_material_request(self):
if self.material_request:
frappe.get_doc("Material Request", self.material_request).update_completed_qty([self.material_request_item])
def set_work_order_operations(self):
"""Fetch operations from BOM and set in 'Work Order'"""
- self.set('operations', [])
- if not self.bom_no:
+ def _get_operations(bom_no, qty=1):
+ return frappe.db.sql(
+ f"""select
+ operation, description, workstation, idx,
+ base_hour_rate as hour_rate, time_in_mins * {qty} as time_in_mins,
+ "Pending" as status, parent as bom, batch_size, sequence_id
+ from
+ `tabBOM Operation`
+ where
+ parent = %s order by idx
+ """, bom_no, as_dict=1)
+
+
+ self.set('operations', [])
+ if not self.bom_no or not frappe.get_cached_value('BOM', self.bom_no, 'with_operations'):
return
- if self.use_multi_level_bom:
- bom_list = frappe.get_doc("BOM", self.bom_no).traverse_tree()
+ operations = []
+ if not self.use_multi_level_bom:
+ bom_qty = frappe.db.get_value("BOM", self.bom_no, "quantity")
+ operations.extend(_get_operations(self.bom_no, qty=1.0/bom_qty))
else:
- bom_list = [self.bom_no]
+ bom_tree = frappe.get_doc("BOM", self.bom_no).get_tree_representation()
+ bom_traversal = list(reversed(bom_tree.level_order_traversal()))
+ bom_traversal.append(bom_tree) # add operation on top level item last
+
+ for d in bom_traversal:
+ if d.is_bom:
+ operations.extend(_get_operations(d.name, qty=d.exploded_qty))
+
+ for correct_index, operation in enumerate(operations, start=1):
+ operation.idx = correct_index
- operations = frappe.db.sql("""
- select
- operation, description, workstation, idx,
- base_hour_rate as hour_rate, time_in_mins,
- "Pending" as status, parent as bom, batch_size, sequence_id
- from
- `tabBOM Operation`
- where
- parent in (%s) order by idx
- """ % ", ".join(["%s"]*len(bom_list)), tuple(bom_list), as_dict=1)
self.set('operations', operations)
-
- if self.use_multi_level_bom and self.get('operations') and self.get('items'):
- raw_material_operations = [d.operation for d in self.get('items')]
- operations = [d.operation for d in self.get('operations')]
-
- for operation in raw_material_operations:
- if operation not in operations:
- self.append('operations', {
- 'operation': operation
- })
-
self.calculate_time()
def calculate_time(self):
- bom_qty = frappe.db.get_value("BOM", self.bom_no, "quantity")
-
for d in self.get("operations"):
- d.time_in_mins = flt(d.time_in_mins) / flt(bom_qty) * (flt(self.qty) / flt(d.batch_size))
+ d.time_in_mins = flt(d.time_in_mins) * (flt(self.qty) / flt(d.batch_size))
self.calculate_operating_cost()
@@ -485,6 +590,7 @@ class WorkOrder(Document):
def validate_operation_time(self):
for d in self.operations:
if not d.time_in_mins > 0:
+ print(self.bom_no, self.production_item)
frappe.throw(_("Operation Time must be greater than 0 for Operation {0}").format(d.operation))
def update_required_items(self):
@@ -640,6 +746,17 @@ class WorkOrder(Document):
bom.set_bom_material_details()
return bom
+ def update_batch_produced_qty(self, stock_entry_doc):
+ if not cint(frappe.db.get_single_value("Manufacturing Settings", "make_serial_no_batch_from_work_order")):
+ return
+
+ for row in stock_entry_doc.items:
+ if row.batch_no and (row.is_finished_item or row.is_scrap_item):
+ qty = frappe.get_all("Stock Entry Detail", filters = {"batch_no": row.batch_no, "docstatus": 1},
+ or_filters= {"is_finished_item": 1, "is_scrap_item": 1}, fields = ["sum(qty)"], as_list=1)[0][0]
+
+ frappe.db.set_value("Batch", row.batch_no, "produced_qty", flt(qty))
+
@frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs
def get_bom_operations(doctype, txt, searchfield, start, page_len, filters):
@@ -717,7 +834,7 @@ def make_work_order(bom_no, item, qty=0, project=None, variant_items=None):
return wo_doc
def add_variant_item(variant_items, wo_doc, bom_no, table_name="items"):
- if isinstance(variant_items, string_types):
+ if isinstance(variant_items, str):
variant_items = json.loads(variant_items)
for item in variant_items:
@@ -797,6 +914,7 @@ def make_stock_entry(work_order_id, purpose, qty=None):
stock_entry.set_stock_entry_type()
stock_entry.get_items()
+ stock_entry.set_serial_no_batch_for_finished_good()
return stock_entry.as_dict()
@frappe.whitelist()
@@ -838,13 +956,47 @@ def query_sales_order(production_item):
@frappe.whitelist()
def make_job_card(work_order, operations):
- if isinstance(operations, string_types):
+ if isinstance(operations, str):
operations = json.loads(operations)
work_order = frappe.get_doc('Work Order', work_order)
for row in operations:
+ row = frappe._dict(row)
validate_operation_data(row)
- create_job_card(work_order, row, row.get("qty"), auto_create=True)
+ qty = row.get("qty")
+ while qty > 0:
+ qty = split_qty_based_on_batch_size(work_order, row, qty)
+ if row.job_card_qty > 0:
+ create_job_card(work_order, row, auto_create=True)
+
+def split_qty_based_on_batch_size(wo_doc, row, qty):
+ if not cint(frappe.db.get_value("Operation",
+ row.operation, "create_job_card_based_on_batch_size")):
+ row.batch_size = row.get("qty") or wo_doc.qty
+
+ row.job_card_qty = row.batch_size
+ if row.batch_size and qty >= row.batch_size:
+ qty -= row.batch_size
+ elif qty > 0:
+ row.job_card_qty = qty
+ qty = 0
+
+ get_serial_nos_for_job_card(row, wo_doc)
+
+ return qty
+
+def get_serial_nos_for_job_card(row, wo_doc):
+ if not wo_doc.serial_no:
+ return
+
+ serial_nos = get_serial_nos(wo_doc.serial_no)
+ used_serial_nos = []
+ for d in frappe.get_all('Job Card', fields=['serial_no'],
+ filters={'docstatus': ('<', 2), 'work_order': wo_doc.name, 'operation_id': row.name}):
+ used_serial_nos.extend(get_serial_nos(d.serial_no))
+
+ serial_nos = sorted(list(set(serial_nos) - set(used_serial_nos)))
+ row.serial_no = '\n'.join(serial_nos[0:row.job_card_qty])
def validate_operation_data(row):
if row.get("qty") <= 0:
@@ -863,20 +1015,22 @@ def validate_operation_data(row):
)
)
-def create_job_card(work_order, row, qty=0, enable_capacity_planning=False, auto_create=False):
+def create_job_card(work_order, row, enable_capacity_planning=False, auto_create=False):
doc = frappe.new_doc("Job Card")
doc.update({
'work_order': work_order.name,
'operation': row.get("operation"),
'workstation': row.get("workstation"),
'posting_date': nowdate(),
- 'for_quantity': qty or work_order.get('qty', 0),
+ 'for_quantity': row.job_card_qty or work_order.get('qty', 0),
'operation_id': row.get("name"),
'bom_no': work_order.bom_no,
'project': work_order.project,
'company': work_order.company,
'sequence_id': row.get("sequence_id"),
- 'wip_warehouse': work_order.wip_warehouse
+ 'wip_warehouse': work_order.wip_warehouse,
+ 'hour_rate': row.get("hour_rate"),
+ 'serial_no': row.get("serial_no")
})
if work_order.transfer_material_against == 'Job Card' and not work_order.skip_transfer:
diff --git a/erpnext/manufacturing/doctype/work_order/work_order_dashboard.py b/erpnext/manufacturing/doctype/work_order/work_order_dashboard.py
index 87c090f99c3..9aa0715e7ff 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order_dashboard.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order_dashboard.py
@@ -4,10 +4,17 @@ from frappe import _
def get_data():
return {
'fieldname': 'work_order',
+ 'non_standard_fieldnames': {
+ 'Batch': 'reference_name'
+ },
'transactions': [
{
'label': _('Transactions'),
'items': ['Stock Entry', 'Job Card', 'Pick List']
+ },
+ {
+ 'label': _('Reference'),
+ 'items': ['Serial No', 'Batch']
}
]
}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json b/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
index 8c5cde9a13c..f7b8787a0b3 100644
--- a/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
+++ b/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
@@ -2,14 +2,14 @@
"actions": [],
"creation": "2014-10-16 14:35:41.950175",
"doctype": "DocType",
- "editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"details",
"operation",
"bom",
- "sequence_id",
+ "column_break_4",
"description",
+ "sequence_id",
"col_break1",
"completed_qty",
"status",
@@ -48,6 +48,7 @@
{
"fieldname": "bom",
"fieldtype": "Link",
+ "in_list_view": 1,
"label": "BOM",
"no_copy": 1,
"options": "BOM",
@@ -67,6 +68,7 @@
"fieldtype": "Column Break"
},
{
+ "columns": 1,
"description": "Operation completed for how many finished goods?",
"fieldname": "completed_qty",
"fieldtype": "Float",
@@ -76,6 +78,7 @@
"read_only": 1
},
{
+ "columns": 1,
"default": "Pending",
"fieldname": "status",
"fieldtype": "Select",
@@ -118,6 +121,7 @@
"fieldtype": "Column Break"
},
{
+ "columns": 1,
"description": "in Minutes",
"fieldname": "time_in_mins",
"fieldtype": "Float",
@@ -195,12 +199,16 @@
"label": "Sequence ID",
"print_hide": 1,
"read_only": 1
+ },
+ {
+ "fieldname": "column_break_4",
+ "fieldtype": "Column Break"
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2020-10-14 12:58:49.241252",
+ "modified": "2021-06-24 14:36:12.835543",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Work Order Operation",
@@ -209,4 +217,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/manufacturing/doctype/workstation/test_workstation.py b/erpnext/manufacturing/doctype/workstation/test_workstation.py
index c6699bee48c..9b73aca6010 100644
--- a/erpnext/manufacturing/doctype/workstation/test_workstation.py
+++ b/erpnext/manufacturing/doctype/workstation/test_workstation.py
@@ -1,16 +1,19 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and Contributors
# See license.txt
from __future__ import unicode_literals
+from erpnext.manufacturing.doctype.operation.test_operation import make_operation
import frappe
import unittest
from erpnext.manufacturing.doctype.workstation.workstation import check_if_within_operating_hours, NotInWorkingHoursError, WorkstationHolidayError
+from erpnext.manufacturing.doctype.routing.test_routing import setup_bom, create_routing
+from frappe.test_runner import make_test_records
test_dependencies = ["Warehouse"]
test_records = frappe.get_test_records('Workstation')
+make_test_records('Workstation')
class TestWorkstation(unittest.TestCase):
-
def test_validate_timings(self):
check_if_within_operating_hours("_Test Workstation 1", "Operation 1", "2013-02-02 11:00:00", "2013-02-02 19:00:00")
check_if_within_operating_hours("_Test Workstation 1", "Operation 1", "2013-02-02 10:00:00", "2013-02-02 20:00:00")
@@ -21,6 +24,58 @@ class TestWorkstation(unittest.TestCase):
self.assertRaises(WorkstationHolidayError, check_if_within_operating_hours,
"_Test Workstation 1", "Operation 1", "2013-02-01 10:00:00", "2013-02-02 20:00:00")
+ def test_update_bom_operation_rate(self):
+ operations = [
+ {
+ "operation": "Test Operation A",
+ "workstation": "_Test Workstation A",
+ "hour_rate_rent": 300,
+ "time_in_mins": 60
+ },
+ {
+ "operation": "Test Operation B",
+ "workstation": "_Test Workstation B",
+ "hour_rate_rent": 1000,
+ "time_in_mins": 60
+ }
+ ]
+
+ for row in operations:
+ make_workstation(row)
+ make_operation(row)
+
+ test_routing_operations = [
+ {
+ "operation": "Test Operation A",
+ "workstation": "_Test Workstation A",
+ "time_in_mins": 60
+ },
+ {
+ "operation": "Test Operation B",
+ "workstation": "_Test Workstation A",
+ "time_in_mins": 60
+ }
+ ]
+ routing_doc = create_routing(routing_name = "Routing Test", operations=test_routing_operations)
+ bom_doc = setup_bom(item_code="_Testing Item", routing=routing_doc.name, currency="INR")
+ w1 = frappe.get_doc("Workstation", "_Test Workstation A")
+ #resets values
+ w1.hour_rate_rent = 300
+ w1.hour_rate_labour = 0
+ w1.save()
+ bom_doc.update_cost()
+ bom_doc.reload()
+ self.assertEqual(w1.hour_rate, 300)
+ self.assertEqual(bom_doc.operations[0].hour_rate, 300)
+ w1.hour_rate_rent = 250
+ w1.save()
+ #updating after setting new rates in workstations
+ bom_doc.update_cost()
+ bom_doc.reload()
+ self.assertEqual(w1.hour_rate, 250)
+ self.assertEqual(bom_doc.operations[0].hour_rate, 250)
+ self.assertEqual(bom_doc.operations[1].hour_rate, 250)
+
def make_workstation(*args, **kwargs):
args = args if args else kwargs
if isinstance(args, tuple):
@@ -34,9 +89,10 @@ def make_workstation(*args, **kwargs):
"doctype": "Workstation",
"workstation_name": workstation_name
})
-
+ doc.hour_rate_rent = args.get("hour_rate_rent")
+ doc.hour_rate_labour = args.get("hour_rate_labour")
doc.insert()
return doc
except frappe.DuplicateEntryError:
- return frappe.get_doc("Workstation", workstation_name)
\ No newline at end of file
+ return frappe.get_doc("Workstation", workstation_name)
diff --git a/erpnext/manufacturing/doctype/workstation/workstation.py b/erpnext/manufacturing/doctype/workstation/workstation.py
index 3512e590458..f4483f75472 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.py
+++ b/erpnext/manufacturing/doctype/workstation/workstation.py
@@ -39,7 +39,8 @@ class Workstation(Document):
def update_bom_operation(self):
bom_list = frappe.db.sql("""select DISTINCT parent from `tabBOM Operation`
- where workstation = %s""", self.name)
+ where workstation = %s and parenttype = 'routing' """, self.name)
+
for bom_no in bom_list:
frappe.db.sql("""update `tabBOM Operation` set hour_rate = %s
where parent = %s and workstation = %s""",
@@ -71,7 +72,7 @@ def check_if_within_operating_hours(workstation, operation, from_datetime, to_da
def is_within_operating_hours(workstation, operation, from_datetime, to_datetime):
operation_length = time_diff_in_seconds(to_datetime, from_datetime)
workstation = frappe.get_doc("Workstation", workstation)
-
+
if not workstation.working_hours:
return
diff --git a/erpnext/manufacturing/report/bom_explorer/bom_explorer.py b/erpnext/manufacturing/report/bom_explorer/bom_explorer.py
index 48907adc5f3..858b5546b02 100644
--- a/erpnext/manufacturing/report/bom_explorer/bom_explorer.py
+++ b/erpnext/manufacturing/report/bom_explorer/bom_explorer.py
@@ -20,17 +20,20 @@ def get_exploded_items(bom, data, indent=0, qty=1):
fields= ['qty','bom_no','qty','scrap','item_code','item_name','description','uom'])
for item in exploded_items:
+ print(item.bom_no, indent)
item["indent"] = indent
data.append({
'item_code': item.item_code,
'item_name': item.item_name,
'indent': indent,
+ 'bom_level': (frappe.get_cached_value("BOM", item.bom_no, "bom_level")
+ if item.bom_no else ""),
'bom': item.bom_no,
'qty': item.qty * qty,
'uom': item.uom,
'description': item.description,
'scrap': item.scrap
- })
+ })
if item.bom_no:
get_exploded_items(item.bom_no, data, indent=indent+1, qty=item.qty)
@@ -68,6 +71,12 @@ def get_columns():
"fieldname": "uom",
"width": 100
},
+ {
+ "label": "BOM Level",
+ "fieldtype": "Data",
+ "fieldname": "bom_level",
+ "width": 100
+ },
{
"label": "Standard Description",
"fieldtype": "data",
diff --git a/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py b/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py
index 1c6758e6f36..ed8b93929a1 100644
--- a/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py
+++ b/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py
@@ -70,12 +70,12 @@ def get_bom_stock(filters):
ON bom_item.item_code = ledger.item_code
{conditions}
WHERE
- bom_item.parent = '{bom}' and bom_item.parenttype='BOM'
+ bom_item.parent = {bom} and bom_item.parenttype='BOM'
GROUP BY bom_item.item_code""".format(
qty_field=qty_field,
table=table,
conditions=conditions,
- bom=bom,
+ bom=frappe.db.escape(bom),
qty_to_produce=qty_to_produce or 1)
)
diff --git a/erpnext/patches/v4_4/__init__.py b/erpnext/manufacturing/report/cost_of_poor_quality_report/__init__.py
similarity index 100%
rename from erpnext/patches/v4_4/__init__.py
rename to erpnext/manufacturing/report/cost_of_poor_quality_report/__init__.py
diff --git a/erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js b/erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js
new file mode 100644
index 00000000000..97e7e0a7d20
--- /dev/null
+++ b/erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js
@@ -0,0 +1,105 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Cost of Poor Quality Report"] = {
+ "filters": [
+ {
+ label: __("Company"),
+ fieldname: "company",
+ fieldtype: "Link",
+ options: "Company",
+ default: frappe.defaults.get_user_default("Company"),
+ reqd: 1
+ },
+ {
+ label: __("From Date"),
+ fieldname:"from_date",
+ fieldtype: "Datetime",
+ default: frappe.datetime.convert_to_system_tz(frappe.datetime.add_months(frappe.datetime.now_datetime(), -1)),
+ reqd: 1
+ },
+ {
+ label: __("To Date"),
+ fieldname:"to_date",
+ fieldtype: "Datetime",
+ default: frappe.datetime.now_datetime(),
+ reqd: 1,
+ },
+ {
+ label: __("Job Card"),
+ fieldname: "name",
+ fieldtype: "Link",
+ options: "Job Card",
+ get_query: function() {
+ return {
+ filters: {
+ is_corrective_job_card: 1,
+ docstatus: 1
+ }
+ }
+ }
+ },
+ {
+ label: __("Work Order"),
+ fieldname: "work_order",
+ fieldtype: "Link",
+ options: "Work Order"
+ },
+ {
+ label: __("Operation"),
+ fieldname: "operation",
+ fieldtype: "Link",
+ options: "Operation",
+ get_query: function() {
+ return {
+ filters: {
+ is_corrective_operation: 1
+ }
+ }
+ }
+ },
+ {
+ label: __("Workstation"),
+ fieldname: "workstation",
+ fieldtype: "Link",
+ options: "Workstation"
+ },
+ {
+ label: __("Item"),
+ fieldname: "production_item",
+ fieldtype: "Link",
+ options: "Item"
+ },
+ {
+ label: __("Serial No"),
+ fieldname: "serial_no",
+ fieldtype: "Link",
+ options: "Serial No",
+ depends_on: "eval: doc.production_item",
+ get_query: function() {
+ var item_code = frappe.query_report.get_filter_value('production_item');
+ return {
+ filters: {
+ item_code: item_code
+ }
+ }
+ }
+ },
+ {
+ label: __("Batch No"),
+ fieldname: "batch_no",
+ fieldtype: "Link",
+ options: "Batch No",
+ depends_on: "eval: doc.production_item",
+ get_query: function() {
+ var item_code = frappe.query_report.get_filter_value('production_item');
+ return {
+ filters: {
+ item: item_code
+ }
+ }
+ }
+ },
+ ]
+};
diff --git a/erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.json b/erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.json
new file mode 100644
index 00000000000..ee63bc1c287
--- /dev/null
+++ b/erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.json
@@ -0,0 +1,33 @@
+{
+ "add_total_row": 0,
+ "columns": [],
+ "creation": "2021-01-11 11:10:58.292896",
+ "disable_prepared_report": 0,
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "filters": [],
+ "idx": 0,
+ "is_standard": "Yes",
+ "json": "{}",
+ "modified": "2021-01-11 11:11:03.594242",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Cost of Poor Quality Report",
+ "owner": "Administrator",
+ "prepared_report": 0,
+ "ref_doctype": "Job Card",
+ "report_name": "Cost of Poor Quality Report",
+ "report_type": "Script Report",
+ "roles": [
+ {
+ "role": "System Manager"
+ },
+ {
+ "role": "Manufacturing User"
+ },
+ {
+ "role": "Manufacturing Manager"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py b/erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py
new file mode 100644
index 00000000000..9f81e7d26a1
--- /dev/null
+++ b/erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py
@@ -0,0 +1,127 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import flt
+
+def execute(filters=None):
+ columns, data = [], []
+
+ columns = get_columns(filters)
+ data = get_data(filters)
+
+ return columns, data
+
+def get_data(report_filters):
+ data = []
+ operations = frappe.get_all("Operation", filters = {"is_corrective_operation": 1})
+ if operations:
+ operations = [d.name for d in operations]
+ fields = ["production_item as item_code", "item_name", "work_order", "operation",
+ "workstation", "total_time_in_mins", "name", "hour_rate", "serial_no", "batch_no"]
+
+ filters = get_filters(report_filters, operations)
+
+ job_cards = frappe.get_all("Job Card", fields = fields,
+ filters = filters)
+
+ for row in job_cards:
+ row.operating_cost = flt(row.hour_rate) * (flt(row.total_time_in_mins) / 60.0)
+ update_raw_material_cost(row, report_filters)
+ data.append(row)
+
+ return data
+
+def get_filters(report_filters, operations):
+ filters = {"docstatus": 1, "operation": ("in", operations), "is_corrective_job_card": 1}
+ for field in ["name", "work_order", "operation", "workstation", "company", "serial_no", "batch_no", "production_item"]:
+ if report_filters.get(field):
+ if field != 'serial_no':
+ filters[field] = report_filters.get(field)
+ else:
+ filters[field] = ('like', '% {} %'.format(report_filters.get(field)))
+
+ return filters
+
+def update_raw_material_cost(row, filters):
+ row.rm_cost = 0.0
+ for data in frappe.get_all("Job Card Item", fields = ["amount"],
+ filters={"parent": row.name, "docstatus": 1}):
+ row.rm_cost += data.amount
+
+def get_columns(filters):
+ return [
+ {
+ "label": _("Job Card"),
+ "fieldtype": "Link",
+ "fieldname": "name",
+ "options": "Job Card",
+ "width": "100"
+ },
+ {
+ "label": _("Work Order"),
+ "fieldtype": "Link",
+ "fieldname": "work_order",
+ "options": "Work Order",
+ "width": "100"
+ },
+ {
+ "label": _("Item Code"),
+ "fieldtype": "Link",
+ "fieldname": "item_code",
+ "options": "Item",
+ "width": "100"
+ },
+ {
+ "label": _("Item Name"),
+ "fieldtype": "Data",
+ "fieldname": "item_name",
+ "width": "100"
+ },
+ {
+ "label": _("Operation"),
+ "fieldtype": "Link",
+ "fieldname": "operation",
+ "options": "Operation",
+ "width": "100"
+ },
+ {
+ "label": _("Serial No"),
+ "fieldtype": "Data",
+ "fieldname": "serial_no",
+ "width": "100"
+ },
+ {
+ "label": _("Batch No"),
+ "fieldtype": "Data",
+ "fieldname": "batch_no",
+ "width": "100"
+ },
+ {
+ "label": _("Workstation"),
+ "fieldtype": "Link",
+ "fieldname": "workstation",
+ "options": "Workstation",
+ "width": "100"
+ },
+ {
+ "label": _("Operating Cost"),
+ "fieldtype": "Currency",
+ "fieldname": "operating_cost",
+ "width": "100"
+ },
+ {
+ "label": _("Raw Material Cost"),
+ "fieldtype": "Currency",
+ "fieldname": "rm_cost",
+ "width": "100"
+ },
+ {
+ "label": _("Total Time (in Mins)"),
+ "fieldtype": "Float",
+ "fieldname": "total_time_in_mins",
+ "width": "100"
+ }
+ ]
\ No newline at end of file
diff --git a/erpnext/manufacturing/report/job_card_summary/job_card_summary.js b/erpnext/manufacturing/report/job_card_summary/job_card_summary.js
index bd68db190e7..cb771e49941 100644
--- a/erpnext/manufacturing/report/job_card_summary/job_card_summary.js
+++ b/erpnext/manufacturing/report/job_card_summary/job_card_summary.js
@@ -68,6 +68,18 @@ frappe.query_reports["Job Card Summary"] = {
get_data: function(txt) {
return frappe.db.get_link_options('Item', txt);
}
+ },
+ {
+ label: __("Workstation"),
+ fieldname: "workstation",
+ fieldtype: "Link",
+ options: "Workstation"
+ },
+ {
+ label: __("Operation"),
+ fieldname: "operation",
+ fieldtype: "Link",
+ options: "Operation"
}
]
};
diff --git a/erpnext/manufacturing/report/job_card_summary/job_card_summary.json b/erpnext/manufacturing/report/job_card_summary/job_card_summary.json
index 9f08fc34cb8..ecf2b74bbed 100644
--- a/erpnext/manufacturing/report/job_card_summary/job_card_summary.json
+++ b/erpnext/manufacturing/report/job_card_summary/job_card_summary.json
@@ -1,14 +1,16 @@
{
- "add_total_row": 0,
+ "add_total_row": 1,
+ "columns": [],
"creation": "2020-04-20 12:00:21.436619",
"disable_prepared_report": 0,
"disabled": 0,
"docstatus": 0,
"doctype": "Report",
+ "filters": [],
"idx": 0,
"is_standard": "Yes",
- "letter_head": "Gadgets International",
- "modified": "2020-04-20 12:00:21.436619",
+ "letter_head": "",
+ "modified": "2020-12-30 11:49:21.713561",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Job Card Summary",
diff --git a/erpnext/patches/v5_0/__init__.py b/erpnext/manufacturing/report/production_plan_summary/__init__.py
similarity index 100%
rename from erpnext/patches/v5_0/__init__.py
rename to erpnext/manufacturing/report/production_plan_summary/__init__.py
diff --git a/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.js b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.js
new file mode 100644
index 00000000000..59396fef16e
--- /dev/null
+++ b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.js
@@ -0,0 +1,32 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Production Plan Summary"] = {
+ "filters": [
+ {
+ fieldname: "production_plan",
+ label: __("Production Plan"),
+ fieldtype: "Link",
+ options: "Production Plan",
+ reqd: 1,
+ get_query: function() {
+ return {
+ filters: {
+ "docstatus": 1
+ }
+ };
+ }
+ }
+ ],
+ "formatter": function(value, row, column, data, default_formatter) {
+ value = default_formatter(value, row, column, data);
+
+ if (column.fieldname == "document_name") {
+ var color = data.pending_qty > 0 ? 'red': 'green';
+ value = `${data['document_name']}`;
+ }
+
+ return value;
+ },
+};
diff --git a/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.json b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.json
new file mode 100644
index 00000000000..33aca21a6ea
--- /dev/null
+++ b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.json
@@ -0,0 +1,26 @@
+{
+ "add_total_row": 0,
+ "columns": [],
+ "creation": "2020-12-27 11:43:39.781793",
+ "disable_prepared_report": 0,
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "filters": [],
+ "idx": 0,
+ "is_standard": "Yes",
+ "modified": "2020-12-27 11:43:42.677584",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Production Plan Summary",
+ "owner": "Administrator",
+ "prepared_report": 0,
+ "ref_doctype": "Production Plan",
+ "report_name": "Production Plan Summary",
+ "report_type": "Script Report",
+ "roles": [
+ {
+ "role": "Manufacturing User"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py
new file mode 100644
index 00000000000..81b1791ae81
--- /dev/null
+++ b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py
@@ -0,0 +1,136 @@
+# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils import flt
+
+def execute(filters=None):
+ columns, data = [], []
+ data = get_data(filters)
+ columns = get_column(filters)
+
+ return columns, data
+
+def get_data(filters):
+ data = []
+
+ order_details = {}
+ get_work_order_details(filters, order_details)
+ get_purchase_order_details(filters, order_details)
+ get_production_plan_item_details(filters, data, order_details)
+
+ return data
+
+def get_production_plan_item_details(filters, data, order_details):
+ itemwise_indent = {}
+
+ production_plan_doc = frappe.get_cached_doc("Production Plan", filters.get("production_plan"))
+ for row in production_plan_doc.po_items:
+ work_order = frappe.get_cached_value("Work Order", {"production_plan_item": row.name,
+ "bom_no": row.bom_no, "production_item": row.item_code}, "name")
+
+ if row.item_code not in itemwise_indent:
+ itemwise_indent.setdefault(row.item_code, {})
+
+ data.append({
+ "indent": 0,
+ "item_code": row.item_code,
+ "item_name": frappe.get_cached_value("Item", row.item_code, "item_name"),
+ "qty": row.planned_qty,
+ "document_type": "Work Order",
+ "document_name": work_order,
+ "bom_level": frappe.get_cached_value("BOM", row.bom_no, "bom_level"),
+ "produced_qty": order_details.get((work_order, row.item_code)).get("produced_qty"),
+ "pending_qty": flt(row.planned_qty) - flt(order_details.get((work_order, row.item_code)).get("produced_qty"))
+ })
+
+ get_production_plan_sub_assembly_item_details(filters, row, production_plan_doc, data, order_details)
+
+def get_production_plan_sub_assembly_item_details(filters, row, production_plan_doc, data, order_details):
+ for item in production_plan_doc.sub_assembly_items:
+ if row.name == item.production_plan_item:
+ subcontracted_item = (item.type_of_manufacturing == 'Subcontract')
+
+ if subcontracted_item:
+ docname = frappe.get_cached_value("Purchase Order Item",
+ {"production_plan_sub_assembly_item": item.name, "docstatus": ("<", 2)}, "parent")
+ else:
+ docname = frappe.get_cached_value("Work Order",
+ {"production_plan_sub_assembly_item": item.name, "docstatus": ("<", 2)}, "name")
+
+ data.append({
+ "indent": 1,
+ "item_code": item.production_item,
+ "item_name": item.item_name,
+ "qty": item.qty,
+ "document_type": "Work Order" if not subcontracted_item else "Purchase Order",
+ "document_name": docname,
+ "bom_level": item.bom_level,
+ "produced_qty": order_details.get((docname, item.production_item)).get("produced_qty"),
+ "pending_qty": flt(item.qty) - flt(order_details.get((docname, item.production_item)).get("produced_qty"))
+ })
+
+def get_work_order_details(filters, order_details):
+ for row in frappe.get_all("Work Order", filters = {"production_plan": filters.get("production_plan")},
+ fields=["name", "produced_qty", "production_plan", "production_item"]):
+ order_details.setdefault((row.name, row.production_item), row)
+
+def get_purchase_order_details(filters, order_details):
+ for row in frappe.get_all("Purchase Order Item", filters = {"production_plan": filters.get("production_plan")},
+ fields=["parent", "received_qty as produced_qty", "item_code"]):
+ order_details.setdefault((row.parent, row.item_code), row)
+
+def get_column(filters):
+ return [
+ {
+ "label": "Finished Good",
+ "fieldtype": "Link",
+ "fieldname": "item_code",
+ "width": 300,
+ "options": "Item"
+ },
+ {
+ "label": "Item Name",
+ "fieldtype": "data",
+ "fieldname": "item_name",
+ "width": 100
+ },
+ {
+ "label": "Document Type",
+ "fieldtype": "Link",
+ "fieldname": "document_type",
+ "width": 150,
+ "options": "DocType"
+ },
+ {
+ "label": "Document Name",
+ "fieldtype": "Dynamic Link",
+ "fieldname": "document_name",
+ "width": 150
+ },
+ {
+ "label": "BOM Level",
+ "fieldtype": "Int",
+ "fieldname": "bom_level",
+ "width": 100
+ },
+ {
+ "label": "Order Qty",
+ "fieldtype": "Float",
+ "fieldname": "qty",
+ "width": 120
+ },
+ {
+ "label": "Received Qty",
+ "fieldtype": "Float",
+ "fieldname": "produced_qty",
+ "width": 160
+ },
+ {
+ "label": "Pending Qty",
+ "fieldtype": "Float",
+ "fieldname": "pending_qty",
+ "width": 110
+ }
+ ]
diff --git a/erpnext/manufacturing/report/work_order_summary/work_order_summary.py b/erpnext/manufacturing/report/work_order_summary/work_order_summary.py
index fb047b230ce..612dad0bf51 100644
--- a/erpnext/manufacturing/report/work_order_summary/work_order_summary.py
+++ b/erpnext/manufacturing/report/work_order_summary/work_order_summary.py
@@ -19,7 +19,7 @@ def execute(filters=None):
return columns, data, None, chart_data
def get_data(filters):
- query_filters = {"docstatus": 1}
+ query_filters = {"docstatus": ("<", 2)}
fields = ["name", "status", "sales_order", "production_item", "qty", "produced_qty",
"planned_start_date", "planned_end_date", "actual_start_date", "actual_end_date", "lead_time"]
@@ -62,7 +62,8 @@ def get_chart_based_on_status(data):
"Not Started": 0,
"In Process": 0,
"Stopped": 0,
- "Completed": 0
+ "Completed": 0,
+ "Draft": 0
}
for d in data:
diff --git a/erpnext/non_profit/doctype/member/member.py b/erpnext/non_profit/doctype/member/member.py
index efc072ee971..30be585e9a7 100644
--- a/erpnext/non_profit/doctype/member/member.py
+++ b/erpnext/non_profit/doctype/member/member.py
@@ -28,7 +28,7 @@ class Member(Document):
def setup_subscription(self):
non_profit_settings = frappe.get_doc('Non Profit Settings')
if not non_profit_settings.enable_razorpay_for_memberships:
- frappe.throw('Please check Enable Razorpay for Memberships in {0} to setup subscription').format(
+ frappe.throw(_('Please check Enable Razorpay for Memberships in {0} to setup subscription')).format(
get_link_to_form('Non Profit Settings', 'Non Profit Settings'))
controller = get_payment_gateway_controller("Razorpay")
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 1e8ce3c6583..29376f00a1c 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -1,494 +1,19 @@
-execute:import unidecode # new requirement
-erpnext.patches.v8_0.move_perpetual_inventory_setting
-erpnext.patches.v8_9.set_print_zero_amount_taxes
erpnext.patches.v12_0.update_is_cancelled_field
erpnext.patches.v11_0.rename_production_order_to_work_order
erpnext.patches.v11_0.refactor_naming_series
erpnext.patches.v11_0.refactor_autoname_naming
-erpnext.patches.v10_0.rename_schools_to_education
-erpnext.patches.v4_0.validate_v3_patch
-erpnext.patches.v4_0.fix_employee_user_id
-erpnext.patches.v4_0.remove_employee_role_if_no_employee
-erpnext.patches.v4_0.update_user_properties
-erpnext.patches.v4_0.apply_user_permissions
-erpnext.patches.v4_0.move_warehouse_user_to_restrictions
-erpnext.patches.v4_0.global_defaults_to_system_settings
-erpnext.patches.v4_0.update_incharge_name_to_sales_person_in_maintenance_schedule
execute:frappe.reload_doc("accounts", "doctype", "POS Payment Method") #2020-05-28
execute:frappe.reload_doc("HR", "doctype", "HR Settings") #2020-01-16 #2020-07-24
-execute:frappe.reload_doc('stock', 'doctype', 'warehouse') # 2017-04-24
-execute:frappe.reload_doc('accounts', 'doctype', 'sales_invoice') # 2016-08-31
-execute:frappe.reload_doc('selling', 'doctype', 'sales_order') # 2014-01-29
-execute:frappe.reload_doc('selling', 'doctype', 'quotation') # 2014-01-29
-execute:frappe.reload_doc('stock', 'doctype', 'delivery_note') # 2014-01-29
-erpnext.patches.v4_0.reload_sales_print_format
-execute:frappe.reload_doc('accounts', 'doctype', 'purchase_invoice') # 2014-01-29
-execute:frappe.reload_doc('buying', 'doctype', 'purchase_order') # 2014-01-29
-execute:frappe.reload_doc('buying', 'doctype', 'supplier_quotation') # 2014-01-29
-execute:frappe.reload_doc('stock', 'doctype', 'purchase_receipt') # 2014-01-29
-execute:frappe.reload_doc('accounts', 'doctype', 'pos_setting') # 2014-01-29
-execute:frappe.reload_doc('selling', 'doctype', 'customer') # 2014-01-29
-execute:frappe.reload_doc('buying', 'doctype', 'supplier') # 2014-01-29
-execute:frappe.reload_doc('accounts', 'doctype', 'asset_category')
-execute:frappe.reload_doc('accounts', 'doctype', 'pricing_rule')
-erpnext.patches.v4_0.map_charge_to_taxes_and_charges
-execute:frappe.reload_doc('support', 'doctype', 'newsletter') # 2014-01-31
-execute:frappe.reload_doc('hr', 'doctype', 'employee') # 2014-02-03
-execute:frappe.db.sql("update tabPage set module='Core' where name='Setup'")
-erpnext.patches.v5_2.change_item_selects_to_checks
-execute:frappe.reload_doctype('Item')
-erpnext.patches.v4_0.fields_to_be_renamed
-erpnext.patches.v4_0.rename_sitemap_to_route
-erpnext.patches.v7_0.re_route #2016-06-27
-erpnext.patches.v4_0.fix_contact_address
-erpnext.patches.v4_0.customer_discount_to_pricing_rule
-execute:frappe.db.sql("""delete from `tabWebsite Item Group` where ifnull(item_group, '')=''""")
-erpnext.patches.v4_0.remove_module_home_pages
-erpnext.patches.v4_0.split_email_settings
-erpnext.patches.v4_0.import_country_codes
-erpnext.patches.v4_0.countrywise_coa
-execute:frappe.delete_doc("DocType", "MIS Control")
-execute:frappe.delete_doc("Page", "Financial Statements")
-execute:frappe.delete_doc("DocType", "Stock Ledger")
-execute:frappe.delete_doc("DocType", "Grade")
-execute:frappe.db.sql("delete from `tabWebsite Item Group` where ifnull(item_group, '')=''")
-execute:frappe.delete_doc("Print Format", "SalesInvoice")
-execute:import frappe.defaults;frappe.defaults.clear_default("price_list_currency")
-erpnext.patches.v4_0.update_account_root_type
-execute:frappe.delete_doc("Report", "Purchase In Transit")
-erpnext.patches.v4_0.new_address_template
-execute:frappe.delete_doc("DocType", "SMS Control")
-execute:frappe.delete_doc_if_exists("DocType", "Bulk SMS") #2015-08-18
-erpnext.patches.v4_0.fix_case_of_hr_module_def
-erpnext.patches.v4_0.fix_address_template
-
-# WATCHOUT: This patch reload's documents
-erpnext.patches.v4_0.reset_permissions_for_masters
-erpnext.patches.v6_20x.rename_project_name_to_project #2016-03-14
-
-erpnext.patches.v4_0.update_tax_amount_after_discount
-execute:frappe.permissions.reset_perms("GL Entry") #2014-06-09
-execute:frappe.permissions.reset_perms("Stock Ledger Entry") #2014-06-09
-erpnext.patches.v4_0.create_custom_fields_for_india_specific_fields
-erpnext.patches.v4_0.save_default_letterhead
-erpnext.patches.v4_0.update_custom_print_formats_for_renamed_fields
-erpnext.patches.v4_0.update_other_charges_in_custom_purchase_print_formats
-erpnext.patches.v4_0.create_price_list_if_missing
-execute:frappe.db.sql("update `tabItem` set end_of_life=null where end_of_life='0000-00-00'") #2014-06-16
-erpnext.patches.v4_0.update_users_report_view_settings
-erpnext.patches.v4_0.set_pricing_rule_for_buying_or_selling
-erpnext.patches.v4_1.set_outgoing_email_footer
-erpnext.patches.v4_1.fix_sales_order_delivered_status
-erpnext.patches.v4_1.fix_delivery_and_billing_status
-execute:frappe.db.sql("update `tabAccount` set root_type='Liability' where root_type='Income' and report_type='Balance Sheet'")
-execute:frappe.delete_doc("DocType", "Payment to Invoice Matching Tool") # 29-07-2014
-execute:frappe.delete_doc("DocType", "Payment to Invoice Matching Tool Detail") # 29-07-2014
-execute:frappe.delete_doc("Page", "trial-balance") #2014-07-22
-erpnext.patches.v4_2.delete_old_print_formats #2014-07-29
-erpnext.patches.v4_2.toggle_rounded_total #2014-07-30
-erpnext.patches.v4_2.fix_account_master_type
-erpnext.patches.v4_2.update_project_milestones
-erpnext.patches.v4_2.add_currency_turkish_lira #2014-08-08
-execute:frappe.delete_doc("DocType", "Landed Cost Wizard")
-erpnext.patches.v4_2.default_website_style
-erpnext.patches.v4_2.set_company_country
-erpnext.patches.v4_2.update_sales_order_invoice_field_name
-erpnext.patches.v4_2.seprate_manufacture_and_repack
-execute:frappe.delete_doc("Report", "Warehouse-Wise Stock Balance")
-execute:frappe.delete_doc("DocType", "Purchase Request")
-execute:frappe.delete_doc("DocType", "Purchase Request Item")
-erpnext.patches.v4_2.recalculate_bom_cost
-erpnext.patches.v4_2.fix_gl_entries_for_stock_transactions
erpnext.patches.v4_2.update_requested_and_ordered_qty #2021-03-31
-execute:frappe.rename_doc("DocType", "Support Ticket", "Issue", force=True)
-erpnext.patches.v4_4.make_email_accounts
-execute:frappe.delete_doc("DocType", "Contact Control")
-erpnext.patches.v4_2.discount_amount
-erpnext.patches.v4_2.reset_bom_costs
-erpnext.patches.v5_0.update_frozen_accounts_permission_role
-erpnext.patches.v5_0.update_dn_against_doc_fields
-execute:frappe.db.sql("update `tabMaterial Request` set material_request_type = 'Material Transfer' where material_request_type = 'Transfer'")
-execute:frappe.reload_doc('stock', 'doctype', 'item')
-erpnext.patches.v5_0.set_default_company_in_bom
-execute:frappe.reload_doc('crm', 'doctype', 'lead')
-execute:frappe.reload_doc('crm', 'doctype', 'opportunity')
-erpnext.patches.v5_0.rename_taxes_and_charges_master
-erpnext.patches.v5_1.sales_bom_rename
-erpnext.patches.v5_0.rename_table_fieldnames
-execute:frappe.db.sql("update `tabJournal Entry` set voucher_type='Journal Entry' where ifnull(voucher_type, '')=''")
-erpnext.patches.v5_0.is_group
-erpnext.patches.v4_2.party_model
-erpnext.patches.v5_0.party_model_patch_fix
-erpnext.patches.v4_1.fix_jv_remarks
-erpnext.patches.v4_2.update_landed_cost_voucher
-erpnext.patches.v4_2.set_item_has_batch
-erpnext.patches.v4_2.update_stock_uom_for_dn_in_sle
-erpnext.patches.v5_0.recalculate_total_amount_in_jv
-erpnext.patches.v5_0.update_companywise_payment_account
-erpnext.patches.v5_0.remove_birthday_events
-erpnext.patches.v5_0.update_item_name_in_bom
-erpnext.patches.v5_0.rename_customer_issue
-erpnext.patches.v5_0.rename_total_fields
-erpnext.patches.v5_0.new_crm_module
-erpnext.patches.v5_0.rename_customer_issue
-erpnext.patches.v5_0.update_material_transfer_for_manufacture
-execute:frappe.reload_doc('crm', 'doctype', 'opportunity_item')
-erpnext.patches.v5_0.update_item_description_and_image
-erpnext.patches.v5_0.update_material_transferred_for_manufacturing
-erpnext.patches.v5_0.stock_entry_update_value
-erpnext.patches.v5_0.convert_stock_reconciliation
-erpnext.patches.v5_0.update_projects
-erpnext.patches.v5_0.item_patches
-erpnext.patches.v5_0.update_journal_entry_title
-erpnext.patches.v5_0.taxes_and_totals_in_party_currency
-erpnext.patches.v5_0.replace_renamed_fields_in_custom_scripts_and_print_formats
-erpnext.patches.v5_0.update_from_bom
-erpnext.patches.v5_0.update_account_types
-erpnext.patches.v5_0.update_sms_sender
-erpnext.patches.v5_0.set_appraisal_remarks
-erpnext.patches.v5_0.update_time_log_title
-erpnext.patches.v7_0.create_warehouse_nestedset
-erpnext.patches.v7_0.merge_account_type_stock_and_warehouse_to_stock
-erpnext.patches.v7_0.set_is_group_for_warehouse
-erpnext.patches.v7_2.stock_uom_in_selling
-erpnext.patches.v4_2.repost_sle_for_si_with_no_warehouse
-erpnext.patches.v5_0.newsletter
-execute:frappe.delete_doc("DocType", "Chart of Accounts")
-execute:frappe.delete_doc("DocType", "Style Settings")
-erpnext.patches.v5_0.update_opportunity
-erpnext.patches.v5_0.opportunity_not_submittable
-execute:frappe.permissions.reset_perms("Purchase Taxes and Charges Template") #2014-06-09
-execute:frappe.permissions.reset_perms("Expense Claim Type") #2014-06-19
-erpnext.patches.v5_0.execute_on_doctype_update
-erpnext.patches.v4_2.fix_recurring_orders
-erpnext.patches.v4_2.delete_gl_entries_for_cancelled_invoices
-erpnext.patches.v5_0.project_costing
-erpnext.patches.v5_0.update_temporary_account
-erpnext.patches.v5_0.update_advance_paid
-erpnext.patches.v5_0.link_warehouse_with_account
-execute:frappe.delete_doc("Page", "stock-ledger")
-execute:frappe.delete_doc("Page","stock-level")
-erpnext.patches.v5_0.reclculate_planned_operating_cost_in_production_order
-erpnext.patches.v5_0.repost_requested_qty
-erpnext.patches.v5_0.fix_taxes_and_totals_in_party_currency
-erpnext.patches.v5_0.update_tax_amount_after_discount_in_purchase_cycle
-erpnext.patches.v5_0.rename_pos_setting
-erpnext.patches.v5_0.update_operation_description
-erpnext.patches.v5_0.set_footer_address
-execute:frappe.db.set_value("Backup Manager", None, "send_backups_to_dropbox", 1 if frappe.db.get_value("Backup Manager", None, "upload_backups_to_dropbox") in ("Daily", "Weekly") else 0)
-execute:frappe.db.sql_list("delete from `tabDocPerm` where parent='Issue' and modified_by='Administrator' and role='Guest'")
-erpnext.patches.v5_0.update_item_and_description_again
-erpnext.patches.v6_0.multi_currency
-erpnext.patches.v7_0.create_budget_record
-erpnext.patches.v5_0.repost_gle_for_jv_with_multiple_party
-erpnext.patches.v5_0.portal_fixes
-erpnext.patches.v5_0.reset_values_in_tools # 02-05-2016
-execute:frappe.delete_doc("Page", "users")
-erpnext.patches.v5_0.update_material_transferred_for_manufacturing_again
-erpnext.patches.v5_0.index_on_account_and_gl_entry
-execute:frappe.db.sql("""delete from `tabProject Task`""")
-erpnext.patches.v5_0.update_item_desc_in_invoice
-erpnext.patches.v5_1.fix_against_account
-execute:frappe.rename_doc("DocType", "Salary Manager", "Process Payroll", force=True)
-erpnext.patches.v5_1.rename_roles
-erpnext.patches.v5_1.default_bom
-execute:frappe.delete_doc("DocType", "Party Type")
-execute:frappe.delete_doc("Module Def", "Contacts")
-erpnext.patches.v5_4.fix_reserved_qty_and_sle_for_packed_items # 30-07-2015
-execute:frappe.reload_doctype("Leave Type")
-execute:frappe.db.sql("update `tabLeave Type` set include_holiday=0")
-erpnext.patches.v5_4.set_root_and_report_type
-erpnext.patches.v5_4.notify_system_managers_regarding_wrong_tax_calculation
-erpnext.patches.v5_4.fix_invoice_outstanding
-execute:frappe.db.sql("update `tabStock Ledger Entry` set stock_queue = '[]' where voucher_type = 'Stock Reconciliation' and ifnull(qty_after_transaction, 0) = 0")
-erpnext.patches.v5_4.fix_missing_item_images
-erpnext.patches.v5_4.stock_entry_additional_costs
-erpnext.patches.v5_4.cleanup_journal_entry #2015-08-14
erpnext.patches.v5_7.update_item_description_based_on_item_master
-erpnext.patches.v5_7.item_template_attributes
-execute:frappe.delete_doc_if_exists("DocType", "Manage Variants")
-execute:frappe.delete_doc_if_exists("DocType", "Manage Variants Item")
erpnext.patches.v4_2.repost_reserved_qty #2021-03-31
-erpnext.patches.v5_4.update_purchase_cost_against_project
-erpnext.patches.v5_8.update_order_reference_in_return_entries
-erpnext.patches.v5_8.add_credit_note_print_heading
-execute:frappe.delete_doc_if_exists("Print Format", "Credit Note - Negative Invoice")
-
-# V6.0
-erpnext.patches.v6_0.set_default_title # 2015-09-03
-erpnext.patches.v6_0.default_activity_rate
-execute:frappe.db.set_value("Stock Settings", None, "automatically_set_serial_nos_based_on_fifo", 1)
-execute:frappe.db.sql("""update `tabProject` set percent_complete=round(percent_complete, 2) where percent_complete is not null""")
-erpnext.patches.v6_0.fix_outstanding_amount
-erpnext.patches.v6_0.fix_planned_qty
-erpnext.patches.v6_2.remove_newsletter_duplicates
-erpnext.patches.v6_2.fix_missing_default_taxes_and_lead
-erpnext.patches.v6_3.convert_applicable_territory
-erpnext.patches.v6_4.round_status_updater_percentages
-erpnext.patches.v6_4.repost_gle_for_journal_entries_where_reference_name_missing
-erpnext.patches.v6_4.fix_journal_entries_due_to_reconciliation
-erpnext.patches.v6_4.fix_status_in_sales_and_purchase_order
-erpnext.patches.v6_4.fix_modified_in_sales_order_and_purchase_order
-erpnext.patches.v6_4.fix_duplicate_bins
-erpnext.patches.v6_4.fix_sales_order_maintenance_status
-erpnext.patches.v6_4.email_digest_update
-
-# delete shopping cart doctypes
-execute:frappe.delete_doc_if_exists("DocType", "Applicable Territory")
-execute:frappe.delete_doc_if_exists("DocType", "Shopping Cart Price List")
-execute:frappe.delete_doc_if_exists("DocType", "Shopping Cart Taxes and Charges Master")
-
-erpnext.patches.v6_4.set_user_in_contact
-erpnext.patches.v6_4.make_image_thumbnail #2015-10-20
-erpnext.patches.v6_5.show_in_website_for_template_item
-erpnext.patches.v6_4.fix_expense_included_in_valuation
-execute:frappe.delete_doc_if_exists("Report", "Item-wise Last Purchase Rate")
-erpnext.patches.v6_6.fix_website_image
-erpnext.patches.v6_6.remove_fiscal_year_from_leave_allocation
-execute:frappe.delete_doc_if_exists("DocType", "Stock UOM Replace Utility")
-erpnext.patches.v6_8.make_webform_standard #2015-11-23
-erpnext.patches.v6_8.move_drop_ship_to_po_items
-erpnext.patches.v6_10.fix_ordered_received_billed
-erpnext.patches.v6_10.fix_jv_total_amount #2015-11-30
-erpnext.patches.v6_10.email_digest_default_quote
-erpnext.patches.v6_10.fix_billed_amount_in_drop_ship_po
-erpnext.patches.v6_10.fix_delivery_status_of_drop_ship_item #2015-12-08
-erpnext.patches.v5_8.tax_rule #2015-12-08
-erpnext.patches.v6_12.set_overdue_tasks
-erpnext.patches.v6_16.update_billing_status_in_dn_and_pr
-erpnext.patches.v6_16.create_manufacturer_records
-execute:frappe.db.sql("update `tabPricing Rule` set title=name where title='' or title is null") #2016-01-27
-erpnext.patches.v6_20.set_party_account_currency_in_orders
-erpnext.patches.v6_19.comment_feed_communication
-erpnext.patches.v6_21.fix_reorder_level
-erpnext.patches.v6_21.rename_material_request_fields
-erpnext.patches.v6_23.update_stopped_status_to_closed
-erpnext.patches.v6_24.set_recurring_id
-erpnext.patches.v6_20x.set_compact_print
-execute:frappe.delete_doc_if_exists("Web Form", "contact") #2016-03-10
-erpnext.patches.v6_20x.remove_fiscal_year_from_holiday_list
-erpnext.patches.v6_24.map_customer_address_to_shipping_address_on_po
-erpnext.patches.v6_27.fix_recurring_order_status
-erpnext.patches.v6_20x.update_product_bundle_description
-erpnext.patches.v7_0.update_party_status #2016-09-22
-erpnext.patches.v7_0.remove_features_setup
-erpnext.patches.v7_0.update_home_page
-execute:frappe.delete_doc_if_exists("Page", "financial-analytics")
-erpnext.patches.v7_0.update_project_in_gl_entry
-execute:frappe.db.sql('update tabQuotation set status="Cancelled" where docstatus=2')
-execute:frappe.rename_doc("DocType", "Payments", "Sales Invoice Payment", force=True)
-erpnext.patches.v7_0.update_mins_to_first_response
-erpnext.patches.v6_20x.repost_valuation_rate_for_negative_inventory
-erpnext.patches.v7_0.migrate_mode_of_payments_v6_to_v7
-erpnext.patches.v7_0.system_settings_setup_complete
-erpnext.patches.v7_0.set_naming_series_for_timesheet #2016-07-27
-execute:frappe.reload_doc('projects', 'doctype', 'project')
-execute:frappe.reload_doc('projects', 'doctype', 'project_user')
-erpnext.patches.v7_0.convert_timelogbatch_to_timesheet
-erpnext.patches.v7_0.convert_timelog_to_timesheet
-erpnext.patches.v7_0.move_timelogbatch_from_salesinvoiceitem_to_salesinvoicetimesheet
-erpnext.patches.v7_0.remove_doctypes_and_reports #2016-10-29
-erpnext.patches.v7_0.update_maintenance_module_in_doctype
-erpnext.patches.v7_0.update_prevdoc_values_for_supplier_quotation_item
-erpnext.patches.v7_0.rename_advance_table_fields
-erpnext.patches.v7_0.rename_salary_components
-erpnext.patches.v7_0.rename_prevdoc_fields
-erpnext.patches.v7_0.rename_time_sheet_doctype
-execute:frappe.delete_doc_if_exists("Report", "Customers Not Buying Since Long Time")
-erpnext.patches.v7_0.make_is_group_fieldtype_as_check
-execute:frappe.reload_doc('projects', 'doctype', 'timesheet') #2016-09-12
-erpnext.patches.v7_1.rename_field_timesheet
-execute:frappe.delete_doc_if_exists("Report", "Employee Holiday Attendance")
-execute:frappe.delete_doc_if_exists("DocType", "Payment Tool")
-execute:frappe.delete_doc_if_exists("DocType", "Payment Tool Detail")
-erpnext.patches.v7_0.setup_account_table_for_expense_claim_type_if_exists
-erpnext.patches.v7_0.migrate_schools_to_erpnext
-erpnext.patches.v7_1.update_lead_source
-erpnext.patches.v6_20x.remove_customer_supplier_roles
-erpnext.patches.v7_0.remove_administrator_role_in_doctypes
-erpnext.patches.v7_0.rename_fee_amount_to_fee_component
-erpnext.patches.v7_0.calculate_total_costing_amount
-erpnext.patches.v7_0.fix_nonwarehouse_ledger_gl_entries_for_transactions
-erpnext.patches.v7_0.remove_old_earning_deduction_doctypes
-erpnext.patches.v7_0.make_guardian
-erpnext.patches.v7_0.update_refdoc_in_landed_cost_voucher
-erpnext.patches.v7_0.set_material_request_type_in_item
-erpnext.patches.v7_0.rename_examination_to_assessment
-erpnext.patches.v7_0.set_portal_settings
-erpnext.patches.v7_0.update_change_amount_account
-erpnext.patches.v7_0.fix_duplicate_icons
-erpnext.patches.v7_0.repost_gle_for_pos_sales_return
-erpnext.patches.v7_1.update_total_billing_hours
-erpnext.patches.v7_1.update_component_type
-erpnext.patches.v7_0.repost_gle_for_pos_sales_return
-erpnext.patches.v7_0.update_missing_employee_in_timesheet
-erpnext.patches.v7_0.update_status_for_timesheet
-erpnext.patches.v7_0.set_party_name_in_payment_entry
-erpnext.patches.v7_1.set_student_guardian
-erpnext.patches.v7_0.update_conversion_factor_in_supplier_quotation_item
-erpnext.patches.v7_1.move_sales_invoice_from_parent_to_child_timesheet
-execute:frappe.db.sql("update `tabTimesheet` ts, `tabEmployee` emp set ts.employee_name = emp.employee_name where emp.name = ts.employee and ts.employee_name is null and ts.employee is not null")
-erpnext.patches.v7_1.fix_link_for_customer_from_lead
-execute:frappe.db.sql("delete from `tabTimesheet Detail` where NOT EXISTS (select name from `tabTimesheet` where name = `tabTimesheet Detail`.parent)")
-erpnext.patches.v7_0.update_mode_of_payment_type
-
-execute:frappe.reload_doctype('Employee') #2016-10-18
-execute:frappe.db.sql("update `tabEmployee` set prefered_contact_email = IFNULL(prefered_contact_email,'') ")
execute:frappe.reload_doc("Payroll", "doctype", "salary_slip")
-execute:frappe.db.sql("update `tabSalary Slip` set posting_date=creation")
-execute:frappe.reload_doc("stock", "doctype", "stock_settings")
-erpnext.patches.v8_0.create_domain_docs #16-05-2017
-erpnext.patches.v7_1.update_portal_roles
-erpnext.patches.v7_1.set_total_amount_currency_in_je
-finally:erpnext.patches.v7_0.update_timesheet_communications
-erpnext.patches.v7_0.update_status_of_zero_amount_sales_order
-erpnext.patches.v7_1.add_field_for_task_dependent
-erpnext.patches.v7_0.repost_bin_qty_and_item_projected_qty
-erpnext.patches.v7_1.set_prefered_contact_email
-execute:frappe.reload_doc('accounts', 'doctype', 'accounts_settings')
-execute:frappe.db.set_value("Accounts Settings", "Accounts Settings", "unlink_payment_on_cancellation_of_invoice", 0)
-execute:frappe.db.sql("update `tabStock Entry` set total_amount = 0 where purpose in('Repack', 'Manufacture')")
-erpnext.patches.v7_1.save_stock_settings
-erpnext.patches.v7_0.repost_gle_for_pi_with_update_stock #2016-11-01
-erpnext.patches.v7_1.add_account_user_role_for_timesheet
-erpnext.patches.v7_0.set_base_amount_in_invoice_payment_table
-erpnext.patches.v7_1.update_invoice_status
-erpnext.patches.v7_0.po_status_issue_for_pr_return
-erpnext.patches.v7_1.update_missing_salary_component_type
-erpnext.patches.v7_1.rename_quality_inspection_field
-erpnext.patches.v7_0.update_autoname_field
-erpnext.patches.v7_1.update_bom_base_currency
-erpnext.patches.v7_0.update_status_of_po_so
-erpnext.patches.v7_1.set_budget_against_as_cost_center
-erpnext.patches.v7_1.set_currency_exchange_date
-erpnext.patches.v7_1.set_sales_person_status
-erpnext.patches.v7_1.repost_stock_for_deleted_bins_for_merging_items
-erpnext.patches.v7_2.update_website_for_variant
-erpnext.patches.v7_2.update_assessment_modules
-erpnext.patches.v7_2.update_doctype_status
-erpnext.patches.v7_2.update_salary_slips
-erpnext.patches.v7_2.delete_fleet_management_module_def
-erpnext.patches.v7_2.contact_address_links
-erpnext.patches.v7_2.mark_students_active
-erpnext.patches.v7_2.set_null_value_to_fields
-erpnext.patches.v7_2.update_guardian_name_in_student_master
-erpnext.patches.v7_2.update_abbr_in_salary_slips
-erpnext.patches.v7_2.rename_evaluation_criteria
-erpnext.patches.v7_2.update_party_type
-erpnext.patches.v7_2.setup_auto_close_settings
-erpnext.patches.v7_2.empty_supplied_items_for_non_subcontracted
-erpnext.patches.v7_2.arrear_leave_encashment_as_salary_component
-erpnext.patches.v7_2.rename_att_date_attendance
-erpnext.patches.v7_2.update_attendance_docstatus
-erpnext.patches.v7_2.make_all_assessment_group
-erpnext.patches.v8_0.repost_reserved_qty_for_multiple_sales_uom
-erpnext.patches.v8_0.addresses_linked_to_lead
-execute:frappe.delete_doc('DocType', 'Purchase Common')
-erpnext.patches.v8_0.update_stock_qty_value_in_purchase_invoice
-erpnext.patches.v8_0.update_supplier_address_in_stock_entry
-erpnext.patches.v8_0.rename_is_sample_item_to_allow_zero_valuation_rate
-erpnext.patches.v8_0.set_null_to_serial_nos_for_disabled_sales_invoices
-erpnext.patches.v8_0.enable_booking_asset_depreciation_automatically
-erpnext.patches.v8_0.set_project_copied_from
-erpnext.patches.v8_0.update_status_as_paid_for_completed_expense_claim
-erpnext.patches.v7_2.stock_uom_in_selling
-erpnext.patches.v8_0.revert_manufacturers_table_from_item
-erpnext.patches.v8_0.disable_instructor_role
-erpnext.patches.v8_0.merge_student_batch_and_student_group
-erpnext.patches.v8_0.rename_total_margin_to_rate_with_margin # 11-05-2017
-erpnext.patches.v8_0.fix_status_for_invoices_with_negative_outstanding
-erpnext.patches.v8_0.make_payments_table_blank_for_non_pos_invoice
-erpnext.patches.v8_0.set_sales_invoice_serial_number_from_delivery_note
-erpnext.patches.v8_0.delete_schools_depricated_doctypes
-erpnext.patches.v8_0.update_customer_pos_id
-erpnext.patches.v8_0.rename_items_in_status_field_of_material_request
-erpnext.patches.v8_0.delete_bin_indexes
-erpnext.patches.v8_0.move_account_head_from_account_to_warehouse_for_inventory
-erpnext.patches.v8_0.change_in_words_varchar_length
-erpnext.patches.v8_0.update_stock_qty_value_in_bom_item
-erpnext.patches.v8_0.update_sales_cost_in_project
-erpnext.patches.v8_0.save_system_settings
-erpnext.patches.v8_1.delete_deprecated_reports
-erpnext.patches.v9_0.remove_subscription_module
-erpnext.patches.v8_7.make_subscription_from_recurring_data
erpnext.patches.v8_1.setup_gst_india #2017-06-27
-execute:frappe.reload_doc('regional', 'doctype', 'gst_hsn_code')
erpnext.patches.v8_1.removed_roles_from_gst_report_non_indian_account #16-08-2018
-erpnext.patches.v8_1.gst_fixes #2017-07-06
-erpnext.patches.v8_0.update_production_orders
-erpnext.patches.v8_1.remove_sales_invoice_from_returned_serial_no
-erpnext.patches.v8_1.allow_invoice_copy_to_edit_after_submit
-erpnext.patches.v8_1.add_hsn_sac_codes
-erpnext.patches.v8_1.update_gst_state #17-07-2017
-erpnext.patches.v8_1.removed_report_support_hours
-erpnext.patches.v8_1.add_indexes_in_transaction_doctypes
-erpnext.patches.v8_3.set_restrict_to_domain_for_module_def
-erpnext.patches.v8_1.update_expense_claim_status
-erpnext.patches.v8_3.update_company_total_sales #2017-08-16
-erpnext.patches.v8_4.make_scorecard_records
-erpnext.patches.v8_1.set_delivery_date_in_so_item #2017-07-28
-erpnext.patches.v8_5.fix_tax_breakup_for_non_invoice_docs
-erpnext.patches.v8_5.remove_quotations_route_in_sidebar
-erpnext.patches.v8_5.update_existing_data_in_project_type
-erpnext.patches.v8_5.set_default_mode_of_payment
-erpnext.patches.v8_5.update_customer_group_in_POS_profile
-erpnext.patches.v8_6.update_timesheet_company_from_PO
-erpnext.patches.v8_6.set_write_permission_for_quotation_for_sales_manager
-erpnext.patches.v8_5.remove_project_type_property_setter
erpnext.patches.v8_7.sync_india_custom_fields
-erpnext.patches.v8_7.fix_purchase_receipt_status
-erpnext.patches.v8_6.rename_bom_update_tool
-erpnext.patches.v8_9.add_setup_progress_actions #08-09-2017 #26-09-2017 #22-11-2017 #15-12-2017
-erpnext.patches.v8_9.rename_company_sales_target_field
-erpnext.patches.v8_8.set_bom_rate_as_per_uom
-erpnext.patches.v8_8.add_new_fields_in_accounts_settings
-erpnext.patches.v8_9.set_default_customer_group
-erpnext.patches.v8_9.delete_gst_doctypes_for_outside_india_accounts
-erpnext.patches.v8_9.set_default_fields_in_variant_settings
-erpnext.patches.v8_9.update_billing_gstin_for_indian_account
-erpnext.patches.v8_9.set_member_party_type
-erpnext.patches.v9_0.add_user_to_child_table_in_pos_profile
-erpnext.patches.v9_0.set_schedule_date_for_material_request_and_purchase_order
-erpnext.patches.v9_0.student_admission_childtable_migrate
-erpnext.patches.v9_0.add_healthcare_domain
-erpnext.patches.v9_0.set_variant_item_description
-erpnext.patches.v9_0.set_uoms_in_variant_field
-erpnext.patches.v9_0.copy_old_fees_field_data
-execute:frappe.delete_doc_if_exists("DocType", "Program Fee")
-erpnext.patches.v9_0.set_pos_profile_name
-erpnext.patches.v9_0.remove_non_existing_warehouse_from_stock_settings
-execute:frappe.delete_doc_if_exists("DocType", "Program Fee")
-erpnext.patches.v8_10.change_default_customer_credit_days
-erpnext.patches.v9_0.update_employee_loan_details
-erpnext.patches.v9_2.delete_healthcare_domain_default_items
-erpnext.patches.v9_1.create_issue_opportunity_type
-erpnext.patches.v9_2.rename_translated_domains_in_en
-erpnext.patches.v9_0.set_shipping_type_for_existing_shipping_rules
-erpnext.patches.v9_0.update_multi_uom_fields_in_material_request
-erpnext.patches.v9_2.repost_reserved_qty_for_production
-erpnext.patches.v9_2.remove_company_from_patient
-erpnext.patches.v9_2.set_item_name_in_production_order
-erpnext.patches.v10_0.update_lft_rgt_for_employee
-erpnext.patches.v9_2.rename_net_weight_in_item_master
-erpnext.patches.v9_2.delete_process_payroll
-erpnext.patches.v10_0.add_agriculture_domain
-erpnext.patches.v10_0.add_non_profit_domain
-erpnext.patches.v10_0.setup_vat_for_uae_and_saudi_arabia #2017-12-28
-erpnext.patches.v10_0.set_primary_contact_for_customer
-erpnext.patches.v10_0.copy_projects_renamed_fields
-erpnext.patches.v10_0.enabled_regional_print_format_based_on_country
-erpnext.patches.v10_0.update_asset_calculate_depreciation
-erpnext.patches.v10_0.add_guardian_role_for_parent_portal
-erpnext.patches.v10_0.set_numeric_ranges_in_template_if_blank
-erpnext.patches.v10_0.update_reserved_qty_for_purchase_order
erpnext.patches.v10_0.fichier_des_ecritures_comptables_for_france
-erpnext.patches.v10_0.update_assessment_plan
-erpnext.patches.v10_0.update_assessment_result
-erpnext.patches.v10_0.set_default_payment_terms_based_on_company
-erpnext.patches.v10_0.update_sales_order_link_to_purchase_order
erpnext.patches.v10_0.rename_price_to_rate_in_pricing_rule
erpnext.patches.v10_0.set_currency_in_pricing_rule
-erpnext.patches.v10_0.set_b2c_limit
erpnext.patches.v10_0.update_translatable_fields
erpnext.patches.v10_0.rename_offer_letter_to_job_offer
execute:frappe.delete_doc('DocType', 'Production Planning Tool', ignore_missing=True)
@@ -496,16 +21,6 @@ erpnext.patches.v10_0.migrate_daily_work_summary_settings_to_daily_work_summary_
erpnext.patches.v10_0.add_default_cash_flow_mappers
erpnext.patches.v11_0.rename_duplicate_item_code_values
erpnext.patches.v11_0.make_quality_inspection_template
-erpnext.patches.v10_0.update_status_for_multiple_source_in_po
-erpnext.patches.v10_0.set_auto_created_serial_no_in_stock_entry
-erpnext.patches.v10_0.update_territory_and_customer_group
-erpnext.patches.v10_0.update_warehouse_address_details
-erpnext.patches.v10_0.update_reserved_qty_for_purchase_order
-erpnext.patches.v10_0.update_hub_connector_domain
-erpnext.patches.v10_0.set_student_party_type
-erpnext.patches.v10_0.update_project_in_sle
-erpnext.patches.v10_0.fix_reserved_qty_for_sub_contract
-erpnext.patches.v10_0.repost_requested_qty_for_non_stock_uom_items
erpnext.patches.v11_0.merge_land_unit_with_location
erpnext.patches.v11_0.add_index_on_nestedset_doctypes
erpnext.patches.v11_0.remove_modules_setup_page
@@ -514,7 +29,6 @@ erpnext.patches.v11_0.update_department_lft_rgt
erpnext.patches.v11_0.add_default_email_template_for_leave
erpnext.patches.v11_0.set_default_email_template_in_hr #08-06-2018
erpnext.patches.v11_0.uom_conversion_data #30-06-2018
-erpnext.patches.v10_0.taxes_issue_with_pos
erpnext.patches.v11_0.update_account_type_in_party_type
erpnext.patches.v11_0.rename_healthcare_doctype_and_fields
erpnext.patches.v11_0.rename_supplier_type_to_supplier_group
@@ -522,8 +36,6 @@ erpnext.patches.v10_1.transfer_subscription_to_auto_repeat
erpnext.patches.v11_0.update_brand_in_item_price
erpnext.patches.v11_0.create_default_success_action
erpnext.patches.v11_0.add_healthcare_service_unit_tree_root
-erpnext.patches.v10_0.set_qty_in_transactions_based_on_serial_no_input
-erpnext.patches.v10_0.show_leaves_of_all_department_members_in_calendar
erpnext.patches.v11_0.rename_field_max_days_allowed
erpnext.patches.v11_0.create_salary_structure_assignments
erpnext.patches.v11_0.rename_health_insurance
@@ -536,7 +48,6 @@ erpnext.patches.v11_0.move_item_defaults_to_child_table_for_multicompany #02-07-
erpnext.patches.v11_0.refactor_erpnext_shopify #2018-09-07
erpnext.patches.v11_0.rename_overproduction_percent_field
erpnext.patches.v11_0.update_backflush_subcontract_rm_based_on_bom
-erpnext.patches.v10_0.update_status_in_purchase_receipt
erpnext.patches.v11_0.inter_state_field_for_gst
erpnext.patches.v11_0.rename_members_with_naming_series #04-06-2018
erpnext.patches.v11_0.set_update_field_and_value_in_workflow_state
@@ -550,13 +61,10 @@ erpnext.patches.v11_0.skip_user_permission_check_for_department
erpnext.patches.v11_0.set_department_for_doctypes
erpnext.patches.v11_0.update_allow_transfer_for_manufacture
erpnext.patches.v11_0.add_item_group_defaults
-erpnext.patches.v10_0.update_address_template_for_india
erpnext.patches.v11_0.add_expense_claim_default_account
execute:frappe.delete_doc("Page", "hub")
erpnext.patches.v11_0.reset_publish_in_hub_for_all_items
erpnext.patches.v11_0.update_hub_url # 2018-08-31 # 2018-09-03
-erpnext.patches.v10_0.set_discount_amount
-erpnext.patches.v10_0.recalculate_gross_margin_for_project
erpnext.patches.v11_0.make_job_card
erpnext.patches.v11_0.redesign_healthcare_billing_work_flow
erpnext.patches.v10_0.delete_hub_documents # 12-08-2018
@@ -570,9 +78,6 @@ execute:frappe.delete_doc_if_exists("Page", "stock-analytics")
execute:frappe.delete_doc_if_exists("Page", "production-analytics")
erpnext.patches.v11_0.ewaybill_fields_gst_india #2018-11-13 #2019-01-09 #2019-04-01 #2019-04-26 #2019-05-03
erpnext.patches.v11_0.drop_column_max_days_allowed
-erpnext.patches.v10_0.update_user_image_in_employee
-erpnext.patches.v10_0.repost_gle_for_purchase_receipts_with_rejected_items
-erpnext.patches.v10_0.allow_operators_in_supplier_scorecard
erpnext.patches.v10_0.item_barcode_childtable_migrate # 16-02-2019
erpnext.patches.v11_0.update_delivery_trip_status
erpnext.patches.v11_0.set_missing_gst_hsn_code
@@ -779,5 +284,10 @@ erpnext.patches.v12_0.add_ewaybill_validity_field
erpnext.patches.v13_0.germany_make_custom_fields
erpnext.patches.v13_0.germany_fill_debtor_creditor_number
erpnext.patches.v13_0.set_pos_closing_as_failed
+execute:frappe.rename_doc("Workspace", "Loan Management", "Loans", force=True)
erpnext.patches.v13_0.update_timesheet_changes
erpnext.patches.v13_0.set_training_event_attendance
+erpnext.patches.v13_0.rename_issue_status_hold_to_on_hold
+erpnext.patches.v13_0.bill_for_rejected_quantity_in_purchase_invoice
+erpnext.patches.v13_0.update_job_card_details
+erpnext.patches.v13_0.update_level_in_bom #1234sswef
diff --git a/erpnext/patches/repair_tools/set_stock_balance_as_per_serial_no.py b/erpnext/patches/repair_tools/set_stock_balance_as_per_serial_no.py
deleted file mode 100644
index 5a421d146fe..00000000000
--- a/erpnext/patches/repair_tools/set_stock_balance_as_per_serial_no.py
+++ /dev/null
@@ -1,13 +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():
- from erpnext.stock.stock_balance import set_stock_balance_as_per_serial_no
- frappe.db.auto_commit_on_many_writes = 1
-
- set_stock_balance_as_per_serial_no()
-
- frappe.db.auto_commit_on_many_writes = 0
diff --git a/erpnext/patches/v10_0/add_agriculture_domain.py b/erpnext/patches/v10_0/add_agriculture_domain.py
deleted file mode 100644
index c18e69f3e6c..00000000000
--- a/erpnext/patches/v10_0/add_agriculture_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 = 'Agriculture'
- 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/v10_0/add_guardian_role_for_parent_portal.py b/erpnext/patches/v10_0/add_guardian_role_for_parent_portal.py
deleted file mode 100644
index 0b891f21f44..00000000000
--- a/erpnext/patches/v10_0/add_guardian_role_for_parent_portal.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():
- # create guardian role
- if not frappe.get_value('Role', dict(role_name='Guardian')):
- frappe.get_doc({
- 'doctype': 'Role',
- 'role_name': 'Guardian',
- 'desk_access': 0,
- 'restrict_to_domain': 'Education'
- }).insert(ignore_permissions=True)
-
- # set guardian roles in already created users
- if frappe.db.exists("Doctype", "Guardian"):
- for user in frappe.db.sql_list("""select u.name from `tabUser` u , `tabGuardian` g where g.email_address = u.name"""):
- user = frappe.get_doc('User', user)
- user.flags.ignore_validate = True
- user.flags.ignore_mandatory = True
- user.save()
diff --git a/erpnext/patches/v10_0/add_non_profit_domain.py b/erpnext/patches/v10_0/add_non_profit_domain.py
deleted file mode 100644
index b03d6695154..00000000000
--- a/erpnext/patches/v10_0/add_non_profit_domain.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
-
-def execute():
- domain = 'Non Profit'
- if not frappe.db.exists('Domain', domain):
- frappe.get_doc({
- 'doctype': 'Domain',
- 'domain': domain
- }).insert(ignore_permissions=True)
-
- frappe.get_doc({
- 'doctype': 'Role',
- 'role_name': 'Non Profit Portal User',
- 'desk_access': 0,
- 'restrict_to_domain': domain
- }).insert(ignore_permissions=True)
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/allow_operators_in_supplier_scorecard.py b/erpnext/patches/v10_0/allow_operators_in_supplier_scorecard.py
deleted file mode 100644
index 827f9bc94fa..00000000000
--- a/erpnext/patches/v10_0/allow_operators_in_supplier_scorecard.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (c) 2019, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc('buying', 'doctype', 'supplier_scorecard_criteria')
- frappe.reload_doc('buying', 'doctype', 'supplier_scorecard_scoring_criteria')
- frappe.reload_doc('buying', 'doctype', 'supplier_scorecard')
-
- for criteria in frappe.get_all('Supplier Scorecard Criteria', fields=['name', 'formula'], limit_page_length=None):
- frappe.db.set_value('Supplier Scorecard Criteria', criteria.name,
- 'formula', criteria.formula.replace('<','<').replace('>','>'))
-
- for criteria in frappe.get_all('Supplier Scorecard Scoring Criteria', fields=['name', 'formula'], limit_page_length=None):
- if criteria.formula: # not mandatory
- frappe.db.set_value('Supplier Scorecard Scoring Criteria', criteria.name,
- 'formula', criteria.formula.replace('<','<').replace('>','>'))
-
- for sc in frappe.get_all('Supplier Scorecard', fields=['name', 'weighting_function'], limit_page_length=None):
- frappe.db.set_value('Supplier Scorecard', sc.name, 'weighting_function',
- sc.weighting_function.replace('<','<').replace('>','>'))
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/copy_projects_renamed_fields.py b/erpnext/patches/v10_0/copy_projects_renamed_fields.py
deleted file mode 100644
index 80db3bdd1ee..00000000000
--- a/erpnext/patches/v10_0/copy_projects_renamed_fields.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():
- """ copy data from old fields to new """
- frappe.reload_doc("projects", "doctype", "project")
-
- if frappe.db.has_column('Project', 'total_sales_cost'):
- rename_field('Project', "total_sales_cost", "total_sales_amount")
-
- if frappe.db.has_column('Project', 'total_billing_amount'):
- rename_field('Project', "total_billing_amount", "total_billable_amount")
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/enabled_regional_print_format_based_on_country.py b/erpnext/patches/v10_0/enabled_regional_print_format_based_on_country.py
deleted file mode 100644
index 38b04cebc2e..00000000000
--- a/erpnext/patches/v10_0/enabled_regional_print_format_based_on_country.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():
- print_format_mapper = {
- 'India': ['GST POS Invoice', 'GST Tax Invoice'],
- 'Saudi Arabia': ['Simplified Tax Invoice', 'Detailed Tax Invoice', 'Tax Invoice'],
- 'United Arab Emirates': ['Simplified Tax Invoice', 'Detailed Tax Invoice', 'Tax Invoice']
- }
-
- frappe.db.sql(""" update `tabPrint Format` set disabled = 1 where name
- in ('GST POS Invoice', 'GST Tax Invoice', 'Simplified Tax Invoice', 'Detailed Tax Invoice')""")
-
- for d in frappe.get_all('Company', fields = ["country"],
- filters={'country': ('in', ['India', 'Saudi Arabia', 'United Arab Emirates'])}):
- if print_format_mapper.get(d.country):
- print_formats = print_format_mapper.get(d.country)
- frappe.db.sql(""" update `tabPrint Format` set disabled = 0
- where name in (%s)""" % ", ".join(["%s"]*len(print_formats)), tuple(print_formats))
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/fix_reserved_qty_for_sub_contract.py b/erpnext/patches/v10_0/fix_reserved_qty_for_sub_contract.py
deleted file mode 100644
index c0a9e5eb5bc..00000000000
--- a/erpnext/patches/v10_0/fix_reserved_qty_for_sub_contract.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
-from erpnext.stock.utils import get_bin
-
-def execute():
- frappe.reload_doc("stock", "doctype", "bin")
- frappe.reload_doc("buying", "doctype", "purchase_order_item_supplied")
- for d in frappe.db.sql("""
- select distinct rm_item_code, reserve_warehouse
- from `tabPurchase Order Item Supplied`
- where docstatus=1 and reserve_warehouse is not null and reserve_warehouse != ''"""):
-
- try:
- bin_doc = get_bin(d[0], d[1])
- bin_doc.update_reserved_qty_for_sub_contracting()
- except:
- pass
-
- for d in frappe.db.sql("""select distinct item_code, source_warehouse
- from `tabWork Order Item`
- where docstatus=1 and transferred_qty > required_qty
- and source_warehouse is not null and source_warehouse != ''""", as_list=1):
-
- try:
- bin_doc = get_bin(d[0], d[1])
- bin_doc.update_reserved_qty_for_production()
- except:
- pass
diff --git a/erpnext/patches/v10_0/recalculate_gross_margin_for_project.py b/erpnext/patches/v10_0/recalculate_gross_margin_for_project.py
deleted file mode 100644
index 6d461f3bc97..00000000000
--- a/erpnext/patches/v10_0/recalculate_gross_margin_for_project.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('projects', 'doctype', 'project')
- for d in frappe.db.sql(""" select name from `tabProject` where
- ifnull(total_consumed_material_cost, 0 ) > 0 and ifnull(total_billed_amount, 0) > 0""", as_dict=1):
- doc = frappe.get_doc("Project", d.name)
- doc.calculate_gross_margin()
- doc.db_set('gross_margin', doc.gross_margin)
- doc.db_set('per_gross_margin', doc.per_gross_margin)
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/rename_schools_to_education.py b/erpnext/patches/v10_0/rename_schools_to_education.py
deleted file mode 100644
index 85c25a89434..00000000000
--- a/erpnext/patches/v10_0/rename_schools_to_education.py
+++ /dev/null
@@ -1,32 +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():
- # rename the School module as Education
-
- # rename the school module
- if frappe.db.exists('Module Def', 'Schools') and not frappe.db.exists('Module Def', 'Education'):
- frappe.rename_doc("Module Def", "Schools", "Education")
-
- # delete the school module
- if frappe.db.exists('Module Def', 'Schools') and frappe.db.exists('Module Def', 'Education'):
- frappe.db.sql("""delete from `tabModule Def` where module_name = 'Schools'""")
-
-
- # rename "School Settings" to the "Education Settings
- if frappe.db.exists('DocType', 'School Settings'):
- frappe.rename_doc("DocType", "School Settings", "Education Settings", force=True)
- frappe.reload_doc("education", "doctype", "education_settings")
-
- # delete the discussion web form if exists
- if frappe.db.exists('Web Form', 'Discussion'):
- frappe.db.sql("""delete from `tabWeb Form` where name = 'discussion'""")
-
- # rename the select option field from "School Bus" to "Institute's Bus"
- frappe.reload_doc("education", "doctype", "Program Enrollment")
- if "mode_of_transportation" in frappe.db.get_table_columns("Program Enrollment"):
- frappe.db.sql("""update `tabProgram Enrollment` set mode_of_transportation = "Institute's Bus"
- where mode_of_transportation = "School Bus" """)
diff --git a/erpnext/patches/v10_0/repost_gle_for_purchase_receipts_with_rejected_items.py b/erpnext/patches/v10_0/repost_gle_for_purchase_receipts_with_rejected_items.py
deleted file mode 100644
index e6546e386b9..00000000000
--- a/erpnext/patches/v10_0/repost_gle_for_purchase_receipts_with_rejected_items.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (c) 2017, Frappe and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe, erpnext
-
-def execute():
- for company in frappe.get_all("Company"):
- if not erpnext.is_perpetual_inventory_enabled(company.name):
- continue
-
- acc_frozen_upto = frappe.db.get_value("Accounts Settings", None, "acc_frozen_upto") or "1900-01-01"
- pr_with_rejected_warehouse = frappe.db.sql("""
- select pr.name
- from `tabPurchase Receipt` pr, `tabPurchase Receipt Item` pr_item
- where pr.name = pr_item.parent
- and pr.posting_date > %s
- and pr.docstatus=1
- and pr.company = %s
- and pr_item.rejected_qty > 0
- """, (acc_frozen_upto, company.name), as_dict=1)
-
- for d in pr_with_rejected_warehouse:
- doc = frappe.get_doc("Purchase Receipt", d.name)
-
- doc.docstatus = 2
- doc.make_gl_entries_on_cancel()
-
-
- # update gl entries for submit state of PR
- doc.docstatus = 1
- doc.make_gl_entries()
diff --git a/erpnext/patches/v10_0/repost_requested_qty_for_non_stock_uom_items.py b/erpnext/patches/v10_0/repost_requested_qty_for_non_stock_uom_items.py
deleted file mode 100644
index 4fe4e97cf5b..00000000000
--- a/erpnext/patches/v10_0/repost_requested_qty_for_non_stock_uom_items.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2019, 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():
- from erpnext.stock.stock_balance import update_bin_qty, get_indented_qty
-
- count=0
- for item_code, warehouse in frappe.db.sql("""select distinct item_code, warehouse
- from `tabMaterial Request Item` where docstatus = 1 and stock_uom<>uom"""):
- try:
- count += 1
- update_bin_qty(item_code, warehouse, {
- "indented_qty": get_indented_qty(item_code, warehouse),
- })
- if count % 200 == 0:
- frappe.db.commit()
- except:
- frappe.db.rollback()
diff --git a/erpnext/patches/v10_0/set_auto_created_serial_no_in_stock_entry.py b/erpnext/patches/v10_0/set_auto_created_serial_no_in_stock_entry.py
deleted file mode 100644
index c6470f21d7c..00000000000
--- a/erpnext/patches/v10_0/set_auto_created_serial_no_in_stock_entry.py
+++ /dev/null
@@ -1,56 +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():
- serialised_items = [d.name for d in frappe.get_all("Item", filters={"has_serial_no": 1})]
-
- if not serialised_items:
- return
-
- for dt in ["Stock Entry Detail", "Purchase Receipt Item", "Purchase Invoice Item"]:
- cond = ""
- if dt=="Purchase Invoice Item":
- cond = """ and parent in (select name from `tabPurchase Invoice`
- where `tabPurchase Invoice`.name = `tabPurchase Invoice Item`.parent and update_stock=1)"""
-
- item_rows = frappe.db.sql("""
- select name
- from `tab{0}`
- where conversion_factor != 1
- and docstatus = 1
- and ifnull(serial_no, '') = ''
- and item_code in ({1})
- {2}
- """.format(dt, ', '.join(['%s']*len(serialised_items)), cond), tuple(serialised_items))
-
- if item_rows:
- sle_serial_nos = dict(frappe.db.sql("""
- select voucher_detail_no, serial_no
- from `tabStock Ledger Entry`
- where ifnull(serial_no, '') != ''
- and voucher_detail_no in (%s)
- """.format(', '.join(['%s']*len(item_rows))),
- tuple([d[0] for d in item_rows])))
-
- batch_size = 100
- for i in range(0, len(item_rows), batch_size):
- batch_item_rows = item_rows[i:i + batch_size]
- when_then = []
- for item_row in batch_item_rows:
-
- when_then.append('WHEN `name` = "{row_name}" THEN "{value}"'.format(
- row_name=item_row[0],
- value=sle_serial_nos.get(item_row[0])))
-
- frappe.db.sql("""
- update
- `tab{doctype}`
- set
- serial_no = CASE {when_then_cond} ELSE `serial_no` END
- """.format(
- doctype = dt,
- when_then_cond=" ".join(when_then)
- ))
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/set_b2c_limit.py b/erpnext/patches/v10_0/set_b2c_limit.py
deleted file mode 100644
index 5d964e681ab..00000000000
--- a/erpnext/patches/v10_0/set_b2c_limit.py
+++ /dev/null
@@ -1,12 +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("regional", "doctype", "gst_settings")
- frappe.reload_doc("accounts", "doctype", "gst_account")
- gst_settings = frappe.get_doc("GST Settings")
- gst_settings.b2c_limit = 250000
- gst_settings.save()
diff --git a/erpnext/patches/v10_0/set_default_payment_terms_based_on_company.py b/erpnext/patches/v10_0/set_default_payment_terms_based_on_company.py
deleted file mode 100644
index a90e096390a..00000000000
--- a/erpnext/patches/v10_0/set_default_payment_terms_based_on_company.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from erpnext.patches.v8_10.change_default_customer_credit_days import make_payment_term, make_template
-
-def execute():
- for dt in ("Company", "Customer Group"):
- frappe.reload_doc("setup", "doctype", frappe.scrub(dt))
-
- credit_records = 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(dt), as_dict=1)
-
- for d in credit_records:
- template = create_payment_terms_template(d)
-
- frappe.db.sql("""
- update `tab{0}`
- set `payment_terms` = %s
- where name = %s
- """.format(dt), (template.name, d.name))
-
-def create_payment_terms_template(data):
- if data.credit_days_based_on == "Fixed Days":
- pyt_template_name = 'Default Payment Term - N{0}'.format(data.credit_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(data.credit_days, data.credit_days_based_on)
- template = make_template(payment_term)
- else:
- template = frappe.get_doc("Payment Terms Template", pyt_template_name)
- return template
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/set_discount_amount.py b/erpnext/patches/v10_0/set_discount_amount.py
deleted file mode 100644
index d5e2c5a84b8..00000000000
--- a/erpnext/patches/v10_0/set_discount_amount.py
+++ /dev/null
@@ -1,35 +0,0 @@
-from __future__ import unicode_literals
-
-import frappe
-
-def execute():
- frappe.reload_doc("accounts", "doctype", "sales_invoice_item")
- frappe.reload_doc('accounts', 'doctype', 'purchase_invoice_item')
- frappe.reload_doc('buying', 'doctype', 'purchase_order_item')
- frappe.reload_doc('buying', 'doctype', 'supplier_quotation_item')
- frappe.reload_doc('selling', 'doctype', 'sales_order_item')
- frappe.reload_doc('selling', 'doctype', 'quotation_item')
- frappe.reload_doc('stock', 'doctype', 'delivery_note_item')
- frappe.reload_doc('stock', 'doctype', 'purchase_receipt_item')
-
- selling_doctypes = ["Sales Order Item", "Sales Invoice Item", "Delivery Note Item", "Quotation Item"]
- buying_doctypes = ["Purchase Order Item", "Purchase Invoice Item", "Purchase Receipt Item", "Supplier Quotation Item"]
-
- for doctype in selling_doctypes:
- frappe.db.sql('''
- UPDATE
- `tab%s`
- SET
- discount_amount = if(rate_with_margin > 0, rate_with_margin, price_list_rate) * discount_percentage / 100
- WHERE
- discount_percentage > 0
- ''' % (doctype))
- for doctype in buying_doctypes:
- frappe.db.sql('''
- UPDATE
- `tab%s`
- SET
- discount_amount = price_list_rate * discount_percentage / 100
- WHERE
- discount_percentage > 0
- ''' % (doctype))
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/set_numeric_ranges_in_template_if_blank.py b/erpnext/patches/v10_0/set_numeric_ranges_in_template_if_blank.py
deleted file mode 100644
index 6825f19d74d..00000000000
--- a/erpnext/patches/v10_0/set_numeric_ranges_in_template_if_blank.py
+++ /dev/null
@@ -1,35 +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():
- item_numeric_attributes = frappe.db.sql("""
- select name, numeric_values, from_range, to_range, increment
- from `tabItem Attribute`
- where numeric_values = 1
- """, as_dict=1)
-
- for d in item_numeric_attributes:
- frappe.db.sql("""
- update `tabItem Variant Attribute`
- set
- from_range = CASE
- WHEN from_range = 0 THEN %(from_range)s
- ELSE from_range
- END,
- to_range = CASE
- WHEN to_range = 0 THEN %(to_range)s
- ELSE to_range
- END,
- increment = CASE
- WHEN increment = 0 THEN %(increment)s
- ELSE increment
- END,
- numeric_values = %(numeric_values)s
- where
- attribute = %(name)s
- and exists(select name from tabItem
- where name=`tabItem Variant Attribute`.parent and has_variants=1)
- """, d)
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/set_primary_contact_for_customer.py b/erpnext/patches/v10_0/set_primary_contact_for_customer.py
deleted file mode 100644
index ae0b31c21f6..00000000000
--- a/erpnext/patches/v10_0/set_primary_contact_for_customer.py
+++ /dev/null
@@ -1,21 +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('Customer')
-
- frappe.db.sql("""
- update
- `tabCustomer`, (
- select `tabContact`.name, `tabContact`.mobile_no, `tabContact`.email_id,
- `tabDynamic Link`.link_name from `tabContact`, `tabDynamic Link`
- where `tabContact`.name = `tabDynamic Link`.parent and
- `tabDynamic Link`.link_doctype = 'Customer' and `tabContact`.is_primary_contact = 1
- ) as contact
- set
- `tabCustomer`.customer_primary_contact = contact.name,
- `tabCustomer`.mobile_no = contact.mobile_no, `tabCustomer`.email_id = contact.email_id
- where `tabCustomer`.name = contact.link_name""")
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/set_qty_in_transactions_based_on_serial_no_input.py b/erpnext/patches/v10_0/set_qty_in_transactions_based_on_serial_no_input.py
deleted file mode 100644
index 083b7f4b201..00000000000
--- a/erpnext/patches/v10_0/set_qty_in_transactions_based_on_serial_no_input.py
+++ /dev/null
@@ -1,21 +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", "stock_settings")
-
- ss = frappe.get_doc("Stock Settings")
- ss.set_qty_in_transactions_based_on_serial_no_input = 1
-
- if ss.default_warehouse \
- and not frappe.db.exists("Warehouse", ss.default_warehouse):
- ss.default_warehouse = None
-
- if ss.stock_uom and not frappe.db.exists("UOM", ss.stock_uom):
- ss.stock_uom = None
-
- ss.flags.ignore_mandatory = True
- ss.save()
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/set_student_party_type.py b/erpnext/patches/v10_0/set_student_party_type.py
deleted file mode 100644
index 08376ae894b..00000000000
--- a/erpnext/patches/v10_0/set_student_party_type.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- if not frappe.db.exists("Party Type", "Student"):
- party = frappe.new_doc("Party Type")
- party.party_type = "Student"
- party.save()
diff --git a/erpnext/patches/v10_0/setup_vat_for_uae_and_saudi_arabia.py b/erpnext/patches/v10_0/setup_vat_for_uae_and_saudi_arabia.py
deleted file mode 100644
index a8d90499d88..00000000000
--- a/erpnext/patches/v10_0/setup_vat_for_uae_and_saudi_arabia.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
-from erpnext.setup.doctype.company.company import install_country_fixtures
-
-def execute():
- frappe.reload_doc("accounts", "doctype", "account")
- frappe.reload_doc("accounts", "doctype", "payment_schedule")
- for d in frappe.get_all('Company',
- filters={'country': ('in', ['Saudi Arabia', 'United Arab Emirates'])}):
- install_country_fixtures(d.name)
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/show_leaves_of_all_department_members_in_calendar.py b/erpnext/patches/v10_0/show_leaves_of_all_department_members_in_calendar.py
deleted file mode 100644
index 7e2ff7a8a7f..00000000000
--- a/erpnext/patches/v10_0/show_leaves_of_all_department_members_in_calendar.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc("hr", "doctype", "hr_settings")
- frappe.db.set_value("HR Settings", None, "show_leaves_of_all_department_members_in_calendar", 1)
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/taxes_issue_with_pos.py b/erpnext/patches/v10_0/taxes_issue_with_pos.py
deleted file mode 100644
index 2a3275ac2ce..00000000000
--- a/erpnext/patches/v10_0/taxes_issue_with_pos.py
+++ /dev/null
@@ -1,26 +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 d in frappe.get_all('Sales Invoice', fields=["name"],
- filters = {'is_pos':1, 'docstatus': 1, 'creation': ('>', '2018-04-23')}):
- doc = frappe.get_doc('Sales Invoice', d.name)
- if (not doc.taxes and doc.taxes_and_charges and doc.pos_profile and doc.outstanding_amount != 0 and
- frappe.db.get_value('POS Profile', doc.pos_profile, 'taxes_and_charges', cache=True) == doc.taxes_and_charges):
-
- doc.append_taxes_from_master()
- doc.calculate_taxes_and_totals()
- for d in doc.taxes:
- d.db_update()
-
- doc.db_update()
-
- delete_gle_for_voucher(doc.name)
- doc.make_gl_entries()
-
-def delete_gle_for_voucher(voucher_no):
- frappe.db.sql("""delete from `tabGL Entry` where voucher_no = %(voucher_no)s""",
- {'voucher_no': voucher_no})
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/update_address_template_for_india.py b/erpnext/patches/v10_0/update_address_template_for_india.py
deleted file mode 100644
index 1ddca937609..00000000000
--- a/erpnext/patches/v10_0/update_address_template_for_india.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
-from erpnext.regional.address_template.setup import set_up_address_templates
-
-def execute():
- if frappe.db.get_value('Company', {'country': 'India'}, 'name'):
- address_template = frappe.db.get_value('Address Template', 'India', 'template')
- if not address_template or "gstin" not in address_template:
- set_up_address_templates(default_country='India')
diff --git a/erpnext/patches/v10_0/update_assessment_plan.py b/erpnext/patches/v10_0/update_assessment_plan.py
deleted file mode 100644
index 174623c1a48..00000000000
--- a/erpnext/patches/v10_0/update_assessment_plan.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_doc('education', 'doctype', 'assessment_plan')
-
- frappe.db.sql("""
- UPDATE `tabAssessment Plan` as ap
- INNER JOIN `tabStudent Group` as sg ON sg.name = ap.student_group
- SET ap.academic_term = sg.academic_term,
- ap.academic_year = sg.academic_year,
- ap.program = sg.program
- WHERE ap.docstatus = 1
- """)
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/update_assessment_result.py b/erpnext/patches/v10_0/update_assessment_result.py
deleted file mode 100644
index 96218db972c..00000000000
--- a/erpnext/patches/v10_0/update_assessment_result.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
-
-def execute():
- frappe.reload_doc('education', 'doctype', 'assessment_result')
-
- frappe.db.sql("""
- UPDATE `tabAssessment Result` AS ar
- INNER JOIN `tabAssessment Plan` AS ap ON ap.name = ar.assessment_plan
- SET ar.academic_term = ap.academic_term,
- ar.academic_year = ap.academic_year,
- ar.program = ap.program,
- ar.course = ap.course,
- ar.assessment_group = ap.assessment_group,
- ar.student_group = ap.student_group
- WHERE ap.docstatus = 1
- """)
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/update_asset_calculate_depreciation.py b/erpnext/patches/v10_0/update_asset_calculate_depreciation.py
deleted file mode 100644
index b947a40b4a3..00000000000
--- a/erpnext/patches/v10_0/update_asset_calculate_depreciation.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc('assets', 'doctype', 'asset')
- frappe.reload_doc('assets', 'doctype', 'depreciation_schedule')
-
- frappe.db.sql("""
- update tabAsset a
- set calculate_depreciation = 1
- where exists(select ds.name from `tabDepreciation Schedule` ds where ds.parent=a.name)
- """)
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/update_hub_connector_domain.py b/erpnext/patches/v10_0/update_hub_connector_domain.py
deleted file mode 100644
index baf580a3699..00000000000
--- a/erpnext/patches/v10_0/update_hub_connector_domain.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- if frappe.db.table_exists("Data Migration Connector"):
- frappe.db.sql("""
- UPDATE `tabData Migration Connector`
- SET hostname = 'https://hubmarket.org'
- WHERE connector_name = 'Hub Connector'
- """)
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/update_lft_rgt_for_employee.py b/erpnext/patches/v10_0/update_lft_rgt_for_employee.py
deleted file mode 100644
index 46ca786e0d6..00000000000
--- a/erpnext/patches/v10_0/update_lft_rgt_for_employee.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe.utils.nestedset import rebuild_tree
-
-def execute():
- """ assign lft and rgt appropriately """
- frappe.reload_doc("hr", "doctype", "employee")
-
- rebuild_tree("Employee", "reports_to")
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/update_project_in_sle.py b/erpnext/patches/v10_0/update_project_in_sle.py
deleted file mode 100644
index 08c64f18d80..00000000000
--- a/erpnext/patches/v10_0/update_project_in_sle.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():
- for doctype in ['Sales Invoice', 'Delivery Note', 'Stock Entry']:
- frappe.db.sql(""" update
- `tabStock Ledger Entry` sle, `tab{0}` parent_doc
- set
- sle.project = parent_doc.project
- where
- sle.voucher_no = parent_doc.name and sle.voucher_type = %s and sle.project is null
- and parent_doc.project is not null and parent_doc.project != ''""".format(doctype), doctype)
diff --git a/erpnext/patches/v10_0/update_reserved_qty_for_purchase_order.py b/erpnext/patches/v10_0/update_reserved_qty_for_purchase_order.py
deleted file mode 100644
index 7b2c36698a2..00000000000
--- a/erpnext/patches/v10_0/update_reserved_qty_for_purchase_order.py
+++ /dev/null
@@ -1,53 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from erpnext.stock.utils import get_bin
-
-def execute():
- po_item = list(frappe.db.sql(("""
- select distinct po.name as poname, poitem.rm_item_code as rm_item_code, po.company
- from `tabPurchase Order` po, `tabPurchase Order Item Supplied` poitem
- where po.name = poitem.parent
- and po.is_subcontracted = "Yes"
- and po.docstatus = 1"""), as_dict=1))
- if not po_item:
- return
-
- frappe.reload_doc("stock", "doctype", "bin")
- frappe.reload_doc("buying", "doctype", "purchase_order_item_supplied")
- company_warehouse = frappe._dict(frappe.db.sql("""select company, min(name) from `tabWarehouse`
- where is_group = 0 group by company"""))
-
- items = list(set([d.rm_item_code for d in po_item]))
- item_wh = frappe._dict(frappe.db.sql("""select item_code, default_warehouse
- from `tabItem` where name in ({0})""".format(", ".join(["%s"] * len(items))), items))
-
- # Update reserved warehouse
- for item in po_item:
- reserve_warehouse = get_warehouse(item.rm_item_code, item.company, company_warehouse, item_wh)
- frappe.db.sql("""update `tabPurchase Order Item Supplied`
- set reserve_warehouse = %s
- where parent = %s and rm_item_code = %s
- """, (reserve_warehouse, item["poname"], item["rm_item_code"]))
-
- # Update bin
- item_wh_bin = frappe.db.sql(("""
- select distinct poitemsup.rm_item_code as rm_item_code,
- poitemsup.reserve_warehouse as reserve_warehouse
- from `tabPurchase Order` po, `tabPurchase Order Item Supplied` poitemsup
- where po.name = poitemsup.parent
- and po.is_subcontracted = "Yes"
- and po.docstatus = 1"""), as_dict=1)
- for d in item_wh_bin:
- try:
- stock_bin = get_bin(d["rm_item_code"], d["reserve_warehouse"])
- stock_bin.update_reserved_qty_for_sub_contracting()
- except:
- pass
-
-def get_warehouse(item_code, company, company_warehouse, item_wh):
- reserve_warehouse = item_wh.get(item_code)
- if frappe.db.get_value("Warehouse", reserve_warehouse, "company") != company:
- reserve_warehouse = None
- if not reserve_warehouse:
- reserve_warehouse = company_warehouse.get(company)
- return reserve_warehouse
diff --git a/erpnext/patches/v10_0/update_sales_order_link_to_purchase_order.py b/erpnext/patches/v10_0/update_sales_order_link_to_purchase_order.py
deleted file mode 100644
index b4f58384bfe..00000000000
--- a/erpnext/patches/v10_0/update_sales_order_link_to_purchase_order.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc("buying", "doctype", "supplier_quotation_item")
-
- for doctype in ['Purchase Order','Supplier Quotation']:
- frappe.db.sql("""
- Update
- `tab{doctype} Item`, `tabMaterial Request Item`
- set
- `tab{doctype} Item`.sales_order = `tabMaterial Request Item`.sales_order
- where
- `tab{doctype} Item`.material_request= `tabMaterial Request Item`.parent
- and `tab{doctype} Item`.material_request_item = `tabMaterial Request Item`.name
- and `tabMaterial Request Item`.sales_order is not null""".format(doctype=doctype))
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/update_status_for_multiple_source_in_po.py b/erpnext/patches/v10_0/update_status_for_multiple_source_in_po.py
deleted file mode 100644
index fd3be08b89b..00000000000
--- a/erpnext/patches/v10_0/update_status_for_multiple_source_in_po.py
+++ /dev/null
@@ -1,40 +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():
-
-
- # update the sales order item in the material request
- frappe.reload_doc('stock', 'doctype', 'material_request_item')
- frappe.db.sql('''update `tabMaterial Request Item` mri, `tabSales Order Item` soi
- set mri.sales_order_item = soi.name
- where ifnull(mri.sales_order, "")!="" and soi.parent=mri.sales_order
- and soi.item_code=mri.item_code and mri.docstatus=1
- ''')
-
- # update the sales order item in the purchase order
- frappe.db.sql('''update `tabPurchase Order Item` poi, `tabSales Order Item` soi
- set poi.sales_order_item = soi.name
- where ifnull(poi.sales_order, "")!="" and soi.parent=poi.sales_order
- and soi.item_code=poi.item_code and poi.docstatus = 1
- ''')
-
- # Update the status in material request and sales order
- po_list = frappe.db.sql('''
- select parent from `tabPurchase Order Item` where ifnull(material_request, "")!="" and
- ifnull(sales_order, "")!="" and docstatus=1
- ''',as_dict=1)
-
- for po in list(set([d.get("parent") for d in po_list if d.get("parent")])):
- try:
- po_doc = frappe.get_doc("Purchase Order", po)
-
- # update the so in the status updater
- po_doc.update_status_updater()
- po_doc.update_qty(update_modified=False)
-
- except Exception:
- pass
diff --git a/erpnext/patches/v10_0/update_status_in_purchase_receipt.py b/erpnext/patches/v10_0/update_status_in_purchase_receipt.py
deleted file mode 100644
index a0bdd9e2cc1..00000000000
--- a/erpnext/patches/v10_0/update_status_in_purchase_receipt.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc("stock", "doctype", "purchase_receipt")
- frappe.db.sql('''
- UPDATE `tabPurchase Receipt` SET status = "Completed" WHERE per_billed = 100 AND docstatus = 1
- ''')
\ No newline at end of file
diff --git a/erpnext/patches/v10_0/update_territory_and_customer_group.py b/erpnext/patches/v10_0/update_territory_and_customer_group.py
deleted file mode 100644
index 7f3dae991d2..00000000000
--- a/erpnext/patches/v10_0/update_territory_and_customer_group.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe.model.rename_doc import get_fetch_fields
-
-def execute():
- ignore_doctypes = ["Lead", "Opportunity", "POS Profile", "Tax Rule", "Pricing Rule"]
- customers = frappe.get_all('Customer', fields=["name", "customer_group"])
- customer_group_fetch = get_fetch_fields('Customer', 'Customer Group', ignore_doctypes)
-
- batch_size = 1000
- for i in range(0, len(customers), batch_size):
- batch_customers = customers[i:i + batch_size]
- for d in customer_group_fetch:
- when_then = []
- for customer in batch_customers:
- value = frappe.db.escape(frappe.as_unicode(customer.get("customer_group")))
-
- when_then.append('''
- WHEN `%s` = %s and %s != %s
- THEN %s
- '''%(d["master_fieldname"], frappe.db.escape(frappe.as_unicode(customer.name)),
- d["linked_to_fieldname"], value, value))
-
- frappe.db.sql("""
- update
- `tab%s`
- set
- %s = CASE %s ELSE `%s` END
- """%(d['doctype'], d.linked_to_fieldname, " ".join(when_then), d.linked_to_fieldname))
diff --git a/erpnext/patches/v10_0/update_user_image_in_employee.py b/erpnext/patches/v10_0/update_user_image_in_employee.py
deleted file mode 100644
index 72d5d2a857b..00000000000
--- a/erpnext/patches/v10_0/update_user_image_in_employee.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('hr', 'doctype', 'employee')
-
- frappe.db.sql("""
- UPDATE
- `tabEmployee`, `tabUser`
- SET
- `tabEmployee`.image = `tabUser`.user_image
- WHERE
- `tabEmployee`.user_id = `tabUser`.name and
- `tabEmployee`.user_id is not null and
- `tabEmployee`.user_id != '' and `tabEmployee`.image is null
- """)
diff --git a/erpnext/patches/v10_0/update_warehouse_address_details.py b/erpnext/patches/v10_0/update_warehouse_address_details.py
deleted file mode 100644
index b982b9a662f..00000000000
--- a/erpnext/patches/v10_0/update_warehouse_address_details.py
+++ /dev/null
@@ -1,37 +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():
- warehouse = frappe.db.sql("""select name, email_id, phone_no, mobile_no, address_line_1,
- address_line_2, city, state, pin from `tabWarehouse` where ifnull(address_line_1, '') != ''
- or ifnull(mobile_no, '') != ''
- or ifnull(email_id, '') != '' """, as_dict=1)
-
- for d in warehouse:
- try:
- address = frappe.new_doc('Address')
- address.name = d.name
- address.address_title = d.name
- address.address_line1 = d.address_line_1
- address.city = d.city
- address.state = d.state
- address.pincode = d.pin
- address.db_insert()
- address.append('links',{'link_doctype':'Warehouse','link_name':d.name})
- address.links[0].db_insert()
- if d.name and (d.email_id or d.mobile_no or d.phone_no):
- contact = frappe.new_doc('Contact')
- contact.name = d.name
- contact.first_name = d.name
- contact.mobile_no = d.mobile_no
- contact.email_id = d.email_id
- contact.phone = d.phone_no
- contact.db_insert()
- contact.append('links',{'link_doctype':'Warehouse','link_name':d.name})
- contact.links[0].db_insert()
- except frappe.DuplicateEntryError:
- pass
-
\ No newline at end of file
diff --git a/erpnext/patches/v11_0/__init__.py b/erpnext/patches/v11_0/__init__.py
deleted file mode 100644
index baffc488252..00000000000
--- a/erpnext/patches/v11_0/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/patches/v11_0/remove_subscriber_doctype.py b/erpnext/patches/v11_0/remove_subscriber_doctype.py
deleted file mode 100644
index 4839a20f91f..00000000000
--- a/erpnext/patches/v11_0/remove_subscriber_doctype.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe.model.utils.rename_field import rename_field
-
-def execute():
- """ copy subscribe field to customer """
- frappe.reload_doc("accounts","doctype","subscription")
-
- if frappe.db.exists("DocType", "Subscriber"):
- if frappe.db.has_column('Subscription','subscriber'):
- frappe.db.sql("""
- update `tabSubscription` s1
- set customer=(select customer from tabSubscriber where name=s1.subscriber)
- """)
-
- frappe.delete_doc("DocType", "Subscriber")
\ No newline at end of file
diff --git a/erpnext/patches/v11_0/rename_bom_wo_fields.py b/erpnext/patches/v11_0/rename_bom_wo_fields.py
index b4a740fabbf..882ec84e644 100644
--- a/erpnext/patches/v11_0/rename_bom_wo_fields.py
+++ b/erpnext/patches/v11_0/rename_bom_wo_fields.py
@@ -6,6 +6,10 @@ import frappe
from frappe.model.utils.rename_field import rename_field
def execute():
+ # updating column value to handle field change from Data to Currency
+ changed_field = "base_scrap_material_cost"
+ frappe.db.sql(f"update `tabBOM` set {changed_field} = '0' where trim(coalesce({changed_field}, ''))= ''")
+
for doctype in ['BOM Explosion Item', 'BOM Item', 'Work Order Item', 'Item']:
if frappe.db.has_column(doctype, 'allow_transfer_for_manufacture'):
if doctype != 'Item':
diff --git a/erpnext/patches/v12_0/purchase_receipt_status.py b/erpnext/patches/v12_0/purchase_receipt_status.py
index 1a99b3163b6..459221e7695 100644
--- a/erpnext/patches/v12_0/purchase_receipt_status.py
+++ b/erpnext/patches/v12_0/purchase_receipt_status.py
@@ -19,6 +19,9 @@ def execute():
logger.info("purchase_receipt_status: begin patch, PR count: {}"
.format(len(affected_purchase_receipts)))
+ frappe.reload_doc("stock", "doctype", "Purchase Receipt")
+ frappe.reload_doc("stock", "doctype", "Purchase Receipt Item")
+
for pr in affected_purchase_receipts:
pr_name = pr[0]
diff --git a/erpnext/patches/v13_0/__init__.py b/erpnext/patches/v13_0/__init__.py
deleted file mode 100644
index baffc488252..00000000000
--- a/erpnext/patches/v13_0/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from __future__ import unicode_literals
diff --git a/erpnext/patches/v13_0/bill_for_rejected_quantity_in_purchase_invoice.py b/erpnext/patches/v13_0/bill_for_rejected_quantity_in_purchase_invoice.py
new file mode 100644
index 00000000000..be85cfdeeff
--- /dev/null
+++ b/erpnext/patches/v13_0/bill_for_rejected_quantity_in_purchase_invoice.py
@@ -0,0 +1,8 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+ frappe.reload_doctype("Buying Settings")
+ buying_settings = frappe.get_single("Buying Settings")
+ buying_settings.bill_for_rejected_quantity_in_purchase_invoice = 0
+ buying_settings.save()
\ No newline at end of file
diff --git a/erpnext/patches/v13_0/healthcare_lab_module_rename_doctypes.py b/erpnext/patches/v13_0/healthcare_lab_module_rename_doctypes.py
index 9af0a8dbef7..2549a1e91ee 100644
--- a/erpnext/patches/v13_0/healthcare_lab_module_rename_doctypes.py
+++ b/erpnext/patches/v13_0/healthcare_lab_module_rename_doctypes.py
@@ -2,6 +2,7 @@ from __future__ import unicode_literals
import frappe
from frappe.model.utils.rename_field import rename_field
+
def execute():
if frappe.db.exists('DocType', 'Lab Test') and frappe.db.exists('DocType', 'Lab Test Template'):
# rename child doctypes
@@ -17,7 +18,12 @@ def execute():
frappe.reload_doc('healthcare', 'doctype', 'lab_test_template')
for old_dt, new_dt in doctypes.items():
- if not frappe.db.table_exists(new_dt) and frappe.db.table_exists(old_dt):
+ frappe.flags.link_fields = {}
+ should_rename = (
+ frappe.db.table_exists(old_dt)
+ and not frappe.db.table_exists(new_dt)
+ )
+ if should_rename:
frappe.reload_doc('healthcare', 'doctype', frappe.scrub(old_dt))
frappe.rename_doc('DocType', old_dt, new_dt, force=True)
frappe.reload_doc('healthcare', 'doctype', frappe.scrub(new_dt))
diff --git a/erpnext/patches/v13_0/rename_issue_status_hold_to_on_hold.py b/erpnext/patches/v13_0/rename_issue_status_hold_to_on_hold.py
new file mode 100644
index 00000000000..48325fc2d43
--- /dev/null
+++ b/erpnext/patches/v13_0/rename_issue_status_hold_to_on_hold.py
@@ -0,0 +1,20 @@
+# Copyright (c) 2020, 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('DocType', 'Issue'):
+ frappe.reload_doc("support", "doctype", "issue")
+ rename_status()
+
+def rename_status():
+ frappe.db.sql("""
+ UPDATE
+ `tabIssue`
+ SET
+ status = 'On Hold'
+ WHERE
+ status = 'Hold'
+ """)
\ No newline at end of file
diff --git a/erpnext/patches/v13_0/update_job_card_details.py b/erpnext/patches/v13_0/update_job_card_details.py
new file mode 100644
index 00000000000..d4e65c6f2f2
--- /dev/null
+++ b/erpnext/patches/v13_0/update_job_card_details.py
@@ -0,0 +1,16 @@
+# Copyright (c) 2019, 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", "job_card")
+ frappe.reload_doc("manufacturing", "doctype", "job_card_item")
+ frappe.reload_doc("manufacturing", "doctype", "work_order_operation")
+
+ frappe.db.sql(""" update `tabJob Card` jc, `tabWork Order Operation` wo
+ SET jc.hour_rate = wo.hour_rate
+ WHERE
+ jc.operation_id = wo.name and jc.docstatus < 2 and wo.hour_rate > 0
+ """)
\ No newline at end of file
diff --git a/erpnext/patches/v13_0/update_level_in_bom.py b/erpnext/patches/v13_0/update_level_in_bom.py
new file mode 100644
index 00000000000..0d03c42e980
--- /dev/null
+++ b/erpnext/patches/v13_0/update_level_in_bom.py
@@ -0,0 +1,30 @@
+# Copyright (c) 2020, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+ for document in ["bom", "bom_item", "bom_explosion_item"]:
+ frappe.reload_doc('manufacturing', 'doctype', document)
+
+ frappe.db.sql(" update `tabBOM` set bom_level = 0 where docstatus = 1")
+
+ bom_list = frappe.db.sql_list("""select name from `tabBOM` bom
+ where docstatus=1 and is_active=1 and not exists(select bom_no from `tabBOM Item`
+ where parent=bom.name and ifnull(bom_no, '')!='')""")
+
+ count = 0
+ while(count < len(bom_list)):
+ for parent_bom in get_parent_boms(bom_list[count]):
+ bom_doc = frappe.get_cached_doc("BOM", parent_bom)
+ bom_doc.set_bom_level(update=True)
+ bom_list.append(parent_bom)
+ count += 1
+
+def get_parent_boms(bom_no):
+ return frappe.db.sql_list("""
+ select distinct bom_item.parent from `tabBOM Item` bom_item
+ where bom_item.bom_no = %s and bom_item.docstatus=1 and bom_item.parenttype='BOM'
+ and exists(select bom.name from `tabBOM` bom where bom.name=bom_item.parent and bom.is_active=1)
+ """, bom_no)
diff --git a/erpnext/patches/v4_0/apply_user_permissions.py b/erpnext/patches/v4_0/apply_user_permissions.py
deleted file mode 100644
index 3c5d612c181..00000000000
--- a/erpnext/patches/v4_0/apply_user_permissions.py
+++ /dev/null
@@ -1,50 +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
-from erpnext.hr.doctype.employee.employee import EmployeeUserDisabledError
-
-def execute():
- update_hr_permissions()
- update_permissions()
- remove_duplicate_user_permissions()
- frappe.clear_cache()
-
-def update_hr_permissions():
- # add set user permissions rights to HR Manager
- frappe.db.sql("""update `tabDocPerm` set `set_user_permissions`=1 where parent in ('Employee', 'Leave Application')
- and role='HR Manager' and permlevel=0 and `read`=1""")
- docperm_meta = frappe.get_meta('DocPerm')
- if docperm_meta.get_field('apply_user_permissions'):
- # apply user permissions on Employee and Leave Application
- frappe.db.sql("""update `tabDocPerm` set `apply_user_permissions`=1 where parent in ('Employee', 'Leave Application')
- and role in ('Employee', 'Leave Approver') and permlevel=0 and `read`=1""")
-
- frappe.clear_cache()
-
- # save employees to run on_update events
- for employee in frappe.db.sql_list("""select name from `tabEmployee` where docstatus < 2"""):
- try:
- emp = frappe.get_doc("Employee", employee)
- emp.flags.ignore_mandatory = True
- emp.save()
- except EmployeeUserDisabledError:
- pass
-
-def update_permissions():
- # clear match conditions other than owner
- frappe.db.sql("""update tabDocPerm set `match`=''
- where ifnull(`match`,'') not in ('', 'owner')""")
-
-def remove_duplicate_user_permissions():
- # remove duplicate user_permissions (if they exist)
- for d in frappe.db.sql("""select parent, defkey, defvalue,
- count(*) as cnt from tabDefaultValue
- where parent not in ('__global', '__default')
- group by parent, defkey, defvalue""", as_dict=1):
- if d.cnt > 1:
- # order by parenttype so that user permission does not get removed!
- frappe.db.sql("""delete from tabDefaultValue where `parent`=%s and `defkey`=%s and
- `defvalue`=%s order by parenttype limit %s""", (d.parent, d.defkey, d.defvalue, d.cnt-1))
-
diff --git a/erpnext/patches/v4_0/countrywise_coa.py b/erpnext/patches/v4_0/countrywise_coa.py
deleted file mode 100644
index f45e6028c87..00000000000
--- a/erpnext/patches/v4_0/countrywise_coa.py
+++ /dev/null
@@ -1,29 +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("setup", 'doctype', "company")
- frappe.reload_doc("accounts", 'doctype', "account")
-
- frappe.db.sql("""update tabAccount set account_type='Cash'
- where account_type='Bank or Cash' and account_name in ('Cash', 'Cash In Hand')""")
-
- frappe.db.sql("""update tabAccount set account_type='Stock'
- where account_name = 'Stock Assets'""")
-
- ac_types = {"Fixed Asset Account": "Fixed Asset", "Bank or Cash": "Bank"}
- for old, new in ac_types.items():
- frappe.db.sql("""update tabAccount set account_type=%s
- where account_type=%s""", (new, old))
-
- try:
- frappe.db.sql("""update `tabAccount` set report_type =
- if(is_pl_account='Yes', 'Profit and Loss', 'Balance Sheet')""")
-
- frappe.db.sql("""update `tabAccount` set balance_must_be=debit_or_credit
- where ifnull(allow_negative_balance, 0) = 0""")
- except:
- pass
diff --git a/erpnext/patches/v4_0/create_custom_fields_for_india_specific_fields.py b/erpnext/patches/v4_0/create_custom_fields_for_india_specific_fields.py
deleted file mode 100644
index fe50e444b52..00000000000
--- a/erpnext/patches/v4_0/create_custom_fields_for_india_specific_fields.py
+++ /dev/null
@@ -1,63 +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
-from frappe.custom.doctype.custom_field.custom_field import create_custom_field_if_values_exist
-
-def execute():
- frappe.reload_doc("stock", "doctype", "purchase_receipt")
- frappe.reload_doc("hr", "doctype", "employee")
- frappe.reload_doc("Payroll", "doctype", "salary_slip")
-
- india_specific_fields = {
- "Purchase Receipt": [{
- "label": "Supplier Shipment No",
- "fieldname": "challan_no",
- "fieldtype": "Data",
- "insert_after": "is_subcontracted"
- }, {
- "label": "Supplier Shipment Date",
- "fieldname": "challan_date",
- "fieldtype": "Date",
- "insert_after": "is_subcontracted"
- }],
- "Employee": [{
- "label": "PAN Number",
- "fieldname": "pan_number",
- "fieldtype": "Data",
- "insert_after": "company_email"
- }, {
- "label": "Gratuity LIC Id",
- "fieldname": "gratuity_lic_id",
- "fieldtype": "Data",
- "insert_after": "company_email"
- }, {
- "label": "Esic Card No",
- "fieldname": "esic_card_no",
- "fieldtype": "Data",
- "insert_after": "bank_ac_no"
- }, {
- "label": "PF Number",
- "fieldname": "pf_number",
- "fieldtype": "Data",
- "insert_after": "bank_ac_no"
- }],
- "Salary Slip": [{
- "label": "Esic No",
- "fieldname": "esic_no",
- "fieldtype": "Data",
- "insert_after": "letter_head",
- "permlevel": 1
- }, {
- "label": "PF Number",
- "fieldname": "pf_no",
- "fieldtype": "Data",
- "insert_after": "letter_head",
- "permlevel": 1
- }]
- }
-
- for dt, docfields in india_specific_fields.items():
- for df in docfields:
- create_custom_field_if_values_exist(dt, df)
diff --git a/erpnext/patches/v4_0/create_price_list_if_missing.py b/erpnext/patches/v4_0/create_price_list_if_missing.py
deleted file mode 100644
index 039e52111c9..00000000000
--- a/erpnext/patches/v4_0/create_price_list_if_missing.py
+++ /dev/null
@@ -1,35 +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
-from frappe import _
-from frappe.utils.nestedset import get_root_of
-
-def execute():
- # setup not complete
- if not frappe.db.sql("""select name from tabCompany limit 1"""):
- return
-
- if "shopping_cart" in frappe.get_installed_apps():
- frappe.reload_doc("shopping_cart", "doctype", "shopping_cart_settings")
-
- if not frappe.db.sql("select name from `tabPrice List` where buying=1"):
- create_price_list(_("Standard Buying"), buying=1)
-
- if not frappe.db.sql("select name from `tabPrice List` where selling=1"):
- create_price_list(_("Standard Selling"), selling=1)
-
-def create_price_list(pl_name, buying=0, selling=0):
- price_list = frappe.get_doc({
- "doctype": "Price List",
- "price_list_name": pl_name,
- "enabled": 1,
- "buying": buying,
- "selling": selling,
- "currency": frappe.db.get_default("currency"),
- "territories": [{
- "territory": get_root_of("Territory")
- }]
- })
- price_list.insert()
diff --git a/erpnext/patches/v4_0/customer_discount_to_pricing_rule.py b/erpnext/patches/v4_0/customer_discount_to_pricing_rule.py
deleted file mode 100644
index 1b260c48cc1..00000000000
--- a/erpnext/patches/v4_0/customer_discount_to_pricing_rule.py
+++ /dev/null
@@ -1,33 +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
-from frappe.utils.nestedset import get_root_of
-
-def execute():
- frappe.reload_doc("accounts", "doctype", "pricing_rule")
-
- frappe.db.auto_commit_on_many_writes = True
-
- default_item_group = get_root_of("Item Group")
-
- for d in frappe.db.sql("""select * from `tabCustomer Discount`
- where ifnull(parent, '') != ''""", as_dict=1):
- if not d.discount:
- continue
-
- frappe.get_doc({
- "doctype": "Pricing Rule",
- "apply_on": "Item Group",
- "item_group": d.item_group or default_item_group,
- "applicable_for": "Customer",
- "customer": d.parent,
- "price_or_discount": "Discount Percentage",
- "discount_percentage": d.discount,
- "selling": 1
- }).insert()
-
- frappe.db.auto_commit_on_many_writes = False
-
- frappe.delete_doc("DocType", "Customer Discount")
diff --git a/erpnext/patches/v4_0/fields_to_be_renamed.py b/erpnext/patches/v4_0/fields_to_be_renamed.py
deleted file mode 100644
index cc176971327..00000000000
--- a/erpnext/patches/v4_0/fields_to_be_renamed.py
+++ /dev/null
@@ -1,109 +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
-from frappe.model.utils.rename_field import rename_field
-from frappe.modules import scrub, get_doctype_module
-
-rename_map = {
- "Quotation Item": [
- ["ref_rate", "price_list_rate"],
- ["base_ref_rate", "base_price_list_rate"],
- ["adj_rate", "discount_percentage"],
- ["export_rate", "rate"],
- ["basic_rate", "base_rate"],
- ["amount", "base_amount"],
- ["export_amount", "amount"]
- ],
-
- "Sales Order Item": [
- ["ref_rate", "price_list_rate"],
- ["base_ref_rate", "base_price_list_rate"],
- ["adj_rate", "discount_percentage"],
- ["export_rate", "rate"],
- ["basic_rate", "base_rate"],
- ["amount", "base_amount"],
- ["export_amount", "amount"],
- ["reserved_warehouse", "warehouse"]
- ],
-
- "Delivery Note Item": [
- ["ref_rate", "price_list_rate"],
- ["base_ref_rate", "base_price_list_rate"],
- ["adj_rate", "discount_percentage"],
- ["export_rate", "rate"],
- ["basic_rate", "base_rate"],
- ["amount", "base_amount"],
- ["export_amount", "amount"]
- ],
-
- "Sales Invoice Item": [
- ["ref_rate", "price_list_rate"],
- ["base_ref_rate", "base_price_list_rate"],
- ["adj_rate", "discount_percentage"],
- ["export_rate", "rate"],
- ["basic_rate", "base_rate"],
- ["amount", "base_amount"],
- ["export_amount", "amount"]
- ],
-
- "Supplier Quotation Item": [
- ["import_ref_rate", "price_list_rate"],
- ["purchase_ref_rate", "base_price_list_rate"],
- ["discount_rate", "discount_percentage"],
- ["import_rate", "rate"],
- ["purchase_rate", "base_rate"],
- ["amount", "base_amount"],
- ["import_amount", "amount"]
- ],
-
- "Purchase Order Item": [
- ["import_ref_rate", "price_list_rate"],
- ["purchase_ref_rate", "base_price_list_rate"],
- ["discount_rate", "discount_percentage"],
- ["import_rate", "rate"],
- ["purchase_rate", "base_rate"],
- ["amount", "base_amount"],
- ["import_amount", "amount"]
- ],
-
- "Purchase Receipt Item": [
- ["import_ref_rate", "price_list_rate"],
- ["purchase_ref_rate", "base_price_list_rate"],
- ["discount_rate", "discount_percentage"],
- ["import_rate", "rate"],
- ["purchase_rate", "base_rate"],
- ["amount", "base_amount"],
- ["import_amount", "amount"]
- ],
-
- "Purchase Invoice Item": [
- ["import_ref_rate", "price_list_rate"],
- ["purchase_ref_rate", "base_price_list_rate"],
- ["discount_rate", "discount_percentage"],
- ["import_rate", "rate"],
- ["rate", "base_rate"],
- ["amount", "base_amount"],
- ["import_amount", "amount"],
- ["expense_head", "expense_account"]
- ],
-
- "Item": [
- ["purchase_account", "expense_account"],
- ["default_sales_cost_center", "selling_cost_center"],
- ["cost_center", "buying_cost_center"],
- ["default_income_account", "income_account"],
- ],
- "Item Price": [
- ["ref_rate", "price_list_rate"]
- ]
-}
-
-def execute():
- for dn in rename_map:
- frappe.reload_doc(get_doctype_module(dn), "doctype", scrub(dn))
-
- for dt, field_list in rename_map.items():
- for field in field_list:
- rename_field(dt, field[0], field[1])
diff --git a/erpnext/patches/v4_0/fix_address_template.py b/erpnext/patches/v4_0/fix_address_template.py
deleted file mode 100644
index 905e3db3e87..00000000000
--- a/erpnext/patches/v4_0/fix_address_template.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- missing_line = """{{ address_line1 }}
"""
- for name, template in frappe.db.sql("select name, template from `tabAddress Template`"):
- if missing_line not in template:
- d = frappe.get_doc("Address Template", name)
- d.template = missing_line + d.template
- d.save()
diff --git a/erpnext/patches/v4_0/fix_case_of_hr_module_def.py b/erpnext/patches/v4_0/fix_case_of_hr_module_def.py
deleted file mode 100644
index e77b427b77e..00000000000
--- a/erpnext/patches/v4_0/fix_case_of_hr_module_def.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- hr = frappe.db.get_value("Module Def", "HR")
- if hr == "Hr":
- frappe.rename_doc("Module Def", "Hr", "HR")
- frappe.db.set_value("Module Def", "HR", "module_name", "HR")
-
- frappe.clear_cache()
- frappe.setup_module_map()
diff --git a/erpnext/patches/v4_0/fix_contact_address.py b/erpnext/patches/v4_0/fix_contact_address.py
deleted file mode 100644
index 6a3e106b8cc..00000000000
--- a/erpnext/patches/v4_0/fix_contact_address.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc("website", "doctype", "contact_us_settings")
- address = frappe.db.get_value("Contact Us Settings", None, "address")
- if address:
- address = frappe.get_doc("Address", address)
- contact = frappe.get_doc("Contact Us Settings", "Contact Us Settings")
- for f in ("address_title", "address_line1", "address_line2", "city", "state", "country", "pincode"):
- contact.set(f, address.get(f))
-
- contact.save()
\ No newline at end of file
diff --git a/erpnext/patches/v4_0/fix_employee_user_id.py b/erpnext/patches/v4_0/fix_employee_user_id.py
deleted file mode 100644
index 6f449f97bb6..00000000000
--- a/erpnext/patches/v4_0/fix_employee_user_id.py
+++ /dev/null
@@ -1,23 +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
-from frappe.utils import get_fullname
-
-def execute():
- for user_id in frappe.db.sql_list("""select distinct user_id from `tabEmployee`
- where ifnull(user_id, '')!=''
- group by user_id having count(name) > 1"""):
-
- fullname = get_fullname(user_id)
- employee = frappe.db.get_value("Employee", {"employee_name": fullname, "user_id": user_id})
-
- if employee:
- frappe.db.sql("""update `tabEmployee` set user_id=null
- where user_id=%s and name!=%s""", (user_id, employee))
- else:
- count = frappe.db.sql("""select count(*) from `tabEmployee` where user_id=%s""", user_id)[0][0]
- frappe.db.sql("""update `tabEmployee` set user_id=null
- where user_id=%s limit %s""", (user_id, count - 1))
diff --git a/erpnext/patches/v4_0/global_defaults_to_system_settings.py b/erpnext/patches/v4_0/global_defaults_to_system_settings.py
deleted file mode 100644
index 2905fe1e6a9..00000000000
--- a/erpnext/patches/v4_0/global_defaults_to_system_settings.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt
-
-from __future__ import unicode_literals
-
-import frappe
-from collections import Counter
-from frappe.core.doctype.user.user import STANDARD_USERS
-
-def execute():
- frappe.reload_doc("core", "doctype", "system_settings")
- system_settings = frappe.get_doc("System Settings")
-
- # set values from global_defauls
- global_defaults = frappe.db.get_value("Global Defaults", None,
- ["time_zone", "date_format", "number_format", "float_precision", "session_expiry"], as_dict=True)
-
- if global_defaults:
- for key, val in global_defaults.items():
- if not system_settings.get(key):
- system_settings.set(key, val)
-
- # language
- if not system_settings.get("language"):
- # find most common language
- lang = frappe.db.sql_list("""select language from `tabUser`
- where ifnull(language, '')!='' and language not like "Loading%%" and name not in ({standard_users})""".format(
- standard_users=", ".join(["%s"]*len(STANDARD_USERS))), tuple(STANDARD_USERS))
- lang = Counter(lang).most_common(1)
- lang = (len(lang) > 0) and lang[0][0] or "english"
-
- system_settings.language = lang
-
- system_settings.flags.ignore_mandatory = True
- system_settings.save()
-
- global_defaults = frappe.get_doc("Global Defaults")
- global_defaults.flags.ignore_mandatory = True
- global_defaults.save()
diff --git a/erpnext/patches/v4_0/import_country_codes.py b/erpnext/patches/v4_0/import_country_codes.py
deleted file mode 100644
index 43e23d5b631..00000000000
--- a/erpnext/patches/v4_0/import_country_codes.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.geo.country_info import get_all
-from frappe.utils.install import import_country_and_currency
-
-from six import iteritems
-
-def execute():
- frappe.reload_doc("setup", "doctype", "country")
- import_country_and_currency()
- for name, country in iteritems(get_all()):
- frappe.set_value("Country", name, "code", country.get("code"))
\ No newline at end of file
diff --git a/erpnext/patches/v4_0/map_charge_to_taxes_and_charges.py b/erpnext/patches/v4_0/map_charge_to_taxes_and_charges.py
deleted file mode 100644
index 97e217aa054..00000000000
--- a/erpnext/patches/v4_0/map_charge_to_taxes_and_charges.py
+++ /dev/null
@@ -1,16 +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 sales cycle
- for d in ['Sales Invoice', 'Sales Order', 'Quotation', 'Delivery Note']:
- frappe.db.sql("""update `tab%s` set taxes_and_charges=charge""" % d)
-
- # update purchase cycle
- for d in ['Purchase Invoice', 'Purchase Order', 'Supplier Quotation', 'Purchase Receipt']:
- frappe.db.sql("""update `tab%s` set taxes_and_charges=purchase_other_charges""" % d)
-
- frappe.db.sql("""update `tabPurchase Taxes and Charges` set parentfield='other_charges'""")
diff --git a/erpnext/patches/v4_0/move_warehouse_user_to_restrictions.py b/erpnext/patches/v4_0/move_warehouse_user_to_restrictions.py
deleted file mode 100644
index 8b81936d8d4..00000000000
--- a/erpnext/patches/v4_0/move_warehouse_user_to_restrictions.py
+++ /dev/null
@@ -1,13 +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
-import frappe.permissions
-
-def execute():
- for warehouse, user in frappe.db.sql("""select parent, user from `tabWarehouse User`"""):
- frappe.permissions.add_user_permission("Warehouse", warehouse, user)
-
- frappe.delete_doc_if_exists("DocType", "Warehouse User")
- frappe.reload_doc("stock", "doctype", "warehouse")
diff --git a/erpnext/patches/v4_0/new_address_template.py b/erpnext/patches/v4_0/new_address_template.py
deleted file mode 100644
index fa6602706e9..00000000000
--- a/erpnext/patches/v4_0/new_address_template.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from __future__ import print_function, unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc("utilities", "doctype", "address_template")
- if not frappe.db.sql("select name from `tabAddress Template`"):
- try:
- d = frappe.new_doc("Address Template")
- d.update({"country":frappe.db.get_default("country") or
- frappe.db.get_value("Global Defaults", "Global Defaults", "country")})
- d.insert()
- except:
- print(frappe.get_traceback())
-
diff --git a/erpnext/patches/v4_0/reload_sales_print_format.py b/erpnext/patches/v4_0/reload_sales_print_format.py
deleted file mode 100644
index b8f090f9f3d..00000000000
--- a/erpnext/patches/v4_0/reload_sales_print_format.py
+++ /dev/null
@@ -1,8 +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', 'Print Format', 'POS Invoice')
diff --git a/erpnext/patches/v4_0/remove_employee_role_if_no_employee.py b/erpnext/patches/v4_0/remove_employee_role_if_no_employee.py
deleted file mode 100644
index 8766ace54f3..00000000000
--- a/erpnext/patches/v4_0/remove_employee_role_if_no_employee.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
-import frappe.permissions
-
-def execute():
- for user in frappe.db.sql_list("select distinct parent from `tabHas Role` where role='Employee'"):
- # if employee record does not exists, remove employee role!
- if not frappe.db.get_value("Employee", {"user_id": user}):
- try:
- user = frappe.get_doc("User", user)
- for role in user.get("roles", {"role": "Employee"}):
- user.get("roles").remove(role)
- user.save()
- except frappe.DoesNotExistError:
- pass
diff --git a/erpnext/patches/v4_0/remove_module_home_pages.py b/erpnext/patches/v4_0/remove_module_home_pages.py
deleted file mode 100644
index a2720e0ebf7..00000000000
--- a/erpnext/patches/v4_0/remove_module_home_pages.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 page in ("accounts-home", "website-home", "support-home", "stock-home", "selling-home", "projects-home",
- "manufacturing-home", "hr-home", "buying-home"):
- frappe.delete_doc("Page", page)
\ No newline at end of file
diff --git a/erpnext/patches/v4_0/rename_sitemap_to_route.py b/erpnext/patches/v4_0/rename_sitemap_to_route.py
deleted file mode 100644
index ffb1fda1440..00000000000
--- a/erpnext/patches/v4_0/rename_sitemap_to_route.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-import frappe.model
-
-def execute():
- frappe.reload_doc("setup", "doctype", "item_group")
- frappe.reload_doc("stock", "doctype", "item")
- frappe.reload_doc("setup", "doctype", "sales_partner")
-
- try:
- frappe.model.rename_field("Item Group", "parent_website_sitemap", "parent_website_route")
- frappe.model.rename_field("Item", "parent_website_sitemap", "parent_website_route")
- frappe.model.rename_field("Sales Partner", "parent_website_sitemap",
- "parent_website_route")
- except Exception as e:
- if e.args[0]!=1054:
- raise
diff --git a/erpnext/patches/v4_0/reset_permissions_for_masters.py b/erpnext/patches/v4_0/reset_permissions_for_masters.py
deleted file mode 100644
index bc1b438e2bb..00000000000
--- a/erpnext/patches/v4_0/reset_permissions_for_masters.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import print_function, unicode_literals
-from frappe.permissions import reset_perms
-
-def execute():
- for doctype in ("About Us Settings", "Accounts Settings", "Activity Type",
- "Blog Category", "Blog Settings", "Blogger", "Branch", "Brand", "Buying Settings",
- "Communication", "Company", "Contact Us Settings",
- "Country", "Currency", "Currency Exchange", "Deduction Type", "Department",
- "Designation", "Earning Type", "Event", "Feed", "File", "Fiscal Year",
- "HR Settings", "Industry Type", "Leave Type", "Letter Head",
- "Mode of Payment", "Module Def", "Naming Series", "POS Setting", "Print Heading",
- "Report", "Role", "Selling Settings", "Stock Settings", "Supplier Type", "UOM"):
- try:
- reset_perms(doctype)
- except:
- print("Error resetting perms for", doctype)
- raise
diff --git a/erpnext/patches/v4_0/save_default_letterhead.py b/erpnext/patches/v4_0/save_default_letterhead.py
deleted file mode 100644
index 5d75f096b3a..00000000000
--- a/erpnext/patches/v4_0/save_default_letterhead.py
+++ /dev/null
@@ -1,13 +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():
- """save default letterhead to set default_letter_head_content"""
- try:
- letter_head = frappe.get_doc("Letter Head", {"is_default": 1})
- letter_head.save()
- except frappe.DoesNotExistError:
- pass
diff --git a/erpnext/patches/v4_0/set_pricing_rule_for_buying_or_selling.py b/erpnext/patches/v4_0/set_pricing_rule_for_buying_or_selling.py
deleted file mode 100644
index 7e472e21953..00000000000
--- a/erpnext/patches/v4_0/set_pricing_rule_for_buying_or_selling.py
+++ /dev/null
@@ -1,13 +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", "pricing_rule")
- frappe.db.sql("""update `tabPricing Rule` set selling=1 where ifnull(applicable_for, '') in
- ('', 'Customer', 'Customer Group', 'Territory', 'Sales Partner', 'Campaign')""")
-
- frappe.db.sql("""update `tabPricing Rule` set buying=1 where ifnull(applicable_for, '') in
- ('', 'Supplier', 'Supplier Type')""")
diff --git a/erpnext/patches/v4_0/split_email_settings.py b/erpnext/patches/v4_0/split_email_settings.py
deleted file mode 100644
index 5d1dea60ee0..00000000000
--- a/erpnext/patches/v4_0/split_email_settings.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import print_function, unicode_literals
-import frappe
-
-def execute():
- print("WARNING!!!! Email Settings not migrated. Please setup your email again.")
-
- # this will happen if you are migrating very old accounts
- # comment out this line below and remember to create new Email Accounts
- # for incoming and outgoing mails
- raise Exception
-
- return
-
-
- frappe.reload_doc("core", "doctype", "outgoing_email_settings")
- frappe.reload_doc("support", "doctype", "support_email_settings")
-
- email_settings = get_email_settings()
- map_outgoing_email_settings(email_settings)
- map_support_email_settings(email_settings)
-
-
-def map_outgoing_email_settings(email_settings):
- outgoing_email_settings = frappe.get_doc("Outgoing Email Settings")
- for fieldname in (("outgoing_mail_server", "mail_server"),
- "use_ssl", "mail_port", "mail_login", "mail_password",
- "always_use_login_id_as_sender", "auto_email_id"):
-
- if isinstance(fieldname, tuple):
- from_fieldname, to_fieldname = fieldname
- else:
- from_fieldname = to_fieldname = fieldname
-
- outgoing_email_settings.set(to_fieldname, email_settings.get(from_fieldname))
-
- outgoing_email_settings._fix_numeric_types()
- outgoing_email_settings.save()
-
-def map_support_email_settings(email_settings):
- support_email_settings = frappe.get_doc("Support Email Settings")
-
- for fieldname in ("sync_support_mails", "support_email",
- ("support_host", "mail_server"),
- ("support_use_ssl", "use_ssl"),
- ("support_username", "mail_login"),
- ("support_password", "mail_password"),
- "support_signature", "send_autoreply", "support_autoreply"):
-
- if isinstance(fieldname, tuple):
- from_fieldname, to_fieldname = fieldname
- else:
- from_fieldname = to_fieldname = fieldname
-
- support_email_settings.set(to_fieldname, email_settings.get(from_fieldname))
-
- support_email_settings._fix_numeric_types()
- support_email_settings.save()
-
-def get_email_settings():
- ret = {}
- for field, value in frappe.db.sql("select field, value from tabSingles where doctype='Email Settings'"):
- ret[field] = value
- return ret
-
diff --git a/erpnext/patches/v4_0/update_account_root_type.py b/erpnext/patches/v4_0/update_account_root_type.py
deleted file mode 100644
index 15ddf032a4a..00000000000
--- a/erpnext/patches/v4_0/update_account_root_type.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 print_function, unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc("accounts", "doctype", "account")
-
- account_table_columns = frappe.db.get_table_columns("Account")
- if "debit_or_credit" in account_table_columns and "is_pl_account" in account_table_columns:
- frappe.db.sql("""UPDATE tabAccount
- SET root_type = CASE
- WHEN (debit_or_credit='Debit' and is_pl_account = 'No') THEN 'Asset'
- WHEN (debit_or_credit='Credit' and is_pl_account = 'No') THEN 'Liability'
- WHEN (debit_or_credit='Debit' and is_pl_account = 'Yes') THEN 'Expense'
- WHEN (debit_or_credit='Credit' and is_pl_account = 'Yes') THEN 'Income'
- END
- WHERE ifnull(parent_account, '') = ''
- """)
-
- else:
- for key, root_type in (("asset", "Asset"), ("liabilities", "Liability"), ("expense", "Expense"),
- ("income", "Income")):
- frappe.db.sql("""update tabAccount set root_type=%s where name like %s
- and ifnull(parent_account, '')=''""", (root_type, "%" + key + "%"))
-
- for root in frappe.db.sql("""SELECT name, lft, rgt, root_type FROM `tabAccount`
- WHERE ifnull(parent_account, '')=''""", as_dict=True):
- if root.root_type:
- frappe.db.sql("""UPDATE tabAccount SET root_type=%s WHERE lft>%s and rgt<%s""",
- (root.root_type, root.lft, root.rgt))
- else:
- print(b"Root type not found for {0}".format(root.name.encode("utf-8")))
diff --git a/erpnext/patches/v4_0/update_custom_print_formats_for_renamed_fields.py b/erpnext/patches/v4_0/update_custom_print_formats_for_renamed_fields.py
deleted file mode 100644
index d784a1b1828..00000000000
--- a/erpnext/patches/v4_0/update_custom_print_formats_for_renamed_fields.py
+++ /dev/null
@@ -1,36 +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
-import re
-
-def execute():
- # NOTE: sequence is important
- fields_list = (
- ("amount", "base_amount"),
- ("ref_rate", "price_list_rate"),
- ("base_ref_rate", "base_price_list_rate"),
- ("adj_rate", "discount_percentage"),
- ("export_rate", "rate"),
- ("basic_rate", "base_rate"),
- ("export_amount", "amount"),
- ("reserved_warehouse", "warehouse"),
- ("import_ref_rate", "price_list_rate"),
- ("purchase_ref_rate", "base_price_list_rate"),
- ("discount_rate", "discount_percentage"),
- ("import_rate", "rate"),
- ("purchase_rate", "base_rate"),
- ("import_amount", "amount")
- )
-
- condition = " or ".join("""html like "%%{}%%" """.format(d[0].replace("_", "\\_")) for d in fields_list
- if d[0] != "amount")
-
- for name, html in frappe.db.sql("""select name, html from `tabPrint Format`
- where standard = 'No' and ({}) and html not like '%%frappe.%%'""".format(condition)):
- html = html.replace("wn.", "frappe.")
- for from_field, to_field in fields_list:
- html = re.sub(r"\b{}\b".format(from_field), to_field, html)
-
- frappe.db.set_value("Print Format", name, "html", html)
diff --git a/erpnext/patches/v4_0/update_incharge_name_to_sales_person_in_maintenance_schedule.py b/erpnext/patches/v4_0/update_incharge_name_to_sales_person_in_maintenance_schedule.py
deleted file mode 100644
index fe66a5e3ef9..00000000000
--- a/erpnext/patches/v4_0/update_incharge_name_to_sales_person_in_maintenance_schedule.py
+++ /dev/null
@@ -1,12 +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("support", "doctype", "schedules")
- frappe.reload_doc("support", "doctype", "maintenance_schedule_item")
-
- frappe.db.sql("""update `tabMaintenance Schedule Detail` set sales_person=incharge_name""")
- frappe.db.sql("""update `tabMaintenance Schedule Item` set sales_person=incharge_name""")
\ No newline at end of file
diff --git a/erpnext/patches/v4_0/update_other_charges_in_custom_purchase_print_formats.py b/erpnext/patches/v4_0/update_other_charges_in_custom_purchase_print_formats.py
deleted file mode 100644
index 2e2e77a9fca..00000000000
--- a/erpnext/patches/v4_0/update_other_charges_in_custom_purchase_print_formats.py
+++ /dev/null
@@ -1,12 +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
-import re
-
-def execute():
- for name, html in frappe.db.sql("""select name, html from `tabPrint Format`
- where standard = 'No' and html like '%%purchase\\_tax\\_details%%'"""):
- html = re.sub(r"\bpurchase_tax_details\b", "taxes", html)
- frappe.db.set_value("Print Format", name, "html", html)
diff --git a/erpnext/patches/v4_0/update_tax_amount_after_discount.py b/erpnext/patches/v4_0/update_tax_amount_after_discount.py
deleted file mode 100644
index d10329ef375..00000000000
--- a/erpnext/patches/v4_0/update_tax_amount_after_discount.py
+++ /dev/null
@@ -1,20 +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_taxes_and_charges")
- docs_with_discount_amount = frappe._dict()
- for dt in ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice"]:
- records = frappe.db.sql_list("""select name from `tab%s`
- where ifnull(discount_amount, 0) > 0 and docstatus=1""" % dt)
- docs_with_discount_amount[dt] = records
-
- for dt, discounted_records in docs_with_discount_amount.items():
- frappe.db.sql("""update `tabSales Taxes and Charges`
- set tax_amount_after_discount_amount = tax_amount
- where parenttype = %s and parent not in (%s)""" %
- ('%s', ', '.join(['%s']*(len(discounted_records)+1))),
- tuple([dt, ''] + discounted_records))
diff --git a/erpnext/patches/v4_0/update_user_properties.py b/erpnext/patches/v4_0/update_user_properties.py
deleted file mode 100644
index f2085ce4df6..00000000000
--- a/erpnext/patches/v4_0/update_user_properties.py
+++ /dev/null
@@ -1,51 +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
-import frappe.permissions
-import frappe.defaults
-
-def execute():
- frappe.reload_doc("core", "doctype", "docfield")
- frappe.reload_doc("hr", "doctype", "employee")
-
- set_print_email_permissions()
- migrate_user_properties_to_user_permissions()
-
- frappe.clear_cache()
-
-def migrate_user_properties_to_user_permissions():
- for d in frappe.db.sql("""select parent, defkey, defvalue from tabDefaultValue
- where parent not in ('__global', '__default')""", as_dict=True):
- df = frappe.db.sql("""select options from tabDocField
- where fieldname=%s and fieldtype='Link'""", d.defkey, as_dict=True)
-
- if df:
- frappe.db.sql("""update tabDefaultValue
- set defkey=%s, parenttype='User Permission'
- where defkey=%s and
- parent not in ('__global', '__default')""", (df[0].options, d.defkey))
-
-def set_print_email_permissions():
- # reset Page perms
- from frappe.core.page.permission_manager.permission_manager import reset
- reset("Page")
- reset("Report")
-
- if "allow_print" not in frappe.db.get_table_columns("DocType"):
- return
-
- # patch to move print, email into DocPerm
- # NOTE: allow_print and allow_email are misnamed. They were used to hide print / hide email
- for doctype, hide_print, hide_email in frappe.db.sql("""select name, ifnull(allow_print, 0), ifnull(allow_email, 0)
- from `tabDocType` where ifnull(issingle, 0)=0 and ifnull(istable, 0)=0 and
- (ifnull(allow_print, 0)=0 or ifnull(allow_email, 0)=0)"""):
-
- if not hide_print:
- frappe.db.sql("""update `tabDocPerm` set `print`=1
- where permlevel=0 and `read`=1 and parent=%s""", doctype)
-
- if not hide_email:
- frappe.db.sql("""update `tabDocPerm` set `email`=1
- where permlevel=0 and `read`=1 and parent=%s""", doctype)
diff --git a/erpnext/patches/v4_0/update_users_report_view_settings.py b/erpnext/patches/v4_0/update_users_report_view_settings.py
deleted file mode 100644
index 6f216f5b38b..00000000000
--- a/erpnext/patches/v4_0/update_users_report_view_settings.py
+++ /dev/null
@@ -1,12 +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
-
-from frappe.model.utils.rename_field import update_users_report_view_settings
-from erpnext.patches.v4_0.fields_to_be_renamed import rename_map
-
-def execute():
- for dt, field_list in rename_map.items():
- for field in field_list:
- update_users_report_view_settings(dt, field[0], field[1])
diff --git a/erpnext/patches/v4_0/validate_v3_patch.py b/erpnext/patches/v4_0/validate_v3_patch.py
deleted file mode 100644
index 3df39edea69..00000000000
--- a/erpnext/patches/v4_0/validate_v3_patch.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():
- from frappe.modules.patch_handler import executed
- last_v3_patch = 'patches.1401.fix_pos_outstanding'
- if not executed(last_v3_patch):
- raise Exception("site not ready to migrate to version 4")
diff --git a/erpnext/patches/v4_1/fix_delivery_and_billing_status.py b/erpnext/patches/v4_1/fix_delivery_and_billing_status.py
deleted file mode 100644
index 8cc6a4b0bed..00000000000
--- a/erpnext/patches/v4_1/fix_delivery_and_billing_status.py
+++ /dev/null
@@ -1,12 +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.db.sql("""update `tabSales Order` set delivery_status = 'Not Delivered'
- where delivery_status = 'Delivered' and ifnull(per_delivered, 0) = 0 and ifnull(docstatus, 0) in (0, 1)""")
-
- frappe.db.sql("""update `tabSales Order` set billing_status = 'Not Billed'
- where billing_status = 'Billed' and ifnull(per_billed, 0) = 0 and ifnull(docstatus, 0) in (0, 1)""")
diff --git a/erpnext/patches/v4_1/fix_jv_remarks.py b/erpnext/patches/v4_1/fix_jv_remarks.py
deleted file mode 100644
index e07bf05f1a5..00000000000
--- a/erpnext/patches/v4_1/fix_jv_remarks.py
+++ /dev/null
@@ -1,21 +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():
- reference_date = guess_reference_date()
- for name in frappe.db.sql_list("""select name from `tabJournal Entry`
- where date(creation)>=%s""", reference_date):
- jv = frappe.get_doc("Journal Entry", name)
- try:
- jv.create_remarks()
- except frappe.MandatoryError:
- pass
- else:
- frappe.db.set_value("Journal Entry", jv.name, "remark", jv.remark)
-
-def guess_reference_date():
- return (frappe.db.get_value("Patch Log", {"patch": "erpnext.patches.v4_0.validate_v3_patch"}, "creation")
- or "2014-05-06")
diff --git a/erpnext/patches/v4_1/fix_sales_order_delivered_status.py b/erpnext/patches/v4_1/fix_sales_order_delivered_status.py
deleted file mode 100644
index 66037b8958b..00000000000
--- a/erpnext/patches/v4_1/fix_sales_order_delivered_status.py
+++ /dev/null
@@ -1,15 +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 si in frappe.db.sql_list("""select name
- from `tabSales Invoice`
- where ifnull(update_stock,0) = 1 and docstatus = 1 and exists(
- select name from `tabSales Invoice Item` where parent=`tabSales Invoice`.name and
- ifnull(so_detail, "") != "")"""):
-
- invoice = frappe.get_doc("Sales Invoice", si)
- invoice.update_qty()
diff --git a/erpnext/patches/v4_1/set_outgoing_email_footer.py b/erpnext/patches/v4_1/set_outgoing_email_footer.py
deleted file mode 100644
index 54d016bf5f6..00000000000
--- a/erpnext/patches/v4_1/set_outgoing_email_footer.py
+++ /dev/null
@@ -1,12 +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
-from erpnext.setup.install import default_mail_footer
-
-def execute():
- return
- mail_footer = frappe.db.get_default('mail_footer') or ''
- mail_footer += default_mail_footer
- frappe.db.set_value("Outgoing Email Settings", "Outgoing Email Settings", "footer", mail_footer)
diff --git a/erpnext/patches/v4_2/add_currency_turkish_lira.py b/erpnext/patches/v4_2/add_currency_turkish_lira.py
deleted file mode 100644
index 1a46089f943..00000000000
--- a/erpnext/patches/v4_2/add_currency_turkish_lira.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():
- return
- # country = get_country_info(country="Turkey")
- # add_country_and_currency("Turkey", country)
diff --git a/erpnext/patches/v4_2/default_website_style.py b/erpnext/patches/v4_2/default_website_style.py
deleted file mode 100644
index e8f9502ea62..00000000000
--- a/erpnext/patches/v4_2/default_website_style.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- return
- # frappe.reload_doc('website', 'doctype', 'style_settings')
- # style_settings = frappe.get_doc("Style Settings", "Style Settings")
- # if not style_settings.apply_style:
- # style_settings.update(default_properties)
- # style_settings.apply_style = 1
- # style_settings.save()
diff --git a/erpnext/patches/v4_2/delete_gl_entries_for_cancelled_invoices.py b/erpnext/patches/v4_2/delete_gl_entries_for_cancelled_invoices.py
deleted file mode 100644
index 169b1e29275..00000000000
--- a/erpnext/patches/v4_2/delete_gl_entries_for_cancelled_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
-
-def execute():
- cancelled_invoices = frappe.db.sql_list("""select name from `tabSales Invoice`
- where docstatus = 2 and ifnull(update_stock, 0) = 1""")
-
- if cancelled_invoices:
- frappe.db.sql("""delete from `tabGL Entry`
- where voucher_type = 'Sales Invoice' and voucher_no in (%s)"""
- % (', '.join(['%s']*len(cancelled_invoices))), tuple(cancelled_invoices))
\ No newline at end of file
diff --git a/erpnext/patches/v4_2/delete_old_print_formats.py b/erpnext/patches/v4_2/delete_old_print_formats.py
deleted file mode 100644
index cacdb85ce07..00000000000
--- a/erpnext/patches/v4_2/delete_old_print_formats.py
+++ /dev/null
@@ -1,23 +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():
- old_formats = ("Sales Invoice", "Sales Invoice Spartan", "Sales Invoice Modern",
- "Sales Invoice Classic",
- "Sales Order Spartan", "Sales Order Modern", "Sales Order Classic",
- "Purchase Order Spartan", "Purchase Order Modern", "Purchase Order Classic",
- "Quotation Spartan", "Quotation Modern", "Quotation Classic",
- "Delivery Note Spartan", "Delivery Note Modern", "Delivery Note Classic")
-
- for fmt in old_formats:
- # update property setter
- for ps in frappe.db.sql_list("""select name from `tabProperty Setter`
- where property='default_print_format' and value=%s""", fmt):
- ps = frappe.get_doc("Property Setter", ps)
- ps.value = "Standard"
- ps.save(ignore_permissions = True)
-
- frappe.delete_doc_if_exists("Print Format", fmt)
diff --git a/erpnext/patches/v4_2/discount_amount.py b/erpnext/patches/v4_2/discount_amount.py
deleted file mode 100644
index 7ab61bdbeaa..00000000000
--- a/erpnext/patches/v4_2/discount_amount.py
+++ /dev/null
@@ -1,12 +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
-from frappe.modules import scrub, get_doctype_module
-
-def execute():
- for dt in ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice"]:
- frappe.reload_doc(get_doctype_module(dt), "doctype", scrub(dt))
- frappe.db.sql("""update `tab{0}` set base_discount_amount=discount_amount,
- discount_amount=discount_amount/conversion_rate""".format(dt))
diff --git a/erpnext/patches/v4_2/fix_account_master_type.py b/erpnext/patches/v4_2/fix_account_master_type.py
deleted file mode 100644
index 99444ce83b2..00000000000
--- a/erpnext/patches/v4_2/fix_account_master_type.py
+++ /dev/null
@@ -1,12 +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 d in frappe.db.sql("""select name from `tabAccount`
- where ifnull(master_type, '') not in ('Customer', 'Supplier', 'Employee', '') and docstatus=0"""):
- ac = frappe.get_doc("Account", d[0])
- ac.master_type = None
- ac.save()
diff --git a/erpnext/patches/v4_2/fix_gl_entries_for_stock_transactions.py b/erpnext/patches/v4_2/fix_gl_entries_for_stock_transactions.py
deleted file mode 100644
index c6c94d41797..00000000000
--- a/erpnext/patches/v4_2/fix_gl_entries_for_stock_transactions.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import print_function, unicode_literals
-import frappe
-from frappe.utils import flt
-
-def execute():
- from erpnext.stock.stock_balance import repost
- repost(allow_zero_rate=True, only_actual=True)
-
- frappe.reload_doctype("Account")
-
- warehouse_account = frappe.db.sql("""select name, master_name from tabAccount
- where ifnull(account_type, '') = 'Warehouse'""")
- if warehouse_account:
- warehouses = [d[1] for d in warehouse_account]
- accounts = [d[0] for d in warehouse_account]
-
- stock_vouchers = frappe.db.sql("""select distinct sle.voucher_type, sle.voucher_no
- from `tabStock Ledger Entry` sle
- where sle.warehouse in (%s)
- order by sle.posting_date""" %
- ', '.join(['%s']*len(warehouses)), tuple(warehouses))
-
- rejected = []
- for voucher_type, voucher_no in stock_vouchers:
- stock_bal = frappe.db.sql("""select sum(stock_value_difference) from `tabStock Ledger Entry`
- where voucher_type=%s and voucher_no =%s and warehouse in (%s)""" %
- ('%s', '%s', ', '.join(['%s']*len(warehouses))), tuple([voucher_type, voucher_no] + warehouses))
-
- account_bal = frappe.db.sql("""select ifnull(sum(ifnull(debit, 0) - ifnull(credit, 0)), 0)
- from `tabGL Entry`
- where voucher_type=%s and voucher_no =%s and account in (%s)
- group by voucher_type, voucher_no""" %
- ('%s', '%s', ', '.join(['%s']*len(accounts))), tuple([voucher_type, voucher_no] + accounts))
-
- if stock_bal and account_bal and abs(flt(stock_bal[0][0]) - flt(account_bal[0][0])) > 0.1:
- try:
- print(voucher_type, voucher_no, stock_bal[0][0], account_bal[0][0])
-
- frappe.db.sql("""delete from `tabGL Entry`
- where voucher_type=%s and voucher_no=%s""", (voucher_type, voucher_no))
-
- voucher = frappe.get_doc(voucher_type, voucher_no)
- voucher.make_gl_entries()
- frappe.db.commit()
- except Exception as e:
- print(frappe.get_traceback())
- rejected.append([voucher_type, voucher_no])
- frappe.db.rollback()
-
- print("Failed to repost: ")
- print(rejected)
diff --git a/erpnext/patches/v4_2/fix_recurring_orders.py b/erpnext/patches/v4_2/fix_recurring_orders.py
deleted file mode 100644
index ea1724a0401..00000000000
--- a/erpnext/patches/v4_2/fix_recurring_orders.py
+++ /dev/null
@@ -1,41 +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():
- sales_orders = frappe.db.sql("""select name from `tabSales Order`
- where docstatus = 1 and ifnull(is_recurring, 0) = 1
- and (per_delivered > 0 or per_billed > 0)""", as_dict=1)
-
- for so in sales_orders:
- if not frappe.db.exists("Delivery Note Item", {"against_sales_order": so.name, "docstatus": 1}):
- frappe.db.sql("""update `tabSales Order` set per_delivered = 0,
- delivery_status = 'Not Delivered' where name = %s""", so.name)
- frappe.db.sql("""update `tabSales Order Item` set delivered_qty = 0
- where parent = %s""", so.name)
-
- if not frappe.db.exists("Sales Invoice Item", {"sales_order": so.name, "docstatus": 1}):
- frappe.db.sql("""update `tabSales Order` set per_billed = 0,
- billing_status = 'Not Billed' where name = %s""", so.name)
- frappe.db.sql("""update `tabSales Order Item` set billed_amt = 0
- where parent = %s""", so.name)
-
- purchase_orders = frappe.db.sql("""select name from `tabPurchase Order`
- where docstatus = 1 and ifnull(is_recurring, 0) = 1
- and (per_received > 0 or per_billed > 0)""", as_dict=1)
-
- for po in purchase_orders:
- if not frappe.db.exists("Purchase Receipt Item", {"prevdoc_doctype": "Purchase Order",
- "prevdoc_docname": po.name, "docstatus": 1}):
- frappe.db.sql("""update `tabPurchase Order` set per_received = 0
- where name = %s""", po.name)
- frappe.db.sql("""update `tabPurchase Order Item` set received_qty = 0
- where parent = %s""", po.name)
-
- if not frappe.db.exists("Purchase Invoice Item", {"purchase_order": po.name, "docstatus": 1}):
- frappe.db.sql("""update `tabPurchase Order` set per_billed = 0
- where name = %s""", po.name)
- frappe.db.sql("""update `tabPurchase Order Item` set billed_amt = 0
- where parent = %s""", po.name)
\ No newline at end of file
diff --git a/erpnext/patches/v4_2/party_model.py b/erpnext/patches/v4_2/party_model.py
deleted file mode 100644
index 46d7fffee10..00000000000
--- a/erpnext/patches/v4_2/party_model.py
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import print_function, unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc("accounts", "doctype", "account")
- frappe.reload_doc("setup", "doctype", "company")
- frappe.reload_doc("accounts", "doctype", "gl_entry")
- frappe.reload_doc("accounts", "doctype", "journal_entry_account")
- receivable_payable_accounts = create_receivable_payable_account()
- if receivable_payable_accounts:
- set_party_in_jv_and_gl_entry(receivable_payable_accounts)
- delete_individual_party_account()
- remove_customer_supplier_account_report()
-
-def create_receivable_payable_account():
- receivable_payable_accounts = frappe._dict()
-
- def _create_account(args):
- if args["parent_account"] and frappe.db.exists("Account", args["parent_account"]):
- account_id = frappe.db.get_value("Account",
- {"account_name": args["account_name"], "company": args["company"]})
- if not account_id:
- account = frappe.new_doc("Account")
- account.is_group = 0
- account.update(args)
- account.insert()
-
- account_id = account.name
-
- frappe.db.set_value("Company", args["company"], ("default_receivable_account"
- if args["account_type"]=="Receivable" else "default_payable_account"), account_id)
-
- receivable_payable_accounts.setdefault(args["company"], {}).setdefault(args["account_type"], account_id)
-
- for company in frappe.db.sql_list("select name from tabCompany"):
- _create_account({
- "account_name": "Debtors",
- "account_type": "Receivable",
- "company": company,
- "parent_account": get_parent_account(company, "Customer")
- })
-
- _create_account({
- "account_name": "Creditors",
- "account_type": "Payable",
- "company": company,
- "parent_account": get_parent_account(company, "Supplier")
- })
-
- return receivable_payable_accounts
-
-def get_parent_account(company, master_type):
- parent_account = None
-
- if "receivables_group" in frappe.db.get_table_columns("Company"):
- parent_account = frappe.get_cached_value('Company', company,
- "receivables_group" if master_type=="Customer" else "payables_group")
- if not parent_account:
- parent_account = frappe.db.get_value("Account", {"company": company,
- "account_name": "Accounts Receivable" if master_type=="Customer" else "Accounts Payable"})
-
- if not parent_account:
- parent_account = frappe.db.sql_list("""select parent_account from tabAccount
- where company=%s and ifnull(master_type, '')=%s and ifnull(master_name, '')!='' limit 1""",
- (company, master_type))
- parent_account = parent_account[0][0] if parent_account else None
-
- return parent_account
-
-def set_party_in_jv_and_gl_entry(receivable_payable_accounts):
- accounts = frappe.db.sql("""select name, master_type, master_name, company from `tabAccount`
- where ifnull(master_type, '') in ('Customer', 'Supplier') and ifnull(master_name, '') != ''""", as_dict=1)
-
- account_map = frappe._dict()
- for d in accounts:
- account_map.setdefault(d.name, d)
-
- if not account_map:
- return
-
- for dt in ["Journal Entry Account", "GL Entry"]:
- records = frappe.db.sql("""select name, account from `tab%s`
- where account in (%s) and ifnull(party, '') = '' and docstatus < 2""" %
- (dt, ", ".join(['%s']*len(account_map))), tuple(account_map.keys()), as_dict=1)
- for i, d in enumerate(records):
- account_details = account_map.get(d.account, {})
- account_type = "Receivable" if account_details.get("master_type")=="Customer" else "Payable"
- new_account = receivable_payable_accounts[account_details.get("company")][account_type]
-
- frappe.db.sql("update `tab{0}` set account=%s, party_type=%s, party=%s where name=%s".format(dt),
- (new_account, account_details.get("master_type"), account_details.get("master_name"), d.name))
-
- if i%500 == 0:
- frappe.db.commit()
-
-def delete_individual_party_account():
- frappe.db.sql("""delete from `tabAccount`
- where ifnull(master_type, '') in ('Customer', 'Supplier')
- and ifnull(master_name, '') != ''
- and not exists(select gle.name from `tabGL Entry` gle
- where gle.account = tabAccount.name)""")
-
- accounts_not_deleted = frappe.db.sql_list("""select tabAccount.name from `tabAccount`
- where ifnull(master_type, '') in ('Customer', 'Supplier')
- and ifnull(master_name, '') != ''
- and exists(select gle.name from `tabGL Entry` gle where gle.account = tabAccount.name)""")
-
- if accounts_not_deleted:
- print("Accounts not deleted: " + "\n".join(accounts_not_deleted))
-
-
-def remove_customer_supplier_account_report():
- for d in ["Customer Account Head", "Supplier Account Head"]:
- frappe.delete_doc("Report", d)
diff --git a/erpnext/patches/v4_2/recalculate_bom_cost.py b/erpnext/patches/v4_2/recalculate_bom_cost.py
deleted file mode 100644
index eee89fce96b..00000000000
--- a/erpnext/patches/v4_2/recalculate_bom_cost.py
+++ /dev/null
@@ -1,16 +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 d in frappe.db.sql("select name from `tabBOM` where docstatus < 2"):
- try:
- document = frappe.get_doc('BOM', d[0])
- if document.docstatus == 1:
- document.flags.ignore_validate_update_after_submit = True
- document.calculate_cost()
- document.save()
- except:
- pass
diff --git a/erpnext/patches/v4_2/repost_sle_for_si_with_no_warehouse.py b/erpnext/patches/v4_2/repost_sle_for_si_with_no_warehouse.py
deleted file mode 100644
index 1356129dc0a..00000000000
--- a/erpnext/patches/v4_2/repost_sle_for_si_with_no_warehouse.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import print_function, unicode_literals
-import frappe
-from erpnext.stock.stock_ledger import NegativeStockError
-
-def execute():
- si_list = frappe.db.sql("""select distinct si.name
- from `tabSales Invoice Item` si_item, `tabSales Invoice` si
- where si.name = si_item.parent and si.modified > '2015-02-16' and si.docstatus=1
- and ifnull(si_item.warehouse, '') = '' and ifnull(si.update_stock, 0) = 1
- order by posting_date, posting_time""", as_dict=1)
-
- failed_list = []
- for si in si_list:
- try:
- si_doc = frappe.get_doc("Sales Invoice", si.name)
- si_doc.docstatus = 2
- si_doc.on_cancel()
-
- si_doc.docstatus = 1
- si_doc.set_missing_item_details()
- si_doc.on_submit()
- frappe.db.commit()
- except:
- failed_list.append(si.name)
- frappe.local.stockledger_exceptions = None
- frappe.db.rollback()
-
- print("Failed to repost: ", failed_list)
-
-
-
\ No newline at end of file
diff --git a/erpnext/patches/v4_2/repost_stock_reconciliation.py b/erpnext/patches/v4_2/repost_stock_reconciliation.py
deleted file mode 100644
index ad20ebbae41..00000000000
--- a/erpnext/patches/v4_2/repost_stock_reconciliation.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
-import json
-
-def execute():
- existing_allow_negative_stock = frappe.db.get_value("Stock Settings", None, "allow_negative_stock")
- frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
-
- head_row = ["Item Code", "Warehouse", "Quantity", "Valuation Rate"]
- stock_reco_to_be_reposted = []
- for d in frappe.db.sql("""select name, reconciliation_json from `tabStock Reconciliation`
- where docstatus=1 and creation > '2014-03-01'""", as_dict=1):
- data = json.loads(d.reconciliation_json)
- for row in data[data.index(head_row)+1:]:
- if row[3] in ["", None]:
- stock_reco_to_be_reposted.append(d.name)
- break
-
- for dn in stock_reco_to_be_reposted:
- reco = frappe.get_doc("Stock Reconciliation", dn)
- reco.docstatus = 2
- reco.on_cancel()
-
- reco.docstatus = 1
- reco.validate()
- reco.on_submit()
-
- frappe.db.set_value("Stock Settings", None, "allow_negative_stock", existing_allow_negative_stock)
diff --git a/erpnext/patches/v4_2/reset_bom_costs.py b/erpnext/patches/v4_2/reset_bom_costs.py
deleted file mode 100644
index 42ca7594678..00000000000
--- a/erpnext/patches/v4_2/reset_bom_costs.py
+++ /dev/null
@@ -1,17 +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('manufacturing', 'doctype', 'bom_operation')
- for d in frappe.db.sql("""select name from `tabBOM` where docstatus < 2""", as_dict=1):
- try:
- bom = frappe.get_doc('BOM', d.name)
- bom.flags.ignore_validate_update_after_submit = True
- bom.calculate_cost()
- bom.save()
- frappe.db.commit()
- except:
- frappe.db.rollback()
diff --git a/erpnext/patches/v4_2/seprate_manufacture_and_repack.py b/erpnext/patches/v4_2/seprate_manufacture_and_repack.py
deleted file mode 100644
index 2c935436a2c..00000000000
--- a/erpnext/patches/v4_2/seprate_manufacture_and_repack.py
+++ /dev/null
@@ -1,9 +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.db.sql("""update `tabStock Entry` set purpose='Manufacture' where purpose='Manufacture/Repack' and ifnull(work_order,"")!="" """)
- frappe.db.sql("""update `tabStock Entry` set purpose='Repack' where purpose='Manufacture/Repack' and ifnull(work_order,"")="" """)
\ No newline at end of file
diff --git a/erpnext/patches/v4_2/set_company_country.py b/erpnext/patches/v4_2/set_company_country.py
deleted file mode 100644
index 89f07f28731..00000000000
--- a/erpnext/patches/v4_2/set_company_country.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import print_function, unicode_literals
-import frappe
-
-def execute():
- country = frappe.db.get_single_value("Global Defaults", "country")
- if not country:
- print("Country not specified in Global Defaults")
- return
-
- for company in frappe.db.sql_list("""select name from `tabCompany`
- where ifnull(country, '')=''"""):
- frappe.db.set_value("Company", company, "country", country)
diff --git a/erpnext/patches/v4_2/set_item_has_batch.py b/erpnext/patches/v4_2/set_item_has_batch.py
deleted file mode 100644
index 7e52d2def0f..00000000000
--- a/erpnext/patches/v4_2/set_item_has_batch.py
+++ /dev/null
@@ -1,65 +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.db.sql("update tabItem set has_batch_no = 0 where ifnull(has_batch_no, '') = ''")
- frappe.db.sql("update tabItem set has_serial_no = 0 where ifnull(has_serial_no, '') = ''")
-
- item_list = frappe.db.sql("""select name, has_batch_no, has_serial_no from tabItem
- where is_stock_item = 1""", as_dict=1)
-
- sle_count = get_sle_count()
- sle_with_batch = get_sle_with_batch()
- sle_with_serial = get_sle_with_serial()
-
- batch_items = get_items_with_batch()
- serialized_items = get_items_with_serial()
-
- for d in item_list:
- if d.has_batch_no == 1:
- if d.name not in batch_items and sle_count.get(d.name) and sle_count.get(d.name) != sle_with_batch.get(d.name):
- frappe.db.set_value("Item", d.name, "has_batch_no", 0)
- else:
- if d.name in batch_items or (sle_count.get(d.name) and sle_count.get(d.name) == sle_with_batch.get(d.name)):
- frappe.db.set_value("Item", d.name, "has_batch_no", 1)
-
- if d.has_serial_no == 1:
- if d.name not in serialized_items and sle_count.get(d.name) and sle_count.get(d.name) != sle_with_serial.get(d.name):
- frappe.db.set_value("Item", d.name, "has_serial_no", 0)
- else:
- if d.name in serialized_items or (sle_count.get(d.name) and sle_count.get(d.name) == sle_with_serial.get(d.name)):
- frappe.db.set_value("Item", d.name, "has_serial_no", 1)
-
-
-def get_sle_count():
- sle_count = {}
- for d in frappe.db.sql("""select item_code, count(name) as cnt from `tabStock Ledger Entry` group by item_code""", as_dict=1):
- sle_count.setdefault(d.item_code, d.cnt)
-
- return sle_count
-
-def get_sle_with_batch():
- sle_with_batch = {}
- for d in frappe.db.sql("""select item_code, count(name) as cnt from `tabStock Ledger Entry`
- where ifnull(batch_no, '') != '' group by item_code""", as_dict=1):
- sle_with_batch.setdefault(d.item_code, d.cnt)
-
- return sle_with_batch
-
-
-def get_sle_with_serial():
- sle_with_serial = {}
- for d in frappe.db.sql("""select item_code, count(name) as cnt from `tabStock Ledger Entry`
- where ifnull(serial_no, '') != '' group by item_code""", as_dict=1):
- sle_with_serial.setdefault(d.item_code, d.cnt)
-
- return sle_with_serial
-
-def get_items_with_batch():
- return frappe.db.sql_list("select item from tabBatch")
-
-def get_items_with_serial():
- return frappe.db.sql_list("select item_code from `tabSerial No`")
diff --git a/erpnext/patches/v4_2/toggle_rounded_total.py b/erpnext/patches/v4_2/toggle_rounded_total.py
deleted file mode 100644
index e571208eb65..00000000000
--- a/erpnext/patches/v4_2/toggle_rounded_total.py
+++ /dev/null
@@ -1,9 +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():
- global_defaults = frappe.get_doc("Global Defaults", "Global Defaults")
- global_defaults.toggle_rounded_total()
diff --git a/erpnext/patches/v4_2/update_landed_cost_voucher.py b/erpnext/patches/v4_2/update_landed_cost_voucher.py
deleted file mode 100644
index ec0029671e4..00000000000
--- a/erpnext/patches/v4_2/update_landed_cost_voucher.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():
- frappe.reload_doc("stock", "doctype", "landed_cost_voucher")
- frappe.db.sql("""update `tabLanded Cost Voucher` set distribute_charges_based_on = 'Amount'
- where docstatus=1""")
diff --git a/erpnext/patches/v4_2/update_project_milestones.py b/erpnext/patches/v4_2/update_project_milestones.py
deleted file mode 100644
index e704116d05c..00000000000
--- a/erpnext/patches/v4_2/update_project_milestones.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- for project in frappe.db.sql_list("select name from tabProject"):
- frappe.reload_doc("projects", "doctype", "project")
- p = frappe.get_doc("Project", project)
- p.update_milestones_completed()
- p.db_set("percent_milestones_completed", p.percent_milestones_completed)
diff --git a/erpnext/patches/v4_2/update_sales_order_invoice_field_name.py b/erpnext/patches/v4_2/update_sales_order_invoice_field_name.py
deleted file mode 100644
index 28dd5c0d4e7..00000000000
--- a/erpnext/patches/v4_2/update_sales_order_invoice_field_name.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doc('accounts', 'doctype', 'sales_invoice')
- frappe.db.sql("""update `tabSales Invoice` set from_date = invoice_period_from_date,
- to_date = invoice_period_to_date, is_recurring = convert_into_recurring_invoice""")
diff --git a/erpnext/patches/v4_2/update_stock_uom_for_dn_in_sle.py b/erpnext/patches/v4_2/update_stock_uom_for_dn_in_sle.py
deleted file mode 100644
index 89bf7955340..00000000000
--- a/erpnext/patches/v4_2/update_stock_uom_for_dn_in_sle.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():
- frappe.db.sql("""update `tabStock Ledger Entry` sle, tabItem item
- set sle.stock_uom = item.stock_uom
- where sle.voucher_type="Delivery Note" and item.name = sle.item_code
- and sle.stock_uom != item.stock_uom""")
diff --git a/erpnext/patches/v4_4/make_email_accounts.py b/erpnext/patches/v4_4/make_email_accounts.py
deleted file mode 100644
index 57df1ae4911..00000000000
--- a/erpnext/patches/v4_4/make_email_accounts.py
+++ /dev/null
@@ -1,96 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe.model import default_fields
-
-from six import iteritems
-
-def execute():
- frappe.reload_doc("email", "doctype", "email_account")
-
- # outgoing
- outgoing = dict(frappe.db.sql("select field, value from tabSingles where doctype='Outgoing Email Settings'"))
- if outgoing and outgoing['mail_server'] and outgoing['mail_login']:
- account = frappe.new_doc("Email Account")
- mapping = {
- "login_id_is_different": 1,
- "email_id": "auto_email_id",
- "login_id": "mail_login",
- "password": "mail_password",
- "footer": "footer",
- "smtp_server": "mail_server",
- "smtp_port": "mail_port",
- "use_tls": "use_ssl"
- }
-
- for target_fieldname, source_fieldname in iteritems(mapping):
- account.set(target_fieldname, outgoing.get(source_fieldname))
-
- account.enable_outgoing = 1
- account.enable_incoming = 0
-
- account.insert()
-
- # support
- support = dict(frappe.db.sql("select field, value from tabSingles where doctype='Support Email Settings'"))
- if support and support['mail_server'] and support['mail_login']:
- account = frappe.new_doc("Email Account")
- mapping = {
- "enable_incoming": "sync_support_mails",
- "email_id": "mail_login",
- "password": "mail_password",
- "email_server": "mail_server",
- "use_ssl": "use_ssl",
- "signature": "support_signature",
- "enable_auto_reply": "send_autoreply",
- "auto_reply_message": "support_autoreply"
- }
-
- for target_fieldname, source_fieldname in iteritems(mapping):
- account.set(target_fieldname, support.get(source_fieldname))
-
- account.enable_outgoing = 0
- account.append_to = "Issue"
-
- insert_or_update(account)
-
- # sales, jobs
- for doctype in ("Sales Email Settings", "Jobs Email Settings"):
- source = dict(frappe.db.sql("select field, value from tabSingles where doctype=%s", doctype))
- if source and source.get('host') and source.get('username'):
- account = frappe.new_doc("Email Account")
- mapping = {
- "enable_incoming": "extract_emails",
- "email_id": "username",
- "password": "password",
- "email_server": "host",
- "use_ssl": "use_ssl",
- }
-
- for target_fieldname, source_fieldname in iteritems(mapping):
- account.set(target_fieldname, source.get(source_fieldname))
-
- account.enable_outgoing = 0
- account.append_to = "Lead" if doctype=="Sales Email Settings" else "Job Applicant"
-
- insert_or_update(account)
-
- for doctype in ("Outgoing Email Settings", "Support Email Settings",
- "Sales Email Settings", "Jobs Email Settings"):
- frappe.delete_doc("DocType", doctype)
-
-def insert_or_update(account):
- try:
- account.insert()
- except frappe.NameError as e:
- if e.args[0]=="Email Account":
- existing_account = frappe.get_doc("Email Account", e.args[1])
- for key, value in account.as_dict().items():
- if not existing_account.get(key) and value \
- and key not in default_fields \
- and key != "__islocal":
- existing_account.set(key, value)
-
- existing_account.save()
- else:
- raise
-
diff --git a/erpnext/patches/v5_0/convert_stock_reconciliation.py b/erpnext/patches/v5_0/convert_stock_reconciliation.py
deleted file mode 100644
index 75d1da752f2..00000000000
--- a/erpnext/patches/v5_0/convert_stock_reconciliation.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from __future__ import unicode_literals
-import frappe, json
-
-def execute():
- # stock reco now amendable
- frappe.db.sql("""update tabDocPerm set `amend` = 1 where parent='Stock Reconciliation' and submit = 1""")
-
- frappe.reload_doc("stock", "doctype", "stock_reconciliation_item")
- frappe.reload_doctype("Stock Reconciliation")
-
- if frappe.db.has_column("Stock Reconciliation", "reconciliation_json"):
- for sr in frappe.db.get_all("Stock Reconciliation", ["name"],
- {"reconciliation_json": ["!=", ""]}):
- start = False
- sr = frappe.get_doc("Stock Reconciliation", sr.name)
- for row in json.loads(sr.reconciliation_json):
- if start:
- sr.append("items", {
- "item_code": row[0],
- "warehouse": row[1],
- "qty": row[2] if len(row) > 2 else None,
- "valuation_rate": row[3] if len(row) > 3 else None
- })
-
- elif row[0]=="Item Code":
- start = True
-
-
- for item in sr.items:
- item.db_update()
-
diff --git a/erpnext/patches/v5_0/execute_on_doctype_update.py b/erpnext/patches/v5_0/execute_on_doctype_update.py
deleted file mode 100644
index 70b1d8ded69..00000000000
--- a/erpnext/patches/v5_0/execute_on_doctype_update.py
+++ /dev/null
@@ -1,9 +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 ("Stock Ledger Entry", "Communication", "DefaultValue", "DocShare", "File", "ToDo"):
- frappe.get_doc("DocType", dt).run_module_method("on_doctype_update")
diff --git a/erpnext/patches/v5_0/fix_taxes_and_totals_in_party_currency.py b/erpnext/patches/v5_0/fix_taxes_and_totals_in_party_currency.py
deleted file mode 100644
index 30dc0f8db4e..00000000000
--- a/erpnext/patches/v5_0/fix_taxes_and_totals_in_party_currency.py
+++ /dev/null
@@ -1,66 +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
-from frappe.model.meta import get_field_precision
-
-def execute():
- if not frappe.db.sql("""select name from `tabPatch Log`
- where patch = 'erpnext.patches.v5_0.taxes_and_totals_in_party_currency'"""):
- return
- selling_doctypes = ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice"]
- buying_doctypes = ["Supplier Quotation", "Purchase Order", "Purchase Receipt", "Purchase Invoice"]
-
- for dt in selling_doctypes:
- update_values(dt, "Sales Taxes and Charges")
-
- for dt in buying_doctypes:
- update_values(dt, "Purchase Taxes and Charges")
-
-def update_values(dt, tax_table):
- rate_field_precision = get_field_precision(frappe.get_meta(dt + " Item").get_field("rate"))
- tax_amount_precision = get_field_precision(frappe.get_meta(tax_table).get_field("tax_amount"))
-
- # update net_total, discount_on
- frappe.db.sql("""
- UPDATE
- `tab{0}`
- SET
- total_taxes_and_charges = round(base_total_taxes_and_charges / conversion_rate, {1})
- WHERE
- docstatus < 2
- and ifnull(base_total_taxes_and_charges, 0) != 0
- and ifnull(total_taxes_and_charges, 0) = 0
- """.format(dt, tax_amount_precision))
-
- # update net_amount
- frappe.db.sql("""
- UPDATE
- `tab{0}` par, `tab{1}` item
- SET
- item.net_amount = round(item.base_net_amount / par.conversion_rate, {2}),
- item.net_rate = round(item.base_net_rate / par.conversion_rate, {2})
- WHERE
- par.name = item.parent
- and par.docstatus < 2
- and ((ifnull(item.base_net_amount, 0) != 0 and ifnull(item.net_amount, 0) = 0)
- or (ifnull(item.base_net_rate, 0) != 0 and ifnull(item.net_rate, 0) = 0))
- """.format(dt, dt + " Item", rate_field_precision))
-
- # update tax in party currency
- frappe.db.sql("""
- UPDATE
- `tab{0}` par, `tab{1}` tax
- SET
- tax.tax_amount = round(tax.base_tax_amount / par.conversion_rate, {2}),
- tax.total = round(tax.base_total / conversion_rate, {2}),
- tax.tax_amount_after_discount_amount = round(tax.base_tax_amount_after_discount_amount / conversion_rate, {2})
- WHERE
- par.name = tax.parent
- and par.docstatus < 2
- and ((ifnull(tax.base_tax_amount, 0) != 0 and ifnull(tax.tax_amount, 0) = 0)
- or (ifnull(tax.base_total, 0) != 0 and ifnull(tax.total, 0) = 0)
- or (ifnull(tax.base_tax_amount_after_discount_amount, 0) != 0 and
- ifnull(tax.tax_amount_after_discount_amount, 0) = 0))
- """.format(dt, tax_table, tax_amount_precision))
\ No newline at end of file
diff --git a/erpnext/patches/v5_0/index_on_account_and_gl_entry.py b/erpnext/patches/v5_0/index_on_account_and_gl_entry.py
deleted file mode 100644
index 2920e9293d7..00000000000
--- a/erpnext/patches/v5_0/index_on_account_and_gl_entry.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from __future__ import unicode_literals
-
-import frappe
-
-def execute():
- index_map = {
- "Account": ["parent_account", "lft", "rgt"],
- "GL Entry": ["posting_date", "account", 'party', "voucher_no"],
- "Sales Invoice": ["posting_date", "debit_to", "customer"],
- "Purchase Invoice": ["posting_date", "credit_to", "supplier"]
- }
-
- for dt, indexes in index_map.items():
- existing_indexes = [(d.Key_name, d.Column_name) for d in frappe.db.sql("""show index from `tab{0}`
- where Column_name != 'name'""".format(dt), as_dict=1)]
-
- for old, column in existing_indexes:
- if column in ("parent", "group_or_ledger", "is_group", "is_pl_account", "debit_or_credit",
- "account_name", "company", "project", "voucher_date", "due_date", "bill_no",
- "bill_date", "is_opening", "fiscal_year", "outstanding_amount"):
- frappe.db.sql("alter table `tab{0}` drop index {1}".format(dt, old))
-
- existing_indexes = [(d.Key_name, d.Column_name) for d in frappe.db.sql("""show index from `tab{0}`
- where Column_name != 'name'""".format(dt), as_dict=1)]
-
- existing_indexed_columns = list(set([x[1] for x in existing_indexes]))
-
- for new in indexes:
- if new not in existing_indexed_columns:
- frappe.db.sql("alter table `tab{0}` add index ({1})".format(dt, new))
\ No newline at end of file
diff --git a/erpnext/patches/v5_0/is_group.py b/erpnext/patches/v5_0/is_group.py
deleted file mode 100644
index 4e3f760bed7..00000000000
--- a/erpnext/patches/v5_0/is_group.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from __future__ import unicode_literals
-
-import frappe
-
-def execute():
- frappe.reload_doctype("Account")
- frappe.reload_doctype("Cost Center")
- frappe.db.sql("update tabAccount set is_group = if(group_or_ledger='Group', 1, 0)")
- frappe.db.sql("update `tabCost Center` set is_group = if(group_or_ledger='Group', 1, 0)")
diff --git a/erpnext/patches/v5_0/item_patches.py b/erpnext/patches/v5_0/item_patches.py
deleted file mode 100644
index e223e09f5b7..00000000000
--- a/erpnext/patches/v5_0/item_patches.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.db.sql("update `tabItem` set end_of_life='2099-12-31' where ifnull(end_of_life, '0000-00-00')='0000-00-00'")
- frappe.db.sql("update `tabItem` set website_image = image where ifnull(website_image, '') = 'attach_files:'")
diff --git a/erpnext/patches/v5_0/link_warehouse_with_account.py b/erpnext/patches/v5_0/link_warehouse_with_account.py
deleted file mode 100644
index 338fd7ad7f6..00000000000
--- a/erpnext/patches/v5_0/link_warehouse_with_account.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 "master_name" in frappe.db.get_table_columns("Account"):
- frappe.db.sql("""update tabAccount set warehouse=master_name
- where ifnull(account_type, '') = 'Warehouse' and ifnull(master_name, '') != ''""")
\ No newline at end of file
diff --git a/erpnext/patches/v5_0/new_crm_module.py b/erpnext/patches/v5_0/new_crm_module.py
deleted file mode 100644
index f5dda1f2738..00000000000
--- a/erpnext/patches/v5_0/new_crm_module.py
+++ /dev/null
@@ -1,24 +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 json
-import frappe
-
-def execute():
- frappe.reload_doc('crm', 'doctype', 'lead')
- frappe.reload_doc('crm', 'doctype', 'opportunity')
-
- add_crm_to_user_desktop_items()
-
-def add_crm_to_user_desktop_items():
- key = "_user_desktop_items"
- for user in frappe.get_all("User", filters={"enabled": 1, "user_type": "System User"}):
- user = user.name
- user_desktop_items = frappe.db.get_defaults(key, parent=user)
- if user_desktop_items:
- user_desktop_items = json.loads(user_desktop_items)
- if "CRM" not in user_desktop_items:
- user_desktop_items.append("CRM")
- frappe.db.set_default(key, json.dumps(user_desktop_items), parent=user)
-
diff --git a/erpnext/patches/v5_0/newsletter.py b/erpnext/patches/v5_0/newsletter.py
deleted file mode 100644
index 63e33124139..00000000000
--- a/erpnext/patches/v5_0/newsletter.py
+++ /dev/null
@@ -1,38 +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
-import frappe.permissions
-
-def execute():
- frappe.reload_doc("core", "doctype", "block_module")
- frappe.reload_doctype("User")
- frappe.reload_doctype("Lead")
- frappe.reload_doctype("Contact")
-
- frappe.reload_doc('email', 'doctype', 'email_group')
- frappe.reload_doc('email', 'doctype', 'email_group_member')
- frappe.reload_doc('email', 'doctype', 'newsletter')
-
- frappe.permissions.reset_perms("Newsletter")
-
- if not frappe.db.exists("Role", "Newsletter Manager"):
- frappe.get_doc({"doctype": "Role", "role": "Newsletter Manager"}).insert()
-
- for userrole in frappe.get_all("Has Role", "parent", {"role": "Sales Manager", "parenttype": "User"}):
- if frappe.db.exists("User", userrole.parent):
- user = frappe.get_doc("User", userrole.parent)
- user.append("roles", {
- "doctype": "Has Role",
- "role": "Newsletter Manager"
- })
- user.flags.ignore_mandatory = True
- user.save()
-
- # create default lists
- general = frappe.new_doc("Email Group")
- general.title = "General"
- general.insert()
- general.import_from("Lead")
- general.import_from("Contact")
diff --git a/erpnext/patches/v5_0/opportunity_not_submittable.py b/erpnext/patches/v5_0/opportunity_not_submittable.py
deleted file mode 100644
index e29d66f2845..00000000000
--- a/erpnext/patches/v5_0/opportunity_not_submittable.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():
- frappe.reload_doctype("Opportunity")
- frappe.db.sql("update tabDocPerm set submit=0, cancel=0, amend=0 where parent='Opportunity'")
- frappe.db.sql("update tabOpportunity set docstatus=0 where docstatus=1")
diff --git a/erpnext/patches/v5_0/party_model_patch_fix.py b/erpnext/patches/v5_0/party_model_patch_fix.py
deleted file mode 100644
index d9b67097922..00000000000
--- a/erpnext/patches/v5_0/party_model_patch_fix.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- for company in frappe.get_all("Company",
- ["name", "default_receivable_account", "default_payable_account"]):
-
- if company.default_receivable_account:
- frappe.db.sql("""update `tabSales Invoice` invoice set `debit_to`=%(account)s
- where company=%(company)s
- and not exists (select name from `tabAccount` account where account.name=invoice.debit_to)""",
- {"company": company.name, "account": company.default_receivable_account})
-
- if company.default_payable_account:
- frappe.db.sql("""update `tabPurchase Invoice` invoice set `credit_to`=%(account)s
- where company=%(company)s
- and not exists (select name from `tabAccount` account where account.name=invoice.credit_to)""",
- {"company": company.name, "account": company.default_payable_account})
diff --git a/erpnext/patches/v5_0/portal_fixes.py b/erpnext/patches/v5_0/portal_fixes.py
deleted file mode 100644
index 1fefd991678..00000000000
--- a/erpnext/patches/v5_0/portal_fixes.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-import erpnext.setup.install
-
-def execute():
- frappe.reload_doc("website", "doctype", "web_form_field", force=True, reset_permissions=True)
- #erpnext.setup.install.add_web_forms()
diff --git a/erpnext/patches/v5_0/project_costing.py b/erpnext/patches/v5_0/project_costing.py
deleted file mode 100644
index e2d65d05940..00000000000
--- a/erpnext/patches/v5_0/project_costing.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype("Project")
- frappe.db.sql("update `tabProject` set expected_start_date = project_start_date, \
- expected_end_date = completion_date, actual_end_date = act_completion_date, \
- estimated_costing = project_value, gross_margin = gross_margin_value")
\ No newline at end of file
diff --git a/erpnext/patches/v5_0/recalculate_total_amount_in_jv.py b/erpnext/patches/v5_0/recalculate_total_amount_in_jv.py
deleted file mode 100644
index d5af43c541e..00000000000
--- a/erpnext/patches/v5_0/recalculate_total_amount_in_jv.py
+++ /dev/null
@@ -1,26 +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
-from frappe.utils import money_in_words
-
-def execute():
- company_currency = dict(frappe.db.sql("select name, default_currency from `tabCompany`"))
- bank_or_cash_accounts = frappe.db.sql_list("""select name from `tabAccount`
- where account_type in ('Bank', 'Cash') and docstatus < 2""")
-
- for je in frappe.db.sql_list("""select name from `tabJournal Entry` where docstatus < 2"""):
- total_amount = 0
- total_amount_in_words = ""
-
- je_doc = frappe.get_doc('Journal Entry', je)
- for d in je_doc.get("accounts"):
- if (d.party_type and d.party) or d.account in bank_or_cash_accounts:
- total_amount = d.debit or d.credit
- if total_amount:
- total_amount_in_words = money_in_words(total_amount, company_currency.get(je_doc.company))
-
- if total_amount:
- frappe.db.sql("""update `tabJournal Entry` set total_amount=%s, total_amount_in_words=%s
- where name = %s""", (total_amount, total_amount_in_words, je))
diff --git a/erpnext/patches/v5_0/reclculate_planned_operating_cost_in_production_order.py b/erpnext/patches/v5_0/reclculate_planned_operating_cost_in_production_order.py
deleted file mode 100644
index 6d392831b40..00000000000
--- a/erpnext/patches/v5_0/reclculate_planned_operating_cost_in_production_order.py
+++ /dev/null
@@ -1,13 +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 wo in frappe.db.sql("""select name from `tabWork Order` where docstatus < 2""", as_dict=1):
- work_order = frappe.get_doc("Work Order", wo.name)
- if work_order.operations:
- work_order.flags.ignore_validate_update_after_submit = True
- work_order.calculate_time()
- work_order.save()
\ No newline at end of file
diff --git a/erpnext/patches/v5_0/remove_birthday_events.py b/erpnext/patches/v5_0/remove_birthday_events.py
deleted file mode 100644
index 3ead8669b86..00000000000
--- a/erpnext/patches/v5_0/remove_birthday_events.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- for e in frappe.db.sql_list("""select name from tabEvent where
- repeat_on='Every Year' and ref_type='Employee'"""):
- frappe.delete_doc("Event", e, force=True)
diff --git a/erpnext/patches/v5_0/rename_customer_issue.py b/erpnext/patches/v5_0/rename_customer_issue.py
deleted file mode 100644
index 1bd69ceec19..00000000000
--- a/erpnext/patches/v5_0/rename_customer_issue.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- if frappe.db.table_exists("Customer Issue"):
- frappe.rename_doc("DocType", "Customer Issue", "Warranty Claim")
diff --git a/erpnext/patches/v5_0/rename_pos_setting.py b/erpnext/patches/v5_0/rename_pos_setting.py
deleted file mode 100644
index bf10333564e..00000000000
--- a/erpnext/patches/v5_0/rename_pos_setting.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- if frappe.db.table_exists("POS Setting"):
- frappe.rename_doc("DocType", "POS Setting", "POS Profile")
diff --git a/erpnext/patches/v5_0/rename_table_fieldnames.py b/erpnext/patches/v5_0/rename_table_fieldnames.py
deleted file mode 100644
index aefb0a20372..00000000000
--- a/erpnext/patches/v5_0/rename_table_fieldnames.py
+++ /dev/null
@@ -1,243 +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
-from frappe.model.utils.rename_field import rename_field
-from frappe.modules import scrub, get_doctype_module
-
-rename_map = {
- "Opportunity": [
- ["enquiry_details", "items"]
- ],
- "Quotation": [
- ["quotation_details", "items"],
- ["other_charges", "taxes"]
- ],
- "Sales Order": [
- ["sales_order_details", "items"],
- ["other_charges", "taxes"],
- ["packing_details", "packed_items"]
- ],
- "Delivery Note": [
- ["delivery_note_details", "items"],
- ["other_charges", "taxes"],
- ["packing_details", "packed_items"]
- ],
- "Sales Invoice": [
- ["entries", "items"],
- ["other_charges", "taxes"],
- ["packing_details", "packed_items"],
- ["advance_adjustment_details", "advances"]
- ],
- "Material Request": [
- ["indent_details", "items"]
- ],
- "Supplier Quotation": [
- ["quotation_items", "items"],
- ["other_charges", "taxes"]
- ],
- "Purchase Order": [
- ["po_details", "items"],
- ["other_charges", "taxes"],
- ["po_raw_material_details", "supplied_items"]
- ],
- "Purchase Receipt": [
- ["purchase_receipt_details", "items"],
- ["other_charges", "taxes"],
- ["pr_raw_material_details", "supplied_items"]
- ],
- "Purchase Invoice": [
- ["entries", "items"],
- ["other_charges", "taxes"],
- ["advance_allocation_details", "advances"]
- ],
- "Work Order": [
- ["production_order_operations", "operations"]
- ],
- "BOM": [
- ["bom_operations", "operations"],
- ["bom_materials", "items"],
- ["flat_bom_details", "exploded_items"]
- ],
- "Payment Reconciliation": [
- ["payment_reconciliation_payments", "payments"],
- ["payment_reconciliation_invoices", "invoices"]
- ],
- "Sales Taxes and Charges Template": [
- ["other_charges", "taxes"],
- ["valid_for_territories", "territories"]
- ],
- "Purchase Taxes and Charges Template": [
- ["other_charges", "taxes"]
- ],
- "Shipping Rule": [
- ["shipping_rule_conditions", "conditions"],
- ["valid_for_territories", "territories"]
- ],
- "Price List": [
- ["valid_for_territories", "territories"]
- ],
- "Appraisal": [
- ["appraisal_details", "goals"]
- ],
- "Appraisal Template": [
- ["kra_sheet", "goals"]
- ],
- "Bank Reconciliation": [
- ["entries", "journal_entries"]
- ],
- "C-Form": [
- ["invoice_details", "invoices"]
- ],
- "Employee": [
- ["employee_leave_approvers", "leave_approvers"],
- ["educational_qualification_details", "education"],
- ["previous_experience_details", "external_work_history"],
- ["experience_in_company_details", "internal_work_history"]
- ],
- "Expense Claim": [
- ["expense_voucher_details", "expenses"]
- ],
- "Fiscal Year": [
- ["fiscal_year_companies", "companies"]
- ],
- "Holiday List": [
- ["holiday_list_details", "holidays"]
- ],
- "Installation Note": [
- ["installed_item_details", "items"]
- ],
- "Item": [
- ["item_reorder", "reorder_levels"],
- ["uom_conversion_details", "uoms"],
- ["item_supplier_details", "supplier_items"],
- ["item_customer_details", "customer_items"],
- ["item_tax", "taxes"],
- ["item_specification_details", "quality_parameters"],
- ["item_website_specifications", "website_specifications"]
- ],
- "Item Group": [
- ["item_website_specifications", "website_specifications"]
- ],
- "Landed Cost Voucher": [
- ["landed_cost_purchase_receipts", "purchase_receipts"],
- ["landed_cost_items", "items"],
- ["landed_cost_taxes_and_charges", "taxes"]
- ],
- "Maintenance Schedule": [
- ["item_maintenance_detail", "items"],
- ["maintenance_schedule_detail", "schedules"]
- ],
- "Maintenance Visit": [
- ["maintenance_visit_details", "purposes"]
- ],
- "Packing Slip": [
- ["item_details", "items"]
- ],
- "Customer": [
- ["party_accounts", "accounts"]
- ],
- "Customer Group": [
- ["party_accounts", "accounts"]
- ],
- "Supplier": [
- ["party_accounts", "accounts"]
- ],
- "Supplier Type": [
- ["party_accounts", "accounts"]
- ],
- "Payment Tool": [
- ["payment_tool_details", "vouchers"]
- ],
- "Production Planning Tool": [
- ["pp_so_details", "sales_orders"],
- ["pp_details", "items"]
- ],
- "Quality Inspection": [
- ["qa_specification_details", "readings"]
- ],
- "Salary Slip": [
- ["earning_details", "earnings"],
- ["deduction_details", "deductions"]
- ],
- "Salary Structure": [
- ["earning_details", "earnings"],
- ["deduction_details", "deductions"]
- ],
- "Product Bundle": [
- ["sales_bom_items", "items"]
- ],
- "SMS Settings": [
- ["static_parameter_details", "parameters"]
- ],
- "Stock Entry": [
- ["mtn_details", "items"]
- ],
- "Sales Partner": [
- ["partner_target_details", "targets"]
- ],
- "Sales Person": [
- ["target_details", "targets"]
- ],
- "Territory": [
- ["target_details", "targets"]
- ],
- "Time Sheet": [
- ["time_sheet_details", "time_logs"]
- ],
- "Workstation": [
- ["workstation_operation_hours", "working_hours"]
- ],
- "Payment Reconciliation Payment": [
- ["journal_voucher", "journal_entry"],
- ],
- "Purchase Invoice Advance": [
- ["journal_voucher", "journal_entry"],
- ],
- "Sales Invoice Advance": [
- ["journal_voucher", "journal_entry"],
- ],
- "Journal Entry": [
- ["entries", "accounts"]
- ],
- "Monthly Distribution": [
- ["budget_distribution_details", "percentages"]
- ]
-}
-
-def execute():
- # rename doctypes
- tables = frappe.db.sql_list("show tables")
- for old_dt, new_dt in [["Journal Voucher Detail", "Journal Entry Account"],
- ["Journal Voucher", "Journal Entry"],
- ["Budget Distribution Detail", "Monthly Distribution Percentage"],
- ["Budget Distribution", "Monthly Distribution"]]:
- if "tab"+new_dt not in tables:
- frappe.rename_doc("DocType", old_dt, new_dt, force=True)
-
- # reload new child doctypes
- frappe.reload_doc("manufacturing", "doctype", "work_order_operation")
- frappe.reload_doc("manufacturing", "doctype", "workstation_working_hour")
- frappe.reload_doc("stock", "doctype", "item_variant")
- frappe.reload_doc("Payroll", "doctype", "salary_detail")
- frappe.reload_doc("accounts", "doctype", "party_account")
- frappe.reload_doc("accounts", "doctype", "fiscal_year_company")
-
- #rename table fieldnames
- for dn in rename_map:
- if not frappe.db.exists("DocType", dn):
- continue
- frappe.reload_doc(get_doctype_module(dn), "doctype", scrub(dn))
-
- for dt, field_list in rename_map.items():
- if not frappe.db.exists("DocType", dt):
- continue
- for field in field_list:
- rename_field(dt, field[0], field[1])
-
- # update voucher type
- for old, new in [["Bank Voucher", "Bank Entry"], ["Cash Voucher", "Cash Entry"],
- ["Credit Card Voucher", "Credit Card Entry"], ["Contra Voucher", "Contra Entry"],
- ["Write Off Voucher", "Write Off Entry"], ["Excise Voucher", "Excise Entry"]]:
- frappe.db.sql("update `tabJournal Entry` set voucher_type=%s where voucher_type=%s", (new, old))
diff --git a/erpnext/patches/v5_0/rename_taxes_and_charges_master.py b/erpnext/patches/v5_0/rename_taxes_and_charges_master.py
deleted file mode 100644
index e26f48cda18..00000000000
--- a/erpnext/patches/v5_0/rename_taxes_and_charges_master.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-
-def execute():
- if frappe.db.table_exists("Sales Taxes and Charges Master"):
- frappe.rename_doc("DocType", "Sales Taxes and Charges Master",
- "Sales Taxes and Charges Template")
- frappe.delete_doc("DocType", "Sales Taxes and Charges Master")
-
- if frappe.db.table_exists("Purchase Taxes and Charges Master"):
- frappe.rename_doc("DocType", "Purchase Taxes and Charges Master",
- "Purchase Taxes and Charges Template")
- frappe.delete_doc("DocType", "Purchase Taxes and Charges Master")
diff --git a/erpnext/patches/v5_0/rename_total_fields.py b/erpnext/patches/v5_0/rename_total_fields.py
deleted file mode 100644
index 6657dd843e8..00000000000
--- a/erpnext/patches/v5_0/rename_total_fields.py
+++ /dev/null
@@ -1,55 +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
-from frappe.model.utils.rename_field import rename_field
-from frappe.modules import scrub, get_doctype_module
-
-selling_doctypes = ("Quotation", "Sales Order", "Delivery Note", "Sales Invoice")
-
-buying_doctypes = ("Supplier Quotation", "Purchase Order", "Purchase Receipt", "Purchase Invoice")
-
-selling_renamed_fields = (
- ("net_total", "base_net_total"),
- ("net_total_export", "net_total"),
- ("other_charges_total", "base_total_taxes_and_charges"),
- ("other_charges_total_export", "total_taxes_and_charges"),
- ("grand_total", "base_grand_total"),
- ("grand_total_export", "grand_total"),
- ("rounded_total", "base_rounded_total"),
- ("rounded_total_export", "rounded_total"),
- ("in_words", "base_in_words"),
- ("in_words_export", "in_words")
-)
-
-buying_renamed_fields = (
- ("net_total", "base_net_total"),
- ("net_total_import", "net_total"),
- ("grand_total", "base_grand_total"),
- ("grand_total_import", "grand_total"),
- ("rounded_total", "base_rounded_total"),
- ("in_words", "base_in_words"),
- ("in_words_import", "in_words"),
- ("other_charges_added", "base_taxes_and_charges_added"),
- ("other_charges_added_import", "taxes_and_charges_added"),
- ("other_charges_deducted", "base_taxes_and_charges_deducted"),
- ("other_charges_deducted_import", "taxes_and_charges_deducted"),
- ("total_tax", "base_total_taxes_and_charges")
-)
-
-def execute():
- for doctypes, fields in [[selling_doctypes, selling_renamed_fields], [buying_doctypes, buying_renamed_fields]]:
- for dt in doctypes:
- frappe.reload_doc(get_doctype_module(dt), "doctype", scrub(dt))
- table_columns = frappe.db.get_table_columns(dt)
- base_net_total = frappe.db.sql("select sum(ifnull({0}, 0)) from `tab{1}`".format(fields[0][1], dt))[0][0]
- if not base_net_total:
- for f in fields:
- if f[0] in table_columns:
- rename_field(dt, f[0], f[1])
-
- # Added new field "total_taxes_and_charges" in buying cycle, updating value
- if dt in ("Supplier Quotation", "Purchase Order", "Purchase Receipt", "Purchase Invoice"):
- frappe.db.sql("""update `tab{0}` set total_taxes_and_charges =
- round(base_total_taxes_and_charges/conversion_rate, 2)""".format(dt))
diff --git a/erpnext/patches/v5_0/replace_renamed_fields_in_custom_scripts_and_print_formats.py b/erpnext/patches/v5_0/replace_renamed_fields_in_custom_scripts_and_print_formats.py
deleted file mode 100644
index c564f8b02ab..00000000000
--- a/erpnext/patches/v5_0/replace_renamed_fields_in_custom_scripts_and_print_formats.py
+++ /dev/null
@@ -1,65 +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
-import re
-
-def execute():
- # NOTE: sequence is important
- renamed_fields = get_all_renamed_fields()
-
- for dt, script_field, ref_dt_field in (("Client Script", "script", "dt"), ("Print Format", "html", "doc_type")):
-
- cond1 = " or ".join("""{0} like "%%{1}%%" """.format(script_field, d[0].replace("_", "\\_")) for d in renamed_fields)
- cond2 = " and standard = 'No'" if dt == "Print Format" else ""
-
- for name, script, ref_dt in frappe.db.sql("select name, {0} as script, {1} as ref_dt from `tab{2}` where ({3}) {4}".format(script_field, ref_dt_field, dt, cond1, cond2)):
- update_script(dt, name, ref_dt, script_field, script, renamed_fields)
-
-def get_all_renamed_fields():
- from erpnext.patches.v5_0.rename_table_fieldnames import rename_map
-
- renamed_fields = (
- ("base_amount", "base_net_amount"),
- ("net_total", "base_net_total"),
- ("net_total_export", "total"),
- ("net_total_import", "total"),
- ("other_charges_total", "base_total_taxes_and_charges"),
- ("other_charges_total_export", "total_taxes_and_charges"),
- ("other_charges_added", "base_taxes_and_charges_added"),
- ("other_charges_added_import", "taxes_and_charges_added"),
- ("other_charges_deducted", "base_taxes_and_charges_deducted"),
- ("other_charges_deducted_import", "taxes_and_charges_deducted"),
- ("total_tax", "base_total_taxes_and_charges"),
- ("grand_total", "base_grand_total"),
- ("grand_total_export", "grand_total"),
- ("grand_total_import", "grand_total"),
- ("rounded_total", "base_rounded_total"),
- ("rounded_total_export", "rounded_total"),
- ("rounded_total_import", "rounded_total"),
- ("in_words", "base_in_words"),
- ("in_words_export", "in_words"),
- ("in_words_import", "in_words"),
- ("tax_amount", "base_tax_amount"),
- ("tax_amount_after_discount_amount", "base_tax_amount_after_discount_amount"),
- )
-
- for fields in rename_map.values():
- renamed_fields += tuple(fields)
-
- return renamed_fields
-
-def update_script(dt, name, ref_dt, script_field, script, renamed_fields):
- for from_field, to_field in renamed_fields:
- if from_field != "entries":
- script = re.sub(r"\b{}\b".format(from_field), to_field, script)
-
- if ref_dt == "Journal Entry":
- script = re.sub(r"\bentries\b", "accounts", script)
- elif ref_dt == "Bank Reconciliation":
- script = re.sub(r"\bentries\b", "journal_entries", script)
- elif ref_dt in ("Sales Invoice", "Purchase Invoice"):
- script = re.sub(r"\bentries\b", "items", script)
-
- frappe.db.set_value(dt, name, script_field, script)
\ No newline at end of file
diff --git a/erpnext/patches/v5_0/repost_gle_for_jv_with_multiple_party.py b/erpnext/patches/v5_0/repost_gle_for_jv_with_multiple_party.py
deleted file mode 100644
index 76efdcc7c6b..00000000000
--- a/erpnext/patches/v5_0/repost_gle_for_jv_with_multiple_party.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import print_function, unicode_literals
-import frappe
-
-def execute():
- je_list = frappe.db.sql_list("""
- select par.name from `tabJournal Entry` par
- where par.docstatus=1 and par.creation > '2015-03-01'
- and (select count(distinct child.party) from `tabJournal Entry Account` child
- where par.name=child.parent and ifnull(child.party, '') != '') > 1
- """)
-
- for d in je_list:
- # delete existing gle
- frappe.db.sql("delete from `tabGL Entry` where voucher_type='Journal Entry' and voucher_no=%s", d)
-
- # repost gl entries
- je = frappe.get_doc("Journal Entry", d)
- je.make_gl_entries()
-
- if je_list:
- print(je_list)
-
-
\ No newline at end of file
diff --git a/erpnext/patches/v5_0/repost_requested_qty.py b/erpnext/patches/v5_0/repost_requested_qty.py
deleted file mode 100644
index 6af71f3fc49..00000000000
--- a/erpnext/patches/v5_0/repost_requested_qty.py
+++ /dev/null
@@ -1,21 +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():
- from erpnext.stock.stock_balance import update_bin_qty, get_indented_qty
-
- count=0
- for item_code, warehouse in frappe.db.sql("""select distinct item_code, warehouse
- from `tabMaterial Request Item` where docstatus = 1"""):
- try:
- count += 1
- update_bin_qty(item_code, warehouse, {
- "indented_qty": get_indented_qty(item_code, warehouse),
- })
- if count % 200 == 0:
- frappe.db.commit()
- except:
- frappe.db.rollback()
diff --git a/erpnext/patches/v5_0/reset_values_in_tools.py b/erpnext/patches/v5_0/reset_values_in_tools.py
deleted file mode 100644
index fd970ba1b04..00000000000
--- a/erpnext/patches/v5_0/reset_values_in_tools.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) 2013, 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 ["Payment Tool", "Bank Reconciliation", "Payment Reconciliation", "Leave Control Panel",
- "Salary Manager", "Upload Attenadance", "Production Planning Tool", "BOM Update Tool", "Customize Form",
- "Employee Attendance Tool", "Rename Tool", "BOM Update Tool", "Process Payroll", "Naming Series"]:
- frappe.db.sql("delete from `tabSingles` where doctype=%s", dt)
-
\ No newline at end of file
diff --git a/erpnext/patches/v5_0/set_appraisal_remarks.py b/erpnext/patches/v5_0/set_appraisal_remarks.py
deleted file mode 100644
index 8652c32cf0e..00000000000
--- a/erpnext/patches/v5_0/set_appraisal_remarks.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2013, 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_doctype("Appraisal")
- frappe.db.sql("update `tabAppraisal` set remarks = comments")
\ No newline at end of file
diff --git a/erpnext/patches/v5_0/set_default_company_in_bom.py b/erpnext/patches/v5_0/set_default_company_in_bom.py
deleted file mode 100644
index a5cd7611199..00000000000
--- a/erpnext/patches/v5_0/set_default_company_in_bom.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():
- frappe.reload_doc("manufacturing", "doctype", "bom")
- company = frappe.db.get_value("Global Defaults", None, "default_company")
- frappe.db.sql("""update `tabBOM` set company = %s""",company)
diff --git a/erpnext/patches/v5_0/set_footer_address.py b/erpnext/patches/v5_0/set_footer_address.py
deleted file mode 100644
index 8120d834e1f..00000000000
--- a/erpnext/patches/v5_0/set_footer_address.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- frappe.reload_doctype("System Settings")
- ss = frappe.get_doc("System Settings", "System Settings")
- ss.email_footer_address = frappe.db.get_default("company")
- ss.flags.ignore_mandatory = True
- ss.save()
diff --git a/erpnext/patches/v5_0/stock_entry_update_value.py b/erpnext/patches/v5_0/stock_entry_update_value.py
deleted file mode 100644
index ba1af310f55..00000000000
--- a/erpnext/patches/v5_0/stock_entry_update_value.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-
-def execute():
- for d in frappe.db.get_all("Stock Entry"):
- se = frappe.get_doc("Stock Entry", d.name)
- se.set_total_incoming_outgoing_value()
- se.db_update()
diff --git a/erpnext/patches/v5_0/taxes_and_totals_in_party_currency.py b/erpnext/patches/v5_0/taxes_and_totals_in_party_currency.py
deleted file mode 100644
index 76d10820b58..00000000000
--- a/erpnext/patches/v5_0/taxes_and_totals_in_party_currency.py
+++ /dev/null
@@ -1,80 +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
-from frappe.model.meta import get_field_precision
-from frappe.custom.doctype.property_setter.property_setter import make_property_setter
-
-def execute():
- selling_doctypes = ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice"]
- buying_doctypes = ["Supplier Quotation", "Purchase Order", "Purchase Receipt", "Purchase Invoice"]
-
- for dt in selling_doctypes:
- update_values(dt, "Sales Taxes and Charges")
-
- for dt in buying_doctypes:
- update_values(dt, "Purchase Taxes and Charges")
-
-def update_values(dt, tax_table):
- frappe.reload_doctype(dt)
- frappe.reload_doctype(dt + " Item")
- frappe.reload_doctype(tax_table)
-
- net_total_precision = get_field_precision(frappe.get_meta(dt).get_field("net_total"))
- for field in ("total", "base_total", "base_net_total"):
- make_property_setter(dt, field, "precision", net_total_precision, "Select")
-
- rate_field_precision = get_field_precision(frappe.get_meta(dt + " Item").get_field("rate"))
- for field in ("net_rate", "base_net_rate", "net_amount", "base_net_amount", "base_rate", "base_amount"):
- make_property_setter(dt + " Item", field, "precision", rate_field_precision, "Select")
-
- tax_amount_precision = get_field_precision(frappe.get_meta(tax_table).get_field("tax_amount"))
- for field in ("base_tax_amount", "total", "base_total", "tax_amount_after_discount_amount",
- "base_tax_amount_after_discount_amount"):
- make_property_setter(tax_table, field, "precision", tax_amount_precision, "Select")
-
- # update net_total, discount_on
- frappe.db.sql("""
- UPDATE
- `tab{0}`
- SET
- total = round(net_total, {1}),
- base_total = round(net_total*conversion_rate, {1}),
- net_total = round(base_net_total / conversion_rate, {1}),
- apply_discount_on = "Grand Total"
- WHERE
- docstatus < 2
- """.format(dt, net_total_precision))
-
- # update net_amount
- frappe.db.sql("""
- UPDATE
- `tab{0}` par, `tab{1}` item
- SET
- item.base_net_amount = round(item.base_amount, {2}),
- item.base_net_rate = round(item.base_rate, {2}),
- item.net_amount = round(item.base_amount / par.conversion_rate, {2}),
- item.net_rate = round(item.base_rate / par.conversion_rate, {2}),
- item.base_amount = round(item.amount * par.conversion_rate, {2}),
- item.base_rate = round(item.rate * par.conversion_rate, {2})
- WHERE
- par.name = item.parent
- and par.docstatus < 2
- """.format(dt, dt + " Item", rate_field_precision))
-
- # update tax in party currency
- frappe.db.sql("""
- UPDATE
- `tab{0}` par, `tab{1}` tax
- SET
- tax.base_tax_amount = round(tax.tax_amount, {2}),
- tax.tax_amount = round(tax.tax_amount / par.conversion_rate, {2}),
- tax.base_total = round(tax.total, {2}),
- tax.total = round(tax.total / conversion_rate, {2}),
- tax.base_tax_amount_after_discount_amount = round(tax.tax_amount_after_discount_amount, {2}),
- tax.tax_amount_after_discount_amount = round(tax.tax_amount_after_discount_amount / conversion_rate, {2})
- WHERE
- par.name = tax.parent
- and par.docstatus < 2
- """.format(dt, tax_table, tax_amount_precision))
diff --git a/erpnext/patches/v5_0/update_account_types.py b/erpnext/patches/v5_0/update_account_types.py
deleted file mode 100644
index 424743efaa7..00000000000
--- a/erpnext/patches/v5_0/update_account_types.py
+++ /dev/null
@@ -1,20 +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 company in frappe.db.get_all("Company"):
- company = frappe.get_doc("Company", company.name)
-
- match_types = ("Stock Received But Not Billed", "Stock Adjustment", "Expenses Included In Valuation",
- "Cost of Goods Sold")
-
- for account_type in match_types:
- account_name = "{0} - {1}".format(account_type, company.abbr)
- current_account_type = frappe.db.get_value("Account", account_name, "account_type")
- if current_account_type != account_type:
- frappe.db.set_value("Account", account_name, "account_type", account_type)
-
- company.set_default_accounts()
diff --git a/erpnext/patches/v5_0/update_advance_paid.py b/erpnext/patches/v5_0/update_advance_paid.py
deleted file mode 100644
index 74e71e84c82..00000000000
--- a/erpnext/patches/v5_0/update_advance_paid.py
+++ /dev/null
@@ -1,13 +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", "Purchase Order"):
- orders_with_advance = frappe.db.sql("""select name from `tab{0}`
- where docstatus < 2 and ifnull(advance_paid, 0) != 0""".format(dt), as_dict=1)
-
- for order in orders_with_advance:
- frappe.get_doc(dt, order.name).set_total_advance_paid()
\ No newline at end of file
diff --git a/erpnext/patches/v5_0/update_companywise_payment_account.py b/erpnext/patches/v5_0/update_companywise_payment_account.py
deleted file mode 100644
index fb4b919c859..00000000000
--- a/erpnext/patches/v5_0/update_companywise_payment_account.py
+++ /dev/null
@@ -1,21 +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', 'mode_of_payment')
- frappe.reload_doc('accounts', 'doctype', 'mode_of_payment_account')
-
- mode_of_payment_list = frappe.db.sql("""select name, default_account
- from `tabMode of Payment`""", as_dict=1)
-
- for d in mode_of_payment_list:
- if d.get("default_account"):
- parent_doc = frappe.get_doc("Mode of Payment", d.get("name"))
-
- parent_doc.set("accounts",
- [{"company": frappe.db.get_value("Account", d.get("default_account"), "company"),
- "default_account": d.get("default_account")}])
- parent_doc.save()
diff --git a/erpnext/patches/v5_0/update_dn_against_doc_fields.py b/erpnext/patches/v5_0/update_dn_against_doc_fields.py
deleted file mode 100644
index 56f4f484b13..00000000000
--- a/erpnext/patches/v5_0/update_dn_against_doc_fields.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():
- frappe.reload_doc('stock', 'doctype', 'delivery_note_item')
-
- frappe.db.sql("""update `tabDelivery Note Item` set so_detail = prevdoc_detail_docname
- where ifnull(against_sales_order, '') != ''""")
-
- frappe.db.sql("""update `tabDelivery Note Item` set si_detail = prevdoc_detail_docname
- where ifnull(against_sales_invoice, '') != ''""")
diff --git a/erpnext/patches/v5_0/update_from_bom.py b/erpnext/patches/v5_0/update_from_bom.py
deleted file mode 100644
index 4b3e62d7a55..00000000000
--- a/erpnext/patches/v5_0/update_from_bom.py
+++ /dev/null
@@ -1,9 +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_doctype("Stock Entry")
- frappe.db.sql("update `tabStock Entry` set from_bom = if(ifnull(bom_no, '')='', 0, 1)")
diff --git a/erpnext/patches/v5_0/update_frozen_accounts_permission_role.py b/erpnext/patches/v5_0/update_frozen_accounts_permission_role.py
deleted file mode 100644
index b52785ae605..00000000000
--- a/erpnext/patches/v5_0/update_frozen_accounts_permission_role.py
+++ /dev/null
@@ -1,13 +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():
- account_settings = frappe.get_doc("Accounts Settings")
-
- if not account_settings.frozen_accounts_modifier and account_settings.bde_auth_role:
- frappe.db.set_value("Accounts Settings", None,
- "frozen_accounts_modifier", account_settings.bde_auth_role)
-
diff --git a/erpnext/patches/v5_0/update_item_and_description_again.py b/erpnext/patches/v5_0/update_item_and_description_again.py
deleted file mode 100644
index 35dedcc072b..00000000000
--- a/erpnext/patches/v5_0/update_item_and_description_again.py
+++ /dev/null
@@ -1,50 +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
-from frappe.utils import cstr
-import re
-
-def execute():
- item_details = frappe._dict()
- for d in frappe.db.sql("select name, description from `tabItem`", as_dict=1):
- description = cstr(d.description).strip()
- new_desc = extract_description(description)
-
- item_details.setdefault(d.name, frappe._dict({
- "old_description": description,
- "new_description": new_desc
- }))
-
-
- dt_list= ["Purchase Order Item","Supplier Quotation Item", "BOM", "BOM Explosion Item" , \
- "BOM Item", "Opportunity Item" , "Quotation Item" , "Sales Order Item" , "Delivery Note Item" , \
- "Material Request Item" , "Purchase Receipt Item" , "Stock Entry Detail"]
- for dt in dt_list:
- frappe.reload_doctype(dt)
- records = frappe.db.sql("""select name, `{0}` as item_code, description from `tab{1}`
- where description is not null and description like '%%' 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 4c0c6a9313e..00000000000
--- 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 16681357e68..00000000000
--- 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 54d492b2658..00000000000
--- 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 9292a1be1b9..00000000000
--- 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 0c6b4ea598d..00000000000
--- 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 e90de50c1ec..00000000000
--- 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 d99e9a41e3b..00000000000
--- 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 2d562bb40ec..00000000000
--- 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 117c40c59f2..00000000000
--- 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 d630e8f0f2d..00000000000
--- 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 9b2b24785a5..00000000000
--- 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 203471ea8f2..00000000000
--- 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 519ff49eac1..00000000000
--- 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 7372b0cc5ff..00000000000
--- 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 65b1c74e87d..00000000000
--- 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 33f809fe37e..00000000000
--- 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 d1ec7c697e7..00000000000
--- 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 3690a2e79d4..00000000000
--- 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 3b5a7d95eb1..00000000000
--- 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 aca21085cc1..00000000000
--- 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 d3f0263c102..00000000000
--- 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 dd9a432cf01..00000000000
--- 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 2a2d420f21c..00000000000
--- 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 3b68e22269a..00000000000
--- 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 929beac27f4..00000000000
--- 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 093c0bf6d94..00000000000
--- 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 8426ddcd7d9..00000000000
--- 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 9a59209ea52..00000000000
--- 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 24ca0570e01..00000000000
--- 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 851af80f7a2..00000000000
--- 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 a2a48a62e1a..00000000000
--- 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 824f2b881f0..00000000000
--- 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 482586b8efe..00000000000
--- 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 b9c96028f52..00000000000
--- 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 baffc488252..00000000000
--- 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 d2583b94224..00000000000
--- 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 200434c208d..00000000000
--- 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 542ac11e3f2..00000000000
--- 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 ec6f8afc3a5..00000000000
--- 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 f3ec628374c..00000000000
--- 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 7289e4a9158..00000000000
--- 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 7f06d8f1239..00000000000
--- 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 c6520b1b725..00000000000
--- 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 6388be438db..00000000000
--- 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 4eef2b9c8a7..00000000000
--- 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 d0295557470..00000000000
--- 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 57432fe9861..00000000000
--- 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 2b5e774d467..00000000000
--- 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 a69052657dd..00000000000
--- 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 c66f3f2e73a..00000000000
--- 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 9f589ef00e1..00000000000
--- 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 147f5a36435..00000000000
--- 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 9fcce62d8ff..00000000000
--- 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 e8eef6e7da1..00000000000
--- 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 baffc488252..00000000000
--- 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 b5f22342284..00000000000
--- 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 68ff95b5ed7..00000000000
--- 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 cf1bc5af057..00000000000
--- 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 3ef4f3c1bb4..00000000000
--- 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 12cacdb9528..00000000000
--- 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 09a78ed3ca6..00000000000
--- 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 4ba78d172cb..00000000000
--- 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 1088d702dd0..00000000000
--- 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 2e7f360c97b..00000000000
--- 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 9750fb72222..00000000000
--- 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 fb9021fd687..00000000000
--- 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 b59d81831f1..00000000000
--- 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 78322d4575e..00000000000
--- 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 e517df5fdb9..00000000000
--- 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 5ad862a4362..00000000000
--- 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 40654387961..00000000000
--- 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 3030b8e2f37..00000000000
--- 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 60cbb33b80b..00000000000
--- 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 d479ece8a69..00000000000
--- 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 197d6ded61a..00000000000
--- 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 d4287978cf8..00000000000
--- 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 8a4ef4086b6..00000000000
--- 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 a772ae90c5d..00000000000
--- 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 8e993cc1020..00000000000
--- 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 1a29fc4db4f..00000000000
--- 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 19d27b206b1..00000000000
--- 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 1f937bb8af8..00000000000
--- 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 be5cf3aed77..00000000000
--- 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 ae24fe4a14e..00000000000
--- 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 a2173048fd4..00000000000
--- 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 e69de29bb2d..00000000000
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 0fce96a8d4e..00000000000
--- 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 46316026068..00000000000
--- 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 4c606af4243..00000000000
--- 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 3e0fdee7192..00000000000
--- 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 34255eb0a42..00000000000
--- 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 3962f8f1f21..00000000000
--- 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 0936b2231bb..00000000000
--- 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 af2d28b857f..00000000000
--- 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 4c1b85a13f0..00000000000
--- 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 7aaf2d5ff31..00000000000
--- 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 e69de29bb2d..00000000000
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 992be17da04..00000000000
--- 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 e69de29bb2d..00000000000
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 6c4c6d5bd8d..00000000000
--- 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 78efecb3872..00000000000
--- 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 baffc488252..00000000000
--- 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 73afa277b4b..00000000000
--- 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 e69de29bb2d..00000000000
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 82beba37702..00000000000
--- 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 70a08f53776..00000000000
--- 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 2d7df4a179d..00000000000
--- 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 34ecbb0a3c3..00000000000
--- 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 2661914401b..00000000000
--- 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 497da0602e3..00000000000
--- 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 e69de29bb2d..00000000000
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 014a74abe36..00000000000
--- 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 ef5f335e45f..00000000000
--- 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 db4f94748e1..00000000000
--- 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 2d46bee7caa..00000000000
--- 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 e69de29bb2d..00000000000
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 99ecb442149..00000000000
--- 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 2932749116f..00000000000
--- 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 e69de29bb2d..00000000000
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 bd25f15d789..00000000000
--- 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 5b169cdff2b..00000000000
--- 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 8b137891791..00000000000
--- 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 77501073cf4..00000000000
--- 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 f67af90555a..00000000000
--- 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 808ae6d5271..00000000000
--- 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 5433eb673e4..00000000000
--- 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 cbbe09daf5d..00000000000
--- 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 a550d093fab..00000000000
--- 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 33bbc11a93c..00000000000
--- 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 3c508eaa097..00000000000
--- 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 24e20409c19..00000000000
--- 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 baffc488252..00000000000
--- 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 3c0433b9d49..00000000000
--- 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 8a8c8064dde..00000000000
--- 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 14278209c75..00000000000
--- 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 c685bbc6818..00000000000
--- 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 493873f3e80..00000000000
--- 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 f38b7f29cec..00000000000
--- 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 a3a97352150..00000000000
--- 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 3d012978fab..00000000000
--- 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 5092695b7d9..00000000000
--- 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 9e783d99beb..00000000000
--- 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 82d6148508a..00000000000
--- 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 += "
";
+ frappe.throw({
+ message: message,
+ indicator: 'red',
+ title: __('Missing Fields')
+ });
}
+
return {
query: "erpnext.payroll.doctype.payroll_entry.payroll_entry.employee_query",
filters: frm.events.get_employee_filters(frm)
@@ -148,25 +164,22 @@ frappe.ui.form.on('Payroll Entry', {
get_employee_filters: function (frm) {
let filters = {};
- filters['company'] = frm.doc.company;
- filters['start_date'] = frm.doc.start_date;
- filters['end_date'] = frm.doc.end_date;
filters['salary_slip_based_on_timesheet'] = frm.doc.salary_slip_based_on_timesheet;
- filters['payroll_frequency'] = frm.doc.payroll_frequency;
- filters['payroll_payable_account'] = frm.doc.payroll_payable_account;
- filters['currency'] = frm.doc.currency;
- if (frm.doc.department) {
- filters['department'] = frm.doc.department;
- }
- if (frm.doc.branch) {
- filters['branch'] = frm.doc.branch;
- }
- if (frm.doc.designation) {
- filters['designation'] = frm.doc.designation;
- }
+ let fields = ['company', 'start_date', 'end_date', 'payroll_frequency', 'payroll_payable_account',
+ 'currency', 'department', 'branch', 'designation'];
+
+ fields.forEach(field => {
+ if (frm.doc[field]) {
+ filters[field] = frm.doc[field];
+ }
+ });
+
if (frm.doc.employees) {
- filters['employees'] = frm.doc.employees.filter(d => d.employee).map(d => d.employee);
+ let employees = frm.doc.employees.filter(d => d.employee).map(d => d.employee);
+ if (employees && employees.length) {
+ filters['employees'] = employees;
+ }
}
return filters;
},
diff --git a/erpnext/payroll/doctype/payroll_entry/payroll_entry.py b/erpnext/payroll/doctype/payroll_entry/payroll_entry.py
index 3953b463f12..13cc423fc2c 100644
--- a/erpnext/payroll/doctype/payroll_entry/payroll_entry.py
+++ b/erpnext/payroll/doctype/payroll_entry/payroll_entry.py
@@ -11,6 +11,7 @@ from frappe import _
from erpnext.accounts.utils import get_fiscal_year
from erpnext.hr.doctype.employee.employee import get_holiday_list_for_employee
from frappe.desk.reportview import get_match_cond, get_filters_cond
+from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions
class PayrollEntry(Document):
def onload(self):
@@ -41,7 +42,7 @@ class PayrollEntry(Document):
emp_with_sal_slip.append(employee_details.employee)
if len(emp_with_sal_slip):
- frappe.throw(_("Salary Slip already exists for {0} ").format(comma_and(emp_with_sal_slip)))
+ frappe.throw(_("Salary Slip already exists for {0}").format(comma_and(emp_with_sal_slip)))
def on_cancel(self):
frappe.delete_doc("Salary Slip", frappe.db.sql_list("""select name from `tabSalary Slip`
@@ -116,7 +117,6 @@ class PayrollEntry(Document):
Creates salary slip for selected employees if already not created
"""
self.check_permission('write')
- self.created = 1
employees = [emp.employee for emp in self.employees]
if employees:
args = frappe._dict({
@@ -211,7 +211,7 @@ class PayrollEntry(Document):
return account_dict
def make_accrual_jv_entry(self):
- self.check_permission('write')
+ self.check_permission("write")
earnings = self.get_salary_component_total(component_type = "earnings") or {}
deductions = self.get_salary_component_total(component_type = "deductions") or {}
payroll_payable_account = self.payroll_payable_account
@@ -219,12 +219,13 @@ class PayrollEntry(Document):
precision = frappe.get_precision("Journal Entry Account", "debit_in_account_currency")
if earnings or deductions:
- journal_entry = frappe.new_doc('Journal Entry')
- journal_entry.voucher_type = 'Journal Entry'
- journal_entry.user_remark = _('Accrual Journal Entry for salaries from {0} to {1}')\
+ journal_entry = frappe.new_doc("Journal Entry")
+ journal_entry.voucher_type = "Journal Entry"
+ journal_entry.user_remark = _("Accrual Journal Entry for salaries from {0} to {1}")\
.format(self.start_date, self.end_date)
journal_entry.company = self.company
journal_entry.posting_date = self.posting_date
+ accounting_dimensions = get_accounting_dimensions() or []
accounts = []
currencies = []
@@ -236,37 +237,34 @@ class PayrollEntry(Document):
for acc_cc, amount in earnings.items():
exchange_rate, amt = self.get_amount_and_exchange_rate_for_journal_entry(acc_cc[0], amount, company_currency, currencies)
payable_amount += flt(amount, precision)
- accounts.append({
+ accounts.append(self.update_accounting_dimensions({
"account": acc_cc[0],
"debit_in_account_currency": flt(amt, precision),
"exchange_rate": flt(exchange_rate),
- "party_type": '',
"cost_center": acc_cc[1] or self.cost_center,
"project": self.project
- })
+ }, accounting_dimensions))
# Deductions
for acc_cc, amount in deductions.items():
exchange_rate, amt = self.get_amount_and_exchange_rate_for_journal_entry(acc_cc[0], amount, company_currency, currencies)
payable_amount -= flt(amount, precision)
- accounts.append({
+ accounts.append(self.update_accounting_dimensions({
"account": acc_cc[0],
"credit_in_account_currency": flt(amt, precision),
"exchange_rate": flt(exchange_rate),
"cost_center": acc_cc[1] or self.cost_center,
- "party_type": '',
"project": self.project
- })
+ }, accounting_dimensions))
# Payable amount
exchange_rate, payable_amt = self.get_amount_and_exchange_rate_for_journal_entry(payroll_payable_account, payable_amount, company_currency, currencies)
- accounts.append({
+ accounts.append(self.update_accounting_dimensions({
"account": payroll_payable_account,
"credit_in_account_currency": flt(payable_amt, precision),
"exchange_rate": flt(exchange_rate),
- "party_type": '',
"cost_center": self.cost_center
- })
+ }, accounting_dimensions))
journal_entry.set("accounts", accounts)
if len(currencies) > 1:
@@ -286,6 +284,12 @@ class PayrollEntry(Document):
return jv_name
+ def update_accounting_dimensions(self, row, accounting_dimensions):
+ for dimension in accounting_dimensions:
+ row.update({dimension: self.get(dimension)})
+
+ return row
+
def get_amount_and_exchange_rate_for_journal_entry(self, account, amount, company_currency, currencies):
conversion_rate = 1
exchange_rate = self.exchange_rate
@@ -454,6 +458,7 @@ def get_emp_list(sal_struct, cond, end_date, payroll_payable_account):
where
t1.name = t2.employee
and t2.docstatus = 1
+ and t1.status != 'Inactive'
%s order by t2.from_date desc
""" % cond, {"sal_struct": tuple(sal_struct), "from_date": end_date, "payroll_payable_account": payroll_payable_account}, as_dict=True)
@@ -665,6 +670,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):
@@ -672,9 +679,13 @@ def employee_query(doctype, txt, searchfield, start, page_len, filters):
conditions = []
include_employees = []
emp_cond = ''
+
+ if not filters.payroll_frequency:
+ frappe.throw(_('Select Payroll Frequency.'))
+
if filters.start_date and filters.end_date:
employee_list = get_employee_list(filters)
- emp = filters.get('employees')
+ emp = filters.get('employees') or []
include_employees = [employee.employee for employee in employee_list if employee.employee not in emp]
filters.pop('start_date')
filters.pop('end_date')
diff --git a/erpnext/payroll/doctype/payroll_entry/test_payroll_entry.py b/erpnext/payroll/doctype/payroll_entry/test_payroll_entry.py
index 7528bf7a7f8..b80b32061f3 100644
--- a/erpnext/payroll/doctype/payroll_entry/test_payroll_entry.py
+++ b/erpnext/payroll/doctype/payroll_entry/test_payroll_entry.py
@@ -15,7 +15,13 @@ from erpnext.payroll.doctype.salary_structure.test_salary_structure import make_
from erpnext.loan_management.doctype.loan.test_loan import create_loan, make_loan_disbursement_entry, create_loan_type, create_loan_accounts
from erpnext.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual import process_loan_interest_accrual_for_term_loans
+test_dependencies = ['Holiday List']
+
class TestPayrollEntry(unittest.TestCase):
+ @classmethod
+ def setUpClass(cls):
+ frappe.db.set_value("Company", erpnext.get_default_company(), "default_holiday_list", '_Test Holiday List')
+
def setUp(self):
for dt in ["Salary Slip", "Salary Component", "Salary Component Account",
"Payroll Entry", "Salary Structure", "Salary Structure Assignment", "Payroll Employee Detail", "Additional Salary"]:
diff --git a/erpnext/payroll/doctype/retention_bonus/retention_bonus.py b/erpnext/payroll/doctype/retention_bonus/retention_bonus.py
index b8e56ae42aa..049ea265cce 100644
--- a/erpnext/payroll/doctype/retention_bonus/retention_bonus.py
+++ b/erpnext/payroll/doctype/retention_bonus/retention_bonus.py
@@ -10,8 +10,8 @@ from frappe.utils import getdate
class RetentionBonus(Document):
def validate(self):
- if frappe.get_value('Employee', self.employee, 'status') == 'Left':
- frappe.throw(_('Cannot create Retention Bonus for left Employees'))
+ if frappe.get_value('Employee', self.employee, 'status') != 'Active':
+ frappe.throw(_('Cannot create Retention Bonus for Left or Inactive Employees'))
if getdate(self.bonus_payment_date) < getdate():
frappe.throw(_('Bonus Payment Date cannot be a past date'))
diff --git a/erpnext/payroll/doctype/salary_slip/salary_slip.py b/erpnext/payroll/doctype/salary_slip/salary_slip.py
index afdf081ac89..bead880ef70 100644
--- a/erpnext/payroll/doctype/salary_slip/salary_slip.py
+++ b/erpnext/payroll/doctype/salary_slip/salary_slip.py
@@ -115,10 +115,23 @@ class SalarySlip(TransactionBase):
status = "Cancelled"
return status
- def validate_dates(self):
+ def validate_dates(self, joining_date=None, relieving_date=None):
if date_diff(self.end_date, self.start_date) < 0:
frappe.throw(_("To date cannot be before From date"))
+ if not joining_date:
+ joining_date, relieving_date = frappe.get_cached_value(
+ "Employee",
+ self.employee,
+ ("date_of_joining", "relieving_date")
+ )
+
+ if date_diff(self.end_date, joining_date) < 0:
+ frappe.throw(_("Cannot create Salary Slip for Employee joining after Payroll Period"))
+
+ if relieving_date and date_diff(relieving_date, self.start_date) < 0:
+ frappe.throw(_("Cannot create Salary Slip for Employee who has left before Payroll Period"))
+
def is_rounding_total_disabled(self):
return cint(frappe.db.get_single_value("Payroll Settings", "disable_rounded_total"))
@@ -154,9 +167,14 @@ class SalarySlip(TransactionBase):
if not self.salary_slip_based_on_timesheet:
self.get_date_details()
- self.validate_dates()
- joining_date, relieving_date = frappe.get_cached_value("Employee", self.employee,
- ["date_of_joining", "relieving_date"])
+
+ joining_date, relieving_date = frappe.get_cached_value(
+ "Employee",
+ self.employee,
+ ("date_of_joining", "relieving_date")
+ )
+
+ self.validate_dates(joining_date, relieving_date)
#getin leave details
self.get_working_days_details(joining_date, relieving_date)
@@ -492,11 +510,39 @@ class SalarySlip(TransactionBase):
def get_data_for_eval(self):
'''Returns data for evaluating formula'''
data = frappe._dict()
+ employee = frappe.get_doc("Employee", self.employee).as_dict()
- data.update(frappe.get_doc("Salary Structure Assignment",
- {"employee": self.employee, "salary_structure": self.salary_structure}).as_dict())
+ start_date = getdate(self.start_date)
+ date_to_validate = (
+ employee.date_of_joining
+ if employee.date_of_joining > start_date
+ else start_date
+ )
- data.update(frappe.get_doc("Employee", self.employee).as_dict())
+ salary_structure_assignment = frappe.get_value(
+ "Salary Structure Assignment",
+ {
+ "employee": self.employee,
+ "salary_structure": self.salary_structure,
+ "from_date": ("<=", date_to_validate),
+ "docstatus": 1,
+ },
+ "*",
+ order_by="from_date desc",
+ as_dict=True,
+ )
+
+ if not salary_structure_assignment:
+ frappe.throw(
+ _("Please assign a Salary Structure for Employee {0} "
+ "applicable from or before {1} first").format(
+ frappe.bold(self.employee_name),
+ frappe.bold(formatdate(date_to_validate)),
+ )
+ )
+
+ data.update(salary_structure_assignment)
+ data.update(employee)
data.update(self.as_dict())
# set values for components
@@ -1045,6 +1091,7 @@ class SalarySlip(TransactionBase):
"applicant": self.employee,
"docstatus": 1,
"repay_from_salary": 1,
+ "company": self.company
})
def make_loan_repayment_entry(self):
diff --git a/erpnext/payroll/doctype/salary_slip/test_salary_slip.py b/erpnext/payroll/doctype/salary_slip/test_salary_slip.py
index 01e4170d311..6e8d3b3f306 100644
--- a/erpnext/payroll/doctype/salary_slip/test_salary_slip.py
+++ b/erpnext/payroll/doctype/salary_slip/test_salary_slip.py
@@ -8,7 +8,6 @@ import erpnext
import calendar
import random
from erpnext.accounts.utils import get_fiscal_year
-from frappe.utils.make_random import get_random
from frappe.utils import getdate, nowdate, add_days, add_months, flt, get_first_day, get_last_day, cstr
from erpnext.payroll.doctype.salary_structure.salary_structure import make_salary_slip
from erpnext.payroll.doctype.payroll_entry.payroll_entry import get_month_details
@@ -155,12 +154,14 @@ class TestSalarySlip(unittest.TestCase):
self.assertEqual(ss.gross_pay, 78000)
def test_payment_days(self):
+ from erpnext.payroll.doctype.salary_structure.test_salary_structure import create_salary_structure_assignment
+
no_of_days = self.get_no_of_days()
# Holidays not included in working days
frappe.db.set_value("Payroll Settings", None, "include_holidays_in_total_working_days", 1)
# set joinng date in the same month
- make_employee("test_payment_days@salary.com")
+ employee = make_employee("test_payment_days@salary.com")
if getdate(nowdate()).day >= 15:
relieving_date = getdate(add_days(nowdate(),-10))
date_of_joining = getdate(add_days(nowdate(),-10))
@@ -174,25 +175,30 @@ class TestSalarySlip(unittest.TestCase):
date_of_joining = getdate(nowdate())
relieving_date = getdate(nowdate())
- frappe.db.set_value("Employee", frappe.get_value("Employee",
- {"employee_name":"test_payment_days@salary.com"}, "name"), "date_of_joining", date_of_joining)
- frappe.db.set_value("Employee", frappe.get_value("Employee",
- {"employee_name":"test_payment_days@salary.com"}, "name"), "relieving_date", None)
- frappe.db.set_value("Employee", frappe.get_value("Employee",
- {"employee_name":"test_payment_days@salary.com"}, "name"), "status", "Active")
+ frappe.db.set_value("Employee", employee, {
+ "date_of_joining": date_of_joining,
+ "relieving_date": None,
+ "status": "Active"
+ })
- ss = make_employee_salary_slip("test_payment_days@salary.com", "Monthly", "Test Payment Days")
+ salary_structure = "Test Payment Days"
+ ss = make_employee_salary_slip("test_payment_days@salary.com", "Monthly", salary_structure)
self.assertEqual(ss.total_working_days, no_of_days[0])
self.assertEqual(ss.payment_days, (no_of_days[0] - getdate(date_of_joining).day + 1))
# set relieving date in the same month
- frappe.db.set_value("Employee",frappe.get_value("Employee",
- {"employee_name":"test_payment_days@salary.com"}, "name"), "date_of_joining", (add_days(nowdate(),-60)))
- frappe.db.set_value("Employee", frappe.get_value("Employee",
- {"employee_name":"test_payment_days@salary.com"}, "name"), "relieving_date", relieving_date)
- frappe.db.set_value("Employee", frappe.get_value("Employee",
- {"employee_name":"test_payment_days@salary.com"}, "name"), "status", "Left")
+ frappe.db.set_value("Employee", employee, {
+ "date_of_joining": add_days(nowdate(),-60),
+ "relieving_date": relieving_date,
+ "status": "Left"
+ })
+
+ if date_of_joining.day > 1:
+ self.assertRaises(frappe.ValidationError, ss.save)
+
+ create_salary_structure_assignment(employee, salary_structure)
+ ss.reload()
ss.save()
self.assertEqual(ss.total_working_days, no_of_days[0])
@@ -285,6 +291,7 @@ class TestSalarySlip(unittest.TestCase):
def test_multi_currency_salary_slip(self):
from erpnext.payroll.doctype.salary_structure.test_salary_structure import make_salary_structure
+
applicant = make_employee("test_multi_currency_salary_slip@salary.com", company="_Test Company")
frappe.db.sql("""delete from `tabSalary Structure` where name='Test Multi Currency Salary Slip'""")
salary_structure = make_salary_structure("Test Multi Currency Salary Slip", "Monthly", employee=applicant, company="_Test Company", currency='USD')
@@ -325,7 +332,8 @@ class TestSalarySlip(unittest.TestCase):
def test_component_wise_year_to_date_computation(self):
from erpnext.payroll.doctype.salary_structure.test_salary_structure import make_salary_structure
- applicant = make_employee("test_ytd@salary.com", company="_Test Company")
+ employee_name = "test_component_wise_ytd@salary.com"
+ applicant = make_employee(employee_name, company="_Test Company")
payroll_period = create_payroll_period(name="_Test Payroll Period 1", company="_Test Company")
@@ -336,13 +344,13 @@ class TestSalarySlip(unittest.TestCase):
"Monthly", employee=applicant, company="_Test Company", currency="INR", payroll_period=payroll_period)
# clear salary slip for this employee
- frappe.db.sql("DELETE FROM `tabSalary Slip` where employee_name = 'test_ytd@salary.com'")
+ frappe.db.sql("DELETE FROM `tabSalary Slip` where employee_name = '%s'" % employee_name)
create_salary_slips_for_payroll_period(applicant, salary_structure.name,
payroll_period, deduct_random=False, num=3)
salary_slips = frappe.get_all("Salary Slip", fields=["name"], filters={"employee_name":
- "test_ytd@salary.com"}, order_by = "posting_date")
+ employee_name}, order_by="posting_date")
year_to_date = dict()
for slip in salary_slips:
@@ -380,10 +388,10 @@ class TestSalarySlip(unittest.TestCase):
from erpnext.payroll.doctype.salary_structure.test_salary_structure import \
make_salary_structure, create_salary_structure_assignment
+
salary_structure = make_salary_structure("Stucture to test tax", "Monthly",
- other_details={"max_benefits": 100000}, test_tax=True)
- create_salary_structure_assignment(employee, salary_structure.name,
- payroll_period.start_date)
+ other_details={"max_benefits": 100000}, test_tax=True,
+ employee=employee, payroll_period=payroll_period)
# create salary slip for whole period deducting tax only on last period
# to find the total tax amount paid
@@ -469,17 +477,24 @@ class TestSalarySlip(unittest.TestCase):
def make_employee_salary_slip(user, payroll_frequency, salary_structure=None):
from erpnext.payroll.doctype.salary_structure.test_salary_structure import make_salary_structure
+
if not salary_structure:
salary_structure = payroll_frequency + " Salary Structure Test for Salary Slip"
- employee = frappe.db.get_value("Employee", {"user_id": user})
- salary_structure_doc = make_salary_structure(salary_structure, payroll_frequency, employee=employee)
+
+ employee = frappe.db.get_value("Employee",
+ {
+ "user_id": user
+ },
+ ["name", "company", "employee_name"],
+ as_dict=True)
+
+ salary_structure_doc = make_salary_structure(salary_structure, payroll_frequency, employee=employee.name, company=employee.company)
salary_slip_name = frappe.db.get_value("Salary Slip", {"employee": frappe.db.get_value("Employee", {"user_id": user})})
if not salary_slip_name:
- salary_slip = make_salary_slip(salary_structure_doc.name, employee = employee)
- salary_slip.employee_name = frappe.get_value("Employee",
- {"name":frappe.db.get_value("Employee", {"user_id": user})}, "employee_name")
+ salary_slip = make_salary_slip(salary_structure_doc.name, employee = employee.name)
+ salary_slip.employee_name = employee.employee_name
salary_slip.payroll_frequency = payroll_frequency
salary_slip.posting_date = nowdate()
salary_slip.insert()
diff --git a/erpnext/payroll/doctype/salary_structure/test_salary_structure.py b/erpnext/payroll/doctype/salary_structure/test_salary_structure.py
index 36387f23df0..3957d834d33 100644
--- a/erpnext/payroll/doctype/salary_structure/test_salary_structure.py
+++ b/erpnext/payroll/doctype/salary_structure/test_salary_structure.py
@@ -6,7 +6,7 @@ import frappe
import unittest
import erpnext
from frappe.utils.make_random import get_random
-from frappe.utils import nowdate, add_days, add_years, getdate, add_months
+from frappe.utils import nowdate, add_years, get_first_day, date_diff
from erpnext.payroll.doctype.salary_structure.salary_structure import make_salary_slip
from erpnext.payroll.doctype.salary_slip.test_salary_slip import make_earning_salary_component,\
make_deduction_salary_component, make_employee_salary_slip, create_tax_slab
@@ -113,36 +113,49 @@ class TestSalaryStructure(unittest.TestCase):
sal_struct = make_salary_structure("Salary Structure Multi Currency", "Monthly", currency='USD')
self.assertEqual(sal_struct.currency, 'USD')
-def make_salary_structure(salary_structure, payroll_frequency, employee=None, dont_submit=False, other_details=None,
- test_tax=False, company=None, currency=erpnext.get_default_currency(), payroll_period=None):
+def make_salary_structure(salary_structure, payroll_frequency, employee=None,
+ from_date=None, dont_submit=False, other_details=None,test_tax=False,
+ company=None, currency=erpnext.get_default_currency(), payroll_period=None):
if test_tax:
frappe.db.sql("""delete from `tabSalary Structure` where name=%s""",(salary_structure))
- if not frappe.db.exists('Salary Structure', salary_structure):
- details = {
- "doctype": "Salary Structure",
- "name": salary_structure,
- "company": company or erpnext.get_default_company(),
- "earnings": make_earning_salary_component(test_tax=test_tax, company_list=["_Test Company"]),
- "deductions": make_deduction_salary_component(test_tax=test_tax, company_list=["_Test Company"]),
- "payroll_frequency": payroll_frequency,
- "payment_account": get_random("Account", filters={'account_currency': currency}),
- "currency": currency
- }
- if other_details and isinstance(other_details, dict):
- details.update(other_details)
- salary_structure_doc = frappe.get_doc(details)
- salary_structure_doc.insert()
- if not dont_submit:
- salary_structure_doc.submit()
+ if frappe.db.exists("Salary Structure", salary_structure):
+ frappe.db.delete("Salary Structure", salary_structure)
- else:
- salary_structure_doc = frappe.get_doc("Salary Structure", salary_structure)
+ details = {
+ "doctype": "Salary Structure",
+ "name": salary_structure,
+ "company": company or erpnext.get_default_company(),
+ "earnings": make_earning_salary_component(setup=True, test_tax=test_tax, company_list=["_Test Company"]),
+ "deductions": make_deduction_salary_component(setup=True, test_tax=test_tax, company_list=["_Test Company"]),
+ "payroll_frequency": payroll_frequency,
+ "payment_account": get_random("Account", filters={'account_currency': currency}),
+ "currency": currency
+ }
+ if other_details and isinstance(other_details, dict):
+ details.update(other_details)
+ salary_structure_doc = frappe.get_doc(details)
+ salary_structure_doc.insert()
+ if not dont_submit:
+ salary_structure_doc.submit()
+
+ filters = {'employee':employee, 'docstatus': 1}
+ if not from_date and payroll_period:
+ from_date = payroll_period.start_date
+
+ if from_date:
+ filters['from_date'] = from_date
if employee and not frappe.db.get_value("Salary Structure Assignment",
- {'employee':employee, 'docstatus': 1}) and salary_structure_doc.docstatus==1:
- create_salary_structure_assignment(employee, salary_structure, company=company, currency=currency,
- payroll_period=payroll_period)
+ filters) and salary_structure_doc.docstatus==1:
+ create_salary_structure_assignment(
+ employee,
+ salary_structure,
+ from_date=from_date,
+ company=company,
+ currency=currency,
+ payroll_period=payroll_period
+ )
return salary_structure_doc
@@ -165,12 +178,13 @@ def create_salary_structure_assignment(employee, salary_structure, from_date=Non
salary_structure_assignment.base = 50000
salary_structure_assignment.variable = 5000
- if getdate(nowdate()).day == 1:
- date = from_date or nowdate()
- else:
- date = from_date or add_days(nowdate(), -1)
+ if not from_date:
+ from_date = get_first_day(nowdate())
+ joining_date = frappe.get_cached_value("Employee", employee, "date_of_joining")
+ if date_diff(joining_date, from_date) > 0:
+ from_date = joining_date
- salary_structure_assignment.from_date = date
+ salary_structure_assignment.from_date = from_date
salary_structure_assignment.salary_structure = salary_structure
salary_structure_assignment.currency = currency
salary_structure_assignment.payroll_payable_account = get_payable_account(company)
@@ -183,4 +197,4 @@ def create_salary_structure_assignment(employee, salary_structure, from_date=Non
def get_payable_account(company=None):
if not company:
company = erpnext.get_default_company()
- return frappe.db.get_value("Company", company, "default_payroll_payable_account")
\ No newline at end of file
+ return frappe.db.get_value("Company", company, "default_payroll_payable_account")
diff --git a/erpnext/portal/product_configurator/test_product_configurator.py b/erpnext/portal/product_configurator/test_product_configurator.py
index 3521e7e8bf0..daaba671736 100644
--- a/erpnext/portal/product_configurator/test_product_configurator.py
+++ b/erpnext/portal/product_configurator/test_product_configurator.py
@@ -43,6 +43,30 @@ class TestProductConfigurator(unittest.TestCase):
"show_variant_in_website": 1
}).insert()
+ def create_regular_web_item(self, name, item_group=None):
+ if not frappe.db.exists('Item', name):
+ doc = frappe.get_doc({
+ "description": name,
+ "item_code": name,
+ "item_name": name,
+ "doctype": "Item",
+ "is_stock_item": 1,
+ "item_group": item_group or "_Test Item Group",
+ "stock_uom": "_Test UOM",
+ "item_defaults": [{
+ "company": "_Test Company",
+ "default_warehouse": "_Test Warehouse - _TC",
+ "expense_account": "_Test Account Cost for Goods Sold - _TC",
+ "buying_cost_center": "_Test Cost Center - _TC",
+ "selling_cost_center": "_Test Cost Center - _TC",
+ "income_account": "Sales - _TC"
+ }],
+ "show_in_website": 1
+ }).insert()
+ else:
+ doc = frappe.get_doc("Item", name)
+ return doc
+
def test_product_list(self):
template_items = frappe.get_all('Item', {'show_in_website': 1})
variant_items = frappe.get_all('Item', {'show_variant_in_website': 1})
@@ -79,3 +103,42 @@ class TestProductConfigurator(unittest.TestCase):
'Test Size': ['2XL']
})
self.assertEqual(len(items), 1)
+
+ def test_products_in_multiple_item_groups(self):
+ """Check if product is visible on multiple item group pages barring its own."""
+ from erpnext.shopping_cart.product_query import ProductQuery
+
+ if not frappe.db.exists("Item Group", {"name": "Tech Items"}):
+ item_group_doc = frappe.get_doc({
+ "doctype": "Item Group",
+ "item_group_name": "Tech Items",
+ "parent_item_group": "All Item Groups",
+ "show_in_website": 1
+ }).insert()
+ else:
+ item_group_doc = frappe.get_doc("Item Group", "Tech Items")
+
+ doc = self.create_regular_web_item("Portal Item", item_group="Tech Items")
+ if not frappe.db.exists("Website Item Group", {"parent": "Portal Item"}):
+ doc.append("website_item_groups", {
+ "item_group": "_Test Item Group Desktops"
+ })
+ doc.save()
+
+ # check if item is visible in its own Item Group's page
+ engine = ProductQuery()
+ items = engine.query({}, {"item_group": "Tech Items"}, None, start=0, item_group="Tech Items")
+ self.assertEqual(len(items), 1)
+ self.assertEqual(items[0].item_code, "Portal Item")
+
+ # check if item is visible in configured foreign Item Group's page
+ engine = ProductQuery()
+ items = engine.query({}, {"item_group": "_Test Item Group Desktops"}, None, start=0, item_group="_Test Item Group Desktops")
+ item_codes = [row.item_code for row in items]
+
+ self.assertIn(len(items), [2, 3])
+ self.assertIn("Portal Item", item_codes)
+
+ # teardown
+ doc.delete()
+ item_group_doc.delete()
\ No newline at end of file
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index d1583f1473c..39a6024e2cc 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 a3e4577f909..c8bd80fca0a 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_profitability/test_project_profitability.py b/erpnext/projects/report/project_profitability/test_project_profitability.py
index ea6bdb54ca3..180926fe258 100644
--- a/erpnext/projects/report/project_profitability/test_project_profitability.py
+++ b/erpnext/projects/report/project_profitability/test_project_profitability.py
@@ -1,7 +1,7 @@
from __future__ import unicode_literals
import unittest
import frappe
-from frappe.utils import getdate, nowdate
+from frappe.utils import getdate, nowdate, add_days
from erpnext.hr.doctype.employee.test_employee import make_employee
from erpnext.projects.doctype.timesheet.test_timesheet import make_salary_structure_for_timesheet, make_timesheet
from erpnext.projects.doctype.timesheet.timesheet import make_salary_slip, make_sales_invoice
@@ -16,17 +16,22 @@ class TestProjectProfitability(unittest.TestCase):
make_salary_structure_for_timesheet(emp, company='_Test Company')
self.timesheet = make_timesheet(emp, simulate = True, is_billable=1)
self.salary_slip = make_salary_slip(self.timesheet.name)
+ holidays = self.salary_slip.get_holidays_for_employee(nowdate(), nowdate())
+ if holidays:
+ frappe.db.set_value('Payroll Settings', None, 'include_holidays_in_total_working_days', 1)
+
self.salary_slip.submit()
self.sales_invoice = make_sales_invoice(self.timesheet.name, '_Test Item', '_Test Customer')
self.sales_invoice.due_date = nowdate()
self.sales_invoice.submit()
frappe.db.set_value('HR Settings', None, 'standard_working_hours', 8)
+ frappe.db.set_value('Payroll Settings', None, 'include_holidays_in_total_working_days', 0)
def test_project_profitability(self):
filters = {
'company': '_Test Company',
- 'start_date': getdate(),
+ 'start_date': add_days(getdate(), -3),
'end_date': getdate()
}
diff --git a/erpnext/projects/report/project_summary/project_summary.py b/erpnext/projects/report/project_summary/project_summary.py
index 2c7bb49cfba..98dd617f9b3 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 ceeecb28a25..7b997a11530 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/buying.js b/erpnext/public/js/controllers/buying.js
index e7dcd410682..5c9f5d7da43 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -122,9 +122,20 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
this.set_from_product_bundle();
}
+ this.toggle_subcontracting_fields();
this._super();
},
+ toggle_subcontracting_fields: function() {
+ if (in_list(['Purchase Receipt', 'Purchase Invoice'], this.frm.doc.doctype)) {
+ this.frm.fields_dict.supplied_items.grid.update_docfield_property('consumed_qty',
+ 'read_only', this.frm.doc.__onload && this.frm.doc.__onload.backflush_based_on === 'BOM');
+
+ this.frm.set_df_property('supplied_items', 'cannot_add_rows', 1);
+ this.frm.set_df_property('supplied_items', 'cannot_delete_rows', 1);
+ }
+ },
+
supplier: function() {
var me = this;
erpnext.utils.get_party_details(this.frm, null, null, function(){
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 2e133bed2eb..1de9ec1a7df 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,66 @@ 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 = {};
+ let item_tax_templates = {};
+
+ $.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;
+ item_tax_templates[item.name] = item.item_tax_template;
+ }
+ });
+
+ 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,
+ item_tax_templates: item_tax_templates
+ },
+ callback: function(r) {
+ if (!r.exc) {
+ $.each(me.frm.doc.items || [], function(i, item) {
+ if (item.name && r.message.hasOwnProperty(item.name) && r.message[item.name].item_tax_template) {
+ 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);
+ }
+ });
+ }
+ }
+ });
+ }
+ },
+
+ 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 +469,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 +532,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 +630,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 e153e6ccbc7..b3af3d67eaa 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);
@@ -261,11 +259,19 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
if(!in_list(["Delivery Note", "Sales Invoice", "Purchase Receipt", "Purchase Invoice"], this.frm.doc.doctype)) {
return;
}
- var me = this;
- var inspection_type = in_list(["Purchase Receipt", "Purchase Invoice"], this.frm.doc.doctype)
+
+ const me = this;
+ if (!this.frm.is_new() && this.frm.doc.docstatus === 0) {
+ this.frm.add_custom_button(__("Quality Inspection(s)"), () => {
+ me.make_quality_inspection();
+ }, __("Create"));
+ this.frm.page.set_inner_btn_group_as_primary(__('Create'));
+ }
+
+ const inspection_type = in_list(["Purchase Receipt", "Purchase Invoice"], this.frm.doc.doctype)
? "Incoming" : "Outgoing";
- var quality_inspection_field = this.frm.get_docfield("items", "quality_inspection");
+ let quality_inspection_field = this.frm.get_docfield("items", "quality_inspection");
quality_inspection_field.get_route_options_for_new_doc = function(row) {
if(me.frm.is_new()) return;
return {
@@ -280,7 +286,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}
this.frm.set_query("quality_inspection", "items", function(doc, cdt, cdn) {
- var d = locals[cdt][cdn];
+ let d = locals[cdt][cdn];
return {
filters: {
docstatus: 1,
@@ -381,7 +387,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
if(this.frm.doc.scan_barcode) {
frappe.call({
- method: "erpnext.selling.page.point_of_sale.point_of_sale.search_serial_or_batch_or_barcode_number",
+ method: "erpnext.selling.page.point_of_sale.point_of_sale.search_for_serial_or_batch_or_barcode_number",
args: { search_value: this.frm.doc.scan_barcode }
}).then(r => {
const data = r && r.message;
@@ -556,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,
@@ -712,30 +719,14 @@ 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);
+ if (item && item.doctype === 'Purchase Receipt Item Supplied') {
+ return;
+ }
+
if (item && item.serial_no) {
if (!item.item_code) {
this.frm.trigger("item_code", cdt, cdn);
@@ -835,9 +826,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()
]);
}
}
@@ -877,9 +868,6 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}
- if (this.frm.doc.posting_date) var date = this.frm.doc.posting_date;
- else var date = this.frm.doc.transaction_date;
-
if (frappe.meta.get_docfield(this.frm.doctype, "shipping_address") &&
in_list(['Purchase Order', 'Purchase Receipt', 'Purchase Invoice'], this.frm.doctype)) {
erpnext.utils.get_shipping_address(this.frm, function(){
@@ -953,15 +941,15 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
(this.frm.doc.payment_schedule && this.frm.doc.payment_schedule.length)) {
var message1 = "";
var message2 = "";
- var final_message = "Please clear the ";
+ var final_message = __("Please clear the") + " ";
if (this.frm.doc.payment_terms_template) {
- message1 = "selected Payment Terms Template";
+ message1 = __("selected Payment Terms Template");
final_message = final_message + message1;
}
if ((this.frm.doc.payment_schedule || []).length) {
- message2 = "Payment Schedule Table";
+ message2 = __("Payment Schedule Table");
if (message1.length !== 0) message2 = " and " + message2;
final_message = final_message + message2;
}
@@ -1816,7 +1804,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();
}
}
@@ -1827,43 +1814,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
@@ -1949,6 +1900,130 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
});
},
+ make_quality_inspection: function () {
+ let data = [];
+ const fields = [
+ {
+ label: "Items",
+ fieldtype: "Table",
+ fieldname: "items",
+ cannot_add_rows: true,
+ in_place_edit: true,
+ data: data,
+ get_data: () => {
+ return data;
+ },
+ fields: [
+ {
+ fieldtype: "Data",
+ fieldname: "docname",
+ hidden: true
+ },
+ {
+ fieldtype: "Read Only",
+ fieldname: "item_code",
+ label: __("Item Code"),
+ in_list_view: true
+ },
+ {
+ fieldtype: "Read Only",
+ fieldname: "item_name",
+ label: __("Item Name"),
+ in_list_view: true
+ },
+ {
+ fieldtype: "Float",
+ fieldname: "qty",
+ label: __("Accepted Quantity"),
+ in_list_view: true,
+ read_only: true
+ },
+ {
+ fieldtype: "Float",
+ fieldname: "sample_size",
+ label: __("Sample Size"),
+ reqd: true,
+ in_list_view: true
+ },
+ {
+ fieldtype: "Data",
+ fieldname: "description",
+ label: __("Description"),
+ hidden: true
+ },
+ {
+ fieldtype: "Data",
+ fieldname: "serial_no",
+ label: __("Serial No"),
+ hidden: true
+ },
+ {
+ fieldtype: "Data",
+ fieldname: "batch_no",
+ label: __("Batch No"),
+ hidden: true
+ }
+ ]
+ }
+ ];
+
+ const me = this;
+ const dialog = new frappe.ui.Dialog({
+ title: __("Select Items for Quality Inspection"),
+ fields: fields,
+ primary_action: function () {
+ const data = dialog.get_values();
+ frappe.call({
+ method: "erpnext.controllers.stock_controller.make_quality_inspections",
+ args: {
+ doctype: me.frm.doc.doctype,
+ docname: me.frm.doc.name,
+ items: data.items
+ },
+ freeze: true,
+ callback: function (r) {
+ if (r.message.length > 0) {
+ if (r.message.length === 1) {
+ frappe.set_route("Form", "Quality Inspection", r.message[0]);
+ } else {
+ frappe.route_options = {
+ "reference_type": me.frm.doc.doctype,
+ "reference_name": me.frm.doc.name
+ };
+ frappe.set_route("List", "Quality Inspection");
+ }
+ }
+ dialog.hide();
+ }
+ });
+ },
+ primary_action_label: __("Create")
+ });
+
+ this.frm.doc.items.forEach(item => {
+ if (!item.quality_inspection) {
+ let dialog_items = dialog.fields_dict.items;
+ dialog_items.df.data.push({
+ "docname": item.name,
+ "item_code": item.item_code,
+ "item_name": item.item_name,
+ "qty": item.qty,
+ "description": item.description,
+ "serial_no": item.serial_no,
+ "batch_no": item.batch_no
+ });
+ dialog_items.grid.refresh();
+ }
+ });
+
+ data = dialog.fields_dict.items.df.data;
+ if (!data.length) {
+ frappe.msgprint(__("All items in this document already have a linked Quality Inspection."));
+ } else {
+ dialog.show();
+ }
+ },
+
get_method_for_payment: function(){
var method = "erpnext.accounts.doctype.payment_entry.payment_entry.get_payment_entry";
if(cur_frm.doc.__onload && cur_frm.doc.__onload.make_payment_via_journal_entry){
diff --git a/erpnext/public/js/education/lms/quiz.js b/erpnext/public/js/education/lms/quiz.js
index 32fa4ab1ecf..66160a7610c 100644
--- a/erpnext/public/js/education/lms/quiz.js
+++ b/erpnext/public/js/education/lms/quiz.js
@@ -20,10 +20,8 @@ class Quiz {
}
make(data) {
- if (data.duration) {
- const timer_display = document.createElement("div");
- timer_display.classList.add("lms-timer", "float-right", "font-weight-bold");
- document.getElementsByClassName("lms-title")[0].appendChild(timer_display);
+ if (data.is_time_bound) {
+ $(".lms-timer").removeClass("hide");
if (!data.activity || (data.activity && !data.activity.is_complete)) {
this.initialiseTimer(data.duration);
this.is_time_bound = true;
@@ -118,7 +116,7 @@ class Quiz {
quiz_response: this.get_selected(),
course: this.course,
program: this.program,
- time_taken: this.is_time_bound ? this.time_taken : ""
+ time_taken: this.is_time_bound ? this.time_taken : 0
}).then(res => {
this.submit_btn.remove()
if (!res.message) {
@@ -237,4 +235,4 @@ class Question {
this.options = option_list
this.wrapper.appendChild(options_wrapper)
}
-}
\ No newline at end of file
+}
diff --git a/erpnext/public/js/help_links.js b/erpnext/public/js/help_links.js
index e78992302f1..aa9bba17c77 100644
--- a/erpnext/public/js/help_links.js
+++ b/erpnext/public/js/help_links.js
@@ -644,14 +644,14 @@ frappe.help.help_links["List/Payment Request"] = [
frappe.help.help_links["List/Asset"] = [
{
label: "Managing Fixed Assets",
- url: docsUrl + "user/manual/en/accounts/managing-fixed-assets",
+ url: docsUrl + "user/manual/en/accounts/opening-balance/fixed_assets",
},
];
frappe.help.help_links["List/Asset Category"] = [
{
label: "Asset Category",
- url: docsUrl + "user/manual/en/accounts/managing-fixed-assets",
+ url: docsUrl + "user/manual/en/asset/asset-category",
},
];
@@ -663,7 +663,7 @@ frappe.help.help_links["List/Item"] = [
{ label: "Item", url: docsUrl + "user/manual/en/stock/item" },
{
label: "Item Price",
- url: docsUrl + "user/manual/en/stock/item/item-price",
+ url: docsUrl + "user/manual/en/stock/item-price",
},
{
label: "Barcode",
@@ -672,25 +672,25 @@ frappe.help.help_links["List/Item"] = [
},
{
label: "Item Wise Taxation",
- url: docsUrl + "user/manual/en/accounts/item-wise-taxation",
+ url: docsUrl + "user/manual/en/accounts/item-tax-template",
},
{
label: "Managing Fixed Assets",
- url: docsUrl + "user/manual/en/accounts/managing-fixed-assets",
+ url: docsUrl + "user/manual/en/accounts/opening-balance/fixed_assets",
},
{
label: "Item Codification",
- url: docsUrl + "user/manual/en/stock/item/item-codification",
+ url: docsUrl + "user/manual/en/stock/articles/item-codification",
},
{
label: "Item Variants",
- url: docsUrl + "user/manual/en/stock/item/item-variants",
+ url: docsUrl + "user/manual/en/stock/item-variants",
},
{
label: "Item Valuation",
url:
docsUrl +
- "user/manual/en/stock/item/item-valuation-fifo-and-moving-average",
+ "user/manual/en/stock/articles/item-valuation-fifo-and-moving-average",
},
];
@@ -698,7 +698,7 @@ frappe.help.help_links["Form/Item"] = [
{ label: "Item", url: docsUrl + "user/manual/en/stock/item" },
{
label: "Item Price",
- url: docsUrl + "user/manual/en/stock/item/item-price",
+ url: docsUrl + "user/manual/en/stock/item-price",
},
{
label: "Barcode",
@@ -707,19 +707,19 @@ frappe.help.help_links["Form/Item"] = [
},
{
label: "Item Wise Taxation",
- url: docsUrl + "user/manual/en/accounts/item-wise-taxation",
+ url: docsUrl + "user/manual/en/accounts/item-tax-template",
},
{
label: "Managing Fixed Assets",
- url: docsUrl + "user/manual/en/accounts/managing-fixed-assets",
+ url: docsUrl + "user/manual/en/accounts/opening-balance/fixed_assets",
},
{
label: "Item Codification",
- url: docsUrl + "user/manual/en/stock/item/item-codification",
+ url: docsUrl + "user/manual/en/stock/articles/item-codification",
},
{
label: "Item Variants",
- url: docsUrl + "user/manual/en/stock/item/item-variants",
+ url: docsUrl + "user/manual/en/stock/item-variants",
},
{
label: "Item Valuation",
diff --git a/erpnext/public/js/payment/payments.js b/erpnext/public/js/payment/payments.js
index 0d656bc1fb6..ddf87068097 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/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js
index ef03b01698c..6f5d67c7462 100644
--- a/erpnext/public/js/setup_wizard.js
+++ b/erpnext/public/js/setup_wizard.js
@@ -147,7 +147,7 @@ erpnext.setup.slides_settings = [
}
// Validate bank name
- if(me.values.bank_account){
+ if(me.values.bank_account) {
frappe.call({
async: false,
method: "erpnext.accounts.doctype.account.chart_of_accounts.chart_of_accounts.validate_bank_account",
diff --git a/erpnext/public/js/utils/party.js b/erpnext/public/js/utils/party.js
index 808dd5add05..a79eadc7619 100644
--- a/erpnext/public/js/utils/party.js
+++ b/erpnext/public/js/utils/party.js
@@ -274,9 +274,9 @@ erpnext.utils.validate_mandatory = function(frm, label, value, trigger_on) {
return true;
}
-erpnext.utils.get_shipping_address = function(frm, callback){
+erpnext.utils.get_shipping_address = function(frm, callback) {
if (frm.doc.company) {
- if (!(frm.doc.inter_com_order_reference || frm.doc.internal_invoice_reference ||
+ if ((frm.doc.inter_company_order_reference || frm.doc.internal_invoice_reference ||
frm.doc.internal_order_reference)) {
if (callback) {
return callback();
diff --git a/erpnext/public/scss/point-of-sale.scss b/erpnext/public/scss/point-of-sale.scss
index 9bdaa8d1eeb..c77b2ce3dfa 100644
--- a/erpnext/public/scss/point-of-sale.scss
+++ b/erpnext/public/scss/point-of-sale.scss
@@ -806,6 +806,9 @@
display: none;
float: right;
font-weight: 700;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
> .cash-shortcuts {
@@ -829,6 +832,11 @@
}
}
}
+
+ > .loyalty-card {
+ display: flex;
+ flex-direction: column;
+ }
}
}
@@ -1134,4 +1142,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/erpnext/public/scss/shopping_cart.scss b/erpnext/public/scss/shopping_cart.scss
index 159a8a47cd3..5962859be5a 100644
--- a/erpnext/public/scss/shopping_cart.scss
+++ b/erpnext/public/scss/shopping_cart.scss
@@ -1,4 +1,3 @@
-@import "frappe/public/scss/desk/variables";
@import "frappe/public/scss/common/mixins";
body.product-page {
@@ -74,15 +73,6 @@ body.product-page {
}
}
- // .card-body {
- // text-align: center;
- // }
-
- // .featured-item {
- // .card-body {
- // text-align: left;
- // }
- // }
.card-img-container {
height: 210px;
width: 100%;
@@ -217,12 +207,12 @@ body.product-page {
border-color: var(--table-border-color) !important;
padding: 15px;
- @include media-breakpoint-between(xs, md) {
+ @media (max-width: var(--md-width)) {
height: 300px;
width: 300px;
}
- @include media-breakpoint-up(lg) {
+ @media (min-width: var(--lg-width)) {
height: 350px;
width: 350px;
}
@@ -233,11 +223,12 @@ body.product-page {
}
.item-slideshow {
- @include media-breakpoint-between(xs, md) {
+
+ @media (max-width: var(--md-width)) {
max-height: 320px;
}
- @include media-breakpoint-up(lg) {
+ @media (min-width: var(--lg-width)) {
max-height: 430px;
}
@@ -254,7 +245,7 @@ body.product-page {
cursor: pointer;
&:hover, &.active {
- border-color: $primary;
+ border-color: var(--primary);
}
}
@@ -316,12 +307,9 @@ body.product-page {
}
.item-group-slideshow {
- .item-group-description {
- // max-width: 900px;
- }
.carousel-inner.rounded-carousel {
- border-radius: $card-border-radius;
+ border-radius: var(--card-border-radius);
}
}
@@ -479,11 +467,15 @@ body.product-page {
.btn-change-address {
color: var(--blue-500);
- box-shadow: none;
- border: 1px solid var(--blue-500);
}
}
+.btn-new-address:hover, .btn-change-address:hover {
+ box-shadow: none;
+ color: var(--blue-500) !important;
+ border: 1px solid var(--blue-500);
+}
+
.modal .address-card {
.card-body {
padding: var(--padding-sm);
diff --git a/erpnext/public/scss/website.scss b/erpnext/public/scss/website.scss
index 56b717c4240..f4325c03f5b 100644
--- a/erpnext/public/scss/website.scss
+++ b/erpnext/public/scss/website.scss
@@ -1,4 +1,3 @@
-@import "frappe/public/scss/website/variables";
.filter-options {
max-height: 300px;
@@ -14,7 +13,7 @@
}
&.active {
- border-color: $primary;
+ border-color: var(--primary);
.check {
display: inline-flex;
@@ -25,7 +24,7 @@
.check {
display: inline-flex;
padding: 0.25rem;
- background: $primary;
+ background: var(--primary);
color: white;
border-radius: 50%;
font-size: 12px;
@@ -38,12 +37,12 @@
}
.result {
- border-bottom: 1px solid $border-color;
+ border-bottom: 1px solid var(--border-color);
}
.transaction-list-item {
padding: 1rem 0;
- border-top: 1px solid $border-color;
+ border-top: 1px solid var(--border-color);
position: relative;
a.transaction-item-link {
diff --git a/erpnext/regional/doctype/gst_settings/gst_settings.js b/erpnext/regional/doctype/gst_settings/gst_settings.js
index 808f9bc0789..cd682c5403e 100644
--- a/erpnext/regional/doctype/gst_settings/gst_settings.js
+++ b/erpnext/regional/doctype/gst_settings/gst_settings.js
@@ -35,6 +35,7 @@ frappe.ui.form.on('GST Settings', {
return {
filters: {
company: row.company,
+ account_type: "Tax",
is_group: 0
}
};
diff --git a/erpnext/regional/doctype/gst_settings/gst_settings.py b/erpnext/regional/doctype/gst_settings/gst_settings.py
index bc956e9fa88..af3d92e59a7 100644
--- a/erpnext/regional/doctype/gst_settings/gst_settings.py
+++ b/erpnext/regional/doctype/gst_settings/gst_settings.py
@@ -19,6 +19,21 @@ class GSTSettings(Document):
from tabAddress where country = "India" and ifnull(gstin, '')!='' ''')
self.set_onload('data', data)
+ def validate(self):
+ # Validate duplicate accounts
+ self.validate_duplicate_accounts()
+
+ def validate_duplicate_accounts(self):
+ account_list = []
+ for account in self.get('gst_accounts'):
+ for fieldname in ['cgst_account', 'sgst_account', 'igst_account', 'cess_account']:
+ if account.get(fieldname) in account_list:
+ frappe.throw(_("Account {0} appears multiple times").format(
+ frappe.bold(account.get(fieldname))))
+
+ if account.get(fieldname):
+ account_list.append(account.get(fieldname))
+
@frappe.whitelist()
def send_reminder():
frappe.has_permission('GST Settings', throw=True)
diff --git a/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py b/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py
index 3ddcc58867e..641520437fb 100644
--- a/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py
+++ b/erpnext/regional/doctype/gstr_3b_report/gstr_3b_report.py
@@ -310,7 +310,7 @@ class GSTR3BReport(Document):
self.report_dict['sup_details']['osup_det']['txval'] += taxable_value
gst_category = self.invoice_detail_map.get(inv, {}).get('gst_category')
- place_of_supply = self.invoice_detail_map.get(inv, {}).get('place_of_supply', '00-Other Territory')
+ place_of_supply = self.invoice_detail_map.get(inv, {}).get('place_of_supply') or '00-Other Territory'
if gst_category in ['Unregistered', 'Registered Composition', 'UIN Holders'] and \
self.gst_details.get("gst_state") != place_of_supply.split("-")[1]:
diff --git a/erpnext/regional/doctype/gstr_3b_report/test_gstr_3b_report.py b/erpnext/regional/doctype/gstr_3b_report/test_gstr_3b_report.py
index 3857ce1cdb8..065f80d610a 100644
--- a/erpnext/regional/doctype/gstr_3b_report/test_gstr_3b_report.py
+++ b/erpnext/regional/doctype/gstr_3b_report/test_gstr_3b_report.py
@@ -46,14 +46,14 @@ class TestGSTR3BReport(unittest.TestCase):
make_sales_invoice()
create_purchase_invoices()
- if frappe.db.exists("GSTR 3B Report", "GSTR3B-March-2019-_Test Address-Billing"):
- report = frappe.get_doc("GSTR 3B Report", "GSTR3B-March-2019-_Test Address-Billing")
+ if frappe.db.exists("GSTR 3B Report", "GSTR3B-March-2019-_Test Address GST-Billing"):
+ report = frappe.get_doc("GSTR 3B Report", "GSTR3B-March-2019-_Test Address GST-Billing")
report.save()
else:
report = frappe.get_doc({
"doctype": "GSTR 3B Report",
"company": "_Test Company GST",
- "company_address": "_Test Address-Billing",
+ "company_address": "_Test Address GST-Billing",
"year": getdate().year,
"month": month_number_mapping.get(getdate().month)
}).insert()
@@ -89,7 +89,7 @@ class TestGSTR3BReport(unittest.TestCase):
si.append("taxes", {
"charge_type": "On Net Total",
- "account_head": "IGST - _GST",
+ "account_head": "Output Tax IGST - _GST",
"cost_center": "Main - _GST",
"description": "IGST @ 18.0",
"rate": 18
@@ -117,7 +117,7 @@ def make_sales_invoice():
si.append("taxes", {
"charge_type": "On Net Total",
- "account_head": "IGST - _GST",
+ "account_head": "Output Tax IGST - _GST",
"cost_center": "Main - _GST",
"description": "IGST @ 18.0",
"rate": 18
@@ -138,7 +138,7 @@ def make_sales_invoice():
si1.append("taxes", {
"charge_type": "On Net Total",
- "account_head": "IGST - _GST",
+ "account_head": "Output Tax IGST - _GST",
"cost_center": "Main - _GST",
"description": "IGST @ 18.0",
"rate": 18
@@ -159,7 +159,7 @@ def make_sales_invoice():
si2.append("taxes", {
"charge_type": "On Net Total",
- "account_head": "IGST - _GST",
+ "account_head": "Output Tax IGST - _GST",
"cost_center": "Main - _GST",
"description": "IGST @ 18.0",
"rate": 18
@@ -195,7 +195,7 @@ def create_purchase_invoices():
pi.append("taxes", {
"charge_type": "On Net Total",
- "account_head": "CGST - _GST",
+ "account_head": "Input Tax CGST - _GST",
"cost_center": "Main - _GST",
"description": "CGST @ 9.0",
"rate": 9
@@ -203,7 +203,7 @@ def create_purchase_invoices():
pi.append("taxes", {
"charge_type": "On Net Total",
- "account_head": "SGST - _GST",
+ "account_head": "Input Tax SGST - _GST",
"cost_center": "Main - _GST",
"description": "SGST @ 9.0",
"rate": 9
@@ -410,10 +410,10 @@ def make_company():
company.country = "India"
company.insert()
- if not frappe.db.exists('Address', '_Test Address-Billing'):
+ if not frappe.db.exists('Address', '_Test Address GST-Billing'):
address = frappe.get_doc({
+ "address_title": "_Test Address GST",
"address_line1": "_Test Address Line 1",
- "address_title": "_Test Address",
"address_type": "Billing",
"city": "_Test City",
"state": "Test State",
@@ -444,9 +444,9 @@ def set_account_heads():
if not gst_account:
gst_settings.append("gst_accounts", {
"company": "_Test Company GST",
- "cgst_account": "CGST - _GST",
- "sgst_account": "SGST - _GST",
- "igst_account": "IGST - _GST",
+ "cgst_account": "Output Tax CGST - _GST",
+ "sgst_account": "Output Tax SGST - _GST",
+ "igst_account": "Output Tax IGST - _GST"
})
gst_settings.save()
diff --git a/erpnext/regional/india/e_invoice/einvoice.js b/erpnext/regional/india/e_invoice/einvoice.js
index 23d4fe9030b..8ad30fa9106 100644
--- a/erpnext/regional/india/e_invoice/einvoice.js
+++ b/erpnext/regional/india/e_invoice/einvoice.js
@@ -1,6 +1,8 @@
erpnext.setup_einvoice_actions = (doctype) => {
frappe.ui.form.on(doctype, {
async refresh(frm) {
+ if (frm.doc.docstatus == 2) return;
+
const res = await frappe.call({
method: 'erpnext.regional.india.e_invoice.utils.validate_eligibility',
args: { doc: frm.doc }
@@ -111,7 +113,7 @@ erpnext.setup_einvoice_actions = (doctype) => {
if (irn && ewaybill && !irn_cancelled && !eway_bill_cancelled) {
const action = () => {
- let message = __('Cancellation of e-way bill is currently not supported. ');
+ let message = __('Cancellation of e-way bill is currently not supported.') + ' ';
message += '
';
message += __('You must first use the portal to cancel the e-way bill and then update the cancelled status in the ERPNext system.');
diff --git a/erpnext/regional/india/e_invoice/utils.py b/erpnext/regional/india/e_invoice/utils.py
index 843fb012b91..ea600d90973 100644
--- a/erpnext/regional/india/e_invoice/utils.py
+++ b/erpnext/regional/india/e_invoice/utils.py
@@ -38,11 +38,14 @@ def validate_eligibility(doc):
einvoicing_eligible_from = frappe.db.get_single_value('E Invoice Settings', 'applicable_from') or '2021-04-01'
if getdate(doc.get('posting_date')) < getdate(einvoicing_eligible_from):
return False
-
+
invalid_company = not frappe.db.get_value('E Invoice User', { 'company': doc.get('company') })
invalid_supply_type = doc.get('gst_category') not in ['Registered Regular', 'SEZ', 'Overseas', 'Deemed Export']
company_transaction = doc.get('billing_address_gstin') == doc.get('company_gstin')
- no_taxes_applied = not doc.get('taxes')
+
+ # if export invoice, then taxes can be empty
+ # invoice can only be ineligible if no taxes applied and is not an export invoice
+ no_taxes_applied = not doc.get('taxes') and not doc.get('gst_category') == 'Overseas'
has_non_gst_item = any(d for d in doc.get('items', []) if d.get('is_non_gst'))
if invalid_company or invalid_supply_type or company_transaction or no_taxes_applied or has_non_gst_item:
@@ -135,7 +138,7 @@ def validate_address_fields(address, is_shipping_address):
def get_party_details(address_name, is_shipping_address=False):
addr = frappe.get_doc('Address', address_name)
-
+
validate_address_fields(addr, is_shipping_address)
if addr.gst_state_number == 97:
@@ -188,18 +191,14 @@ def get_item_list(invoice):
item.qty = abs(item.qty)
- if invoice.apply_discount_on == 'Net Total' and invoice.discount_amount:
- item.discount_amount = abs(item.base_amount - item.base_net_amount)
- else:
- item.discount_amount = 0
-
- item.unit_rate = abs((abs(item.taxable_value) - item.discount_amount)/ item.qty)
- item.gross_amount = abs(item.taxable_value) + item.discount_amount
+ item.unit_rate = abs(item.taxable_value / item.qty)
+ item.gross_amount = abs(item.taxable_value)
item.taxable_value = abs(item.taxable_value)
+ item.discount_amount = 0
item.batch_expiry_date = frappe.db.get_value('Batch', d.batch_no, 'expiry_date') if d.batch_no else None
item.batch_expiry_date = format_date(item.batch_expiry_date, 'dd/mm/yyyy') if item.batch_expiry_date else None
- item.is_service_item = 'N' if frappe.db.get_value('Item', d.item_code, 'is_stock_item') else 'Y'
+ item.is_service_item = 'Y' if item.gst_hsn_code and item.gst_hsn_code[:2] == "99" else 'N'
item.serial_no = ""
item = update_item_taxes(invoice, item)
@@ -254,18 +253,8 @@ def update_item_taxes(invoice, item):
def get_invoice_value_details(invoice):
invoice_value_details = frappe._dict(dict())
-
- if invoice.apply_discount_on == 'Net Total' and invoice.discount_amount:
- # Discount already applied on net total which means on items
- invoice_value_details.base_total = abs(sum([i.taxable_value for i in invoice.get('items')]))
- invoice_value_details.invoice_discount_amt = 0
- elif invoice.apply_discount_on == 'Grand Total' and invoice.discount_amount:
- invoice_value_details.invoice_discount_amt = invoice.base_discount_amount
- invoice_value_details.base_total = abs(sum([i.taxable_value for i in invoice.get('items')]))
- else:
- invoice_value_details.base_total = abs(sum([i.taxable_value for i in invoice.get('items')]))
- # since tax already considers discount amount
- invoice_value_details.invoice_discount_amt = 0
+ invoice_value_details.base_total = abs(sum([i.taxable_value for i in invoice.get('items')]))
+ invoice_value_details.invoice_discount_amt = 0
invoice_value_details.round_off = invoice.base_rounding_adjustment
invoice_value_details.base_grand_total = abs(invoice.base_rounded_total) or abs(invoice.base_grand_total)
@@ -287,8 +276,7 @@ def update_invoice_taxes(invoice, invoice_value_details):
considered_rows = []
for t in invoice.taxes:
- tax_amount = t.base_tax_amount if (invoice.apply_discount_on == 'Grand Total' and invoice.discount_amount) \
- else t.base_tax_amount_after_discount_amount
+ tax_amount = t.base_tax_amount_after_discount_amount
if t.account_head in gst_accounts_list:
if t.account_head in gst_accounts.cess_account:
# using after discount amt since item also uses after discount amt for cess calc
@@ -995,7 +983,7 @@ class GSPConnector():
self.invoice.failure_description = self.get_failure_message(errors) if errors else ""
self.update_invoice()
frappe.db.commit()
-
+
def get_failure_message(self, errors):
if isinstance(errors, list):
errors = ', '.join(errors)
@@ -1052,7 +1040,7 @@ def generate_einvoices(docnames):
_('{} e-invoices generated successfully').format(success),
title=_('Bulk E-Invoice Generation Complete')
)
-
+
else:
enqueue_bulk_action(schedule_bulk_generate_irn, docnames=docnames)
diff --git a/erpnext/regional/india/setup.py b/erpnext/regional/india/setup.py
index 229e0c031e3..5f9d5ed0d61 100644
--- a/erpnext/regional/india/setup.py
+++ b/erpnext/regional/india/setup.py
@@ -25,8 +25,12 @@ def setup_company_independent_fixtures(patch=False):
frappe.enqueue('erpnext.regional.india.setup.add_hsn_sac_codes', now=frappe.flags.in_test)
create_gratuity_rule()
add_print_formats()
+ update_accounts_settings_for_taxes()
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 +42,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')
@@ -674,7 +681,7 @@ def make_custom_fields(update=True):
def make_fixtures(company=None):
docs = []
- company = company.name if company else frappe.db.get_value("Global Defaults", None, "default_company")
+ company = company or frappe.db.get_value("Global Defaults", None, "default_company")
set_salary_components(docs)
set_tds_account(docs, company)
@@ -692,6 +699,53 @@ def make_fixtures(company=None):
# create records for Tax Withholding Category
set_tax_withholding_category(company)
+def update_regional_tax_settings(country, company):
+ # Will only add default GST accounts if present
+ input_account_names = ['Input Tax CGST', 'Input Tax SGST', 'Input Tax IGST']
+ output_account_names = ['Output Tax CGST', 'Output Tax SGST', 'Output Tax IGST']
+ rcm_accounts = ['Input Tax CGST RCM', 'Input Tax SGST RCM', 'Input Tax IGST RCM']
+ gst_settings = frappe.get_single('GST Settings')
+ existing_account_list = []
+
+ for account in gst_settings.get('gst_accounts'):
+ for key in ['cgst_account', 'sgst_account', 'igst_account']:
+ existing_account_list.append(account.get(key))
+
+ gst_accounts = frappe._dict(frappe.get_all("Account",
+ {'company': company, 'account_name': ('in', input_account_names +
+ output_account_names + rcm_accounts)}, ['account_name', 'name'], as_list=1))
+
+ add_accounts_in_gst_settings(company, input_account_names, gst_accounts,
+ existing_account_list, gst_settings)
+ add_accounts_in_gst_settings(company, output_account_names, gst_accounts,
+ existing_account_list, gst_settings)
+ add_accounts_in_gst_settings(company, rcm_accounts, gst_accounts,
+ existing_account_list, gst_settings, is_reverse_charge=1)
+
+ gst_settings.save()
+
+def add_accounts_in_gst_settings(company, account_names, gst_accounts,
+ existing_account_list, gst_settings, is_reverse_charge=0):
+ accounts_not_added = 1
+
+ for account in account_names:
+ # Default Account Added does not exists
+ if not gst_accounts.get(account):
+ accounts_not_added = 0
+
+ # Check if already added in GST Settings
+ if gst_accounts.get(account) in existing_account_list:
+ accounts_not_added = 0
+
+ if accounts_not_added:
+ gst_settings.append('gst_accounts', {
+ 'company': company,
+ 'cgst_account': gst_accounts.get(account_names[0]),
+ 'sgst_account': gst_accounts.get(account_names[1]),
+ 'igst_account': gst_accounts.get(account_names[2]),
+ 'is_reverse_charge_account': is_reverse_charge
+ })
+
def set_salary_components(docs):
docs.extend([
{'doctype': 'Salary Component', 'salary_component': 'Professional Tax',
@@ -725,12 +779,13 @@ def set_tax_withholding_category(company):
docs = get_tds_details(accounts, fiscal_year)
for d in docs:
- try:
+ if not frappe.db.exists("Tax Withholding Category", d.get("name")):
doc = frappe.get_doc(d)
+ doc.flags.ignore_validate = True
doc.flags.ignore_permissions = True
doc.flags.ignore_mandatory = True
doc.insert()
- except frappe.DuplicateEntryError:
+ else:
doc = frappe.get_doc("Tax Withholding Category", d.get("name"))
if accounts:
@@ -743,11 +798,12 @@ def set_tax_withholding_category(company):
doc.append("rates", d.get('rates')[0])
doc.flags.ignore_permissions = True
+ doc.flags.ignore_validate = True
doc.flags.ignore_mandatory = True
+ doc.flags.ignore_links = True
doc.save()
def set_tds_account(docs, company):
- abbr = frappe.get_value("Company", company, "abbr")
parent_account = frappe.db.get_value("Account", filters = {"account_name": "Duties and Taxes", "company": company})
if parent_account:
docs.extend([
@@ -906,7 +962,6 @@ def get_tds_details(accounts, fiscal_year):
]
def create_gratuity_rule():
-
# Standard Indain Gratuity Rule
if not frappe.db.exists("Gratuity Rule", "Indian Standard Gratuity Rule"):
rule = frappe.new_doc("Gratuity Rule")
@@ -924,3 +979,7 @@ def create_gratuity_rule():
rule.flags.ignore_mandatory = True
rule.save()
+
+def update_accounts_settings_for_taxes():
+ if frappe.db.count('Company') == 1:
+ frappe.db.set_value('Accounts Settings', None, "add_taxes_from_item_tax_template", 0)
\ No newline at end of file
diff --git a/erpnext/regional/india/utils.py b/erpnext/regional/india/utils.py
index fc227defbfc..a4466e78f28 100644
--- a/erpnext/regional/india/utils.py
+++ b/erpnext/regional/india/utils.py
@@ -500,7 +500,7 @@ def download_ewb_json():
if not isinstance(docname, list):
# removes characters not allowed in a filename (https://stackoverflow.com/a/38766141/4767738)
- filename_prefix = re.sub('[^\w_.)( -]', '', docname)
+ filename_prefix = re.sub(r'[^\w_.)( -]', '', docname)
frappe.local.response.filename = '{0}_e-WayBill_Data_{1}.json'.format(filename_prefix, frappe.utils.random_string(5))
@@ -817,12 +817,8 @@ def update_taxable_values(doc, method):
considered_rows.append(prev_row_id)
for item in doc.get('items'):
- if doc.apply_discount_on == 'Grand Total' and doc.discount_amount:
- proportionate_value = item.base_amount if doc.base_total else item.qty
- total_value = doc.base_total if doc.base_total else doc.total_qty
- else:
- proportionate_value = item.base_net_amount if doc.base_net_total else item.qty
- total_value = doc.base_net_total if doc.base_net_total else doc.total_qty
+ proportionate_value = item.base_net_amount if doc.base_net_total else item.qty
+ total_value = doc.base_net_total if doc.base_net_total else doc.total_qty
applicable_charges = flt(flt(proportionate_value * (flt(additional_taxes) / flt(total_value)),
item.precision('taxable_value')))
diff --git a/erpnext/regional/report/e_invoice_summary/e_invoice_summary.json b/erpnext/regional/report/e_invoice_summary/e_invoice_summary.json
index 4deb073a53d..d0000ad50df 100644
--- a/erpnext/regional/report/e_invoice_summary/e_invoice_summary.json
+++ b/erpnext/regional/report/e_invoice_summary/e_invoice_summary.json
@@ -11,7 +11,7 @@
"is_standard": "Yes",
"json": "{}",
"letter_head": "Logo",
- "modified": "2021-03-12 12:36:48.689413",
+ "modified": "2021-03-13 12:36:48.689413",
"modified_by": "Administrator",
"module": "Regional",
"name": "E-Invoice Summary",
diff --git a/erpnext/regional/report/gstr_1/gstr_1.py b/erpnext/regional/report/gstr_1/gstr_1.py
index 1e28a40f811..10961593e1c 100644
--- a/erpnext/regional/report/gstr_1/gstr_1.py
+++ b/erpnext/regional/report/gstr_1/gstr_1.py
@@ -147,6 +147,13 @@ class Gstr1Report(object):
def get_invoice_data(self):
self.invoices = frappe._dict()
conditions = self.get_conditions()
+
+ company_gstins = get_company_gstin_number(self.filters.get('company'), all_gstins=True)
+
+ self.filters.update({
+ 'company_gstins': company_gstins
+ })
+
invoice_data = frappe.db.sql("""
select
{select_columns}
@@ -193,6 +200,9 @@ class Gstr1Report(object):
elif self.filters.get("type_of_business") == "EXPORT":
conditions += """ AND is_return !=1 and gst_category = 'Overseas' """
+
+ conditions += " AND IFNULL(billing_address_gstin, '') NOT IN %(company_gstins)s"
+
return conditions
def get_invoice_items(self):
@@ -574,7 +584,7 @@ class Gstr1Report(object):
def get_json(filters, report_name, data):
filters = json.loads(filters)
report_data = json.loads(data)
- gstin = get_company_gstin_number(filters["company"])
+ gstin = get_company_gstin_number(filters["company"], filters["company_address"])
fp = "%02d%s" % (getdate(filters["to_date"]).month, getdate(filters["to_date"]).year)
@@ -810,23 +820,30 @@ def get_rate_and_tax_details(row, gstin):
return {"num": int(num), "itm_det": itm_det}
-def get_company_gstin_number(company):
- filters = [
- ["is_your_company_address", "=", 1],
- ["Dynamic Link", "link_doctype", "=", "Company"],
- ["Dynamic Link", "link_name", "=", company],
- ["Dynamic Link", "parenttype", "=", "Address"],
- ]
+def get_company_gstin_number(company, address=None, all_gstins=False):
+ gstin = ''
+ if address:
+ gstin = frappe.db.get_value("Address", address, "gstin")
- gstin = frappe.get_all("Address", filters=filters, fields=["gstin"])
+ if not gstin:
+ filters = [
+ ["is_your_company_address", "=", 1],
+ ["Dynamic Link", "link_doctype", "=", "Company"],
+ ["Dynamic Link", "link_name", "=", company],
+ ["Dynamic Link", "parenttype", "=", "Address"],
+ ]
+ gstin = frappe.get_all("Address", filters=filters, pluck="gstin")
+ if gstin and not all_gstins:
+ gstin = gstin[0]
- if gstin:
- return gstin[0]["gstin"]
- else:
- frappe.throw(_("Please set valid GSTIN No. in Company Address for company {0}").format(
- frappe.bold(company)
+ if not gstin:
+ address = frappe.bold(address) if address else ""
+ frappe.throw(_("Please set valid GSTIN No. in Company Address {} for company {}").format(
+ address, frappe.bold(company)
))
+ return gstin
+
@frappe.whitelist()
def download_json_file():
''' download json content in a file '''
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 51d86ff0bf8..818888c0c12 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/product_bundle/product_bundle.py b/erpnext/selling/doctype/product_bundle/product_bundle.py
index d3281f733f0..ae3482f402b 100644
--- a/erpnext/selling/doctype/product_bundle/product_bundle.py
+++ b/erpnext/selling/doctype/product_bundle/product_bundle.py
@@ -4,6 +4,8 @@
from __future__ import unicode_literals
import frappe
+from frappe.utils import get_link_to_form
+
from frappe import _
from frappe.model.document import Document
@@ -18,6 +20,27 @@ class ProductBundle(Document):
from erpnext.utilities.transaction_base import validate_uom_is_integer
validate_uom_is_integer(self, "uom", "qty")
+ def on_trash(self):
+ linked_doctypes = ["Delivery Note", "Sales Invoice", "POS Invoice", "Purchase Receipt", "Purchase Invoice",
+ "Stock Entry", "Stock Reconciliation", "Sales Order", "Purchase Order", "Material Request"]
+
+ invoice_links = []
+ for doctype in linked_doctypes:
+ item_doctype = doctype + " Item"
+
+ if doctype == "Stock Entry":
+ item_doctype = doctype + " Detail"
+
+ invoices = frappe.db.get_all(item_doctype, {"item_code": self.new_item_code, "docstatus": 1}, ["parent"])
+
+ for invoice in invoices:
+ invoice_links.append(get_link_to_form(doctype, invoice['parent']))
+
+ if len(invoice_links):
+ frappe.throw(
+ "This Product Bundle is linked with {0}. You will have to cancel these documents in order to delete this Product Bundle"
+ .format(", ".join(invoice_links)), title=_("Not Allowed"))
+
def validate_main_item(self):
"""Validates, main Item is not a stock item"""
if frappe.db.get_value("Item", self.new_item_code, "is_stock_item"):
diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index 246f9234a41..e4f8a475816 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 d9e52e1d69d..41f57a34d3d 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:
@@ -233,7 +233,7 @@ class SalesOrder(SellingController):
# Checks Sales Invoice
submit_rv = frappe.db.sql_list("""select t1.name
from `tabSales Invoice` t1,`tabSales Invoice Item` t2
- where t1.name = t2.parent and t2.sales_order = %s and t1.docstatus = 1""",
+ where t1.name = t2.parent and t2.sales_order = %s and t1.docstatus < 2""",
self.name)
if submit_rv:
diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index 987371066a7..974648d6d44 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -1217,6 +1217,19 @@ class TestSalesOrder(unittest.TestCase):
# To test if the SO does NOT have a Blanket Order
self.assertEqual(so_doc.items[0].blanket_order, None)
+ def test_so_cancellation_when_si_drafted(self):
+ """
+ Test to check if Sales Order gets cancelled if Sales Invoice is in Draft state
+ Expected result: sales order should not get cancelled
+ """
+ so = make_sales_order()
+ so.submit()
+ si = make_sales_invoice(so.name)
+ si.save()
+
+ self.assertRaises(frappe.ValidationError, so.cancel)
+
+
def make_sales_order(**args):
so = frappe.new_doc("Sales Order")
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.py b/erpnext/selling/page/point_of_sale/point_of_sale.py
index 750a1a6071d..296c8c2fd9d 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.py
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.py
@@ -8,39 +8,52 @@ from frappe.utils import cint
from erpnext.accounts.doctype.pos_profile.pos_profile import get_item_groups
from erpnext.accounts.doctype.pos_invoice.pos_invoice import get_stock_availability
-from six import string_types
+def search_by_term(search_term, warehouse, price_list):
+ result = search_for_serial_or_batch_or_barcode_number(search_term) or {}
+
+ item_code = result.get("item_code") or search_term
+ serial_no = result.get("serial_no") or ""
+ batch_no = result.get("batch_no") or ""
+ barcode = result.get("barcode") or ""
+
+ if result:
+ item_info = frappe.db.get_value("Item", item_code,
+ ["name as item_code", "item_name", "description", "stock_uom", "image as item_image", "is_stock_item"],
+ as_dict=1)
+
+ item_stock_qty = get_stock_availability(item_code, warehouse)
+ price_list_rate, currency = frappe.db.get_value('Item Price', {
+ 'price_list': price_list,
+ 'item_code': item_code
+ }, ["price_list_rate", "currency"]) or [None, None]
+
+ item_info.update({
+ 'serial_no': serial_no,
+ 'batch_no': batch_no,
+ 'barcode': barcode,
+ 'price_list_rate': price_list_rate,
+ 'currency': currency,
+ 'actual_qty': item_stock_qty
+ })
+
+ return {'items': [item_info]}
@frappe.whitelist()
-def get_items(start, page_length, price_list, item_group, pos_profile, search_value=""):
- data = dict()
+def get_items(start, page_length, price_list, item_group, pos_profile, search_term=""):
+ warehouse, hide_unavailable_items = frappe.db.get_value(
+ 'POS Profile', pos_profile, ['warehouse', 'hide_unavailable_items'])
+
result = []
- allow_negative_stock = frappe.db.get_single_value('Stock Settings', 'allow_negative_stock')
- warehouse, hide_unavailable_items = frappe.db.get_value('POS Profile', pos_profile, ['warehouse', 'hide_unavailable_items'])
+ if search_term:
+ result = search_by_term(search_term, warehouse, price_list) or []
+ if result:
+ return result
if not frappe.db.exists('Item Group', item_group):
item_group = get_root_of('Item Group')
- if search_value:
- data = search_serial_or_batch_or_barcode_number(search_value)
-
- item_code = data.get("item_code") if data.get("item_code") else search_value
- serial_no = data.get("serial_no") if data.get("serial_no") else ""
- batch_no = data.get("batch_no") if data.get("batch_no") else ""
- barcode = data.get("barcode") if data.get("barcode") else ""
-
- if data:
- item_info = frappe.db.get_value(
- "Item", data.get("item_code"),
- ["name as item_code", "item_name", "description", "stock_uom", "image as item_image", "is_stock_item"]
- , as_dict=1)
- item_info.setdefault('serial_no', serial_no)
- item_info.setdefault('batch_no', batch_no)
- item_info.setdefault('barcode', barcode)
-
- return { 'items': [item_info] }
-
- condition = get_conditions(item_code, serial_no, batch_no, barcode)
+ condition = get_conditions(search_term)
condition += get_item_group_condition(pos_profile)
lft, rgt = frappe.db.get_value('Item Group', item_group, ['lft', 'rgt'])
@@ -62,7 +75,6 @@ def get_items(start, page_length, price_list, item_group, pos_profile, search_va
`tabItem` item {bin_join_selection}
WHERE
item.disabled = 0
- AND item.is_stock_item = 1
AND item.has_variants = 0
AND item.is_sales_item = 1
AND item.is_fixed_asset = 0
@@ -84,6 +96,7 @@ def get_items(start, page_length, price_list, item_group, pos_profile, search_va
), {'warehouse': warehouse}, as_dict=1)
if items_data:
+ items_data = filter_service_items(items_data)
items = [d.item_code for d in items_data]
item_prices_data = frappe.get_all("Item Price",
fields = ["item_code", "price_list_rate", "currency"],
@@ -96,10 +109,7 @@ def get_items(start, page_length, price_list, item_group, pos_profile, search_va
for item in items_data:
item_code = item.item_code
item_price = item_prices.get(item_code) or {}
- if allow_negative_stock:
- item_stock_qty = frappe.db.sql("""select ifnull(sum(actual_qty), 0) from `tabBin` where item_code = %s""", item_code)[0][0]
- else:
- item_stock_qty = get_stock_availability(item_code, warehouse)
+ item_stock_qty = get_stock_availability(item_code, warehouse)
row = {}
row.update(item)
@@ -110,14 +120,10 @@ def get_items(start, page_length, price_list, item_group, pos_profile, search_va
})
result.append(row)
- res = {
- 'items': result
- }
-
- return res
+ return {'items': result}
@frappe.whitelist()
-def search_serial_or_batch_or_barcode_number(search_value):
+def search_for_serial_or_batch_or_barcode_number(search_value):
# search barcode no
barcode_data = frappe.db.get_value('Item Barcode', {'barcode': search_value}, ['barcode', 'parent as item_code'], as_dict=True)
if barcode_data:
@@ -135,27 +141,29 @@ def search_serial_or_batch_or_barcode_number(search_value):
return {}
-def get_conditions(item_code, serial_no, batch_no, barcode):
- if serial_no or batch_no or barcode:
- return "item.name = {0}".format(frappe.db.escape(item_code))
+def filter_service_items(items):
+ for item in items:
+ if not item['is_stock_item']:
+ if not frappe.db.exists('Product Bundle', item['item_code']):
+ items.remove(item)
+
+ return items
- return make_condition(item_code)
-
-def make_condition(item_code):
+def get_conditions(search_term):
condition = "("
- condition += """item.name like {item_code}
- or item.item_name like {item_code}""".format(item_code = frappe.db.escape('%' + item_code + '%'))
- condition += add_search_fields_condition(item_code)
+ condition += """item.name like {search_term}
+ or item.item_name like {search_term}""".format(search_term=frappe.db.escape('%' + search_term + '%'))
+ condition += add_search_fields_condition(search_term)
condition += ")"
return condition
-def add_search_fields_condition(item_code):
+def add_search_fields_condition(search_term):
condition = ''
search_fields = frappe.get_all('POS Search Fields', fields = ['fieldname'])
if search_fields:
for field in search_fields:
- condition += " or item.{0} like {1}".format(field['fieldname'], frappe.db.escape('%' + item_code + '%'))
+ condition += " or item.`{0}` like {1}".format(field['fieldname'], frappe.db.escape('%' + search_term + '%'))
return condition
def get_item_group_condition(pos_profile):
diff --git a/erpnext/selling/page/point_of_sale/pos_controller.js b/erpnext/selling/page/point_of_sale/pos_controller.js
index 4f4f1b2240b..c827368dbf5 100644
--- a/erpnext/selling/page/point_of_sale/pos_controller.js
+++ b/erpnext/selling/page/point_of_sale/pos_controller.js
@@ -241,10 +241,8 @@ erpnext.PointOfSale.Controller = class {
events: {
get_frm: () => this.frm,
- cart_item_clicked: (item_code, batch_no, uom) => {
- const search_field = batch_no ? 'batch_no' : 'item_code';
- const search_value = batch_no || item_code;
- const item_row = this.frm.doc.items.find(i => i[search_field] === search_value && i.uom === uom);
+ cart_item_clicked: (item) => {
+ const item_row = this.get_item_from_frm(item);
this.item_details.toggle_item_details_section(item_row);
},
@@ -275,18 +273,23 @@ erpnext.PointOfSale.Controller = class {
this.cart.toggle_numpad(minimize);
},
- form_updated: async (cdt, cdn, fieldname, value) => {
- const item_row = frappe.model.get_doc(cdt, cdn);
- if (item_row && item_row[fieldname] != value) {
-
- const { item_code, batch_no, uom } = this.item_details.current_item;
- const event = {
- field: fieldname,
+ form_updated: (item, field, value) => {
+ const item_row = frappe.model.get_doc(item.doctype, item.name);
+ if (item_row && item_row[field] != value) {
+ const args = {
+ field,
value,
- item: { item_code, batch_no, uom }
- }
- return this.on_cart_update(event)
+ item: this.item_details.current_item
+ };
+ return this.on_cart_update(args);
}
+
+ return Promise.resolve();
+ },
+
+ highlight_cart_item: (item) => {
+ const cart_item = this.cart.get_cart_item(item);
+ this.cart.toggle_item_highlight(cart_item);
},
item_field_focused: (fieldname) => {
@@ -295,19 +298,18 @@ erpnext.PointOfSale.Controller = class {
set_value_in_current_cart_item: (selector, value) => {
this.cart.update_selector_value_in_cart_item(selector, value, this.item_details.current_item);
},
- clone_new_batch_item_in_frm: (batch_serial_map, current_item) => {
+ clone_new_batch_item_in_frm: (batch_serial_map, item) => {
// called if serial nos are 'auto_selected' and if those serial nos belongs to multiple batches
// for each unique batch new item row is added in the form & cart
Object.keys(batch_serial_map).forEach(batch => {
- const { item_code, batch_no } = current_item;
- const item_to_clone = this.frm.doc.items.find(i => i.item_code === item_code && i.batch_no === batch_no);
+ const item_to_clone = this.frm.doc.items.find(i => i.name == item.name);
const new_row = this.frm.add_child("items", { ...item_to_clone });
// update new serialno and batch
new_row.batch_no = batch;
new_row.serial_no = batch_serial_map[batch].join(`\n`);
new_row.qty = batch_serial_map[batch].length;
this.frm.doc.items.forEach(row => {
- if (item_code === row.item_code) {
+ if (item.item_code === row.item_code) {
this.update_cart_html(row);
}
});
@@ -316,8 +318,8 @@ erpnext.PointOfSale.Controller = class {
remove_item_from_cart: () => this.remove_item_from_cart(),
get_item_stock_map: () => this.item_stock_map,
close_item_details: () => {
- this.item_details.toggle_item_details_section(undefined);
- this.cart.prev_action = undefined;
+ this.item_details.toggle_item_details_section(null);
+ this.cart.prev_action = null;
this.cart.toggle_item_highlight();
},
get_available_stock: (item_code, warehouse) => this.get_available_stock(item_code, warehouse)
@@ -501,58 +503,60 @@ erpnext.PointOfSale.Controller = class {
let item_row = undefined;
try {
let { field, value, item } = args;
- const { item_code, batch_no, serial_no, uom } = item;
- item_row = this.get_item_from_frm(item_code, batch_no, uom);
+ item_row = this.get_item_from_frm(item);
+ const item_row_exists = !$.isEmptyObject(item_row);
- const item_selected_from_selector = field === 'qty' && value === "+1"
+ const from_selector = field === 'qty' && value === "+1";
+ if (from_selector)
+ value = flt(item_row.qty) + flt(value);
- if (item_row) {
- item_selected_from_selector && (value = item_row.qty + flt(value))
-
- field === 'qty' && (value = flt(value));
+ if (item_row_exists) {
+ if (field === 'qty')
+ value = flt(value);
if (['qty', 'conversion_factor'].includes(field) && value > 0 && !this.allow_negative_stock) {
const qty_needed = field === 'qty' ? value * item_row.conversion_factor : item_row.qty * value;
await this.check_stock_availability(item_row, qty_needed, this.frm.doc.set_warehouse);
}
- if (this.is_current_item_being_edited(item_row) || item_selected_from_selector) {
+ if (this.is_current_item_being_edited(item_row) || from_selector) {
await frappe.model.set_value(item_row.doctype, item_row.name, field, value);
this.update_cart_html(item_row);
}
} else {
- if (!this.frm.doc.customer) {
- frappe.dom.unfreeze();
- frappe.show_alert({
- message: __('You must select a customer before adding an item.'),
- indicator: 'orange'
- });
- frappe.utils.play_sound("error");
+ if (!this.frm.doc.customer)
+ return this.raise_customer_selection_alert();
+
+ const { item_code, batch_no, serial_no, rate } = item;
+
+ if (!item_code)
return;
- }
- if (!item_code) return;
- item_selected_from_selector && (value = flt(value))
-
- const args = { item_code, batch_no, [field]: value };
+ const new_item = { item_code, batch_no, rate, [field]: value };
if (serial_no) {
await this.check_serial_no_availablilty(item_code, this.frm.doc.set_warehouse, serial_no);
- args['serial_no'] = serial_no;
+ new_item['serial_no'] = serial_no;
}
- if (field === 'serial_no') args['qty'] = value.split(`\n`).length || 0;
+ if (field === 'serial_no')
+ new_item['qty'] = value.split(`\n`).length || 0;
- item_row = this.frm.add_child('items', args);
+ item_row = this.frm.add_child('items', new_item);
if (field === 'qty' && value !== 0 && !this.allow_negative_stock)
await this.check_stock_availability(item_row, value, this.frm.doc.set_warehouse);
await this.trigger_new_item_events(item_row);
-
- this.check_serial_batch_selection_needed(item_row) && this.edit_item_details_of(item_row);
+
this.update_cart_html(item_row);
+
+ if (this.item_details.$component.is(':visible'))
+ this.edit_item_details_of(item_row);
+
+ if (this.check_serial_batch_selection_needed(item_row))
+ this.edit_item_details_of(item_row);
}
} catch (error) {
@@ -563,13 +567,33 @@ erpnext.PointOfSale.Controller = class {
}
}
- get_item_from_frm(item_code, batch_no, uom) {
- const has_batch_no = batch_no;
- return this.frm.doc.items.find(
- i => i.item_code === item_code
- && (!has_batch_no || (has_batch_no && i.batch_no === batch_no))
- && (i.uom === uom)
- );
+ raise_customer_selection_alert() {
+ frappe.dom.unfreeze();
+ frappe.show_alert({
+ message: __('You must select a customer before adding an item.'),
+ indicator: 'orange'
+ });
+ frappe.utils.play_sound("error");
+ }
+
+ get_item_from_frm({ name, item_code, batch_no, uom, rate }) {
+ let item_row = null;
+ if (name) {
+ item_row = this.frm.doc.items.find(i => i.name == name);
+ } else {
+ // if item is clicked twice from item selector
+ // then "item_code, batch_no, uom, rate" will help in getting the exact item
+ // to increase the qty by one
+ const has_batch_no = batch_no;
+ item_row = this.frm.doc.items.find(
+ i => i.item_code === item_code
+ && (!has_batch_no || (has_batch_no && i.batch_no === batch_no))
+ && (i.uom === uom)
+ && (i.rate == rate)
+ );
+ }
+
+ return item_row || {};
}
edit_item_details_of(item_row) {
@@ -577,9 +601,7 @@ erpnext.PointOfSale.Controller = class {
}
is_current_item_being_edited(item_row) {
- const { item_code, batch_no } = this.item_details.current_item;
-
- return item_code !== item_row.item_code || batch_no != item_row.batch_no ? false : true;
+ return item_row.name == this.item_details.current_item.name;
}
update_cart_html(item_row, remove_item) {
@@ -661,7 +683,7 @@ erpnext.PointOfSale.Controller = class {
update_item_field(value, field_or_action) {
if (field_or_action === 'checkout') {
- this.item_details.toggle_item_details_section(undefined);
+ this.item_details.toggle_item_details_section(null);
} else if (field_or_action === 'remove') {
this.remove_item_from_cart();
} else {
@@ -680,7 +702,7 @@ erpnext.PointOfSale.Controller = class {
.then(() => {
frappe.model.clear_doc(doctype, name);
this.update_cart_html(current_item, true);
- this.item_details.toggle_item_details_section(undefined);
+ this.item_details.toggle_item_details_section(null);
frappe.dom.unfreeze();
})
.catch(e => console.log(e));
diff --git a/erpnext/selling/page/point_of_sale/pos_item_cart.js b/erpnext/selling/page/point_of_sale/pos_item_cart.js
index 11a63b3d4a6..38508c219b3 100644
--- a/erpnext/selling/page/point_of_sale/pos_item_cart.js
+++ b/erpnext/selling/page/point_of_sale/pos_item_cart.js
@@ -181,10 +181,8 @@ erpnext.PointOfSale.ItemCart = class {
me.$totals_section.find(".edit-cart-btn").click();
}
- const item_code = unescape($cart_item.attr('data-item-code'));
- const batch_no = unescape($cart_item.attr('data-batch-no'));
- const uom = unescape($cart_item.attr('data-uom'));
- me.events.cart_item_clicked(item_code, batch_no, uom);
+ const item_row_name = unescape($cart_item.attr('data-row-name'));
+ me.events.cart_item_clicked({ name: item_row_name });
this.numpad_value = '';
});
@@ -474,12 +472,7 @@ erpnext.PointOfSale.ItemCart = class {
const grand_total = cint(frappe.sys_defaults.disable_rounded_total) ? frm.doc.grand_total : frm.doc.rounded_total;
this.render_grand_total(grand_total);
- const taxes = frm.doc.taxes.map(t => {
- return {
- description: t.description, rate: t.rate
- };
- });
- this.render_taxes(frm.doc.total_taxes_and_charges, taxes);
+ this.render_taxes(frm.doc.taxes);
}
render_net_total(value) {
@@ -504,14 +497,14 @@ erpnext.PointOfSale.ItemCart = class {
);
}
- render_taxes(value, taxes) {
+ render_taxes(taxes) {
if (taxes.length) {
const currency = this.events.get_frm().doc.currency;
const taxes_html = taxes.map(t => {
const description = /[0-9]+/.test(t.description) ? t.description : `${t.description} @ ${t.rate}%`;
return `
+
`);
+ if (!this.hide_images && image) {
+ this.$item_image.html(
+ `
`
+ );
} else {
this.$item_image.html(`
+
" + _("Please create Landed Cost Vouchers against Invoices that have 'Update Stock' enabled.")
+ frappe.throw(msg, title=_("Incorrect Invoice"))
+
+ receipt_documents.append(d.receipt_document)
for item in self.get("items"):
if not item.receipt_document:
@@ -78,7 +87,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 +113,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 984ae46c66c..32b08f60c4a 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/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
index 92c8d213878..6e66f9869c0 100644
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -101,7 +101,8 @@ frappe.ui.form.on('Material Request', {
}
if (frm.doc.docstatus == 1 && frm.doc.status != 'Stopped') {
- if (flt(frm.doc.per_ordered, 2) < 100) {
+ let precision = frappe.defaults.get_default("float_precision");
+ if (flt(frm.doc.per_ordered, precision) < 100) {
let add_create_pick_list_button = () => {
frm.add_custom_button(__('Pick List'),
() => frm.events.create_pick_list(frm), __('Create'));
diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index 335175f21d1..3ad9909ad07 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -189,7 +189,7 @@ class MaterialRequest(BuyingController):
item_wh_list = []
for d in self.get("items"):
if (not mr_item_rows or d.name in mr_item_rows) and [d.item_code, d.warehouse] not in item_wh_list \
- and frappe.db.get_value("Item", d.item_code, "is_stock_item") == 1 and d.warehouse:
+ and d.warehouse and frappe.db.get_value("Item", d.item_code, "is_stock_item") == 1 :
item_wh_list.append([d.item_code, d.warehouse])
for item_code, warehouse in item_wh_list:
diff --git a/erpnext/stock/doctype/packed_item/packed_item.json b/erpnext/stock/doctype/packed_item/packed_item.json
index f1d7f8c8c9e..bb396e806f6 100644
--- a/erpnext/stock/doctype/packed_item/packed_item.json
+++ b/erpnext/stock/doctype/packed_item/packed_item.json
@@ -13,6 +13,7 @@
"section_break_6",
"warehouse",
"target_warehouse",
+ "conversion_factor",
"column_break_9",
"qty",
"uom",
@@ -209,13 +210,18 @@
"no_copy": 1,
"print_hide": 1,
"read_only": 1
+ },
+ {
+ "fieldname": "conversion_factor",
+ "fieldtype": "Float",
+ "label": "Conversion Factor"
}
],
"idx": 1,
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2020-09-24 09:25:13.050151",
+ "modified": "2021-05-26 07:08:05.111385",
"modified_by": "Administrator",
"module": "Stock",
"name": "Packed Item",
diff --git a/erpnext/stock/doctype/packed_item/packed_item.py b/erpnext/stock/doctype/packed_item/packed_item.py
index 5341f298531..4ab71bdf629 100644
--- a/erpnext/stock/doctype/packed_item/packed_item.py
+++ b/erpnext/stock/doctype/packed_item/packed_item.py
@@ -53,6 +53,7 @@ def update_packing_list_item(doc, packing_item_code, qty, main_item_row, descrip
pi.parent_detail_docname = main_item_row.name
pi.uom = item.stock_uom
pi.qty = flt(qty)
+ pi.conversion_factor = main_item_row.conversion_factor
if description and not pi.description:
pi.description = description
if not pi.warehouse and not doc.amended_from:
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.py b/erpnext/stock/doctype/packing_slip/packing_slip.py
index 2008bffcd32..4a843e0fde9 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/pick_list/pick_list.json b/erpnext/stock/doctype/pick_list/pick_list.json
index c01388dcd21..21467935370 100644
--- a/erpnext/stock/doctype/pick_list/pick_list.json
+++ b/erpnext/stock/doctype/pick_list/pick_list.json
@@ -184,4 +184,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/stock/doctype/pick_list/pick_list.py b/erpnext/stock/doctype/pick_list/pick_list.py
index 6ab68e292ae..e795742ea4d 100644
--- a/erpnext/stock/doctype/pick_list/pick_list.py
+++ b/erpnext/stock/doctype/pick_list/pick_list.py
@@ -17,6 +17,9 @@ from erpnext.selling.doctype.sales_order.sales_order import make_delivery_note a
# TODO: Prioritize SO or WO group warehouse
class PickList(Document):
+ def validate(self):
+ self.validate_for_qty()
+
def before_save(self):
self.set_item_locations()
@@ -35,6 +38,7 @@ class PickList(Document):
@frappe.whitelist()
def set_item_locations(self, save=False):
+ self.validate_for_qty()
items = self.aggregate_item_qty()
self.item_location_map = frappe._dict()
@@ -107,6 +111,11 @@ class PickList(Document):
return item_map.values()
+ def validate_for_qty(self):
+ if self.purpose == "Material Transfer for Manufacture" \
+ and (self.for_qty is None or self.for_qty == 0):
+ frappe.throw(_("Qty of Finished Goods Item should be greater than 0."))
+
def validate_item_locations(pick_list):
if not pick_list.locations:
diff --git a/erpnext/stock/doctype/pick_list/test_pick_list.py b/erpnext/stock/doctype/pick_list/test_pick_list.py
index c4da05a6d44..84566b8d8c7 100644
--- a/erpnext/stock/doctype/pick_list/test_pick_list.py
+++ b/erpnext/stock/doctype/pick_list/test_pick_list.py
@@ -37,6 +37,7 @@ class TestPickList(unittest.TestCase):
'company': '_Test Company',
'customer': '_Test Customer',
'items_based_on': 'Sales Order',
+ 'purpose': 'Delivery',
'locations': [{
'item_code': '_Test Item',
'qty': 5,
@@ -90,6 +91,7 @@ class TestPickList(unittest.TestCase):
'company': '_Test Company',
'customer': '_Test Customer',
'items_based_on': 'Sales Order',
+ 'purpose': 'Delivery',
'locations': [{
'item_code': '_Test Item Warehouse Group Wise Reorder',
'qty': 1000,
@@ -135,6 +137,7 @@ class TestPickList(unittest.TestCase):
'company': '_Test Company',
'customer': '_Test Customer',
'items_based_on': 'Sales Order',
+ 'purpose': 'Delivery',
'locations': [{
'item_code': '_Test Serialized Item',
'qty': 1000,
@@ -264,6 +267,7 @@ class TestPickList(unittest.TestCase):
'company': '_Test Company',
'customer': '_Test Customer',
'items_based_on': 'Sales Order',
+ 'purpose': 'Delivery',
'locations': [{
'item_code': '_Test Item',
'qty': 5,
@@ -319,6 +323,7 @@ class TestPickList(unittest.TestCase):
'company': '_Test Company',
'customer': '_Test Customer',
'items_based_on': 'Sales Order',
+ 'purpose': 'Delivery',
'locations': [{
'item_code': '_Test Item',
'qty': 1,
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index 32d349f3031..44fb736304f 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -514,8 +514,7 @@
"oldfieldname": "pr_raw_material_details",
"oldfieldtype": "Table",
"options": "Purchase Receipt Item Supplied",
- "print_hide": 1,
- "read_only": 1
+ "print_hide": 1
},
{
"fieldname": "section_break0",
@@ -762,6 +761,7 @@
"read_only": 1
},
{
+ "depends_on": "eval:!doc.disable_rounded_total",
"fieldname": "base_rounding_adjustment",
"fieldtype": "Currency",
"label": "Rounding Adjustment (Company Currency)",
@@ -805,6 +805,7 @@
"read_only": 1
},
{
+ "depends_on": "eval:!doc.disable_rounded_total",
"fieldname": "rounding_adjustment",
"fieldtype": "Currency",
"label": "Rounding Adjustment",
@@ -1147,7 +1148,7 @@
"idx": 261,
"is_submittable": 1,
"links": [],
- "modified": "2020-12-26 20:49:39.106049",
+ "modified": "2021-05-25 00:15:12.239017",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt",
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index f1292d8cbdd..82c87a83a50 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -202,6 +202,7 @@ class PurchaseReceipt(BuyingController):
self.make_gl_entries()
self.repost_future_sle_and_gle()
+ self.set_consumed_qty_in_po()
def check_next_docstatus(self):
submit_rv = frappe.db.sql("""select t1.name
@@ -233,6 +234,7 @@ class PurchaseReceipt(BuyingController):
self.repost_future_sle_and_gle()
self.ignore_linked_doctypes = ('GL Entry', 'Stock Ledger Entry', 'Repost Item Valuation')
self.delete_auto_created_batches()
+ self.set_consumed_qty_in_po()
@frappe.whitelist()
def get_current_stock(self):
@@ -384,6 +386,7 @@ class PurchaseReceipt(BuyingController):
against_account = ", ".join([d.account for d in gl_entries if flt(d.debit) > 0])
total_valuation_amount = sum(valuation_tax.values())
amount_including_divisional_loss = negative_expense_to_be_booked
+ stock_rbnb = self.get_company_default("stock_received_but_not_billed")
i = 1
for tax in self.get("taxes"):
if valuation_tax.get(tax.name):
@@ -497,7 +500,7 @@ class PurchaseReceipt(BuyingController):
def update_billing_status(self, update_modified=True):
updated_pr = [self.name]
for d in self.get("items"):
- if d.purchase_invoice and d.purchase_invoice_item:
+ if d.get("purchase_invoice") and d.get("purchase_invoice_item"):
d.db_set('billed_amt', d.amount, update_modified=update_modified)
elif d.purchase_order_item:
updated_pr += update_billed_amount_based_on_po(d.purchase_order_item, update_modified)
@@ -579,7 +582,6 @@ def update_billing_percentage(pr_doc, update_modified=True):
@frappe.whitelist()
def make_purchase_invoice(source_name, target_doc=None):
- from frappe.model.mapper import get_mapped_doc
from erpnext.accounts.party import get_payment_terms_template
doc = frappe.get_doc('Purchase Receipt', source_name)
@@ -599,11 +601,16 @@ def make_purchase_invoice(source_name, target_doc=None):
def update_item(source_doc, target_doc, source_parent):
target_doc.qty, returned_qty = get_pending_qty(source_doc)
+ if frappe.db.get_single_value("Buying Settings", "bill_for_rejected_quantity_in_purchase_invoice"):
+ target_doc.rejected_qty = 0
target_doc.stock_qty = flt(target_doc.qty) * flt(target_doc.conversion_factor, target_doc.precision("conversion_factor"))
returned_qty_map[source_doc.name] = returned_qty
def get_pending_qty(item_row):
- pending_qty = item_row.qty - invoiced_qty_map.get(item_row.name, 0)
+ qty = item_row.qty
+ if frappe.db.get_single_value("Buying Settings", "bill_for_rejected_quantity_in_purchase_invoice"):
+ qty = item_row.received_qty
+ pending_qty = qty - invoiced_qty_map.get(item_row.name, 0)
returned_qty = flt(returned_qty_map.get(item_row.name, 0))
if returned_qty:
if returned_qty >= pending_qty:
@@ -748,4 +755,3 @@ def get_item_account_wise_additional_cost(purchase_document):
account.base_amount * item.get(based_on_field) / total_item_cost
return item_account_wise_cost
-
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index e5ef978ca3c..2eb8bfd5d2f 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()
@@ -297,6 +297,8 @@ class TestPurchaseReceipt(unittest.TestCase):
item_code = "Test Extra Item 1", qty=10, basic_rate=100)
se2 = make_stock_entry(target="_Test Warehouse - _TC",
item_code = "_Test FG Item", qty=1, basic_rate=100)
+ se3 = make_stock_entry(target="_Test Warehouse - _TC",
+ item_code = "Test Extra Item 2", qty=1, basic_rate=100)
rm_items = [
{
"item_code": item_code,
@@ -331,7 +333,12 @@ class TestPurchaseReceipt(unittest.TestCase):
se.cancel()
se1.cancel()
se2.cancel()
+ se3.cancel()
po.reload()
+ pr2.load_from_db()
+ pr2.cancel()
+
+ po.load_from_db()
po.cancel()
def test_serial_no_supplier(self):
@@ -414,11 +421,18 @@ class TestPurchaseReceipt(unittest.TestCase):
self.assertEqual(return_pr_2.items[0].qty, -3)
# Make PI against unreturned amount
+ buying_settings = frappe.get_single("Buying Settings")
+ buying_settings.bill_for_rejected_quantity_in_purchase_invoice = 0
+ buying_settings.save()
+
pi = make_purchase_invoice(pr.name)
pi.submit()
self.assertEqual(pi.items[0].qty, 3)
+ buying_settings.bill_for_rejected_quantity_in_purchase_invoice = 1
+ buying_settings.save()
+
pr.load_from_db()
# PR should be completed on billing all unreturned amount
self.assertEqual(pr.items[0].billed_amt, 150)
@@ -997,6 +1011,47 @@ class TestPurchaseReceipt(unittest.TestCase):
self.assertEqual(pr.status, "To Bill")
self.assertAlmostEqual(pr.per_billed, 50.0, places=2)
+ def test_service_item_purchase_with_perpetual_inventory(self):
+ company = '_Test Company with perpetual inventory'
+ service_item = '_Test Non Stock Item'
+
+ before_test_value = frappe.db.get_value('Company', company, 'enable_perpetual_inventory_for_non_stock_items')
+ frappe.db.set_value('Company', company, 'enable_perpetual_inventory_for_non_stock_items', 1)
+ srbnb_account = 'Stock Received But Not Billed - TCP1'
+ frappe.db.set_value('Company', company, 'service_received_but_not_billed', srbnb_account)
+
+ pr = make_purchase_receipt(
+ company=company, item=service_item,
+ warehouse='Finished Goods - TCP1', do_not_save=1
+ )
+ item_row_with_diff_rate = frappe.copy_doc(pr.items[0])
+ item_row_with_diff_rate.rate = 100
+ pr.append('items', item_row_with_diff_rate)
+
+ pr.save()
+ pr.submit()
+
+ item_one_gl_entry = frappe.db.get_all("GL Entry", {
+ 'voucher_type': pr.doctype,
+ 'voucher_no': pr.name,
+ 'account': srbnb_account,
+ 'voucher_detail_no': pr.items[0].name
+ }, pluck="name")
+
+ item_two_gl_entry = frappe.db.get_all("GL Entry", {
+ 'voucher_type': pr.doctype,
+ 'voucher_no': pr.name,
+ 'account': srbnb_account,
+ 'voucher_detail_no': pr.items[1].name
+ }, pluck="name")
+
+ # check if the entries are not merged into one
+ # seperate entries should be made since voucher_detail_no is different
+ self.assertEqual(len(item_one_gl_entry), 1)
+ self.assertEqual(len(item_two_gl_entry), 1)
+
+ frappe.db.set_value('Company', company, 'enable_perpetual_inventory_for_non_stock_items', before_test_value)
+
def get_sl_entries(voucher_type, voucher_no):
return frappe.db.sql(""" select actual_qty, warehouse, stock_value_difference
from `tabStock Ledger Entry` where voucher_type=%s and voucher_no=%s
diff --git a/erpnext/stock/doctype/putaway_rule/putaway_rule.py b/erpnext/stock/doctype/putaway_rule/putaway_rule.py
index ea26caced04..0f50bcd6ea8 100644
--- a/erpnext/stock/doctype/putaway_rule/putaway_rule.py
+++ b/erpnext/stock/doctype/putaway_rule/putaway_rule.py
@@ -97,7 +97,7 @@ def apply_putaway_rule(doctype, items, company, sync=None, purpose=None):
at_capacity, rules = get_ordered_putaway_rules(item_code, company, source_warehouse=source_warehouse)
if not rules:
- warehouse = source_warehouse or item.warehouse
+ warehouse = source_warehouse or item.get('warehouse')
if at_capacity:
# rules available, but no free space
items_not_accomodated.append([item_code, pending_qty])
diff --git a/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py b/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py
index 56b046a92e1..f5d076a077a 100644
--- a/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py
+++ b/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py
@@ -1,29 +1,45 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and Contributors
# See license.txt
-from __future__ import unicode_literals
-import frappe
import unittest
+
+import frappe
from frappe.utils import nowdate
-from erpnext.stock.doctype.item.test_item import create_item
+
+from erpnext.controllers.stock_controller import (
+ QualityInspectionNotSubmittedError,
+ QualityInspectionRejectedError,
+ QualityInspectionRequiredError,
+ make_quality_inspections,
+)
from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
-from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
-from erpnext.controllers.stock_controller import QualityInspectionRejectedError, QualityInspectionRequiredError, QualityInspectionNotSubmittedError
+from erpnext.stock.doctype.item.test_item import create_item
+from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
# test_records = frappe.get_test_records('Quality Inspection')
+
class TestQualityInspection(unittest.TestCase):
def setUp(self):
create_item("_Test Item with QA")
- frappe.db.set_value("Item", "_Test Item with QA", "inspection_required_before_delivery", 1)
+ frappe.db.set_value(
+ "Item", "_Test Item with QA", "inspection_required_before_delivery", 1
+ )
def test_qa_for_delivery(self):
- make_stock_entry(item_code="_Test Item with QA", target="_Test Warehouse - _TC", qty=1, basic_rate=100)
+ make_stock_entry(
+ item_code="_Test Item with QA",
+ target="_Test Warehouse - _TC",
+ qty=1,
+ basic_rate=100
+ )
dn = create_delivery_note(item_code="_Test Item with QA", do_not_submit=True)
self.assertRaises(QualityInspectionRequiredError, dn.submit)
- qa = create_quality_inspection(reference_type="Delivery Note", reference_name=dn.name, status="Rejected")
+ qa = create_quality_inspection(
+ reference_type="Delivery Note", reference_name=dn.name, status="Rejected"
+ )
dn.reload()
self.assertRaises(QualityInspectionRejectedError, dn.submit)
@@ -38,7 +54,9 @@ class TestQualityInspection(unittest.TestCase):
def test_qa_not_submit(self):
dn = create_delivery_note(item_code="_Test Item with QA", do_not_submit=True)
- qa = create_quality_inspection(reference_type="Delivery Note", reference_name=dn.name, do_not_submit=True)
+ qa = create_quality_inspection(
+ reference_type="Delivery Note", reference_name=dn.name, do_not_submit=True
+ )
dn.items[0].quality_inspection = qa.name
self.assertRaises(QualityInspectionNotSubmittedError, dn.submit)
@@ -48,21 +66,28 @@ class TestQualityInspection(unittest.TestCase):
def test_value_based_qi_readings(self):
# Test QI based on acceptance values (Non formula)
dn = create_delivery_note(item_code="_Test Item with QA", do_not_submit=True)
- readings = [{
- "specification": "Iron Content", # numeric reading
- "min_value": 0.1,
- "max_value": 0.9,
- "reading_1": "0.4"
- },
- {
- "specification": "Particle Inspection Needed", # non-numeric reading
- "numeric": 0,
- "value": "Yes",
- "reading_value": "Yes"
- }]
+ readings = [
+ {
+ "specification": "Iron Content", # numeric reading
+ "min_value": 0.1,
+ "max_value": 0.9,
+ "reading_1": "0.4"
+ },
+ {
+ "specification": "Particle Inspection Needed", # non-numeric reading
+ "numeric": 0,
+ "value": "Yes",
+ "reading_value": "Yes"
+ }
+ ]
+
+ qa = create_quality_inspection(
+ reference_type="Delivery Note",
+ reference_name=dn.name,
+ readings=readings,
+ do_not_save=True
+ )
- qa = create_quality_inspection(reference_type="Delivery Note", reference_name=dn.name,
- readings=readings, do_not_save=True)
qa.save()
# status must be auto set as per formula
@@ -74,36 +99,43 @@ class TestQualityInspection(unittest.TestCase):
def test_formula_based_qi_readings(self):
dn = create_delivery_note(item_code="_Test Item with QA", do_not_submit=True)
- readings = [{
- "specification": "Iron Content", # numeric reading
- "formula_based_criteria": 1,
- "acceptance_formula": "reading_1 > 0.35 and reading_1 < 0.50",
- "reading_1": "0.4"
- },
- {
- "specification": "Calcium Content", # numeric reading
- "formula_based_criteria": 1,
- "acceptance_formula": "reading_1 > 0.20 and reading_1 < 0.50",
- "reading_1": "0.7"
- },
- {
- "specification": "Mg Content", # numeric reading
- "formula_based_criteria": 1,
- "acceptance_formula": "mean < 0.9",
- "reading_1": "0.5",
- "reading_2": "0.7",
- "reading_3": "random text" # check if random string input causes issues
- },
- {
- "specification": "Calcium Content", # non-numeric reading
- "formula_based_criteria": 1,
- "numeric": 0,
- "acceptance_formula": "reading_value in ('Grade A', 'Grade B', 'Grade C')",
- "reading_value": "Grade B"
- }]
+ readings = [
+ {
+ "specification": "Iron Content", # numeric reading
+ "formula_based_criteria": 1,
+ "acceptance_formula": "reading_1 > 0.35 and reading_1 < 0.50",
+ "reading_1": "0.4"
+ },
+ {
+ "specification": "Calcium Content", # numeric reading
+ "formula_based_criteria": 1,
+ "acceptance_formula": "reading_1 > 0.20 and reading_1 < 0.50",
+ "reading_1": "0.7"
+ },
+ {
+ "specification": "Mg Content", # numeric reading
+ "formula_based_criteria": 1,
+ "acceptance_formula": "mean < 0.9",
+ "reading_1": "0.5",
+ "reading_2": "0.7",
+ "reading_3": "random text" # check if random string input causes issues
+ },
+ {
+ "specification": "Calcium Content", # non-numeric reading
+ "formula_based_criteria": 1,
+ "numeric": 0,
+ "acceptance_formula": "reading_value in ('Grade A', 'Grade B', 'Grade C')",
+ "reading_value": "Grade B"
+ }
+ ]
+
+ qa = create_quality_inspection(
+ reference_type="Delivery Note",
+ reference_name=dn.name,
+ readings=readings,
+ do_not_save=True
+ )
- qa = create_quality_inspection(reference_type="Delivery Note", reference_name=dn.name,
- readings=readings, do_not_save=True)
qa.save()
# status must be auto set as per formula
@@ -115,6 +147,60 @@ class TestQualityInspection(unittest.TestCase):
qa.delete()
dn.delete()
+ def test_make_quality_inspections_from_linked_document(self):
+ dn = create_delivery_note(item_code="_Test Item with QA", do_not_submit=True)
+ for item in dn.items:
+ item.sample_size = item.qty
+ quality_inspections = make_quality_inspections(dn.doctype, dn.name, dn.items)
+ self.assertEqual(len(dn.items), len(quality_inspections))
+
+ # cleanup
+ for qi in quality_inspections:
+ frappe.delete_doc("Quality Inspection", qi)
+ dn.delete()
+
+ def test_rejected_qi_validation(self):
+ """Test if rejected QI blocks Stock Entry as per Stock Settings."""
+ se = make_stock_entry(
+ item_code="_Test Item with QA",
+ target="_Test Warehouse - _TC",
+ qty=1,
+ basic_rate=100,
+ inspection_required=True,
+ do_not_submit=True
+ )
+
+ readings = [
+ {
+ "specification": "Iron Content",
+ "min_value": 0.1,
+ "max_value": 0.9,
+ "reading_1": "0.4"
+ }
+ ]
+
+ qa = create_quality_inspection(
+ reference_type="Stock Entry",
+ reference_name=se.name,
+ readings=readings,
+ status="Rejected"
+ )
+
+ frappe.db.set_value("Stock Settings", None, "action_if_quality_inspection_is_rejected", "Stop")
+ se.reload()
+ self.assertRaises(QualityInspectionRejectedError, se.submit) # when blocked in Stock settings, block rejected QI
+
+ frappe.db.set_value("Stock Settings", None, "action_if_quality_inspection_is_rejected", "Warn")
+ se.reload()
+ se.submit() # when allowed in Stock settings, allow rejected QI
+
+ # teardown
+ qa.reload()
+ qa.cancel()
+ se.reload()
+ se.cancel()
+ frappe.db.set_value("Stock Settings", None, "action_if_quality_inspection_is_rejected", "Stop")
+
def create_quality_inspection(**args):
args = frappe._dict(args)
qa = frappe.new_doc("Quality Inspection")
@@ -130,12 +216,11 @@ def create_quality_inspection(**args):
if not args.readings:
create_quality_inspection_parameter("Size")
readings = {"specification": "Size", "min_value": 0, "max_value": 10}
+ if args.status == "Rejected":
+ readings["reading_1"] = "12" # status is auto set in child on save
else:
readings = args.readings
- if args.status == "Rejected":
- readings["reading_1"] = "12" # status is auto set in child on save
-
if isinstance(readings, list):
for entry in readings:
create_quality_inspection_parameter(entry["specification"])
@@ -150,10 +235,11 @@ def create_quality_inspection(**args):
return qa
+
def create_quality_inspection_parameter(parameter):
if not frappe.db.exists("Quality Inspection Parameter", parameter):
frappe.get_doc({
"doctype": "Quality Inspection Parameter",
"parameter": parameter,
"description": parameter
- }).insert()
\ No newline at end of file
+ }).insert()
diff --git a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
index 5b626ea3458..55f2ebb2241 100644
--- a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
+++ b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
@@ -37,6 +37,9 @@ class RepostItemValuation(Document):
self.db_set('status', status)
def on_submit(self):
+ if not frappe.flags.in_test:
+ return
+
frappe.enqueue(repost, timeout=1800, queue='long',
job_name='repost_sle', now=frappe.flags.in_test, doc=self)
@@ -115,12 +118,6 @@ def notify_error_to_stock_managers(doc, traceback):
frappe.sendmail(recipients=recipients, subject=subject, message=message)
def repost_entries():
- job_log = frappe.get_all('Scheduled Job Log', fields = ['status', 'creation'],
- filters = {'scheduled_job_type': 'repost_item_valuation.repost_entries'}, order_by='creation desc', limit=1)
-
- if job_log and job_log[0]['status'] == 'Start' and time_diff_in_hours(now(), job_log[0]['creation']) < 2:
- return
-
riv_entries = get_repost_item_valuation_entries()
for row in riv_entries:
@@ -135,9 +132,7 @@ def repost_entries():
check_if_stock_and_account_balance_synced(today(), d.name)
def get_repost_item_valuation_entries():
- date = add_to_date(now(), hours=-3)
-
return frappe.db.sql(""" SELECT name from `tabRepost Item Valuation`
WHERE status != 'Completed' and creation <= %s and docstatus = 1
ORDER BY timestamp(posting_date, posting_time) asc, creation asc
- """, date, as_dict=1)
+ """, now(), as_dict=1)
diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json
index 3acf3a9316c..a3d44af4945 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json
@@ -57,7 +57,8 @@
"more_info",
"serial_no_details",
"company",
- "status"
+ "status",
+ "work_order"
],
"fields": [
{
@@ -422,12 +423,18 @@
"label": "Status",
"options": "\nActive\nInactive\nDelivered\nExpired",
"read_only": 1
+ },
+ {
+ "fieldname": "work_order",
+ "fieldtype": "Link",
+ "label": "Work Order",
+ "options": "Work Order"
}
],
"icon": "fa fa-barcode",
"idx": 1,
"links": [],
- "modified": "2020-07-20 20:50:16.660433",
+ "modified": "2021-01-08 14:31:15.375996",
"modified_by": "Administrator",
"module": "Stock",
"name": "Serial No",
diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py
index 5ecc9f81405..bad7b608acf 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.py
+++ b/erpnext/stock/doctype/serial_no/serial_no.py
@@ -473,16 +473,13 @@ def get_serial_nos(serial_no):
if s.strip()]
def update_args_for_serial_no(serial_no_doc, serial_no, args, is_new=False):
- serial_no_doc.update({
- "item_code": args.get("item_code"),
- "company": args.get("company"),
- "batch_no": args.get("batch_no"),
- "via_stock_ledger": args.get("via_stock_ledger") or True,
- "supplier": args.get("supplier"),
- "location": args.get("location"),
- "warehouse": (args.get("warehouse")
- if args.get("actual_qty", 0) > 0 else None)
- })
+ for field in ["item_code", "work_order", "company", "batch_no", "supplier", "location"]:
+ if args.get(field):
+ serial_no_doc.set(field, args.get(field))
+
+ serial_no_doc.via_stock_ledger = args.get("via_stock_ledger") or True
+ serial_no_doc.warehouse = (args.get("warehouse")
+ if args.get("actual_qty", 0) > 0 else None)
if is_new:
serial_no_doc.serial_no = serial_no
@@ -613,7 +610,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 de23e769f85..67083930272 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -115,6 +115,14 @@ frappe.ui.form.on('Stock Entry', {
return;
}
+ if (!frm.is_new() && frm.doc.docstatus === 0) {
+ frm.add_custom_button(__("Quality Inspection(s)"), () => {
+ let transaction_controller = new erpnext.TransactionController({ frm: frm });
+ transaction_controller.make_quality_inspection();
+ }, __("Create"));
+ frm.page.set_inner_btn_group_as_primary(__('Create'));
+ }
+
let quality_inspection_field = frm.get_docfield("items", "quality_inspection");
quality_inspection_field.get_route_options_for_new_doc = function(row) {
if (frm.is_new()) return;
@@ -155,7 +163,7 @@ frappe.ui.form.on('Stock Entry', {
refresh: function(frm) {
if(!frm.doc.docstatus) {
frm.trigger('validate_purpose_consumption');
- frm.add_custom_button(__('Create Material Request'), function() {
+ frm.add_custom_button(__('Material Request'), function() {
frappe.model.with_doctype('Material Request', function() {
var mr = frappe.model.get_new_doc('Material Request');
var items = frm.get_field('items').grid.get_selected_children();
@@ -178,7 +186,7 @@ frappe.ui.form.on('Stock Entry', {
});
frappe.set_route('Form', 'Material Request', mr.name);
});
- });
+ }, __("Create"));
}
if(frm.doc.items) {
@@ -978,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;
@@ -1068,6 +1079,10 @@ erpnext.stock.select_batch_and_serial_no = (frm, item) => {
}
function attach_bom_items(bom_no) {
+ if (!bom_no) {
+ return
+ }
+
if (check_should_not_attach_bom_items(bom_no)) return
frappe.db.get_doc("BOM",bom_no).then(bom => {
const {name, items} = bom
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index 7f945910051..523d332b8f4 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -59,10 +59,6 @@
"supplier_name",
"supplier_address",
"address_display",
- "column_break_39",
- "customer",
- "customer_name",
- "customer_address",
"accounting_dimensions_section",
"project",
"dimension_col_break",
@@ -78,7 +74,8 @@
"total_amount",
"job_card",
"amended_from",
- "credit_note"
+ "credit_note",
+ "is_return"
],
"fields": [
{
@@ -435,13 +432,13 @@
},
{
"collapsible": 1,
- "depends_on": "eval: in_list([\"Sales Return\", \"Purchase Return\", \"Send to Subcontractor\"], doc.purpose)",
+ "depends_on": "eval:doc.purpose === \"Send to Subcontractor\"",
"fieldname": "contact_section",
"fieldtype": "Section Break",
- "label": "Customer or Supplier Details"
+ "label": "Supplier Details"
},
{
- "depends_on": "eval:doc.purpose==\"Purchase Return\" || doc.purpose==\"Send to Subcontractor\"",
+ "depends_on": "eval:doc.purpose === \"Send to Subcontractor\"",
"fieldname": "supplier",
"fieldtype": "Link",
"label": "Supplier",
@@ -453,7 +450,7 @@
},
{
"bold": 1,
- "depends_on": "eval:doc.purpose==\"Purchase Return\" || doc.purpose==\"Send to Subcontractor\"",
+ "depends_on": "eval:doc.purpose === \"Send to Subcontractor\"",
"fieldname": "supplier_name",
"fieldtype": "Data",
"label": "Supplier Name",
@@ -463,7 +460,7 @@
"read_only": 1
},
{
- "depends_on": "eval:doc.purpose==\"Purchase Return\" || doc.purpose==\"Send to Subcontractor\"",
+ "depends_on": "eval:doc.purpose === \"Send to Subcontractor\"",
"fieldname": "supplier_address",
"fieldtype": "Link",
"label": "Supplier Address",
@@ -477,41 +474,6 @@
"fieldtype": "Small Text",
"label": "Address"
},
- {
- "fieldname": "column_break_39",
- "fieldtype": "Column Break"
- },
- {
- "depends_on": "eval:doc.purpose==\"Sales Return\"",
- "fieldname": "customer",
- "fieldtype": "Link",
- "label": "Customer",
- "no_copy": 1,
- "oldfieldname": "customer",
- "oldfieldtype": "Link",
- "options": "Customer",
- "print_hide": 1
- },
- {
- "bold": 1,
- "depends_on": "eval:doc.purpose==\"Sales Return\"",
- "fieldname": "customer_name",
- "fieldtype": "Data",
- "label": "Customer Name",
- "no_copy": 1,
- "oldfieldname": "customer_name",
- "oldfieldtype": "Data",
- "read_only": 1
- },
- {
- "depends_on": "eval:doc.purpose==\"Sales Return\"",
- "fieldname": "customer_address",
- "fieldtype": "Small Text",
- "label": "Customer Address",
- "no_copy": 1,
- "oldfieldname": "customer_address",
- "oldfieldtype": "Small Text"
- },
{
"collapsible": 1,
"fieldname": "printing_settings",
@@ -650,6 +612,16 @@
"fieldname": "apply_putaway_rule",
"fieldtype": "Check",
"label": "Apply Putaway Rule"
+ },
+ {
+ "default": "0",
+ "fieldname": "is_return",
+ "fieldtype": "Check",
+ "hidden": 1,
+ "label": "Is Return",
+ "no_copy": 1,
+ "print_hide": 1,
+ "read_only": 1
}
],
"icon": "fa fa-file-text",
@@ -657,7 +629,7 @@
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
- "modified": "2021-05-21 11:29:11.917161",
+ "modified": "2021-05-26 17:07:58.015737",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry",
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 2f76bc7d56a..90b81ddb1dc 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -97,8 +97,7 @@ class StockEntry(StockController):
update_serial_nos_after_submit(self, "items")
self.update_work_order()
self.validate_purchase_order()
- if self.purchase_order and self.purpose == "Send to Subcontractor":
- self.update_purchase_order_supplied_items()
+ self.update_purchase_order_supplied_items()
self.make_gl_entries()
@@ -117,9 +116,7 @@ class StockEntry(StockController):
self.set_material_request_transfer_status('Completed')
def on_cancel(self):
-
- if self.purchase_order and self.purpose == "Send to Subcontractor":
- self.update_purchase_order_supplied_items()
+ self.update_purchase_order_supplied_items()
if self.work_order and self.purpose == "Material Consumption for Manufacture":
self.validate_work_order_status()
@@ -465,7 +462,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'):
@@ -501,6 +498,7 @@ class StockEntry(StockController):
d.basic_amount = flt(flt(d.transfer_qty) * flt(d.basic_rate), d.precision("basic_amount"))
if not d.t_warehouse:
outgoing_items_cost += flt(d.basic_amount)
+
return outgoing_items_cost
def get_args_for_incoming_rate(self, item):
@@ -531,7 +529,7 @@ class StockEntry(StockController):
scrap_items_cost = sum([flt(d.basic_amount) for d in self.get("items") if d.is_scrap_item])
# Get raw materials cost from BOM if multiple material consumption entries
- if frappe.db.get_single_value("Manufacturing Settings", "material_consumption"):
+ if frappe.db.get_single_value("Manufacturing Settings", "material_consumption", cache=True):
bom_items = self.get_bom_raw_materials(finished_item_qty)
outgoing_items_cost = sum([flt(row.qty)*flt(row.rate) for row in bom_items.values()])
@@ -857,6 +855,7 @@ class StockEntry(StockController):
pro_doc.run_method("update_work_order_qty")
if self.purpose == "Manufacture":
pro_doc.run_method("update_planned_qty")
+ pro_doc.update_batch_produced_qty(self)
if not pro_doc.operations:
pro_doc.set_actual_dates()
@@ -1008,10 +1007,12 @@ class StockEntry(StockController):
if self.purchase_order and self.purpose == "Send to Subcontractor":
#Get PO Supplied Items Details
item_wh = frappe._dict(frappe.db.sql("""
- select rm_item_code, reserve_warehouse
- from `tabPurchase Order` po, `tabPurchase Order Item Supplied` poitemsup
- where po.name = poitemsup.parent
- and po.name = %s""",self.purchase_order))
+ SELECT
+ rm_item_code, reserve_warehouse
+ FROM
+ `tabPurchase Order` po, `tabPurchase Order Item Supplied` poitemsup
+ WHERE
+ po.name = poitemsup.parent and po.name = %s """,self.purchase_order))
for item in itervalues(item_dict):
if self.pro_doc and cint(self.pro_doc.from_wip_warehouse):
@@ -1077,18 +1078,54 @@ class StockEntry(StockController):
# in case of BOM
to_warehouse = item.get("default_warehouse")
+ args = {
+ "to_warehouse": to_warehouse,
+ "from_warehouse": "",
+ "qty": self.fg_completed_qty,
+ "item_name": item.item_name,
+ "description": item.description,
+ "stock_uom": item.stock_uom,
+ "expense_account": item.get("expense_account"),
+ "cost_center": item.get("buying_cost_center"),
+ "is_finished_item": 1
+ }
+
+ if self.work_order and self.pro_doc.has_batch_no:
+ self.set_batchwise_finished_goods(args, item)
+ else:
+ self.add_finisged_goods(args, item)
+
+ def set_batchwise_finished_goods(self, args, item):
+ qty = flt(self.fg_completed_qty)
+ filters = {
+ "reference_name": self.pro_doc.name,
+ "reference_doctype": self.pro_doc.doctype,
+ "qty_to_produce": (">", 0)
+ }
+
+ fields = ["qty_to_produce as qty", "produced_qty", "name"]
+
+ for row in frappe.get_all("Batch", filters = filters, fields = fields, order_by="creation asc"):
+ batch_qty = flt(row.qty) - flt(row.produced_qty)
+ if not batch_qty:
+ continue
+
+ if qty <=0:
+ break
+
+ fg_qty = batch_qty
+ if batch_qty >= qty:
+ fg_qty = qty
+
+ qty -= batch_qty
+ args["qty"] = fg_qty
+ args["batch_no"] = row.name
+
+ self.add_finisged_goods(args, item)
+
+ def add_finisged_goods(self, args, item):
self.add_to_stock_entry_detail({
- item.name: {
- "to_warehouse": to_warehouse,
- "from_warehouse": "",
- "qty": self.fg_completed_qty,
- "item_name": item.item_name,
- "description": item.description,
- "stock_uom": item.stock_uom,
- "expense_account": item.get("expense_account"),
- "cost_center": item.get("buying_cost_center"),
- "is_finished_item": 1
- }
+ item.name: args
}, bom_no = self.bom_no)
def get_bom_raw_materials(self, qty):
@@ -1294,7 +1331,8 @@ class StockEntry(StockController):
item_dict[item]["qty"] = 0
# delete items with 0 qty
- for item in item_dict.keys():
+ list_of_items = item_dict.keys()
+ for item in list_of_items:
if not item_dict[item]["qty"]:
del item_dict[item]
@@ -1347,7 +1385,7 @@ class StockEntry(StockController):
se_child.is_scrap_item = item_dict[d].get("is_scrap_item", 0)
for field in ["idx", "po_detail", "original_item",
- "expense_account", "description", "item_name"]:
+ "expense_account", "description", "item_name", "serial_no", "batch_no"]:
if item_dict[d].get(field):
se_child.set(field, item_dict[d].get(field))
@@ -1400,33 +1438,26 @@ class StockEntry(StockController):
.format(item.batch_no, item.item_code))
def update_purchase_order_supplied_items(self):
- #Get PO Supplied Items Details
- item_wh = frappe._dict(frappe.db.sql("""
- select rm_item_code, reserve_warehouse
- from `tabPurchase Order` po, `tabPurchase Order Item Supplied` poitemsup
- where po.name = poitemsup.parent
- and po.name = %s""", self.purchase_order))
+ if (self.purchase_order and
+ (self.purpose in ['Send to Subcontractor', 'Material Transfer'] or self.is_return)):
- #Update Supplied Qty in PO Supplied Items
+ #Get PO Supplied Items Details
+ item_wh = frappe._dict(frappe.db.sql("""
+ select rm_item_code, reserve_warehouse
+ from `tabPurchase Order` po, `tabPurchase Order Item Supplied` poitemsup
+ where po.name = poitemsup.parent
+ and po.name = %s""", self.purchase_order))
- frappe.db.sql("""UPDATE `tabPurchase Order Item Supplied` pos
- SET
- pos.supplied_qty = IFNULL((SELECT ifnull(sum(transfer_qty), 0)
- FROM
- `tabStock Entry Detail` sed, `tabStock Entry` se
- WHERE
- pos.name = sed.po_detail AND pos.rm_item_code = sed.item_code
- AND pos.parent = se.purchase_order AND sed.docstatus = 1
- AND se.name = sed.parent and se.purchase_order = %(po)s
- ), 0)
- WHERE pos.docstatus = 1 and pos.parent = %(po)s""", {"po": self.purchase_order})
+ supplied_items = get_supplied_items(self.purchase_order)
+ for name, item in supplied_items.items():
+ frappe.db.set_value('Purchase Order Item Supplied', name, item)
- #Update reserved sub contracted quantity in bin based on Supplied Item Details and
- for d in self.get("items"):
- item_code = d.get('original_item') or d.get('item_code')
- reserve_warehouse = item_wh.get(item_code)
- stock_bin = get_bin(item_code, reserve_warehouse)
- stock_bin.update_reserved_qty_for_sub_contracting()
+ #Update reserved sub contracted quantity in bin based on Supplied Item Details and
+ for d in self.get("items"):
+ item_code = d.get('original_item') or d.get('item_code')
+ reserve_warehouse = item_wh.get(item_code)
+ stock_bin = get_bin(item_code, reserve_warehouse)
+ stock_bin.update_reserved_qty_for_sub_contracting()
def update_so_in_serial_number(self):
so_name, item_code = frappe.db.get_value("Work Order", self.work_order, ["sales_order", "production_item"])
@@ -1480,7 +1511,7 @@ class StockEntry(StockController):
cond += """ WHEN (parent = %s and name = %s) THEN %s
""" %(frappe.db.escape(data[0]), frappe.db.escape(data[1]), transferred_qty)
- if cond and stock_entries_child_list:
+ if stock_entries_child_list:
frappe.db.sql(""" UPDATE `tabStock Entry Detail`
SET
transferred_qty = CASE {cond} END
@@ -1531,6 +1562,36 @@ class StockEntry(StockController):
material_requests.append(material_request)
frappe.db.set_value('Material Request', material_request, 'transfer_status', status)
+ def set_serial_no_batch_for_finished_good(self):
+ args = {}
+ if self.pro_doc.serial_no:
+ self.get_serial_nos_for_fg(args)
+
+ for row in self.items:
+ if row.is_finished_item and row.item_code == self.pro_doc.production_item:
+ if args.get("serial_no"):
+ row.serial_no = '\n'.join(args["serial_no"][0: cint(row.qty)])
+
+ def get_serial_nos_for_fg(self, args):
+ fields = ["`tabStock Entry`.`name`", "`tabStock Entry Detail`.`qty`",
+ "`tabStock Entry Detail`.`serial_no`", "`tabStock Entry Detail`.`batch_no`"]
+
+ filters = [["Stock Entry","work_order","=",self.work_order], ["Stock Entry","purpose","=","Manufacture"],
+ ["Stock Entry","docstatus","=",1], ["Stock Entry Detail","item_code","=",self.pro_doc.production_item]]
+
+ stock_entries = frappe.get_all("Stock Entry", fields=fields, filters=filters)
+
+ if self.pro_doc.serial_no:
+ args["serial_no"] = self.get_available_serial_nos(stock_entries)
+
+ def get_available_serial_nos(self, stock_entries):
+ used_serial_nos = []
+ for row in stock_entries:
+ if row.serial_no:
+ used_serial_nos.extend(get_serial_nos(row.serial_no))
+
+ return sorted(list(set(get_serial_nos(self.pro_doc.serial_no)) - set(used_serial_nos)))
+
@frappe.whitelist()
def move_sample_to_retention_warehouse(company, items):
if isinstance(items, string_types):
@@ -1642,6 +1703,10 @@ def get_operating_cost_per_unit(work_order=None, bom_no=None):
if bom.quantity:
operating_cost_per_unit = flt(bom.operating_cost) / flt(bom.quantity)
+ if work_order and work_order.produced_qty and cint(frappe.db.get_single_value('Manufacturing Settings',
+ 'add_corrective_operation_cost_in_finished_good_valuation')):
+ operating_cost_per_unit += flt(work_order.corrective_operation_cost) / flt(work_order.produced_qty)
+
return operating_cost_per_unit
def get_used_alternative_items(purchase_order=None, work_order=None):
@@ -1751,3 +1816,30 @@ def validate_sample_quantity(item_code, sample_quantity, qty, batch_no = None):
format(max_retain_qty, batch_no, item_code), alert=True)
sample_quantity = qty_diff
return sample_quantity
+
+def get_supplied_items(purchase_order):
+ fields = ['`tabStock Entry Detail`.`transfer_qty`', '`tabStock Entry`.`is_return`',
+ '`tabStock Entry Detail`.`po_detail`', '`tabStock Entry Detail`.`item_code`']
+
+ filters = [['Stock Entry', 'docstatus', '=', 1], ['Stock Entry', 'purchase_order', '=', purchase_order]]
+
+ supplied_item_details = {}
+ for row in frappe.get_all('Stock Entry', fields = fields, filters = filters):
+ if not row.po_detail:
+ continue
+
+ key = row.po_detail
+ if key not in supplied_item_details:
+ supplied_item_details.setdefault(key,
+ frappe._dict({'supplied_qty': 0, 'returned_qty':0, 'total_supplied_qty':0}))
+
+ supplied_item = supplied_item_details[key]
+
+ if row.is_return:
+ supplied_item.returned_qty += row.transfer_qty
+ else:
+ supplied_item.supplied_qty += row.transfer_qty
+
+ supplied_item.total_supplied_qty = flt(supplied_item.supplied_qty) - flt(supplied_item.returned_qty)
+
+ return supplied_item_details
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_utils.py b/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
index b12a8547fea..563fcb03973 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
@@ -45,6 +45,8 @@ def make_stock_entry(**args):
s.posting_date = args.posting_date
if args.posting_time:
s.posting_time = args.posting_time
+ if args.inspection_required:
+ s.inspection_required = args.inspection_required
# map names
if args.from_warehouse:
diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
index 864ff488b22..22f412a2989 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -18,6 +18,7 @@
"col_break2",
"is_finished_item",
"is_scrap_item",
+ "quality_inspection",
"subcontracted_item",
"section_break_8",
"description",
@@ -69,7 +70,6 @@
"putaway_rule",
"column_break_51",
"reference_purchase_receipt",
- "quality_inspection",
"job_card_item"
],
"fields": [
@@ -307,6 +307,7 @@
"fieldname": "quality_inspection",
"fieldtype": "Link",
"label": "Quality Inspection",
+ "no_copy": 1,
"options": "Quality Inspection"
},
{
@@ -548,7 +549,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
- "modified": "2021-02-11 13:47:50.158754",
+ "modified": "2021-06-21 16:03:18.834880",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry Detail",
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
index b0e7440e6cc..cb939e63c28 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
@@ -5,7 +5,7 @@
from __future__ import unicode_literals
import frappe
from frappe import _
-from frappe.utils import flt, getdate, add_days, formatdate, get_datetime, date_diff
+from frappe.utils import flt, getdate, add_days, formatdate, get_datetime, cint
from frappe.model.document import Document
from datetime import date
from erpnext.controllers.item_variant import ItemTemplateCannotHaveStock
@@ -108,17 +108,18 @@ class StockLedgerEntry(Document):
self.stock_uom = item_det.stock_uom
def check_stock_frozen_date(self):
- stock_frozen_upto = frappe.db.get_value('Stock Settings', None, 'stock_frozen_upto') or ''
- if stock_frozen_upto:
- stock_auth_role = frappe.db.get_value('Stock Settings', None,'stock_auth_role')
- if getdate(self.posting_date) <= getdate(stock_frozen_upto) and not stock_auth_role in frappe.get_roles():
- frappe.throw(_("Stock transactions before {0} are frozen").format(formatdate(stock_frozen_upto)), StockFreezeError)
+ stock_settings = frappe.get_doc('Stock Settings', 'Stock Settings')
- stock_frozen_upto_days = int(frappe.db.get_value('Stock Settings', None, 'stock_frozen_upto_days') or 0)
+ if stock_settings.stock_frozen_upto:
+ if (getdate(self.posting_date) <= getdate(stock_settings.stock_frozen_upto)
+ and stock_settings.stock_auth_role not in frappe.get_roles()):
+ frappe.throw(_("Stock transactions before {0} are frozen")
+ .format(formatdate(stock_settings.stock_frozen_upto)), StockFreezeError)
+
+ stock_frozen_upto_days = cint(stock_settings.stock_frozen_upto_days)
if stock_frozen_upto_days:
- stock_auth_role = frappe.db.get_value('Stock Settings', None,'stock_auth_role')
older_than_x_days_ago = (add_days(getdate(self.posting_date), stock_frozen_upto_days) <= date.today())
- if older_than_x_days_ago and not stock_auth_role in frappe.get_roles():
+ if older_than_x_days_ago and stock_settings.stock_auth_role not in frappe.get_roles():
frappe.throw(_("Not allowed to update stock transactions older than {0}").format(stock_frozen_upto_days), StockFreezeError)
def scrub_posting_time(self):
@@ -177,3 +178,4 @@ def on_doctype_update():
frappe.db.add_index("Stock Ledger Entry", ["voucher_no", "voucher_type"])
frappe.db.add_index("Stock Ledger Entry", ["batch_no", "item_code", "warehouse"])
+ frappe.db.add_index("Stock Ledger Entry", ["voucher_detail_no"])
diff --git a/erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py
index 3296f5ba4ae..af2ada8c9a4 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py
+++ b/erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py
@@ -15,10 +15,12 @@ from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_pu
from erpnext.stock.doctype.landed_cost_voucher.test_landed_cost_voucher import create_landed_cost_voucher
from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
from erpnext.stock.doctype.stock_ledger_entry.stock_ledger_entry import BackDatedStockTransaction
+from frappe.core.page.permission_manager.permission_manager import reset
class TestStockLedgerEntry(unittest.TestCase):
def setUp(self):
items = create_items()
+ reset('Stock Entry')
# delete SLE and BINs for all items
frappe.db.sql("delete from `tabStock Ledger Entry` where item_code in (%s)" % (', '.join(['%s']*len(items))), items)
@@ -52,7 +54,7 @@ class TestStockLedgerEntry(unittest.TestCase):
)
# _Test Item for Reposting transferred from Stores to FG warehouse on 30-04-2020
- make_stock_entry(
+ se = make_stock_entry(
item_code="_Test Item for Reposting",
source="Stores - _TC",
target="Finished Goods - _TC",
@@ -62,29 +64,29 @@ class TestStockLedgerEntry(unittest.TestCase):
posting_date='2020-04-30',
posting_time='14:00'
)
- target_wh_sle = get_previous_sle({
+ target_wh_sle = frappe.db.get_value('Stock Ledger Entry', {
"item_code": "_Test Item for Reposting",
"warehouse": "Finished Goods - _TC",
- "posting_date": '2020-04-30',
- "posting_time": '14:00'
- })
+ "voucher_type": "Stock Entry",
+ "voucher_no": se.name
+ }, ["valuation_rate"], as_dict=1)
self.assertEqual(target_wh_sle.get("valuation_rate"), 150)
# Repack entry on 5-5-2020
repack = create_repack_entry(company=company, posting_date='2020-05-05', posting_time='14:00')
- finished_item_sle = get_previous_sle({
+ finished_item_sle = frappe.db.get_value('Stock Ledger Entry', {
"item_code": "_Test Finished Item for Reposting",
"warehouse": "Finished Goods - _TC",
- "posting_date": '2020-05-05',
- "posting_time": '14:00'
- })
+ "voucher_type": "Stock Entry",
+ "voucher_no": repack.name
+ }, ["incoming_rate", "valuation_rate"], as_dict=1)
self.assertEqual(finished_item_sle.get("incoming_rate"), 540)
self.assertEqual(finished_item_sle.get("valuation_rate"), 540)
# Reconciliation for _Test Item for Reposting at Stores on 12-04-2020: Qty = 50, Rate = 150
- create_stock_reconciliation(
+ sr = create_stock_reconciliation(
item_code="_Test Item for Reposting",
warehouse="Stores - _TC",
qty=50,
@@ -107,12 +109,12 @@ class TestStockLedgerEntry(unittest.TestCase):
self.assertEqual(target_wh_sle.get("valuation_rate"), 175)
# Check valuation rate of repacked item after back-dated entry at Stores
- finished_item_sle = get_previous_sle({
+ finished_item_sle = frappe.db.get_value('Stock Ledger Entry', {
"item_code": "_Test Finished Item for Reposting",
"warehouse": "Finished Goods - _TC",
- "posting_date": '2020-05-05',
- "posting_time": '14:00'
- })
+ "voucher_type": "Stock Entry",
+ "voucher_no": repack.name
+ }, ["incoming_rate", "valuation_rate"], as_dict=1)
self.assertEqual(finished_item_sle.get("incoming_rate"), 790)
self.assertEqual(finished_item_sle.get("valuation_rate"), 790)
@@ -314,10 +316,11 @@ class TestStockLedgerEntry(unittest.TestCase):
# Set User with Stock User role but not Stock Manager
try:
user = frappe.get_doc("User", "test@example.com")
- frappe.set_user(user.name)
user.add_roles("Stock User")
user.remove_roles("Stock Manager")
+ frappe.set_user(user.name)
+
stock_entry_on_today = make_stock_entry(target="_Test Warehouse - _TC", qty=10, basic_rate=100)
back_dated_se_1 = make_stock_entry(target="_Test Warehouse - _TC", qty=10, basic_rate=100,
posting_date=add_days(today(), -1), do_not_submit=True)
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
index ac4ed5e75d9..a01db80da4a 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
@@ -48,37 +48,54 @@ frappe.ui.form.on("Stock Reconciliation", {
},
get_items: function(frm) {
- frappe.prompt({label:"Warehouse", fieldname: "warehouse", fieldtype:"Link", options:"Warehouse", reqd: 1,
+ let fields = [{
+ label: 'Warehouse', fieldname: 'warehouse', fieldtype: 'Link', options: 'Warehouse', reqd: 1,
"get_query": function() {
return {
"filters": {
"company": frm.doc.company,
}
- }
- }},
- function(data) {
- frappe.call({
- method:"erpnext.stock.doctype.stock_reconciliation.stock_reconciliation.get_items",
- args: {
- warehouse: data.warehouse,
- posting_date: frm.doc.posting_date,
- posting_time: frm.doc.posting_time,
- company:frm.doc.company
- },
- callback: function(r) {
- var items = [];
- frm.clear_table("items");
- for(var i=0; i< r.message.length; i++) {
- var d = frm.add_child("items");
- $.extend(d, r.message[i]);
- if(!d.qty) d.qty = null;
- if(!d.valuation_rate) d.valuation_rate = null;
- }
- frm.refresh_field("items");
- }
- });
+ };
}
- , __("Get Items"), __("Update"));
+ }, {
+ label: "Item Code", fieldname: "item_code", fieldtype: "Link", options: "Item",
+ "get_query": function() {
+ return {
+ "filters": {
+ "disabled": 0,
+ }
+ };
+ }
+ }];
+
+ frappe.prompt(fields, function(data) {
+ frappe.call({
+ method: "erpnext.stock.doctype.stock_reconciliation.stock_reconciliation.get_items",
+ args: {
+ warehouse: data.warehouse,
+ posting_date: frm.doc.posting_date,
+ posting_time: frm.doc.posting_time,
+ company: frm.doc.company,
+ item_code: data.item_code
+ },
+ callback: function(r) {
+ frm.clear_table("items");
+ for (var i=0; i
+
+ {% else %}
+
+
+
+ {% else %}
+
+
{{ doc.project_name }}
+{{ doc.project_name }}
{% endblock %} {% block style %} - + {% endblock %} - {% block page_content %} -{% if doc.percent_complete %} -{{ _("Tasks") }}
- {{ _("New task") }} -- -
+Status:
+Progress: + {{ doc.percent_complete }} + % +
+Hours Spent: + {{ doc.actual_time }} +
+-
{{ _("No tasks") }}
-{% endif %} + {{ progress_bar(doc.percent_complete) }} + {% if doc.tasks %} +{{ _("No Tasks") }}
+ {% endif %} - + {% if doc.timesheets %} +Timesheets
+Status
+From
+To
+Modified By
+Modified On
+{{ _("No Timesheets") }}
+ {% endif %} -{{ _("Timesheets") }}
+ {% if doc.attachments %} + -{% if doc.timesheets %} -- {% endif %} -{% else %} -
{{ _("No time sheets") }}
-{% endif %} - -{% if doc.attachments %} - - -