X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=5fbdb8d4436e12ed0a45ce31fc191fa1e8938c5f;hb=6724489b9b146d2ebd8b89c1f0562954a14619f7;hp=24dedae2806520dbede7423920a22d39670ec7c0;hpb=c3e31ddfb1139d6264bddd2a211e18c35ded6e54;p=fa-stable.git
diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 24dedae2..5fbdb8d4 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -46,9 +46,10 @@ $opts = array( // default options
'sel_hint' => null,
'search_box' => false, // name or true/false
'type' => 0, // type of extended selector:
- // 0 - with (optional) visible search box, search by id
+ // 0 - with (optional) visible search box, search by fragment inside id
// 1 - with hidden search box, search by option text
- // 2 - TODO reverse: box with hidden selector available via enter; this
+ // 2 - with (optional) visible search box, search by fragment at the start of id
+ // 3 - TODO reverse: box with hidden selector available via enter; this
// would be convenient for optional ad hoc adding of new item
'search_submit' => true, //search submit button: true/false
'size' => 8, // size and max of box tag
@@ -77,8 +78,17 @@ $opts = array( // default options
$select_submit = $opts['select_submit'];
$spec_id = $opts['spec_id'];
$spec_option = $opts['spec_option'];
- $by_id = ($opts['type'] == 0);
- $class = $by_id ? 'combo':'combo2';
+ if ($opts['type'] == 0) {
+ $by_id = true;
+ $class = 'combo';
+ } elseif($opts['type'] == 1) {
+ $by_id = false;
+ $class = 'combo2';
+ } else {
+ $by_id = true;
+ $class = 'combo3';
+ }
+
$disabled = $opts['disabled'] ? "disabled" : '';
$multi = $opts['multi'];
@@ -95,10 +105,10 @@ $opts = array( // default options
: _('Enter description fragment to search or * for all')) :'';
if ($selected_id == null) {
- $selected_id = get_post($name, $opts['default']);
+ $selected_id = get_post($name, (string)$opts['default']);
}
if(!is_array($selected_id))
- $selected_id = array($selected_id); // code is generalized for multiple selection support
+ $selected_id = array((string)$selected_id); // code is generalized for multiple selection support
$txt = get_post($search_box);
$rel = '';
@@ -133,13 +143,14 @@ $opts = array( // default options
if ($spec_option === false && $selected_id == array())
$limit = ' LIMIT 1';
else
- $opts['where'][] = $valfield . "='". get_post($name, $spec_id)."'";
+ $opts['where'][] = $valfield . "=". db_escape(get_post($name, $spec_id));
}
else
if ($txt != '*') {
foreach($opts['search'] as $i=> $s)
- $opts['search'][$i] = $s . " LIKE '%{$txt}%'";
+ $opts['search'][$i] = $s . " LIKE "
+ .db_escape(($class=='combo3' ? '' : '%').$txt.'%');
$opts['where'][] = '('. implode($opts['search'], ' OR ') . ')';
}
}
@@ -328,7 +339,7 @@ $opts = array( // default options
$selected_id = get_post($name, $opts['default']);
}
if(!is_array($selected_id))
- $selected_id = array($selected_id); // code is generalized for multiple selection support
+ $selected_id = array((string)$selected_id); // code is generalized for multiple selection support
if (isset($_POST[ '_'.$name.'_update'])) {
if (!$opts['async'])
@@ -511,7 +522,7 @@ function customer_branches_list($customer_id, $name, $selected_id=null,
global $all_items;
$sql = "SELECT branch_code, branch_ref FROM ".TB_PREF."cust_branch
- WHERE debtor_no='" . $customer_id . "' ";
+ WHERE debtor_no=" . db_escape($customer_id)." ";
if ($editkey)
set_editor('branch', $name, $editkey);
@@ -1439,17 +1450,14 @@ function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $sub
//-----------------------------------------------------------------------------------------------
// Payment type selector for current user.
//
-function sale_payment_list($name, $selected_id=null, $submit_on_change=true)
+function sale_payment_list($name, $category, $selected_id=null, $submit_on_change=true)
{
$sql = "SELECT terms_indicator, terms, inactive FROM ".TB_PREF."payment_terms";
- $paym = get_sales_point(user_pos());
-
- if (!$paym['cash_sale'] || !$paym['credit_sale']) {
- if ($paym['cash_sale']) // only cash
+
+ if ($category == PM_CASH) // only cash
$sql .= " WHERE days_before_due=0 AND day_in_following_month=0";
- else
+ if ($category == PM_CREDIT) // only delayed payments
$sql .= " WHERE days_before_due!=0 OR day_in_following_month!=0";
- }
return combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms',
array(
@@ -1459,13 +1467,13 @@ function sale_payment_list($name, $selected_id=null, $submit_on_change=true)
}
-function sale_payment_list_cells($label, $name, $selected_id=null, $submit_on_change=true)
+function sale_payment_list_cells($label, $name, $category, $selected_id=null, $submit_on_change=true)
{
if ($label != null)
echo "| $label | \n";
echo "";
- echo sale_payment_list($name, $selected_id, $submit_on_change);
+ echo sale_payment_list($name, $category, $selected_id, $submit_on_change);
echo " | \n";
}
@@ -1538,6 +1546,7 @@ function gl_account_types_list($name, $selected_id=null, $all_option=false, $all
return combo_input($name, $selected_id, $sql, 'id', 'name',
array(
+ 'format' => '_format_account',
'order' => array('class_id', 'id', 'parent'),
'spec_option' =>$all_option,
'spec_id' => $all_items
@@ -1582,6 +1591,7 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals
'format' => '_format_account',
'spec_option' => $all_option===true ? _("Use Item Sales Accounts") : $all_option,
'spec_id' => '',
+ 'type' => 2,
'order' => array('type.class_id','type.id','account_code'),
'search_box' => $cells,
'search_submit' => false,
@@ -1851,7 +1861,7 @@ function systypes_list_cells($label, $name, $value=null, $submit_on_change=false
function systypes_list_row($label, $name, $value=null, $submit_on_change=false)
{
echo "| $label | ";
- systypes_list_cells(null, $name, $value, false, $submit_on_change);
+ systypes_list_cells(null, $name, $value, $submit_on_change);
echo "
\n";
}
@@ -1917,6 +1927,25 @@ function supp_allocations_list_cell($name, $selected=null)
echo "\n";
}
+function supp_transactions_list_cell($name, $selected=null)
+{
+ global $all_items;
+
+ echo "\n";
+ $allocs = array(
+ $all_items=>_("All Types"),
+ '6'=>_("GRNs"),
+ '1'=> _("Invoices"),
+ '2'=> _("Overdue Invoices"),
+ '3' => _("Payments"),
+ '4' => _("Credit Notes"),
+ '5' => _("Overdue Credit Notes")
+ );
+
+ echo array_selector($name, $selected, $allocs);
+ echo " | \n";
+}
+
function policy_list_cells($label, $name, $selected=null)
{
if ($label != null)
@@ -2218,4 +2247,82 @@ function extset_list($name, $value=null, $submit_on_change=false)
));
}
+function crm_category_types_list($name, $selected_id=null, $filter=array(), $submit_on_change=true)
+{
+
+ $sql = "SELECT id, name, type, inactive FROM ".TB_PREF."crm_categories";
+
+ $multi = false;
+ $groups = false;
+ $where = array();
+ if (@$filter['class']) {
+ $where[] = 'type='.db_escape($filter['class']);
+ } else
+ $groups = 'type';
+ if (@$filter['subclass']) $where[] = 'action='.db_escape($filter['subclass']);
+ if (@$filter['entity']) $where[] = 'entity_id='.db_escape($filter['entity']);
+ if (@$filter['multi']) { // contact category selector for person
+ $multi = true;
+ }
+
+ return combo_input($name, $selected_id, $sql, 'id', 'name',
+ array(
+ 'multi' => $multi,
+ 'height' => $multi ? 5:1,
+ 'category' => $groups,
+ 'select_submit'=> $submit_on_change,
+ 'async' => true,
+ 'where' => $where
+ ));
+}
+
+function crm_category_types_list_row($label, $name, $selected_id=null, $filter=array(), $submit_on_change=true)
+{
+ echo "| $label | ";
+ echo crm_category_types_list($name, $selected_id, $filter, $submit_on_change);
+ echo " |
\n";
+}
+
+function payment_type_list_row($label, $name, $selected_id=null, $submit_on_change=false)
+{
+ global $pterm_types;
+
+ echo "| $label | ";
+ echo array_selector($name, $selected_id, $pterm_types,
+ array(
+ 'select_submit'=> $submit_on_change
+ ) );
+ echo " |
\n";
+}
+
+function coa_list_row($label, $name, $value=null)
+{
+ global $path_to_root, $installed_extensions;
+
+ $path = $path_to_root.'/sql/';
+ $coas = array();
+ $sqldir = opendir($path);
+ while (false !== ($fname = readdir($sqldir)))
+ {
+ if (is_file($path.$fname) && substr($fname,-4)=='.sql' && @($fname[2] == '_'))
+ {
+ $ext = array_search_value($fname, $installed_extensions, 'sql');
+ if ($ext!=null) {
+ $descr = $ext['name'];
+ } elseif ($fname == 'en_US-new.sql') { // two standard COAs
+ $descr = _("Standard new company American COA (4 digit)");
+ } elseif ($fname == 'en_US-demo.sql') {
+ $descr = _("Standard American COA (4 digit) with demo data");
+ } else
+ $descr = $fname;
+
+ $coas[$fname] = $descr;
+ }
+ }
+ ksort($coas);
+
+ echo "| $label | \n";
+ echo array_selector( $name, $value, $coas );
+ echo " |
\n";
+}
?>
\ No newline at end of file