chore: version bump to production

beams/beams/custom_scripts/budget/budget.py

@@ -11,7 +11,7 @@ def beams_budget_validate(doc, method=None):
 	convert_currency(doc, method)
 
 def update_total_amount(doc, method):
-	total = sum([row.budget_amount for row in doc.get('accounts') if row.budget_amount])
+	total = sum([row.budget_amount for row in doc.get('budget_accounts') if row.budget_amount])
 	doc.total_amount = total
 
 def populate_og_accounts(doc, method=None):

beams/beams/custom_scripts/journal_entry/journal_entry.py

@@ -1,24 +1,69 @@
 import frappe
 from frappe import _
+from frappe.utils import flt, getdate
+
+
+def on_submit(doc, method=None):
+	"""When a Journal Entry linked to a Bureau Trip Sheet is submitted (docstatus=1), add it to the BTS settlement table."""
+	if not getattr(doc, "bureau_trip_sheet", None):
+		return
+	bts_name = doc.bureau_trip_sheet
+	if not frappe.db.exists("Bureau Trip Sheet", bts_name):
+		return
+	# Avoid duplicate row if already in table
+	existing = frappe.db.get_all(
+		"Bureau Trip Sheet Journal Entry",
+		filters={"parent": bts_name, "parenttype": "Bureau Trip Sheet", "journal_entry": doc.name},
+		limit=1,
+	)
+	if existing:
+		return
+	# Settlement amount = total debit (or credit) in the JE
+	amount = sum(flt(acc.get("debit_in_account_currency") or 0) for acc in (doc.accounts or []))
+	if amount <= 0:
+		amount = sum(flt(acc.get("credit_in_account_currency") or 0) for acc in (doc.accounts or []))
+	bts = frappe.get_doc("Bureau Trip Sheet", bts_name)
+	bts.append("settlement_journal_entries", {
+		"journal_entry": doc.name,
+		"posting_date": getdate(doc.posting_date),
+		"amount": amount,
+	})
+	bts.flags.ignore_validate_update_after_submit = True
+	bts.save(ignore_permissions=True)
+
 
 def on_cancel(doc, method):
-    """
-    This method is called when the Journal Entry is canceled.
-    and updates the 'is_paid' field in the Substitute Booking.
-    """
-    # Check if the Journal Entry is linked to a Substitute Booking
-    substitute_booking_name = doc.substitute_booking_reference
-    if substitute_booking_name:
-        # Fetch the related Substitute Booking document
-        substitute_booking = frappe.get_doc('Substitute Booking', substitute_booking_name)
-
-        # Uncheck 'is_paid' in Substitute Booking
-        substitute_booking.db_set('is_paid', 0)
-        substitute_booking.save()
-
-        # Display success message
-        frappe.msgprint(_("Journal Entry cancelled, and Substitute Booking updated successfully."))
-
-    else:
-        # Handle case where no Substitute Booking is linked
-        frappe.msgprint(_("No Substitute Booking linked to this Journal Entry."))
+	# Remove this JE from Bureau Trip Sheet settlement_journal_entries if linked
+	bts_name = getattr(doc, "bureau_trip_sheet", None)
+	if bts_name and frappe.db.exists("Bureau Trip Sheet", bts_name):
+		child = frappe.db.get_value(
+			"Bureau Trip Sheet Journal Entry",
+			{"parent": bts_name, "parenttype": "Bureau Trip Sheet", "journal_entry": doc.name},
+			"name",
+		)
+		if child:
+			bts = frappe.get_doc("Bureau Trip Sheet", bts_name)
+			bts.flags.ignore_validate_update_after_submit = True
+			for i, row in enumerate(bts.settlement_journal_entries or []):
+				if row.journal_entry == doc.name:
+					bts.settlement_journal_entries.pop(i)
+					break
+			bts.save(ignore_permissions=True)
+
+	# This method is called when the Journal Entry is canceled.
+	# Updates the 'is_paid' field in the Substitute Booking.
+	substitute_booking_name = doc.substitute_booking_reference
+	if substitute_booking_name:
+		# Fetch the related Substitute Booking document
+		substitute_booking = frappe.get_doc('Substitute Booking', substitute_booking_name)
+
+		# Uncheck 'is_paid' in Substitute Booking
+		substitute_booking.db_set('is_paid', 0)
+		substitute_booking.save()
+
+		# Display success message
+		frappe.msgprint(_("Journal Entry cancelled, and Substitute Booking updated successfully."))
+
+	else:
+		# Handle case where no Substitute Booking is linked
+		frappe.msgprint(_("No Substitute Booking linked to this Journal Entry."))

beams/beams/custom_scripts/purchase_invoice/purchase_invoice.js

@@ -44,6 +44,9 @@ frappe.ui.form.on('Purchase Invoice', {
 			frm.set_df_property('supplier', 'read_only', 1);
 		}
 	},
+	refresh: function (frm) {
+		fetch_advances_from_mcts(frm);
+	},
 	bureau: function (frm) {
 		fetch_mode_of_payment_from_bureau(frm, frm.doc.bureau);
 	}
@@ -168,3 +171,22 @@ function fetch_mode_of_payment_from_bureau(frm, bureau) {
 	});
 }
 
+function fetch_advances_from_mcts(frm) {
+    // When opened from Monthly Consolidated Trip Sheet, fetch advances for the supplier (like "Get Advances Paid")
+		if (frappe.route_options && frappe.route_options.fetch_advances_from_mcts && frm.doc.supplier && frm.doc.__islocal) {
+			delete frappe.route_options.fetch_advances_from_mcts;
+			frappe.call({
+				method: "run_doc_method",
+				args: { docs: frm.doc, method: "set_advances" },
+				callback: function (r) {
+					if (!r.exc && r.docs && r.docs[0] && r.docs[0].advances && r.docs[0].advances.length) {
+						frm.clear_table("advances");
+						(r.docs[0].advances || []).forEach(function (row) {
+							frm.add_child("advances", row);
+						});
+						frm.refresh_field("advances");
+					}
+				},
+			});
+		}
+}