X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep112.php;h=a70b78cb112b47d8fbf33a72b1a53a11fb62e72d;hb=a31195793c023906ab5da62f06ab84aefed445c3;hp=f04ee1d77f5cd1df851782269101da5492f0504d;hpb=74d962f7a82f2fd9543bf35faaa5026403b98cee;p=fa-stable.git diff --git a/reporting/rep112.php b/reporting/rep112.php index f04ee1d7..a70b78cb 100644 --- a/reporting/rep112.php +++ b/reporting/rep112.php @@ -31,35 +31,26 @@ print_receipts(); //---------------------------------------------------------------------------------------------------- function get_receipt($type, $trans_no) { - $sql = "SELECT ".TB_PREF."debtor_trans.*, - (".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 + ".TB_PREF."debtor_trans.ov_discount) AS Total, - ".TB_PREF."debtors_master.name AS DebtorName, ".TB_PREF."debtors_master.debtor_ref, - ".TB_PREF."debtors_master.curr_code, ".TB_PREF."debtors_master.payment_terms, " - .TB_PREF."debtors_master.tax_id AS tax_id, - ".TB_PREF."debtors_master.address - FROM ".TB_PREF."debtor_trans, ".TB_PREF."debtors_master - WHERE ".TB_PREF."debtor_trans.debtor_no = ".TB_PREF."debtors_master.debtor_no - AND ".TB_PREF."debtor_trans.type = ".db_escape($type)." - AND ".TB_PREF."debtor_trans.trans_no = ".db_escape($trans_no); + $sql = "SELECT trans.*, + (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax) AS Total, + trans.ov_discount, + debtor.name AS DebtorName, + debtor.debtor_ref, + debtor.curr_code, + debtor.payment_terms, + debtor.tax_id AS tax_id, + debtor.address + FROM ".TB_PREF."debtor_trans trans," + .TB_PREF."debtors_master debtor + WHERE trans.debtor_no = debtor.debtor_no + 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_receipt($debtor_id, $type, $trans_no) -{ - $sql = get_alloc_trans_sql("amt, trans.reference, trans.alloc", "trans.trans_no = alloc.trans_no_to - AND trans.type = alloc.trans_type_to - AND alloc.trans_no_from=$trans_no - AND alloc.trans_type_from=$type - AND trans.debtor_no=".db_escape($debtor_id), - TB_PREF."cust_allocations as alloc"); - $sql .= " ORDER BY trans_no"; - return db_query($sql, "Cannot retreive alloc to transactions"); -} - function print_receipts() { global $path_to_root, $systypes_array; @@ -70,9 +61,11 @@ function print_receipts() $to = $_POST['PARAM_1']; $currency = $_POST['PARAM_2']; $comments = $_POST['PARAM_3']; + $orientation = $_POST['PARAM_4']; if (!$from || !$to) return; + $orientation = ($orientation ? 'L' : 'P'); $dec = user_price_dec(); $fno = explode("-", $from); @@ -89,38 +82,43 @@ function print_receipts() $cur = get_company_Pref('curr_default'); - $rep = new FrontReport(_('RECEIPT'), "ReceiptBulk", user_pagesize()); - $rep->SetHeaderType('Header2'); + $rep = new FrontReport(_('RECEIPT'), "ReceiptBulk", user_pagesize(), 9, $orientation); + if ($orientation == 'L') + recalculate_cols($cols); $rep->currency = $cur; $rep->Font(); $rep->Info($params, $cols, null, $aligns); for ($i = $from; $i <= $to; $i++) { - if ($from == $to) - $types = array($from); + if ($fno[0] == $tno[0]) + $types = array($fno[1]); else $types = array(ST_BANKDEPOSIT, ST_CUSTPAYMENT); foreach ($types as $j) { $myrow = get_receipt($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']; - $rep->title = _('RECEIPT'); $contacts = get_branch_contacts($myrow['branch_code'], 'invoice', $myrow['debtor_no']); $rep->SetCommonData($myrow, null, $myrow, $baccount, ST_CUSTPAYMENT, $contacts); + $rep->SetHeaderType('Header2'); $rep->NewPage(); - $result = get_allocations_for_receipt($myrow['debtor_no'], $myrow['type'], $myrow['trans_no']); + $result = get_allocatable_to_cust_transactions($myrow['debtor_no'], $myrow['trans_no'], $myrow['type']); $doctype = ST_CUSTPAYMENT; $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); @@ -137,23 +135,37 @@ function print_receipts() $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); - $rep->AmountCol(6, 7, $myrow['Total'] - $total_allocated, $dec, -2); + $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 RECEIPT"), - 2); $rep->AmountCol(6, 7, $myrow['Total'], $dec, -2); + $words = price_in_words($myrow['Total'], ST_CUSTPAYMENT); if ($words != "") { $rep->NewLine(1); $rep->TextCol(0, 7, $myrow['curr_code'] . ": " . $words, - 2); - } + } $rep->Font(); $rep->NewLine(); $rep->TextCol(6, 7, _("Received / Sign"), - 2); @@ -168,9 +180,8 @@ function print_receipts() $rep->TextCol(4, 5, _("Branch"), - 2); $rep->TextCol(5, 6, "__________________", - 2); $rep->TextCol(6, 7, "__________________"); - } + } } $rep->End(); } -?> \ No newline at end of file