Fixed Quote Valid Days in System and GL Setup, Setup tab.

diff --git a/admin/gl_setup.php b/admin/gl_setup.php
index 26309baa2a8cef38189f1f909eb5d64a59cbb079..aeae18d98da92513b120b824aa709182de6f4a49 100644 (file)
--- a/admin/gl_setup.php
+++ b/admin/gl_setup.php
@@ -72,7 +72,7 @@ if (isset($_POST['submit']) && can_process())
                'default_prompt_payment_act', 'default_inventory_act', 'default_cogs_act',
                'default_adj_act', 'default_inv_sales_act', 'default_assembly_act', 'legal_text',
                'past_due_days', 'default_workorder_required', 'default_dim_required',
-               'default_delivery_required', 'grn_clearing_act',
+               'default_delivery_required', 'default_quote_valid_days', 'grn_clearing_act',
                'allow_negative_stock'=> 0, 'accumulate_shipping'=> 0,
                'po_over_receive' => 0.0, 'po_over_charge' => 0.0, 'default_credit_limit'=>0.0
 )));
@@ -94,6 +94,11 @@ if (get_company_pref('grn_clearing_act') === null) { // available from 2.3.1, ca
        refresh_sys_prefs();
 }
 
+if (get_company_pref('default_quote_valid_days') === null) { // available from 2.3.23, can be not defined on pre-2.4 installations
+       set_company_pref('default_quote_valid_days', 'glsetup.sales', 'smallint', 6, 30);
+       refresh_sys_prefs();
+}
+
 $myrow = get_company_prefs();
 
 $_POST['retained_earnings_act']  = $myrow["retained_earnings_act"];
@@ -130,6 +135,7 @@ $_POST['accumulate_shipping'] = $myrow['accumulate_shipping'];
 $_POST['default_workorder_required'] = $myrow['default_workorder_required'];
 $_POST['default_dim_required'] = $myrow['default_dim_required'];
 $_POST['default_delivery_required'] = $myrow['default_delivery_required'];
+$_POST['default_quote_valid_days'] = $myrow['default_quote_valid_days'];
 
 //---------------
 
@@ -171,6 +177,8 @@ gl_all_accounts_list_row(_("Sales Discount Account:"), 'default_sales_discount_a
 
 gl_all_accounts_list_row(_("Prompt Payment Discount Account:"), 'default_prompt_payment_act');
 
+text_row(_("Quote Valid Days:"), 'default_quote_valid_days', $_POST['default_quote_valid_days'], 6, 6, '', "", _("days"));
+
 text_row(_("Delivery Required By:"), 'default_delivery_required', $_POST['default_delivery_required'], 6, 6, '', "", _("days"));
 
 //----------------

diff --git a/includes/prefs/sysprefs.inc b/includes/prefs/sysprefs.inc
index f930f85da3229029cc2792755dcc43b33017633d..8f8d522b9553806588dd46cf737a8c8949b700e1 100644 (file)
--- a/includes/prefs/sysprefs.inc
+++ b/includes/prefs/sysprefs.inc
@@ -56,6 +56,11 @@ class sys_prefs
                return $this->prefs['default_workorder_required'];
        }
 
+       function default_quote_valid_days() 
+       {
+               return $this->prefs['default_quote_valid_days'];
+       }
+
        function default_delivery_required_by() 
        {
                return $this->prefs['default_delivery_required'];

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index 42d324aa0d732ce328ae11ed22277c2bea919dd0..456f54f77c7d8447f29cf72448435d6328d4251f 100644 (file)
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -123,6 +123,8 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
        }
        elseif ($order->trans_type == ST_SALESORDER)
                $order->due_date = add_days($order->document_date, $SysPrefs->default_delivery_required_by());
+       elseif ($order->trans_type == ST_SALESQUOTE)
+               $order->due_date = add_days($order->document_date, $SysPrefs->default_quote_valid_days());
        if($order->payment_terms['cash_sale']) {
                $order->set_location($order->pos["pos_location"], $order->pos["location_name"]);
        } else