[Web-erp-svn] SF.net SVN: web-erp:[6695] trunk

[<aga...@us...>]

Revision: 6695
          http://sourceforge.net/p/web-erp/reponame/6695
Author:   agaluski
Date:     2014-04-24 17:16:19 +0000 (Thu, 24 Apr 2014)
Log Message:
-----------
Removed Company Name from variables and labels

Modified Paths:
--------------
    trunk/PDFFGLabel.php
    trunk/PDFQALabel.php
    trunk/companies/weberpdemo/FormDesigns/FGLabel.xml
    trunk/companies/weberpdemo/FormDesigns/QALabel.xml

Modified: trunk/PDFFGLabel.php
===================================================================
--- trunk/PDFFGLabel.php	2014-04-24 14:07:56 UTC (rev 6694)
+++ trunk/PDFFGLabel.php	2014-04-24 17:16:19 UTC (rev 6695)
@@ -164,7 +164,7 @@
 		$pdf->addText($FormDesign->Box->x,$Page_Height-$FormDesign->Box->y,$FormDesign->Box->FontSize,'Box' . ': ' . $myrow['box']);
 		
 		if ($ControlledRow[0]==1) { /*Then its a controlled item */
-			$pdf->addText($FormDesign->ResMartLot->x,$Page_Height-$FormDesign->ResMartLot->y,$FormDesign->ResMartLot->FontSize,'Lot: ' . $myrow['serialno']);
+			$pdf->addText($FormDesign->Lot->x,$Page_Height-$FormDesign->Lot->y,$FormDesign->Lot->FontSize,'Lot: ' . $myrow['serialno']);
 		} //controlled item*/
 	} //end of loop around GRNs to print
 

Modified: trunk/PDFQALabel.php
===================================================================
--- trunk/PDFQALabel.php	2014-04-24 14:07:56 UTC (rev 6694)
+++ trunk/PDFQALabel.php	2014-04-24 17:16:19 UTC (rev 6695)
@@ -83,7 +83,7 @@
 				$LeftOvers = $pdf->addText($FormDesign->ItemDesc->x,$Page_Height-$FormDesign->ItemDesc->y,$FormDesign->ItemDesc->FontSize,'Description: ' . $myrow['itemdescription']);
 				$LeftOvers = $pdf->addText($FormDesign->SupplierName->x,$Page_Height-$FormDesign->SupplierName->y,$FormDesign->SupplierName->FontSize,'Supplier: ' . $SuppRow['suppname']);
 				$LeftOvers = $pdf->addText($FormDesign->SupplierLot->x,$Page_Height-$FormDesign->SupplierLot->y,$FormDesign->SupplierLot->FontSize,'Supplier Lot: ' . $SerialStockMoves['serialno']);
-				$LeftOvers = $pdf->addText($FormDesign->ResMartLot->x,$Page_Height-$FormDesign->ResMartLot->y,$FormDesign->ResMartLot->FontSize,'ResMart Lot: ' . $SerialStockMoves['serialno']);
+				$LeftOvers = $pdf->addText($FormDesign->Lot->x,$Page_Height-$FormDesign->Lot->y,$FormDesign->Lot->FontSize,'Lot: ' . $SerialStockMoves['serialno']);
 				$LeftOvers = $pdf->addText($FormDesign->ReceiptDate->x,$Page_Height-$FormDesign->ReceiptDate->y,$FormDesign->ReceiptDate->FontSize,'Receipt Date: ' . $myrow['deliverydate']);
 				$LeftOvers = $pdf->addText($FormDesign->OrderNumber->x,$Page_Height-$FormDesign->OrderNumber->y,$FormDesign->OrderNumber->FontSize,'P/O: ' . $myrow['orderno']);
 				$PageNumber++;
@@ -96,7 +96,7 @@
 			$LeftOvers = $pdf->addText($FormDesign->ItemDesc->x,$Page_Height-$FormDesign->ItemDesc->y,$FormDesign->ItemDesc->FontSize,'Description: ' . $myrow['itemdescription']);
 			$LeftOvers = $pdf->addText($FormDesign->SupplierName->x,$Page_Height-$FormDesign->SupplierName->y,$FormDesign->SupplierName->FontSize,'Supplier: ' . $SuppRow['suppname']);
 			//$LeftOvers = $pdf->addText($FormDesign->SupplierLot->x,$Page_Height-$FormDesign->SupplierLot->y,$FormDesign->SupplierLot->FontSize,'Supplier Lot: ' . $myrow['serialno']);
-			//$LeftOvers = $pdf->addText($FormDesign->ResMartLot->x,$Page_Height-$FormDesign->ResMartLot->y,$FormDesign->ResMartLot->FontSize,'ResMart Lot: ' . $myrow['serialno']);
+			//$LeftOvers = $pdf->addText($FormDesign->Lot->x,$Page_Height-$FormDesign->Lot->y,$FormDesign->Lot->FontSize,'Lot: ' . $myrow['serialno']);
 			$LeftOvers = $pdf->addText($FormDesign->ReceiptDate->x,$Page_Height-$FormDesign->ReceiptDate->y,$FormDesign->ReceiptDate->FontSize,'Receipt Date: ' . $myrow['deliverydate']);
 			$LeftOvers = $pdf->addText($FormDesign->OrderNumber->x,$Page_Height-$FormDesign->OrderNumber->y,$FormDesign->OrderNumber->FontSize,'P/O: ' . $myrow['orderno']);
 			if ($PageNumber>1){

Modified: trunk/companies/weberpdemo/FormDesigns/FGLabel.xml
===================================================================
--- trunk/companies/weberpdemo/FormDesigns/FGLabel.xml	2014-04-24 14:07:56 UTC (rev 6694)
+++ trunk/companies/weberpdemo/FormDesigns/FGLabel.xml	2014-04-24 17:16:19 UTC (rev 6695)
@@ -51,11 +51,11 @@
 		<x>20</x>
 		<y>125</y>
 	</ItemDesc>
-	<ResMartLot type="SimpleText" name="ResMart Lot" id="ResMartLot">
+	<Lot type="SimpleText" name="Lot" id="Lot">
 		<FontSize>20</FontSize>
 		<x>20</x>
 		<y>175</y>
-	</ResMartLot>
+	</Lot>
 	<Weight type="SimpleText" name="Weight" id="Weight">
 		<FontSize>20</FontSize>
 		<x>20</x>

Modified: trunk/companies/weberpdemo/FormDesigns/QALabel.xml
===================================================================
--- trunk/companies/weberpdemo/FormDesigns/QALabel.xml	2014-04-24 14:07:56 UTC (rev 6694)
+++ trunk/companies/weberpdemo/FormDesigns/QALabel.xml	2014-04-24 17:16:19 UTC (rev 6695)
@@ -23,11 +23,11 @@
 		<x>20</x>
 		<y>125</y>
 	</SupplierLot>
-	<ResMartLot type="SimpleText" name="ResMart Lot" id="ResMartLot">
+	<Lot type="SimpleText" name="Lot" id="Lot">
 		<FontSize>20</FontSize>
 		<x>20</x>
 		<y>150</y>
-	</ResMartLot>
+	</Lot>
 	<SupplierName type="SimpleText" name="Supplier name" id="SupplierName">
 		<FontSize>20</FontSize>
 		<x>20</x>