Release 2.3.9 and rerun of some files

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

diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc
index aaf634dd6e9de0e2b8a45c1dec2434afd44d4035..14d1eb021347967e630ac58a3d2bc76466563c8e 100644 (file)
--- a/includes/ui/ui_view.inc
+++ b/includes/ui/ui_view.inc
@@ -391,6 +391,9 @@ function display_customer_trans_tax_details($tax_items, $columns)
        $first = true;
     while ($tax_item = db_fetch($tax_items))
     {
+       if (!$tax_item['amount'])
+               continue;
+
        $tax = number_format2($tax_item['amount'],user_price_dec());
                if (isset($suppress_tax_rates) && $suppress_tax_rates == 1)
                        $tax_type_name = $tax_item['tax_type_name'];
@@ -421,6 +424,9 @@ function display_supp_trans_tax_details($tax_items, $columns)
 {
     while ($tax_item = db_fetch($tax_items))
     {
+       if (!$tax_item['amount'])
+               continue;
+
        $tax = number_format2(abs($tax_item['amount']),user_price_dec());
        if ($tax_item['included_in_price'])
                label_row(_("Included") . " " . $tax_item['tax_type_name'] . " (" . $tax_item['rate'] . "%) "
@@ -439,16 +445,18 @@ function display_edit_tax_items($taxes, $columns, $tax_included, $leftspan=0)
 
     foreach ($taxes as $taxitem)
     {
-       if ($tax_included)
-       {
-               label_row(_("Included") . " " . $taxitem['tax_type_name'] . " (" . $taxitem['rate'] . "%) "
-                       . " " . number_format2($taxitem['Value'],user_price_dec()), "", "colspan=$columns align=right", "align=right",$leftspan);
-       }
-       else
-       {
-               label_row($taxitem['tax_type_name'] . " (" . $taxitem['rate'] . "%)",
-                       number_format2($taxitem['Value'],user_price_dec()), "colspan=$columns align=right", "align=right",$leftspan);
-               $total +=  round2($taxitem['Value'], user_price_dec());
+       if ($taxitem['Value'] != 0) {
+               if ($tax_included)
+               {
+                       label_row(_("Included") . " " . $taxitem['tax_type_name']
+                               . " " . number_format2($taxitem['Value'],user_price_dec()), "", "colspan=$columns align=right", "align=right",$leftspan);
+               }
+               else
+               {
+                       label_row($taxitem['tax_type_name'],
+                               number_format2($taxitem['Value'],user_price_dec()), "colspan=$columns align=right", "align=right",$leftspan);
+                       $total +=  round2($taxitem['Value'], user_price_dec());
+               }
        }
     }
 
@@ -466,14 +474,14 @@ function display_footer_exit()
 
 //--------------------------------------------------------------------------------------
 
-function display_allocations($alloc_result, $total)
+function display_allocations($alloc_result, $total, $payments=false)
 {
        global $systypes_array;
 
        if (!$alloc_result || db_num_rows($alloc_result) == 0)
                return;
 
-    display_heading2(_("Allocations"));
+    display_heading2(($payments ? _("Payments") : _("Allocations")));
 
     start_table(TABLESTYLE, "width=80%");
 
@@ -530,6 +538,23 @@ function display_allocations_from($person_type, $person_id, $type, $type_no, $to
        }
 }
 
+//--------------------------------------------------------------------------------------
+
+function display_allocations_to($person_type, $person_id, $type, $type_no, $total)
+{
+       switch ($person_type)
+       {
+               case PT_CUSTOMER :
+                       $alloc_result = get_allocatable_from_cust_transactions($person_id, $type_no, $type);
+                       display_allocations($alloc_result, $total, true);
+                       return;
+               case PT_SUPPLIER :
+                       $alloc_result = get_allocatable_from_supp_transactions($person_id, $type_no, $type);
+                       display_allocations($alloc_result, $total, true);
+                       return;
+       }
+}
+
 //--------------------------------------------------------------------------------------
 //
 //     Expands selected quick entry $id into GL posings and adds to cart.
@@ -633,7 +658,7 @@ function display_quick_entries(&$cart, $id, $base, $type, $descr='')
                                        {
                                                $taxgroup = $cart->tax_group_id;
                                                $rates = 0;
-                                               $res = get_tax_group_items($cart->tax_group_id);
+                                               $res = get_tax_group_rates($cart->tax_group_id);
                                                while ($row = db_fetch($res))
                                                        $rates += $row['rate'];
                                                if ($rates == 0)
@@ -709,10 +734,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) 
     { 
@@ -800,31 +825,6 @@ function reset_focus()
        unset($_POST['_focus']);
 }
 
-function get_js_png_fix()
-{
-       $js = "function fixPNG(myImage)\n"
-               . "{\n"
-               . " var arVersion = navigator.appVersion.split(\"MSIE\")\n"
-               . " var version = parseFloat(arVersion[1])\n"
-       . " if ((version >= 5.5) && (version < 7) && (document.body.filters))\n"
-       . " {\n"
-               . "  var imgID = (myImage.id) ? \"id='\" + myImage.id + \"' \" : \"\"\n"
-               . "  var imgClass = (myImage.className) ? \"class='\" + myImage.className + \"' \" : \"\"\n"
-               . "  var imgTitle = (myImage.title) ?\n"
-               . "    \"title='\" + myImage.title  + \"' \" : \"title='\" + myImage.alt + \"' \"\n"
-               . "  var imgStyle = \"display:inline-block;\" + myImage.style.cssText\n"
-               . "  var strNewHTML = \"<span \" + imgID + imgClass + imgTitle\n"
-        . "    + \" style=\\\"\" + \"width:\" + myImage.width\n"
-        . "    + \"px; height:\" + myImage.height\n"
-        . "    + \"px;\" + imgStyle + \";\"\n"
-        . "    + \"filter:progid:DXImageTransform.Microsoft.AlphaImageLoader\"\n"
-        . "    + \"(src=\'\" + myImage.src + \"\', sizingMethod='scale');\\\"></span>\"\n"
-               . "  myImage.outerHTML = strNewHTML\n"
-       . " }\n"
-               . "}\n";
-       return $js;
-}
-
 function get_js_date_picker()
 {
     global $go_debug;
@@ -1317,4 +1317,32 @@ function display_backtrace($cond=true, $msg='') {
        }
 }
 
+//
+// FIXME: $payment_services array will be moved to bank_accounts in 2.4.x
+//
+if (!isset($payment_services))
+{
+       $payment_services = array(
+               'PayPal' => "https://www.paypal.com/xclick/business=<company_email>&item_name=<comment>&amount=<amount>&currency_code=<currency>",
+       );
+}
+/*
+*      Payment link generation. Options provided during invoice generation:
+*      company_email, comment, amount, currency
+*/
+function payment_link($name, $options)
+{
+       global $payment_services;
+
+       $link = @$payment_services[$name];
+
+       if (!$link) return null;
+
+       $patterns = array();
+       foreach ($options as $id => $option)
+               $patterns['<'.$id.'>'] = urlencode($options[$id]);
+
+       return strtr($link, $patterns);
+}
+
 ?>
\ No newline at end of file