From 16c7aee8f8fd1a0dc3acad904ef8f7f3fe18effa Mon Sep 17 00:00:00 2001 From: Georgiy Bukharov Date: Mon, 20 May 2024 16:27:24 +0400 Subject: [PATCH 1/2] fix hooks.py according to https://github.com/frappe/agriculture/issues/30 --- agriculture/hooks.py | 1 + 1 file changed, 1 insertion(+) diff --git a/agriculture/hooks.py b/agriculture/hooks.py index ccc2c77..61be43d 100644 --- a/agriculture/hooks.py +++ b/agriculture/hooks.py @@ -70,6 +70,7 @@ # before_install = "agriculture.install.before_install" # after_install = "agriculture.install.after_install" +after_install = "agriculture.agriculture.setup.setup_agriculture" # Uninstallation # ------------ From 5b16f2b6b20ea12c985cf9a3461c03af8e5ef168 Mon Sep 17 00:00:00 2001 From: Georgiy Bukharov Date: Tue, 8 Apr 2025 13:01:05 +0400 Subject: [PATCH 2/2] Update crop.js https://github.com/frappe/agriculture/pull/32 --- agriculture/agriculture/doctype/crop/crop.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/agriculture/agriculture/doctype/crop/crop.js b/agriculture/agriculture/doctype/crop/crop.js index 5508246..6907534 100644 --- a/agriculture/agriculture/doctype/crop/crop.js +++ b/agriculture/agriculture/doctype/crop/crop.js @@ -1,7 +1,7 @@ // Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and contributors // For license information, please see license.txt -frappe.provide("erpnext.crop"); +frappe.provide("agriculture.crop"); frappe.ui.form.on('Crop', { refresh: (frm) => { @@ -11,23 +11,23 @@ frappe.ui.form.on('Crop', { frappe.ui.form.on("BOM Item", { item_code: (frm, cdt, cdn) => { - erpnext.crop.update_item_rate_uom(frm, cdt, cdn); + agriculture.crop.update_item_rate_uom(frm, cdt, cdn); }, qty: (frm, cdt, cdn) => { - erpnext.crop.update_item_qty_amount(frm, cdt, cdn); + agriculture.crop.update_item_qty_amount(frm, cdt, cdn); }, rate: (frm, cdt, cdn) => { - erpnext.crop.update_item_qty_amount(frm, cdt, cdn); + agriculture.crop.update_item_qty_amount(frm, cdt, cdn); } }); -erpnext.crop.update_item_rate_uom = function(frm, cdt, cdn) { +agriculture.crop.update_item_rate_uom = function(frm, cdt, cdn) { let material_list = ['materials_required', 'produce', 'byproducts']; material_list.forEach((material) => { frm.doc[material].forEach((item, index) => { if (item.name == cdn && item.item_code){ frappe.call({ - method:'erpnext.agriculture.doctype.crop.crop.get_item_details', + method:'agriculture.agriculture.doctype.crop.crop.get_item_details', args: { item_code: item.item_code }, @@ -41,7 +41,7 @@ erpnext.crop.update_item_rate_uom = function(frm, cdt, cdn) { }); }; -erpnext.crop.update_item_qty_amount = function(frm, cdt, cdn) { +agriculture.crop.update_item_qty_amount = function(frm, cdt, cdn) { let material_list = ['materials_required', 'produce', 'byproducts']; material_list.forEach((material) => { frm.doc[material].forEach((item, index) => {