Fixed typo in Suppliers Report.

[fa-stable.git] / reporting / rep210.php

diff --git a/reporting/rep210.php b/reporting/rep210.php
index 1b80b72e8368814d54efb411a981ce736be07519..9f14a1ae2975ad8fd72ae6dcbb96aab7c0b17749 100644 (file)
--- a/reporting/rep210.php
+++ b/reporting/rep210.php
@@ -33,7 +33,8 @@ print_remittances();
 function get_remittance($type, $trans_no)
 {
        $sql = "SELECT ".TB_PREF."supp_trans.*, 
-               (".TB_PREF."supp_trans.ov_amount+".TB_PREF."supp_trans.ov_gst+".TB_PREF."supp_trans.ov_discount) AS Total, 
+               (".TB_PREF."supp_trans.ov_amount+".TB_PREF."supp_trans.ov_gst) AS Total,
+               ".TB_PREF."supp_trans.ov_discount,
                ".TB_PREF."suppliers.supp_name,  ".TB_PREF."suppliers.supp_account_no, 
                ".TB_PREF."suppliers.curr_code, ".TB_PREF."suppliers.payment_terms, ".TB_PREF."suppliers.gst_no AS tax_id, 
                ".TB_PREF."suppliers.address
@@ -47,18 +48,6 @@ function get_remittance($type, $trans_no)
     return db_fetch($result);
 }
 
-function get_allocations_for_remittance($supplier_id, $type, $trans_no)
-{
-       $sql = get_alloc_supp_sql("amt, supp_reference, trans.alloc", "trans.trans_no = alloc.trans_no_to
-               AND trans.type = alloc.trans_type_to
-               AND alloc.trans_no_from=".db_escape($trans_no)."
-               AND alloc.trans_type_from=".db_escape($type)."
-               AND trans.supplier_id=".db_escape($supplier_id),
-               TB_PREF."supp_allocations as alloc");
-       $sql .= " ORDER BY trans_no";
-       return db_query($sql, "Cannot retreive alloc to transactions");
-}
-
 function print_remittances()
 {
        global $path_to_root, $systypes_array;
@@ -70,9 +59,11 @@ function print_remittances()
        $currency = $_POST['PARAM_2'];
        $email = $_POST['PARAM_3'];
        $comments = $_POST['PARAM_4'];
+       $orientation = $_POST['PARAM_5'];
 
        if (!$from || !$to) return;
 
+       $orientation = ($orientation ? 'L' : 'P');
        $dec = user_price_dec();
 
        $fno = explode("-", $from);
@@ -90,13 +81,9 @@ function print_remittances()
        $cur = get_company_Pref('curr_default');
 
        if ($email == 0)
-       {
-               $rep = new FrontReport(_('REMITTANCE'), "RemittanceBulk", user_pagesize());
-               $rep->SetHeaderType('Header2');
-               $rep->currency = $cur;
-               $rep->Font();
-               $rep->Info($params, $cols, null, $aligns);
-       }
+               $rep = new FrontReport(_('REMITTANCE'), "RemittanceBulk", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+       recalculate_cols($cols);
 
        for ($i = $from; $i <= $to; $i++)
        {
@@ -108,33 +95,36 @@ function print_remittances()
                {
                        $myrow = get_remittance($j, $i);
                        if (!$myrow)
-                               continue;                       
-                       $baccount = get_default_bank_account($myrow['curr_code']);
-                       $params['bankaccount'] = $baccount['id'];
+                               continue;
+                       if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
+                               continue;
+                       }
+                       $res = get_bank_trans($j, $i);
+                       $baccount = db_fetch($res);
+                       $params['bankaccount'] = $baccount['bank_act'];
 
                        if ($email == 1)
                        {
-                               $rep = new FrontReport("", "", user_pagesize());
-                               $rep->SetHeaderType('Header2');
-                               $rep->currency = $cur;
-                               $rep->Font();
+                               $rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
                                $rep->title = _('REMITTANCE');
                                $rep->filename = "Remittance" . $i . ".pdf";
-                               $rep->Info($params, $cols, null, $aligns);
                        }
-                       else
-                               $rep->title = _('REMITTANCE');
+                       $rep->currency = $cur;
+                       $rep->Font();
+                       $rep->Info($params, $cols, null, $aligns);
+
                        $contacts = get_supplier_contacts($myrow['supplier_id'], 'invoice');
                        $rep->SetCommonData($myrow, null, $myrow, $baccount, ST_SUPPAYMENT, $contacts);
+                       $rep->SetHeaderType('Header2');
                        $rep->NewPage();
-                       $result = get_allocations_for_remittance($myrow['supplier_id'], $myrow['type'], $myrow['trans_no']);
+                       $result = get_allocatable_to_supp_transactions($myrow['supplier_id'], $myrow['trans_no'], $myrow['type']);
 
                        $doctype = ST_SUPPAYMENT;
 
                        $total_allocated = 0;
                        $rep->TextCol(0, 4,     _("As advance / full / part / payment towards:"), -2);
                        $rep->NewLine(2);
-                       
+
                        while ($myrow2=db_fetch($result))
                        {
                                $rep->TextCol(0, 1,     $systypes_array[$myrow2['type']], -2);
@@ -151,34 +141,48 @@ function print_remittances()
                                        $rep->NewPage();
                        }
 
-                       $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
+                       $memo = get_comments_string($j, $i);
+                       if ($memo != "")
+                       {
+                               $rep->NewLine();
+                               $rep->TextColLines(1, 5, $memo, -2);
+                       }
+                       $rep->row = $rep->bottomMargin + (16 * $rep->lineHeight);
 
                        $rep->TextCol(3, 6, _("Total Allocated"), -2);
                        $rep->AmountCol(6, 7, $total_allocated, $dec, -2);
                        $rep->NewLine();
                        $rep->TextCol(3, 6, _("Left to Allocate"), -2);
                        $myrow['Total'] *= -1;
-                       $rep->AmountCol(6, 7, $myrow['Total'] - $total_allocated, $dec, -2);
+                       $myrow['ov_discount'] *= -1;
+                       $rep->AmountCol(6, 7, $myrow['Total'] + $myrow['ov_discount'] - $total_allocated, $dec, -2);
+                       if (floatcmp($myrow['ov_discount'], 0))
+                       {
+                               $rep->NewLine();
+                               $rep->TextCol(3, 6, _("Discount"), - 2);
+                               $rep->AmountCol(6, 7, -$myrow['ov_discount'], $dec, -2);
+                       }       
+
                        $rep->NewLine();
                        $rep->Font('bold');
                        $rep->TextCol(3, 6, _("TOTAL REMITTANCE"), - 2);
                        $rep->AmountCol(6, 7, $myrow['Total'], $dec, -2);
+
                        $words = price_in_words($myrow['Total'], ST_SUPPAYMENT);
                        if ($words != "")
                        {
                                $rep->NewLine(2);
                                $rep->TextCol(1, 7, $myrow['curr_code'] . ": " . $words, - 2);
-                       }       
+                       }
                        $rep->Font();
                        if ($email == 1)
                        {
                                $myrow['DebtorName'] = $myrow['supp_name'];
                                $rep->End($email);
                        }
-               }       
+               }
        }
        if ($email == 0)
                $rep->End();
 }
 
-?>
\ No newline at end of file