diff --git a/erpnext/__version__.py b/erpnext/__version__.py index b35f45ac41a..40c61dba31b 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '4.25.5' +__version__ = '4.25.6' diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 1cb26fde1cf..54875ab42f3 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -229,19 +229,15 @@ cur_frm.cscript.hide_fields = function(doc) { 'advance_adjustment_details', 'sales_partner', 'commission_rate', 'total_commission', 'advances', 'from_date', 'to_date']; - item_flds_normal = ['sales_order', 'delivery_note'] - if(cint(doc.is_pos) == 1) { hide_field(par_flds); unhide_field('payments_section'); - cur_frm.fields_dict['entries'].grid.set_column_disp(item_flds_normal, false); } else { hide_field('payments_section'); for (i in par_flds) { var docfield = frappe.meta.docfield_map[doc.doctype][par_flds[i]]; if(!docfield.hidden) unhide_field(par_flds[i]); } - cur_frm.fields_dict['entries'].grid.set_column_disp(item_flds_normal, true); } item_flds_stock = ['serial_no', 'batch_no', 'actual_qty', 'actual_batch_qty', 'expense_account', 'warehouse'] diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 4d30cee800e..8b6460b5ba1 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -5,7 +5,7 @@ app_publisher = "Web Notes Technologies Pvt. Ltd. and Contributors" app_description = "Open Source Enterprise Resource Planning for Small and Midsized Organizations" app_icon = "icon-th" app_color = "#e74c3c" -app_version = "4.25.5" +app_version = "4.25.6" error_report_email = "support@erpnext.com" diff --git a/erpnext/patches.txt b/erpnext/patches.txt index bccbe796868..a9e979b48ee 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -99,3 +99,4 @@ erpnext.patches.v4_2.repost_sle_for_si_with_no_warehouse erpnext.patches.v4_2.fix_recurring_orders erpnext.patches.v4_2.delete_gl_entries_for_cancelled_invoices erpnext.patches.v4_2.update_advance_paid +erpnext.patches.v4_2.repost_requested_qty diff --git a/erpnext/patches/v4_2/repost_requested_qty.py b/erpnext/patches/v4_2/repost_requested_qty.py new file mode 100644 index 00000000000..8c1d6f7fbb1 --- /dev/null +++ b/erpnext/patches/v4_2/repost_requested_qty.py @@ -0,0 +1,21 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors +# License: GNU General Public License v3. See license.txt + +from __future__ import unicode_literals +import frappe + +def execute(): + from erpnext.utilities.repost_stock import update_bin_qty, get_indented_qty + + count=0 + for item_code, warehouse in frappe.db.sql("""select distinct item_code, warehouse + from `tabMaterial Request Item` where docstatus = 1"""): + try: + count += 1 + update_bin_qty(item_code, warehouse, { + "indented_qty": get_indented_qty(item_code, warehouse), + }) + if count % 200 == 0: + frappe.db.commit() + except: + frappe.db.rollback() diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index ff11f267848..c46eaff6420 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -94,8 +94,8 @@ class MaterialRequest(BuyingController): def update_status(self, status): self.check_modified_date() - self.update_requested_qty() frappe.db.set(self, 'status', cstr(status)) + self.update_requested_qty() frappe.msgprint(_("Status updated to {0}").format(_(status))) def on_cancel(self): diff --git a/setup.py b/setup.py index f2089c1f0c5..ececf0f1105 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import os -version = "4.25.5" +version = "4.25.6" with open("requirements.txt", "r") as f: install_requires = f.readlines()