feat(vsd_fleet_ms): enforce fleet company defaults and strengthen tri…

vsd_fleet_ms/hooks.py

@@ -64,7 +64,12 @@
 # ------------
 
 # before_install = "vsd_fleet_ms.install.before_install"
-# after_install = "vsd_fleet_ms.install.after_install"
+after_install = [
+	"vsd_fleet_ms.utils.service_job_card_tyre_fields.ensure_service_job_card_tyre_fields",
+]
+after_migrate = [
+	"vsd_fleet_ms.utils.service_job_card_tyre_fields.ensure_service_job_card_tyre_fields",
+]
 
 # Uninstallation
 # ------------
@@ -110,6 +115,51 @@
 #	}
 # }
 doc_events = {
+	"Trips": {
+		"validate": "vsd_fleet_ms.utils.fleet_company_fields.set_company_from_transport_settings",
+	},
+	"Fuel Requests": {
+		"validate": "vsd_fleet_ms.utils.fleet_company_fields.set_company_from_transport_settings",
+	},
+	"Cargo Registration": {
+		"validate": "vsd_fleet_ms.utils.fleet_company_fields.set_company_from_transport_settings",
+	},
+	"Transportation Order": {
+		"validate": "vsd_fleet_ms.utils.fleet_company_fields.set_company_from_transport_settings",
+	},
+	"Requested Payment": {
+		"validate": "vsd_fleet_ms.utils.fleet_company_fields.set_company_from_transport_settings",
+	},
+	"Sales Invoice": {
+		"validate": "vsd_fleet_ms.utils.fleet_company_fields.set_company_from_transport_settings",
+	},
+	"Sales Order": {
+		"validate": "vsd_fleet_ms.utils.fleet_company_fields.set_company_from_transport_settings",
+	},
+	"Purchase Invoice": {
+		"validate": "vsd_fleet_ms.utils.fleet_company_fields.set_company_from_transport_settings",
+	},
+	"Purchase Order": {
+		"validate": "vsd_fleet_ms.utils.fleet_company_fields.set_company_from_transport_settings",
+	},
+	"Purchase Receipt": {
+		"validate": "vsd_fleet_ms.utils.fleet_company_fields.set_company_from_transport_settings",
+	},
+	"Delivery Note": {
+		"validate": "vsd_fleet_ms.utils.fleet_company_fields.set_company_from_transport_settings",
+	},
+	"Stock Entry": {
+		"validate": "vsd_fleet_ms.utils.fleet_company_fields.set_company_from_transport_settings",
+	},
+	"Journal Entry": {
+		"validate": "vsd_fleet_ms.utils.fleet_company_fields.set_company_from_transport_settings",
+	},
+	"Payment Entry": {
+		"validate": "vsd_fleet_ms.utils.fleet_company_fields.set_company_from_transport_settings",
+	},
+	"Quotation": {
+		"validate": "vsd_fleet_ms.utils.fleet_company_fields.set_company_from_transport_settings",
+	},
 	"Service Job Card": {
 		"on_submit": "vsd_fleet_ms.utils.tyre_service_integration.create_tyre_movement_from_service_job_card"
 	}

vsd_fleet_ms/utils/fleet_company_fields.py

@@ -0,0 +1,11 @@
+import frappe
+
+
+def get_transport_company(fallback_company=None):
+    transport_company = frappe.db.get_single_value("Transport Settings", "company")
+    default_company = frappe.defaults.get_global_default("company")
+    return transport_company or default_company or fallback_company
+
+
+def set_company_from_transport_settings(doc, method=None):
+    doc.company = get_transport_company(doc.get("company"))

vsd_fleet_ms/utils/service_job_card_tyre_fields.py

@@ -0,0 +1,91 @@
+import frappe
+from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
+
+
+def ensure_service_job_card_tyre_fields():
+    """Create Fleet-specific tyre fields on Service Job Card.
+
+    Safe to run repeatedly on migrate/install and on sites where either app is absent.
+    """
+    if "servicems" not in frappe.get_installed_apps():
+        return
+
+    if not frappe.db.exists("DocType", "Service Job Card"):
+        return
+
+    required_doctypes = ["Tyre Master", "Tyre Position", "Trailers"]
+    if not all(frappe.db.exists("DocType", dt) for dt in required_doctypes):
+        return
+
+    create_custom_fields(
+        {
+            "Service Job Card": [
+                {
+                    "fieldname": "custom_trailer",
+                    "label": "Trailer",
+                    "fieldtype": "Link",
+                    "options": "Trailers",
+                    "insert_after": "service_item_name",
+                },
+                {
+                    "fieldname": "tyre_management_section",
+                    "label": "Tyre Management",
+                    "fieldtype": "Section Break",
+                    "insert_after": "odometer_reading",
+                },
+                {
+                    "fieldname": "tyre_serial",
+                    "label": "Tyre Serial",
+                    "fieldtype": "Link",
+                    "options": "Tyre Master",
+                    "insert_after": "tyre_management_section",
+                },
+                {
+                    "fieldname": "tyre_movement_type",
+                    "label": "Tyre Movement Type",
+                    "fieldtype": "Select",
+                    "options": "Installation\nRemoval\nPositional Change\nVehicle Transfer\nSend for Repair\nReturn from Repair\nScrap",
+                    "default": "Installation",
+                    "insert_after": "tyre_serial",
+                },
+                {
+                    "fieldname": "tyre_install_on",
+                    "label": "Movement On",
+                    "fieldtype": "Select",
+                    "options": "Truck\nTrailers",
+                    "depends_on": "eval:doc.tyre_movement_type",
+                    "insert_after": "tyre_movement_type",
+                },
+                {
+                    "fieldname": "column_break_tyre_1",
+                    "fieldtype": "Column Break",
+                    "insert_after": "tyre_install_on",
+                },
+                {
+                    "fieldname": "tyre_from_position",
+                    "label": "From Position",
+                    "fieldtype": "Link",
+                    "options": "Tyre Position",
+                    "depends_on": "eval:doc.tyre_movement_type == 'Positional Change'",
+                    "insert_after": "column_break_tyre_1",
+                },
+                {
+                    "fieldname": "tyre_to_position",
+                    "label": "To Position",
+                    "fieldtype": "Link",
+                    "options": "Tyre Position",
+                    "depends_on": "eval:doc.tyre_movement_type == 'Positional Change'",
+                    "insert_after": "tyre_from_position",
+                },
+                {
+                    "fieldname": "tyre_position",
+                    "label": "Tyre Position",
+                    "fieldtype": "Link",
+                    "options": "Tyre Position",
+                    "depends_on": "eval:doc.tyre_movement_type != 'Positional Change'",
+                    "insert_after": "tyre_to_position",
+                },
+            ]
+        },
+        update=True,
+    )

vsd_fleet_ms/vsd_fleet_ms/doctype/bulk_cargo/bulk_cargo.py

@@ -2,6 +2,7 @@
 from frappe import _
 from frappe.model.document import Document
 from frappe.utils import nowdate, flt
+from vsd_fleet_ms.utils.fleet_company_fields import get_transport_company
 
 class BulkCargo(Document):
     def validate(self):
@@ -149,7 +150,7 @@ def create_sales_invoice(name):
             "customer": bulk_cargo.customer_name,
             "currency": frappe.defaults.get_global_default("currency"),  # <-- fixed here
             "posting_date": nowdate(),
-            "company": frappe.defaults.get_global_default("company"),
+            "company": get_transport_company(),
             "items": items
         })
 

vsd_fleet_ms/vsd_fleet_ms/doctype/cargo_registration/cargo_registration.js

@@ -3,6 +3,7 @@
 
 frappe.ui.form.on('Cargo Registration', {
 	onload: function(frm){
+		setFleetCompanyDefault(frm);
 		if(!frm.doc.posting_date) {
 			frm.set_value('posting_date', frappe.datetime.nowdate());
 		}
@@ -57,6 +58,17 @@ frappe.ui.form.on('Cargo Registration', {
 	},
 });
 
+const setFleetCompanyDefault = (frm) => {
+	if (!frm.is_new()) return;
+	frappe.db.get_single_value("Transport Settings", "company").then((company) => {
+		const fallback = (frappe.boot && frappe.boot.sysdefaults && frappe.boot.sysdefaults.company) || "";
+		const target_company = company || fallback;
+		if (target_company) {
+			frm.set_value("company", target_company);
+		}
+	});
+};
+
 frappe.ui.form.on('Cargo Detail', {
 	form_render: function (frm, cdt, cdn) {
 		const container = document.querySelector('[data-fieldname="assign_manifest"]');

vsd_fleet_ms/vsd_fleet_ms/doctype/fuel_requests/fuel_requests.js

@@ -3,6 +3,7 @@
 
 frappe.ui.form.on('Fuel Requests', {
     onload: function (frm) {
+        setFleetCompanyDefault(frm);
         //Load the approve and reject buttons
         var html = '<button style="background-color: green; color: #FFF;" class="btn btn-default btn-xs" onclick="cur_frm.cscript.approve_request(\'' + frm + '\');">Approve</button> ';
         html += '<button style="background-color: red; color: #FFF;" class="btn btn-default btn-xs" onclick="cur_frm.cscript.reject_request(\'' + frm + '\');">Reject</button>';
@@ -129,6 +130,17 @@ cur_frm.cscript.approve_request = function (frm) {
     }
 };
 
+const setFleetCompanyDefault = (frm) => {
+    if (!frm.is_new()) return;
+    frappe.db.get_single_value("Transport Settings", "company").then((company) => {
+        const fallback = (frappe.boot && frappe.boot.sysdefaults && frappe.boot.sysdefaults.company) || "";
+        const target_company = company || fallback;
+        if (target_company) {
+            frm.set_value("company", target_company);
+        }
+    });
+};
+
 //For reject button
 cur_frm.cscript.reject_request = function (frm) {
     //cur_frm.cscript.populate_child(cur_frm.doc.reference_doctype, cur_frm.doc.reference_docname);

vsd_fleet_ms/vsd_fleet_ms/doctype/fuel_requests/fuel_requests.py

@@ -10,9 +10,12 @@
 from frappe import _, msgprint
 from frappe.model.mapper import get_mapped_doc
 from frappe.utils import nowdate
+from vsd_fleet_ms.utils.fleet_company_fields import get_transport_company
 
 class FuelRequests(Document):
     def onload(self):
+        if not self.company:
+            self.company = get_transport_company(self.company)
         trip = frappe.get_doc(self.reference_doctype, self.reference_docname)
         if not self.main_route:
             self.set("main_route", trip.route)
@@ -253,5 +256,7 @@ def make_stock_entry(source_name, target_doc=None):
         },
         target_doc,
     )
+    source_company = frappe.db.get_value("Fuel Requests", source_name, "company")
+    doc.company = get_transport_company(source_company)
     return doc
 

vsd_fleet_ms/vsd_fleet_ms/doctype/requested_payment/requested_payment.js

@@ -3,6 +3,7 @@
 
 frappe.ui.form.on('Requested Payment', {
 	onload: function(frm){
+		setFleetCompanyDefault(frm);
 		//Load the approve and reject buttons
 		var html = '<button style="background-color: green; color: #FFF;" class="btn btn-default btn-xs" onclick="cur_frm.cscript.approve_request(\'' + frm + '\');">Approve</button> ';
 		html += '<button style="background-color: red; color: #FFF;" class="btn btn-default btn-xs" onclick="cur_frm.cscript.reject_request(\'' + frm + '\');">Reject</button>'
@@ -189,6 +190,17 @@ frappe.ui.form.on('Requested Payment', {
 		}
 	}
 });
+
+const setFleetCompanyDefault = (frm) => {
+	if (!frm.is_new()) return;
+	frappe.db.get_single_value("Transport Settings", "company").then((company) => {
+		const fallback = (frappe.boot && frappe.boot.sysdefaults && frappe.boot.sysdefaults.company) || "";
+		const target_company = company || fallback;
+		if (target_company) {
+			frm.set_value("company", target_company);
+		}
+	});
+};
 frappe.ui.form.on('Requested Fund Details', {
 
 	form_render (frm, cdt, cdn) {
@@ -636,4 +648,3 @@ cur_frm.cscript.populate_child = function(reference_doctype, reference_docname){
 	});
 };
 
-

vsd_fleet_ms/vsd_fleet_ms/doctype/requested_payment/requested_payment.py

@@ -17,6 +17,7 @@
 )
 from erpnext.controllers.accounts_controller import set_balance_in_account_currency
 from erpnext.accounts.doctype.budget.budget import validate_expense_against_budget
+from vsd_fleet_ms.utils.fleet_company_fields import get_transport_company
 
 
 class RequestedPayment(Document):
@@ -716,6 +717,8 @@ def make_payment(source_name, target_doc=None, ignore_permissions=False):
     pe.mode_of_payment = "Cash"
     pe.party_type = "Employee"
     pe.allocate_payment_amount = 1
+    source_company = frappe.db.get_value("Requested Payment", source_name, "company")
+    pe.company = get_transport_company(source_company)
 
     return pe
 

vsd_fleet_ms/vsd_fleet_ms/doctype/transport_settings/transport_settings.json

@@ -7,6 +7,7 @@
   "editable_grid": 1,
   "engine": "InnoDB",
   "field_order": [
+    "company",
     "vehicle_fuel_parent_warehouse",
     "sales_item_group",
     "fuel_item_group",
@@ -17,6 +18,7 @@
     "default_compartment_capacity",
     "require_purchase_order_for_fuel",
     "require_journal_entry_for_funds",
+    "enforce_financial_booking_before_trip_submission",
     "servicems_tab",
     "servicems_section",
     "enable_service_ms",
@@ -26,6 +28,12 @@
     "accounting_dimension"
   ],
   "fields": [
+    {
+      "fieldname": "company",
+      "fieldtype": "Link",
+      "label": "Company",
+      "options": "Company"
+    },
     {
       "fieldname": "vehicle_fuel_parent_warehouse",
       "fieldtype": "Link",
@@ -112,6 +120,13 @@
       "default": 1,
       "description": "Require Journal Entry For Funds in Trip"
     },
+    {
+      "fieldname": "enforce_financial_booking_before_trip_submission",
+      "fieldtype": "Check",
+      "label": "Enforce Financial Booking Before Trip Submission",
+      "default": 0,
+      "description": "Block trip submission until fund requests and fuel stockout are fully processed"
+    },
     {
       "fieldname": "enable_service_ms",
       "fieldtype": "Check",

vsd_fleet_ms/vsd_fleet_ms/doctype/transportation_order/transportation_order.js

@@ -3,6 +3,7 @@
 
 frappe.ui.form.on('Transportation Order', {
 	onload: function (frm) {
+		setFleetCompanyDefault(frm);
 		frm.get_field("assign_transport").grid.cannot_add_rows = true;
 		$("*[data-fieldname='assign_transport']").find(".grid-remove-rows").hide();
 		$("*[data-fieldname='assign_transport']").find(".grid-remove-all-rows").hide();
@@ -227,6 +228,17 @@ frappe.ui.form.on('Transportation Order', {
 	},
 });
 
+const setFleetCompanyDefault = (frm) => {
+	if (!frm.is_new()) return;
+	frappe.db.get_single_value("Transport Settings", "company").then((company) => {
+		const fallback = (frappe.boot && frappe.boot.sysdefaults && frappe.boot.sysdefaults.company) || "";
+		const target_company = company || fallback;
+		if (target_company) {
+			frm.set_value("company", target_company);
+		}
+	});
+};
+
 
 frappe.ui.form.on("Transport Assignments", {
 	form_render: function (frm, cdt, cdn) {