backport to develop

.github/workflows/master.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Deploy to dev
       uses: appleboy/ssh-action@master
       with:
-        host: ${{ secrets.DEV_HOST }}
+        host: ${{ secrets.UAT_HOST }}
         username: ${{ secrets.USERNAME }}
         key: ${{ secrets.DEV_KEY }}
         port: 22

beams/beams/custom_scripts/sales_invoice/sales_invoice.js

@@ -1,83 +1,76 @@
 frappe.ui.form.on('Sales Invoice', {
-  refresh: function(frm) {
-    setTimeout(() => {
-        frm.remove_custom_button('Delivery', 'Create');
-        frm.remove_custom_button('Timesheet', 'Get Items From');
-        frm.remove_custom_button('Delivery Note', 'Get Items From');
-    }, 500);
-    set_actual_customer_query(frm);
+    refresh: function (frm) {
+        setTimeout(() => {
+            frm.remove_custom_button('Delivery', 'Create');
+            frm.remove_custom_button('Timesheet', 'Get Items From');
+            frm.remove_custom_button('Delivery Note', 'Get Items From');
+        }, 500);
+        set_actual_customer_query(frm);
 
-    // Check if the Sales Invoice is being created from a Quotation (i.e., reference_id is set)
-    if (frm.doc.reference_id) {
-      // Make the customer field read-only
-      frm.set_df_property('customer', 'read_only', 1);
-    }
-  },
-
-  sales_type: function(frm) {
-    if (frm.doc.sales_type) {
-      set_item_code_query(frm);
-    }
-
-    // Check and update 'include_in_ibf' based on the current state of the form
-    check_include_in_ibf(frm);
-
-    // Clear and refresh the items table
-    frm.clear_table('items');
-    frm.refresh_field('items');
-  },
+        // Check if the Sales Invoice is being created from a Quotation (i.e., reference_id is set)
+        if (frm.doc.reference_id) {
+            // Make the customer field read-only
+            frm.set_df_property('customer', 'read_only', 1);
+        }
+    },
+    sales_type: function (frm) {
+        if (frm.doc.sales_type) {
+            set_item_code_query(frm);
+        }
+        check_include_in_ibf(frm);
 
-  is_barter_invoice: function(frm) {
-    check_include_in_ibf(frm);
-  },
+        // Clear and refresh the items table
+        frm.clear_table('items');
+        frm.refresh_field('items');
+    },
 
-  is_agent: function(frm) {
-    check_include_in_ibf(frm);
-  },
-
-  onload: function(frm) {
-    if (frm.is_new) {
-      check_include_in_ibf(frm);
-    }
-
-    // Check if the Sales Invoice is being created from a Quotation (i.e., reference_id is set)
-    if (frm.doc.reference_id) {
-      // Make the customer field read-only
-      frm.set_df_property('customer', 'read_only', 1);
+    is_barter_invoice: function (frm) {
+        check_include_in_ibf(frm);
+    },
+    is_agent: function (frm) {
+        check_include_in_ibf(frm);
+    },
+    onload: function (frm) {
+        // Check if the Sales Invoice is being created from a Quotation (i.e., reference_id is set)
+        if (frm.doc.reference_id) {
+            // Make the customer field read-only
+            frm.set_df_property('customer', 'read_only', 1);
+        }
     }
-  }
 });
 
 // Function to set query for the 'actual_customer' field
 function set_actual_customer_query(frm) {
-  frm.set_query('actual_customer', function() {
-    return {
-      filters: {
-        'is_agent': 0
-      }
-    };
-  });
+    frm.set_query('actual_customer', function () {
+        return {
+            filters: {
+                'is_agent': 0
+            }
+        };
+    });
 }
 
 // Function to set query for 'item_code' field in the 'items' child table based on 'sales_type'
 function set_item_code_query(frm) {
-  frm.fields_dict['items'].grid.get_field('item_code').get_query = function(doc, cdt, cdn) {
-    return {
-      filters: {
-        'sales_type': frm.doc.sales_type
-      }
+    frm.fields_dict['items'].grid.get_field('item_code').get_query = function (doc, cdt, cdn) {
+        return {
+            filters: {
+                'sales_type': frm.doc.sales_type
+            }
+        };
     };
-  };
 }
 
 // Function to check and set the value of 'include_in_ibf'
 function check_include_in_ibf(frm) {
-  frappe.db.get_value('Sales Type', frm.doc.sales_type, 'is_time_sales', function(value) {
-    if (value && value.is_time_sales && !frm.doc.is_barter_invoice && frm.doc.is_agent) {
-      frm.set_value('include_in_ibf', 1);  // Set 'include_in_ibf' to 1 (true)
-    } else {
-      frm.set_value('include_in_ibf', 0);  // Set 'include_in_ibf' to 0 (false)
+    if (frm.is_new()) {
+        frappe.db.get_value('Sales Type', frm.doc.sales_type, 'is_time_sales', function (value) {
+            if (value && value.is_time_sales && !frm.doc.is_barter_invoice && frm.doc.is_agent) {
+                frm.set_value('include_in_ibf', 1);  // Set 'include_in_ibf' to 1 (true)
+            } else {
+                frm.set_value('include_in_ibf', 0);  // Set 'include_in_ibf' to 0 (false)
+            }
+            frm.refresh_field('include_in_ibf');  // Refresh the field to reflect the change
+        });
     }
-    frm.refresh_field('include_in_ibf');  // Refresh the field to reflect the change
-  });
 }

beams/beams/custom_scripts/voucher_entry/voucher_entry.js

@@ -54,11 +54,26 @@ function show_petty_cash_dialog(frm) {
                 fieldname: "requested_amount",
                 label: __("Requested Amount"),
                 fieldtype: "Currency",
+                reqd: 1,
+                read_only: 1,
+                default: frm.doc.total_amount - frm.doc.balance
+            },
+            {
+                fieldname: "reason",
+                label: __("Reason"),
+                fieldtype: "Small Text",
                 reqd: 1
-            }
+            },
         ],
         primary_action_label: __("Submit"),
         primary_action(values) {
+            if (values.requested_amount <= 0) {
+                frappe.throw({
+                    title: __("Invalid Amount"),
+                    message: __("Requested Amount should be greater than 0. Please enter a valid amount."),
+                    indicator: "red"
+                });
+            }
             submit_petty_cash_request(frm, values, d);
         }
     });
@@ -74,7 +89,8 @@ function submit_petty_cash_request(frm, values, dialog) {
             bureau: values.bureau,
             mode_of_payment: values.mode_of_payment,
             account: values.account,
-            requested_amount: values.requested_amount
+            requested_amount: values.requested_amount,
+            reason: values.reason
         },
         callback: function (response) {
             if (response.message.status === "success") {

beams/beams/custom_scripts/voucher_entry/voucher_entry.py

@@ -1,7 +1,7 @@
 import frappe
 
 @frappe.whitelist()
-def create_petty_cash_request(voucher_entry_name, bureau, mode_of_payment, account, requested_amount):
+def create_petty_cash_request(voucher_entry_name, bureau, mode_of_payment, account, requested_amount, reason):
     """Create a Petty Cash Request linked to a Voucher Entry"""
 
     # Get Employee ID based on logged-in user
@@ -15,11 +15,11 @@ def create_petty_cash_request(voucher_entry_name, bureau, mode_of_payment, accou
         "account": account,
         "requested_amount": requested_amount,
         "reference_voucher": voucher_entry_name,
+        "reason": reason,
         "employee": employee
     })
 
     petty_cash.insert(ignore_permissions=True)
-    petty_cash.submit()
     frappe.db.commit()
 
     return {"status": "success", "message": "Petty Cash Request Created Successfully!", "docname": petty_cash.name}