Supplier Inquiry/Customer Inquiry: removed inconsistency in unsettled/overdue transac...

[fa-stable.git] / includes / ui / ui_lists.inc

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index a82e9d3a64f4fdc4f497b0437d8f0ca8d415ff04..9ea529965d026c3a51d782d0426cd94c2cccd32b 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -180,11 +180,14 @@ $opts = array(            // default options
        $found = false;
        $lastcat = null;
        $edit = false;
+       $pname = false;
+       if (($type === "customer" || $type === "supplier") && !empty($SysPrefs->prefs['shortname_name_in_list']))
+               $pname = true;
        if($result = db_query($sql)) {
                while ($contact_row = db_fetch($result)) {
                        $value = $contact_row[0];
                        $descr = $opts['format']==null ?  $contact_row[1] :
-                               call_user_func($opts['format'], $contact_row);
+                               call_user_func($opts['format'], $contact_row, $pname);
                        $sel = '';
                        if (get_post($search_button) && ($txt == $value)) {
                                $selected_id[] = $value;
@@ -478,7 +481,7 @@ function array_selector_row($label, $name, $selected_id, $items, $options=null)
 }
 
 //----------------------------------------------------------------------------------------------
-function _format_add_curr($row)
+function _format_add_curr($row, $pname=false)
 {
        static $company_currency;
 
@@ -486,8 +489,14 @@ function _format_add_curr($row)
        {
                $company_currency = get_company_currency();
        }
-       return $row[1] . ($row[2] == $company_currency ?
-               '' : (" - " . $row[2]));
+       if (!$pname)
+       {
+               return $row[1] . ($row[2] == $company_currency ? '' : (" - " . $row[2]));
+       }               
+       else
+       {
+               return $row[1] . " - " . $row[2] . ($row[3] == $company_currency ? '' : (" - " . $row[3]));
+       }               
 }
 
 function add_edit_combo($type)
@@ -508,8 +517,11 @@ function add_edit_combo($type)
 function supplier_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false,
        $all=false, $editkey = false)
 {
-
-       $sql = "SELECT supplier_id, supp_ref, curr_code, inactive FROM ".TB_PREF."suppliers ";
+       global $SysPrefs;
+       if (!empty($SysPrefs->prefs['shortname_name_in_list']))
+               $sql = "SELECT supplier_id, supp_ref, supp_name, curr_code, inactive FROM ".TB_PREF."suppliers ";
+       else    
+               $sql = "SELECT supplier_id, supp_ref, curr_code, inactive FROM ".TB_PREF."suppliers ";
 
        $mode = get_company_pref('no_supplier_list');
 
@@ -558,8 +570,11 @@ function supplier_list_row($label, $name, $selected_id=null, $all_option = false
 function customer_list($name, $selected_id=null, $spec_option=false, $submit_on_change=false, 
        $show_inactive=false, $editkey = false)
 {
-
-       $sql = "SELECT debtor_no, debtor_ref, curr_code, inactive FROM ".TB_PREF."debtors_master ";
+       global $SysPrefs;
+       if (!empty($SysPrefs->prefs['shortname_name_in_list']))
+               $sql = "SELECT debtor_no, debtor_ref, name, curr_code, inactive FROM ".TB_PREF."debtors_master ";
+       else    
+               $sql = "SELECT debtor_no, debtor_ref, curr_code, inactive FROM ".TB_PREF."debtors_master ";
 
        $mode = get_company_pref('no_customer_list');
 
@@ -687,16 +702,18 @@ function locations_list_row($label, $name, $selected_id=null, $all_option=false,
 
 //-----------------------------------------------------------------------------------------------
 
-function currencies_list($name, $selected_id=null, $submit_on_change=false)
+function currencies_list($name, $selected_id=null, $submit_on_change=false, $exclude_home_curr=false)
 {
        $sql = "SELECT curr_abrev, currency, inactive FROM ".TB_PREF."currencies";
+       if ($exclude_home_curr)
+               $sql .= " WHERE curr_abrev!='".get_company_currency()."'";
 
        // default to the company currency
        return combo_input($name, $selected_id, $sql, 'curr_abrev', 'currency',
                array(
                        'select_submit'=> $submit_on_change,
                        'default' => get_company_currency(),
-                       'async' => false                
+                       'async' => false
                ) );
 }
 
@@ -985,8 +1002,9 @@ function stock_component_items_list_cells($label, $name, $parent_stock_id,
 {
        if ($label != null)
                echo "<td>$label</td>\n";
+       $parent = db_escape($parent_stock_id);
        echo stock_items_list($name, $selected_id, $all_option, $submit_on_change,
-               array('where'=>array("stock_id != $parent"), 'cells'=>true, 'parent'=> $parent_stock_id), $editkey, "component");
+               array('where'=>array("stock_id != '$parent_stock_id'"), 'cells'=>true, 'parent'=> $parent_stock_id), $editkey, "component");
 }
 //------------------------------------------------------------------------------------
 
@@ -2103,7 +2121,7 @@ function journal_types_list_cells($label, $name, $value=null, $submit_on_change=
        echo "</td>\n";
 }
 
-function cust_allocations_list_cells($label, $name, $selected=null)
+function cust_allocations_list_cells($label, $name, $selected=null, $submit_on_change=false)
 {
 
        if ($label != null)
@@ -2112,12 +2130,12 @@ function cust_allocations_list_cells($label, $name, $selected=null)
        $allocs = array( 
                ALL_TEXT=>_("All Types"),
                '1'=> _("Sales Invoices"),
-               '2'=> _("Overdue Invoices"),
+               '2'=> _("Unsettled transactions"),
                '3' => _("Payments"),
                '4' => _("Credit Notes"),
                '5' => _("Delivery Notes")
        );
-       echo array_selector($name, $selected, $allocs);
+       echo array_selector($name, $selected, $allocs, array('select_submit'=> $submit_on_change));
        echo "</td>\n";
 }
 
@@ -2137,7 +2155,7 @@ function supp_allocations_list_cell($name, $selected=null)
        echo "</td>\n";
 }
 
-function supp_transactions_list_cell($name, $selected=null)
+function supp_transactions_list_cell($name, $selected=null, $submit_on_change=false)
 {
 
        echo "<td>\n";
@@ -2145,13 +2163,13 @@ function supp_transactions_list_cell($name, $selected=null)
                ALL_TEXT=>_("All Types"),
                '6'=>_("GRNs"),
                '1'=> _("Invoices"),
-               '2'=> _("Overdue Invoices"),
+               '2'=> _("Unsettled transactions"),
                '3' => _("Payments"),
                '4' => _("Credit Notes"),
                '5' => _("Overdue Credit Notes")
        );
 
-       echo array_selector($name, $selected, $allocs);
+       echo array_selector($name, $selected, $allocs, array('select_submit'=> $submit_on_change));
        echo "</td>\n";
 }
 
@@ -2532,7 +2550,7 @@ function payment_services($name)
 {
        global $payment_services;
 
-       $services = array_combine(array_keys($payment_services), array_keys($payment_services));
+       $services = (object)array_combine(array_keys($payment_services), array_keys($payment_services));
 
        return array_selector($name, null, $services, array(
                        'spec_option'=> _("No payment Link"),