X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep210.php;h=98b4a9b024c232eab641a40e3b7d9fdfbd3188ad;hb=48589f9ce6c51bb25e2fa8ed83c57d9dfa485e44;hp=7f6b53b65e20c5e23e3b65faec3a36a629b20af7;hpb=52cb07f22b3c471b08339236ae5bcb9c07ee779e;p=fa-stable.git diff --git a/reporting/rep210.php b/reporting/rep210.php index 7f6b53b6..98b4a9b0 100644 --- a/reporting/rep210.php +++ b/reporting/rep210.php @@ -32,33 +32,24 @@ 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."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 - FROM ".TB_PREF."supp_trans, ".TB_PREF."suppliers - WHERE ".TB_PREF."supp_trans.supplier_id = ".TB_PREF."suppliers.supplier_id - AND ".TB_PREF."supp_trans.type = ".db_escape($type)." - AND ".TB_PREF."supp_trans.trans_no = ".db_escape($trans_no); + $sql = "SELECT trans.*, + (trans.ov_amount+trans.ov_gst) AS Total, + trans.ov_discount, + supplier.supp_name, supplier.supp_account_no, + supplier.curr_code, supplier.payment_terms, supplier.gst_no AS tax_id, + supplier.address + FROM " + .TB_PREF."supp_trans trans," + .TB_PREF."suppliers supplier + WHERE trans.supplier_id = supplier.supplier_id + AND trans.type = ".db_escape($type)." + AND trans.trans_no = ".db_escape($trans_no); $result = db_query($sql, "The remittance cannot be retrieved"); if (db_num_rows($result) == 0) return false; 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,15 +61,17 @@ function print_remittances() $currency = $_POST['PARAM_2']; $email = $_POST['PARAM_3']; $comments = $_POST['PARAM_4']; + $orientation = $_POST['PARAM_5']; - if ($from == null) - $from = 0; - if ($to == null) - $to = 0; + if (!$from || !$to) return; + + $orientation = ($orientation ? 'L' : 'P'); $dec = user_price_dec(); $fno = explode("-", $from); $tno = explode("-", $to); + $from = min($fno[0], $tno[0]); + $to = max($fno[0], $tno[0]); $cols = array(4, 85, 150, 225, 275, 360, 450, 515); @@ -90,15 +83,11 @@ 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 = $fno[0]; $i <= $tno[0]; $i++) + for ($i = $from; $i <= $to; $i++) { if ($fno[0] == $tno[0]) $types = array($fno[1]); @@ -108,35 +97,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']); - $linetype = true; $doctype = ST_SUPPAYMENT; - include($path_to_root . "/reporting/includes/doctext.inc"); $total_allocated = 0; - $rep->TextCol(0, 4, $doc_Towards, -2); + $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); @@ -153,34 +143,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, $doc_Total_Allocated, -2); + $rep->TextCol(3, 6, _("Total Allocated"), -2); $rep->AmountCol(6, 7, $total_allocated, $dec, -2); $rep->NewLine(); - $rep->TextCol(3, 6, $doc_Left_To_Allocate, -2); + $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, $doc_Total_Payment, - 2); + $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, $doc_Order_no . " " . $myrow['reference'], $myrow); + $rep->End($email); } - } + } } if ($email == 0) $rep->End(); } -?> \ No newline at end of file