[Vtigercrm-commits] [vtiger-commits] r6014 - in /vtigercrm/trunk/modules: Invoice/EditView.php PriceBooks/EditView.php Products/EditView.php PurchaseOrder/EditView.php Quotes/EditView.php SalesOrder/EditView.php Vendors/EditView.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Mon May 15 23:34:03 2006
New Revision: 6014

Log:
* Modified to display the contents using InventoryCreateView.tpl file which is a seperate file for Inventory modules

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

Modified: vtigercrm/trunk/modules/Invoice/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/EditView.php (original)
+++ vtigercrm/trunk/modules/Invoice/EditView.php Mon May 15 23:34:03 2006
@@ -182,7 +182,15 @@
 	$smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
 else	
 {
-	$smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
+	$bas_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS');
+	$adv_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'ADV');
+
+	$blocks['basicTab'] = $bas_block;
+	if(is_array($adv_block ))
+		$blocks['moreTab'] = $adv_block;
+
+	$smarty->assign("BLOCKS",$blocks);
+	$smarty->assign("BLOCKS_COUNT",count($blocks));
 }
 
 $smarty->assign("OP_MODE",$disp_view);
@@ -278,8 +286,8 @@
 $smarty->assign("CHECK", $check_button);
 
 if($focus->mode == 'edit')
-$smarty->display("salesEditView.tpl");
+	$smarty->display("salesEditView.tpl");
 else
-$smarty->display('CreateView.tpl');
+	$smarty->display('InventoryCreateView.tpl');
 
 ?>

Modified: vtigercrm/trunk/modules/PriceBooks/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/PriceBooks/EditView.php (original)
+++ vtigercrm/trunk/modules/PriceBooks/EditView.php Mon May 15 23:34:03 2006
@@ -41,7 +41,11 @@
 	$smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
 else	
 {
-	$smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
+	$bas_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS');
+	$blocks['basicTab'] = $bas_block;
+
+	$smarty->assign("BLOCKS",$blocks);
+	$smarty->assign("BLOCKS_COUNT",count($blocks));
 }
 $smarty->assign("OP_MODE",$disp_view);
 
@@ -91,5 +95,5 @@
 if($focus->mode == 'edit')
 	$smarty->display('salesEditView.tpl');
 else 
-	$smarty->display('CreateView.tpl');
+	$smarty->display('InventoryCreateView.tpl');
 ?>

Modified: vtigercrm/trunk/modules/Products/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Products/EditView.php (original)
+++ vtigercrm/trunk/modules/Products/EditView.php Mon May 15 23:34:03 2006
@@ -17,6 +17,7 @@
 global $app_strings;
 global $mod_strings;
 global $currentModule;
+
 $encode_val=$_REQUEST['encode_val'];
 $decode_val=base64_decode($encode_val);
 
@@ -81,8 +82,15 @@
 	$smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
 else	
 {
-	$smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
-	$smarty->assign("ADVBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'ADV'));
+	$bas_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS');
+	$adv_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'ADV');
+
+	$blocks['basicTab'] = $bas_block;
+	if(is_array($adv_block))
+		$blocks['moreTab'] = $adv_block;
+
+	$smarty->assign("BLOCKS",$blocks);
+	$smarty->assign("BLOCKS_COUNT",count($blocks));
 }
 $smarty->assign("OP_MODE",$disp_view);
 
@@ -166,7 +174,7 @@
 $smarty->assign("CHECK", $check_button);
 
 if($focus->mode == 'edit')
-$smarty->display('salesEditView.tpl');
+	$smarty->display('salesEditView.tpl');
 else
-$smarty->display('CreateView.tpl');
+	$smarty->display('InventoryCreateView.tpl');
 ?>

Modified: vtigercrm/trunk/modules/PurchaseOrder/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/PurchaseOrder/EditView.php (original)
+++ vtigercrm/trunk/modules/PurchaseOrder/EditView.php Mon May 15 23:34:03 2006
@@ -84,7 +84,15 @@
 	$smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
 else	
 {
-	$smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
+	$bas_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS');
+	$adv_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'ADV');
+	
+	$blocks['basicTab'] = $bas_block;
+	if(is_array($adv_block ))
+		$blocks['moreTab'] = $adv_block;
+	
+	$smarty->assign("BLOCKS",$blocks);
+	$smarty->assign("BLOCKS_COUNT",count($blocks));
 }	
 $smarty->assign("OP_MODE",$disp_view);
 
@@ -186,7 +194,7 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 if($focus->mode == 'edit')
-$smarty->display('salesEditView.tpl');
+	$smarty->display('salesEditView.tpl');
 else
-$smarty->display('CreateView.tpl');
+	$smarty->display('InventoryCreateView.tpl');
 ?>

Modified: vtigercrm/trunk/modules/Quotes/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/EditView.php (original)
+++ vtigercrm/trunk/modules/Quotes/EditView.php Mon May 15 23:34:03 2006
@@ -97,7 +97,15 @@
 	$smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
 else	
 {
-	$smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
+	$bas_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS');
+	$adv_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'ADV');
+	
+	$blocks['basicTab'] = $bas_block;
+	if(is_array($adv_block ))
+		$blocks['moreTab'] = $adv_block;
+	
+	$smarty->assign("BLOCKS",$blocks);
+	$smarty->assign("BLOCKS_COUNT",count($blocks));
 }
 $smarty->assign("OP_MODE",$disp_view);
 
@@ -233,8 +241,8 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 if($focus->mode == 'edit')
-$smarty->display("salesEditView.tpl");
+	$smarty->display("salesEditView.tpl");
 else
-$smarty->display('CreateView.tpl');
+	$smarty->display('InventoryCreateView.tpl');
 
 ?>

Modified: vtigercrm/trunk/modules/SalesOrder/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/SalesOrder/EditView.php (original)
+++ vtigercrm/trunk/modules/SalesOrder/EditView.php Mon May 15 23:34:03 2006
@@ -168,7 +168,15 @@
 	$smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
 else	
 {
-	$smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
+	$bas_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS');
+	$adv_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'ADV');
+	
+	$blocks['basicTab'] = $bas_block;
+	if(is_array($adv_block ))
+		$blocks['moreTab'] = $adv_block;
+
+	$smarty->assign("BLOCKS",$blocks);
+	$smarty->assign("BLOCKS_COUNT",count($blocks));
 }
 $smarty->assign("OP_MODE",$disp_view);
 
@@ -282,8 +290,8 @@
 $check_button = Button_Check($module);
 $smarty->assign("CHECK", $check_button);
 if($focus->mode == 'edit')
-$smarty->display("salesEditView.tpl");
+	$smarty->display("salesEditView.tpl");
 else
-$smarty->display('CreateView.tpl');
+	$smarty->display('InventoryCreateView.tpl');
 
 ?>

Modified: vtigercrm/trunk/modules/Vendors/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Vendors/EditView.php (original)
+++ vtigercrm/trunk/modules/Vendors/EditView.php Mon May 15 23:34:03 2006
@@ -41,7 +41,15 @@
 	$smarty->assign("BLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields));
 else	
 {
-	$smarty->assign("BASBLOCKS",getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS'));
+	$bas_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'BAS');
+	$adv_block = getBlocks($currentModule,$disp_view,$mode,$focus->column_fields,'ADV');
+
+	$blocks['basicTab'] = $bas_block;
+	if(is_array($adv_block ))
+		$blocks['moreTab'] = $adv_block;
+
+	$smarty->assign("BLOCKS",$blocks);
+	$smarty->assign("BLOCKS_COUNT",count($blocks));
 }
 $smarty->assign("OP_MODE",$disp_view);
 
@@ -91,8 +99,8 @@
 $smarty->assign("CHECK", $check_button);
 
 if($focus->mode == 'edit')
-$smarty->display('salesEditView.tpl');
+	$smarty->display('salesEditView.tpl');
 else
-$smarty->display('CreateView.tpl');
+	$smarty->display('InventoryCreateView.tpl');
 
 ?>