Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6029] trunk
|
From: <rc...@us...> - 2013-06-17 17:36:56
|
Revision: 6029
http://sourceforge.net/p/web-erp/reponame/6029
Author: rchacon
Date: 2013-06-17 17:36:52 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
Adds company, delivery and supplier country.
Modified Paths:
--------------
trunk/PO_PDFPurchOrder.php
trunk/companies/weberpdemo/FormDesigns/PurchaseOrder.xml
trunk/includes/PO_PDFOrderPageHeader.inc
Modified: trunk/PO_PDFPurchOrder.php
===================================================================
--- trunk/PO_PDFPurchOrder.php 2013-06-17 15:12:18 UTC (rev 6028)
+++ trunk/PO_PDFPurchOrder.php 2013-06-17 17:36:52 UTC (rev 6029)
@@ -83,6 +83,7 @@
suppliers.address3,
suppliers.address4,
suppliers.address5,
+ suppliers.address6,
purchorders.comments,
purchorders.orddate,
purchorders.rate,
@@ -167,8 +168,9 @@
$POHeader['address1'] = str_pad('', 40, 'x');
$POHeader['address2'] = str_pad('', 40, 'x');
$POHeader['address3'] = str_pad('', 40, 'x');
- $POHeader['address4'] = str_pad('', 30, 'x');
- $POHeader['address5'] = str_pad('', 30, 'x');
+ $POHeader['address4'] = str_pad('', 40, 'x');
+ $POHeader['address5'] = str_pad('', 20, 'x');
+ $POHeader['address6'] = str_pad('', 15, 'x');
$POHeader['comments'] = str_pad('', 50, 'x');
$POHeader['orddate'] = '1900-01-01';
$POHeader['rate'] = '0.0000';
Modified: trunk/companies/weberpdemo/FormDesigns/PurchaseOrder.xml
===================================================================
--- trunk/companies/weberpdemo/FormDesigns/PurchaseOrder.xml 2013-06-17 15:12:18 UTC (rev 6028)
+++ trunk/companies/weberpdemo/FormDesigns/PurchaseOrder.xml 2013-06-17 17:36:52 UTC (rev 6029)
@@ -3,10 +3,10 @@
<PaperSize name="Paper size">A4_Landscape</PaperSize>
<LineHeight name="Line height">16</LineHeight>
<logo type="image" name="Logo" id="Logo">
- <x>0</x>
- <y>62</y>
+ <x>-5</x>
+ <y>124</y>
<width>0</width>
- <height>60</height>
+ <height>120</height>
</logo>
<OrderNumber type="SimpleText" name="Order Number" id="OrderNumber">
<FontSize>15</FontSize>
@@ -23,16 +23,16 @@
<x>762</x>
<y>30</y>
</PageNumber>
- <TaxAuthority type="SimpleText" name="Tax Authority" id="TaxAuthority">
+ <CompanyName type="SimpleText" name="Company name" id="CompanyName">
<FontSize>10</FontSize>
<x>40</x>
- <y>106</y>
- </TaxAuthority>
- <CompanyName type="SimpleText" name="Company name" id="CompanyName">
+ <y>112</y>
+ </CompanyName>
+ <TaxAuthority type="SimpleText" name="Tax Authority" id="TaxAuthority">
<FontSize>10</FontSize>
<x>40</x>
<y>122</y>
- </CompanyName>
+ </TaxAuthority>
<CompanyAddress type="ElementArray" name="Company address">
<Line1 type="SimpleText" name="Line 1" id="CompanyAddress1">
<FontSize>10</FontSize>
@@ -106,18 +106,13 @@
<x>448</x>
<y>202</y>
</Line5>
- <Line6 type="SimpleText" name="Line 6" id="DeliveryAddress6">
- <FontSize>12</FontSize>
- <x>448</x>
- <y>214</y>
- </Line6>
</DeliveryAddress>
<DeliveryAddressBox type="CurvedRectangle" name="Delivery address box" id="DeliveryAddressBox">
- <x>446</x>
- <y>145</y>
+ <x>436</x>
+ <y>142</y>
<width>240</width>
- <height>80</height>
- <radius>10</radius>
+ <height>72</height>
+ <radius>12</radius>
</DeliveryAddressBox>
<SupplierName type="SimpleText" name="Supplier name" id="SupplierName">
<FontSize>12</FontSize>
@@ -246,7 +241,7 @@
<Column3 type="DataText" name="Column 3" id="Data3">
<FontSize>10</FontSize>
<x>441</x>
- <Length>85</Length>
+ <Length>40</Length>
</Column3>
<Column4 type="DataText" name="Column 4" id="Data4">
<FontSize>10</FontSize>
@@ -277,7 +272,7 @@
<OrderTotal type="MultiLineText" name="Order total" id="OrderTotal">
<FontSize>14</FontSize>
<x>665</x>
- <y>563</y>
+ <y>549</y>
<Length>125</Length>
</OrderTotal>
</form>
Modified: trunk/includes/PO_PDFOrderPageHeader.inc
===================================================================
--- trunk/includes/PO_PDFOrderPageHeader.inc 2013-06-17 15:12:18 UTC (rev 6028)
+++ trunk/includes/PO_PDFOrderPageHeader.inc 2013-06-17 17:36:52 UTC (rev 6029)
@@ -23,7 +23,7 @@
$pdf->addText($FormDesign->CompanyAddress->Line2->x,$Page_Height - $FormDesign->CompanyAddress->Line2->y, $FormDesign->CompanyAddress->Line2->FontSize, $_SESSION['CompanyRecord']['regoffice2']);
$pdf->addText($FormDesign->CompanyAddress->Line3->x,$Page_Height - $FormDesign->CompanyAddress->Line3->y, $FormDesign->CompanyAddress->Line3->FontSize, $_SESSION['CompanyRecord']['regoffice3']);
$pdf->addText($FormDesign->CompanyAddress->Line4->x,$Page_Height - $FormDesign->CompanyAddress->Line4->y, $FormDesign->CompanyAddress->Line4->FontSize, $_SESSION['CompanyRecord']['regoffice4']);
-$pdf->addText($FormDesign->CompanyAddress->Line5->x,$Page_Height - $FormDesign->CompanyAddress->Line5->y, $FormDesign->CompanyAddress->Line5->FontSize, $_SESSION['CompanyRecord']['regoffice5']);
+$pdf->addText($FormDesign->CompanyAddress->Line5->x,$Page_Height - $FormDesign->CompanyAddress->Line5->y, $FormDesign->CompanyAddress->Line5->FontSize, $_SESSION['CompanyRecord']['regoffice5'] . ' ' . $_SESSION['CompanyRecord']['regoffice6']); // Includes company postal code and country.
$pdf->addText($FormDesign->CompanyPhone->x,$Page_Height - $FormDesign->CompanyPhone->y, $FormDesign->CompanyPhone->FontSize, _('Tel'). ': ' . $_SESSION['CompanyRecord']['telephone']);
$pdf->addText($FormDesign->CompanyFax->x,$Page_Height - $FormDesign->CompanyFax->y, $FormDesign->CompanyFax->FontSize, _('Fax').': ' . $_SESSION['CompanyRecord']['fax']);
$pdf->addText($FormDesign->CompanyEmail->x,$Page_Height - $FormDesign->CompanyEmail->y, $FormDesign->CompanyEmail->FontSize, _('Email'). ': ' .$_SESSION['CompanyRecord']['email']);
@@ -33,8 +33,7 @@
$pdf->addText($FormDesign->DeliveryAddress->Line2->x,$Page_Height - $FormDesign->DeliveryAddress->Line2->y, $FormDesign->DeliveryAddress->Line2->FontSize, $POHeader['deladd2']);
$pdf->addText($FormDesign->DeliveryAddress->Line3->x,$Page_Height - $FormDesign->DeliveryAddress->Line3->y, $FormDesign->DeliveryAddress->Line3->FontSize, $POHeader['deladd3']);
$pdf->addText($FormDesign->DeliveryAddress->Line4->x,$Page_Height - $FormDesign->DeliveryAddress->Line4->y, $FormDesign->DeliveryAddress->Line4->FontSize, $POHeader['deladd4']);
-$pdf->addText($FormDesign->DeliveryAddress->Line5->x,$Page_Height - $FormDesign->DeliveryAddress->Line5->y, $FormDesign->DeliveryAddress->Line5->FontSize, $POHeader['deladd5']);
-$pdf->addText($FormDesign->DeliveryAddress->Line6->x,$Page_Height - $FormDesign->DeliveryAddress->Line6->y, $FormDesign->DeliveryAddress->Line6->FontSize, $POHeader['deladd6']);
+$pdf->addText($FormDesign->DeliveryAddress->Line5->x,$Page_Height - $FormDesign->DeliveryAddress->Line5->y, $FormDesign->DeliveryAddress->Line5->FontSize, $POHeader['deladd5'] . ' ' . $POHeader['deladd6']); // Includes delivery postal code and country.
/*draw a nice curved corner box around the delivery to address */
$pdf->RoundRectangle($FormDesign->DeliveryAddressBox->x, $Page_Height - $FormDesign->DeliveryAddressBox->y,$FormDesign->DeliveryAddressBox->width, $FormDesign->DeliveryAddressBox->height, $FormDesign->DeliveryAddressBox->radius);
/*Now the Supplier details */
@@ -44,7 +43,7 @@
$pdf->addText($FormDesign->SupplierAddress->Line2->x,$Page_Height - $FormDesign->SupplierAddress->Line2->y, $FormDesign->SupplierAddress->Line2->FontSize, $POHeader['address2']);
$pdf->addText($FormDesign->SupplierAddress->Line3->x,$Page_Height - $FormDesign->SupplierAddress->Line3->y, $FormDesign->SupplierAddress->Line3->FontSize, $POHeader['address3']);
$pdf->addText($FormDesign->SupplierAddress->Line4->x,$Page_Height - $FormDesign->SupplierAddress->Line4->y, $FormDesign->SupplierAddress->Line4->FontSize, $POHeader['address4']);
-$pdf->addText($FormDesign->SupplierAddress->Line5->x,$Page_Height - $FormDesign->SupplierAddress->Line5->y, $FormDesign->SupplierAddress->Line5->FontSize, $POHeader['address5']);
+$pdf->addText($FormDesign->SupplierAddress->Line5->x,$Page_Height - $FormDesign->SupplierAddress->Line5->y, $FormDesign->SupplierAddress->Line5->FontSize, $POHeader['address5'] . ' ' . $POHeader['address6']); // Includes supplier postal code and country.
/*Now the Requisition Number */
$pdf->addText($FormDesign->RequisitionNumber->x,$Page_Height - $FormDesign->RequisitionNumber->y, $FormDesign->RequisitionNumber->FontSize, _('Requisition Number') . ':' );
$pdf->addText($FormDesign->RequisitionNumber->x+120,$Page_Height - $FormDesign->RequisitionNumber->y, $FormDesign->RequisitionNumber->FontSize, $POHeader['requisitionno']);
|
