Menu
▾
▴
web-erp-svn
|
From: <tim...@us...> - 2011-11-26 21:46:17
|
Revision: 4755
http://web-erp.svn.sourceforge.net/web-erp/?rev=4755&view=rev
Author: tim_schofield
Date: 2011-11-26 21:46:11 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
Correct typos in html
Modified Paths:
--------------
trunk/PrintCustTransPortrait.php
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2011-11-26 20:51:02 UTC (rev 4754)
+++ trunk/PrintCustTransPortrait.php 2011-11-26 21:46:11 UTC (rev 4755)
@@ -76,8 +76,8 @@
nobble the invoice reprints */
// check if the user has set a default bank account for invoices, if not leave it blank
- $sql = "SELECT bankaccounts.invoice,
- bankaccounts.bankaccountnumber,
+ $sql = "SELECT bankaccounts.invoice,
+ bankaccounts.bankaccountnumber,
bankaccounts.bankaccountcode
FROM bankaccounts
WHERE bankaccounts.invoice = '1'";
@@ -146,22 +146,22 @@
debtortrans.debtorno,
debtortrans.branchcode,
currencies.decimalplaces
- FROM debtortrans INNER JOIN debtorsmaster
- ON debtortrans.debtorno=debtorsmaster.debtorno
- INNER JOIN custbranch
- ON debtortrans.debtorno=custbranch.debtorno
+ FROM debtortrans INNER JOIN debtorsmaster
+ ON debtortrans.debtorno=debtorsmaster.debtorno
+ INNER JOIN custbranch
+ ON debtortrans.debtorno=custbranch.debtorno
AND debtortrans.branchcode=custbranch.branchcode
- INNER JOIN salesorders
+ INNER JOIN salesorders
ON debtortrans.order_ = salesorders.orderno
- INNER JOIN shippers
- ON debtortrans.shipvia=shippers.shipper_id
- INNER JOIN salesman
- ON custbranch.salesman=salesman.salesmancode
- INNER JOIN locations
- ON salesorders.fromstkloc=locations.loccode
- INNER JOIN paymentterms
+ INNER JOIN shippers
+ ON debtortrans.shipvia=shippers.shipper_id
+ INNER JOIN salesman
+ ON custbranch.salesman=salesman.salesmancode
+ INNER JOIN locations
+ ON salesorders.fromstkloc=locations.loccode
+ INNER JOIN paymentterms
ON debtorsmaster.paymentterms=paymentterms.termsindicator
- INNER JOIN currencies
+ INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
WHERE debtortrans.type=10
AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'";
@@ -205,16 +205,16 @@
debtortrans.branchcode,
paymentterms.terms,
currencies.decimalplaces
- FROM debtortrans INNER JOIN debtorsmaster
- ON debtortrans.debtorno=debtorsmaster.debtorno
- INNER JOIN custbranch
- ON debtortrans.debtorno=custbranch.debtorno
+ FROM debtortrans INNER JOIN debtorsmaster
+ ON debtortrans.debtorno=debtorsmaster.debtorno
+ INNER JOIN custbranch
+ ON debtortrans.debtorno=custbranch.debtorno
AND debtortrans.branchcode=custbranch.branchcode
- INNER JOIN salesman
- ON custbranch.salesman=salesman.salesmancode
- INNER JOIN paymentterms
+ INNER JOIN salesman
+ ON custbranch.salesman=salesman.salesmancode
+ INNER JOIN paymentterms
ON debtorsmaster.paymentterms=paymentterms.termsindicator
- INNER JOIN currencies
+ INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
WHERE debtortrans.type=11
AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'";
@@ -257,7 +257,7 @@
stockmaster.units,
stockmoves.stkmoveno,
stockmaster.decimalplaces
- FROM stockmoves INNER JOIN stockmaster
+ FROM stockmoves INNER JOIN stockmaster
ON stockmoves.stockid = stockmaster.stockid
WHERE stockmoves.type=10
AND stockmoves.transno='" . filter_number_format($FromTransNo) . "'
@@ -276,7 +276,7 @@
stockmaster.units,
stockmoves.stkmoveno,
stockmaster.decimalplaces
- FROM stockmoves INNER JOIN stockmaster
+ FROM stockmoves INNER JOIN stockmaster
ON stockmoves.stockid = stockmaster.stockid
WHERE stockmoves.type=11
AND stockmoves.transno='" . filter_number_format($FromTransNo) . "'
@@ -332,7 +332,7 @@
if ($myrow2['controlled']==1){
- $GetControlMovts = DB_query("SELECT moveqty,
+ $GetControlMovts = DB_query("SELECT moveqty,
serialno
FROM stockserialmoves
WHERE stockmoveno='" . $myrow2['stkmoveno'] . "'",$db);
@@ -493,7 +493,7 @@
$FileName = $_SESSION['reports_dir'] . '/' . $_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $_GET['FromTransNo'] . '.pdf';
$pdf->Output($FileName,'F');
$mail = new htmlMimeMail();
-
+
$Attachment = $mail->getFile($FileName);
$mail->setText(_('Please find attached') . ' ' . $InvOrCredit . ' ' . $_GET['FromTransNo'] );
$mail->SetSubject($InvOrCredit . ' ' . $_GET['FromTransNo']);
@@ -511,7 +511,7 @@
} else { //its not an email just print the invoice to PDF
$pdf->OutputD($_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $FromTransNo . '.pdf');
-
+
}
$pdf->__destruct();
} else { /*The option to print PDF was not hit */
@@ -525,14 +525,14 @@
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
+
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Print Invoices or Credit Notes (Portrait Mode)') . '</p>';
-
+
echo '<table class="selection">
<tr>
<td>' . _('Print Invoices or Credit Notes') . '</td>
<td><select name="InvOrCredit">';
-
+
if ($InvOrCredit=='Invoice' OR !isset($InvOrCredit)){
echo '<option selected value="Invoice">' . _('Invoices') . '</option>';
@@ -547,7 +547,7 @@
echo '<tr>
<td>' . _('Print EDI Transactions') . '</td>
<td><select name="PrintEDI">';
-
+
if ($InvOrCredit=='Invoice' OR !isset($InvOrCredit)){
echo '<option selected value="No">' . _('Do not Print PDF EDI Transactions') . '</option>';
@@ -639,22 +639,22 @@
salesman.salesmanname,
debtortrans.debtorno,
currencies.decimalplaces
- FROM debtortrans INNER JOIN debtorsmaster
- ON debtortrans.debtorno=debtorsmaster.debtorno
- INNER JOIN custbranch
- ON debtortrans.debtorno=custbranch.debtorno
+ FROM debtortrans INNER JOIN debtorsmaster
+ ON debtortrans.debtorno=debtorsmaster.debtorno
+ INNER JOIN custbranch
+ ON debtortrans.debtorno=custbranch.debtorno
AND debtortrans.branchcode=custbranch.branchcode
- INNER JOIN salesorders
+ INNER JOIN salesorders
ON debtortrans.order_ = salesorders.orderno
- INNER JOIN shippers
- ON debtortrans.shipvia=shippers.shipper_id
- INNER JOIN salesman
- ON custbranch.salesman=salesman.salesmancode
- INNER JOIN locations
- ON salesorders.fromstkloc=locations.loccode
- INNER JOIN paymentterms
+ INNER JOIN shippers
+ ON debtortrans.shipvia=shippers.shipper_id
+ INNER JOIN salesman
+ ON custbranch.salesman=salesman.salesmancode
+ INNER JOIN locations
+ ON salesorders.fromstkloc=locations.loccode
+ INNER JOIN paymentterms
ON debtorsmaster.paymentterms=paymentterms.termsindicator
- INNER JOIN currencies
+ INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
WHERE debtortrans.type=10
AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'";
@@ -685,16 +685,16 @@
salesman.salesmanname,
debtortrans.debtorno,
currencies.decimalplaces
- FROM debtortrans INNER JOIN debtorsmaster
- ON debtortrans.debtorno=debtorsmaster.debtorno
- INNER JOIN custbranch
- ON debtortrans.debtorno=custbranch.debtorno
+ FROM debtortrans INNER JOIN debtorsmaster
+ ON debtortrans.debtorno=debtorsmaster.debtorno
+ INNER JOIN custbranch
+ ON debtortrans.debtorno=custbranch.debtorno
AND debtortrans.branchcode=custbranch.branchcode
- INNER JOIN salesman
- ON custbranch.salesman=salesman.salesmancode
- INNER JOIN paymentterms
+ INNER JOIN salesman
+ ON custbranch.salesman=salesman.salesmancode
+ INNER JOIN paymentterms
ON debtorsmaster.paymentterms=paymentterms.termsindicator
- INNER JOIN currencies
+ INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
WHERE debtortrans.type=11
AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'";
@@ -763,14 +763,14 @@
</tr>
<tr>
<td bgcolor="#eee">';
- echo $myrow['name'] .
- '<br />' . $myrow['address1'] .
- '<br />' . $myrow['address2'] .
- '<br />' . $myrow['address3'] .
- '<br />' . $myrow['address4'] .
- '<br />' . $myrow['address5'] .
+ echo $myrow['name'] .
+ '<br />' . $myrow['address1'] .
+ '<br />' . $myrow['address2'] .
+ '<br />' . $myrow['address3'] .
+ '<br />' . $myrow['address4'] .
+ '<br />' . $myrow['address5'] .
'<br />' . $myrow['address6'];
-
+
echo '</td>
</tr>
</table>';
@@ -789,22 +789,22 @@
<td align=left bgcolor="#bbb"><b>' . _('Delivered To') . ':</b></td>
</tr>';
echo '<tr>
- <td bgcolor="#eee">' .$myrow['brname'] .
- '<br />' . $myrow['braddress1'] .
- '<br />' . $myrow['braddress2'] .
- '<br />' . $myrow['braddress3'] .
- '<br />' . $myrow['braddress4'] .
- '<br />' . $myrow['braddress5'] .
- '<br />' . $myrow['braddress6'] .
+ <td bgcolor="#eee">' .$myrow['brname'] .
+ '<br />' . $myrow['braddress1'] .
+ '<br />' . $myrow['braddress2'] .
+ '<br />' . $myrow['braddress3'] .
+ '<br />' . $myrow['braddress4'] .
+ '<br />' . $myrow['braddress5'] .
+ '<br />' . $myrow['braddress6'] .
'</td>';
- echo '<td bgcolor="#eee">' . $myrow['deliverto'] .
- '<br />' . $myrow['deladd1'] .
- '<br />' . $myrow['deladd2'] .
- '<br />' . $myrow['deladd3'] .
- '<br />' . $myrow['deladd4'] .
- '<br />' . $myrow['deladd5'] .
- '<br />' . $myrow['deladd6'] .
+ echo '<td bgcolor="#eee">' . $myrow['deliverto'] .
+ '<br />' . $myrow['deladd1'] .
+ '<br />' . $myrow['deladd2'] .
+ '<br />' . $myrow['deladd3'] .
+ '<br />' . $myrow['deladd4'] .
+ '<br />' . $myrow['deladd5'] .
+ '<br />' . $myrow['deladd6'] .
'</td>';
echo '</tr>
</table><hr>';
@@ -844,7 +844,7 @@
WHERE stockmoves.type=10
AND stockmoves.transno='" . filter_number_format($FromTransNo) . "'
AND stockmoves.show_on_inv_crds=1";
-
+
} else { /* then its a credit note */
echo '<table width="50%">
@@ -852,13 +852,13 @@
<td align=left bgcolor="#BBBBBB"><b>' . _('Branch') . ':</b></td>
</tr>';
echo '<tr>
- <td bgcolor="#EEEEEE">' . $myrow['brname'] .
- '<br />' . $myrow['braddress1'] .
- '<br />' . $myrow['braddress2'] .
- '<br />' . $myrow['braddress3'] .
- '<br />' . $myrow['braddress4'] .
- '<br />' . $myrow['braddress5'] .
- '<br />' . $myrow['braddress6'] .
+ <td bgcolor="#EEEEEE">' . $myrow['brname'] .
+ '<br />' . $myrow['braddress1'] .
+ '<br />' . $myrow['braddress2'] .
+ '<br />' . $myrow['braddress3'] .
+ '<br />' . $myrow['braddress4'] .
+ '<br />' . $myrow['braddress5'] .
+ '<br />' . $myrow['braddress6'] .
'</td>
</tr></table>';
echo '<hr>
@@ -953,9 +953,9 @@
$DisplayPrice,
$DisplayDiscount,
$DisplayNet);
-
+
if (mb_strlen($myrow2['narrative'])>1){
- echo $RowStarter .
+ echo $RowStarter .
'<td></td>
<td colspan=6>' . $myrow2['narrative'] . '</td>
</tr>';
@@ -974,7 +974,7 @@
<tr>
<td valign="top"><img src="' . $_SESSION['LogoFile'] . '"></td>
<td bgcolor="#bbb"><b>';
-
+
if ($InvOrCredit=='Invoice') {
echo '<font size="4">' . _('TAX INVOICE') . ' ';
} else {
@@ -997,7 +997,7 @@
echo _('Telephone') . ': ' . $_SESSION['CompanyRecord']['telephone'] . '<br />';
echo _('Facsimile') . ': ' . $_SESSION['CompanyRecord']['fax'] . '<br />';
echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br />';
- echo '</td><td class+"number">' . _('Page') . ': ' . $PageNumber . '</td>
+ echo '</td><td class="number">' . _('Page') . ': ' . $PageNumber . '</td>
</tr>
</table>';
echo '<table class="table1">
@@ -1054,7 +1054,7 @@
echo _('Telephone') . ': ' . $_SESSION['CompanyRecord']['telephone'] . '<br />';
echo _('Facsimile') . ': ' . $_SESSION['CompanyRecord']['fax'] . '<br />';
echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br />';
- echo '</td><td class+"number">' . _('Page') . ': ' . $PageNumber . '</td>
+ echo '</td><td class="number">' . _('Page') . ': ' . $PageNumber . '</td>
</tr>
</table>';
echo '<table class="table1">
@@ -1108,7 +1108,7 @@
echo '<tr><td class="number"><b>' . _('TOTAL INVOICE') . '</b></td>
<td class="number" bgcolor="#EEEEEE"><U><b>' . $DisplayTotal . '</b></U></td></tr>';
} else {
- echo '<tr><td class+"number"><font color=RED><b>' . _('TOTAL CREDIT') . '</b></font></td>
+ echo '<tr><td class="number"><font color=RED><b>' . _('TOTAL CREDIT') . '</b></font></td>
<td class="number" bgcolor="#EEEEEE"><font color="red"><U><b>' . $DisplayTotal . '</b></u></font></td></tr>';
}
echo '</table>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2011-11-26 21:46:17
|
Revision: 4755
http://web-erp.svn.sourceforge.net/web-erp/?rev=4755&view=rev
Author: tim_schofield
Date: 2011-11-26 21:46:11 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
Correct typos in html
Modified Paths:
--------------
trunk/PrintCustTransPortrait.php
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2011-11-26 20:51:02 UTC (rev 4754)
+++ trunk/PrintCustTransPortrait.php 2011-11-26 21:46:11 UTC (rev 4755)
@@ -76,8 +76,8 @@
nobble the invoice reprints */
// check if the user has set a default bank account for invoices, if not leave it blank
- $sql = "SELECT bankaccounts.invoice,
- bankaccounts.bankaccountnumber,
+ $sql = "SELECT bankaccounts.invoice,
+ bankaccounts.bankaccountnumber,
bankaccounts.bankaccountcode
FROM bankaccounts
WHERE bankaccounts.invoice = '1'";
@@ -146,22 +146,22 @@
debtortrans.debtorno,
debtortrans.branchcode,
currencies.decimalplaces
- FROM debtortrans INNER JOIN debtorsmaster
- ON debtortrans.debtorno=debtorsmaster.debtorno
- INNER JOIN custbranch
- ON debtortrans.debtorno=custbranch.debtorno
+ FROM debtortrans INNER JOIN debtorsmaster
+ ON debtortrans.debtorno=debtorsmaster.debtorno
+ INNER JOIN custbranch
+ ON debtortrans.debtorno=custbranch.debtorno
AND debtortrans.branchcode=custbranch.branchcode
- INNER JOIN salesorders
+ INNER JOIN salesorders
ON debtortrans.order_ = salesorders.orderno
- INNER JOIN shippers
- ON debtortrans.shipvia=shippers.shipper_id
- INNER JOIN salesman
- ON custbranch.salesman=salesman.salesmancode
- INNER JOIN locations
- ON salesorders.fromstkloc=locations.loccode
- INNER JOIN paymentterms
+ INNER JOIN shippers
+ ON debtortrans.shipvia=shippers.shipper_id
+ INNER JOIN salesman
+ ON custbranch.salesman=salesman.salesmancode
+ INNER JOIN locations
+ ON salesorders.fromstkloc=locations.loccode
+ INNER JOIN paymentterms
ON debtorsmaster.paymentterms=paymentterms.termsindicator
- INNER JOIN currencies
+ INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
WHERE debtortrans.type=10
AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'";
@@ -205,16 +205,16 @@
debtortrans.branchcode,
paymentterms.terms,
currencies.decimalplaces
- FROM debtortrans INNER JOIN debtorsmaster
- ON debtortrans.debtorno=debtorsmaster.debtorno
- INNER JOIN custbranch
- ON debtortrans.debtorno=custbranch.debtorno
+ FROM debtortrans INNER JOIN debtorsmaster
+ ON debtortrans.debtorno=debtorsmaster.debtorno
+ INNER JOIN custbranch
+ ON debtortrans.debtorno=custbranch.debtorno
AND debtortrans.branchcode=custbranch.branchcode
- INNER JOIN salesman
- ON custbranch.salesman=salesman.salesmancode
- INNER JOIN paymentterms
+ INNER JOIN salesman
+ ON custbranch.salesman=salesman.salesmancode
+ INNER JOIN paymentterms
ON debtorsmaster.paymentterms=paymentterms.termsindicator
- INNER JOIN currencies
+ INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
WHERE debtortrans.type=11
AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'";
@@ -257,7 +257,7 @@
stockmaster.units,
stockmoves.stkmoveno,
stockmaster.decimalplaces
- FROM stockmoves INNER JOIN stockmaster
+ FROM stockmoves INNER JOIN stockmaster
ON stockmoves.stockid = stockmaster.stockid
WHERE stockmoves.type=10
AND stockmoves.transno='" . filter_number_format($FromTransNo) . "'
@@ -276,7 +276,7 @@
stockmaster.units,
stockmoves.stkmoveno,
stockmaster.decimalplaces
- FROM stockmoves INNER JOIN stockmaster
+ FROM stockmoves INNER JOIN stockmaster
ON stockmoves.stockid = stockmaster.stockid
WHERE stockmoves.type=11
AND stockmoves.transno='" . filter_number_format($FromTransNo) . "'
@@ -332,7 +332,7 @@
if ($myrow2['controlled']==1){
- $GetControlMovts = DB_query("SELECT moveqty,
+ $GetControlMovts = DB_query("SELECT moveqty,
serialno
FROM stockserialmoves
WHERE stockmoveno='" . $myrow2['stkmoveno'] . "'",$db);
@@ -493,7 +493,7 @@
$FileName = $_SESSION['reports_dir'] . '/' . $_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $_GET['FromTransNo'] . '.pdf';
$pdf->Output($FileName,'F');
$mail = new htmlMimeMail();
-
+
$Attachment = $mail->getFile($FileName);
$mail->setText(_('Please find attached') . ' ' . $InvOrCredit . ' ' . $_GET['FromTransNo'] );
$mail->SetSubject($InvOrCredit . ' ' . $_GET['FromTransNo']);
@@ -511,7 +511,7 @@
} else { //its not an email just print the invoice to PDF
$pdf->OutputD($_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $FromTransNo . '.pdf');
-
+
}
$pdf->__destruct();
} else { /*The option to print PDF was not hit */
@@ -525,14 +525,14 @@
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-
+
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Print Invoices or Credit Notes (Portrait Mode)') . '</p>';
-
+
echo '<table class="selection">
<tr>
<td>' . _('Print Invoices or Credit Notes') . '</td>
<td><select name="InvOrCredit">';
-
+
if ($InvOrCredit=='Invoice' OR !isset($InvOrCredit)){
echo '<option selected value="Invoice">' . _('Invoices') . '</option>';
@@ -547,7 +547,7 @@
echo '<tr>
<td>' . _('Print EDI Transactions') . '</td>
<td><select name="PrintEDI">';
-
+
if ($InvOrCredit=='Invoice' OR !isset($InvOrCredit)){
echo '<option selected value="No">' . _('Do not Print PDF EDI Transactions') . '</option>';
@@ -639,22 +639,22 @@
salesman.salesmanname,
debtortrans.debtorno,
currencies.decimalplaces
- FROM debtortrans INNER JOIN debtorsmaster
- ON debtortrans.debtorno=debtorsmaster.debtorno
- INNER JOIN custbranch
- ON debtortrans.debtorno=custbranch.debtorno
+ FROM debtortrans INNER JOIN debtorsmaster
+ ON debtortrans.debtorno=debtorsmaster.debtorno
+ INNER JOIN custbranch
+ ON debtortrans.debtorno=custbranch.debtorno
AND debtortrans.branchcode=custbranch.branchcode
- INNER JOIN salesorders
+ INNER JOIN salesorders
ON debtortrans.order_ = salesorders.orderno
- INNER JOIN shippers
- ON debtortrans.shipvia=shippers.shipper_id
- INNER JOIN salesman
- ON custbranch.salesman=salesman.salesmancode
- INNER JOIN locations
- ON salesorders.fromstkloc=locations.loccode
- INNER JOIN paymentterms
+ INNER JOIN shippers
+ ON debtortrans.shipvia=shippers.shipper_id
+ INNER JOIN salesman
+ ON custbranch.salesman=salesman.salesmancode
+ INNER JOIN locations
+ ON salesorders.fromstkloc=locations.loccode
+ INNER JOIN paymentterms
ON debtorsmaster.paymentterms=paymentterms.termsindicator
- INNER JOIN currencies
+ INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
WHERE debtortrans.type=10
AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'";
@@ -685,16 +685,16 @@
salesman.salesmanname,
debtortrans.debtorno,
currencies.decimalplaces
- FROM debtortrans INNER JOIN debtorsmaster
- ON debtortrans.debtorno=debtorsmaster.debtorno
- INNER JOIN custbranch
- ON debtortrans.debtorno=custbranch.debtorno
+ FROM debtortrans INNER JOIN debtorsmaster
+ ON debtortrans.debtorno=debtorsmaster.debtorno
+ INNER JOIN custbranch
+ ON debtortrans.debtorno=custbranch.debtorno
AND debtortrans.branchcode=custbranch.branchcode
- INNER JOIN salesman
- ON custbranch.salesman=salesman.salesmancode
- INNER JOIN paymentterms
+ INNER JOIN salesman
+ ON custbranch.salesman=salesman.salesmancode
+ INNER JOIN paymentterms
ON debtorsmaster.paymentterms=paymentterms.termsindicator
- INNER JOIN currencies
+ INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
WHERE debtortrans.type=11
AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'";
@@ -763,14 +763,14 @@
</tr>
<tr>
<td bgcolor="#eee">';
- echo $myrow['name'] .
- '<br />' . $myrow['address1'] .
- '<br />' . $myrow['address2'] .
- '<br />' . $myrow['address3'] .
- '<br />' . $myrow['address4'] .
- '<br />' . $myrow['address5'] .
+ echo $myrow['name'] .
+ '<br />' . $myrow['address1'] .
+ '<br />' . $myrow['address2'] .
+ '<br />' . $myrow['address3'] .
+ '<br />' . $myrow['address4'] .
+ '<br />' . $myrow['address5'] .
'<br />' . $myrow['address6'];
-
+
echo '</td>
</tr>
</table>';
@@ -789,22 +789,22 @@
<td align=left bgcolor="#bbb"><b>' . _('Delivered To') . ':</b></td>
</tr>';
echo '<tr>
- <td bgcolor="#eee">' .$myrow['brname'] .
- '<br />' . $myrow['braddress1'] .
- '<br />' . $myrow['braddress2'] .
- '<br />' . $myrow['braddress3'] .
- '<br />' . $myrow['braddress4'] .
- '<br />' . $myrow['braddress5'] .
- '<br />' . $myrow['braddress6'] .
+ <td bgcolor="#eee">' .$myrow['brname'] .
+ '<br />' . $myrow['braddress1'] .
+ '<br />' . $myrow['braddress2'] .
+ '<br />' . $myrow['braddress3'] .
+ '<br />' . $myrow['braddress4'] .
+ '<br />' . $myrow['braddress5'] .
+ '<br />' . $myrow['braddress6'] .
'</td>';
- echo '<td bgcolor="#eee">' . $myrow['deliverto'] .
- '<br />' . $myrow['deladd1'] .
- '<br />' . $myrow['deladd2'] .
- '<br />' . $myrow['deladd3'] .
- '<br />' . $myrow['deladd4'] .
- '<br />' . $myrow['deladd5'] .
- '<br />' . $myrow['deladd6'] .
+ echo '<td bgcolor="#eee">' . $myrow['deliverto'] .
+ '<br />' . $myrow['deladd1'] .
+ '<br />' . $myrow['deladd2'] .
+ '<br />' . $myrow['deladd3'] .
+ '<br />' . $myrow['deladd4'] .
+ '<br />' . $myrow['deladd5'] .
+ '<br />' . $myrow['deladd6'] .
'</td>';
echo '</tr>
</table><hr>';
@@ -844,7 +844,7 @@
WHERE stockmoves.type=10
AND stockmoves.transno='" . filter_number_format($FromTransNo) . "'
AND stockmoves.show_on_inv_crds=1";
-
+
} else { /* then its a credit note */
echo '<table width="50%">
@@ -852,13 +852,13 @@
<td align=left bgcolor="#BBBBBB"><b>' . _('Branch') . ':</b></td>
</tr>';
echo '<tr>
- <td bgcolor="#EEEEEE">' . $myrow['brname'] .
- '<br />' . $myrow['braddress1'] .
- '<br />' . $myrow['braddress2'] .
- '<br />' . $myrow['braddress3'] .
- '<br />' . $myrow['braddress4'] .
- '<br />' . $myrow['braddress5'] .
- '<br />' . $myrow['braddress6'] .
+ <td bgcolor="#EEEEEE">' . $myrow['brname'] .
+ '<br />' . $myrow['braddress1'] .
+ '<br />' . $myrow['braddress2'] .
+ '<br />' . $myrow['braddress3'] .
+ '<br />' . $myrow['braddress4'] .
+ '<br />' . $myrow['braddress5'] .
+ '<br />' . $myrow['braddress6'] .
'</td>
</tr></table>';
echo '<hr>
@@ -953,9 +953,9 @@
$DisplayPrice,
$DisplayDiscount,
$DisplayNet);
-
+
if (mb_strlen($myrow2['narrative'])>1){
- echo $RowStarter .
+ echo $RowStarter .
'<td></td>
<td colspan=6>' . $myrow2['narrative'] . '</td>
</tr>';
@@ -974,7 +974,7 @@
<tr>
<td valign="top"><img src="' . $_SESSION['LogoFile'] . '"></td>
<td bgcolor="#bbb"><b>';
-
+
if ($InvOrCredit=='Invoice') {
echo '<font size="4">' . _('TAX INVOICE') . ' ';
} else {
@@ -997,7 +997,7 @@
echo _('Telephone') . ': ' . $_SESSION['CompanyRecord']['telephone'] . '<br />';
echo _('Facsimile') . ': ' . $_SESSION['CompanyRecord']['fax'] . '<br />';
echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br />';
- echo '</td><td class+"number">' . _('Page') . ': ' . $PageNumber . '</td>
+ echo '</td><td class="number">' . _('Page') . ': ' . $PageNumber . '</td>
</tr>
</table>';
echo '<table class="table1">
@@ -1054,7 +1054,7 @@
echo _('Telephone') . ': ' . $_SESSION['CompanyRecord']['telephone'] . '<br />';
echo _('Facsimile') . ': ' . $_SESSION['CompanyRecord']['fax'] . '<br />';
echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br />';
- echo '</td><td class+"number">' . _('Page') . ': ' . $PageNumber . '</td>
+ echo '</td><td class="number">' . _('Page') . ': ' . $PageNumber . '</td>
</tr>
</table>';
echo '<table class="table1">
@@ -1108,7 +1108,7 @@
echo '<tr><td class="number"><b>' . _('TOTAL INVOICE') . '</b></td>
<td class="number" bgcolor="#EEEEEE"><U><b>' . $DisplayTotal . '</b></U></td></tr>';
} else {
- echo '<tr><td class+"number"><font color=RED><b>' . _('TOTAL CREDIT') . '</b></font></td>
+ echo '<tr><td class="number"><font color=RED><b>' . _('TOTAL CREDIT') . '</b></font></td>
<td class="number" bgcolor="#EEEEEE"><font color="red"><U><b>' . $DisplayTotal . '</b></u></font></td></tr>';
}
echo '</table>';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-11-27 02:36:53
|
Revision: 4756
http://web-erp.svn.sourceforge.net/web-erp/?rev=4756&view=rev
Author: daintree
Date: 2011-11-27 02:36:47 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/PrintCustTransPortrait.php
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2011-11-26 21:46:11 UTC (rev 4755)
+++ trunk/PrintCustTransPortrait.php 2011-11-27 02:36:47 UTC (rev 4756)
@@ -164,7 +164,7 @@
INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
WHERE debtortrans.type=10
- AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'";
+ AND debtortrans.transno='" . $FromTransNo . "'";
if (isset($_POST['PrintEDI']) and $_POST['PrintEDI']=='No') {
$sql = $sql . " AND debtorsmaster.ediinvoices=0";
@@ -217,7 +217,7 @@
INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
WHERE debtortrans.type=11
- AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'";
+ AND debtortrans.transno='" . $FromTransNo . "'";
if (isset($_POST['PrintEDI']) and $_POST['PrintEDI']=='No'){
@@ -260,7 +260,7 @@
FROM stockmoves INNER JOIN stockmaster
ON stockmoves.stockid = stockmaster.stockid
WHERE stockmoves.type=10
- AND stockmoves.transno='" . filter_number_format($FromTransNo) . "'
+ AND stockmoves.transno='" . $FromTransNo . "'
AND stockmoves.show_on_inv_crds=1";
} else {
/* only credit notes to be retrieved */
@@ -279,7 +279,7 @@
FROM stockmoves INNER JOIN stockmaster
ON stockmoves.stockid = stockmaster.stockid
WHERE stockmoves.type=11
- AND stockmoves.transno='" . filter_number_format($FromTransNo) . "'
+ AND stockmoves.transno='" . $FromTransNo . "'
AND stockmoves.show_on_inv_crds=1";
} // end else
@@ -657,7 +657,7 @@
INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
WHERE debtortrans.type=10
- AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'";
+ AND debtortrans.transno='" . $FromTransNo . "'";
} else { //its a credit note
$sql = "SELECT debtortrans.trandate,
@@ -697,7 +697,7 @@
INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
WHERE debtortrans.type=11
- AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'";
+ AND debtortrans.transno='" . $FromTransNo . "'";
}
@@ -842,7 +842,7 @@
FROM stockmoves INNER JOIN stockmaster
ON stockmoves.stockid = stockmaster.stockid
WHERE stockmoves.type=10
- AND stockmoves.transno='" . filter_number_format($FromTransNo) . "'
+ AND stockmoves.transno='" . $FromTransNo . "'
AND stockmoves.show_on_inv_crds=1";
} else { /* then its a credit note */
@@ -885,7 +885,7 @@
FROM stockmoves INNER JOIN stockmaster
ON stockmoves.stockid = stockmaster.stockid
WHERE stockmoves.type=11
- AND stockmoves.transno='" . filter_number_format($FromTransNo) . "'
+ AND stockmoves.transno='" . $FromTransNo . "'
AND stockmoves.show_on_inv_crds=1";
}
@@ -1037,7 +1037,7 @@
}
echo '</b>' . _('Number') . ' ' . $FromTransNo . '</font>
<br />
- <font size=1>' . _('GST Number') . ' - ' . $_SESSION['CompanyRecord']['gstno'] . '</td>
+ <font size="1">' . _('GST Number') . ' - ' . $_SESSION['CompanyRecord']['gstno'] . '</font></td>
</tr>
</table>';
@@ -1093,23 +1093,23 @@
} else {
$DisplaySubTot = locale_number_format(-$myrow['ovamount'],$myrow['decimalplaces']);
$DisplayFreight = locale_number_format(-$myrow['ovfreight'],$myrow['decimalplaces']);
- $DisplayTax = locale_number_format(-$myrow['ovgst'],2);
+ $DisplayTax = locale_number_format(-$myrow['ovgst'],$myrow['decimalplaces']);
$DisplayTotal = locale_number_format(-$myrow['ovfreight']-$myrow['ovgst']-$myrow['ovamount'],$myrow['decimalplaces']);
}
/*Print out the invoice text entered */
echo '<table class="table1"><tr>
<td class="number">' . _('Sub Total') . '</td>
- <td class="number" bgcolor="#EEEEEE" WIDTH="15%">' . $DisplaySubTot . '</td></tr>';
+ <td class="number" bgcolor="#EEEEEE" width="15%">' . $DisplaySubTot . '</td></tr>';
echo '<tr><td class="number">' . _('Freight') . '</td>
<td class="number" bgcolor="#EEEEEE">' . $DisplayFreight . '</td></tr>';
echo '<tr><td class="number">' . _('Tax') . '</td>
<td class="number" bgcolor="#EEEEEE">' . $DisplayTax . '</td></tr>';
if ($InvOrCredit=='Invoice'){
echo '<tr><td class="number"><b>' . _('TOTAL INVOICE') . '</b></td>
- <td class="number" bgcolor="#EEEEEE"><U><b>' . $DisplayTotal . '</b></U></td></tr>';
+ <td class="number" bgcolor="#EEEEEE"><u><b>' . $DisplayTotal . '</b></u></td></tr>';
} else {
- echo '<tr><td class="number"><font color=RED><b>' . _('TOTAL CREDIT') . '</b></font></td>
- <td class="number" bgcolor="#EEEEEE"><font color="red"><U><b>' . $DisplayTotal . '</b></u></font></td></tr>';
+ echo '<tr><td class="number"><font color="red"><b>' . _('TOTAL CREDIT') . '</b></font></td>
+ <td class="number" bgcolor="#EEEEEE"><font color="red"><u><b>' . $DisplayTotal . '</b></u></font></td></tr>';
}
echo '</table>';
} /* end of check to see that there was an invoice record to print */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2011-11-27 02:36:53
|
Revision: 4756
http://web-erp.svn.sourceforge.net/web-erp/?rev=4756&view=rev
Author: daintree
Date: 2011-11-27 02:36:47 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/PrintCustTransPortrait.php
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2011-11-26 21:46:11 UTC (rev 4755)
+++ trunk/PrintCustTransPortrait.php 2011-11-27 02:36:47 UTC (rev 4756)
@@ -164,7 +164,7 @@
INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
WHERE debtortrans.type=10
- AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'";
+ AND debtortrans.transno='" . $FromTransNo . "'";
if (isset($_POST['PrintEDI']) and $_POST['PrintEDI']=='No') {
$sql = $sql . " AND debtorsmaster.ediinvoices=0";
@@ -217,7 +217,7 @@
INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
WHERE debtortrans.type=11
- AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'";
+ AND debtortrans.transno='" . $FromTransNo . "'";
if (isset($_POST['PrintEDI']) and $_POST['PrintEDI']=='No'){
@@ -260,7 +260,7 @@
FROM stockmoves INNER JOIN stockmaster
ON stockmoves.stockid = stockmaster.stockid
WHERE stockmoves.type=10
- AND stockmoves.transno='" . filter_number_format($FromTransNo) . "'
+ AND stockmoves.transno='" . $FromTransNo . "'
AND stockmoves.show_on_inv_crds=1";
} else {
/* only credit notes to be retrieved */
@@ -279,7 +279,7 @@
FROM stockmoves INNER JOIN stockmaster
ON stockmoves.stockid = stockmaster.stockid
WHERE stockmoves.type=11
- AND stockmoves.transno='" . filter_number_format($FromTransNo) . "'
+ AND stockmoves.transno='" . $FromTransNo . "'
AND stockmoves.show_on_inv_crds=1";
} // end else
@@ -657,7 +657,7 @@
INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
WHERE debtortrans.type=10
- AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'";
+ AND debtortrans.transno='" . $FromTransNo . "'";
} else { //its a credit note
$sql = "SELECT debtortrans.trandate,
@@ -697,7 +697,7 @@
INNER JOIN currencies
ON debtorsmaster.currcode=currencies.currabrev
WHERE debtortrans.type=11
- AND debtortrans.transno='" . filter_number_format($FromTransNo) . "'";
+ AND debtortrans.transno='" . $FromTransNo . "'";
}
@@ -842,7 +842,7 @@
FROM stockmoves INNER JOIN stockmaster
ON stockmoves.stockid = stockmaster.stockid
WHERE stockmoves.type=10
- AND stockmoves.transno='" . filter_number_format($FromTransNo) . "'
+ AND stockmoves.transno='" . $FromTransNo . "'
AND stockmoves.show_on_inv_crds=1";
} else { /* then its a credit note */
@@ -885,7 +885,7 @@
FROM stockmoves INNER JOIN stockmaster
ON stockmoves.stockid = stockmaster.stockid
WHERE stockmoves.type=11
- AND stockmoves.transno='" . filter_number_format($FromTransNo) . "'
+ AND stockmoves.transno='" . $FromTransNo . "'
AND stockmoves.show_on_inv_crds=1";
}
@@ -1037,7 +1037,7 @@
}
echo '</b>' . _('Number') . ' ' . $FromTransNo . '</font>
<br />
- <font size=1>' . _('GST Number') . ' - ' . $_SESSION['CompanyRecord']['gstno'] . '</td>
+ <font size="1">' . _('GST Number') . ' - ' . $_SESSION['CompanyRecord']['gstno'] . '</font></td>
</tr>
</table>';
@@ -1093,23 +1093,23 @@
} else {
$DisplaySubTot = locale_number_format(-$myrow['ovamount'],$myrow['decimalplaces']);
$DisplayFreight = locale_number_format(-$myrow['ovfreight'],$myrow['decimalplaces']);
- $DisplayTax = locale_number_format(-$myrow['ovgst'],2);
+ $DisplayTax = locale_number_format(-$myrow['ovgst'],$myrow['decimalplaces']);
$DisplayTotal = locale_number_format(-$myrow['ovfreight']-$myrow['ovgst']-$myrow['ovamount'],$myrow['decimalplaces']);
}
/*Print out the invoice text entered */
echo '<table class="table1"><tr>
<td class="number">' . _('Sub Total') . '</td>
- <td class="number" bgcolor="#EEEEEE" WIDTH="15%">' . $DisplaySubTot . '</td></tr>';
+ <td class="number" bgcolor="#EEEEEE" width="15%">' . $DisplaySubTot . '</td></tr>';
echo '<tr><td class="number">' . _('Freight') . '</td>
<td class="number" bgcolor="#EEEEEE">' . $DisplayFreight . '</td></tr>';
echo '<tr><td class="number">' . _('Tax') . '</td>
<td class="number" bgcolor="#EEEEEE">' . $DisplayTax . '</td></tr>';
if ($InvOrCredit=='Invoice'){
echo '<tr><td class="number"><b>' . _('TOTAL INVOICE') . '</b></td>
- <td class="number" bgcolor="#EEEEEE"><U><b>' . $DisplayTotal . '</b></U></td></tr>';
+ <td class="number" bgcolor="#EEEEEE"><u><b>' . $DisplayTotal . '</b></u></td></tr>';
} else {
- echo '<tr><td class="number"><font color=RED><b>' . _('TOTAL CREDIT') . '</b></font></td>
- <td class="number" bgcolor="#EEEEEE"><font color="red"><U><b>' . $DisplayTotal . '</b></u></font></td></tr>';
+ echo '<tr><td class="number"><font color="red"><b>' . _('TOTAL CREDIT') . '</b></font></td>
+ <td class="number" bgcolor="#EEEEEE"><font color="red"><u><b>' . $DisplayTotal . '</b></u></font></td></tr>';
}
echo '</table>';
} /* end of check to see that there was an invoice record to print */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-03-03 20:03:32
|
Revision: 5005
http://web-erp.svn.sourceforge.net/web-erp/?rev=5005&view=rev
Author: tim_schofield
Date: 2012-03-03 20:03:26 +0000 (Sat, 03 Mar 2012)
Log Message:
-----------
Corrections to background colours
Modified Paths:
--------------
trunk/PrintCustTransPortrait.php
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2012-03-03 15:38:23 UTC (rev 5004)
+++ trunk/PrintCustTransPortrait.php 2012-03-03 20:03:26 UTC (rev 5005)
@@ -725,7 +725,7 @@
echo '<table class="table1">
<tr>
<td valign=top width="10%"><img src="' . $_SESSION['LogoFile'] . '" /></td>
- <td bgcolor="#bbb"><b>';
+ <td bgcolor="#bbbbbb"><b>';
if ($InvOrCredit=='Invoice') {
echo '<font size="4">' . _('TAX INVOICE') . ' ';
@@ -759,10 +759,10 @@
echo '<table class="table1">
<tr>
- <td align="left" bgcolor="#bbb"><b>' . _('Charge To') . ':</b></td>
+ <td align="left" bgcolor="#bbbbbb"><b>' . _('Charge To') . ':</b></td>
</tr>
<tr>
- <td bgcolor="#eee">';
+ <td bgcolor="#eeeeee">';
echo $myrow['name'] .
'<br />' . $myrow['address1'] .
'<br />' . $myrow['address2'] .
@@ -785,8 +785,8 @@
echo '<table class="table1">
<tr>
- <td align=left bgcolor="#bbb"><b>' . _('Charge Branch') . ':</b></td>
- <td align=left bgcolor="#bbb"><b>' . _('Delivered To') . ':</b></td>
+ <td align=left bgcolor="#bbbbbb"><b>' . _('Charge Branch') . ':</b></td>
+ <td align=left bgcolor="#bbbbbb"><b>' . _('Delivered To') . ':</b></td>
</tr>';
echo '<tr>
<td bgcolor="#eee">' .$myrow['brname'] .
@@ -811,13 +811,13 @@
echo '<table class="table1">
<tr>
- <td align=left bgcolor="#bbb"><b>' . _('Your Order Ref') . '</b></td>
- <td align=left bgcolor="#bbb"><b>' . _('Our Order No') . '</b></td>
- <td align=left bgcolor="#bbb"><b>' . _('Order Date') . '</b></td>
- <td align=left bgcolor="#bbb"><b>' . _('Invoice Date') . '</b></td>
- <td align=left bgcolor="#bbb"><b>' . _('Sales Person') . '</font></b></td>
- <td align=left bgcolor="#bbb"><b>' . _('Shipper') . '</b></td>
- <td align=left bgcolor="#bbb"><b>' . _('Consignment Ref') . '</b></td>
+ <td align=left bgcolor="#bbbbbb"><b>' . _('Your Order Ref') . '</b></td>
+ <td align=left bgcolor="#bbbbbb"><b>' . _('Our Order No') . '</b></td>
+ <td align=left bgcolor="#bbbbbb"><b>' . _('Order Date') . '</b></td>
+ <td align=left bgcolor="#bbbbbb"><b>' . _('Invoice Date') . '</b></td>
+ <td align=left bgcolor="#bbbbbb"><b>' . _('Sales Person') . '</font></b></td>
+ <td align=left bgcolor="#bbbbbb"><b>' . _('Shipper') . '</b></td>
+ <td align=left bgcolor="#bbbbbb"><b>' . _('Consignment Ref') . '</b></td>
</tr>';
echo '<tr>
<td bgcolor="#EEEEEE">' . $myrow['customerref'] . '</td>
@@ -973,7 +973,7 @@
<table class="table1">
<tr>
<td valign="top"><img src="' . $_SESSION['LogoFile'] . '" /></td>
- <td bgcolor="#bbb"><b>';
+ <td bgcolor="#bbbbbb"><b>';
if ($InvOrCredit=='Invoice') {
echo '<font size="4">' . _('TAX INVOICE') . ' ';
@@ -1029,7 +1029,7 @@
echo '<table class="table1">
<tr>
<td valign="top"><img src="' . $_SESSION['LogoFile'] . '" /></td>
- <td bgcolor="#bbb"><b>';
+ <td bgcolor="#bbbbbb"><b>';
if ($InvOrCredit=='Invoice') {
echo '<font size="4">' . _('TAX INVOICE') .' ';
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tim...@us...> - 2012-03-03 20:03:33
|
Revision: 5005
http://web-erp.svn.sourceforge.net/web-erp/?rev=5005&view=rev
Author: tim_schofield
Date: 2012-03-03 20:03:26 +0000 (Sat, 03 Mar 2012)
Log Message:
-----------
Corrections to background colours
Modified Paths:
--------------
trunk/PrintCustTransPortrait.php
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2012-03-03 15:38:23 UTC (rev 5004)
+++ trunk/PrintCustTransPortrait.php 2012-03-03 20:03:26 UTC (rev 5005)
@@ -725,7 +725,7 @@
echo '<table class="table1">
<tr>
<td valign=top width="10%"><img src="' . $_SESSION['LogoFile'] . '" /></td>
- <td bgcolor="#bbb"><b>';
+ <td bgcolor="#bbbbbb"><b>';
if ($InvOrCredit=='Invoice') {
echo '<font size="4">' . _('TAX INVOICE') . ' ';
@@ -759,10 +759,10 @@
echo '<table class="table1">
<tr>
- <td align="left" bgcolor="#bbb"><b>' . _('Charge To') . ':</b></td>
+ <td align="left" bgcolor="#bbbbbb"><b>' . _('Charge To') . ':</b></td>
</tr>
<tr>
- <td bgcolor="#eee">';
+ <td bgcolor="#eeeeee">';
echo $myrow['name'] .
'<br />' . $myrow['address1'] .
'<br />' . $myrow['address2'] .
@@ -785,8 +785,8 @@
echo '<table class="table1">
<tr>
- <td align=left bgcolor="#bbb"><b>' . _('Charge Branch') . ':</b></td>
- <td align=left bgcolor="#bbb"><b>' . _('Delivered To') . ':</b></td>
+ <td align=left bgcolor="#bbbbbb"><b>' . _('Charge Branch') . ':</b></td>
+ <td align=left bgcolor="#bbbbbb"><b>' . _('Delivered To') . ':</b></td>
</tr>';
echo '<tr>
<td bgcolor="#eee">' .$myrow['brname'] .
@@ -811,13 +811,13 @@
echo '<table class="table1">
<tr>
- <td align=left bgcolor="#bbb"><b>' . _('Your Order Ref') . '</b></td>
- <td align=left bgcolor="#bbb"><b>' . _('Our Order No') . '</b></td>
- <td align=left bgcolor="#bbb"><b>' . _('Order Date') . '</b></td>
- <td align=left bgcolor="#bbb"><b>' . _('Invoice Date') . '</b></td>
- <td align=left bgcolor="#bbb"><b>' . _('Sales Person') . '</font></b></td>
- <td align=left bgcolor="#bbb"><b>' . _('Shipper') . '</b></td>
- <td align=left bgcolor="#bbb"><b>' . _('Consignment Ref') . '</b></td>
+ <td align=left bgcolor="#bbbbbb"><b>' . _('Your Order Ref') . '</b></td>
+ <td align=left bgcolor="#bbbbbb"><b>' . _('Our Order No') . '</b></td>
+ <td align=left bgcolor="#bbbbbb"><b>' . _('Order Date') . '</b></td>
+ <td align=left bgcolor="#bbbbbb"><b>' . _('Invoice Date') . '</b></td>
+ <td align=left bgcolor="#bbbbbb"><b>' . _('Sales Person') . '</font></b></td>
+ <td align=left bgcolor="#bbbbbb"><b>' . _('Shipper') . '</b></td>
+ <td align=left bgcolor="#bbbbbb"><b>' . _('Consignment Ref') . '</b></td>
</tr>';
echo '<tr>
<td bgcolor="#EEEEEE">' . $myrow['customerref'] . '</td>
@@ -973,7 +973,7 @@
<table class="table1">
<tr>
<td valign="top"><img src="' . $_SESSION['LogoFile'] . '" /></td>
- <td bgcolor="#bbb"><b>';
+ <td bgcolor="#bbbbbb"><b>';
if ($InvOrCredit=='Invoice') {
echo '<font size="4">' . _('TAX INVOICE') . ' ';
@@ -1029,7 +1029,7 @@
echo '<table class="table1">
<tr>
<td valign="top"><img src="' . $_SESSION['LogoFile'] . '" /></td>
- <td bgcolor="#bbb"><b>';
+ <td bgcolor="#bbbbbb"><b>';
if ($InvOrCredit=='Invoice') {
echo '<font size="4">' . _('TAX INVOICE') .' ';
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ex...@us...> - 2012-03-05 10:00:50
|
Revision: 5026
http://web-erp.svn.sourceforge.net/web-erp/?rev=5026&view=rev
Author: ExsonQu
Date: 2012-03-05 10:00:44 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
5/3/2012 fixed html background color cannot displayed correctly in IE for PrintCustTransPortrait.php reported by rfthomas fixed by Tim and Exson
Modified Paths:
--------------
trunk/PrintCustTransPortrait.php
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2012-03-05 09:56:07 UTC (rev 5025)
+++ trunk/PrintCustTransPortrait.php 2012-03-05 10:00:44 UTC (rev 5026)
@@ -789,7 +789,7 @@
<td align=left bgcolor="#bbbbbb"><b>' . _('Delivered To') . ':</b></td>
</tr>';
echo '<tr>
- <td bgcolor="#eee">' .$myrow['brname'] .
+ <td bgcolor="#eeeeee">' .$myrow['brname'] .
'<br />' . $myrow['braddress1'] .
'<br />' . $myrow['braddress2'] .
'<br />' . $myrow['braddress3'] .
@@ -798,7 +798,7 @@
'<br />' . $myrow['braddress6'] .
'</td>';
- echo '<td bgcolor="#eee">' . $myrow['deliverto'] .
+ echo '<td bgcolor="#eeeeee">' . $myrow['deliverto'] .
'<br />' . $myrow['deladd1'] .
'<br />' . $myrow['deladd2'] .
'<br />' . $myrow['deladd3'] .
@@ -1152,4 +1152,4 @@
}
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ex...@us...> - 2012-03-05 10:00:53
|
Revision: 5026
http://web-erp.svn.sourceforge.net/web-erp/?rev=5026&view=rev
Author: ExsonQu
Date: 2012-03-05 10:00:44 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
5/3/2012 fixed html background color cannot displayed correctly in IE for PrintCustTransPortrait.php reported by rfthomas fixed by Tim and Exson
Modified Paths:
--------------
trunk/PrintCustTransPortrait.php
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2012-03-05 09:56:07 UTC (rev 5025)
+++ trunk/PrintCustTransPortrait.php 2012-03-05 10:00:44 UTC (rev 5026)
@@ -789,7 +789,7 @@
<td align=left bgcolor="#bbbbbb"><b>' . _('Delivered To') . ':</b></td>
</tr>';
echo '<tr>
- <td bgcolor="#eee">' .$myrow['brname'] .
+ <td bgcolor="#eeeeee">' .$myrow['brname'] .
'<br />' . $myrow['braddress1'] .
'<br />' . $myrow['braddress2'] .
'<br />' . $myrow['braddress3'] .
@@ -798,7 +798,7 @@
'<br />' . $myrow['braddress6'] .
'</td>';
- echo '<td bgcolor="#eee">' . $myrow['deliverto'] .
+ echo '<td bgcolor="#eeeeee">' . $myrow['deliverto'] .
'<br />' . $myrow['deladd1'] .
'<br />' . $myrow['deladd2'] .
'<br />' . $myrow['deladd3'] .
@@ -1152,4 +1152,4 @@
}
-?>
\ No newline at end of file
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ex...@us...> - 2012-03-13 01:26:16
|
Revision: 5097
http://web-erp.svn.sourceforge.net/web-erp/?rev=5097&view=rev
Author: ExsonQu
Date: 2012-03-13 01:26:09 +0000 (Tue, 13 Mar 2012)
Log Message:
-----------
13/3/2012 Exson: Correct mailing sending messages display error in PrintCustTransPortrait.php Reported by Thomas_lie
Modified Paths:
--------------
trunk/PrintCustTransPortrait.php
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2012-03-13 01:02:15 UTC (rev 5096)
+++ trunk/PrintCustTransPortrait.php 2012-03-13 01:26:09 UTC (rev 5097)
@@ -502,15 +502,20 @@
$result = $mail->send(array($_GET['Email']));
unlink($FileName); //delete the temporary file
-
- $title = _('Emailing') . ' ' .$InvOrCredit . ' ' . _('Number') . ' ' . $FromTransNo;
- include('includes/header.inc');
- echo '<p>' . $InvOrCredit . ' ' . _('number') . ' ' . $FromTransNo . ' ' . _('has been emailed to') . ' ' . $_GET['Email'];
+ if(($FromTransNo - $FirstTrans)==1){
+ $title = _('Emailing') . ' ' .$InvOrCredit . ' ' . _('Number') . ' ' . $FirstTrans;
+ include('includes/header.inc');
+ echo '<p>' . $InvOrCredit . ' ' . _('number') . ' ' . $FirstTrans . ' ' . _('has been emailed to') . ' ' . $_GET['Email'];
+ }else{
+ $title = _('Emailing') . ' ' . $InvOrCredit . ' ' . _('from Number') . ' ' . $FirstTrans.' ' . _('to Number'). ' ' . ($FromTransNo-1);
+ include('includes/header.inc');
+ echo '<p>' . $InvOrCredit . ' ' . _('from Number') . ' ' . $FirstTrans . ' '._('to Number').' ' . ($FromTransNo-1) . _('has been emailed to') . ' ' . $_GET['Email'];
+ }
include('includes/footer.inc');
exit;
} else { //its not an email just print the invoice to PDF
- $pdf->OutputD($_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $FromTransNo . '.pdf');
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $FirstTrans. '.pdf');
}
$pdf->__destruct();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ex...@us...> - 2012-03-13 01:26:16
|
Revision: 5097
http://web-erp.svn.sourceforge.net/web-erp/?rev=5097&view=rev
Author: ExsonQu
Date: 2012-03-13 01:26:09 +0000 (Tue, 13 Mar 2012)
Log Message:
-----------
13/3/2012 Exson: Correct mailing sending messages display error in PrintCustTransPortrait.php Reported by Thomas_lie
Modified Paths:
--------------
trunk/PrintCustTransPortrait.php
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2012-03-13 01:02:15 UTC (rev 5096)
+++ trunk/PrintCustTransPortrait.php 2012-03-13 01:26:09 UTC (rev 5097)
@@ -502,15 +502,20 @@
$result = $mail->send(array($_GET['Email']));
unlink($FileName); //delete the temporary file
-
- $title = _('Emailing') . ' ' .$InvOrCredit . ' ' . _('Number') . ' ' . $FromTransNo;
- include('includes/header.inc');
- echo '<p>' . $InvOrCredit . ' ' . _('number') . ' ' . $FromTransNo . ' ' . _('has been emailed to') . ' ' . $_GET['Email'];
+ if(($FromTransNo - $FirstTrans)==1){
+ $title = _('Emailing') . ' ' .$InvOrCredit . ' ' . _('Number') . ' ' . $FirstTrans;
+ include('includes/header.inc');
+ echo '<p>' . $InvOrCredit . ' ' . _('number') . ' ' . $FirstTrans . ' ' . _('has been emailed to') . ' ' . $_GET['Email'];
+ }else{
+ $title = _('Emailing') . ' ' . $InvOrCredit . ' ' . _('from Number') . ' ' . $FirstTrans.' ' . _('to Number'). ' ' . ($FromTransNo-1);
+ include('includes/header.inc');
+ echo '<p>' . $InvOrCredit . ' ' . _('from Number') . ' ' . $FirstTrans . ' '._('to Number').' ' . ($FromTransNo-1) . _('has been emailed to') . ' ' . $_GET['Email'];
+ }
include('includes/footer.inc');
exit;
} else { //its not an email just print the invoice to PDF
- $pdf->OutputD($_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $FromTransNo . '.pdf');
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $FirstTrans. '.pdf');
}
$pdf->__destruct();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-03-13 06:35:53
|
Revision: 5101
http://web-erp.svn.sourceforge.net/web-erp/?rev=5101&view=rev
Author: daintree
Date: 2012-03-13 06:35:47 +0000 (Tue, 13 Mar 2012)
Log Message:
-----------
decremented FromTransNo to show correct transaction number being emailed
Modified Paths:
--------------
trunk/PrintCustTransPortrait.php
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2012-03-13 02:01:54 UTC (rev 5100)
+++ trunk/PrintCustTransPortrait.php 2012-03-13 06:35:47 UTC (rev 5101)
@@ -488,8 +488,8 @@
if (isset($_GET['Email'])){ //email the invoice to address supplied
include('includes/header.inc');
-
include ('includes/htmlMimeMail.php');
+ $FromTransNo--; //reverse the increment to retain the correct transaction number
$FileName = $_SESSION['reports_dir'] . '/' . $_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $_GET['FromTransNo'] . '.pdf';
$pdf->Output($FileName,'F');
$mail = new htmlMimeMail();
@@ -502,20 +502,15 @@
$result = $mail->send(array($_GET['Email']));
unlink($FileName); //delete the temporary file
- if(($FromTransNo - $FirstTrans)==1){
- $title = _('Emailing') . ' ' .$InvOrCredit . ' ' . _('Number') . ' ' . $FirstTrans;
- include('includes/header.inc');
- echo '<p>' . $InvOrCredit . ' ' . _('number') . ' ' . $FirstTrans . ' ' . _('has been emailed to') . ' ' . $_GET['Email'];
- }else{
- $title = _('Emailing') . ' ' . $InvOrCredit . ' ' . _('from Number') . ' ' . $FirstTrans.' ' . _('to Number'). ' ' . ($FromTransNo-1);
- include('includes/header.inc');
- echo '<p>' . $InvOrCredit . ' ' . _('from Number') . ' ' . $FirstTrans . ' '._('to Number').' ' . ($FromTransNo-1) . _('has been emailed to') . ' ' . $_GET['Email'];
- }
+
+ $title = _('Emailing') . ' ' .$InvOrCredit . ' ' . _('Number') . ' ' . $FromTransNo;
+ include('includes/header.inc');
+ echo '<p>' . $InvOrCredit . ' ' . _('number') . ' ' . $FromTransNo . ' ' . _('has been emailed to') . ' ' . $_GET['Email'];
include('includes/footer.inc');
exit;
} else { //its not an email just print the invoice to PDF
- $pdf->OutputD($_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $FirstTrans. '.pdf');
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $FromTransNo . '.pdf');
}
$pdf->__destruct();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-03-13 06:35:53
|
Revision: 5101
http://web-erp.svn.sourceforge.net/web-erp/?rev=5101&view=rev
Author: daintree
Date: 2012-03-13 06:35:47 +0000 (Tue, 13 Mar 2012)
Log Message:
-----------
decremented FromTransNo to show correct transaction number being emailed
Modified Paths:
--------------
trunk/PrintCustTransPortrait.php
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2012-03-13 02:01:54 UTC (rev 5100)
+++ trunk/PrintCustTransPortrait.php 2012-03-13 06:35:47 UTC (rev 5101)
@@ -488,8 +488,8 @@
if (isset($_GET['Email'])){ //email the invoice to address supplied
include('includes/header.inc');
-
include ('includes/htmlMimeMail.php');
+ $FromTransNo--; //reverse the increment to retain the correct transaction number
$FileName = $_SESSION['reports_dir'] . '/' . $_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $_GET['FromTransNo'] . '.pdf';
$pdf->Output($FileName,'F');
$mail = new htmlMimeMail();
@@ -502,20 +502,15 @@
$result = $mail->send(array($_GET['Email']));
unlink($FileName); //delete the temporary file
- if(($FromTransNo - $FirstTrans)==1){
- $title = _('Emailing') . ' ' .$InvOrCredit . ' ' . _('Number') . ' ' . $FirstTrans;
- include('includes/header.inc');
- echo '<p>' . $InvOrCredit . ' ' . _('number') . ' ' . $FirstTrans . ' ' . _('has been emailed to') . ' ' . $_GET['Email'];
- }else{
- $title = _('Emailing') . ' ' . $InvOrCredit . ' ' . _('from Number') . ' ' . $FirstTrans.' ' . _('to Number'). ' ' . ($FromTransNo-1);
- include('includes/header.inc');
- echo '<p>' . $InvOrCredit . ' ' . _('from Number') . ' ' . $FirstTrans . ' '._('to Number').' ' . ($FromTransNo-1) . _('has been emailed to') . ' ' . $_GET['Email'];
- }
+
+ $title = _('Emailing') . ' ' .$InvOrCredit . ' ' . _('Number') . ' ' . $FromTransNo;
+ include('includes/header.inc');
+ echo '<p>' . $InvOrCredit . ' ' . _('number') . ' ' . $FromTransNo . ' ' . _('has been emailed to') . ' ' . $_GET['Email'];
include('includes/footer.inc');
exit;
} else { //its not an email just print the invoice to PDF
- $pdf->OutputD($_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $FirstTrans. '.pdf');
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $FromTransNo . '.pdf');
}
$pdf->__destruct();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-03-13 06:43:04
|
Revision: 5102
http://web-erp.svn.sourceforge.net/web-erp/?rev=5102&view=rev
Author: daintree
Date: 2012-03-13 06:42:58 +0000 (Tue, 13 Mar 2012)
Log Message:
-----------
remove extra includes/header.inc
Modified Paths:
--------------
trunk/PrintCustTransPortrait.php
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2012-03-13 06:35:47 UTC (rev 5101)
+++ trunk/PrintCustTransPortrait.php 2012-03-13 06:42:58 UTC (rev 5102)
@@ -487,7 +487,6 @@
} /* end loop to print invoices */
if (isset($_GET['Email'])){ //email the invoice to address supplied
- include('includes/header.inc');
include ('includes/htmlMimeMail.php');
$FromTransNo--; //reverse the increment to retain the correct transaction number
$FileName = $_SESSION['reports_dir'] . '/' . $_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $_GET['FromTransNo'] . '.pdf';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dai...@us...> - 2012-03-13 06:43:07
|
Revision: 5102
http://web-erp.svn.sourceforge.net/web-erp/?rev=5102&view=rev
Author: daintree
Date: 2012-03-13 06:42:58 +0000 (Tue, 13 Mar 2012)
Log Message:
-----------
remove extra includes/header.inc
Modified Paths:
--------------
trunk/PrintCustTransPortrait.php
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2012-03-13 06:35:47 UTC (rev 5101)
+++ trunk/PrintCustTransPortrait.php 2012-03-13 06:42:58 UTC (rev 5102)
@@ -487,7 +487,6 @@
} /* end loop to print invoices */
if (isset($_GET['Email'])){ //email the invoice to address supplied
- include('includes/header.inc');
include ('includes/htmlMimeMail.php');
$FromTransNo--; //reverse the increment to retain the correct transaction number
$FileName = $_SESSION['reports_dir'] . '/' . $_SESSION['DatabaseName'] . '_' . $InvOrCredit . '_' . $_GET['FromTransNo'] . '.pdf';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ex...@us...> - 2013-05-02 03:47:03
|
Revision: 5877
http://sourceforge.net/p/web-erp/reponame/5877
Author: exsonqu
Date: 2013-05-02 03:46:59 +0000 (Thu, 02 May 2013)
Log Message:
-----------
02/05/2013 Exson: Make the smtp mail available for PrintCustTransPortrait.php
Modified Paths:
--------------
trunk/PrintCustTransPortrait.php
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2013-05-02 03:38:13 UTC (rev 5876)
+++ trunk/PrintCustTransPortrait.php 2013-05-02 03:46:59 UTC (rev 5877)
@@ -506,8 +506,12 @@
$mail->setText(_('Please find attached') . ' ' . $InvOrCredit . ' ' . $_GET['FromTransNo'] );
$mail->SetSubject($InvOrCredit . ' ' . $_GET['FromTransNo']);
$mail->addAttachment($Attachment, $FileName, 'application/pdf');
- $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . ' <' . $_SESSION['CompanyRecord']['email'] . '>');
- $result = $mail->send(array($_GET['Email']));
+ if($_SESSION['SmtpSetting'] == 0){
+ $mail->setFrom($_SESSION['CompanyRecord']['coyname'] . ' <' . $_SESSION['CompanyRecord']['email'] . '>');
+ $result = $mail->send(array($_GET['Email']));
+ }else{
+ $result = SendmailBySmtp($mail,array($_GET['Email']));
+ }
unlink($FileName); //delete the temporary file
|
|
From: <rc...@us...> - 2015-02-12 02:19:37
|
Revision: 7149
http://sourceforge.net/p/web-erp/reponame/7149
Author: rchacon
Date: 2015-02-12 02:19:30 +0000 (Thu, 12 Feb 2015)
Log Message:
-----------
Fix. Do not need to escape special characters in a string for use in an SQL statement.
Modified Paths:
--------------
trunk/PrintCustTransPortrait.php
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2015-02-11 14:15:50 UTC (rev 7148)
+++ trunk/PrintCustTransPortrait.php 2015-02-12 02:19:30 UTC (rev 7149)
@@ -465,7 +465,7 @@
$pdf->addTextWrap($Left_Margin, $YPos+3, 280, $FontSize,_('Payment Terms') . ': ' . $myrow['terms']);
$FontSize =8;
- $LeftOvers=explode("\r\n",DB_escape_string($myrow['invtext']));
+ $LeftOvers=explode("\r\n",$myrow['invtext']);
for ($i=0;$i<sizeOf($LeftOvers);$i++) {
$pdf->addText($Left_Margin, $YPos-8-($i*8), $FontSize, $LeftOvers[$i]);
}
|
|
From: <rc...@us...> - 2016-06-05 18:19:53
|
Revision: 7549
http://sourceforge.net/p/web-erp/reponame/7549
Author: rchacon
Date: 2016-06-05 18:19:51 +0000 (Sun, 05 Jun 2016)
Log Message:
-----------
Minor code format changes.
Modified Paths:
--------------
trunk/PrintCustTransPortrait.php
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2016-05-30 09:59:55 UTC (rev 7548)
+++ trunk/PrintCustTransPortrait.php 2016-06-05 18:19:51 UTC (rev 7549)
@@ -1,6 +1,6 @@
<?php
/* $Id$ */
-/* */
+/* Print Invoices or Credit Notes (Portrait Mode) */
include('includes/session.inc');
@@ -46,12 +46,12 @@
include ('includes/class.pdf.php');
- $Page_Width=595;
- $Page_Height=842;
- $Top_Margin=30;
- $Bottom_Margin=30;
- $Left_Margin=40;
- $Right_Margin=30;
+ $Page_Width=595;
+ $Page_Height=842;
+ $Top_Margin=30;
+ $Bottom_Margin=30;
+ $Left_Margin=40;
+ $Right_Margin=30;
$pdf = new Cpdf('P', 'pt', 'A4');
$pdf->addInfo('Author','webERP ' . $Version);
@@ -77,7 +77,7 @@
//Keep a record of the user's language
$UserLanguage = $_SESSION['Language'];
- while ($FromTransNo <= filter_number_format($_POST['ToTransNo'])) {
+ while($FromTransNo <= filter_number_format($_POST['ToTransNo'])) {
/*retrieve the invoice details from the database to print
notice that salesorder record must be present to print the invoice purging of sales orders will
@@ -94,14 +94,14 @@
if(DB_num_rows($result)==1) {
$myrow = DB_fetch_array($result);
$DefaultBankAccountNumber = _('Account') .': ' .$myrow['bankaccountnumber'];
- $DefaultBankAccountCode = _('Bank Code:') .' ' .$myrow['bankaccountcode'];
+ $DefaultBankAccountCode = _('Bank Code:') .' ' .$myrow['bankaccountcode'];
} else {
$DefaultBankAccountNumber = '';
- $DefaultBankAccountCode = '';
+ $DefaultBankAccountCode = '';
}
} else {
$DefaultBankAccountNumber = '';
- $DefaultBankAccountCode = '';
+ $DefaultBankAccountCode = '';
}
// gather the invoice data
@@ -170,7 +170,7 @@
INNER JOIN locations
ON salesorders.fromstkloc=locations.loccode
INNER JOIN locationusers
- ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1
+ ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1
INNER JOIN paymentterms
ON debtorsmaster.paymentterms=paymentterms.termsindicator
INNER JOIN currencies
@@ -247,12 +247,12 @@
prnMsg( _('There was a problem retrieving the invoice or credit note details for note number') . ' ' . $InvoiceToPrint . ' ' . _('from the database') . '. ' . _('To print an invoice, the sales order record, the customer transaction record and the branch record for the customer must not have been purged') . '. ' . _('To print a credit note only requires the customer, transaction, salesman and branch records be available'),'error');
if($debug==1) {
- prnMsg (_('The SQL used to get this information that failed was') . '<br />' . $sql,'error');
+ prnMsg (_('The SQL used to get this information that failed was') . '<br />' . $sql,'error');
}
include ('includes/footer.inc');
exit;
- }
- if(DB_num_rows($result)==1) {
+ }
+ if(DB_num_rows($result)==1) {
$myrow = DB_fetch_array($result);
$ExchRate = $myrow['rate'];
//Change the language to the customer's language
@@ -304,7 +304,7 @@
include ('includes/header.inc');
echo '<br />' . _('There was a problem retrieving the invoice or credit note stock movement details for invoice number') . ' ' . $FromTransNo . ' ' . _('from the database');
if($debug==1) {
- echo '<br />' . _('The SQL used to get this information that failed was') . '<br />' . $sql;
+ echo '<br />' . _('The SQL used to get this information that failed was') . '<br />' . $sql;
}
include('includes/footer.inc');
exit;
@@ -318,7 +318,7 @@
include('includes/PDFTransPageHeaderPortrait.inc');
$FirstPage = False;
- while ($myrow2=DB_fetch_array($result)) {
+ while($myrow2=DB_fetch_array($result)) {
if($myrow2['discountpercent'] == 0) {
$DisplayDiscount = '';
} else {
@@ -343,7 +343,7 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+80,$YPos,186,$FontSize,$myrow2['description']);// Print item short description.
}
$lines=1;
- while ($LeftOvers!='') {
+ while($LeftOvers!='') {
$LeftOvers = $pdf->addTextWrap($Left_Margin+80,$YPos-(10*$lines),186,$FontSize,$LeftOvers);
$lines++;
}
@@ -364,26 +364,26 @@
WHERE stockmoveno='" . $myrow2['stkmoveno'] . "'");
if($myrow2['serialised']==1) {
- while ($ControlledMovtRow = DB_fetch_array($GetControlMovts)) {
+ while($ControlledMovtRow = DB_fetch_array($GetControlMovts)) {
$YPos -= (10*$lines);
$LeftOvers = $pdf->addTextWrap($Left_Margin+82,$YPos,100,$FontSize,$ControlledMovtRow['serialno'],'left');
if($YPos-$line_height <= $Bottom_Margin) {
/* head up a new invoice/credit note page */
/*draw the vertical column lines right to the bottom */
PrintLinesToBottom ();
- include ('includes/PDFTransPageHeaderPortrait.inc');
- } //end if need a new page headed up
+ include ('includes/PDFTransPageHeaderPortrait.inc');
+ } //end if need a new page headed up
}
} else {
- while ($ControlledMovtRow = DB_fetch_array($GetControlMovts)) {
+ while($ControlledMovtRow = DB_fetch_array($GetControlMovts)) {
$YPos -= (10*$lines);
$LeftOvers = $pdf->addTextWrap($Left_Margin+82,$YPos,100,$FontSize,(-$ControlledMovtRow['moveqty']) . ' x ' . $ControlledMovtRow['serialno'], 'left');
if($YPos-$line_height <= $Bottom_Margin) {
/* head up a new invoice/credit note page */
/*draw the vertical column lines right to the bottom */
PrintLinesToBottom ();
- include ('includes/PDFTransPageHeaderPortrait.inc');
- } //end if need a new page headed up
+ include ('includes/PDFTransPageHeaderPortrait.inc');
+ } //end if need a new page headed up
}
}
}
@@ -391,15 +391,15 @@
$lines=explode("\r\n",htmlspecialchars_decode($myrow2['narrative']));
for ($i=0;$i<sizeOf($lines);$i++) {
- while (mb_strlen($lines[$i])>1) {
+ while(mb_strlen($lines[$i])>1) {
if($YPos-$line_height <= $Bottom_Margin) {
/* head up a new invoice/credit note page */
/*draw the vertical column lines right to the bottom */
PrintLinesToBottom ();
- include ('includes/PDFTransPageHeaderPortrait.inc');
- } //end if need a new page headed up
- /*increment a line down for the next line item */
- if(mb_strlen($lines[$i])>1) {
+ include ('includes/PDFTransPageHeaderPortrait.inc');
+ } //end if need a new page headed up
+ /*increment a line down for the next line item */
+ if(mb_strlen($lines[$i])>1) {
$lines[$i] = $pdf->addTextWrap($Left_Margin+85,$YPos,181,$FontSize,stripslashes($lines[$i]));
}
$YPos -= ($line_height);
@@ -424,7 +424,7 @@
PrintLinesToBottom ();
include ('includes/PDFTransPageHeaderPortrait.inc');
}
- /*Print a column vertical line with enough space for the footer*/
+ /*Print a column vertical line with enough space for the footer*/
/*draw the vertical column lines to 4 lines shy of the bottom
to leave space for invoice footer info ie totals etc*/
$pdf->line($Left_Margin+78, $TopOfColHeadings+12,$Left_Margin+78,$Bottom_Margin+(4*$line_height));
@@ -454,16 +454,16 @@
$DisplayTax = locale_number_format($myrow['ovgst'],$myrow['decimalplaces']);
$DisplayTotal = locale_number_format($myrow['ovfreight']+$myrow['ovgst']+$myrow['ovamount'],$myrow['decimalplaces']);
} else {
- $DisplaySubTot = locale_number_format(-$myrow['ovamount'],$myrow['decimalplaces']);
- $DisplayFreight = locale_number_format(-$myrow['ovfreight'],$myrow['decimalplaces']);
- $DisplayTax = locale_number_format(-$myrow['ovgst'],$myrow['decimalplaces']);
- $DisplayTotal = locale_number_format(-$myrow['ovfreight']-$myrow['ovgst']-$myrow['ovamount'],$myrow['decimalplaces']);
+ $DisplaySubTot = locale_number_format(-$myrow['ovamount'],$myrow['decimalplaces']);
+ $DisplayFreight = locale_number_format(-$myrow['ovfreight'],$myrow['decimalplaces']);
+ $DisplayTax = locale_number_format(-$myrow['ovgst'],$myrow['decimalplaces']);
+ $DisplayTotal = locale_number_format(-$myrow['ovfreight']-$myrow['ovgst']-$myrow['ovamount'],$myrow['decimalplaces']);
}
/*Print out the invoice text entered */
$YPos = $Bottom_Margin+(3*$line_height);
/* Print out the payment terms */
- $pdf->addTextWrap($Left_Margin, $YPos+3, 280, $FontSize,_('Payment Terms') . ': ' . $myrow['terms']);
+ $pdf->addTextWrap($Left_Margin, $YPos+3, 280, $FontSize,_('Payment Terms') . ': ' . $myrow['terms']);
$FontSize =8;
$LeftOvers=explode("\r\n",DB_escape_string($myrow['invtext']));
@@ -492,7 +492,7 @@
$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-220, $Bottom_Margin+5, 144, $FontSize, _('TOTAL INVOICE'));
$FontSize=8;
$LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos-18,280,$FontSize,$_SESSION['RomalpaClause']);
- while (mb_strlen($LeftOvers)>0 AND $YPos > $Bottom_Margin) {
+ while(mb_strlen($LeftOvers)>0 AND $YPos > $Bottom_Margin) {
$YPos -=10;
$LeftOvers = $pdf->addTextWrap($Left_Margin, $YPos-18,280,$FontSize,$LeftOvers);
}
@@ -501,15 +501,15 @@
$pdf->addJpegFromFile('companies/' . $_SESSION['DatabaseName'] . '/payment.jpg',$Page_Width/2 -60,$YPos-15,0,20);
}
// Print Bank acount details if available and default for invoices is selected
- $pdf->addText($Left_Margin, $YPos+22-$line_height*3, $FontSize, $DefaultBankAccountCode . ' ' . $DefaultBankAccountNumber);
+ $pdf->addText($Left_Margin, $YPos+22-$line_height*3, $FontSize, $DefaultBankAccountCode . ' ' . $DefaultBankAccountNumber);
$FontSize=10;
} else {
$LeftOvers = $pdf->addTextWrap($Page_Width-$Right_Margin-220, $Bottom_Margin+5, 144, $FontSize, _('TOTAL CREDIT'));
}
$LeftOvers = $pdf->addTextWrap($Page_Width-$Left_Margin-72, $Bottom_Margin+5, 72, $FontSize, $DisplayTotal, 'right');
- } /* end of check to see that there was an invoice record to print */
+ } /* end of check to see that there was an invoice record to print */
- $FromTransNo++;
+ $FromTransNo++;
} /* end loop to print invoices */
/* Put the transaction number back as would have been incremented by one after last pass */
@@ -529,7 +529,7 @@
if($_SESSION['SmtpSetting'] == 0) {
$mail->setFrom($_SESSION['CompanyRecord']['coyname'] . ' <' . $_SESSION['CompanyRecord']['email'] . '>');
$result = $mail->send(array($_GET['Email']));
- }else{
+ } else {
$result = SendmailBySmtp($mail,array($_GET['Email']));
}
@@ -537,7 +537,7 @@
$Title = _('Emailing') . ' ' .$InvOrCredit . ' ' . _('Number') . ' ' . $FromTransNo;
include('includes/header.inc');
- echo '<p>' . $InvOrCredit . ' ' . _('number') . ' ' . $FromTransNo . ' ' . _('has been emailed to') . ' ' . $_GET['Email'];
+ echo '<p>' . $InvOrCredit . ' ' . _('number') . ' ' . $FromTransNo . ' ' . _('has been emailed to') . ' ' . $_GET['Email'];
include('includes/footer.inc');
exit;
@@ -560,7 +560,7 @@
/*if FromTransNo is not set then show a form to allow input of either a single invoice number or a range of invoices to be printed. Also get the last invoice number created to show the user where the current range is up to */
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
- echo '<div>';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Print Invoices or Credit Notes (Portrait Mode)') . '</p>';
@@ -571,30 +571,24 @@
<td><select name="InvOrCredit">';
if($InvOrCredit=='Invoice' OR !isset($InvOrCredit)) {
-
- echo '<option selected="selected" value="Invoice">' . _('Invoices') . '</option>';
- echo '<option value="Credit">' . _('Credit Notes') . '</option>';
+ echo '<option selected="selected" value="Invoice">' . _('Invoices') . '</option>';
+ echo '<option value="Credit">' . _('Credit Notes') . '</option>';
} else {
- echo '<option selected="selected" value="Credit">' . _('Credit Notes') . '</option>';
- echo '<option value="Invoice">' . _('Invoices') . '</option>';
+ echo '<option selected="selected" value="Credit">' . _('Credit Notes') . '</option>';
+ echo '<option value="Invoice">' . _('Invoices') . '</option>';
}
echo '</select></td>
- </tr>';
-
- echo '<tr>
- <td>' . _('Print EDI Transactions') . '</td>
+ </tr>
+ <tr>
+ <td>', _('Print EDI Transactions'), '</td>
<td><select name="PrintEDI">';
if($InvOrCredit=='Invoice' OR !isset($InvOrCredit)) {
-
- echo '<option selected="selected" value="No">' . _('Do not Print PDF EDI Transactions') . '</option>';
- echo '<option value="Yes">' . _('Print PDF EDI Transactions Too') . '</option>';
-
+ echo '<option selected="selected" value="No">' . _('Do not Print PDF EDI Transactions') . '</option>';
+ echo '<option value="Yes">' . _('Print PDF EDI Transactions Too') . '</option>';
} else {
-
- echo '<option value="No">' . _('Do not Print PDF EDI Transactions') . '</option>';
- echo '<option selected="selected" value="Yes">' . _('Print PDF EDI Transactions Too') . '</option>';
-
+ echo '<option value="No">' . _('Do not Print PDF EDI Transactions') . '</option>';
+ echo '<option selected="selected" value="Yes">' . _('Print PDF EDI Transactions Too') . '</option>';
}
echo '</select></td>
@@ -628,12 +622,12 @@
$myrow = DB_fetch_row($result);
echo '<br /><b>' . _('The last credit note created was number') . ' ' . $myrow[0] . '</b><br />' . _('A sequential range can be printed using the same method as for invoices above') . '. ' . _('A single credit note can be printed by only entering a start transaction number') . '</div>';
- echo '</div>
- </form>';
+ echo '</div>
+ </form>';
} else {
- while ($FromTransNo <= $_POST['ToTransNo']) {
+ while($FromTransNo <= $_POST['ToTransNo']) {
/*retrieve the invoice details from the database to print
notice that salesorder record must be present to print the invoice purging of sales orders will
@@ -641,7 +635,7 @@
if($InvOrCredit=='Invoice') {
- $sql = "SELECT debtortrans.trandate,
+ $sql = "SELECT debtortrans.trandate,
debtortrans.ovamount,
debtortrans.ovdiscount,
debtortrans.ovfreight,
@@ -692,7 +686,7 @@
INNER JOIN locations
ON salesorders.fromstkloc=locations.loccode
INNER JOIN locationusers
- ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1
+ ON locationusers.loccode=locations.loccode AND locationusers.userid='" . $_SESSION['UserID'] . "' AND locationusers.canview=1
INNER JOIN paymentterms
ON debtorsmaster.paymentterms=paymentterms.termsindicator
INNER JOIN currencies
@@ -701,8 +695,8 @@
AND debtortrans.transno='" . $FromTransNo . "'";
} else { //its a credit note
- $sql = "SELECT debtortrans.trandate,
- debtortrans.ovamount,
+ $sql = "SELECT debtortrans.trandate,
+ debtortrans.ovamount,
debtortrans.ovdiscount,
debtortrans.ovfreight,
debtortrans.ovgst,
@@ -769,9 +763,9 @@
<td style="background-color:#bbbbbb">';
if($InvOrCredit=='Invoice') {
- echo '<h2>' . _('TAX INVOICE') . ' ';
+ echo '<h2>' . _('TAX INVOICE') . ' ';
} else {
- echo '<h2 style="color:red">' . _('TAX CREDIT NOTE') . ' ';
+ echo '<h2 style="color:red">' . _('TAX CREDIT NOTE') . ' ';
}
echo _('Number') . ' ' . $FromTransNo . '</h2>
<br />' . _('Tax Authority Ref') . '. ' . $_SESSION['CompanyRecord']['gstno'] . '</td>
@@ -824,13 +818,13 @@
if($InvOrCredit=='Invoice') {
- echo '<table class="table1">
- <tr>
- <td align="left" style="background-color:#bbbbbb"><b>' . _('Charge Branch') . ':</b></td>
+ echo '<table class="table1">
+ <tr>
+ <td align="left" style="background-color:#bbbbbb"><b>' . _('Charge Branch') . ':</b></td>
<td align="left" style="background-color:#bbbbbb"><b>' . _('Delivered To') . ':</b></td>
</tr>';
- echo '<tr>
- <td style="background-color:#eeeeee">' .$myrow['brname'] .
+ echo '<tr>
+ <td style="background-color:#eeeeee">' .$myrow['brname'] .
'<br />' . $myrow['braddress1'] .
'<br />' . $myrow['braddress2'] .
'<br />' . $myrow['braddress3'] .
@@ -839,7 +833,7 @@
'<br />' . $myrow['braddress6'] .
'</td>';
- echo '<td style="background-color:#eeeeee">' . $myrow['deliverto'] .
+ echo '<td style="background-color:#eeeeee">' . $myrow['deliverto'] .
'<br />' . $myrow['deladd1'] .
'<br />' . $myrow['deladd2'] .
'<br />' . $myrow['deladd3'] .
@@ -847,11 +841,11 @@
'<br />' . $myrow['deladd5'] .
'<br />' . $myrow['deladd6'] .
'</td>';
- echo '</tr>
- </table><hr />';
+ echo '</tr>
+ </table><hr />';
- echo '<table class="table1">
- <tr>
+ echo '<table class="table1">
+ <tr>
<td align="left" style="background-color:#bbbbbb"><b>' . _('Your Order Ref') . '</b></td>
<td align="left" style="background-color:#bbbbbb"><b>' . _('Our Order No') . '</b></td>
<td align="left" style="background-color:#bbbbbb"><b>' . _('Order Date') . '</b></td>
@@ -860,7 +854,7 @@
<td align="left" style="background-color:#bbbbbb"><b>' . _('Shipper') . '</b></td>
<td align="left" style="background-color:#bbbbbb"><b>' . _('Consignment Ref') . '</b></td>
</tr>';
- echo '<tr>
+ echo '<tr>
<td style="background-color:#EEEEEE">' . $myrow['customerref'] . '</td>
<td style="background-color:#EEEEEE">' .$myrow['orderno'] . '</td>
<td style="background-color:#EEEEEE">' . ConvertSQLDate($myrow['orddate']) . '</td>
@@ -871,8 +865,8 @@
</tr>
</table>';
- $sql ="SELECT stockmoves.stockid,
- stockmaster.description,
+ $sql ="SELECT stockmoves.stockid,
+ stockmaster.description,
-stockmoves.qty as quantity,
stockmoves.discountpercent,
((1 - stockmoves.discountpercent) * stockmoves.price * " . $ExchRate . "* -stockmoves.qty) AS fxnet,
@@ -888,11 +882,11 @@
} else { /* then its a credit note */
- echo '<table width="50%">
+ echo '<table width="50%">
<tr>
<td align="left" style="background-color:#BBBBBB"><b>' . _('Branch') . ':</b></td>
</tr>';
- echo '<tr>
+ echo '<tr>
<td style="background-color:#EEEEEE">' . $myrow['brname'] .
'<br />' . $myrow['braddress1'] .
'<br />' . $myrow['braddress2'] .
@@ -902,21 +896,21 @@
'<br />' . $myrow['braddress6'] .
'</td>
</tr></table>';
- echo '<hr />
+ echo '<hr />
<table class="table1">
<tr>
- <td align="left" style="background-color:#bbbbbb"><b>' . _('Date') . '</b></td>
+ <td align="left" style="background-color:#bbbbbb"><b>' . _('Date') . '</b></td>
<td align="left" style="background-color:#BBBBBB"><b>' . _('Sales Person') . '</b></td>
</tr>';
- echo '<tr>
- <td style="background-color:#EEEEEE">' . ConvertSQLDate($myrow['trandate']) . '</td>
+ echo '<tr>
+ <td style="background-color:#EEEEEE">' . ConvertSQLDate($myrow['trandate']) . '</td>
<td style="background-color:#EEEEEE">' . $myrow['salesmanname'] . '</td>
</tr>
</table>';
- $sql ="SELECT stockmoves.stockid,
- stockmaster.description,
+ $sql ="SELECT stockmoves.stockid,
+ stockmaster.description,
stockmoves.qty as quantity,
stockmoves.discountpercent, ((1 - stockmoves.discountpercent) * stockmoves.price * " . $ExchRate . " * stockmoves.qty) AS fxnet,
(stockmoves.price * " . $ExchRate . ") AS fxprice,
@@ -957,91 +951,91 @@
$LineCounter =17;
$k=0; //row colour counter
- while ($myrow2=DB_fetch_array($result)) {
+ while($myrow2=DB_fetch_array($result)) {
- if($k==1) {
- $RowStarter = '<tr class="EvenTableRows">';
- $k=0;
- } else {
- $RowStarter = '<tr class="OddTableRows">';
- $k=1;
- }
+ if($k==1) {
+ $RowStarter = '<tr class="EvenTableRows">';
+ $k=0;
+ } else {
+ $RowStarter = '<tr class="OddTableRows">';
+ $k=1;
+ }
- echo $RowStarter;
+ echo $RowStarter;
- $DisplayPrice =locale_number_format($myrow2['fxprice'],$myrow['decimalplaces']);
- $DisplayQty = locale_number_format($myrow2['quantity'],$myrow2['decimalplaces']);
- $DisplayNet = locale_number_format($myrow2['fxnet'],$myrow['decimalplaces']);
+ $DisplayPrice =locale_number_format($myrow2['fxprice'],$myrow['decimalplaces']);
+ $DisplayQty = locale_number_format($myrow2['quantity'],$myrow2['decimalplaces']);
+ $DisplayNet = locale_number_format($myrow2['fxnet'],$myrow['decimalplaces']);
- if($myrow2['discountpercent']==0) {
- $DisplayDiscount ='';
- } else {
- $DisplayDiscount = locale_number_format($myrow2['discountpercent']*100,2) . '%';
- }
+ if($myrow2['discountpercent']==0) {
+ $DisplayDiscount ='';
+ } else {
+ $DisplayDiscount = locale_number_format($myrow2['discountpercent']*100,2) . '%';
+ }
- printf ('<td>%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- </tr>',
- $myrow2['stockid'],
- $myrow2['description'],
- $DisplayQty,
- $myrow2['units'],
- $DisplayPrice,
- $DisplayDiscount,
- $DisplayNet);
+ printf ('<td>%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ </tr>',
+ $myrow2['stockid'],
+ $myrow2['description'],
+ $DisplayQty,
+ $myrow2['units'],
+ $DisplayPrice,
+ $DisplayDiscount,
+ $DisplayNet);
- if(mb_strlen($myrow2['narrative'])>1) {
- echo $RowStarter .
- '<td></td>
- <td colspan="6">' . $myrow2['narrative'] . '</td>
- </tr>';
+ if(mb_strlen($myrow2['narrative'])>1) {
+ echo $RowStarter .
+ '<td></td>
+ <td colspan="6">' . $myrow2['narrative'] . '</td>
+ </tr>';
$LineCounter++;
- }
+ }
- $LineCounter++;
+ $LineCounter++;
- if($LineCounter == ($_SESSION['PageLength'] - 2)) {
+ if($LineCounter == ($_SESSION['PageLength'] - 2)) {
- /* head up a new invoice/credit note page */
+ /* head up a new invoice/credit note page */
- $PageNumber++;
- echo '</table>
+ $PageNumber++;
+ echo '</table>
<table class="table1">
<tr>
<td valign="top"><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
<td style="background-color:#bbbbbb">';
- if($InvOrCredit=='Invoice') {
- echo '<h2>' . _('TAX INVOICE') . ' ';
- } else {
- echo '<h2 style="color:red">' . _('TAX CREDIT NOTE') . ' ';
- }
- echo _('Number') . ' ' . $FromTransNo . '</h2><br />' . _('GST Number') . ' - ' . $_SESSION['CompanyRecord']['gstno'] . '</td>
+ if($InvOrCredit=='Invoice') {
+ echo '<h2>' . _('TAX INVOICE') . ' ';
+ } else {
+ echo '<h2 style="color:red">' . _('TAX CREDIT NOTE') . ' ';
+ }
+ echo _('Number') . ' ' . $FromTransNo . '</h2><br />' . _('GST Number') . ' - ' . $_SESSION['CompanyRecord']['gstno'] . '</td>
</tr>
</table>';
/*Now print out company name and address */
- echo '<table class="table1">
+ echo '<table class="table1">
<tr>
<td><h2>' . $_SESSION['CompanyRecord']['coyname'] . '</h2><br />';
- echo $_SESSION['CompanyRecord']['regoffice1'] . '<br />';
- echo $_SESSION['CompanyRecord']['regoffice2'] . '<br />';
- echo $_SESSION['CompanyRecord']['regoffice3'] . '<br />';
- echo $_SESSION['CompanyRecord']['regoffice4'] . '<br />';
- echo $_SESSION['CompanyRecord']['regoffice5'] . '<br />';
- echo $_SESSION['CompanyRecord']['regoffice6'] . '<br />';
- echo _('Telephone') . ': ' . $_SESSION['CompanyRecord']['telephone'] . '<br />';
- echo _('Facsimile') . ': ' . $_SESSION['CompanyRecord']['fax'] . '<br />';
- echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br />';
- echo '</td><td class="number">' . _('Page') . ': ' . $PageNumber . '</td>
- </tr>
+ echo $_SESSION['CompanyRecord']['regoffice1'] . '<br />';
+ echo $_SESSION['CompanyRecord']['regoffice2'] . '<br />';
+ echo $_SESSION['CompanyRecord']['regoffice3'] . '<br />';
+ echo $_SESSION['CompanyRecord']['regoffice4'] . '<br />';
+ echo $_SESSION['CompanyRecord']['regoffice5'] . '<br />';
+ echo $_SESSION['CompanyRecord']['regoffice6'] . '<br />';
+ echo _('Telephone') . ': ' . $_SESSION['CompanyRecord']['telephone'] . '<br />';
+ echo _('Facsimile') . ': ' . $_SESSION['CompanyRecord']['fax'] . '<br />';
+ echo _('Email') . ': ' . $_SESSION['CompanyRecord']['email'] . '<br />';
+ echo '</td><td class="number">' . _('Page') . ': ' . $PageNumber . '</td>
+ </tr>
</table>';
- echo '<table class="table1">
+ echo '<table class="table1">
<tr>
<th>' . _('Item Code') . '</th>
<th>' . _('Item Description') . '</th>
@@ -1052,9 +1046,9 @@
<th>' . _('Net') . '</th>
</tr>';
- $LineCounter = 10;
+ $LineCounter = 10;
- } //end if need a new page headed up
+ } //end if need a new page headed up
} //end while there are line items to print out
echo '</table>';
} /*end if there are stock movements to show on the invoice or credit note*/
@@ -1072,9 +1066,9 @@
<td valign="top"><img src="' . $_SESSION['LogoFile'] . '" alt="" /></td>
<td style="background-color:#bbbbbb">';
if($InvOrCredit=='Invoice') {
- echo '<h2>' . _('TAX INVOICE') .' ';
+ echo '<h2>' . _('TAX INVOICE') .' ';
} else {
- echo '<h2 style="color:red">' . _('TAX CREDIT NOTE') . ' ';
+ echo '<h2 style="color:red">' . _('TAX CREDIT NOTE') . ' ';
}
echo _('Number') . ' ' . $FromTransNo . '</h2>
<br />' . _('GST Number') . ' - ' . $_SESSION['CompanyRecord']['gstno'] . '</td>
@@ -1117,7 +1111,7 @@
echo '<br /><br />' . $myrow['invtext'];
$LineCounter=$LineCounter+2+$LinesRequiredForText;
- while ($LineCounter < ($_SESSION['PageLength'] -6)) {
+ while($LineCounter < ($_SESSION['PageLength'] -6)) {
echo '<br />';
$LineCounter++;
}
@@ -1125,16 +1119,15 @@
/*Now print out the footer and totals */
if($InvOrCredit=='Invoice') {
-
- $DisplaySubTot = locale_number_format($myrow['ovamount'],$myrow['decimalplaces']);
- $DisplayFreight = locale_number_format($myrow['ovfreight'],$myrow['decimalplaces']);
- $DisplayTax = locale_number_format($myrow['ovgst'],$myrow['decimalplaces']);
- $DisplayTotal = locale_number_format($myrow['ovfreight']+$myrow['ovgst']+$myrow['ovamount'],$myrow['decimalplaces']);
+ $DisplaySubTot = locale_number_format($myrow['ovamount'],$myrow['decimalplaces']);
+ $DisplayFreight = locale_number_format($myrow['ovfreight'],$myrow['decimalplaces']);
+ $DisplayTax = locale_number_format($myrow['ovgst'],$myrow['decimalplaces']);
+ $DisplayTotal = locale_number_format($myrow['ovfreight']+$myrow['ovgst']+$myrow['ovamount'],$myrow['decimalplaces']);
} else {
- $DisplaySubTot = locale_number_format(-$myrow['ovamount'],$myrow['decimalplaces']);
- $DisplayFreight = locale_number_format(-$myrow['ovfreight'],$myrow['decimalplaces']);
- $DisplayTax = locale_number_format(-$myrow['ovgst'],$myrow['decimalplaces']);
- $DisplayTotal = locale_number_format(-$myrow['ovfreight']-$myrow['ovgst']-$myrow['ovamount'],$myrow['decimalplaces']);
+ $DisplaySubTot = locale_number_format(-$myrow['ovamount'],$myrow['decimalplaces']);
+ $DisplayFreight = locale_number_format(-$myrow['ovfreight'],$myrow['decimalplaces']);
+ $DisplayTax = locale_number_format(-$myrow['ovgst'],$myrow['decimalplaces']);
+ $DisplayTotal = locale_number_format(-$myrow['ovfreight']-$myrow['ovgst']-$myrow['ovamount'],$myrow['decimalplaces']);
}
/*Print out the invoice text entered */
echo '<table class="table1"><tr>
@@ -1145,11 +1138,11 @@
echo '<tr><td class="number">' . _('Tax') . '</td>
<td class="number" style="background-color:#EEEEEE">' . $DisplayTax . '</td></tr>';
if($InvOrCredit=='Invoice') {
- echo '<tr><td class="number"><b>' . _('TOTAL INVOICE') . '</b></td>
- <td class="number" style="background-color:#EEEEEE"><b>' . $DisplayTotal . '</b></td></tr>';
+ echo '<tr><td class="number"><b>' . _('TOTAL INVOICE') . '</b></td>
+ <td class="number" style="background-color:#EEEEEE"><b>' . $DisplayTotal . '</b></td></tr>';
} else {
- echo '<tr><td class="number" style="color:red"><b>' . _('TOTAL CREDIT') . '</b></td>
- <td class="number" style="background-color:#EEEEEE;color:red"><b>' . $DisplayTotal . '</b></td></tr>';
+ echo '<tr><td class="number" style="color:red"><b>' . _('TOTAL CREDIT') . '</b></td>
+ <td class="number" style="background-color:#EEEEEE;color:red"><b>' . $DisplayTotal . '</b></td></tr>';
}
echo '</table>';
} /* end of check to see that there was an invoice record to print */
@@ -1171,7 +1164,7 @@
global $TopOfColHeadings;
// Prints column vertical lines:
- $pdf->line($Left_Margin+78, $TopOfColHeadings+12,$Left_Margin+78,$Bottom_Margin);
+ $pdf->line($Left_Margin+ 78, $TopOfColHeadings+12,$Left_Margin+ 78,$Bottom_Margin);
$pdf->line($Left_Margin+268, $TopOfColHeadings+12,$Left_Margin+268,$Bottom_Margin);
$pdf->line($Left_Margin+348, $TopOfColHeadings+12,$Left_Margin+348,$Bottom_Margin);
$pdf->line($Left_Margin+388, $TopOfColHeadings+12,$Left_Margin+388,$Bottom_Margin);
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X