[Vtigercrm-commits] [vtiger-commits] r10980 - in /vtigercrm/branches/5.0.3/modules: Invoice/pdf_templates/header.php PurchaseOrder/pdf_templates/header.php Quotes/pdf_templates/header.php Reports/ReportRun.php SalesOrder/pdf_templates/header.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Wed May 23 05:33:23 2007
New Revision: 10980

Log:
Invoice PDF - Issue in Addresses, Invoice Report is empty. Fixes #3663 and #3867

Modified:
    vtigercrm/branches/5.0.3/modules/Invoice/pdf_templates/header.php
    vtigercrm/branches/5.0.3/modules/PurchaseOrder/pdf_templates/header.php
    vtigercrm/branches/5.0.3/modules/Quotes/pdf_templates/header.php
    vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php
    vtigercrm/branches/5.0.3/modules/SalesOrder/pdf_templates/header.php

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 Wed May 23 05:33:23 2007
@@ -46,12 +46,12 @@
 
 // ************** Begin Addresses **************
 // shipping Address
-$shipLocation = array("10","43","60");
+$shipLocation = array("147","40","60");
 $shipText=$ship_street."\n".$ship_city.", ".$ship_state." ".$ship_code."\n".$ship_country;
 $pdf->addTextBlock( "Shipping Address:", $shipText, $shipLocation );
 
 // billing Address
-$billPositions = array("147","40","60");
+$billPositions = array("10","43","60");
 $billText=$bill_street."\n".$bill_city.", ".$bill_state." ".$bill_code."\n".$bill_country;
 $pdf->addTextBlock("Billing Address:",$billText, $billPositions);
 // ********** End Addresses ******************

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 Wed May 23 05:33:23 2007
@@ -46,12 +46,12 @@
 
 // ************** Begin Addresses **************
 // shipping Address
-$shipLocation = array("10","43","60");
+$shipLocation = array("147","40","60");
 $shipText=$ship_street."\n".$ship_city.", ".$ship_state." ".$ship_code."\n".$ship_country;
 $pdf->addTextBlock( "Shipping Address:", $shipText, $shipLocation );
 
 // billing Address
-$billPositions = array("147","40","60");
+$billPositions = array("10","43","60");
 $billText=$bill_street."\n".$bill_city.", ".$bill_state." ".$bill_code."\n".$bill_country;
 $pdf->addTextBlock("Billing Address:",$billText, $billPositions);
 // ********** End Addresses ******************

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 Wed May 23 05:33:23 2007
@@ -41,12 +41,12 @@
 
 // ************** Begin Addresses **************
 // shipping Address
-$shipLocation = array("10","43","60");
+$shipLocation = array("147","40","60");
 $shipText=$ship_street."\n".$ship_city.", ".$ship_state." ".$ship_code."\n".$ship_country;
 $pdf->addTextBlock( "Shipping Address:", $shipText, $shipLocation );
 
 // billing Address
-$billPositions = array("147","40","60");
+$billPositions = array("10","43","60");
 $billText=$bill_street."\n".$bill_city.", ".$bill_state." ".$bill_code."\n".$bill_country;
 $pdf->addTextBlock("Billing Address:",$billText, $billPositions);
 // ********** End Addresses ******************

Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Wed May 23 05:33:23 2007
@@ -1103,7 +1103,6 @@
 			if($secmodule == "Accounts")
 			{
 				$query = "left join vtiger_account on vtiger_account.accountid = vtiger_invoice.accountid
-					left join vtiger_contactdetails as vtiger_contactdetailsInvoice on vtiger_contactdetailsInvoice.contactid = vtiger_invoice.contactid
 					left join vtiger_crmentity as vtiger_crmentityAccounts on vtiger_crmentityAccounts.crmid=vtiger_account.accountid
 					left join vtiger_accountbillads on vtiger_account.accountid=vtiger_accountbillads.accountaddressid
 					left join vtiger_accountshipads on vtiger_account.accountid=vtiger_accountshipads.accountaddressid

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 Wed May 23 05:33:23 2007
@@ -46,12 +46,12 @@
 
 // ************** Begin Addresses **************
 // shipping Address
-$shipLocation = array("10","43","60");
+$shipLocation = array("147","40","60");
 $shipText=$ship_street."\n".$ship_city.", ".$ship_state." ".$ship_code."\n".$ship_country;
 $pdf->addTextBlock( "Shipping Address:", $shipText, $shipLocation );
 
 // billing Address
-$billPositions = array("147","40","60");
+$billPositions = array("10","43","60");
 $billText=$bill_street."\n".$bill_city.", ".$bill_state." ".$bill_code."\n".$bill_country;
 $pdf->addTextBlock("Billing Address:",$billText, $billPositions);
 // ********** End Addresses ******************