Merged changes from stable branch up to 2.3.12

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

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index 3f27641b67e9508b035366282014748eac5ac829..adf663288317479f0cee4a0238776d6114a370f5 100644 (file)
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -50,7 +50,7 @@ function get_gl_view_str($type, $trans_no, $label="", $force=false, $class='', $
        {
                $label = _("GL");
                $icon = ICON_GL;
-       }       
+       }
        $url = ($type == ST_WORKORDER && !work_order_is_closed($trans_no)) ? "manufacturing/view/wo_costs_view.php?trans_no=$trans_no"
                : "gl/view/gl_trans_view.php?type_id=$type&trans_no=$trans_no";
 
@@ -468,20 +468,20 @@ function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0)
 function display_footer_exit()
 {
        br(2);
-       end_page(false, false, true);
+       end_page(false, true);
        exit;
 }
 
 //--------------------------------------------------------------------------------------
 
-function display_allocations($alloc_result, $total, $payments=false)
+function display_allocations($alloc_result, $total, $title, $show_summary=true)
 {
        global $systypes_array;
 
        if (!$alloc_result || db_num_rows($alloc_result) == 0)
                return;
 
-    display_heading2(($payments ? _("Payments") : _("Allocations")));
+    display_heading2($title);
 
     start_table(TABLESTYLE, "width=80%");
 
@@ -492,7 +492,6 @@ function display_allocations($alloc_result, $total, $payments=false)
 
     while ($alloc_row = db_fetch($alloc_result))
     {
-
        alt_table_row_color($k);
 
        label_cell($systypes_array[$alloc_row['type']]);
@@ -500,9 +499,10 @@ function display_allocations($alloc_result, $total, $payments=false)
        label_cell(sql2date($alloc_row['tran_date']));
        $alloc_row['Total'] = round2($alloc_row['Total'], user_price_dec());
        $alloc_row['amt'] = round2($alloc_row['amt'], user_price_dec());
+       if ($payments && ($alloc_row['type'] == ST_SUPPAYMENT || $alloc_row['type'] == ST_BANKPAYMENT || $alloc_row['type'] == ST_SUPPCREDIT))
+               $alloc_row['Total'] = -$alloc_row['Total'];
        amount_cell($alloc_row['Total']);
-       //amount_cell($alloc_row['Total'] - $alloc_row['PrevAllocs'] - $alloc_row['amt']);
-       amount_cell($alloc_row['Total'] - $alloc_row['amt']);
+               amount_cell($alloc_row['Total'] - $alloc_row['amt']);
        amount_cell($alloc_row['amt']);
        end_row();
 
@@ -512,12 +512,14 @@ function display_allocations($alloc_result, $total, $payments=false)
        label_cell(_("Total Allocated:"), "align=right colspan=5");
        amount_cell($total_allocated);
        end_row();
-       start_row();
-    label_cell(_("Left to Allocate:"), "align=right colspan=5");
-    $total = round2($total, user_price_dec());
-    amount_cell($total - $total_allocated);
-    end_row();
-
+       if ($show_summary)
+       {
+               start_row();
+           label_cell(_("Left to Allocate:"), "align=right colspan=5");
+           $total = round2($total, user_price_dec());
+       amount_cell($total - $total_allocated);
+       end_row();
+       }
     end_table(1);
 }
 
@@ -529,11 +531,11 @@ function display_allocations_from($person_type, $person_id, $type, $type_no, $to
        {
                case PT_CUSTOMER :
                        $alloc_result = get_allocatable_to_cust_transactions($person_id, $type_no, $type);
-                       display_allocations($alloc_result, $total);
+                       display_allocations($alloc_result, $total, _("Allocations"));
                        return;
                case PT_SUPPLIER :
                        $alloc_result = get_allocatable_to_supp_transactions($person_id, $type_no, $type);
-                       display_allocations($alloc_result, $total);
+                       display_allocations($alloc_result, $total, _("Allocations"));
                        return;
        }
 }
@@ -546,11 +548,11 @@ function display_allocations_to($person_type, $person_id, $type, $type_no, $tota
        {
                case PT_CUSTOMER :
                        $alloc_result = get_allocatable_from_cust_transactions($person_id, $type_no, $type);
-                       display_allocations($alloc_result, $total, true);
+                       display_allocations($alloc_result, $total, $type == ST_SALESORDER ? _("Pre-Payments") : _("Payments"), false);
                        return;
                case PT_SUPPLIER :
                        $alloc_result = get_allocatable_from_supp_transactions($person_id, $type_no, $type);
-                       display_allocations($alloc_result, $total, true);
+                       display_allocations($alloc_result, $total, $type == ST_PURCHORDER ? _("Pre-Payments") : _("Payments"), false);
                        return;
        }
 }
@@ -586,9 +588,9 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
                                        $begin = "";
                                else
                                        $begin = begin_fiscalyear(); // from fiscalyear begin
-                       }               
+                       }
                        $base = get_gl_trans_from_to($begin, $cart->tran_date, $qe['base_desc']);
-                               
+
                }
                if ($descr != '') $qe['description'] .= ': '.$descr;
                $result = get_quick_entry_lines($id);
@@ -734,10 +736,10 @@ function _number_to_words($number)
 
     $ones = array("", "One", "Two", "Three", "Four", "Five", "Six", 
         "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve", "Thirteen", 
-        "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eightteen", 
+        "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen", 
         "Nineteen"); 
     $tens = array("", "", "Twenty", "Thirty", "Fourty", "Fifty", "Sixty", 
-        "Seventy", "Eigthy", "Ninety"); 
+        "Seventy", "Eighty", "Ninety"); 
 
     if ($Dn || $n) 
     { 
@@ -773,16 +775,16 @@ function price_in_words($amount, $document=0)
        $dec = user_price_dec();
        if ($dec > 0)
        {
-               $divisor = pow(10, $dec);       
-               $frac = round2($amount - floor($amount), $dec) * $divisor;
-               $frac = sprintf("%0{$dec}d", $frac);
+               $divisor = pow(10, $dec);
+        $frac = round2($amount - floor($amount), $dec) * $divisor;
+               $frac = sprintf("%0{$dec}d", round2($frac, 0));
                $and = _("and");
        $frac = " $and $frac/$divisor";
     }
     else
        $frac = "";
     return _number_to_words(intval($amount)) . $frac;
-}    
+}
 
 function get_js_open_window($width, $height)
 {