From feda4f9bc9c9553fdaf5f01a8427aff7db83f9b7 Mon Sep 17 00:00:00 2001 From: Neil Trini Lasrado Date: Thu, 16 Jul 2015 15:44:56 +0530 Subject: [PATCH 01/15] Default Expense Account added to Expense Claim Type. Fetch account while making Bank Entry --- erpnext/hr/doctype/expense_claim/expense_claim.js | 12 ++++++++---- .../expense_claim_detail/expense_claim_detail.json | 14 +++++++++++++- .../expense_claim_type/expense_claim_type.json | 12 ++++++++++-- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js index b556172a78..a56929d1c3 100644 --- a/erpnext/hr/doctype/expense_claim/expense_claim.js +++ b/erpnext/hr/doctype/expense_claim/expense_claim.js @@ -19,10 +19,13 @@ erpnext.hr.ExpenseClaimController = frappe.ui.form.Controller.extend({ jv.company = cur_frm.doc.company; jv.remark = 'Payment against Expense Claim: ' + cur_frm.doc.name; jv.fiscal_year = cur_frm.doc.fiscal_year; - - var d1 = frappe.model.add_child(jv, 'Journal Entry Account', 'accounts'); - d1.debit = cur_frm.doc.total_sanctioned_amount; - d1.against_expense_claim = cur_frm.doc.name; + var expense = cur_frm.doc.expenses || []; + for(var i = 0; i < expense.length; i++){ + var d1 = frappe.model.add_child(jv, 'Journal Entry Account', 'accounts'); + d1.debit = expense[i].sanctioned_amount; + d1.account = expense[i].default_account; + d1.against_expense_claim = cur_frm.doc.name; + } // credit to bank var d1 = frappe.model.add_child(jv, 'Journal Entry Account', 'accounts'); @@ -43,6 +46,7 @@ $.extend(cur_frm.cscript, new erpnext.hr.ExpenseClaimController({frm: cur_frm})) cur_frm.add_fetch('employee', 'company', 'company'); cur_frm.add_fetch('employee','employee_name','employee_name'); +cur_frm.add_fetch('expense_type', 'default_account', 'default_account'); cur_frm.cscript.onload = function(doc,cdt,cdn) { if(!doc.approval_status) diff --git a/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json b/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json index c6123eeeff..9522d94207 100644 --- a/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json +++ b/erpnext/hr/doctype/expense_claim_detail/expense_claim_detail.json @@ -34,6 +34,18 @@ "reqd": 1, "width": "150px" }, + { + "depends_on": "expense_type", + "fieldname": "default_account", + "fieldtype": "Link", + "hidden": 1, + "label": "Default Account", + "options": "Account", + "permlevel": 0, + "precision": "", + "read_only": 1, + "unique": 0 + }, { "fieldname": "section_break_4", "fieldtype": "Section Break", @@ -93,7 +105,7 @@ ], "idx": 1, "istable": 1, - "modified": "2015-04-08 06:18:47.539134", + "modified": "2015-07-16 06:13:32.090048", "modified_by": "Administrator", "module": "HR", "name": "Expense Claim Detail", diff --git a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json index fc7e604dba..0b0d304644 100644 --- a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json +++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json @@ -17,6 +17,14 @@ "reqd": 1, "search_index": 0 }, + { + "fieldname": "default_account", + "fieldtype": "Link", + "label": "Default Account", + "options": "Account", + "permlevel": 0, + "precision": "" + }, { "fieldname": "description", "fieldtype": "Small Text", @@ -29,7 +37,7 @@ ], "icon": "icon-flag", "idx": 1, - "modified": "2015-07-13 04:46:38.897484", + "modified": "2015-07-15 08:57:23.069980", "modified_by": "Administrator", "module": "HR", "name": "Expense Claim Type", @@ -55,7 +63,7 @@ "print": 0, "read": 1, "report": 0, - "role": "Employee", + "role": "All", "share": 0, "write": 0 } From 0a3be6da272610fba8ae500b09963948ef0ebcc8 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 17 Jul 2015 14:39:41 +0530 Subject: [PATCH 02/15] Update rename_table_fieldnames.py --- erpnext/patches/v5_0/rename_table_fieldnames.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/patches/v5_0/rename_table_fieldnames.py b/erpnext/patches/v5_0/rename_table_fieldnames.py index c26accbf74..8c54ff9ba3 100644 --- a/erpnext/patches/v5_0/rename_table_fieldnames.py +++ b/erpnext/patches/v5_0/rename_table_fieldnames.py @@ -2,7 +2,7 @@ # License: GNU General Public License v3. See license.txt import frappe -from frappe.model import rename_field +from frappe.model.utils import rename_field from frappe.modules import scrub, get_doctype_module rename_map = { From dae29bf2d4c403414376e6e4228ae80d8340998e Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 17 Jul 2015 14:42:46 +0530 Subject: [PATCH 03/15] Update fields_to_be_renamed.py --- erpnext/patches/v4_0/fields_to_be_renamed.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/patches/v4_0/fields_to_be_renamed.py b/erpnext/patches/v4_0/fields_to_be_renamed.py index 2baab97b0a..69776a21db 100644 --- a/erpnext/patches/v4_0/fields_to_be_renamed.py +++ b/erpnext/patches/v4_0/fields_to_be_renamed.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import frappe -from frappe.model import rename_field +from frappe.model.utils import rename_field from frappe.modules import scrub, get_doctype_module rename_map = { From 1401e3f679de58c8313feb144ea8571d7c86809c Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 17 Jul 2015 14:43:19 +0530 Subject: [PATCH 04/15] Update rename_total_fields.py --- erpnext/patches/v5_0/rename_total_fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/patches/v5_0/rename_total_fields.py b/erpnext/patches/v5_0/rename_total_fields.py index cf95caa708..93ab852feb 100644 --- a/erpnext/patches/v5_0/rename_total_fields.py +++ b/erpnext/patches/v5_0/rename_total_fields.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import frappe -from frappe.model import rename_field +from frappe.model.utils import rename_field from frappe.modules import scrub, get_doctype_module selling_doctypes = ("Quotation", "Sales Order", "Delivery Note", "Sales Invoice") From a041297861970ffb9a00e738618452e807587728 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 17 Jul 2015 15:12:52 +0530 Subject: [PATCH 05/15] Update rename_total_fields.py --- erpnext/patches/v5_0/rename_total_fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/patches/v5_0/rename_total_fields.py b/erpnext/patches/v5_0/rename_total_fields.py index 93ab852feb..6657dd843e 100644 --- a/erpnext/patches/v5_0/rename_total_fields.py +++ b/erpnext/patches/v5_0/rename_total_fields.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import frappe -from frappe.model.utils import rename_field +from frappe.model.utils.rename_field import rename_field from frappe.modules import scrub, get_doctype_module selling_doctypes = ("Quotation", "Sales Order", "Delivery Note", "Sales Invoice") From 3c821c89f20710f6cc0bd4efab1c70828e6c8485 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 17 Jul 2015 15:13:29 +0530 Subject: [PATCH 06/15] Update rename_table_fieldnames.py --- erpnext/patches/v5_0/rename_table_fieldnames.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/patches/v5_0/rename_table_fieldnames.py b/erpnext/patches/v5_0/rename_table_fieldnames.py index 8c54ff9ba3..05d5c913c9 100644 --- a/erpnext/patches/v5_0/rename_table_fieldnames.py +++ b/erpnext/patches/v5_0/rename_table_fieldnames.py @@ -2,7 +2,7 @@ # License: GNU General Public License v3. See license.txt import frappe -from frappe.model.utils import rename_field +from frappe.model.utils.rename_field import rename_field from frappe.modules import scrub, get_doctype_module rename_map = { From 14a394cde1b599f86a049e4ef908a9fecfa97f70 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 17 Jul 2015 15:14:19 +0530 Subject: [PATCH 07/15] Update fields_to_be_renamed.py --- erpnext/patches/v4_0/fields_to_be_renamed.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/patches/v4_0/fields_to_be_renamed.py b/erpnext/patches/v4_0/fields_to_be_renamed.py index 69776a21db..cc17697132 100644 --- a/erpnext/patches/v4_0/fields_to_be_renamed.py +++ b/erpnext/patches/v4_0/fields_to_be_renamed.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import frappe -from frappe.model.utils import rename_field +from frappe.model.utils.rename_field import rename_field from frappe.modules import scrub, get_doctype_module rename_map = { From 906c2babaaa7e751c88ce32bfd16cd0f4a8eb084 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 17 Jul 2015 15:11:24 +0530 Subject: [PATCH 08/15] [ui] Show ERPNext icon instead of ERPNext in navbar --- erpnext/public/css/erpnext.css | 5 ++++ erpnext/public/images/erp-icon.svg | 46 ++++++++++++++++++++++++++++++ erpnext/public/js/conf.js | 2 +- erpnext/public/less/erpnext.less | 5 ++++ 4 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 erpnext/public/images/erp-icon.svg diff --git a/erpnext/public/css/erpnext.css b/erpnext/public/css/erpnext.css index b5f2a2d1e2..3c286b162e 100644 --- a/erpnext/public/css/erpnext.css +++ b/erpnext/public/css/erpnext.css @@ -96,3 +96,8 @@ .pos .tax-table { margin-bottom: 10px; } +.erpnext-icon { + width: 24px; + margin-right: 0px; + margin-top: -3px; +} diff --git a/erpnext/public/images/erp-icon.svg b/erpnext/public/images/erp-icon.svg new file mode 100644 index 0000000000..b4e2a24b4e --- /dev/null +++ b/erpnext/public/images/erp-icon.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/erpnext/public/js/conf.js b/erpnext/public/js/conf.js index 626401929a..af06b33f58 100644 --- a/erpnext/public/js/conf.js +++ b/erpnext/public/js/conf.js @@ -11,7 +11,7 @@ $(document).bind('toolbar_setup', function() { href="https://discuss.erpnext.com">Feedback

' - $('.navbar-home').html('ERPNext'); + $('.navbar-home').html(''); $('[data-link="docs"]').attr("href", "https://manual.erpnext.com") }); diff --git a/erpnext/public/less/erpnext.less b/erpnext/public/less/erpnext.less index 830902ad15..3f839ee305 100644 --- a/erpnext/public/less/erpnext.less +++ b/erpnext/public/less/erpnext.less @@ -120,3 +120,8 @@ margin-bottom: 10px; } +.erpnext-icon { + width: 24px; + margin-right: 0px; + margin-top: -3px; +} From 285135da8e97189d110f2fbbbfca396ec08d94f3 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 17 Jul 2015 15:13:32 +0530 Subject: [PATCH 09/15] [ui] Remove 'Stopped' alert banner in Sales Order --- erpnext/selling/doctype/sales_order/sales_order.js | 1 - 1 file changed, 1 deletion(-) diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js index 7f0b3861e7..fcdae4d0b4 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.js +++ b/erpnext/selling/doctype/sales_order/sales_order.js @@ -46,7 +46,6 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( } else { // un-stop - cur_frm.dashboard.set_headline_alert(__("Stopped"), "alert-danger", "icon-stop"); cur_frm.add_custom_button(__('Unstop'), cur_frm.cscript['Unstop Sales Order'], "icon-check"); } } From a5e9c713973901d3493c802cc3aac6b9990fa716 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 17 Jul 2015 15:55:10 +0530 Subject: [PATCH 10/15] [ui] changed Learn icon --- erpnext/config/desktop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py index b0c73457d9..498d100a12 100644 --- a/erpnext/config/desktop.py +++ b/erpnext/config/desktop.py @@ -64,7 +64,7 @@ def get_data(): "type": "module" }, "Learn": { - "color": "#7272FF", + "color": "#FCB868", "force_show": True, "icon": "icon-facetime-video", "type": "module", From 1be94efcfaeff64ade3579f15e59b46ef01e440a Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 17 Jul 2015 17:25:52 +0530 Subject: [PATCH 11/15] [fix] Fetch debit/credit from reference journal entry --- erpnext/accounts/doctype/journal_entry/journal_entry.js | 5 +++-- erpnext/accounts/doctype/journal_entry/journal_entry.py | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js index 3ea92e1b19..1ecde6493e 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.js +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js @@ -109,7 +109,7 @@ erpnext.accounts.JournalEntry = frappe.ui.form.Controller.extend({ against_jv: function(doc, cdt, cdn) { var d = frappe.get_doc(cdt, cdn); - if (d.against_jv && d.party && !flt(d.credit) && !flt(d.debit)) { + if (d.against_jv && !flt(d.credit) && !flt(d.debit)) { this.get_outstanding('Journal Entry', d.against_jv, d); } }, @@ -119,7 +119,8 @@ erpnext.accounts.JournalEntry = frappe.ui.form.Controller.extend({ var args = { "doctype": doctype, "docname": docname, - "party": child.party + "party": child.party, + "account": child.account } return this.frm.call({ diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 23d4c7380e..dc620edcf0 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -545,12 +545,14 @@ def get_against_jv(doctype, txt, searchfield, start, page_len, filters): @frappe.whitelist() def get_outstanding(args): args = eval(args) - if args.get("doctype") == "Journal Entry" and args.get("party"): + if args.get("doctype") == "Journal Entry": + condition = " and party=%(party)s" if args.get("party") else "" + against_jv_amount = frappe.db.sql(""" select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0)) - from `tabJournal Entry Account` where parent=%s and party=%s + from `tabJournal Entry Account` where parent=%(docname)s and account=%(account)s {0} and ifnull(against_invoice, '')='' and ifnull(against_voucher, '')='' - and ifnull(against_jv, '')=''""", (args['docname'], args['party'])) + and ifnull(against_jv, '')=''""".format(condition), args) against_jv_amount = flt(against_jv_amount[0][0]) if against_jv_amount else 0 if against_jv_amount > 0: From 823e88d5bd893c87ac029bba09f1ff7358d92915 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 20 Jul 2015 10:56:39 +0530 Subject: [PATCH 12/15] [minor] close button for task and item not found error fix --- erpnext/projects/doctype/task/task.js | 69 ++++++++++++------- .../stock_ledger_entry/stock_ledger_entry.py | 9 ++- 2 files changed, 50 insertions(+), 28 deletions(-) diff --git a/erpnext/projects/doctype/task/task.js b/erpnext/projects/doctype/task/task.js index d9a611eed6..4e870fa59b 100644 --- a/erpnext/projects/doctype/task/task.js +++ b/erpnext/projects/doctype/task/task.js @@ -5,42 +5,59 @@ frappe.provide("erpnext.projects"); cur_frm.add_fetch("project", "company", "company"); -erpnext.projects.Task = frappe.ui.form.Controller.extend({ - setup: function() { - this.frm.fields_dict.project.get_query = function() { +frappe.ui.form.on("Task", { + refresh: function(frm) { + var doc = frm.doc; + if(!doc.__islocal) { + if(frappe.model.can_read("Time Log")) { + frm.add_custom_button(__("Time Logs"), function() { + frappe.route_options = {"project": doc.project, "task": doc.name} + frappe.set_route("List", "Time Log"); + }, "icon-list", true); + } + if(frappe.model.can_read("Expense Claim")) { + frm.add_custom_button(__("Expense Claims"), function() { + frappe.route_options = {"project": doc.project, "task": doc.name} + frappe.set_route("List", "Expense Claim"); + }, "icon-list", true); + } + + if(frm.perm[0].write) { + if(frm.doc.status==="Open") { + frm.add_custom_button("Close", function() { + frm.set_value("status", "Closed"); + frm.save(); + }); + } else { + frm.add_custom_button("Reopen", function() { + frm.set_value("status", "Open"); + frm.save(); + }); + } + } + } + }, + + setup: function(frm) { + frm.fields_dict.project.get_query = function() { return { query: "erpnext.projects.doctype.task.task.get_project" } }; }, - project: function() { - if(this.frm.doc.project) { - return get_server_fields('get_project_details', '','', this.frm.doc, this.frm.doc.doctype, - this.frm.doc.name, 1); + project: function(frm) { + if(frm.doc.project) { + return get_server_fields('get_project_details', '','', frm.doc, frm.doc.doctype, + frm.doc.name, 1); } }, - validate: function() { - this.frm.doc.project && frappe.model.remove_from_locals("Project", - this.frm.doc.project); + validate: function(frm) { + frm.doc.project && frappe.model.remove_from_locals("Project", + frm.doc.project); }, - - refresh: function(doc) { - if(!doc.__islocal) { - cur_frm.add_custom_button(__("Time Logs"), function() { - frappe.route_options = {"project": doc.project, "task": doc.name} - frappe.set_route("List", "Time Log"); - }, "icon-list", true); - cur_frm.add_custom_button(__("Expense Claims"), function() { - frappe.route_options = {"project": doc.project, "task": doc.name} - frappe.set_route("List", "Expense Claim"); - }, "icon-list", true); - } - } + }); cur_frm.add_fetch('task', 'subject', 'subject'); - -cur_frm.cscript = new erpnext.projects.Task({frm: cur_frm}); - diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py index ff027d7d0b..010f5ead2a 100644 --- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py @@ -57,7 +57,12 @@ class StockLedgerEntry(Document): def validate_item(self): item_det = frappe.db.sql("""select name, has_batch_no, docstatus, is_stock_item, has_variants, stock_uom - from tabItem where name=%s""", self.item_code, as_dict=True)[0] + from tabItem where name=%s""", self.item_code, as_dict=True) + + if not item_det: + frappe.throw(_("Item {0} not found").format(self.item_code)) + + item_det = item_det[0] if item_det.is_stock_item != 'Yes': frappe.throw(_("Item {0} must be a stock Item").format(self.item_code)) @@ -97,7 +102,7 @@ class StockLedgerEntry(Document): def scrub_posting_time(self): if not self.posting_time or self.posting_time == '00:0': self.posting_time = '00:00' - + def validate_batch(self): if self.batch_no and self.voucher_type != "Stock Entry": expiry_date = frappe.db.get_value("Batch", self.batch_no, "expiry_date") From c9e4fbeda00428822a6042d51813e7c5b01131a2 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 20 Jul 2015 12:57:48 +0530 Subject: [PATCH 13/15] [fix][report] Show only active employee in Employee leave balance report --- .../employee_leave_balance/employee_leave_balance.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py index 1a70f45223..d6f865ba9f 100644 --- a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +++ b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py @@ -9,8 +9,13 @@ from frappe.desk.reportview import execute as runreport def execute(filters=None): if not filters: filters = {} - employee_filters = filters.get("company") and \ - [["Employee", "company", "=", filters.get("company")]] or None + employee_filters = { + "status": "Active" + } + + if filters.get("company"): + filters["company"] = filters.company + employees = runreport(doctype="Employee", fields=["name", "employee_name", "department"], filters=employee_filters, limit_page_length=None) From 83694fd18003e59d238c28aa4088fd5dace67484 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 20 Jul 2015 13:26:22 +0530 Subject: [PATCH 14/15] [minor] removed is_group from search fields of Account --- erpnext/accounts/doctype/account/account.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/account/account.json b/erpnext/accounts/doctype/account/account.json index 8146c63638..e60d9abe15 100644 --- a/erpnext/accounts/doctype/account/account.json +++ b/erpnext/accounts/doctype/account/account.json @@ -173,7 +173,7 @@ "icon": "icon-money", "idx": 1, "in_create": 0, - "modified": "2015-06-14 20:57:55.471334", + "modified": "2015-07-20 03:54:14.297995", "modified_by": "Administrator", "module": "Accounts", "name": "Account", @@ -257,5 +257,5 @@ "write": 1 } ], - "search_fields": "is_group" + "search_fields": "" } \ No newline at end of file From 63d345c6ab6c648f16c7d1d6cd4d8e45adaf9320 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 20 Jul 2015 15:52:10 +0600 Subject: [PATCH 15/15] bumped to version 5.2.1 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index 67cff5dcba..9049b135b4 100644 --- a/erpnext/__version__.py +++ b/erpnext/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = '5.2.0' +__version__ = '5.2.1' diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 3418b9f7e5..a87c8f092e 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -5,7 +5,7 @@ app_publisher = "Frappe 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 = "5.2.0" +app_version = "5.2.1" error_report_email = "support@erpnext.com" diff --git a/setup.py b/setup.py index 610b284272..9cb39e1fe5 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = "5.2.0" +version = "5.2.1" with open("requirements.txt", "r") as f: install_requires = f.readlines()