Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6825] trunk
|
From: <rc...@us...> - 2014-08-17 20:52:01
|
Revision: 6825
http://sourceforge.net/p/web-erp/reponame/6825
Author: rchacon
Date: 2014-08-17 20:51:57 +0000 (Sun, 17 Aug 2014)
Log Message:
-----------
Minor changes (add comments).
Modified Paths:
--------------
trunk/doc/Manual/ManualARTransactions.html
trunk/includes/PDFTransPageHeader.inc
trunk/includes/PDFTransPageHeaderPortrait.inc
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
Modified: trunk/doc/Manual/ManualARTransactions.html
===================================================================
--- trunk/doc/Manual/ManualARTransactions.html 2014-08-16 05:13:40 UTC (rev 6824)
+++ trunk/doc/Manual/ManualARTransactions.html 2014-08-17 20:51:57 UTC (rev 6825)
@@ -30,8 +30,15 @@
<li>Updating the stock quantities for all lines of the invoice and the components of all assemblies included on the order.</li>
</ul>
-<p>If the order is not to be invoiced to the customer or branch specified in the order, or pricing is to be changed then the order must be changed. These elements cannot be altered at the time of invoice, they must be altered in the order before it is confirmed for invoicing. Once an invoice is created it cannot be deleted or modified. The order is also updated with the invoice number that it was dispatched on.</p><!-- Help End: SelectSalesOrder -->
+<p>If the order is not to be invoiced to the customer or branch specified in the order, or pricing is to be changed then the order must be changed. These elements cannot be altered at the time of invoice, they must be altered in the order before it is confirmed for invoicing. Once an invoice is created it cannot be deleted or modified. The order is also updated with the invoice number that it was dispatched on.</p>
+<p>Fields:</p>
+<ul>
+<li><b>Invoice Text</b>: This is the comment text of the invoice. It goes after the items lines and before the footer (Subtotal, Freight, Tax, Total invoice). Later, it will be shown in the "<i>Customer Inquiry</i>" on the "<i>Comments</i>" column. Database field: debtortrans.invtext.</li>
+</ul>
+
+<!-- Help End: SelectSalesOrder -->
+
<div class="floatright">
<a class="minitext" href="#top">⬆ Top</a>
</div><!-- Help Begin: SelectCreditItems -->
Modified: trunk/includes/PDFTransPageHeader.inc
===================================================================
--- trunk/includes/PDFTransPageHeader.inc 2014-08-16 05:13:40 UTC (rev 6824)
+++ trunk/includes/PDFTransPageHeader.inc 2014-08-17 20:51:57 UTC (rev 6825)
@@ -1,13 +1,20 @@
<?php
-
/* $Id$ */
-if (!$FirstPage){ /* only initiate a new page if its not the first */
+/* Please note that addTextWrap() prints a font-size-height further down than
+ addText() and other functions. Use addText() instead of addTextWrap() to
+ print left aligned elements.*/
+
+// $PageNumber is initialised in 0 by includes/PDFStarter.php.
+$PageNumber ++;// Increments $PageNumber before printing.
+// Only initiate a new page if its not the first:
+if ($FirstPage) {
+ $FirstPage = False;
+} else {
$pdf->newPage();
}
+$YPos = $Page_Height-$Top_Margin;
-$YPos = $Page_Height - $Top_Margin;
-
$pdf->addJpegFromFile($_SESSION['LogoFile'],$Page_Width/2 -120,$YPos-40,0,60);
$FontSize =15;
if ($InvOrCredit=='Invoice') {
@@ -36,6 +43,14 @@
$pdf->partEllipse($XPos+225, $YPos+5,270,360,10,10);
/*Finally join up to the top right corner where started */
$pdf->line($XPos+235, $YPos+5,$XPos+235, $YPos+100);
+/*// Draws a nice curved corner box around the billing details:
+$pdf->RoundRectangle(
+ $Left_Margin,// RoundRectangle $XPos.
+ $YPos+$FontSize+5,// RoundRectangle $YPos.
+ $Page_Width-$Left_Margin-$Right_Margin,// RoundRectangle $Width.
+ $YPos+$FontSize-$Bottom_Margin+5,// RoundRectangle $Height.
+ 10,// RoundRectangle $RadiusX.
+ 10);// RoundRectangle $RadiusY.*/
$YPos = $Page_Height - $Top_Margin - 10;
@@ -219,4 +234,4 @@
$YPos -= ($line_height);
-?>
\ No newline at end of file
+?>
Modified: trunk/includes/PDFTransPageHeaderPortrait.inc
===================================================================
--- trunk/includes/PDFTransPageHeaderPortrait.inc 2014-08-16 05:13:40 UTC (rev 6824)
+++ trunk/includes/PDFTransPageHeaderPortrait.inc 2014-08-17 20:51:57 UTC (rev 6825)
@@ -1,80 +1,83 @@
<?php
-
/* $Id$ */
+/* Please note that addTextWrap() prints a font-size-height further down than
+ addText() and other functions. Use addText() instead of addTextWrap() to
+ print left aligned elements.*/
-if (!$FirstPage){ /* only initiate a new page if its not the first */
+// $PageNumber is initialised in 0 by includes/PDFStarter.php.
+$PageNumber ++;// Increments $PageNumber before printing.
+if ($PageNumber>1) {// Inserts a page break if it is not the first page.
$pdf->newPage();
}
+/*// Only initiate a new page if its not the first:
+if ($FirstPage) {
+ $FirstPage = False;
+} else {
+ $pdf->newPage();*/
+}
+$YPos = $Page_Height-$Top_Margin;
-$YPos = $Page_Height - $Top_Margin;
-
// Company Logo
$pdf->addJpegFromFile($_SESSION['LogoFile'],$Page_Width/2 -118,$YPos-60,0,35);
$FontSize =15;
if ($InvOrCredit=='Invoice') {
-
- $pdf->addText($Page_Width/2 - 60, $YPos, $FontSize, _('TAX INVOICE') . ' ');
+ $pdf->addText($Page_Width/2 - 60, $YPos, $FontSize, _('TAX INVOICE') . ' ');
} else {
$pdf->addText($Page_Width/2 - 60, $YPos, $FontSize, _('TAX CREDIT NOTE') . ' ');
}
-// Prints page number
+// Prints page number:
$FontSize = 10;
$YPos -= $FontSize; //Downs one line height mesure (addText position is from left-bottom).
-$pdf->addTextWrap($Page_Width-$Left_Margin-72, $YPos, 72, $FontSize, _('Page').' '.$PageNumber, 'right');
+$pdf->addTextWrap($Page_Width-$Right_Margin-100, $YPos, 100, $FontSize,
+ _('Page') . ' ' . $PageNumber, 'right');
$XPos = $Page_Width - 265;
$YPos -= 85;
-/*draw a nice curved corner box around the billing details */
-/*from the top right */
-$pdf->partEllipse($XPos+225,$YPos+67,0,90,10,10);
-/*line to the top left */
-$pdf->line($XPos+225, $YPos+77,$XPos, $YPos+77);
-/*Do top left corner */
-$pdf->partEllipse($XPos, $YPos+67,90,180,10,10);
-/*Do a line to the bottom left corner */
-$pdf->line($XPos-10, $YPos+67,$XPos-10, $YPos-10);
-/*Now do the bottom left corner 180 - 270 coming back west*/
-$pdf->partEllipse($XPos, $YPos-10,180,270,10,10);
-/*Now a line to the bottom right */
-$pdf->line($XPos, $YPos-20,$XPos+225, $YPos-20);
-/*Now do the bottom right corner */
-$pdf->partEllipse($XPos+225, $YPos-10,270,360,10,10);
-/*Finally join up to the top right corner where started */
-$pdf->line($XPos+235, $YPos-10,$XPos+235, $YPos+67);
+// Draws a nice curved corner box around the billing details:
+$pdf->RoundRectangle($XPos-10, $Page_Height-$Top_Margin-15, 245, 101, 10, 10);
+/*// Draws a nice curved corner box around the billing details:
+$pdf->RoundRectangle(
+ $Left_Margin,// RoundRectangle $XPos.
+ $YPos+$FontSize+5,// RoundRectangle $YPos.
+ $Page_Width-$Left_Margin-$Right_Margin,// RoundRectangle $Width.
+ $YPos+$FontSize-$Bottom_Margin+5,// RoundRectangle $Height.
+ 10,// RoundRectangle $RadiusX.
+ 10);// RoundRectangle $RadiusY.*/
+
+$XPos = $Page_Width-268;
$YPos = $Page_Height - $Top_Margin - 10;
-
$FontSize = 10;
$LineHeight = 13;
-$LineCount = 1;
-$pdf->addText($Page_Width-268, $YPos-$LineCount*$LineHeight, $FontSize, _('Number'));
-$pdf->addText($Page_Width-180, $YPos-$LineCount*$LineHeight, $FontSize, $FromTransNo);
-$LineCount += 1;
-$pdf->addText($Page_Width-268, $YPos-$LineCount*$LineHeight, $FontSize, _('Customer Code'));
-$pdf->addText($Page_Width-180, $YPos-$LineCount*$LineHeight, $FontSize, $myrow['debtorno'] . ' ' . _('Branch') . ' ' . $myrow['branchcode']);
-$LineCount += 1;
-$pdf->addText($Page_Width-268, $YPos-$LineCount*$LineHeight, $FontSize, _('Date'));
-$pdf->addText($Page_Width-180, $YPos-$LineCount*$LineHeight, $FontSize, ConvertSQLDate($myrow['trandate']));
+$YPos -= $LineHeight;
+$pdf->addText($XPos, $YPos, $FontSize, _('Number'));
+$pdf->addText($XPos+88, $YPos, $FontSize, $FromTransNo);
+$YPos -= $LineHeight;
+$pdf->addText($XPos, $YPos, $FontSize, _('Customer Code'));
+$pdf->addText($XPos+88, $YPos, $FontSize, $myrow['debtorno'] . ' ' . _('Branch') . ' ' . $myrow['branchcode']);
+$YPos -= $LineHeight;
+$pdf->addText($XPos, $YPos, $FontSize, _('Date'));
+$pdf->addText($XPos+88, $YPos, $FontSize, ConvertSQLDate($myrow['trandate']));
+
if ($InvOrCredit=='Invoice') {
- $LineCount += 1;
- $pdf->addText($Page_Width-268, $YPos-$LineCount*$LineHeight, $FontSize, _('Order No'));
- $pdf->addText($Page_Width-180, $YPos-$LineCount*$LineHeight, $FontSize, $myrow['orderno']);
- $LineCount += 1;
- $pdf->addText($Page_Width-268, $YPos-$LineCount*$LineHeight, $FontSize, _('Order Date'));
- $pdf->addText($Page_Width-180, $YPos-$LineCount*$LineHeight, $FontSize, ConvertSQLDate($myrow['orddate']));
- $LineCount += 1;
- $pdf->addText($Page_Width-268, $YPos-$LineCount*$LineHeight, $FontSize, _('Dispatch Detail'));
- $pdf->addText($Page_Width-180, $YPos-$LineCount*$LineHeight, $FontSize, $myrow['shippername'] . '-' . $myrow['consignment']);
- $LineCount += 1;
- $pdf->addText($Page_Width-268, $YPos-$LineCount*$LineHeight, $FontSize, _('Dispatched From'));
- $pdf->addText($Page_Width-180, $YPos-$LineCount*$LineHeight, $FontSize, $myrow['locationname']);
+ $YPos -= $LineHeight;
+ $pdf->addText($XPos, $YPos, $FontSize, _('Order No'));
+ $pdf->addText($XPos+88, $YPos, $FontSize, $myrow['orderno']);
+ $YPos -= $LineHeight;
+ $pdf->addText($XPos, $YPos, $FontSize, _('Order Date'));
+ $pdf->addText($XPos+88, $YPos, $FontSize, ConvertSQLDate($myrow['orddate']));
+ $YPos -= $LineHeight;
+ $pdf->addText($XPos, $YPos, $FontSize, _('Dispatch Detail'));
+ $pdf->addText($XPos+88, $YPos, $FontSize, $myrow['shippername'] . '-' . $myrow['consignment']);
+ $YPos -= $LineHeight;
+ $pdf->addText($XPos, $YPos, $FontSize, _('Dispatched From'));
+ $pdf->addText($XPos+88, $YPos, $FontSize, $myrow['locationname']);
}
-
/*End of the text in the right side box */
/*Now print out company info at the top left */
@@ -147,7 +150,6 @@
$pdf->addText($XPos, $YPos-$LineCount*$LineHeight, $FontSize, html_entity_decode($myrow['brpostaddr3']) . ' ' . html_entity_decode($myrow['brpostaddr4']) . ' ' . html_entity_decode($myrow['brpostaddr5']) . ' ' . html_entity_decode($myrow['brpostaddr6']));
}
-//$XPos = $Page_Width/2;
$XPos = $Page_Width - 265;
$YPos = $Page_Height - $Top_Margin - 120;
@@ -157,8 +159,8 @@
if ($InvOrCredit=='Invoice') {
$pdf->addText($XPos, $YPos-$LineCount*$LineHeight, $FontSize, _('Delivered To (check Dispatch Detail)') . ':');
- $FontSize = 10;
- $LineHeight = 13;
+ $FontSize = 10;
+ $LineHeight = 13;
$XPos +=20;
$LineCount += 1;
// Before trying to call htmlspecialchars_decode, check that its supported, if not substitute a compatible version
@@ -203,58 +205,42 @@
}
$XPos = $Left_Margin;
-
$YPos = $Page_Height - $Top_Margin - 190;
-$XPos = $Left_Margin;
+/*$XPos = $Left_Margin;*/
$FontSize = 8;
include($PathPrefix . 'includes/CurrenciesArray.php'); // To get the currency name from the currency code.
-$pdf->addText($Left_Margin, $YPos-8, $FontSize, _('All amounts stated in') . ': ' . $myrow['currcode'] . ' ' . $CurrencyName[$myrow['currcode']]);
+$pdf->addText($Left_Margin, $YPos-8, $FontSize, _('All amounts stated in') . ': ' . $myrow['currcode'] . ' - ' . $CurrencyName[$myrow['currcode']]);
-$BoxHeight = $Page_Height-282;
-/*draw a box with nice round corner for entering line items */
-/*90 degree arc at top right of box 0 degrees starts a bottom */
-$pdf->partEllipse($Page_Width-$Right_Margin-10, $Bottom_Margin+$BoxHeight,0,90,10,10);
-/*line to the top left */
-$pdf->line($Page_Width-$Right_Margin-10, $Bottom_Margin+$BoxHeight+10,$Left_Margin+10, $Bottom_Margin+$BoxHeight+10);
-/*Dow top left corner */
-$pdf->partEllipse($Left_Margin+10, $Bottom_Margin+$BoxHeight,90,180,10,10);
-/*Do a line to the bottom left corner */
-$pdf->line($Left_Margin, $Bottom_Margin+$BoxHeight,$Left_Margin, $Bottom_Margin+10);
-/*Now do the bottom left corner 180 - 270 coming back west*/
-$pdf->partEllipse($Left_Margin+10, $Bottom_Margin+10,180,270,10,10);
-/*Now a line to the bottom right */
-$pdf->line($Left_Margin+10, $Bottom_Margin,$Page_Width-$Right_Margin-10, $Bottom_Margin);
-/*Now do the bottom right corner */
-$pdf->partEllipse($Page_Width-$Right_Margin-10, $Bottom_Margin+10,270,360,10,10);
-/*Finally join up to the top right corner where started */
-$pdf->line($Page_Width-$Right_Margin, $Bottom_Margin+10,$Page_Width-$Right_Margin, $Bottom_Margin+$BoxHeight);
+$BoxHeight = $Page_Height-282;
+// Draws a box with nice round corner for entering line items:
+$pdf->RoundRectangle($Left_Margin, $Bottom_Margin+$BoxHeight+10, $Page_Width-$Right_Margin-$Left_Margin, $BoxHeight+10, 10, 10);
-$YPos -= 35;
/*Set up headings */
-$FontSize=10;
+$YPos -= 11;
+$FontSize = 10;
$LineHeight = 12;
-$LineCount = 0;
-$pdf->addText($Left_Margin+2, ($YPos+$LineHeight)-$LineCount*$LineHeight, $FontSize, _('Cust. Tax Ref') . ':');
+$YPos -= $LineHeight;
+$pdf->addText($Left_Margin+2, $YPos, $FontSize, _('Cust. Tax Ref') . ':');
/*Print a vertical line */
-$pdf->line($Left_Margin+178, $YPos+$LineHeight,$Left_Margin+178, $YPos-$LineHeight*2+4);
-$pdf->addText($Left_Margin+180, ($YPos+$LineHeight)-$LineCount*$LineHeight, $FontSize, _('Cust. Reference No.') . ':');
+$pdf->line($Left_Margin+178, $YPos,$Left_Margin+178, $YPos-$LineHeight*3+4);
+$pdf->addText($Left_Margin+180, $YPos, $FontSize, _('Cust. Reference No.') . ':');
/*Print a vertical line */
-$pdf->line($Left_Margin+358, $YPos+$LineHeight,$Left_Margin+358, $YPos-$LineHeight*2+4);
-$pdf->addText($Left_Margin+360, ($YPos+$LineHeight)-$LineCount*$LineHeight, $FontSize, _('Sales Person') . ':');
-$LineCount += 1;
-$pdf->addText($Left_Margin+12, ($YPos+$LineHeight)-$LineCount*$LineHeight, $FontSize, $myrow['taxref']);
-if ($InvOrCredit=='Invoice'){
- $pdf->addText($Left_Margin+190, ($YPos+$LineHeight)-$LineCount*$LineHeight, $FontSize, $myrow['customerref']);
+$pdf->line($Left_Margin+358, $YPos,$Left_Margin+358, $YPos-$LineHeight*3+4);
+$pdf->addText($Left_Margin+360, $YPos, $FontSize, _('Sales Person') . ':');
+
+$YPos -= $LineHeight;
+$pdf->addText($Left_Margin+12, $YPos, $FontSize, $myrow['taxref']);
+if ($InvOrCredit=='Invoice') {
+ $pdf->addText($Left_Margin+190, $YPos, $FontSize, $myrow['customerref']);
}
-$pdf->addText($Left_Margin+370, ($YPos+$LineHeight)-$LineCount*$LineHeight, $FontSize, $myrow['salesmanname']);
+$pdf->addText($Left_Margin+370, $YPos, $FontSize, $myrow['salesmanname']);
+/*draw a line */
$YPos -= 20;
-
-/*draw a line */
$pdf->line($XPos, $YPos,$Page_Width-$Right_Margin, $YPos);
$YPos -= 12;
@@ -269,11 +255,10 @@
$pdf->addText($Left_Margin+420, $YPos+12, $FontSize, _('Disc.'));
$pdf->addTextWrap($Page_Width-$Left_Margin-72, $YPos, 72, $FontSize, _('Price'), 'right');
+/*draw a line */
$YPos-=0;
-
-/*draw a line */
$pdf->line($XPos, $YPos,$Page_Width-$Right_Margin, $YPos);
$YPos -= ($line_height);
-?>
\ No newline at end of file
+?>
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2014-08-16 05:13:40 UTC (rev 6824)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po 2014-08-17 20:51:57 UTC (rev 6825)
@@ -8,7 +8,7 @@
"Project-Id-Version: webERP 4.11.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-08-14 18:43-0600\n"
-"PO-Revision-Date: 2014-08-15 14:04-0600\n"
+"PO-Revision-Date: 2014-08-16 12:00-0600\n"
"Last-Translator: Rafael Chacon <raf...@gm...>\n"
"Language-Team: TecnoSoluciones.com <web...@te...>\n"
"Language: es_ES\n"
@@ -7332,7 +7332,7 @@
#: Credit_Invoice.php:404
msgid "Are you sure you wish to delete this item from the credit?"
-msgstr ""
+msgstr "¿Está seguro de que quiere borrar este artículo del crédito?"
#: Credit_Invoice.php:422
msgid "Freight cost charged on invoice"
@@ -7543,11 +7543,11 @@
#: Credit_Invoice.php:1592
msgid "Credit note text"
-msgstr "Texto de nota de Crédito"
+msgstr "Texto de la nota de crédito"
#: Credit_Invoice.php:1604
msgid "Process Credit"
-msgstr "Procesar nota de Crédito"
+msgstr "Procesar crédito"
#: Currencies.php:6 includes/MainMenuLinksArray.php:441
msgid "Currencies Maintenance"
@@ -10138,7 +10138,7 @@
#: Customers.php:1101
msgid "Contact Deleted"
-msgstr "Contacto Eliminado"
+msgstr "Contacto suprimido"
#: Customers.php:1133
msgid "Add Contact"
@@ -10155,7 +10155,7 @@
#: Customers.php:1195
msgid "Delete Customer"
-msgstr "Eliminar cliente"
+msgstr "Suprimir cliente"
#: DailyBankTransactions.php:6
msgid "Bank Transactions Inquiry"
@@ -10245,7 +10245,7 @@
#: DailyBankTransactions.php:173 GLJournalInquiry.php:126
msgid "Select Another Date"
-msgstr "Seleccione Otra Fecha"
+msgstr "Seleccione otra fecha"
#: DailySalesInquiry.php:6 includes/MainMenuLinksArray.php:56
msgid "Daily Sales Inquiry"
@@ -10261,7 +10261,7 @@
#: DailySalesInquiry.php:26
msgid "Month to Show"
-msgstr "Meses a Mostrar"
+msgstr "Mes a mostrar"
#: DailySalesInquiry.php:70
msgid "Show Daily Sales For The Selected Month"
@@ -10385,7 +10385,7 @@
#: Dashboard.php:359 PrintCustTrans.php:811 PrintCustTransPortrait.php:857
#: SalesInquiry.php:1087 SupplierInvoice.php:632
msgid "Invoice Date"
-msgstr "Fecha Factura"
+msgstr "Fecha factura"
#: Dashboard.php:361
msgid "Amount Due"
@@ -10442,7 +10442,7 @@
#: Dashboard.php:672 FTP_RadioBeacon.php:55 SelectCompletedOrder.php:560
#: SelectSalesOrder.php:701 SelectSalesOrder.php:718
msgid "Req Del Date"
-msgstr "Fecha de Entrega Solicitada"
+msgstr "Fecha de entrega solicitada"
#: Dashboard.php:673 FTP_RadioBeacon.php:56 PO_Header.php:881
#: PO_Header.php:1134 SelectCompletedOrder.php:561 SelectSalesOrder.php:702
|
