Early payment discount option moved from branch to payment terms.

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

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 58a2bae2215f2c2165cb273c54d1d28add045731..15cfe2e93dc8632c2001361be63e28223fd79a5e 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -761,19 +761,19 @@ function _format_fiscalyears($row)
        . "  " . ($row[3] ? _('Closed') : _('Active'));
 }
 
-function fiscalyears_list_cells($label, $name, $selected_id=null)
+function fiscalyears_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       echo fiscalyears_list($name, $selected_id);
+       echo fiscalyears_list($name, $selected_id, $submit_on_change);
        echo "</td>\n";
 }
 
-function fiscalyears_list_row($label, $name, $selected_id=null)
+function fiscalyears_list_row($label, $name, $selected_id=null, $submit_on_change=false)
 {
        echo "<tr><td class='label'>$label</td>";
-       fiscalyears_list_cells(null, $name, $selected_id);
+       fiscalyears_list_cells(null, $name, $selected_id, $submit_on_change);
        echo "</tr>\n";
 }
 //------------------------------------------------------------------------------------
@@ -1473,8 +1473,8 @@ function workorders_list_row($label, $name, $selected_id=null)
 
 function payment_terms_list($name, $selected_id=null)
 {
-       $sql = "SELECT terms_indicator, terms, inactive FROM ".TB_PREF."payment_terms";
-       return combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms', array());
+       $sql = "SELECT id, terms, inactive FROM ".TB_PREF."payment_terms";
+       return combo_input($name, $selected_id, $sql, 'id', 'terms', array());
 }
 
 function payment_terms_list_cells($label, $name, $selected_id=null)
@@ -1697,16 +1697,16 @@ function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $sub
 //
 function sale_payment_list($name, $category, $selected_id=null, $submit_on_change=true, $prepayments=true)
 {
-       $sql = "SELECT terms_indicator, terms, inactive FROM ".TB_PREF."payment_terms";
+       $sql = "SELECT id, terms, inactive FROM ".TB_PREF."payment_terms";
 
        if ($category == PM_CASH) // only cash
-                       $sql .= " WHERE days_before_due=0 AND day_in_following_month=0";
+                       $sql .= " WHERE type=".PTT_CASH;
        elseif ($category == PM_CREDIT) // only delayed payments
-                       $sql .= " WHERE days_before_due".($prepayments ? '!=': '>')."0 OR day_in_following_month!=0";
+                       $sql .= " WHERE type IN(".PTT_FOLLOWING.",".PTT_DAYS.")";
        elseif (!$prepayments)
-                       $sql .= " WHERE days_before_due>=0";
+                       $sql .= " WHERE type<>".PTT_PREPAY;
 
-       return combo_input($name, $selected_id, $sql, 'terms_indicator', 'terms',
+       return combo_input($name, $selected_id, $sql, 'id', 'terms',
                array(
                        'select_submit'=> $submit_on_change,
                        'async' => true
@@ -1907,11 +1907,11 @@ function gl_all_accounts_list_cells($label, $name, $selected_id=null,
 }
 
 function gl_all_accounts_list_row($label, $name, $selected_id=null, 
-       $skip_bank_accounts=false, $cells=false, $all_option=false, $type_id=false)
+       $skip_bank_accounts=false, $cells=false, $all_option=false, $submit_on_change=false, $all=false, $type_id=false)
 {
        echo "<tr><td class='label'>$label</td>";
        gl_all_accounts_list_cells(null, $name, $selected_id, 
-               $skip_bank_accounts, $cells, $all_option, $type_id);
+               $skip_bank_accounts, $cells, $all_option, $submit_on_change, $all, $type_id);
        echo "</tr>\n";
 }