[Vtigercrm-commits] [vtiger-commits] r10587 - in /vtigercrm/branches/5.0.3: include/fpdf/templates/ include/utils/ modules/Invoice/ modules/Invoice/pdf_templates/ modules/PurchaseOrder/ modules/PurchaseOrder/pdf_templates/ modules/Quotes/ modules/Quotes/pdf_templates/ modules/SalesOrder/ modules/SalesOrder/pdf_templates/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Mon Apr 9 02:46:58 EDT 2007
Author: richie
Date: Mon Apr 9 00:46:41 2007
New Revision: 10587
Log:
* PDF related changes ie., instead of Product Name and Description now we have displayed the Product Code ie., Part Number and Product Name and also added Contact Name and Issued Date
Modified:
vtigercrm/branches/5.0.3/include/fpdf/templates/body.php
vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php
vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php
vtigercrm/branches/5.0.3/modules/Invoice/pdf_templates/header.php
vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php
vtigercrm/branches/5.0.3/modules/PurchaseOrder/pdf_templates/header.php
vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php
vtigercrm/branches/5.0.3/modules/Quotes/pdf_templates/header.php
vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php
vtigercrm/branches/5.0.3/modules/SalesOrder/pdf_templates/header.php
Modified: vtigercrm/branches/5.0.3/include/fpdf/templates/body.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/fpdf/templates/body.php (original)
+++ vtigercrm/branches/5.0.3/include/fpdf/templates/body.php Mon Apr 9 00:46:41 2007
@@ -1,7 +1,7 @@
<?php
// watermark based on status
// this is the postion of the watermark before the rotate
-$waterMarkPositions=array("50","180");
+$waterMarkPositions=array("30","180");
// this is the rotate amount (todo)
$waterMarkRotate=array("45","50","180");
$pdf->watermark( $status, $waterMarkPositions, $waterMarkRotate );
@@ -31,9 +31,8 @@
$colsAlign["Discount"] = "R";
$colsAlign["Tax"] = "R";
$colsAlign["Total"] = "R";
-
- $cols["Product Name"] = "25";
- $cols["Description"] = "70";
+ $cols["Product Code"] = "30";
+ $cols["Product Name"] = "65";
$cols["Qty"] = "10";
$cols["Price"] = "25";
$cols["Discount"] = "15";
@@ -49,9 +48,8 @@
$colsAlign["Price"] = "R";
$colsAlign["Discount"] = "R";
$colsAlign["Total"] = "R";
-
- $cols["Product Name"] = "25";
- $cols["Description"] = "70";
+ $cols["Product Code"] = "30";
+ $cols["Product Name"] = "65";
$cols["Qty"] = "15";
$cols["Price"] = "30";
$cols["Discount"] = "20";
Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Mon Apr 9 00:46:41 2007
@@ -1342,6 +1342,7 @@
{
$query="SELECT
vtiger_products.productname,
+ vtiger_products.productcode,
vtiger_products.unit_price,
vtiger_products.qtyinstock,
vtiger_inventoryproductrel.listprice,
@@ -1357,6 +1358,7 @@
{
$query="SELECT
vtiger_products.productname,
+ vtiger_products.productcode,
vtiger_products.unit_price,
vtiger_products.qtyinstock,
vtiger_inventoryproductrel.listprice,
@@ -1372,6 +1374,7 @@
{
$query="SELECT
vtiger_products.productname,
+ vtiger_products.productcode,
vtiger_products.unit_price,
vtiger_products.qtyinstock,
vtiger_inventoryproductrel.listprice,
@@ -1387,6 +1390,7 @@
{
$query="SELECT
vtiger_products.productname,
+ vtiger_products.productcode,
vtiger_products.unit_price,
vtiger_products.qtyinstock,
vtiger_inventoryproductrel.listprice,
@@ -1402,6 +1406,7 @@
{
$query="SELECT
vtiger_products.productname,
+ vtiger_products.productcode,
vtiger_products.product_description,
vtiger_products.unit_price,
vtiger_products.qtyinstock,
@@ -1415,6 +1420,7 @@
{
$query="SELECT
vtiger_products.productid,
+ vtiger_products.productcode,
vtiger_products.productname,
vtiger_products.product_description,
vtiger_products.unit_price,
@@ -1432,6 +1438,7 @@
for($i=1;$i<=$num_rows;$i++)
{
$hdnProductId = $adb->query_result($result,$i-1,'productid');
+ $hdnProductcode = $adb->query_result($result,$i-1,'productcode');
$productname=$adb->query_result($result,$i-1,'productname');
$productdescription=$adb->query_result($result,$i-1,'product_description');
$comment=$adb->query_result($result,$i-1,'comment');
@@ -1456,6 +1463,7 @@
$product_Detail[$i]['hdnProductId'.$i] = $hdnProductId;
$product_Detail[$i]['productName'.$i]= from_html($productname);
+ $product_Detail[$i]['hdnProductcode'.$i] = $hdnProductcode;
$product_Detail[$i]['productDescription'.$i]= from_html($productdescription);
$product_Detail[$i]['comment'.$i]= $comment;
Modified: vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php Mon Apr 9 00:46:41 2007
@@ -49,6 +49,7 @@
$bill_code = $focus->column_fields["bill_code"];
$bill_country = $focus->column_fields["bill_country"];
+$contact_name =getContactName($focus->column_fields["contact_id"]);
$ship_street = $focus->column_fields["ship_street"];
$ship_city = $focus->column_fields["ship_city"];
$ship_state = $focus->column_fields["ship_state"];
@@ -158,6 +159,8 @@
$list_price[$i] = number_format($associated_products[$i]['listPrice'.$i],2,'.',',');
$list_pricet[$i] = $associated_products[$i]['listPrice'.$i];
$discount_total[$i] = $associated_products[$i]['discountTotal'.$i];
+ //aded for 5.0.3 pdf changes
+ $product_code[$i] = $associated_products[$i]['hdnProductcode'.$i];
$taxable_total = $qty[$i]*$list_pricet[$i]-$discount_total[$i];
@@ -179,8 +182,8 @@
}
$prod_total[$i] = number_format($producttotal,2,'.',',');
+ $product_line[$j]["Product Code"] = $product_code[$i];
$product_line[$j]["Product Name"] = $product_name[$i];
- $product_line[$j]["Description"] = $prod_description[$i];
$product_line[$j]["Qty"] = $qty[$i];
$product_line[$j]["Price"] = $list_price[$i];
$product_line[$j]["Discount"] = $discount_total[$i];
Modified: vtigercrm/branches/5.0.3/modules/Invoice/pdf_templates/header.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Invoice/pdf_templates/header.php (original)
+++ vtigercrm/branches/5.0.3/modules/Invoice/pdf_templates/header.php Mon Apr 9 00:46:41 2007
@@ -51,7 +51,7 @@
$pdf->addTextBlock( "Shipping Address:", $shipText, $shipLocation );
// billing Address
-$billPositions = array("147","43","60");
+$billPositions = array("147","40","60");
$billText=$bill_street."\n".$bill_city.", ".$bill_state." ".$bill_code."\n".$bill_country;
$pdf->addTextBlock("Billing Address:",$billText, $billPositions);
// ********** End Addresses ******************
@@ -60,15 +60,23 @@
/* ******** Begin Invoice Data ************************ */
// terms block
-$termBlock=array("10","65");
+$termBlock=array("10","67");
$pdf->addRecBlock($account_name, "Customer Name", $termBlock);
+// issue date block
+$issueBlock=array("80","37");
+$pdf->addRecBlock(date("Y-m-d"), "Issue Date",$issueBlock);
+
// due date block
-$dueBlock=array("80","65");
+$dueBlock=array("81","52");
$pdf->addRecBlock($valid_till, "Due Date",$dueBlock);
+// Contact Name block
+$conBlock=array("79","67");
+$pdf->addRecBlock($contact_name, "Contact Name",$conBlock);
+
// vtiger_invoice number block
-$invBlock=array("145","65");
+$invBlock=array("145","67");
$pdf->addRecBlock($invoice_no, "Invoice Number",$invBlock);
/* ************ End Invoice Data ************************ */
Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php Mon Apr 9 00:46:41 2007
@@ -47,6 +47,7 @@
$bill_code = $focus->column_fields["bill_code"];
$bill_country = $focus->column_fields["bill_country"];
+$contact_name =getContactName($focus->column_fields["contact_id"]);
$ship_street = $focus->column_fields["ship_street"];
$ship_city = $focus->column_fields["ship_city"];
$ship_state = $focus->column_fields["ship_state"];
@@ -156,6 +157,8 @@
$list_price[$i] = number_format($associated_products[$i]['listPrice'.$i],2,'.',',');
$list_pricet[$i] = $associated_products[$i]['listPrice'.$i];
$discount_total[$i] = $associated_products[$i]['discountTotal'.$i];
+ //aded for 5.0.3 pdf changes
+ $product_code[$i] = $associated_products[$i]['hdnProductcode'.$i];
$taxable_total = $qty[$i]*$list_pricet[$i]-$discount_total[$i];
@@ -176,9 +179,8 @@
$product_line[$j]["Tax"] = number_format($total_taxes,2,'.',',')."\n ($total_tax_percent %) ";
}
$prod_total[$i] = number_format($producttotal,2,'.',',');
-
+ $product_line[$j]["Product Code"] = $product_code[$i];
$product_line[$j]["Product Name"] = $product_name[$i];
- $product_line[$j]["Description"] = $prod_description[$i];
$product_line[$j]["Qty"] = $qty[$i];
$product_line[$j]["Price"] = $list_price[$i];
$product_line[$j]["Discount"] = $discount_total[$i];
Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/pdf_templates/header.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/PurchaseOrder/pdf_templates/header.php (original)
+++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/pdf_templates/header.php Mon Apr 9 00:46:41 2007
@@ -51,7 +51,7 @@
$pdf->addTextBlock( "Shipping Address:", $shipText, $shipLocation );
// billing Address
-$billPositions = array("147","43","60");
+$billPositions = array("147","40","60");
$billText=$bill_street."\n".$bill_city.", ".$bill_state." ".$bill_code."\n".$bill_country;
$pdf->addTextBlock("Billing Address:",$billText, $billPositions);
// ********** End Addresses ******************
@@ -59,13 +59,22 @@
/* ******** Begin Invoice Data ************************ */
+// issue date block
+$issueBlock=array("80","37");
+$pdf->addRecBlock(date("Y-m-d"), "Issue Date",$issueBlock);
+
+// due date block
+$dueBlock=array("81","52");
+$pdf->addRecBlock($valid_till, "Due Date",$dueBlock);
+
// terms block
$termBlock=array("10","65");
$pdf->addRecBlock($vendor_name, "Vendor Name", $termBlock);
-// due date block
-$dueBlock=array("80","65");
-$pdf->addRecBlock($valid_till, "Due Date",$dueBlock);
+// Contact Name block
+$conBlock=array("79","67");
+$pdf->addRecBlock($contact_name, "Contact Name",$conBlock);
+
// vtiger_invoice number block
$invBlock=array("145","65");
Modified: vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php Mon Apr 9 00:46:41 2007
@@ -46,6 +46,7 @@
$bill_state = $focus->column_fields["bill_state"];
$bill_code = $focus->column_fields["bill_code"];
$bill_country = $focus->column_fields["bill_country"];
+$contact_name =getContactName($focus->column_fields["contact_id"]);
$ship_street = $focus->column_fields["ship_street"];
$ship_city = $focus->column_fields["ship_city"];
@@ -157,6 +158,8 @@
$list_price[$i] = number_format($associated_products[$i]['listPrice'.$i],2,'.',',');
$list_pricet[$i] = $associated_products[$i]['listPrice'.$i];
$discount_total[$i] = $associated_products[$i]['discountTotal'.$i];
+ //aded for 5.0.3 pdf changes
+ $product_code[$i] = $associated_products[$i]['hdnProductcode'.$i];
$taxable_total = $qty[$i]*$list_pricet[$i]-$discount_total[$i];
@@ -178,8 +181,8 @@
}
$prod_total[$i] = number_format($producttotal,2,'.',',');
+ $product_line[$j]["Product Code"] = $product_code[$i];
$product_line[$j]["Product Name"] = $product_name[$i];
- $product_line[$j]["Description"] = $prod_description[$i];
$product_line[$j]["Qty"] = $qty[$i];
$product_line[$j]["Price"] = $list_price[$i];
$product_line[$j]["Discount"] = $discount_total[$i];
Modified: vtigercrm/branches/5.0.3/modules/Quotes/pdf_templates/header.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/pdf_templates/header.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/pdf_templates/header.php Mon Apr 9 00:46:41 2007
@@ -46,7 +46,7 @@
$pdf->addTextBlock( "Shipping Address:", $shipText, $shipLocation );
// billing Address
-$billPositions = array("147","43","60");
+$billPositions = array("147","40","60");
$billText=$bill_street."\n".$bill_city.", ".$bill_state." ".$bill_code."\n".$bill_country;
$pdf->addTextBlock("Billing Address:",$billText, $billPositions);
// ********** End Addresses ******************
@@ -54,15 +54,25 @@
/* ******** Begin Quote Data ************************ */
-// terms block
+// issue date block
+$issueBlock=array("80","35");
+$pdf->addRecBlock(date("Y-m-d"), "Issue Date",$issueBlock);
+
+// valid till block
+$dueBlock=array("80","50");
+$pdf->addRecBlock($valid_till, "Valid Till",$dueBlock);
+
+// customer name block
$termBlock=array("10","65");
$pdf->addRecBlock($account_name, "Customer Name", $termBlock);
-// due date block
-$dueBlock=array("80","65");
-$pdf->addRecBlock($valid_till, "Valid Till",$dueBlock);
-// vtiger_invoice number block
+// Contact Name block
+$conBlock=array("79","65");
+$pdf->addRecBlock($contact_name, "Contact Name",$conBlock);
+
+
+// quote number block
$invBlock=array("147","65");
$pdf->addRecBlock($quote_id, "Quote Number",$invBlock);
Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php Mon Apr 9 00:46:41 2007
@@ -46,6 +46,7 @@
$bill_state = $focus->column_fields["bill_state"];
$bill_code = $focus->column_fields["bill_code"];
$bill_country = $focus->column_fields["bill_country"];
+$contact_name =getContactName($focus->column_fields["contact_id"]);
$ship_street = $focus->column_fields["ship_street"];
$ship_city = $focus->column_fields["ship_city"];
@@ -156,6 +157,8 @@
$list_price[$i] = number_format($associated_products[$i]['listPrice'.$i],2,'.',',');
$list_pricet[$i] = $associated_products[$i]['listPrice'.$i];
$discount_total[$i] = $associated_products[$i]['discountTotal'.$i];
+ //aded for 5.0.3 pdf changes
+ $product_code[$i] = $associated_products[$i]['hdnProductcode'.$i];
$taxable_total = $qty[$i]*$list_pricet[$i]-$discount_total[$i];
@@ -177,8 +180,8 @@
}
$prod_total[$i] = number_format($producttotal,2,'.',',');
+ $product_line[$j]["Product Code"] = $product_code[$i];
$product_line[$j]["Product Name"] = $product_name[$i];
- $product_line[$j]["Description"] = $prod_description[$i];
$product_line[$j]["Qty"] = $qty[$i];
$product_line[$j]["Price"] = $list_price[$i];
$product_line[$j]["Discount"] = $discount_total[$i];
Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/pdf_templates/header.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/SalesOrder/pdf_templates/header.php (original)
+++ vtigercrm/branches/5.0.3/modules/SalesOrder/pdf_templates/header.php Mon Apr 9 00:46:41 2007
@@ -51,7 +51,7 @@
$pdf->addTextBlock( "Shipping Address:", $shipText, $shipLocation );
// billing Address
-$billPositions = array("147","43","60");
+$billPositions = array("147","40","60");
$billText=$bill_street."\n".$bill_city.", ".$bill_state." ".$bill_code."\n".$bill_country;
$pdf->addTextBlock("Billing Address:",$billText, $billPositions);
// ********** End Addresses ******************
@@ -59,16 +59,27 @@
/* ******** Begin Invoice Data ************************ */
+
+// issue date block
+$issueBlock=array("80","37");
+$pdf->addRecBlock(date("Y-m-d"), "Issue Date",$issueBlock);
+
+// due date block
+$dueBlock=array("81","52");
+$pdf->addRecBlock($valid_till, "Due Date",$dueBlock);
+
// terms block
-$termBlock=array("10","65");
+$termBlock=array("10","67");
$pdf->addRecBlock($account_name, "Customer Name", $termBlock);
-// due date block
-$dueBlock=array("80","65");
-$pdf->addRecBlock($valid_till, "Due Date",$dueBlock);
+// Contact Name block
+$conBlock=array("79","67");
+$pdf->addRecBlock($contact_name, "Contact Name",$conBlock);
+
+
// vtiger_invoice number block
-$invBlock=array("145","65");
+$invBlock=array("145","67");
$pdf->addRecBlock($id, "SO Number",$invBlock);
/* ************ End Invoice Data ************************ */
More information about the vtigercrm-commits
mailing list