A lot of annoying layout bugs taken. Mostly from views and inquiries.

[fa-stable.git] / sales / inquiry / customer_allocation_inquiry.php

diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php
index 62cc4e9d694040fe2449db002acf3d98624a5c4e..c20262d5acbb17d3a39e14cf62dfe44d953c7123 100644 (file)
--- a/sales/inquiry/customer_allocation_inquiry.php
+++ b/sales/inquiry/customer_allocation_inquiry.php
@@ -73,20 +73,20 @@ function get_transactions()
 
        if (isset($_POST['filterType']) && $_POST['filterType'] != reserved_words::get_all())
        {
-               if ($_POST['filterType'] == '1' || $_POST['filterType'] == '2') 
+               if ($_POST['filterType'] == '1' || $_POST['filterType'] == '2')
                {
                        $sql .= " AND ".TB_PREF."debtor_trans.type = 10 ";
-               } 
-               elseif ($_POST['filterType'] == '3') 
+               }
+               elseif ($_POST['filterType'] == '3')
                {
                        $sql .= " AND ".TB_PREF."debtor_trans.type = " . systypes::cust_payment();
-               } 
-               elseif ($_POST['filterType'] == '4') 
+               }
+               elseif ($_POST['filterType'] == '4')
                {
                        $sql .= " AND ".TB_PREF."debtor_trans.type = 11 ";
                }
 
-       if ($_POST['filterType'] == '2') 
+       if ($_POST['filterType'] == '2')
        {
                $today =  date2sql(Today());
                $sql .= " AND ".TB_PREF."debtor_trans.due_date < '$today'
@@ -100,7 +100,7 @@ function get_transactions()
        }
 
 
-       if (!check_value('showSettled')) 
+       if (!check_value('showSettled'))
        {
                $sql .= " AND (round(abs(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + "
                .TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + "
@@ -140,14 +140,14 @@ table_header($th);
 $j = 1;
 $k = 0; //row colour counter
 $over_due = false;
-while ($myrow = db_fetch($result)) 
+while ($myrow = db_fetch($result))
 {
 
        if ($myrow['OverDue'] == 1 && (abs($myrow["TotalAmount"]) - $myrow["Allocated"] != 0))
        {
                start_row("class='overduebg'");
                $over_due = true;
-       } 
+       }
        else
                alt_table_row_color($k);
 
@@ -166,27 +166,26 @@ while ($myrow = db_fetch($result))
 
        if ($myrow["type"] == 10)
                $due_date_str = sql2date($myrow["due_date"]);
-       elseif ($myrow["type"] == 11 && $myrow['TotalAmount'] < 0) 
+       elseif ($myrow["type"] == 11 && $myrow['TotalAmount'] > 0)
        {
                /*its a credit note which could have an allocation */
                $allocations_str = $allocations;
 
-       } 
-       elseif ($myrow["type"] == systypes::cust_payment() && 
-               ($myrow['TotalAmount'] + $myrow['Allocated']) < 0) 
+       }
+       elseif (($myrow["type"] == systypes::cust_payment() || $myrow["type"] == systypes::bank_deposit()) &&
+               ($myrow['TotalAmount'] - $myrow['Allocated']) > 0)
        {
                /*its a receipt  which could have an allocation*/
                $allocations_str = $allocations;
 
-       } 
-       elseif ($myrow["type"] == systypes::cust_payment() && $myrow['TotalAmount'] > 0) 
+       }
+       elseif ($myrow["type"] == systypes::cust_payment() && $myrow['TotalAmount'] < 0)
        {
                /*its a negative receipt */
        }
 
        label_cell(systypes::name($myrow["type"]));
-
-       label_cell(get_customer_trans_view_str($myrow["type"], $myrow["trans_no"]));
+       label_cell(get_trans_view_str($myrow["type"], $myrow["trans_no"]));
        label_cell($myrow["reference"]);
        label_cell($preview_order_str);
        label_cell(sql2date($myrow["tran_date"]), "nowrap");
@@ -195,8 +194,10 @@ while ($myrow = db_fetch($result))
        {
                label_cell($myrow["CustName"]);
                label_cell($myrow["CustCurrCode"]);
-       }       
-       display_debit_or_credit_cells($myrow["TotalAmount"]);
+       }
+       display_debit_or_credit_cells(
+           $myrow['type']==11 || $myrow['type']==12 || $myrow['type']==2 ?
+               -$myrow["TotalAmount"] : $myrow["TotalAmount"]);
        amount_cell(abs($myrow["Allocated"]));
        amount_cell(abs($myrow["TotalAmount"]) - $myrow["Allocated"]);
        label_cell($allocations_str);
@@ -217,7 +218,7 @@ while ($myrow = db_fetch($result))
 end_table(1);
 if ($over_due)
        display_note(_("Marked items are overdue."), 0, 1, "class='overduefg'");
-       
+
 end_page();
 
 ?>