Merge pull request #739 from 8848digital/removed_project_from_budget_…

…module feat: removed project dependency from budget module
8848digital · Nov 27, 2024 · 04270b8 · 04270b8
2 parents 28621e5 + 7677014
commit 04270b8
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 1,503 deletions.
diff --git a/erpnext/accounts/doctype/budget/budget.json b/erpnext/accounts/doctype/budget/budget.json
@@ -38,7 +38,7 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Budget Against",
-   "options": "\nCost Center\nProject",
+   "options": "\nCost Center",
    "reqd": 1
   },
   {

diff --git a/erpnext/budget/doctype/budget_amendment/budget_amendment.js b/erpnext/budget/doctype/budget_amendment/budget_amendment.js
@@ -25,14 +25,6 @@ frappe.ui.form.on("Budget Amendment", {
         });
     },
     onload: function(frm) {
-        frm.set_query("project", function() {
-            return {};
-        });
-
-        if (!frm.doc.posting_date) {
-            frm.set_value("posting_date", frappe.datetime.get_today());
-        }
-
         frm.savecancel = function(btn, callback, on_error){return frm._cancel(btn, callback, on_error, false);}
     },
 

diff --git a/erpnext/budget/doctype/budget_amendment/budget_amendment.json b/erpnext/budget/doctype/budget_amendment/budget_amendment.json
@@ -6,8 +6,6 @@
  "doctype": "DocType",
  "engine": "InnoDB",
  "field_order": [
-  "project",
-  "project_name",
   "get_wbs",
   "column_break_vewb",
   "company",
@@ -20,17 +18,6 @@
   "amended_from"
  ],
  "fields": [
-  {
-   "fieldname": "project",
-   "fieldtype": "Link",
-   "label": "Project",
-   "options": "Project"
-  },
-  {
-   "fieldname": "project_name",
-   "fieldtype": "Data",
-   "label": "Project Name"
-  },
   {
    "fieldname": "get_wbs",
    "fieldtype": "Button",
@@ -46,8 +33,9 @@
    "label": "Company"
   },
   {
+   "default": "Today",
    "fieldname": "posting_date",
-   "fieldtype": "Data",
+   "fieldtype": "Date",
    "label": "Posting Date"
   },
   {
@@ -93,7 +81,7 @@
    "link_fieldname": "voucher_no"
   }
  ],
- "modified": "2024-11-21 16:01:57.968919",
+ "modified": "2024-11-26 22:29:27.031835",
  "modified_by": "Administrator",
  "module": "Budget",
  "name": "Budget Amendment",

diff --git a/erpnext/budget/doctype/budget_amendment/budget_amendment.py b/erpnext/budget/doctype/budget_amendment/budget_amendment.py
@@ -18,9 +18,7 @@ class BudgetAmendment(Document):
         amended_from: DF.Link | None
         budget_amendment_items: DF.Table[BudgetAmendmentItems]
         company: DF.Data | None
-        posting_date: DF.Data | None
-        project: DF.Link | None
-        project_name: DF.Data | None
+        posting_date: DF.Date | None
         total_decrement_budget: DF.Data | None
         total_increment_budget: DF.Data | None
     # end: auto-generated types
@@ -116,7 +114,8 @@ def update_original_budget(self,event):
 def create_budget_entry(self,row,event,company):
     if row.get("wbs_id"):
         bgt_ent = frappe.new_doc("Budget Entry")
-        bgt_ent.project = self.project
+        if "projects" in frappe.get_installed_apps():
+            bgt_ent.project = self.project
         bgt_ent.wbs = row.get("wbs_id")
         bgt_ent.wbs_name = row.get("wbs_name")
         bgt_ent.wbs_level = row.get("wbs_level")

diff --git a/erpnext/budget/doctype/budget_entry/budget_entry.json b/erpnext/budget/doctype/budget_entry/budget_entry.json
@@ -6,7 +6,6 @@
  "doctype": "DocType",
  "engine": "InnoDB",
  "field_order": [
-  "project",
   "wbs",
   "posting_date",
   "column_break_ccnn",
@@ -30,21 +29,16 @@
   "amended_from"
  ],
  "fields": [
-  {
-   "fieldname": "project",
-   "fieldtype": "Link",
-   "label": "Project",
-   "options": "Project"
-  },
   {
    "fieldname": "wbs",
    "fieldtype": "Link",
    "label": "WBS",
    "options": "Work Breakdown Structure"
   },
   {
+   "default": "Today",
    "fieldname": "posting_date",
-   "fieldtype": "Data",
+   "fieldtype": "Date",
    "label": "Posting Date"
   },
   {
@@ -154,7 +148,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-11-21 16:06:41.717902",
+ "modified": "2024-11-26 23:06:27.158091",
  "modified_by": "Administrator",
  "module": "Budget",
  "name": "Budget Entry",

diff --git a/erpnext/budget/doctype/budget_entry/budget_entry.py b/erpnext/budget/doctype/budget_entry/budget_entry.py
@@ -24,8 +24,7 @@ class BudgetEntry(Document):
 		document_date: DF.Date | None
 		overall_credit: DF.Currency
 		overall_debit: DF.Currency
-		posting_date: DF.Data | None
-		project: DF.Link | None
+		posting_date: DF.Date | None
 		total: DF.Int
 		voucher_no: DF.DynamicLink | None
 		voucher_submit_date: DF.Datetime | None

diff --git a/erpnext/budget/doctype/budget_transfer/budget_transfer.js b/erpnext/budget/doctype/budget_transfer/budget_transfer.js
@@ -1,21 +1,7 @@
 // Budget Transfer
 frappe.ui.form.on("Budget Transfer", {
     onload: function(frm) {
-        // Set query for 'project' field without any specific filter
-        frm.set_query("project", function() {
-            return {}; // No filters applied
-        });
-
-        // Automatically set the document_date and posting_date to today's date
-        // if (!frm.doc.document_date) {
-        //     frm.set_value("document_date", frappe.datetime.get_today());
-        // }
-        if (!frm.doc.posting_date) {
-            frm.set_value("posting_date", frappe.datetime.get_today());
-        }
-
         frm.savecancel = function(btn, callback, on_error){ console.log("jiiri");return frm._cancel(btn, callback, on_error, false);}
-
     },
 
     from_wbs: function(frm) {
@@ -62,21 +48,4 @@ frappe.ui.form.on("Budget Transfer", {
             frm.set_value("to_wbs_available_budget", null);
         }
     },
-
-    from_project: function(frm) {
-        // Check if 'from_project' field has a value
-        if (frm.doc.from_project) {
-            // Fetch 'project_name' and 'company' from the selected Project
-            frappe.db.get_value("Project", frm.doc.from_project, ["project_name", "company"], (r) => {
-                if (r) {
-                    frm.set_value("from_project_name", r.project_name);
-                    frm.set_value("company", r.company);
-                }
-            });
-        } else {
-            // Clear the fields if 'from_project' is not set
-            frm.set_value("from_project_name", null);
-            frm.set_value("company", null);
-        }
-    }
 });
diff --git a/erpnext/budget/doctype/budget_transfer/budget_transfer.json b/erpnext/budget/doctype/budget_transfer/budget_transfer.json
@@ -6,8 +6,6 @@
  "doctype": "DocType",
  "engine": "InnoDB",
  "field_order": [
-  "from_project",
-  "from_project_name",
   "company",
   "column_break_pvng",
   "posting_date",
@@ -35,17 +33,7 @@
  ],
  "fields": [
   {
-   "fieldname": "from_project",
-   "fieldtype": "Link",
-   "label": "From Project",
-   "options": "Project"
-  },
-  {
-   "fieldname": "from_project_name",
-   "fieldtype": "Data",
-   "label": "From Project Name"
-  },
-  {
+   "fetch_from": "from_project.company",
    "fieldname": "company",
    "fieldtype": "Link",
    "label": "Company",
@@ -56,6 +44,7 @@
    "fieldtype": "Column Break"
   },
   {
+   "default": "Today",
    "fieldname": "posting_date",
    "fieldtype": "Date",
    "label": "Posting Date"
@@ -187,7 +176,7 @@
    "link_fieldname": "voucher_no"
   }
  ],
- "modified": "2024-11-21 16:02:27.865100",
+ "modified": "2024-11-26 23:24:18.648805",
  "modified_by": "Administrator",
  "module": "Budget",
  "name": "Budget Transfer",

diff --git a/erpnext/budget/doctype/budget_transfer/budget_transfer.py b/erpnext/budget/doctype/budget_transfer/budget_transfer.py
@@ -25,8 +25,6 @@ class BudgetTransfer(Document):
 		fr_av_bgt: DF.Currency
 		fr_oa_bgt: DF.Currency
 		fr_og_bgt: DF.Currency
-		from_project: DF.Link | None
-		from_project_name: DF.Data | None
 		from_wbs: DF.Link | None
 		from_wbs_level: DF.Data | None
 		from_wbs_name: DF.Data | None
@@ -59,7 +57,8 @@ def before_cancel(self):
 
 def create_debit_wbs_budget_entry(self):
 	budget_entry = frappe.new_doc("Budget Entry")
-	budget_entry.project = self.from_project
+	if "projects" in frappe.get_installed_apps():
+		budget_entry.project = self.from_project
 	budget_entry.company = self.company
 	budget_entry.wbs = self.from_wbs
 	budget_entry.wbs_name = self.from_wbs_name
@@ -75,7 +74,8 @@ def create_debit_wbs_budget_entry(self):
 
 def create_credit_wbs_budget_entry(self):
 	budget_entry = frappe.new_doc("Budget Entry")
-	budget_entry.project = self.from_project
+	if "projects" in frappe.get_installed_apps():
+		budget_entry.project = self.from_project
 	budget_entry.company = self.company
 	budget_entry.wbs = self.to_wbs
 	budget_entry.wbs_name = self.to_wbs_name
@@ -110,7 +110,8 @@ def update_credit_wbs(budget_entry):
 
 def create_cancelled_debit_wbs_budget_entry(self):
 	budget_entry = frappe.new_doc("Budget Entry")
-	budget_entry.project = self.from_project
+	if "projects" in frappe.get_installed_apps():
+		budget_entry.project = self.from_project
 	budget_entry.company = self.company
 	budget_entry.wbs = self.from_wbs
 	budget_entry.wbs_name = self.from_wbs_name
@@ -125,7 +126,8 @@ def create_cancelled_debit_wbs_budget_entry(self):
 
 def	create_cancelled_credit_wbs_budget_entry(self):
 	budget_entry = frappe.new_doc("Budget Entry")
-	budget_entry.project = self.from_project
+	if "projects" in frappe.get_installed_apps():
+		budget_entry.project = self.from_project
 	budget_entry.company = self.company
 	budget_entry.wbs = self.to_wbs
 	budget_entry.wbs_name = self.to_wbs_name

diff --git a/erpnext/budget/doctype/wbs_budget/wbs_budget.json b/erpnext/budget/doctype/wbs_budget/wbs_budget.json
@@ -11,7 +11,6 @@
   "budget_against",
   "company",
   "cost_center",
-  "project",
   "wbs",
   "available_budget",
   "get_gl_accounts",
@@ -46,7 +45,7 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Budget Against",
-   "options": "\nCost Center\nProject"
+   "options": "\nCost Center"
   },
   {
    "fieldname": "company",
@@ -65,14 +64,6 @@
    "label": "Cost Center",
    "options": "Cost Center"
   },
-  {
-   "depends_on": "eval:doc.budget_against == 'Project'",
-   "fieldname": "project",
-   "fieldtype": "Link",
-   "in_standard_filter": 1,
-   "label": "Project",
-   "options": "Project"
-  },
   {
    "fieldname": "wbs",
    "fieldtype": "Link",

diff --git a/erpnext/budget/doctype/work_breakdown_structure/work_breakdown_structure.js b/erpnext/budget/doctype/work_breakdown_structure/work_breakdown_structure.js
@@ -13,12 +13,6 @@ frappe.ui.form.on("Work Breakdown Structure", {
 
     },
     onload: function(frm) {
-        frm.set_query("project", function() {
-            return {
-                filters: { "is_wbs": 1 }
-            };
-        });
-
         frm.set_query("parent_work_breakdown_structure", function() {
             return {
                 filters: { 
@@ -29,22 +23,6 @@ frappe.ui.form.on("Work Breakdown Structure", {
         });
     },
 
-    project: function(frm) {
-        if (frm.doc.project) {
-            frappe.db.get_value("Project", frm.doc.project, ["project_type", "project_name", "company"], (r) => {
-                if (r) {
-                    frm.set_value("project_type", r.project_type);
-                    frm.set_value("project_name", r.project_name);
-                    frm.set_value("company", r.company);
-                }
-            });
-        } else {
-            frm.set_value("project_type", null);
-            frm.set_value("project_name", null);
-            frm.set_value("company", null);
-        }
-    },
-
     parent_work_breakdown_structure: function(frm) {
         set_wbs_level(frm);
     },
@@ -77,8 +55,8 @@ frappe.ui.form.on("Work Breakdown Structure", {
             dialog.fields_dict.material_request.$input.on('click', function() {
                 dialog.hide();
                 frappe.new_doc('Material Request', {
-                    custom_project: frm.doc.project,
-                    custom_project_name: frm.doc.project_name,
+                    // custom_project: frm.doc.project,
+                    // custom_project_name: frm.doc.project_name,
                     custom_work_breakdown_structure: frm.doc.name,
                     custom_wbs_name: frm.doc.wbs_name
                 });
@@ -87,8 +65,8 @@ frappe.ui.form.on("Work Breakdown Structure", {
             dialog.fields_dict.purchase_order.$input.on('click', function() {
                 dialog.hide();
                 frappe.new_doc('Purchase Order', {
-                    custom_project: frm.doc.project,
-                    custom_project_name: frm.doc.project_name,
+                    // custom_project: frm.doc.project,
+                    // custom_project_name: frm.doc.project_name,
                     custom_work_breakdown_structure: frm.doc.name,
                     custom_wbs_name: frm.doc.wbs_name
                 });
@@ -97,8 +75,8 @@ frappe.ui.form.on("Work Breakdown Structure", {
             dialog.fields_dict.purchase_invoice.$input.on('click', function() {
                 dialog.hide();
                 frappe.new_doc('Purchase Invoice', {
-                    custom_project: frm.doc.project,
-                    custom_project_name: frm.doc.project_name,
+                    // custom_project: frm.doc.project,
+                    // custom_project_name: frm.doc.project_name,
                     custom_work_breakdown_structure: frm.doc.name,
                     custom_wbs_name: frm.doc.wbs_name
                 });