[Vtigercrm-commits] [vtiger-commits] r7773 - in /vtigercrm/trunk/modules: Invoice/EditView.php PurchaseOrder/EditView.php Quotes/EditView.php SalesOrder/EditView.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Tue Jul  4 06:02:00 2006
New Revision: 7773

Log:
* Modified to retrieve and display the product details when we duplicate the entry

Modified:
    vtigercrm/trunk/modules/Invoice/EditView.php
    vtigercrm/trunk/modules/PurchaseOrder/EditView.php
    vtigercrm/trunk/modules/Quotes/EditView.php
    vtigercrm/trunk/modules/SalesOrder/EditView.php

Modified: vtigercrm/trunk/modules/Invoice/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/EditView.php (original)
+++ vtigercrm/trunk/modules/Invoice/EditView.php Tue Jul  4 06:02:00 2006
@@ -155,7 +155,7 @@
 }
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
 	$num_of_products = getNoOfAssocProducts("Invoice",$focus);
-	$associated_prod = getAssociatedProducts("Invoice",$focus);
+	$INVOICE_associated_prod = getAssociatedProducts("Invoice",$focus);
 	$focus->id = "";
     	$focus->mode = ''; 	
 }
@@ -262,8 +262,15 @@
 }
 elseif(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true')
 {
-	$smarty->assign("MODE", $focus->mode);
-	$se_array=getProductDetailsBlockInfo($focus->mode,"",$focus,$num_of_products,$associated_prod);
+	//$se_array=getProductDetailsBlockInfo($focus->mode,"",$focus,$num_of_products,$associated_prod);
+        $smarty->assign("ROWCOUNT", $num_of_products);
+	$associated_prod = $INVOICE_associated_prod;
+	$smarty->assign("AVAILABLE_PRODUCTS", 'true');
+        $smarty->assign("MODE", $focus->mode);
+	$smarty->assign("TAXVALUE", convertFromDollar($focus->column_fields['txtTax'],$rate));
+	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($focus->column_fields['txtAdjustment'],$rate));
+	$smarty->assign("SUBTOTAL", convertFromDollar($focus->column_fields['hdnSubTotal'],$rate));
+	$smarty->assign("GRANDTOTAL", convertFromDollar($focus->column_fields['hdnGrandTotal'],$rate));
 }
 elseif((isset($_REQUEST['product_id']) && $_REQUEST['product_id'] != '') || (isset($_REQUEST['opportunity_id']) && $_REQUEST['opportunity_id'] != '')) {
 	$smarty->assign("ROWCOUNT", $num_of_products);

Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/EditView.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/EditView.php Tue Jul  4 06:02:00 2006
@@ -46,7 +46,7 @@
 }
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
 	$num_of_products = getNoOfAssocProducts("PurchaseOrder",$focus);
-	$associated_prod = getAssociatedProducts("PurchaseOrder",$focus);
+	$PO_associated_prod = getAssociatedProducts("PurchaseOrder",$focus);
 	$focus->id = "";
     	$focus->mode = ''; 	
 }
@@ -134,7 +134,8 @@
 elseif(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true')
 {
 	$smarty->assign("ROWCOUNT", $num_of_products);
-	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
+	$smarty->assign("ASSOCIATEDPRODUCTS", $PO_associated_prod);
+	$smarty->assign("AVAILABLE_PRODUCTS", 'true');
 	$smarty->assign("MODE", $focus->mode);
 	$smarty->assign("TAXVALUE", convertFromDollar($focus->column_fields['txtTax'],$rate));
 	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($focus->column_fields['txtAdjustment'],$rate));

Modified: vtigercrm/trunk/modules/Quotes/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/EditView.php (original)
+++ vtigercrm/trunk/modules/Quotes/EditView.php Tue Jul  4 06:02:00 2006
@@ -48,8 +48,8 @@
 }
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
 	$num_of_products = getNoOfAssocProducts($module,$focus);
-	 $log->debug("Mode is Duplicate. Quoteid to be duplicated is ".$focus->id);
-        $associated_prod = getAssociatedProducts("Quotes",$focus);
+        $QUOTE_associated_prod = getAssociatedProducts("Quotes",$focus);
+	$log->debug("Mode is Duplicate. Quoteid to be duplicated is ".$focus->id);
 	$focus->id = "";
     	$focus->mode = ''; 	
 }
@@ -153,7 +153,8 @@
 }
 elseif(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
         $smarty->assign("ROWCOUNT", $num_of_products);
-        $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
+        $smarty->assign("ASSOCIATEDPRODUCTS", $QUOTE_associated_prod);
+	$smarty->assign("AVAILABLE_PRODUCTS", 'true');
         $smarty->assign("MODE", $focus->mode);
 	$smarty->assign("TAXVALUE", convertFromDollar($focus->column_fields['txtTax'],$rate));
 	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($focus->column_fields['txtAdjustment'],$rate));

Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/EditView.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/EditView.php Tue Jul  4 06:02:00 2006
@@ -146,7 +146,7 @@
 
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
 	$num_of_products = getNoOfAssocProducts("SalesOrder",$focus);
-	$associated_prod = getAssociatedProducts("SalesOrder",$focus);
+	$SO_associated_prod = getAssociatedProducts("SalesOrder",$focus);
 	$focus->id = "";
     	$focus->mode = ''; 	
 } 
@@ -261,7 +261,8 @@
 elseif(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true')
 {
 	$smarty->assign("ROWCOUNT", $num_of_products);
-	$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
+	$smarty->assign("ASSOCIATEDPRODUCTS", $SO_associated_prod);
+	$smarty->assign("AVAILABLE_PRODUCTS", 'true');
 	$smarty->assign("MODE", $focus->mode);
 	$smarty->assign("TAXVALUE", convertFromDollar($focus->column_fields['txtTax'],$rate));
 	$smarty->assign("ADJUSTMENTVALUE", convertFromDollar($focus->column_fields['txtAdjustment'],$rate));