From 63f87441c84976825cd1a86fa577570f3a33a570 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 19 Jul 2018 13:13:15 +0530 Subject: [PATCH 1/5] Update hooks.py --- erpnext/hooks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 3a276d5b84..999ece99fd 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -12,7 +12,7 @@ app_license = "GNU General Public License (v3)" source_link = "https://github.com/frappe/erpnext" develop_version = '11.x.x-develop' -staging_version = '11.x.x' +staging_version = '11.0.0-beta' error_report_email = "support@erpnext.com" From b8a59547f03e4f8565ccbe2b799b53a555993b6c Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Mon, 30 Jul 2018 10:58:19 +0530 Subject: [PATCH 2/5] modified date for reload_doc (#15027) --- erpnext/assets/doctype/asset/asset.json | 2 +- erpnext/buying/doctype/purchase_order/purchase_order.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/assets/doctype/asset/asset.json b/erpnext/assets/doctype/asset/asset.json index 6b6518dba0..c430b5638f 100644 --- a/erpnext/assets/doctype/asset/asset.json +++ b/erpnext/assets/doctype/asset/asset.json @@ -1879,7 +1879,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2018-07-17 06:30:25.506194", + "modified": "2018-07-27 06:30:25.506194", "modified_by": "Administrator", "module": "Assets", "name": "Asset", diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index 828688570a..16e7749df0 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -3671,7 +3671,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2018-07-18 07:49:53.131408", + "modified": "2018-07-27 07:49:53.131408", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order", From 27e7c15c16fd8bb362c41c1e66dec749a628b257 Mon Sep 17 00:00:00 2001 From: alsum Date: Wed, 24 Oct 2018 13:23:34 +0200 Subject: [PATCH 3/5] trigger set_current_asset_value when make asset_value_adjustment from asset form --- .../doctype/asset_value_adjustment/asset_value_adjustment.js | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.js b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.js index 29909f8bb9..6b85a2b652 100644 --- a/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.js +++ b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.js @@ -3,6 +3,7 @@ frappe.ui.form.on('Asset Value Adjustment', { setup: function(frm) { + frm.trigger("set_current_asset_value"); frm.add_fetch('company', 'cost_center', 'cost_center'); frm.set_query('cost_center', function() { return { From 852bd76a58a3d5a03e9c15c05afca1d44262689f Mon Sep 17 00:00:00 2001 From: alsum Date: Thu, 8 Nov 2018 11:12:33 +0200 Subject: [PATCH 4/5] add set_current_asset_value to onload func --- .../doctype/asset_value_adjustment/asset_value_adjustment.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.js b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.js index 6b85a2b652..ae4ca3359b 100644 --- a/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.js +++ b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.js @@ -3,7 +3,6 @@ frappe.ui.form.on('Asset Value Adjustment', { setup: function(frm) { - frm.trigger("set_current_asset_value"); frm.add_fetch('company', 'cost_center', 'cost_center'); frm.set_query('cost_center', function() { return { @@ -14,7 +13,9 @@ frappe.ui.form.on('Asset Value Adjustment', { } }); }, - + onload: function(frm) { + frm.trigger("set_current_asset_value"); + }, asset: function(frm) { frm.trigger("set_current_asset_value"); }, From ee190e34c2dc372bd0442e5af46a6729fc8924ad Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 13 Nov 2018 12:41:36 +0530 Subject: [PATCH 5/5] Update asset_value_adjustment.js --- .../doctype/asset_value_adjustment/asset_value_adjustment.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.js b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.js index ae4ca3359b..a6e6974c48 100644 --- a/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.js +++ b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.js @@ -14,7 +14,9 @@ frappe.ui.form.on('Asset Value Adjustment', { }); }, onload: function(frm) { - frm.trigger("set_current_asset_value"); + if(frm.is_new() && frm.doc.asset) { + frm.trigger("set_current_asset_value"); + } }, asset: function(frm) { frm.trigger("set_current_asset_value");