From e2bb950012b0f7c22510fba566f87d25497300c7 Mon Sep 17 00:00:00 2001 From: Khushal Trivedi Date: Tue, 15 Oct 2019 15:03:13 +0530 Subject: [PATCH 01/26] [fix] - from date cannot be greater than to date on blanket order --- .../doctype/blanket_order/blanket_order.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.py b/erpnext/manufacturing/doctype/blanket_order/blanket_order.py index 822c7fcc1a..faed707d60 100644 --- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.py +++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.py @@ -4,13 +4,21 @@ from __future__ import unicode_literals import frappe -from frappe.utils import flt +from frappe import _ +from frappe.utils import flt, getdate from frappe.model.document import Document from frappe.model.mapper import get_mapped_doc from erpnext.stock.doctype.item.item import get_item_defaults class BlanketOrder(Document): + def validate(self): + self.validate_dates() + + def validate_dates(self): + if getdate(self.from_date) > getdate(self.to_date): + frappe.throw(_("From date cannot be greater than To date")) + def update_ordered_qty(self): ref_doctype = "Sales Order" if self.blanket_order_type == "Selling" else "Purchase Order" item_ordered_qty = frappe._dict(frappe.db.sql(""" From 3db65ef7e86f997f15770c0053839caf3d7dd39b Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Tue, 15 Oct 2019 19:16:45 +0530 Subject: [PATCH 02/26] fix: Demo Script --- erpnext/demo/setup/setup_data.py | 28 +++++++----- erpnext/demo/user/accounts.py | 14 +++--- erpnext/demo/user/projects.py | 57 ------------------------ erpnext/demo/user/sales.py | 2 +- erpnext/setup/doctype/company/company.py | 2 +- 5 files changed, 28 insertions(+), 75 deletions(-) diff --git a/erpnext/demo/setup/setup_data.py b/erpnext/demo/setup/setup_data.py index 48dcdbe863..a395c7c17a 100644 --- a/erpnext/demo/setup/setup_data.py +++ b/erpnext/demo/setup/setup_data.py @@ -10,13 +10,14 @@ from erpnext.demo.domains import data from frappe import _ def setup(domain): + frappe.flags.in_demo = 1 complete_setup(domain) setup_demo_page() setup_fiscal_year() setup_holiday_list() setup_user() setup_employee() - setup_user_roles() + setup_user_roles(domain) setup_role_permissions() setup_custom_field_for_domain() @@ -183,13 +184,19 @@ def setup_salary_structure(employees, salary_slip_based_on_timesheet=0): return ss -def setup_user_roles(): +def setup_user_roles(domain): user = frappe.get_doc('User', 'demo@erpnext.com') user.add_roles('HR User', 'HR Manager', 'Accounts User', 'Accounts Manager', 'Stock User', 'Stock Manager', 'Sales User', 'Sales Manager', 'Purchase User', 'Purchase Manager', 'Projects User', 'Manufacturing User', 'Manufacturing Manager', - 'Support Team', 'Academics User', 'Physician', 'Healthcare Administrator', 'Laboratory User', - 'Nursing User', 'Patient') + 'Support Team') + + if domain == "Healthcare": + user.add_roles('Physician', 'Healthcare Administrator', 'Laboratory User', + 'Nursing User', 'Patient') + + if domain == "Education": + user.add_roles('Academics User') if not frappe.db.get_global('demo_hr_user'): user = frappe.get_doc('User', 'CaitlinSnow@example.com') @@ -219,7 +226,7 @@ def setup_user_roles(): if not frappe.db.get_global('demo_manufacturing_user'): user = frappe.get_doc('User', 'NeptuniaAquaria@example.com') - user.add_roles('Manufacturing User', 'Stock User', 'Purchase User', 'Accounts User') + user.add_roles('Manufacturing User', 'Stock Manager', 'Stock User', 'Purchase User', 'Accounts User') update_employee_department(user.name, 'Production') frappe.db.set_global('demo_manufacturing_user', user.name) @@ -241,11 +248,12 @@ def setup_user_roles(): update_employee_department(user.name, 'Management') frappe.db.set_global('demo_projects_user', user.name) - if not frappe.db.get_global('demo_education_user'): - user = frappe.get_doc('User', 'ArthurCurry@example.com') - user.add_roles('Academics User') - update_employee_department(user.name, 'Management') - frappe.db.set_global('demo_education_user', user.name) + if domain == "Education": + if not frappe.db.get_global('demo_education_user'): + user = frappe.get_doc('User', 'ArthurCurry@example.com') + user.add_roles('Academics User') + update_employee_department(user.name, 'Management') + frappe.db.set_global('demo_education_user', user.name) #Add Expense Approver user = frappe.get_doc('User', 'ClarkKent@example.com') diff --git a/erpnext/demo/user/accounts.py b/erpnext/demo/user/accounts.py index 6206dfd2d0..7fab772235 100644 --- a/erpnext/demo/user/accounts.py +++ b/erpnext/demo/user/accounts.py @@ -73,14 +73,16 @@ def work(): make_pos_invoice() def make_payment_entries(ref_doctype, report): - outstanding_invoices = list(set([r[3] for r in query_report.run(report, { - "report_date": frappe.flags.current_date, - "company": erpnext.get_default_company() - })["result"] if r[2]==ref_doctype])) + + outstanding_invoices = frappe.get_all(ref_doctype, fields=["name"], + filters={ + "company": erpnext.get_default_company(), + "outstanding_amount": (">", 0.0) + }) # make Payment Entry for inv in outstanding_invoices[:random.randint(1, 2)]: - pe = get_payment_entry(ref_doctype, inv) + pe = get_payment_entry(ref_doctype, inv.name) pe.posting_date = frappe.flags.current_date pe.reference_no = random_string(6) pe.reference_date = frappe.flags.current_date @@ -91,7 +93,7 @@ def make_payment_entries(ref_doctype, report): # make payment via JV for inv in outstanding_invoices[:1]: - jv = frappe.get_doc(get_payment_entry_against_invoice(ref_doctype, inv)) + jv = frappe.get_doc(get_payment_entry_against_invoice(ref_doctype, inv.name)) jv.posting_date = frappe.flags.current_date jv.cheque_no = random_string(6) jv.cheque_date = frappe.flags.current_date diff --git a/erpnext/demo/user/projects.py b/erpnext/demo/user/projects.py index 36d676f317..044e2967fd 100644 --- a/erpnext/demo/user/projects.py +++ b/erpnext/demo/user/projects.py @@ -39,61 +39,4 @@ def make_project(current_date): "doctype": "Project", "project_name": "New Product Development " + current_date.strftime("%Y-%m-%d"), }) - project.set("tasks", [ - { - "title": "Review Requirements", - "start_date": frappe.utils.add_days(current_date, 10), - "end_date": frappe.utils.add_days(current_date, 11) - }, - { - "title": "Design Options", - "start_date": frappe.utils.add_days(current_date, 11), - "end_date": frappe.utils.add_days(current_date, 20) - }, - { - "title": "Make Prototypes", - "start_date": frappe.utils.add_days(current_date, 20), - "end_date": frappe.utils.add_days(current_date, 30) - }, - { - "title": "Customer Feedback on Prototypes", - "start_date": frappe.utils.add_days(current_date, 30), - "end_date": frappe.utils.add_days(current_date, 40) - }, - { - "title": "Freeze Feature Set", - "start_date": frappe.utils.add_days(current_date, 40), - "end_date": frappe.utils.add_days(current_date, 45) - }, - { - "title": "Testing", - "start_date": frappe.utils.add_days(current_date, 45), - "end_date": frappe.utils.add_days(current_date, 60) - }, - { - "title": "Product Engineering", - "start_date": frappe.utils.add_days(current_date, 45), - "end_date": frappe.utils.add_days(current_date, 55) - }, - { - "title": "Supplier Contracts", - "start_date": frappe.utils.add_days(current_date, 55), - "end_date": frappe.utils.add_days(current_date, 70) - }, - { - "title": "Design and Build Fixtures", - "start_date": frappe.utils.add_days(current_date, 45), - "end_date": frappe.utils.add_days(current_date, 65) - }, - { - "title": "Test Run", - "start_date": frappe.utils.add_days(current_date, 70), - "end_date": frappe.utils.add_days(current_date, 80) - }, - { - "title": "Launch", - "start_date": frappe.utils.add_days(current_date, 80), - "end_date": frappe.utils.add_days(current_date, 90) - }, - ]) project.insert() diff --git a/erpnext/demo/user/sales.py b/erpnext/demo/user/sales.py index 457e9763dc..8d5ba28b79 100644 --- a/erpnext/demo/user/sales.py +++ b/erpnext/demo/user/sales.py @@ -66,7 +66,7 @@ def make_opportunity(domain): b = frappe.get_doc({ "doctype": "Opportunity", "opportunity_from": "Customer", - "customer": get_random("Customer"), + "party_name": frappe.get_value("Customer", get_random("Customer"), 'name'), "opportunity_type": "Sales", "with_items": 1, "transaction_date": frappe.flags.current_date, diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py index 9eb374824a..e69a6aaded 100644 --- a/erpnext/setup/doctype/company/company.py +++ b/erpnext/setup/doctype/company/company.py @@ -204,7 +204,7 @@ class Company(NestedSet): }) for default_account in default_accounts: - if self.is_new() or frappe.flags.in_test: + if self.is_new() or frappe.flags.in_test or frappe.flags.in_demo: self._set_default_account(default_account, default_accounts.get(default_account)) if not self.default_income_account: From 8aa0a280b201be9bbd043db3c1f3288853e64da5 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 15 Oct 2019 19:17:20 +0530 Subject: [PATCH 03/26] Revert "fix: Allow disabled links in issue doctype (#19265)" This reverts commit 29a5756f87ccb07bb52ffc9fbc4db0bee891c295. --- erpnext/support/doctype/issue/issue.py | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/support/doctype/issue/issue.py b/erpnext/support/doctype/issue/issue.py index cdf5fedcb8..b748e3fa46 100644 --- a/erpnext/support/doctype/issue/issue.py +++ b/erpnext/support/doctype/issue/issue.py @@ -22,7 +22,6 @@ class Issue(Document): return "{0}: {1}".format(_(self.status), self.subject) def validate(self): - self.flags.ignore_disabled = 1 if self.is_new() and self.via_customer_portal: self.flags.create_communication = True From a32618dff46e5bfebb23f68c34ba42592b6d826a Mon Sep 17 00:00:00 2001 From: ashish-greycube Date: Wed, 16 Oct 2019 10:26:25 +0530 Subject: [PATCH 04/26] add coupon code on selling card of desk --- erpnext/config/selling.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/erpnext/config/selling.py b/erpnext/config/selling.py index 928bd5fa32..5db4cc2702 100644 --- a/erpnext/config/selling.py +++ b/erpnext/config/selling.py @@ -127,7 +127,11 @@ def get_data(): "name": "Shipping Rule", "description": _("Rules for adding shipping costs."), }, - + { + "type": "doctype", + "name": "Coupon Code", + "description": _("Define coupon codes."), + } ] }, { From c41e44d964a296145332eafee7c342456e5326ce Mon Sep 17 00:00:00 2001 From: ashish-greycube Date: Wed, 16 Oct 2019 10:38:31 +0530 Subject: [PATCH 05/26] fix: relative link in href --- erpnext/www/all-products/item_row.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/www/all-products/item_row.html b/erpnext/www/all-products/item_row.html index 9fa7fa3539..b61785aa2d 100644 --- a/erpnext/www/all-products/item_row.html +++ b/erpnext/www/all-products/item_row.html @@ -2,7 +2,7 @@
- + {{ item.item_name }}
@@ -10,7 +10,7 @@
- + {{ item.item_name or item.name }}
From 01f8a4966ab0bb7b38a953613b90c0ab7f2381f9 Mon Sep 17 00:00:00 2001 From: Khushal Trivedi Date: Wed, 16 Oct 2019 11:40:27 +0530 Subject: [PATCH 06/26] [Fix] - making customer/supplier field manadatory on order type condition --- erpnext/manufacturing/doctype/blanket_order/blanket_order.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js index 0bbf689d4a..1e18678eb0 100644 --- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js @@ -51,11 +51,13 @@ frappe.ui.form.on('Blanket Order', { set_tc_name_filter: function(frm) { if (frm.doc.blanket_order_type === 'Selling') { + frm.set_df_property("customer","reqd", 1) frm.set_query("tc_name", function() { return { filters: { selling: 1 } }; }); } if (frm.doc.blanket_order_type === 'Purchasing') { + frm.set_df_property("customer","reqd", 1) frm.set_query("tc_name", function() { return { filters: { buying: 1 } }; }); From 1675181e49079c8a045c7dd9a874f3db98705e0a Mon Sep 17 00:00:00 2001 From: Khushal Trivedi Date: Wed, 16 Oct 2019 12:02:56 +0530 Subject: [PATCH 07/26] [Fix] - making customer/supplier field manadatory on order type condition on BO --- .../manufacturing/doctype/blanket_order/blanket_order.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js index 1e18678eb0..87ad3b5d9f 100644 --- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js @@ -52,12 +52,16 @@ frappe.ui.form.on('Blanket Order', { set_tc_name_filter: function(frm) { if (frm.doc.blanket_order_type === 'Selling') { frm.set_df_property("customer","reqd", 1) + frm.set_df_property("supplier","reqd", 0) + frm.set_query("tc_name", function() { return { filters: { selling: 1 } }; }); } if (frm.doc.blanket_order_type === 'Purchasing') { - frm.set_df_property("customer","reqd", 1) + frm.set_df_property("supplier","reqd", 1) + frm.set_df_property("customer","reqd", 0) + frm.set_query("tc_name", function() { return { filters: { buying: 1 } }; }); @@ -66,7 +70,7 @@ frappe.ui.form.on('Blanket Order', { blanket_order_type: function (frm) { frm.trigger('set_tc_name_filter'); - } + }, }); From 7084f07dab2f34889d952020785e5d10ceeb0b6c Mon Sep 17 00:00:00 2001 From: Khushal Trivedi Date: Wed, 16 Oct 2019 13:40:33 +0530 Subject: [PATCH 08/26] [Fix] - making customer/supplier field manadatory on order type condition on BO --- erpnext/manufacturing/doctype/blanket_order/blanket_order.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js index 87ad3b5d9f..8f0a5e0133 100644 --- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js @@ -70,7 +70,7 @@ frappe.ui.form.on('Blanket Order', { blanket_order_type: function (frm) { frm.trigger('set_tc_name_filter'); - }, + } }); From 5f4b6d267cb1caba153692405578beb558e006f5 Mon Sep 17 00:00:00 2001 From: Khushal Trivedi Date: Wed, 16 Oct 2019 13:40:58 +0530 Subject: [PATCH 09/26] [Fix] - making customer/supplier field manadatory on order type condition on BO --- erpnext/manufacturing/doctype/blanket_order/blanket_order.js | 3 +++ .../manufacturing/doctype/blanket_order/blanket_order.json | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js index 8f0a5e0133..b6ad27632e 100644 --- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js @@ -53,6 +53,7 @@ frappe.ui.form.on('Blanket Order', { if (frm.doc.blanket_order_type === 'Selling') { frm.set_df_property("customer","reqd", 1) frm.set_df_property("supplier","reqd", 0) + frm.set_value("supplier", "") frm.set_query("tc_name", function() { return { filters: { selling: 1 } }; @@ -61,6 +62,8 @@ frappe.ui.form.on('Blanket Order', { if (frm.doc.blanket_order_type === 'Purchasing') { frm.set_df_property("supplier","reqd", 1) frm.set_df_property("customer","reqd", 0) + frm.set_value("customer", "") + frm.set_query("tc_name", function() { return { filters: { buying: 1 } }; diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.json b/erpnext/manufacturing/doctype/blanket_order/blanket_order.json index 570d435c5f..260e0b8a73 100644 --- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.json +++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.json @@ -88,7 +88,8 @@ "fieldname": "company", "fieldtype": "Link", "label": "Company", - "options": "Company" + "options": "Company", + "reqd": 1 }, { "fieldname": "section_break_12", @@ -128,7 +129,7 @@ } ], "is_submittable": 1, - "modified": "2019-06-19 11:59:09.279607", + "modified": "2019-10-16 13:38:32.302316", "modified_by": "Administrator", "module": "Manufacturing", "name": "Blanket Order", From 8750caa8e36ce3ffa764663bdbef2950a6432689 Mon Sep 17 00:00:00 2001 From: Khushal Trivedi Date: Fri, 18 Oct 2019 17:01:16 +0530 Subject: [PATCH 10/26] [Fix] - if its not multi company set it by default on BO --- erpnext/manufacturing/doctype/blanket_order/blanket_order.js | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js index b6ad27632e..19ec2fc00a 100644 --- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js @@ -12,6 +12,7 @@ frappe.ui.form.on('Blanket Order', { }, refresh: function(frm) { + erpnext.hide_company(); if (frm.doc.customer && frm.doc.docstatus === 1) { frm.add_custom_button(__('View Orders'), function() { frappe.set_route('List', 'Sales Order', {blanket_order: frm.doc.name}); From cdebd400ec88879077f7aa36ce89932ce3cc4893 Mon Sep 17 00:00:00 2001 From: Khushal Trivedi Date: Mon, 21 Oct 2019 16:29:16 +0530 Subject: [PATCH 11/26] [Fix] - changed codacy changers suggested --- .../doctype/blanket_order/blanket_order.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js index 19ec2fc00a..420fb1099d 100644 --- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js @@ -52,18 +52,18 @@ frappe.ui.form.on('Blanket Order', { set_tc_name_filter: function(frm) { if (frm.doc.blanket_order_type === 'Selling') { - frm.set_df_property("customer","reqd", 1) - frm.set_df_property("supplier","reqd", 0) - frm.set_value("supplier", "") + frm.set_df_property("customer","reqd", 1); + frm.set_df_property("supplier","reqd", 0); + frm.set_value("supplier", ""); frm.set_query("tc_name", function() { return { filters: { selling: 1 } }; }); } if (frm.doc.blanket_order_type === 'Purchasing') { - frm.set_df_property("supplier","reqd", 1) - frm.set_df_property("customer","reqd", 0) - frm.set_value("customer", "") + frm.set_df_property("supplier","reqd", 1); + frm.set_df_property("customer","reqd", 0); + frm.set_value("customer", ""); frm.set_query("tc_name", function() { From ad71307a5e0bc2558737978b8622f87810a18b3f Mon Sep 17 00:00:00 2001 From: Khushal Trivedi Date: Mon, 21 Oct 2019 17:46:35 +0530 Subject: [PATCH 12/26] fix: date validation, setting up default conpany, customer/supplier manadatory property on Blanket Order --- erpnext/manufacturing/doctype/blanket_order/blanket_order.js | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js index 420fb1099d..20336a1dfa 100644 --- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js @@ -65,7 +65,6 @@ frappe.ui.form.on('Blanket Order', { frm.set_df_property("customer","reqd", 0); frm.set_value("customer", ""); - frm.set_query("tc_name", function() { return { filters: { buying: 1 } }; }); From e22ca23b81984d85f73ce1044a63f95ab14e50d0 Mon Sep 17 00:00:00 2001 From: Khushal Trivedi Date: Mon, 21 Oct 2019 18:17:42 +0530 Subject: [PATCH 13/26] fix: fix: date validation, setting up default conpany, customer/supplier manadatory property on Blanket Order --- erpnext/manufacturing/doctype/blanket_order/blanket_order.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js index 20336a1dfa..1cd9446c8b 100644 --- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js +++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js @@ -61,7 +61,7 @@ frappe.ui.form.on('Blanket Order', { }); } if (frm.doc.blanket_order_type === 'Purchasing') { - frm.set_df_property("supplier","reqd", 1); + frm.set_df_property("supplier","reqd", 1); frm.set_df_property("customer","reqd", 0); frm.set_value("customer", ""); From b5bd3f3abf1782f20e9ca2cf5122fd8fffbbae6d Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Tue, 22 Oct 2019 13:38:36 +0530 Subject: [PATCH 14/26] fix: custom doctypes and reports not visible in Accounts module view --- erpnext/config/{accounting.py => accounts.py} | 0 erpnext/config/desktop.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename erpnext/config/{accounting.py => accounts.py} (100%) diff --git a/erpnext/config/accounting.py b/erpnext/config/accounts.py similarity index 100% rename from erpnext/config/accounting.py rename to erpnext/config/accounts.py diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py index 8ce096499d..95f6f7c510 100644 --- a/erpnext/config/desktop.py +++ b/erpnext/config/desktop.py @@ -18,7 +18,7 @@ def get_data(): "onboard_present": 1 }, { - "module_name": "Accounting", + "module_name": "Accounts", "category": "Modules", "label": _("Accounting"), "color": "#3498db", From d8ddd1e2ec0228ed9f795a88dd3ecb93fb554173 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 22 Oct 2019 14:03:27 +0530 Subject: [PATCH 15/26] fix: not able to select the zero qty batch while making the sales return entry --- erpnext/controllers/queries.py | 39 ++++++++++++-------- erpnext/public/js/controllers/transaction.js | 5 +++ 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py index 19dea080b1..2f6b59f0fb 100644 --- a/erpnext/controllers/queries.py +++ b/erpnext/controllers/queries.py @@ -280,22 +280,31 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters): "page_len": page_len } + having_clause = "having sum(sle.actual_qty) > 0" + if filters.get("is_return"): + having_clause = "" + if args.get('warehouse'): - batch_nos = frappe.db.sql("""select sle.batch_no, round(sum(sle.actual_qty),2), sle.stock_uom, concat('MFG-',batch.manufacturing_date), concat('EXP-',batch.expiry_date) - from `tabStock Ledger Entry` sle - INNER JOIN `tabBatch` batch on sle.batch_no = batch.name - where - batch.disabled = 0 - and sle.item_code = %(item_code)s - and sle.warehouse = %(warehouse)s - and (sle.batch_no like %(txt)s - or batch.manufacturing_date like %(txt)s) - and batch.docstatus < 2 - {0} - {match_conditions} - group by batch_no having sum(sle.actual_qty) > 0 - order by batch.expiry_date, sle.batch_no desc - limit %(start)s, %(page_len)s""".format(cond, match_conditions=get_match_cond(doctype)), args) + batch_nos = frappe.db.sql("""select sle.batch_no, round(sum(sle.actual_qty),2), sle.stock_uom, + concat('MFG-',batch.manufacturing_date), concat('EXP-',batch.expiry_date) + from `tabStock Ledger Entry` sle + INNER JOIN `tabBatch` batch on sle.batch_no = batch.name + where + batch.disabled = 0 + and sle.item_code = %(item_code)s + and sle.warehouse = %(warehouse)s + and (sle.batch_no like %(txt)s + or batch.manufacturing_date like %(txt)s) + and batch.docstatus < 2 + {cond} + {match_conditions} + group by batch_no {having_clause} + order by batch.expiry_date, sle.batch_no desc + limit %(start)s, %(page_len)s""".format( + cond=cond, + match_conditions=get_match_cond(doctype), + having_clause = having_clause + ), args) return batch_nos else: diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index a9b19eddd7..57a1cc2ca1 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -1652,6 +1652,11 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ 'item_code': item.item_code, 'posting_date': me.frm.doc.posting_date || frappe.datetime.nowdate(), } + + if (doc.is_return) { + filters["is_return"] = 1; + } + if (item.warehouse) filters["warehouse"] = item.warehouse; return { From 5ff377e2bb634034554a2d6fb6a5729460136730 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 23 Oct 2019 11:09:21 +0530 Subject: [PATCH 16/26] fix: product link not working in website (#19373) --- erpnext/www/all-products/item_row.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/www/all-products/item_row.html b/erpnext/www/all-products/item_row.html index 9fa7fa3539..9e628265aa 100644 --- a/erpnext/www/all-products/item_row.html +++ b/erpnext/www/all-products/item_row.html @@ -2,7 +2,7 @@
- + {{ item.item_name }}
@@ -10,14 +10,14 @@
- + {{ item.item_name or item.name }}

{{ item.website_description or item.description or 'No description' }}

- {{ _('More details') }} + {{ _('More details') }}
From d5166861ded4ec2cb6dcbaab9f9bf41f044174b8 Mon Sep 17 00:00:00 2001 From: Pranav Nachnekar Date: Wed, 23 Oct 2019 07:46:00 +0000 Subject: [PATCH 17/26] fix:setting incorrect field for party bank account Previously ![wrong](https://user-images.githubusercontent.com/6195660/67369702-0671c000-f569-11e9-9916-a1d1a0c3ddd1.gif) Corrected ![corrected](https://user-images.githubusercontent.com/6195660/67369663-f9ed6780-f568-11e9-859b-cbfa9857b39e.gif) --- erpnext/accounts/doctype/payment_entry/payment_entry.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js index 172d5372a6..1e0b1bcbf1 100644 --- a/erpnext/accounts/doctype/payment_entry/payment_entry.js +++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js @@ -308,7 +308,7 @@ frappe.ui.form.on('Payment Entry', { () => { frm.set_party_account_based_on_party = false; if (r.message.bank_account) { - frm.set_value("bank_account", r.message.bank_account); + frm.set_value("party_bank_account", r.message.bank_account); } } ]); From 758635ab91565e1247e82436c2c2059f04498251 Mon Sep 17 00:00:00 2001 From: Sahil Khan Date: Thu, 24 Oct 2019 17:50:19 +0550 Subject: [PATCH 18/26] bumped to version 12.1.7 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 686d5492ca..a06e3db9ae 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '12.1.6' +__version__ = '12.1.7' def get_default_company(user=None): '''Get default company for user''' From 7bdc6120132c23af4e7e334f6a96aeaae06c8ee7 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 24 Oct 2019 18:01:58 +0530 Subject: [PATCH 19/26] chore: Update module name (#19404) --- erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py b/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py index 5c18985f7f..3d1a88e800 100644 --- a/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py +++ b/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py @@ -4,7 +4,7 @@ from frappe.model.utils.rename_field import rename_field def execute(): - frappe.reload_doc('desk', 'doctype', 'auto_repeat') + frappe.reload_doc('automation', 'doctype', 'auto_repeat') doctypes_to_rename = { 'accounts': ['Journal Entry', 'Payment Entry', 'Purchase Invoice', 'Sales Invoice'], @@ -41,4 +41,4 @@ def drop_columns_from_subscription(): if field in frappe.db.get_table_columns("Subscription"): fields_to_drop['Subscription'].append(field) - frappe.model.delete_fields(fields_to_drop, delete=1) \ No newline at end of file + frappe.model.delete_fields(fields_to_drop, delete=1) From e1f95c0529f0109f7cc70674b4bab75971436550 Mon Sep 17 00:00:00 2001 From: Ashish Shah Date: Fri, 25 Oct 2019 12:16:11 +0530 Subject: [PATCH 20/26] fix: allow_items_not_in_stock should be evaluated (#19398) --- erpnext/shopping_cart/cart.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py index f850bc1707..a4c10cfb7d 100644 --- a/erpnext/shopping_cart/cart.py +++ b/erpnext/shopping_cart/cart.py @@ -66,7 +66,7 @@ def place_order(): from erpnext.selling.doctype.quotation.quotation import _make_sales_order sales_order = frappe.get_doc(_make_sales_order(quotation.name, ignore_permissions=True)) - if not cart_settings.allow_items_not_in_stock: + if not cint(cart_settings.allow_items_not_in_stock): for item in sales_order.get("items"): item.reserved_warehouse, is_stock_item = frappe.db.get_value("Item", item.item_code, ["website_warehouse", "is_stock_item"]) From 8f67ef8a750a0fac04b85935e6a2d5b937666fca Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 25 Oct 2019 18:55:57 +0530 Subject: [PATCH 21/26] fix: Add patch to replace accounting with accounts in home_settings --- erpnext/patches.txt | 1 + .../replace_accounting_with_accounts_in_home_settings.py | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 erpnext/patches/v12_0/replace_accounting_with_accounts_in_home_settings.py diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 9f98099257..ee6bdff661 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -640,3 +640,4 @@ erpnext.patches.v12_0.create_default_energy_point_rules erpnext.patches.v12_0.set_produced_qty_field_in_sales_order_for_work_order erpnext.patches.v12_0.generate_leave_ledger_entries erpnext.patches.v12_0.set_default_shopify_app_type +erpnext.patches.v12_0.replace_accounting_with_accounts_in_home_settings diff --git a/erpnext/patches/v12_0/replace_accounting_with_accounts_in_home_settings.py b/erpnext/patches/v12_0/replace_accounting_with_accounts_in_home_settings.py new file mode 100644 index 0000000000..09fc4c1b04 --- /dev/null +++ b/erpnext/patches/v12_0/replace_accounting_with_accounts_in_home_settings.py @@ -0,0 +1,5 @@ +import frappe + +def execute(): + frappe.db.sql("""UPDATE `tabUser` SET `home_settings` = REPLACE(`home_settings`, 'Accounting', 'Accounts')""") + frappe.cache().delete_key('home_settings') \ No newline at end of file From 9f483c1fa93baba04ae2735c58feab88ffbab1b6 Mon Sep 17 00:00:00 2001 From: Jai Chavan <40264279+jaichavan@users.noreply.github.com> Date: Sat, 26 Oct 2019 18:45:01 +0530 Subject: [PATCH 22/26] fix: Spelling of Variance --- .../report/budget_variance_report/budget_variance_report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/report/budget_variance_report/budget_variance_report.py b/erpnext/accounts/report/budget_variance_report/budget_variance_report.py index 146c10c222..8d65ac8714 100644 --- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.py @@ -69,7 +69,7 @@ def get_columns(filters): for year in fiscal_year: for from_date, to_date in get_period_date_ranges(filters["period"], year[0]): if filters["period"] == "Yearly": - labels = [_("Budget") + " " + str(year[0]), _("Actual ") + " " + str(year[0]), _("Varaiance ") + " " + str(year[0])] + labels = [_("Budget") + " " + str(year[0]), _("Actual ") + " " + str(year[0]), _("Variance ") + " " + str(year[0])] for label in labels: columns.append(label+":Float:150") else: From ce5200d70045f02345e84634b1ca3f3d9dc7a7f6 Mon Sep 17 00:00:00 2001 From: Sahil Khan Date: Thu, 24 Oct 2019 17:50:19 +0550 Subject: [PATCH 23/26] bumped to version 12.1.7 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 686d5492ca..a06e3db9ae 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '12.1.6' +__version__ = '12.1.7' def get_default_company(user=None): '''Get default company for user''' From e6f86c934dc8100980ac009b1d6e39a51d711d0b Mon Sep 17 00:00:00 2001 From: Sahil Khan Date: Sat, 26 Oct 2019 20:22:19 +0550 Subject: [PATCH 24/26] bumped to version 12.1.8 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index a06e3db9ae..d031bc5bb1 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '12.1.7' +__version__ = '12.1.8' def get_default_company(user=None): '''Get default company for user''' From 83b58352cec927b8b8baec9ebf23dd45a3749195 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Mon, 28 Oct 2019 12:05:30 +0530 Subject: [PATCH 25/26] fix: Overwrite default cost center if item has default cost center set. (#19405) --- erpnext/selling/doctype/sales_order/sales_order.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index af78ab250d..c4c3c0f81e 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -205,7 +205,7 @@ class SalesOrder(SellingController): if self.coupon_code: from erpnext.accounts.doctype.pricing_rule.utils import update_coupon_code_count update_coupon_code_count(self.coupon_code,'cancelled') - + def update_project(self): if frappe.db.get_single_value('Selling Settings', 'sales_update_frequency') != "Each Transaction": return @@ -661,12 +661,15 @@ def make_sales_invoice(source_name, target_doc=None, ignore_permissions=False): if source_parent.project: target.cost_center = frappe.db.get_value("Project", source_parent.project, "cost_center") - if not target.cost_center and target.item_code: + if target.item_code: item = get_item_defaults(target.item_code, source_parent.company) item_group = get_item_group_defaults(target.item_code, source_parent.company) - target.cost_center = item.get("selling_cost_center") \ + cost_center = item.get("selling_cost_center") \ or item_group.get("selling_cost_center") + if cost_center: + target.cost_center = cost_center + doclist = get_mapped_doc("Sales Order", source_name, { "Sales Order": { "doctype": "Sales Invoice", From 9942fcc8cb8d2d45ebd285b4876e2f69c725f897 Mon Sep 17 00:00:00 2001 From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Date: Mon, 28 Oct 2019 12:08:31 +0530 Subject: [PATCH 26/26] fix: Better validation msg for difference account in Stock Entry (#19400) * fix: Better validation msg for difference account * fix: Make primary info bold --- erpnext/stock/doctype/stock_entry/stock_entry.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 7fa7d3b0b6..55e02a46ff 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -241,7 +241,9 @@ class StockEntry(StockController): for d in self.get("items"): if not d.expense_account: - frappe.throw(_("Please enter Difference Account")) + frappe.throw(_("Please enter Difference Account or set default Stock Adjustment Account for company {0}") + .format(frappe.bold(self.company))) + elif self.is_opening == "Yes" and frappe.db.get_value("Account", d.expense_account, "report_type") == "Profit and Loss": frappe.throw(_("Difference Account must be a Asset/Liability type account, since this Stock Entry is an Opening Entry"), OpeningEntryAccountError)