From 2b21b7bafa3dd3995e35193222b09adf9c78c698 Mon Sep 17 00:00:00 2001 From: Afshan Date: Mon, 20 Jul 2020 16:05:52 +0530 Subject: [PATCH 01/24] fix: moved custom_make_buttons to PurchaseOrderController to avoid duplication of dropdown options --- .../doctype/purchase_order/purchase_order.js | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index 84e3a31904..25065ab155 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -7,12 +7,6 @@ frappe.provide("erpnext.buying"); frappe.ui.form.on("Purchase Order", { setup: function(frm) { - frm.custom_make_buttons = { - 'Purchase Receipt': 'Receipt', - 'Purchase Invoice': 'Invoice', - 'Stock Entry': 'Material to Supplier', - 'Payment Entry': 'Payment' - } frm.set_query("reserve_warehouse", "supplied_items", function() { return { @@ -36,20 +30,6 @@ frappe.ui.form.on("Purchase Order", { }, - refresh: function(frm) { - if(frm.doc.docstatus === 1 && frm.doc.status !== 'Closed' - && flt(frm.doc.per_received) < 100 && flt(frm.doc.per_billed) < 100) { - frm.add_custom_button(__('Update Items'), () => { - erpnext.utils.update_child_items({ - frm: frm, - child_docname: "items", - child_doctype: "Purchase Order Detail", - cannot_add_row: false, - }) - }); - } - }, - onload: function(frm) { set_schedule_date(frm); if (!frm.doc.transaction_date){ @@ -76,6 +56,18 @@ frappe.ui.form.on("Purchase Order Item", { }); erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend({ + setup: function() { + this.frm.custom_make_buttons = { + 'Purchase Receipt': 'Receipt', + 'Purchase Invoice': 'Invoice', + 'Stock Entry': 'Material to Supplier', + 'Payment Entry': 'Payment', + } + + this._super(); + + }, + refresh: function(doc, cdt, cdn) { var me = this; this._super(); @@ -99,6 +91,16 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend( if(doc.docstatus == 1) { if(!in_list(["Closed", "Delivered"], doc.status)) { + if(this.frm.doc.status !== 'Closed' && flt(this.frm.doc.per_received) < 100 && flt(this.frm.doc.per_billed) < 100) { + this.frm.add_custom_button(__('Update Items'), () => { + erpnext.utils.update_child_items({ + frm: frm, + child_docname: "items", + child_doctype: "Purchase Order Detail", + cannot_add_row: false, + }) + }); + } if (this.frm.has_perm("submit")) { if(flt(doc.per_billed, 6) < 100 || flt(doc.per_received, 6) < 100) { if (doc.status != "On Hold") { From ba4c4f107ed1756759696334acf97cb54df20e3d Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 7 Aug 2020 14:34:28 +0530 Subject: [PATCH 02/24] feat: add image alt field in items --- erpnext/stock/doctype/item/item.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index 45526a3910..f4c7376439 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -123,6 +123,7 @@ "weightage", "slideshow", "website_image", + "website_image_alt", "thumbnail", "cb72", "website_warehouse", @@ -1054,15 +1055,21 @@ "fieldtype": "Data", "label": "Default Manufacturer Part No", "read_only": 1 + }, + { + "fieldname": "website_image_alt", + "fieldtype": "Data", + "label": "Image Alt Text" } ], "has_web_view": 1, "icon": "fa fa-tag", "idx": 2, "image_field": "image", + "index_web_pages_for_search": 1, "links": [], "max_attachments": 1, - "modified": "2020-07-31 21:21:10.956453", + "modified": "2020-08-07 14:24:58.384992", "modified_by": "Administrator", "module": "Stock", "name": "Item", From a0954e66a8844ac0367e5f34c78a83a4796fe1ab Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 7 Aug 2020 14:34:54 +0530 Subject: [PATCH 03/24] feat: add image alt argument for product_image macros --- erpnext/templates/includes/macros.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/templates/includes/macros.html b/erpnext/templates/includes/macros.html index 3c82e90cc0..ea6b00fc58 100644 --- a/erpnext/templates/includes/macros.html +++ b/erpnext/templates/includes/macros.html @@ -7,9 +7,9 @@ {% endmacro %} -{% macro product_image(website_image, css_class="") %} +{% macro product_image(website_image, css_class="", alt="") %}
- + {{ alt }}
{% endmacro %} From b1f885912193cdfd57853c0cf84256f7a2b3e575 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 7 Aug 2020 14:38:40 +0530 Subject: [PATCH 04/24] feat: add alt value in product page --- erpnext/stock/doctype/item/item.py | 2 +- erpnext/templates/generators/item/item_image.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py index d7b43bf399..d209f48353 100644 --- a/erpnext/stock/doctype/item/item.py +++ b/erpnext/stock/doctype/item/item.py @@ -343,7 +343,7 @@ class Item(WebsiteGenerator): if variant: context.variant = frappe.get_doc("Item", variant) - for fieldname in ("website_image", "web_long_description", "description", + for fieldname in ("website_image", "website_image_alt", "web_long_description", "description", "website_specifications"): if context.variant.get(fieldname): value = context.variant.get(fieldname) diff --git a/erpnext/templates/generators/item/item_image.html b/erpnext/templates/generators/item/item_image.html index 0dd4c3505e..5d46a45053 100644 --- a/erpnext/templates/generators/item/item_image.html +++ b/erpnext/templates/generators/item/item_image.html @@ -23,7 +23,7 @@ }) {% else %} -{{ product_image(website_image or image or 'no-image.jpg') }} +{{ product_image(website_image or image or 'no-image.jpg', alt=website_image_alt or item_name) }} {% endif %} From 95984fd921047037c6a83772114af66fd3daa609 Mon Sep 17 00:00:00 2001 From: Anurag Mishra Date: Fri, 17 Jul 2020 13:02:45 +0530 Subject: [PATCH 05/24] fix: Not able to cancel application,allocation nad encashments --- erpnext/hr/doctype/leave_allocation/leave_allocation.js | 9 ++++++--- .../hr/doctype/leave_application/leave_application.js | 4 ++++ erpnext/hr/doctype/leave_encashment/leave_encashment.js | 6 +++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.js b/erpnext/hr/doctype/leave_allocation/leave_allocation.js index 210a73cfe5..a184cc7d15 100755 --- a/erpnext/hr/doctype/leave_allocation/leave_allocation.js +++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.js @@ -5,20 +5,23 @@ cur_frm.add_fetch('employee','employee_name','employee_name'); frappe.ui.form.on("Leave Allocation", { onload: function(frm) { + // Ignore cancellation of doctype on cancel all. + frm.ignored_doctypes_on_cancel_all = ["Leave Ledger Entry"]; + if(!frm.doc.from_date) frm.set_value("from_date", frappe.datetime.get_today()); frm.set_query("employee", function() { return { query: "erpnext.controllers.queries.employee_query" - } + }; }); frm.set_query("leave_type", function() { return { filters: { is_lwp: 0 } - } - }) + }; + }); }, refresh: function(frm) { diff --git a/erpnext/hr/doctype/leave_application/leave_application.js b/erpnext/hr/doctype/leave_application/leave_application.js index 4001a45507..a0cce0a80f 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.js +++ b/erpnext/hr/doctype/leave_application/leave_application.js @@ -19,6 +19,10 @@ frappe.ui.form.on("Leave Application", { frm.set_query("employee", erpnext.queries.employee); }, onload: function(frm) { + + // Ignore cancellation of doctype on cancel all. + frm.ignored_doctypes_on_cancel_all = ["Leave Ledger Entry"]; + if (!frm.doc.posting_date) { frm.set_value("posting_date", frappe.datetime.get_today()); } diff --git a/erpnext/hr/doctype/leave_encashment/leave_encashment.js b/erpnext/hr/doctype/leave_encashment/leave_encashment.js index 701c2f0f31..d5e7adab74 100644 --- a/erpnext/hr/doctype/leave_encashment/leave_encashment.js +++ b/erpnext/hr/doctype/leave_encashment/leave_encashment.js @@ -2,6 +2,10 @@ // For license information, please see license.txt frappe.ui.form.on('Leave Encashment', { + onload: function(frm) { + // Ignore cancellation of doctype on cancel all. + frm.ignored_doctypes_on_cancel_all = ["Leave Ledger Entry"]; + }, setup: function(frm) { frm.set_query("leave_type", function() { return { @@ -33,7 +37,7 @@ frappe.ui.form.on('Leave Encashment', { doc: frm.doc, callback: function(r) { frm.refresh_fields(); - } + } }); } } From ded9f41cce70321b7c425ba31effd93a47c62edd Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 10 Aug 2020 12:45:07 +0530 Subject: [PATCH 06/24] refactor: update confusing label --- erpnext/stock/doctype/item/item.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index f4c7376439..d07b3dc4fe 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -1059,7 +1059,7 @@ { "fieldname": "website_image_alt", "fieldtype": "Data", - "label": "Image Alt Text" + "label": "Image Description" } ], "has_web_view": 1, @@ -1131,4 +1131,4 @@ "sort_order": "DESC", "title_field": "item_name", "track_changes": 1 -} \ No newline at end of file +} From b5b2586968da77105ff4fbe924693286194a3012 Mon Sep 17 00:00:00 2001 From: Afshan Date: Tue, 11 Aug 2020 20:15:57 +0530 Subject: [PATCH 07/24] fix: referencing frm --- erpnext/buying/doctype/purchase_order/purchase_order.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index 25065ab155..9f2b9714f7 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -94,7 +94,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend( if(this.frm.doc.status !== 'Closed' && flt(this.frm.doc.per_received) < 100 && flt(this.frm.doc.per_billed) < 100) { this.frm.add_custom_button(__('Update Items'), () => { erpnext.utils.update_child_items({ - frm: frm, + frm: this.frm, child_docname: "items", child_doctype: "Purchase Order Detail", cannot_add_row: false, From 19ea7218d9d6191c739c9ed2be4857228e1cd266 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 11 Aug 2020 20:34:57 +0530 Subject: [PATCH 08/24] fix: Calculate taxes if tax is based on item quantity and inclusive on item price --- .../sales_invoice/test_sales_invoice.py | 17 ++++++++--- erpnext/controllers/accounts_controller.py | 2 +- erpnext/controllers/taxes_and_totals.py | 26 ++++++++++++----- .../public/js/controllers/taxes_and_totals.js | 29 ++++++++++++------- 4 files changed, 51 insertions(+), 23 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py index 964566a17e..9660c9570e 100644 --- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py @@ -206,10 +206,19 @@ class TestSalesInvoice(unittest.TestCase): "rate": 14, 'included_in_print_rate': 1 }) + si.append("taxes", { + "charge_type": "On Item Quantity", + "account_head": "_Test Account Education Cess - _TC", + "cost_center": "_Test Cost Center - _TC", + "description": "CESS", + "rate": 5, + 'included_in_print_rate': 1 + }) si.insert() # with inclusive tax - self.assertEqual(si.net_total, 4385.96) + self.assertEqual(si.items[0].net_amount, 3947.368421052631) + self.assertEqual(si.net_total, 3947.37) self.assertEqual(si.grand_total, 5000) si.reload() @@ -222,8 +231,8 @@ class TestSalesInvoice(unittest.TestCase): si.save() # with inclusive tax and additional discount - self.assertEqual(si.net_total, 4285.96) - self.assertEqual(si.grand_total, 4885.99) + self.assertEqual(si.net_total, 3847.37) + self.assertEqual(si.grand_total, 4886) si.reload() @@ -235,7 +244,7 @@ class TestSalesInvoice(unittest.TestCase): si.save() # with inclusive tax and additional discount - self.assertEqual(si.net_total, 4298.25) + self.assertEqual(si.net_total, 3859.65) self.assertEqual(si.grand_total, 4900.00) def test_sales_invoice_discount_amount(self): diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 66b5f3035d..3091193b8d 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -985,7 +985,7 @@ def validate_inclusive_tax(tax, doc): # all rows about the reffered tax should be inclusive _on_previous_row_error("1 - %d" % (tax.row_id,)) elif tax.get("category") == "Valuation": - frappe.throw(_("Valuation type charges can not marked as Inclusive")) + frappe.throw(_("Valuation type charges can not be marked as Inclusive")) def set_balance_in_account_currency(gl_dict, account_currency=None, conversion_rate=None, company_currency=None): diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py index 572e1ca239..8f86dce436 100644 --- a/erpnext/controllers/taxes_and_totals.py +++ b/erpnext/controllers/taxes_and_totals.py @@ -161,8 +161,9 @@ class calculate_taxes_and_totals(object): for item in self.doc.get("items"): item_tax_map = self._load_item_tax_rate(item.item_tax_rate) cumulated_tax_fraction = 0 + total_inclusive_tax_amount_per_qty = 0 for i, tax in enumerate(self.doc.get("taxes")): - tax.tax_fraction_for_current_item = self.get_current_tax_fraction(tax, item_tax_map) + tax.tax_fraction_for_current_item, inclusive_tax_amount_per_qty = self.get_current_tax_fraction(tax, item_tax_map) if i==0: tax.grand_total_fraction_for_current_item = 1 + tax.tax_fraction_for_current_item @@ -172,9 +173,12 @@ class calculate_taxes_and_totals(object): + tax.tax_fraction_for_current_item cumulated_tax_fraction += tax.tax_fraction_for_current_item + total_inclusive_tax_amount_per_qty += inclusive_tax_amount_per_qty * flt(item.stock_qty) - if cumulated_tax_fraction and not self.discount_amount_applied and item.qty: - item.net_amount = flt(item.amount / (1 + cumulated_tax_fraction)) + if not self.discount_amount_applied and item.qty and (cumulated_tax_fraction or total_inclusive_tax_amount_per_qty): + amount = flt(item.amount) - total_inclusive_tax_amount_per_qty + + item.net_amount = flt(amount / (1 + cumulated_tax_fraction)) item.net_rate = flt(item.net_amount / item.qty, item.precision("net_rate")) item.discount_percentage = flt(item.discount_percentage, item.precision("discount_percentage")) @@ -190,6 +194,7 @@ class calculate_taxes_and_totals(object): from tax inclusive amount """ current_tax_fraction = 0 + inclusive_tax_amount_per_qty = 0 if cint(tax.included_in_print_rate): tax_rate = self._get_tax_rate(tax, item_tax_map) @@ -204,10 +209,15 @@ class calculate_taxes_and_totals(object): elif tax.charge_type == "On Previous Row Total": current_tax_fraction = (tax_rate / 100.0) * \ self.doc.get("taxes")[cint(tax.row_id) - 1].grand_total_fraction_for_current_item + + elif tax.charge_type == "On Item Quantity": + inclusive_tax_amount_per_qty = flt(tax_rate) - if getattr(tax, "add_deduct_tax", None): - current_tax_fraction *= -1.0 if (tax.add_deduct_tax == "Deduct") else 1.0 - return current_tax_fraction + if getattr(tax, "add_deduct_tax", None) and tax.add_deduct_tax == "Deduct": + current_tax_fraction *= -1.0 + inclusive_tax_amount_per_qty *= -1.0 + + return current_tax_fraction, inclusive_tax_amount_per_qty def _get_tax_rate(self, tax, item_tax_map): if tax.account_head in item_tax_map: @@ -321,7 +331,7 @@ class calculate_taxes_and_totals(object): current_tax_amount = (tax_rate / 100.0) * \ self.doc.get("taxes")[cint(tax.row_id) - 1].grand_total_for_current_item elif tax.charge_type == "On Item Quantity": - current_tax_amount = tax_rate * item.stock_qty + current_tax_amount = tax_rate * item.qty self.set_item_wise_tax(item, tax, tax_rate, current_tax_amount) @@ -472,7 +482,7 @@ class calculate_taxes_and_totals(object): actual_taxes_dict = {} for tax in self.doc.get("taxes"): - if tax.charge_type == "Actual": + if tax.charge_type in ["Actual", "On Item Quantity"]: tax_amount = self.get_tax_amount_if_for_valuation_or_deduction(tax.tax_amount, tax) actual_taxes_dict.setdefault(tax.idx, tax_amount) elif tax.row_id in actual_taxes_dict: diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js index 405a33c72a..c0d2e6f3ce 100644 --- a/erpnext/public/js/controllers/taxes_and_totals.js +++ b/erpnext/public/js/controllers/taxes_and_totals.js @@ -163,9 +163,11 @@ erpnext.taxes_and_totals = erpnext.payments.extend({ $.each(me.frm.doc["items"] || [], function(n, item) { var item_tax_map = me._load_item_tax_rate(item.item_tax_rate); var cumulated_tax_fraction = 0.0; - + var total_inclusive_tax_amount_per_qty = 0; $.each(me.frm.doc["taxes"] || [], function(i, tax) { - tax.tax_fraction_for_current_item = me.get_current_tax_fraction(tax, item_tax_map); + var current_tax_fraction = me.get_current_tax_fraction(tax, item_tax_map); + tax.tax_fraction_for_current_item = current_tax_fraction[0]; + var inclusive_tax_amount_per_qty = current_tax_fraction[1]; if(i==0) { tax.grand_total_fraction_for_current_item = 1 + tax.tax_fraction_for_current_item; @@ -176,10 +178,12 @@ erpnext.taxes_and_totals = erpnext.payments.extend({ } cumulated_tax_fraction += tax.tax_fraction_for_current_item; + total_inclusive_tax_amount_per_qty += inclusive_tax_amount_per_qty * flt(item.qty); }); - if(cumulated_tax_fraction && !me.discount_amount_applied) { - item.net_amount = flt(item.amount / (1 + cumulated_tax_fraction)); + if(!me.discount_amount_applied && item.qty && (total_inclusive_tax_amount_per_qty || cumulated_tax_fraction)) { + var amount = flt(item.amount) - total_inclusive_tax_amount_per_qty; + item.net_amount = flt(amount / (1 + cumulated_tax_fraction)); item.net_rate = item.qty ? flt(item.net_amount / item.qty, precision("net_rate", item)) : 0; me.set_in_company_currency(item, ["net_rate", "net_amount"]); @@ -191,6 +195,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({ // Get tax fraction for calculating tax exclusive amount // from tax inclusive amount var current_tax_fraction = 0.0; + var inclusive_tax_amount_per_qty = 0; if(cint(tax.included_in_print_rate)) { var tax_rate = this._get_tax_rate(tax, item_tax_map); @@ -205,13 +210,16 @@ erpnext.taxes_and_totals = erpnext.payments.extend({ } else if(tax.charge_type == "On Previous Row Total") { current_tax_fraction = (tax_rate / 100.0) * this.frm.doc["taxes"][cint(tax.row_id) - 1].grand_total_fraction_for_current_item; + } else if (tax.charge_type == "On Item Quantity") { + inclusive_tax_amount_per_qty = flt(tax_rate); } } - if(tax.add_deduct_tax) { - current_tax_fraction *= (tax.add_deduct_tax == "Deduct") ? -1.0 : 1.0; + if(tax.add_deduct_tax && tax.add_deduct_tax == "Deduct") { + current_tax_fraction *= -1; + inclusive_tax_amount_per_qty *= -1 } - return current_tax_fraction; + return [current_tax_fraction, inclusive_tax_amount_per_qty]; }, _get_tax_rate: function(tax, item_tax_map) { @@ -360,8 +368,9 @@ erpnext.taxes_and_totals = erpnext.payments.extend({ } else if(tax.charge_type == "On Previous Row Total") { current_tax_amount = (tax_rate / 100.0) * this.frm.doc["taxes"][cint(tax.row_id) - 1].grand_total_for_current_item; + } else if (tax.charge_type == "On Item Quantity") { + current_tax_amount = tax_rate * item.qty; } - this.set_item_wise_tax(item, tax, tax_rate, current_tax_amount); return current_tax_amount; @@ -573,7 +582,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({ var actual_taxes_dict = {}; $.each(this.frm.doc["taxes"] || [], function(i, tax) { - if (tax.charge_type == "Actual") { + if (in_list(["Actual", "On Item Quantity"], tax.charge_type)) { var tax_amount = (tax.category == "Valuation") ? 0.0 : tax.tax_amount; tax_amount *= (tax.add_deduct_tax == "Deduct") ? -1.0 : 1.0; actual_taxes_dict[tax.idx] = tax_amount; @@ -586,7 +595,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({ $.each(actual_taxes_dict, function(key, value) { if (value) total_actual_tax += value; }); - + return flt(this.frm.doc.grand_total - total_actual_tax, precision("grand_total")); } }, From 7d0a625b9c5f8b3af294a034ddb6d6845c4d6b21 Mon Sep 17 00:00:00 2001 From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Date: Tue, 11 Aug 2020 22:02:12 +0530 Subject: [PATCH 09/24] git commit -m "fix: Add missing semicolon" --- erpnext/public/js/controllers/taxes_and_totals.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js index c0d2e6f3ce..6951539026 100644 --- a/erpnext/public/js/controllers/taxes_and_totals.js +++ b/erpnext/public/js/controllers/taxes_and_totals.js @@ -217,7 +217,7 @@ erpnext.taxes_and_totals = erpnext.payments.extend({ if(tax.add_deduct_tax && tax.add_deduct_tax == "Deduct") { current_tax_fraction *= -1; - inclusive_tax_amount_per_qty *= -1 + inclusive_tax_amount_per_qty *= -1; } return [current_tax_fraction, inclusive_tax_amount_per_qty]; }, From e0cc421e504823b589de6a40a76d969618ca54ca Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 12 Aug 2020 14:33:30 +0530 Subject: [PATCH 10/24] fix: TypeError while setting transfer_qty in Stock Entry (#22929) Co-authored-by: Marica --- erpnext/stock/doctype/stock_entry/stock_entry.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 229cf027bd..de1a3a6682 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -199,7 +199,8 @@ class StockEntry(StockController): item.set(f, item_details.get(f)) if not item.transfer_qty and item.qty: - item.transfer_qty = item.qty * item.conversion_factor + item.transfer_qty = flt(flt(item.qty) * flt(item.conversion_factor), + self.precision("transfer_qty", item)) if (self.purpose in ("Material Transfer", "Material Transfer for Manufacture") and not item.serial_no From 674d1b0803bd051b06cb5ddef1e6f3bb6dcd879e Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Wed, 12 Aug 2020 17:55:02 +0530 Subject: [PATCH 11/24] feat: Material Request and Stock Entry Enhancement (#22671) * feat: send to warehouse * adding warehouse validation * fix: review changes * fix: review changes * stock entry enhancement * fix: review changes --- erpnext/patches.txt | 1 + .../patches/v12_0/stock_entry_enhancements.py | 2 +- .../patches/v13_0/stock_entry_enhancements.py | 27 ++++++ erpnext/setup/doctype/company/company.js | 10 ++ erpnext/setup/doctype/company/company.json | 9 +- erpnext/setup/doctype/company/company.py | 6 +- .../operations/install_fixtures.py | 7 +- .../material_request/material_request.json | 12 ++- .../material_request/material_request_list.js | 10 +- .../stock/doctype/stock_entry/stock_entry.js | 31 +++++-- .../doctype/stock_entry/stock_entry.json | 18 +++- .../stock/doctype/stock_entry/stock_entry.py | 65 ++++++++++--- .../doctype/stock_entry/test_stock_entry.py | 28 ------ .../stock_entry_type/stock_entry_type.json | 91 ++----------------- 14 files changed, 177 insertions(+), 140 deletions(-) create mode 100644 erpnext/patches/v13_0/stock_entry_enhancements.py diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 49af0ba6ee..b9d3234147 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -718,3 +718,4 @@ erpnext.patches.v13_0.delete_report_requested_items_to_order erpnext.patches.v12_0.update_item_tax_template_company erpnext.patches.v13_0.move_branch_code_to_bank_account erpnext.patches.v13_0.healthcare_lab_module_rename_doctypes +erpnext.patches.v13_0.stock_entry_enhancements diff --git a/erpnext/patches/v12_0/stock_entry_enhancements.py b/erpnext/patches/v12_0/stock_entry_enhancements.py index d04b3d3862..847d92894b 100644 --- a/erpnext/patches/v12_0/stock_entry_enhancements.py +++ b/erpnext/patches/v12_0/stock_entry_enhancements.py @@ -19,7 +19,7 @@ def create_stock_entry_types(): for purpose in ["Material Issue", "Material Receipt", "Material Transfer", "Material Transfer for Manufacture", "Material Consumption for Manufacture", "Manufacture", - "Repack", "Send to Subcontractor", "Send to Warehouse", "Receive at Warehouse"]: + "Repack", "Send to Subcontractor"]: ste_type = frappe.get_doc({ 'doctype': 'Stock Entry Type', diff --git a/erpnext/patches/v13_0/stock_entry_enhancements.py b/erpnext/patches/v13_0/stock_entry_enhancements.py new file mode 100644 index 0000000000..dcc4f956f7 --- /dev/null +++ b/erpnext/patches/v13_0/stock_entry_enhancements.py @@ -0,0 +1,27 @@ +# Copyright(c) 2020, 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", "stock_entry") + if frappe.db.has_column("Stock Entry", "add_to_transit"): + frappe.db.sql(""" + UPDATE `tabStock Entry` SET + stock_entry_type = 'Material Transfer', + purpose = 'Material Transfer', + add_to_transit = 1 WHERE stock_entry_type = 'Send to Warehouse' + """) + + frappe.db.sql("""UPDATE `tabStock Entry` SET + stock_entry_type = 'Material Transfer', + purpose = 'Material Transfer' + WHERE stock_entry_type = 'Receive at Warehouse' + """) + + frappe.reload_doc("stock", "doctype", "warehouse_type") + if not frappe.db.exists('Warehouse Type', 'Transit'): + doc = frappe.new_doc('Warehouse Type') + doc.name = 'Transit' + doc.insert() \ No newline at end of file diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js index 7ae5385a23..f882db60c5 100644 --- a/erpnext/setup/doctype/company/company.js +++ b/erpnext/setup/doctype/company/company.js @@ -34,6 +34,16 @@ frappe.ui.form.on("Company", { frm.set_query("default_buying_terms", function() { return { filters: { buying: 1 } }; }); + + frm.set_query("default_in_transit_warehouse", function() { + return { + filters:{ + 'warehouse_type' : 'Transit', + 'is_group': 0, + 'company': frm.doc.company + } + }; + }); }, company_name: function(frm) { diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json index 03703fd82e..4a26a71970 100644 --- a/erpnext/setup/doctype/company/company.json +++ b/erpnext/setup/doctype/company/company.json @@ -25,6 +25,7 @@ "default_selling_terms", "default_buying_terms", "default_warehouse_for_sales_return", + "default_in_transit_warehouse", "column_break_10", "country", "create_chart_of_accounts_based_on", @@ -733,6 +734,12 @@ "fieldname": "enable_perpetual_inventory_for_non_stock_items", "fieldtype": "Check", "label": "Enable Perpetual Inventory For Non Stock Items" + }, + { + "fieldname": "default_in_transit_warehouse", + "fieldtype": "Link", + "label": "Default In Transit Warehouse", + "options": "Warehouse" } ], "icon": "fa fa-building", @@ -740,7 +747,7 @@ "image_field": "company_logo", "is_tree": 1, "links": [], - "modified": "2020-06-24 12:45:31.462195", + "modified": "2020-08-06 00:38:08.311216", "modified_by": "Administrator", "module": "Setup", "name": "Company", diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py index 47b41a97ad..8e707fe3f4 100644 --- a/erpnext/setup/doctype/company/company.py +++ b/erpnext/setup/doctype/company/company.py @@ -140,7 +140,8 @@ class Company(NestedSet): {"warehouse_name": _("All Warehouses"), "is_group": 1}, {"warehouse_name": _("Stores"), "is_group": 0}, {"warehouse_name": _("Work In Progress"), "is_group": 0}, - {"warehouse_name": _("Finished Goods"), "is_group": 0}]: + {"warehouse_name": _("Finished Goods"), "is_group": 0}, + {"warehouse_name": _("Goods In Transit"), "is_group": 0, "warehouse_type": "Transit"}]: if not frappe.db.exists("Warehouse", "{0} - {1}".format(wh_detail["warehouse_name"], self.abbr)): warehouse = frappe.get_doc({ @@ -149,7 +150,8 @@ class Company(NestedSet): "is_group": wh_detail["is_group"], "company": self.name, "parent_warehouse": "{0} - {1}".format(_("All Warehouses"), self.abbr) \ - if not wh_detail["is_group"] else "" + if not wh_detail["is_group"] else "", + "warehouse_type" : wh_detail["warehouse_type"] if "warehouse_type" in wh_detail else None }) warehouse.flags.ignore_permissions = True warehouse.flags.ignore_mandatory = True diff --git a/erpnext/setup/setup_wizard/operations/install_fixtures.py b/erpnext/setup/setup_wizard/operations/install_fixtures.py index ad063cfc9d..72ed00293e 100644 --- a/erpnext/setup/setup_wizard/operations/install_fixtures.py +++ b/erpnext/setup/setup_wizard/operations/install_fixtures.py @@ -95,8 +95,6 @@ def install(country=None): {'doctype': 'Stock Entry Type', 'name': 'Send to Subcontractor', 'purpose': 'Send to Subcontractor'}, {'doctype': 'Stock Entry Type', 'name': 'Material Transfer for Manufacture', 'purpose': 'Material Transfer for Manufacture'}, {'doctype': 'Stock Entry Type', 'name': 'Material Consumption for Manufacture', 'purpose': 'Material Consumption for Manufacture'}, - {'doctype': 'Stock Entry Type', 'name': 'Send to Warehouse', 'purpose': 'Send to Warehouse'}, - {'doctype': 'Stock Entry Type', 'name': 'Receive at Warehouse', 'purpose': 'Receive at Warehouse'}, # Designation {'doctype': 'Designation', 'designation_name': _('CEO')}, @@ -244,7 +242,10 @@ def install(country=None): {"doctype": "Sales Stage", "stage_name": _("Identifying Decision Makers")}, {"doctype": "Sales Stage", "stage_name": _("Perception Analysis")}, {"doctype": "Sales Stage", "stage_name": _("Proposal/Price Quote")}, - {"doctype": "Sales Stage", "stage_name": _("Negotiation/Review")} + {"doctype": "Sales Stage", "stage_name": _("Negotiation/Review")}, + + # Warehouse Type + {'doctype': 'Warehouse Type', 'name': 'Transit'}, ] from erpnext.setup.setup_wizard.data.industry_type import get_industry_types diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json index d1f29e364a..44503d22a3 100644 --- a/erpnext/stock/doctype/material_request/material_request.json +++ b/erpnext/stock/doctype/material_request/material_request.json @@ -11,6 +11,7 @@ "naming_series", "title", "material_request_type", + "transfer_status", "customer", "column_break_2", "schedule_date", @@ -303,13 +304,22 @@ "fieldtype": "Link", "label": "Set From Warehouse", "options": "Warehouse" + }, + { + "allow_on_submit": 1, + "depends_on": "eval:doc.add_to_transit == 1", + "fieldname": "transfer_status", + "fieldtype": "Select", + "label": "Transfer Status", + "options": "\nNot Started\nIn Transit\nCompleted", + "read_only": 1 } ], "icon": "fa fa-ticket", "idx": 70, "is_submittable": 1, "links": [], - "modified": "2020-05-01 20:21:09.990867", + "modified": "2020-08-10 13:27:54.891058", "modified_by": "Administrator", "module": "Stock", "name": "Material Request", diff --git a/erpnext/stock/doctype/material_request/material_request_list.js b/erpnext/stock/doctype/material_request/material_request_list.js index 614ecb8a8f..0d7095875c 100644 --- a/erpnext/stock/doctype/material_request/material_request_list.js +++ b/erpnext/stock/doctype/material_request/material_request_list.js @@ -1,8 +1,16 @@ frappe.listview_settings['Material Request'] = { - add_fields: ["material_request_type", "status", "per_ordered", "per_received"], + add_fields: ["material_request_type", "status", "per_ordered", "per_received", "transfer_status"], get_indicator: function(doc) { if(doc.status=="Stopped") { return [__("Stopped"), "red", "status,=,Stopped"]; + } else if(doc.transfer_status && doc.docstatus != 2) { + if (doc.transfer_status == "Not Started") { + return [__("Not Started"), "orange"]; + } else if (doc.transfer_status == "In Transit") { + return [__("In Transit"), "yellow"]; + } else if (doc.transfer_status == "Completed") { + return [__("Completed"), "green"]; + } } else if(doc.docstatus==1 && flt(doc.per_ordered, 2) == 0) { return [__("Pending"), "orange", "per_ordered,=,0"]; } else if(doc.docstatus==1 && flt(doc.per_ordered, 2) < 100) { diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js index 53b986cb72..9845bc2f70 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.js +++ b/erpnext/stock/doctype/stock_entry/stock_entry.js @@ -19,7 +19,6 @@ frappe.ui.form.on('Stock Entry', { filters: [ ['Stock Entry', 'docstatus', '=', 1], ['Stock Entry', 'per_transferred', '<','100'], - ['Stock Entry', 'purpose', '=', 'Send to Warehouse'] ] } }); @@ -171,9 +170,9 @@ frappe.ui.form.on('Stock Entry', { } } - if (frm.doc.docstatus === 1 && frm.doc.purpose == 'Send to Warehouse') { - if (frm.doc.per_transferred < 100) { - frm.add_custom_button(__('Receive at Warehouse Entry'), function() { + if (frm.doc.docstatus === 1) { + if (frm.doc.add_to_transit && frm.doc.purpose=='Material Transfer' && frm.doc.per_transferred < 100) { + frm.add_custom_button('End Transit', function() { frappe.model.open_mapped_doc({ method: "erpnext.stock.doctype.stock_entry.stock_entry.make_stock_in_entry", frm: frm @@ -266,6 +265,7 @@ frappe.ui.form.on('Stock Entry', { stock_entry_type: function(frm){ frm.remove_custom_button('Bill of Materials', "Get items from"); frm.events.show_bom_custom_button(frm); + frm.trigger('add_to_transit'); }, purpose: function(frm) { @@ -532,6 +532,26 @@ frappe.ui.form.on('Stock Entry', { target_warehouse_address: function(frm) { erpnext.utils.get_address_display(frm, 'target_warehouse_address', 'target_address_display', false); + }, + + add_to_transit: function(frm) { + if(frm.doc.add_to_transit && frm.doc.purpose=='Material Transfer') { + frm.set_value('stock_entry_type', 'Material Transfer'); + frm.fields_dict.to_warehouse.get_query = function() { + return { + filters:{ + 'warehouse_type' : 'Transit', + 'is_group': 0, + 'company': frm.doc.company + } + }; + }; + frappe.db.get_value('Company', frm.doc.company, 'default_in_transit_warehouse', (r) => { + if (r.default_in_transit_warehouse) { + frm.set_value('to_warehouse', r.default_in_transit_warehouse); + } + }); + } } }) @@ -754,6 +774,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({ } erpnext.hide_company(); erpnext.utils.add_item(this.frm); + this.frm.trigger('add_to_transit'); }, scan_barcode: function() { @@ -919,8 +940,6 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({ doc.purpose!='Material Issue'); this.frm.fields_dict["items"].grid.set_column_disp("additional_cost", doc.purpose!='Material Issue'); - this.frm.toggle_reqd("outgoing_stock_entry", - doc.purpose == 'Receive at Warehouse' ? 1: 0); }, supplier: function(doc) { diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json index 704ae41bc5..61e0df6723 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.json +++ b/erpnext/stock/doctype/stock_entry/stock_entry.json @@ -13,6 +13,7 @@ "stock_entry_type", "outgoing_stock_entry", "purpose", + "add_to_transit", "work_order", "purchase_order", "delivery_note_no", @@ -116,11 +117,12 @@ "reqd": 1 }, { - "depends_on": "eval:doc.purpose == 'Receive at Warehouse'", + "depends_on": "eval:doc.purpose == 'Material Transfer'", "fieldname": "outgoing_stock_entry", "fieldtype": "Link", "label": "Stock Entry (Outward GIT)", - "options": "Stock Entry" + "options": "Stock Entry", + "read_only": 1 }, { "bold": 1, @@ -132,7 +134,7 @@ "label": "Purpose", "oldfieldname": "purpose", "oldfieldtype": "Select", - "options": "Material Issue\nMaterial Receipt\nMaterial Transfer\nMaterial Transfer for Manufacture\nMaterial Consumption for Manufacture\nManufacture\nRepack\nSend to Subcontractor\nSend to Warehouse\nReceive at Warehouse", + "options": "Material Issue\nMaterial Receipt\nMaterial Transfer\nMaterial Transfer for Manufacture\nMaterial Consumption for Manufacture\nManufacture\nRepack\nSend to Subcontractor", "read_only": 1 }, { @@ -630,13 +632,21 @@ { "fieldname": "print_settings_col_break", "fieldtype": "Column Break" + }, + { + "default": "0", + "depends_on": "eval: doc.purpose=='Material Transfer' && !doc.outgoing_stock_entry", + "fieldname": "add_to_transit", + "fieldtype": "Check", + "label": "Add to Transit", + "no_copy": 1 } ], "icon": "fa fa-file-text", "idx": 1, "is_submittable": 1, "links": [], - "modified": "2020-04-23 12:56:52.881752", + "modified": "2020-08-11 19:10:07.954981", "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 de1a3a6682..30bcccdda6 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -96,6 +96,11 @@ class StockEntry(StockController): self.update_quality_inspection() if self.work_order and self.purpose == "Manufacture": self.update_so_in_serial_number() + + if self.purpose == 'Material Transfer' and self.add_to_transit: + self.set_material_request_transfer_status('In Transit') + if self.purpose == 'Material Transfer' and self.outgoing_stock_entry: + self.set_material_request_transfer_status('Completed') def on_cancel(self): @@ -116,6 +121,11 @@ class StockEntry(StockController): self.update_quality_inspection() self.delete_auto_created_batches() + if self.purpose == 'Material Transfer' and self.add_to_transit: + self.set_material_request_transfer_status('Not Started') + if self.purpose == 'Material Transfer' and self.outgoing_stock_entry: + self.set_material_request_transfer_status('In Transit') + def set_job_card_data(self): if self.job_card and not self.work_order: data = frappe.db.get_value('Job Card', @@ -133,7 +143,7 @@ class StockEntry(StockController): def validate_purpose(self): valid_purposes = ["Material Issue", "Material Receipt", "Material Transfer", "Material Transfer for Manufacture", "Manufacture", "Repack", "Send to Subcontractor", - "Material Consumption for Manufacture", "Send to Warehouse", "Receive at Warehouse"] + "Material Consumption for Manufacture"] if self.purpose not in valid_purposes: frappe.throw(_("Purpose must be one of {0}").format(comma_or(valid_purposes))) @@ -259,10 +269,10 @@ class StockEntry(StockController): """perform various (sometimes conditional) validations on warehouse""" source_mandatory = ["Material Issue", "Material Transfer", "Send to Subcontractor", "Material Transfer for Manufacture", - "Material Consumption for Manufacture", "Send to Warehouse", "Receive at Warehouse"] + "Material Consumption for Manufacture"] target_mandatory = ["Material Receipt", "Material Transfer", "Send to Subcontractor", - "Material Transfer for Manufacture", "Send to Warehouse", "Receive at Warehouse"] + "Material Transfer for Manufacture"] validate_for_manufacture = any([d.bom_no for d in self.get("items")]) @@ -810,7 +820,7 @@ class StockEntry(StockController): def set_items_for_stock_in(self): self.items = [] - if self.outgoing_stock_entry and self.purpose == 'Receive at Warehouse': + if self.outgoing_stock_entry and self.purpose == 'Material Transfer': doc = frappe.get_doc('Stock Entry', self.outgoing_stock_entry) if doc.per_transferred == 100: @@ -1211,13 +1221,25 @@ class StockEntry(StockController): def validate_with_material_request(self): for item in self.get("items"): - if item.material_request: + material_request = item.material_request or None + material_request_item = item.material_request_item or None + if self.purpose == 'Material Transfer' and self.outgoing_stock_entry: + parent_se = frappe.get_value("Stock Entry Detail", item.ste_detail, ['material_request','material_request_item'],as_dict=True) + if parent_se: + material_request = parent_se.material_request + material_request_item = parent_se.material_request_item + + if material_request: mreq_item = frappe.db.get_value("Material Request Item", - {"name": item.material_request_item, "parent": item.material_request}, + {"name": material_request_item, "parent": material_request}, ["item_code", "warehouse", "idx"], as_dict=True) - if mreq_item.item_code != item.item_code or \ - mreq_item.warehouse != (item.s_warehouse if self.purpose== "Material Issue" else item.t_warehouse): - frappe.throw(_("Item or Warehouse for row {0} does not match Material Request").format(item.idx), + if mreq_item.item_code != item.item_code: + frappe.throw(_("Item for row {0} does not match Material Request").format(item.idx), + frappe.MappingMismatchError) + elif self.purpose == "Material Transfer" and self.add_to_transit: + continue + elif mreq_item.warehouse != (item.s_warehouse if self.purpose == "Material Issue" else item.t_warehouse): + frappe.throw(_("Warehouse for row {0} does not match Material Request").format(item.idx), frappe.MappingMismatchError) def validate_batch(self): @@ -1285,7 +1307,7 @@ class StockEntry(StockController): to fullfill Sales Order {2}.").format(item.item_code, sr, sales_order)) def update_transferred_qty(self): - if self.purpose == 'Receive at Warehouse': + if self.purpose == 'Material Transfer' and self.outgoing_stock_entry: stock_entries = {} stock_entries_child_list = [] for d in self.items: @@ -1343,6 +1365,20 @@ class StockEntry(StockController): 'reference_type': reference_type, 'reference_name': reference_name }) + def set_material_request_transfer_status(self, status): + material_requests = [] + if self.outgoing_stock_entry: + parent_se = frappe.get_value("Stock Entry", self.outgoing_stock_entry, 'add_to_transit') + + for item in self.items: + material_request = item.material_request or None + if self.purpose == "Material Transfer" and material_request not in material_requests: + if self.outgoing_stock_entry and parent_se: + material_request = frappe.get_value("Stock Entry Detail", item.ste_detail, 'material_request') + + if material_request and material_request not in material_requests: + material_requests.append(material_request) + frappe.db.set_value('Material Request', material_request, 'transfer_status', status) @frappe.whitelist() def move_sample_to_retention_warehouse(company, items): @@ -1382,12 +1418,19 @@ def move_sample_to_retention_warehouse(company, items): @frappe.whitelist() def make_stock_in_entry(source_name, target_doc=None): + def set_missing_values(source, target): - target.purpose = 'Receive at Warehouse' target.set_stock_entry_type() def update_item(source_doc, target_doc, source_parent): target_doc.t_warehouse = '' + + if source_doc.material_request_item and source_doc.material_request : + add_to_transit = frappe.db.get_value('Stock Entry', source_name, 'add_to_transit') + if add_to_transit: + warehouse = frappe.get_value('Material Request Item', source_doc.material_request_item, 'warehouse') + target_doc.t_warehouse = warehouse + target_doc.s_warehouse = source_doc.t_warehouse target_doc.qty = source_doc.qty - source_doc.transferred_qty diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py index 8e25804511..d98870de3e 100644 --- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py @@ -737,34 +737,6 @@ class TestStockEntry(unittest.TestCase): self.assertEqual(se.get("items")[0].allow_zero_valuation_rate, 1) self.assertEqual(se.get("items")[0].amount, 0) - def test_goods_in_transit(self): - from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse - warehouse = "_Test Warehouse FG 1 - _TC" - - if not frappe.db.exists('Warehouse', warehouse): - create_warehouse("_Test Warehouse FG 1") - - outward_entry = make_stock_entry(item_code="_Test Item", - purpose="Send to Warehouse", - source="_Test Warehouse - _TC", - target="_Test Warehouse 1 - _TC", qty=50, basic_rate=100) - - inward_entry1 = make_stock_in_entry(outward_entry.name) - inward_entry1.items[0].t_warehouse = warehouse - inward_entry1.items[0].qty = 25 - inward_entry1.submit() - - doc = frappe.get_doc('Stock Entry', outward_entry.name) - self.assertEqual(doc.per_transferred, 50) - - inward_entry2 = make_stock_in_entry(outward_entry.name) - inward_entry2.items[0].t_warehouse = warehouse - inward_entry2.items[0].qty = 25 - inward_entry2.submit() - - doc = frappe.get_doc('Stock Entry', outward_entry.name) - self.assertEqual(doc.per_transferred, 100) - def test_gle_for_opening_stock_entry(self): mr = make_stock_entry(item_code="_Test Item", target="Stores - TCP1", company="_Test Company with perpetual inventory",qty=50, basic_rate=100, expense_account="Stock Adjustment - TCP1", is_opening="Yes", do_not_save=True) diff --git a/erpnext/stock/doctype/stock_entry_type/stock_entry_type.json b/erpnext/stock/doctype/stock_entry_type/stock_entry_type.json index edee3c7dc9..0f2b55ec34 100644 --- a/erpnext/stock/doctype/stock_entry_type/stock_entry_type.json +++ b/erpnext/stock/doctype/stock_entry_type/stock_entry_type.json @@ -1,156 +1,83 @@ { - "allow_copy": 0, - "allow_events_in_timeline": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, + "actions": [], "autoname": "Prompt", - "beta": 0, "creation": "2019-03-13 16:23:46.636769", - "custom": 0, - "docstatus": 0, "doctype": "DocType", - "document_type": "", "editable_grid": 1, "engine": "InnoDB", + "field_order": [ + "purpose" + ], "fields": [ { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "default": "Material Issue", - "fetch_if_empty": 0, "fieldname": "purpose", "fieldtype": "Select", - "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": "Purpose", - "length": 0, - "no_copy": 0, - "options": "\nMaterial Issue\nMaterial Receipt\nMaterial Transfer\nMaterial Transfer for Manufacture\nMaterial Consumption for Manufacture\nManufacture\nRepack\nSend to Subcontractor\nSend to Warehouse\nReceive at Warehouse", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, + "options": "\nMaterial Issue\nMaterial Receipt\nMaterial Transfer\nMaterial Transfer for Manufacture\nMaterial Consumption for Manufacture\nManufacture\nRepack\nSend to Subcontractor", "reqd": 1, - "search_index": 0, - "set_only_once": 1, - "translatable": 0, - "unique": 0 + "set_only_once": 1 } ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2019-03-26 12:02:42.144377", + "links": [], + "modified": "2020-08-10 23:24:37.160817", "modified_by": "Administrator", "module": "Stock", "name": "Stock Entry Type", - "name_case": "", "owner": "Administrator", "permissions": [ { - "amend": 0, - "cancel": 0, "create": 1, "delete": 1, "email": 1, "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, "print": 1, "read": 1, "report": 1, "role": "System Manager", - "set_user_permissions": 0, "share": 1, - "submit": 0, "write": 1 }, { - "amend": 0, - "cancel": 0, "create": 1, "delete": 1, "email": 1, "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, "print": 1, "read": 1, "report": 1, "role": "Manufacturing Manager", - "set_user_permissions": 0, "share": 1, - "submit": 0, "write": 1 }, { - "amend": 0, - "cancel": 0, "create": 1, "delete": 1, "email": 1, "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, "print": 1, "read": 1, "report": 1, "role": "Stock Manager", - "set_user_permissions": 0, "share": 1, - "submit": 0, "write": 1 }, { - "amend": 0, - "cancel": 0, "create": 1, "delete": 1, "email": 1, "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, "print": 1, "read": 1, "report": 1, "role": "Stock User", - "set_user_permissions": 0, "share": 1, - "submit": 0, "write": 1 } ], "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "show_name_in_global_search": 0, "sort_field": "modified", "sort_order": "ASC", - "track_changes": 1, - "track_seen": 0, - "track_views": 0 + "track_changes": 1 } \ No newline at end of file From 691ec1bd27d094cc877e6866598a96b3f9612a8c Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 12 Aug 2020 18:01:07 +0530 Subject: [PATCH 12/24] fix: don't set maintenance log status as Overdue when Completed or Cancelled --- .../doctype/asset_maintenance_log/asset_maintenance_log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py index 148357f392..34facd8d05 100644 --- a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py +++ b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.py @@ -11,7 +11,7 @@ from erpnext.assets.doctype.asset_maintenance.asset_maintenance import calculate class AssetMaintenanceLog(Document): def validate(self): - if getdate(self.due_date) < getdate(nowdate()): + if getdate(self.due_date) < getdate(nowdate()) and self.maintenance_status not in ["Completed", "Cancelled"]: self.maintenance_status = "Overdue" if self.maintenance_status == "Completed" and not self.completion_date: From 517a6d00541f91396c27ee5caa460abb682b14a9 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 12 Aug 2020 18:01:45 +0530 Subject: [PATCH 13/24] fix: set draft indicators for Asset Maintenance Log listview --- .../asset_maintenance_log_list.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log_list.js b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log_list.js index b854413310..23000e60ef 100644 --- a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log_list.js +++ b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log_list.js @@ -1,14 +1,15 @@ frappe.listview_settings['Asset Maintenance Log'] = { add_fields: ["maintenance_status"], + has_indicator_for_draft: 1, get_indicator: function(doc) { - if(doc.maintenance_status=="Pending") { - return [__("Pending"), "orange"]; - } else if(doc.maintenance_status=="Completed") { - return [__("Completed"), "green"]; - } else if(doc.maintenance_status=="Cancelled") { - return [__("Cancelled"), "red"]; - } else if(doc.maintenance_status=="Overdue") { - return [__("Overdue"), "red"]; + if (doc.maintenance_status=="Planned") { + return [__(doc.maintenance_status), "orange", "status,=," + doc.maintenance_status]; + } else if (doc.maintenance_status=="Completed") { + return [__(doc.maintenance_status), "green", "status,=," + doc.maintenance_status]; + } else if (doc.maintenance_status=="Cancelled") { + return [__(doc.maintenance_status), "red", "status,=," + doc.maintenance_status]; + } else if (doc.maintenance_status=="Overdue") { + return [__(doc.maintenance_status), "red", "status,=," + doc.maintenance_status]; } } }; From 21a220e2a542b1f5310608eed87d9bb3654c2d7a Mon Sep 17 00:00:00 2001 From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Date: Wed, 12 Aug 2020 19:19:03 +0530 Subject: [PATCH 14/24] fix: Update state code and union territory for Daman and Diu (#22988) Co-authored-by: Rucha Mahabal --- erpnext/patches.txt | 1 + .../update_state_code_for_daman_and_diu.py | 22 +++++++++++++++++++ erpnext/regional/india/__init__.py | 6 ++--- .../regional/india/gst_state_code_data.json | 7 +----- 4 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 erpnext/patches/v12_0/update_state_code_for_daman_and_diu.py diff --git a/erpnext/patches.txt b/erpnext/patches.txt index b9d3234147..67774975fd 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -719,3 +719,4 @@ erpnext.patches.v12_0.update_item_tax_template_company erpnext.patches.v13_0.move_branch_code_to_bank_account erpnext.patches.v13_0.healthcare_lab_module_rename_doctypes erpnext.patches.v13_0.stock_entry_enhancements +erpnext.patches.v12_0.update_state_code_for_daman_and_diu diff --git a/erpnext/patches/v12_0/update_state_code_for_daman_and_diu.py b/erpnext/patches/v12_0/update_state_code_for_daman_and_diu.py new file mode 100644 index 0000000000..7450e9cd8c --- /dev/null +++ b/erpnext/patches/v12_0/update_state_code_for_daman_and_diu.py @@ -0,0 +1,22 @@ +import frappe +from erpnext.regional.india import states + +def execute(): + + company = frappe.get_all('Company', filters = {'country': 'India'}) + if not company: + return + + # Update options in gst_state custom field + gst_state = frappe.get_doc('Custom Field', 'Address-gst_state') + gst_state.options = '\n'.join(states) + gst_state.save() + + # Update gst_state and state code in existing address + frappe.db.sql(""" + UPDATE `tabAddress` + SET + gst_state = 'Dadra and Nagar Haveli and Daman and Diu', + gst_state_number = 26 + WHERE gst_state = 'Daman and Diu' + """) \ No newline at end of file diff --git a/erpnext/regional/india/__init__.py b/erpnext/regional/india/__init__.py index 0ed98b74ee..d6221a80aa 100644 --- a/erpnext/regional/india/__init__.py +++ b/erpnext/regional/india/__init__.py @@ -10,8 +10,7 @@ states = [ 'Bihar', 'Chandigarh', 'Chhattisgarh', - 'Dadra and Nagar Haveli', - 'Daman and Diu', + 'Dadra and Nagar Haveli and Daman and Diu', 'Delhi', 'Goa', 'Gujarat', @@ -50,8 +49,7 @@ state_numbers = { "Bihar": "10", "Chandigarh": "04", "Chhattisgarh": "22", - "Dadra and Nagar Haveli": "26", - "Daman and Diu": "25", + "Dadra and Nagar Haveli and Daman and Diu": "26", "Delhi": "07", "Goa": "30", "Gujarat": "24", diff --git a/erpnext/regional/india/gst_state_code_data.json b/erpnext/regional/india/gst_state_code_data.json index 6dab81d668..ff88e0f9d6 100644 --- a/erpnext/regional/india/gst_state_code_data.json +++ b/erpnext/regional/india/gst_state_code_data.json @@ -134,15 +134,10 @@ "state_code": "DL", "state_name": "Delhi" }, - { - "state_number": "25", - "state_code": "DD", - "state_name": "Daman and Diu" - }, { "state_number": "26", "state_code": "DN", - "state_name": "Dadra and Nagar Haveli" + "state_name": "Dadra and Nagar Haveli and Daman and Diu" }, { "state_number": "22", From e2ee455acc8d1a6badd4a3fbc6913cefdedff32c Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 12 Aug 2020 20:58:03 +0530 Subject: [PATCH 15/24] fix: Calculate taxes if tax is based on item quantity --- erpnext/controllers/taxes_and_totals.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py index 8f86dce436..2a14be8532 100644 --- a/erpnext/controllers/taxes_and_totals.py +++ b/erpnext/controllers/taxes_and_totals.py @@ -173,7 +173,7 @@ class calculate_taxes_and_totals(object): + tax.tax_fraction_for_current_item cumulated_tax_fraction += tax.tax_fraction_for_current_item - total_inclusive_tax_amount_per_qty += inclusive_tax_amount_per_qty * flt(item.stock_qty) + total_inclusive_tax_amount_per_qty += inclusive_tax_amount_per_qty * flt(item.qty) if not self.discount_amount_applied and item.qty and (cumulated_tax_fraction or total_inclusive_tax_amount_per_qty): amount = flt(item.amount) - total_inclusive_tax_amount_per_qty From c7614174d062e713fae1b0b057afb46b1622e0bb Mon Sep 17 00:00:00 2001 From: Saqib Date: Thu, 13 Aug 2020 09:18:59 +0530 Subject: [PATCH 16/24] fix: cannot change customer fields if credit exhausted (#22838) * fix: cannot change customer fields if credit exhausted * fix: order based on company * fix: sort current limits w.r.t company before compare * fix: CustomerCreditLimit Object is not subscriptable --- erpnext/selling/doctype/customer/customer.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py index ca62488a8c..93d4832173 100644 --- a/erpnext/selling/doctype/customer/customer.py +++ b/erpnext/selling/doctype/customer/customer.py @@ -184,6 +184,14 @@ class Customer(TransactionBase): def validate_credit_limit_on_change(self): if self.get("__islocal") or not self.credit_limits: return + + past_credit_limits = [d.credit_limit + for d in frappe.db.get_all("Customer Credit Limit", filters={'parent': self.name}, fields=["credit_limit"], order_by="company")] + + current_credit_limits = [d.credit_limit for d in sorted(self.credit_limits, key=lambda k: k.company)] + + if past_credit_limits == current_credit_limits: + return company_record = [] for limit in self.credit_limits: From e447c79f9de10c6cc1373b206aece6868c6b9d16 Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Thu, 13 Aug 2020 09:20:36 +0530 Subject: [PATCH 17/24] fix: Quotation lost reason options fix (#22814) * adding patch and lost reason child tables * fix: conflict resolved --- .../crm/doctype/opportunity/opportunity.json | 2 +- .../__init__.py | 0 .../opportunity_lost_reason_detail.json | 31 +++++++++++++++++++ .../opportunity_lost_reason_detail.py | 10 ++++++ erpnext/patches.txt | 1 + .../v12_0/rename_lost_reason_detail.py | 17 ++++++++++ .../selling/doctype/quotation/quotation.json | 4 +-- .../selling/doctype/quotation/quotation.py | 2 +- erpnext/selling/sales_common.js | 19 +++++++----- .../quotation_lost_reason_detail/__init__.py | 0 .../quotation_lost_reason_detail.json | 31 +++++++++++++++++++ .../quotation_lost_reason_detail.py | 10 ++++++ 12 files changed, 116 insertions(+), 11 deletions(-) create mode 100644 erpnext/crm/doctype/opportunity_lost_reason_detail/__init__.py create mode 100644 erpnext/crm/doctype/opportunity_lost_reason_detail/opportunity_lost_reason_detail.json create mode 100644 erpnext/crm/doctype/opportunity_lost_reason_detail/opportunity_lost_reason_detail.py create mode 100644 erpnext/patches/v12_0/rename_lost_reason_detail.py create mode 100644 erpnext/setup/doctype/quotation_lost_reason_detail/__init__.py create mode 100644 erpnext/setup/doctype/quotation_lost_reason_detail/quotation_lost_reason_detail.json create mode 100644 erpnext/setup/doctype/quotation_lost_reason_detail/quotation_lost_reason_detail.py diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json index 5cd5233b2e..b61cad3620 100644 --- a/erpnext/crm/doctype/opportunity/opportunity.json +++ b/erpnext/crm/doctype/opportunity/opportunity.json @@ -411,7 +411,7 @@ "fieldname": "lost_reasons", "fieldtype": "Table MultiSelect", "label": "Lost Reasons", - "options": "Lost Reason Detail", + "options": "Opportunity Lost Reason Detail", "read_only": 1 }, { diff --git a/erpnext/crm/doctype/opportunity_lost_reason_detail/__init__.py b/erpnext/crm/doctype/opportunity_lost_reason_detail/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/crm/doctype/opportunity_lost_reason_detail/opportunity_lost_reason_detail.json b/erpnext/crm/doctype/opportunity_lost_reason_detail/opportunity_lost_reason_detail.json new file mode 100644 index 0000000000..50620e2c34 --- /dev/null +++ b/erpnext/crm/doctype/opportunity_lost_reason_detail/opportunity_lost_reason_detail.json @@ -0,0 +1,31 @@ +{ + "actions": [], + "creation": "2020-07-16 16:11:39.830389", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "lost_reason" + ], + "fields": [ + { + "fieldname": "lost_reason", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Opportunity Lost Reason", + "options": "Opportunity Lost Reason" + } + ], + "istable": 1, + "links": [], + "modified": "2020-07-26 17:58:26.313242", + "modified_by": "Administrator", + "module": "CRM", + "name": "Opportunity Lost Reason Detail", + "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/crm/doctype/opportunity_lost_reason_detail/opportunity_lost_reason_detail.py b/erpnext/crm/doctype/opportunity_lost_reason_detail/opportunity_lost_reason_detail.py new file mode 100644 index 0000000000..8723f1d045 --- /dev/null +++ b/erpnext/crm/doctype/opportunity_lost_reason_detail/opportunity_lost_reason_detail.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 OpportunityLostReasonDetail(Document): + pass diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 67774975fd..361fe8352a 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -720,3 +720,4 @@ erpnext.patches.v13_0.move_branch_code_to_bank_account erpnext.patches.v13_0.healthcare_lab_module_rename_doctypes erpnext.patches.v13_0.stock_entry_enhancements erpnext.patches.v12_0.update_state_code_for_daman_and_diu +erpnext.patches.v12_0.rename_lost_reason_detail diff --git a/erpnext/patches/v12_0/rename_lost_reason_detail.py b/erpnext/patches/v12_0/rename_lost_reason_detail.py new file mode 100644 index 0000000000..044d0232e0 --- /dev/null +++ b/erpnext/patches/v12_0/rename_lost_reason_detail.py @@ -0,0 +1,17 @@ +from __future__ import unicode_literals +import frappe + +def execute(): + if frappe.db.exists("DocType", "Lost Reason Detail"): + frappe.reload_doc("crm", "doctype", "opportunity_lost_reason_detail") + frappe.reload_doc("setup", "doctype", "quotation_lost_reason_detail") + + frappe.db.sql("""INSERT INTO `tabOpportunity Lost Reason Detail` SELECT * FROM `tabLost Reason Detail` WHERE `parenttype` = 'Opportunity'""") + + frappe.db.sql("""INSERT INTO `tabQuotation Lost Reason Detail` SELECT * FROM `tabLost Reason Detail` WHERE `parenttype` = 'Quotation'""") + + frappe.db.sql("""INSERT INTO `tabQuotation Lost Reason` (`name`, `creation`, `modified`, `modified_by`, `owner`, `docstatus`, `parent`, `parentfield`, `parenttype`, `idx`, `_comments`, `_assign`, `_user_tags`, `_liked_by`, `order_lost_reason`) + SELECT o.`name`, o.`creation`, o.`modified`, o.`modified_by`, o.`owner`, o.`docstatus`, o.`parent`, o.`parentfield`, o.`parenttype`, o.`idx`, o.`_comments`, o.`_assign`, o.`_user_tags`, o.`_liked_by`, o.`lost_reason` + FROM `tabOpportunity Lost Reason` o LEFT JOIN `tabQuotation Lost Reason` q ON q.name = o.name WHERE q.name IS NULL""") + + frappe.delete_doc("DocType", "Lost Reason Detail") \ No newline at end of file diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json index 6d34c2ac7f..5b85187ccb 100644 --- a/erpnext/selling/doctype/quotation/quotation.json +++ b/erpnext/selling/doctype/quotation/quotation.json @@ -923,7 +923,7 @@ "fieldname": "lost_reasons", "fieldtype": "Table MultiSelect", "label": "Lost Reasons", - "options": "Lost Reason Detail", + "options": "Quotation Lost Reason Detail", "read_only": 1 } ], @@ -932,7 +932,7 @@ "is_submittable": 1, "links": [], "max_attachments": 1, - "modified": "2020-07-18 04:59:09.960118", + "modified": "2020-07-26 17:46:19.951223", "modified_by": "Administrator", "module": "Selling", "name": "Quotation", diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py index 449a968a4f..ab095ebfe0 100644 --- a/erpnext/selling/doctype/quotation/quotation.py +++ b/erpnext/selling/doctype/quotation/quotation.py @@ -68,7 +68,7 @@ class Quotation(SellingController): def declare_enquiry_lost(self, lost_reasons_list, detailed_reason=None): if not self.has_sales_order(): - get_lost_reasons = frappe.get_list('Opportunity Lost Reason', + get_lost_reasons = frappe.get_list('Quotation Lost Reason', fields = ["name"]) lost_reasons_lst = [reason.get('name') for reason in get_lost_reasons] frappe.db.set(self, 'status', 'Lost') diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js index 333a563aa5..002cfe41e1 100644 --- a/erpnext/selling/sales_common.js +++ b/erpnext/selling/sales_common.js @@ -494,13 +494,18 @@ frappe.ui.form.on(cur_frm.doctype, { var dialog = new frappe.ui.Dialog({ title: __("Set as Lost"), fields: [ - {"fieldtype": "Table MultiSelect", - "label": __("Lost Reasons"), - "fieldname": "lost_reason", - "options": "Lost Reason Detail", - "reqd": 1}, - - {"fieldtype": "Text", "label": __("Detailed Reason"), "fieldname": "detailed_reason"}, + { + "fieldtype": "Table MultiSelect", + "label": __("Lost Reasons"), + "fieldname": "lost_reason", + "options": frm.doctype === 'Opportunity' ? 'Opportunity Lost Reason Detail': 'Quotation Lost Reason Detail', + "reqd": 1 + }, + { + "fieldtype": "Text", + "label": __("Detailed Reason"), + "fieldname": "detailed_reason" + }, ], primary_action: function() { var values = dialog.get_values(); diff --git a/erpnext/setup/doctype/quotation_lost_reason_detail/__init__.py b/erpnext/setup/doctype/quotation_lost_reason_detail/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/erpnext/setup/doctype/quotation_lost_reason_detail/quotation_lost_reason_detail.json b/erpnext/setup/doctype/quotation_lost_reason_detail/quotation_lost_reason_detail.json new file mode 100644 index 0000000000..543214101a --- /dev/null +++ b/erpnext/setup/doctype/quotation_lost_reason_detail/quotation_lost_reason_detail.json @@ -0,0 +1,31 @@ +{ + "actions": [], + "creation": "2020-07-14 09:21:44.057724", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "lost_reason" + ], + "fields": [ + { + "fieldname": "lost_reason", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Quotation Lost Reason", + "options": "Quotation Lost Reason" + } + ], + "istable": 1, + "links": [], + "modified": "2020-07-26 17:58:56.373775", + "modified_by": "Administrator", + "module": "Setup", + "name": "Quotation Lost Reason Detail", + "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/setup/doctype/quotation_lost_reason_detail/quotation_lost_reason_detail.py b/erpnext/setup/doctype/quotation_lost_reason_detail/quotation_lost_reason_detail.py new file mode 100644 index 0000000000..7bb8d02670 --- /dev/null +++ b/erpnext/setup/doctype/quotation_lost_reason_detail/quotation_lost_reason_detail.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 QuotationLostReasonDetail(Document): + pass From 6988fbb82d84d4c6164b8fba06599ed0445c00c5 Mon Sep 17 00:00:00 2001 From: marination Date: Thu, 13 Aug 2020 12:17:13 +0530 Subject: [PATCH 18/24] fix: Validate or Set Loan Amount first --- .../doctype/loan_application/loan_application.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/loan_management/doctype/loan_application/loan_application.py b/erpnext/loan_management/doctype/loan_application/loan_application.py index f051755f67..4ea6f92a6a 100644 --- a/erpnext/loan_management/doctype/loan_application/loan_application.py +++ b/erpnext/loan_management/doctype/loan_application/loan_application.py @@ -16,14 +16,15 @@ from six import string_types class LoanApplication(Document): def validate(self): + self.set_loan_amount() + self.validate_loan_amount() validate_repayment_method(self.repayment_method, self.loan_amount, self.repayment_amount, self.repayment_periods, self.is_term_loan) self.validate_loan_type() self.set_pledge_amount() - self.set_loan_amount() - self.validate_loan_amount() + self.get_repayment_details() self.check_sanctioned_amount_limit() From 8264fcd0a53c4261d8836f171f7aa055471185f0 Mon Sep 17 00:00:00 2001 From: marination Date: Thu, 13 Aug 2020 12:47:34 +0530 Subject: [PATCH 19/24] fix: Only validate repayment if term loan --- .../doctype/loan_application/loan_application.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/loan_management/doctype/loan_application/loan_application.py b/erpnext/loan_management/doctype/loan_application/loan_application.py index 4ea6f92a6a..93446a08bd 100644 --- a/erpnext/loan_management/doctype/loan_application/loan_application.py +++ b/erpnext/loan_management/doctype/loan_application/loan_application.py @@ -19,8 +19,9 @@ class LoanApplication(Document): self.set_loan_amount() self.validate_loan_amount() - validate_repayment_method(self.repayment_method, self.loan_amount, self.repayment_amount, - self.repayment_periods, self.is_term_loan) + if self.is_term_loan: + validate_repayment_method(self.repayment_method, self.loan_amount, self.repayment_amount, + self.repayment_periods, self.is_term_loan) self.validate_loan_type() self.set_pledge_amount() From a647bef68240d11c9d560a49a7f54fa5d5f84d0c Mon Sep 17 00:00:00 2001 From: bhavesh95863 <34086262+bhavesh95863@users.noreply.github.com> Date: Thu, 13 Aug 2020 17:41:55 +0530 Subject: [PATCH 20/24] fix: warehouse mandatory even update stock uncheck (#23023) --- erpnext/accounts/doctype/pos_profile/pos_profile.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.json b/erpnext/accounts/doctype/pos_profile/pos_profile.json index 454c598d63..d4c1791789 100644 --- a/erpnext/accounts/doctype/pos_profile/pos_profile.json +++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json @@ -302,10 +302,10 @@ "fieldname": "warehouse", "fieldtype": "Link", "label": "Warehouse", + "mandatory_depends_on": "update_stock", "oldfieldname": "warehouse", "oldfieldtype": "Link", - "options": "Warehouse", - "reqd": 1 + "options": "Warehouse" }, { "default": "0", @@ -350,4 +350,4 @@ ], "sort_field": "modified", "sort_order": "DESC" -} \ No newline at end of file +} From 1151f888baf399b7125619c2cc8b82553aef7867 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Thu, 13 Aug 2020 18:52:23 +0530 Subject: [PATCH 21/24] fix: Set pledge amount before setting loan amount --- .../doctype/loan_application/loan_application.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/loan_management/doctype/loan_application/loan_application.py b/erpnext/loan_management/doctype/loan_application/loan_application.py index 93446a08bd..71773f1459 100644 --- a/erpnext/loan_management/doctype/loan_application/loan_application.py +++ b/erpnext/loan_management/doctype/loan_application/loan_application.py @@ -16,6 +16,7 @@ from six import string_types class LoanApplication(Document): def validate(self): + self.set_pledge_amount() self.set_loan_amount() self.validate_loan_amount() @@ -24,7 +25,6 @@ class LoanApplication(Document): self.repayment_periods, self.is_term_loan) self.validate_loan_type() - self.set_pledge_amount() self.get_repayment_details() self.check_sanctioned_amount_limit() @@ -108,7 +108,7 @@ class LoanApplication(Document): if self.is_secured_loan and self.proposed_pledges: self.maximum_loan_amount = 0 for security in self.proposed_pledges: - self.maximum_loan_amount += security.post_haircut_amount + self.maximum_loan_amount += flt(security.post_haircut_amount) if not self.loan_amount and self.is_secured_loan and self.proposed_pledges: self.loan_amount = self.maximum_loan_amount From d7d92c520eed44e8fa0a8a51782e177da6657693 Mon Sep 17 00:00:00 2001 From: Afshan <33727827+AfshanKhan@users.noreply.github.com> Date: Thu, 13 Aug 2020 19:40:09 +0530 Subject: [PATCH 22/24] fix: removed code relating to standard working hours (#23009) --- erpnext/projects/doctype/timesheet/timesheet.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/erpnext/projects/doctype/timesheet/timesheet.js b/erpnext/projects/doctype/timesheet/timesheet.js index 5de2930c1c..607c3fd974 100644 --- a/erpnext/projects/doctype/timesheet/timesheet.js +++ b/erpnext/projects/doctype/timesheet/timesheet.js @@ -94,13 +94,6 @@ frappe.ui.form.on("Timesheet", { } }, - company: function(frm) { - frappe.db.get_value('Company', { 'company_name' : frm.doc.company }, 'standard_working_hours') - .then(({ message }) => { - (frappe.working_hours = message.standard_working_hours || 0); - }); - }, - make_invoice: function(frm) { let dialog = new frappe.ui.Dialog({ title: __("Select Item (optional)"), From 759632c025f4f545424c69df60919dc4ec3a62a8 Mon Sep 17 00:00:00 2001 From: Anurag Mishra Date: Fri, 14 Aug 2020 12:26:04 +0530 Subject: [PATCH 23/24] fix: requested Changes --- erpnext/hr/doctype/leave_allocation/leave_allocation.js | 2 +- erpnext/hr/doctype/leave_application/leave_application.js | 2 +- erpnext/hr/doctype/leave_encashment/leave_encashment.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.js b/erpnext/hr/doctype/leave_allocation/leave_allocation.js index a184cc7d15..e9e129cdd2 100755 --- a/erpnext/hr/doctype/leave_allocation/leave_allocation.js +++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.js @@ -6,7 +6,7 @@ cur_frm.add_fetch('employee','employee_name','employee_name'); frappe.ui.form.on("Leave Allocation", { onload: function(frm) { // Ignore cancellation of doctype on cancel all. - frm.ignored_doctypes_on_cancel_all = ["Leave Ledger Entry"]; + frm.ignore_doctypes_on_cancel_all = ["Leave Ledger Entry"]; if(!frm.doc.from_date) frm.set_value("from_date", frappe.datetime.get_today()); diff --git a/erpnext/hr/doctype/leave_application/leave_application.js b/erpnext/hr/doctype/leave_application/leave_application.js index a0cce0a80f..d62e418b17 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.js +++ b/erpnext/hr/doctype/leave_application/leave_application.js @@ -21,7 +21,7 @@ frappe.ui.form.on("Leave Application", { onload: function(frm) { // Ignore cancellation of doctype on cancel all. - frm.ignored_doctypes_on_cancel_all = ["Leave Ledger Entry"]; + frm.ignore_doctypes_on_cancel_all = ["Leave Ledger Entry"]; if (!frm.doc.posting_date) { frm.set_value("posting_date", frappe.datetime.get_today()); diff --git a/erpnext/hr/doctype/leave_encashment/leave_encashment.js b/erpnext/hr/doctype/leave_encashment/leave_encashment.js index d5e7adab74..71a34226da 100644 --- a/erpnext/hr/doctype/leave_encashment/leave_encashment.js +++ b/erpnext/hr/doctype/leave_encashment/leave_encashment.js @@ -4,7 +4,7 @@ frappe.ui.form.on('Leave Encashment', { onload: function(frm) { // Ignore cancellation of doctype on cancel all. - frm.ignored_doctypes_on_cancel_all = ["Leave Ledger Entry"]; + frm.ignore_doctypes_on_cancel_all = ["Leave Ledger Entry"]; }, setup: function(frm) { frm.set_query("leave_type", function() { From 5fb0e7184e965b1cb2cc13c8a2eda593e58408b4 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Fri, 14 Aug 2020 17:11:39 +0530 Subject: [PATCH 24/24] fix: list index out of range error while setting POS payment mode (#23018) --- .../doctype/sales_invoice/sales_invoice.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 3dab054014..71f2e120cc 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -1619,22 +1619,23 @@ def update_multi_mode_option(doc, pos_profile): for pos_payment_method in pos_profile.get('payments'): pos_payment_method = pos_payment_method.as_dict() - + payment_mode = get_mode_of_payment_info(pos_payment_method.mode_of_payment, doc.company) - payment_mode[0].default = pos_payment_method.default - append_payment(payment_mode[0]) + if payment_mode: + payment_mode[0].default = pos_payment_method.default + append_payment(payment_mode[0]) def get_all_mode_of_payments(doc): return frappe.db.sql(""" - select mpa.default_account, mpa.parent, mp.type as type - from `tabMode of Payment Account` mpa,`tabMode of Payment` mp + select mpa.default_account, mpa.parent, mp.type as type + from `tabMode of Payment Account` mpa,`tabMode of Payment` mp where mpa.parent = mp.name and mpa.company = %(company)s and mp.enabled = 1""", {'company': doc.company}, as_dict=1) def get_mode_of_payment_info(mode_of_payment, company): return frappe.db.sql(""" - select mpa.default_account, mpa.parent, mp.type as type - from `tabMode of Payment Account` mpa,`tabMode of Payment` mp + select mpa.default_account, mpa.parent, mp.type as type + from `tabMode of Payment Account` mpa,`tabMode of Payment` mp where mpa.parent = mp.name and mpa.company = %s and mp.enabled = 1 and mp.name = %s""", (company, mode_of_payment), as_dict=1)