projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed slow sql for po related invoices/credits.
[fa-stable.git]
/
reporting
/
rep210.php
diff --git
a/reporting/rep210.php
b/reporting/rep210.php
index f25b792543661359c681f12216a107c2814bde31..7f6b53b65e20c5e23e3b65faec3a36a629b20af7 100644
(file)
--- a/
reporting/rep210.php
+++ b/
reporting/rep210.php
@@
-16,13
+16,14
@@
$page_security = $_POST['PARAM_0'] == $_POST['PARAM_1'] ?
// $ Revision: 2.0 $
// Creator: Joe Hunt
// date_: 2005-05-19
// $ Revision: 2.0 $
// Creator: Joe Hunt
// date_: 2005-05-19
-// Title: Purchase
Orders
+// Title: Purchase
Remittance
// ----------------------------------------------------------------
$path_to_root="..";
include_once($path_to_root . "/includes/session.inc");
include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/includes/data_checks.inc");
// ----------------------------------------------------------------
$path_to_root="..";
include_once($path_to_root . "/includes/session.inc");
include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/includes/data_checks.inc");
+include_once($path_to_root . "/includes/db/crm_contacts_db.inc");
//----------------------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------------------
@@
-33,9
+34,9
@@
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,
{
$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.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.curr_code, ".TB_PREF."suppliers.payment_terms, ".TB_PREF."suppliers.gst_no AS tax_id,
- ".TB_PREF."suppliers.
email, ".TB_PREF."suppliers.address, ".TB_PREF."suppliers.contact
+ ".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)."
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)."
@@
-90,7
+91,8
@@
function print_remittances()
if ($email == 0)
{
if ($email == 0)
{
- $rep = new FrontReport(_('PURCHASE ORDER'), "PurchaseOrderBulk", user_pagesize());
+ $rep = new FrontReport(_('REMITTANCE'), "RemittanceBulk", user_pagesize());
+ $rep->SetHeaderType('Header2');
$rep->currency = $cur;
$rep->Font();
$rep->Info($params, $cols, null, $aligns);
$rep->currency = $cur;
$rep->Font();
$rep->Info($params, $cols, null, $aligns);
@@
-103,8
+105,6
@@
function print_remittances()
else
$types = array(ST_BANKPAYMENT, ST_SUPPAYMENT, ST_SUPPCREDIT);
foreach ($types as $j)
else
$types = array(ST_BANKPAYMENT, ST_SUPPAYMENT, ST_SUPPCREDIT);
foreach ($types as $j)
- //for ($j = ST_BANKPAYMENT; $j <= ST_SUPPAYMENT; $j = ($j == ST_BANKPAYMENT ? ST_SUPPAYMENT : 999))
- //for ($j = $ft; $j <= $tt; $j = ($j == ST_BANKPAYMENT ? ST_SUPPAYMENT : 999))
{
$myrow = get_remittance($j, $i);
if (!$myrow)
{
$myrow = get_remittance($j, $i);
if (!$myrow)
@@
-115,6
+115,7
@@
function print_remittances()
if ($email == 1)
{
$rep = new FrontReport("", "", user_pagesize());
if ($email == 1)
{
$rep = new FrontReport("", "", user_pagesize());
+ $rep->SetHeaderType('Header2');
$rep->currency = $cur;
$rep->Font();
$rep->title = _('REMITTANCE');
$rep->currency = $cur;
$rep->Font();
$rep->title = _('REMITTANCE');
@@
-123,10
+124,19
@@
function print_remittances()
}
else
$rep->title = _('REMITTANCE');
}
else
$rep->title = _('REMITTANCE');
- $rep->Header2($myrow, null, $myrow, $baccount, ST_SUPPAYMENT);
+ $contacts = get_supplier_contacts($myrow['supplier_id'], 'invoice');
+ $rep->SetCommonData($myrow, null, $myrow, $baccount, ST_SUPPAYMENT, $contacts);
+ $rep->NewPage();
$result = get_allocations_for_remittance($myrow['supplier_id'], $myrow['type'], $myrow['trans_no']);
$result = get_allocations_for_remittance($myrow['supplier_id'], $myrow['type'], $myrow['trans_no']);
+ $linetype = true;
+ $doctype = ST_SUPPAYMENT;
+ include($path_to_root . "/reporting/includes/doctext.inc");
+
$total_allocated = 0;
$total_allocated = 0;
+ $rep->TextCol(0, 4, $doc_Towards, -2);
+ $rep->NewLine(2);
+
while ($myrow2=db_fetch($result))
{
$rep->TextCol(0, 1, $systypes_array[$myrow2['type']], -2);
while ($myrow2=db_fetch($result))
{
$rep->TextCol(0, 1, $systypes_array[$myrow2['type']], -2);
@@
-140,20
+150,10
@@
function print_remittances()
$total_allocated += $myrow2['amt'];
$rep->NewLine(1);
if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
$total_allocated += $myrow2['amt'];
$rep->NewLine(1);
if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
- $rep->
Header2($myrow, null, $myrow, $baccount, ST_SUPPAYMENT
);
+ $rep->
NewPage(
);
}
$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
}
$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
- $linetype = true;
- $doctype = ST_SUPPAYMENT;
- if ($rep->currency != $myrow['curr_code'])
- {
- include($path_to_root . "/reporting/includes/doctext2.inc");
- }
- else
- {
- include($path_to_root . "/reporting/includes/doctext.inc");
- }
$rep->TextCol(3, 6, $doc_Total_Allocated, -2);
$rep->AmountCol(6, 7, $total_allocated, $dec, -2);
$rep->TextCol(3, 6, $doc_Total_Allocated, -2);
$rep->AmountCol(6, 7, $total_allocated, $dec, -2);
@@
-165,12
+165,16
@@
function print_remittances()
$rep->Font('bold');
$rep->TextCol(3, 6, $doc_Total_Payment, - 2);
$rep->AmountCol(6, 7, $myrow['Total'], $dec, -2);
$rep->Font('bold');
$rep->TextCol(3, 6, $doc_Total_Payment, - 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)
{
$rep->Font();
if ($email == 1)
{
- $myrow['contact_email'] = $myrow['email'];
$myrow['DebtorName'] = $myrow['supp_name'];
$myrow['DebtorName'] = $myrow['supp_name'];
- if ($myrow['contact'] != '') $myrow['DebtorName'] = $myrow['contact'];
$rep->End($email, $doc_Order_no . " " . $myrow['reference'], $myrow);
}
}
$rep->End($email, $doc_Order_no . " " . $myrow['reference'], $myrow);
}
}