projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rerun
[fa-stable.git]
/
reporting
/
rep112.php
diff --git
a/reporting/rep112.php
b/reporting/rep112.php
index dd051b1c7f54411859790667b87baf7bc8844e67..777184d05b923338ae69836ec330758e68d37943 100644
(file)
--- a/
reporting/rep112.php
+++ b/
reporting/rep112.php
@@
-16,7
+16,7
@@
$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 Order
s
+// Title:
Receipt
s
// ----------------------------------------------------------------
$path_to_root="..";
// ----------------------------------------------------------------
$path_to_root="..";
@@
-35,7
+35,8
@@
function get_receipt($type, $trans_no)
(".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."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.curr_code, ".TB_PREF."debtors_master.payment_terms, "
+ .TB_PREF."debtors_master.tax_id AS tax_id,
".TB_PREF."debtors_master.email, ".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
".TB_PREF."debtors_master.email, ".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
@@
-109,20
+110,14
@@
function print_receipts()
$params['bankaccount'] = $baccount['id'];
$rep->title = _('RECEIPT');
$params['bankaccount'] = $baccount['id'];
$rep->title = _('RECEIPT');
- $rep->SetCommonData($myrow, null, $myrow, $baccount, ST_CUSTPAYMENT);
+ $contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no']);
+ $rep->SetCommonData($myrow, null, $myrow, $baccount, ST_CUSTPAYMENT, $contacts);
$rep->NewPage();
$result = get_allocations_for_receipt($myrow['debtor_no'], $myrow['type'], $myrow['trans_no']);
$linetype = true;
$doctype = ST_CUSTPAYMENT;
$rep->NewPage();
$result = get_allocations_for_receipt($myrow['debtor_no'], $myrow['type'], $myrow['trans_no']);
$linetype = true;
$doctype = ST_CUSTPAYMENT;
- if ($rep->currency != $myrow['curr_code'])
- {
- include($path_to_root . "/reporting/includes/doctext2.inc");
- }
- else
- {
- include($path_to_root . "/reporting/includes/doctext.inc");
- }
+ include($path_to_root . "/reporting/includes/doctext.inc");
$total_allocated = 0;
$rep->TextCol(0, 4, $doc_Towards, -2);
$total_allocated = 0;
$rep->TextCol(0, 4, $doc_Towards, -2);