Inspection of "Merge branch 'develop' into console-installer" - adamjakab/SuiteCRM - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — console-installer ( 3d54e5...e2b50d )

by Adam

created 2016-05-10 07:51 UTC

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

@@ -67,9 +67,9 @@  discard block
 block discarded – undo
 $button  = "<form action='index.php' method='post' name='ProspectListForm' id='ProspectListForm'>\n";
 $button .= "<input type='hidden' name='module' value='ProspectLists'>\n";
 if ($currentModule == 'Campaigns') {
-	$button .= "<input type='hidden' name='campaign_id' value='$focus->id'>\n";
-	$button .= "<input type='hidden' name='record' value='$focus->id'>\n";
-	$button .= "<input type='hidden' name='campaign_name' value=\"$focus->name\">\n";
+    $button .= "<input type='hidden' name='campaign_id' value='$focus->id'>\n";
+    $button .= "<input type='hidden' name='record' value='$focus->id'>\n";
+    $button .= "<input type='hidden' name='campaign_name' value=\"$focus->name\">\n";
 }
 $button .= "<input type='hidden' name='prospect_list_id' value=''>\n";
 $button .= "<input type='hidden' name='return_module' value='".$currentModule."'>\n";
@@ -80,28 +80,28 @@  discard block
 block discarded – undo
 $button .= "<input title='".$app_strings['LBL_NEW_BUTTON_TITLE']."' accessyKey='".$app_strings['LBL_NEW_BUTTON_KEY']."' class='button' onclick=\"this.form.action.value='EditView'\" type='submit' name='New' value='  ".$app_strings['LBL_NEW_BUTTON_LABEL']."  '>\n";
 if ($currentModule == 'Campaigns')
 {
-	///////////////////////////////////////
-	///
-	/// SETUP PARENT POPUP
+    ///////////////////////////////////////
+    ///
+    /// SETUP PARENT POPUP
 	
-	$popup_request_data = array(
-		'call_back_function' => 'set_return_prospect_list_and_save',
-		'form_name' => 'ProspectListForm',
-		'field_to_name_array' => array(
-			'id' => 'prospect_list_id',
-			),
-		);
+    $popup_request_data = array(
+        'call_back_function' => 'set_return_prospect_list_and_save',
+        'form_name' => 'ProspectListForm',
+        'field_to_name_array' => array(
+            'id' => 'prospect_list_id',
+            ),
+        );
 	
-	$json = getJSONobj();
-	$encoded_popup_request_data = $json->encode($popup_request_data);
+    $json = getJSONobj();
+    $encoded_popup_request_data = $json->encode($popup_request_data);
 	
-	//
-	///////////////////////////////////////
+    //
+    ///////////////////////////////////////
 	
-	$button .= "<input title='".$app_strings['LBL_SELECT_BUTTON_TITLE']
-		." 'accessyKey='".$app_strings['LBL_SELECT_BUTTON_KEY']
-		."' type='button' class='button' value='  ".$app_strings['LBL_SELECT_BUTTON_LABEL']
-		."  ' name='button' onclick='open_popup(\"ProspectLists\", 600, 400, \"\", false, true, {$encoded_popup_request_data});'>\n";
+    $button .= "<input title='".$app_strings['LBL_SELECT_BUTTON_TITLE']
+        ." 'accessyKey='".$app_strings['LBL_SELECT_BUTTON_KEY']
+        ."' type='button' class='button' value='  ".$app_strings['LBL_SELECT_BUTTON_LABEL']
+        ."  ' name='button' onclick='open_popup(\"ProspectLists\", 600, 400, \"\", false, true, {$encoded_popup_request_data});'>\n";
 //		."  ' name='button' onclick='window.open(\"index.php?module=ProspectLists&action=Popup&html=Popup_picker&form=DetailView&form_submit=true&query=true\",\"new\",\"width=600,height=400,resizable=1,scrollbars=1\");'>\n";
 }
 

Please login to merge, or discard this patch.

modules/AOS_Products/metadata/subpaneldefs.php 1 patch

Indentation +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -40,24 +40,24 @@
 block discarded – undo
 
 
 $layout_defs['AOS_Products'] = array(
-	// list of what Subpanels to show in the DetailView
-	'subpanel_setup' => array(
+    // list of what Subpanels to show in the DetailView
+    'subpanel_setup' => array(
 
-		'aos_products_purchases' => array(
-			'order' => 100,
-			'module' => 'AOS_Quotes',
-			'subpanel_name' => 'ForProductPurchases',
-			'sort_order' => 'asc',
-			'sort_by' => 'id',
-			'title_key' => 'LBL_CUSTOMERS_PURCHASED_PRODUCTS_SUBPANEL_TITLE',
-			//'get_subpanel_data' => 'aos_products_aos_quotes_1',
-			'get_subpanel_data' => 'function:getCustomersPurchasedProductsQuery',
-			'top_buttons' =>
-			array(
-			),
-		),
+        'aos_products_purchases' => array(
+            'order' => 100,
+            'module' => 'AOS_Quotes',
+            'subpanel_name' => 'ForProductPurchases',
+            'sort_order' => 'asc',
+            'sort_by' => 'id',
+            'title_key' => 'LBL_CUSTOMERS_PURCHASED_PRODUCTS_SUBPANEL_TITLE',
+            //'get_subpanel_data' => 'aos_products_aos_quotes_1',
+            'get_subpanel_data' => 'function:getCustomersPurchasedProductsQuery',
+            'top_buttons' =>
+            array(
+            ),
+        ),
 
-	),
+    ),
 );
 
 

Please login to merge, or discard this patch.

modules/AOS_Products/metadata/dashletviewdefs.php 1 patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -30,27 +30,27 @@
 block discarded – undo
 global $current_user;
 
 $dashletData['AOS_ProductsDashlet']['searchFields'] = array('date_entered'     => array('default' => ''),
-                                                          'date_modified'    => array('default' => ''),
+                                                            'date_modified'    => array('default' => ''),
 
 
 
-                                                          'assigned_user_id' => array('type'    => 'assigned_user_name', 
-                                                                                      'default' => $current_user->name));
+                                                            'assigned_user_id' => array('type'    => 'assigned_user_name', 
+                                                                                        'default' => $current_user->name));
 $dashletData['AOS_ProductsDashlet']['columns'] =  array(   'name' => array('width'   => '40', 
-                                                                      'label'   => 'LBL_LIST_NAME',
-                                                                      'link'    => true,
-                                                                      'default' => true), 
-                                                      'date_entered' => array('width'   => '15', 
-                                                                              'label'   => 'LBL_DATE_ENTERED',
-                                                                              'default' => true),
-                                                      'date_modified' => array('width'   => '15', 
-                                                                              'label'   => 'LBL_DATE_MODIFIED'),    
-                                                      'created_by' => array('width'   => '8', 
+                                                                        'label'   => 'LBL_LIST_NAME',
+                                                                        'link'    => true,
+                                                                        'default' => true), 
+                                                        'date_entered' => array('width'   => '15', 
+                                                                                'label'   => 'LBL_DATE_ENTERED',
+                                                                                'default' => true),
+                                                        'date_modified' => array('width'   => '15', 
+                                                                                'label'   => 'LBL_DATE_MODIFIED'),    
+                                                        'created_by' => array('width'   => '8', 
                                                                             'label'   => 'LBL_CREATED'),
-                                                      'assigned_user_name' => array('width'   => '8', 
-                                                                                     'label'   => 'LBL_LIST_ASSIGNED_USER'),
+                                                        'assigned_user_name' => array('width'   => '8', 
+                                                                                        'label'   => 'LBL_LIST_ASSIGNED_USER'),
 
 
 
 
-                                               );
+                                                );

Please login to merge, or discard this patch.

modules/AOS_Products/metadata/editviewdefs.php 1 patch

Indentation +60 added lines, -60 removed lines patch added patch discarded remove patch

@@ -2,129 +2,129 @@
 block discarded – undo
 $module_name = 'AOS_Products';
 $viewdefs [$module_name] = 
 array (
-  'EditView' => 
-  array (
+    'EditView' => 
+    array (
     'templateMeta' => 
     array (
-      'maxColumns' => '2',
-      'widths' => 
-      array (
+        'maxColumns' => '2',
+        'widths' => 
+        array (
         0 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
         1 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
+        ),
         ),
-      ),
-      'form' => 
-      array (
+        'form' => 
+        array (
         'enctype' => 'multipart/form-data',
         'headerTpl' => 'modules/AOS_Products/tpls/EditViewHeader.tpl',
-      ),
-      'includes' => 
-      array (
+        ),
+        'includes' => 
+        array (
         0 => 
         array (
-          'file' => 'modules/AOS_Products/js/products.js',
+            'file' => 'modules/AOS_Products/js/products.js',
         ),
-      ),
-      'useTabs' => false,
-      'tabDefs' => 
-      array (
+        ),
+        'useTabs' => false,
+        'tabDefs' => 
+        array (
         'DEFAULT' => 
         array (
-          'newTab' => false,
-          'panelDefault' => 'expanded',
+            'newTab' => false,
+            'panelDefault' => 'expanded',
+        ),
         ),
-      ),
     ),
     'panels' => 
     array (
-      'default' => 
-      array (
+        'default' => 
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'name',
             'label' => 'LBL_NAME',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'part_number',
             'label' => 'LBL_PART_NUMBER',
-          ),
+            ),
         ),
         1 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'aos_product_category_name',
             'label' => 'LBL_AOS_PRODUCT_CATEGORYS_NAME',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'type',
             'label' => 'LBL_TYPE',
-          ),
+            ),
         ),
         2 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'currency_id',
             'studio' => 'visible',
             'label' => 'LBL_CURRENCY',
-          ),
+            ),
         ),
         3 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'cost',
             'label' => 'LBL_COST',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'price',
             'label' => 'LBL_PRICE',
-          ),
+            ),
         ),
         4 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'contact',
             'label' => 'LBL_CONTACT',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'url',
             'label' => 'LBL_URL',
-          ),
+            ),
         ),
         5 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'description',
             'label' => 'LBL_DESCRIPTION',
-          ),
+            ),
         ),
         6 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'product_image',
             'customCode' => '{$PRODUCT_IMAGE}',
-          ),
+            ),
+        ),
         ),
-      ),
     ),
-  ),
+    ),
 );
 ?>

Please login to merge, or discard this patch.

modules/AOS_Products/metadata/popupdefs.php 1 patch

Indentation +44 added lines, -44 removed lines patch added patch discarded remove patch

@@ -4,94 +4,94 @@
 block discarded – undo
     'varName' => 'AOS_Products',
     'orderBy' => 'aos_products.name',
     'whereClauses' => array (
-  'name' => 'aos_products.name',
-  'part_number' => 'aos_products.part_number',
-  'cost' => 'aos_products.cost',
-  'price' => 'aos_products.price',
-  'created_by' => 'aos_products.created_by',
+    'name' => 'aos_products.name',
+    'part_number' => 'aos_products.part_number',
+    'cost' => 'aos_products.cost',
+    'price' => 'aos_products.price',
+    'created_by' => 'aos_products.created_by',
 ),
     'searchInputs' => array (
-  1 => 'name',
-  4 => 'part_number',
-  5 => 'cost',
-  6 => 'price',
-  7 => 'created_by',
+    1 => 'name',
+    4 => 'part_number',
+    5 => 'cost',
+    6 => 'price',
+    7 => 'created_by',
 ),
     'searchdefs' => array (
-  'name' => 
-  array (
+    'name' => 
+    array (
     'name' => 'name',
     'width' => '10%',
-  ),
-  'part_number' => 
-  array (
+    ),
+    'part_number' => 
+    array (
     'name' => 'part_number',
     'width' => '10%',
-  ),
-  'cost' => 
-  array (
+    ),
+    'cost' => 
+    array (
     'name' => 'cost',
     'width' => '10%',
-  ),
-  'price' => 
-  array (
+    ),
+    'price' => 
+    array (
     'name' => 'price',
     'width' => '10%',
-  ),
-  'created_by' => 
-  array (
+    ),
+    'created_by' => 
+    array (
     'name' => 'created_by',
     'label' => 'LBL_CREATED',
     'type' => 'enum',
     'function' => 
     array (
-      'name' => 'get_user_array',
-      'params' => 
-      array (
+        'name' => 'get_user_array',
+        'params' => 
+        array (
         0 => false,
-      ),
+        ),
     ),
     'width' => '10%',
-  ),
+    ),
 ),
     'listviewdefs' => array (
-  'NAME' => 
-  array (
+    'NAME' => 
+    array (
     'width' => '25%',
     'label' => 'LBL_NAME',
     'default' => true,
     'link' => true,
     'name' => 'name',
-  ),
-  'PART_NUMBER' => 
-  array (
+    ),
+    'PART_NUMBER' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_PART_NUMBER',
     'default' => true,
     'name' => 'part_number',
-  ),
-  'COST' => 
-  array (
+    ),
+    'COST' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_COST',
     'default' => true,
     'name' => 'cost',
-  ),
-  'PRICE' => 
-  array (
+    ),
+    'PRICE' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_PRICE',
     'default' => true,
     'name' => 'price',
-  ),
-  'CURRENCY_ID' =>
-  array (
+    ),
+    'CURRENCY_ID' =>
+    array (
     'type' => 'id',
     'studio' => 'visible',
     'label' => 'LBL_CURRENCY',
     'width' => '10%',
     'default' => false,
     'name' => 'currency_id',
-  ),
+    ),
 ),
 );

Please login to merge, or discard this patch.

modules/AOS_Products/metadata/searchdefs.php 1 patch

Indentation +31 added lines, -31 removed lines patch added patch discarded remove patch

@@ -2,71 +2,71 @@
 block discarded – undo
 $module_name = 'AOS_Products';
 $searchdefs [$module_name] = 
 array (
-  'layout' => 
-  array (
+    'layout' => 
+    array (
     'basic_search' => 
     array (
-      0 => 'name',
-      1 => 
-      array (
+        0 => 'name',
+        1 => 
+        array (
         'name' => 'current_user_only',
         'label' => 'LBL_CURRENT_USER_FILTER',
         'type' => 'bool',
-      ),
+        ),
         'favorites_only' => array ('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',),
     ),
     'advanced_search' => 
     array (
-      'name' => 
-      array (
+        'name' => 
+        array (
         'name' => 'name',
         'default' => true,
         'width' => '10%',
-      ),
-      'part_number' => 
-      array (
+        ),
+        'part_number' => 
+        array (
         'name' => 'part_number',
         'default' => true,
         'width' => '10%',
-      ),
-      'cost' => 
-      array (
+        ),
+        'cost' => 
+        array (
         'name' => 'cost',
         'default' => true,
         'width' => '10%',
-      ),
-      'price' => 
-      array (
+        ),
+        'price' => 
+        array (
         'name' => 'price',
         'default' => true,
         'width' => '10%',
-      ),
-      'created_by' => 
-      array (
+        ),
+        'created_by' => 
+        array (
         'name' => 'created_by',
         'label' => 'LBL_CREATED',
         'type' => 'enum',
         'function' => 
         array (
-          'name' => 'get_user_array',
-          'params' => 
-          array (
+            'name' => 'get_user_array',
+            'params' => 
+            array (
             0 => false,
-          ),
+            ),
         ),
         'default' => true,
         'width' => '10%',
-      ),
+        ),
+    ),
     ),
-  ),
-  'templateMeta' => 
-  array (
+    'templateMeta' => 
+    array (
     'maxColumns' => '3',
     'widths' => 
     array (
-      'label' => '10',
-      'field' => '30',
+        'label' => '10',
+        'field' => '30',
+    ),
     ),
-  ),
 );
 ?>

Please login to merge, or discard this patch.

modules/AOS_Products/metadata/SearchFields.php 1 patch

Indentation +43 added lines, -43 removed lines patch added patch discarded remove patch

@@ -2,87 +2,87 @@
 block discarded – undo
 // created: 2013-05-07 12:48:58
 global $current_user;
 $searchFields['AOS_Products'] = array (
-  'name' => 
-  array (
+    'name' => 
+    array (
     'query_type' => 'default',
-  ),
-  'current_user_only' => 
-  array (
+    ),
+    'current_user_only' => 
+    array (
     'query_type' => 'default',
     'db_field' => 
     array (
-      0 => 'created_by',
+        0 => 'created_by',
     ),
     'my_items' => true,
     'vname' => 'LBL_CURRENT_USER_FILTER',
     'type' => 'bool',
-  ),
-  'range_price' => 
-  array (
+    ),
+    'range_price' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
-  ),
-  'start_range_price' => 
-  array (
+    ),
+    'start_range_price' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
-  ),
-  'end_range_price' => 
-  array (
+    ),
+    'end_range_price' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
-  ),
-  'range_cost' => 
-  array (
+    ),
+    'range_cost' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
-  ),
-  'start_range_cost' => 
-  array (
+    ),
+    'start_range_cost' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
-  ),
-  'end_range_cost' => 
-  array (
+    ),
+    'end_range_cost' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
-  ),
-  'range_date_entered' => 
-  array (
+    ),
+    'range_date_entered' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
-  ),
-  'start_range_date_entered' => 
-  array (
+    ),
+    'start_range_date_entered' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
-  ),
-  'end_range_date_entered' => 
-  array (
+    ),
+    'end_range_date_entered' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
-  ),
-  'range_date_modified' => 
-  array (
+    ),
+    'range_date_modified' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
-  ),
-  'start_range_date_modified' => 
-  array (
+    ),
+    'start_range_date_modified' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
-  ),
-  'end_range_date_modified' => 
-  array (
+    ),
+    'end_range_date_modified' => 
+    array (
     'query_type' => 'default',
     'enable_range_search' => true,
     'is_date_field' => true,
-  ),
+    ),
     'favorites_only' => array(
         'query_type'=>'format',
         'operator' => 'subquery',

Please login to merge, or discard this patch.

modules/AOS_Products/metadata/detailviewdefs.php 1 patch

Indentation +59 added lines, -59 removed lines patch added patch discarded remove patch

@@ -2,127 +2,127 @@
 block discarded – undo
 $module_name = 'AOS_Products';
 $viewdefs [$module_name] = 
 array (
-  'DetailView' => 
-  array (
+    'DetailView' => 
+    array (
     'templateMeta' => 
     array (
-      'form' => 
-      array (
+        'form' => 
+        array (
         'buttons' => 
         array (
-          0 => 'EDIT',
-          1 => 'DUPLICATE',
-          2 => 'DELETE',
+            0 => 'EDIT',
+            1 => 'DUPLICATE',
+            2 => 'DELETE',
+        ),
         ),
-      ),
-      'maxColumns' => '2',
-      'widths' => 
-      array (
+        'maxColumns' => '2',
+        'widths' => 
+        array (
         0 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
         1 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
+        ),
         ),
-      ),
-      'useTabs' => true,
-      'tabDefs' => 
-      array (
+        'useTabs' => true,
+        'tabDefs' => 
+        array (
         'DEFAULT' => 
         array (
-          'newTab' => true,
-          'panelDefault' => 'expanded',
+            'newTab' => true,
+            'panelDefault' => 'expanded',
+        ),
         ),
-      ),
     ),
     'panels' => 
     array (
-      'default' => 
-      array (
+        'default' => 
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'name',
             'label' => 'LBL_NAME',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'part_number',
             'label' => 'LBL_PART_NUMBER',
-          ),
+            ),
         ),
         1 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'aos_product_category_name',
             'label' => 'LBL_AOS_PRODUCT_CATEGORYS_NAME',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'type',
             'label' => 'LBL_TYPE',
-          ),
+            ),
         ),
         2 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'currency_id',
             'studio' => 'visible',
             'label' => 'LBL_CURRENCY',
-          ),
+            ),
         ),
         3 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'cost',
             'label' => 'LBL_COST',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'price',
             'label' => 'LBL_PRICE',
-          ),
+            ),
         ),
         4 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'contact',
             'label' => 'LBL_CONTACT',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'url',
             'label' => 'LBL_URL',
-          ),
+            ),
         ),
         5 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'description',
             'label' => 'LBL_DESCRIPTION',
-          ),
+            ),
         ),
         6 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'product_image',
             'label' => 'LBL_PRODUCT_IMAGE',
             'customCode' => '<img src="{$fields.product_image.value}"/>',
-          ),
+            ),
         ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 ?>

Please login to merge, or discard this patch.

modules/AOS_Products/metadata/quickcreatedefs.php 1 patch

Indentation +54 added lines, -54 removed lines patch added patch discarded remove patch

@@ -2,115 +2,115 @@
 block discarded – undo
 $module_name = 'AOS_Products';
 $viewdefs [$module_name] = 
 array (
-  'QuickCreate' => 
-  array (
+    'QuickCreate' => 
+    array (
     'templateMeta' => 
     array (
-      'maxColumns' => '2',
-      'widths' => 
-      array (
+        'maxColumns' => '2',
+        'widths' => 
+        array (
         0 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
         1 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
+        ),
         ),
-      ),
-      'form' => 
-      array (
+        'form' => 
+        array (
         'enctype' => 'multipart/form-data',
         'headerTpl' => 'modules/AOS_Products/tpls/EditViewHeader.tpl',
-      ),
-      'includes' => 
-      array (
+        ),
+        'includes' => 
+        array (
         0 => 
         array (
-          'file' => 'modules/AOS_Products/js/products.js',
+            'file' => 'modules/AOS_Products/js/products.js',
         ),
-      ),
-      'useTabs' => false,
-      'tabDefs' => 
-      array (
+        ),
+        'useTabs' => false,
+        'tabDefs' => 
+        array (
         'DEFAULT' => 
         array (
-          'newTab' => false,
-          'panelDefault' => 'expanded',
+            'newTab' => false,
+            'panelDefault' => 'expanded',
+        ),
         ),
-      ),
     ),
     'panels' => 
     array (
-      'default' => 
-      array (
+        'default' => 
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'name',
             'label' => 'LBL_NAME',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'part_number',
             'label' => 'LBL_PART_NUMBER',
-          ),
+            ),
         ),
         1 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'url',
             'label' => 'LBL_URL',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'type',
             'label' => 'LBL_TYPE',
-          ),
+            ),
         ),
         2 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'cost',
             'label' => 'LBL_COST',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'price',
             'label' => 'LBL_PRICE',
-          ),
+            ),
         ),
         3 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'contact',
             'label' => 'LBL_CONTACT',
-          ),
+            ),
         ),
         4 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'description',
             'label' => 'LBL_DESCRIPTION',
-          ),
+            ),
         ),
         5 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'product_image',
             'customCode' => '{$PRODUCT_IMAGE}',
-          ),
+            ),
+        ),
         ),
-      ),
     ),
-  ),
+    ),
 );
 ?>

Please login to merge, or discard this patch.

		@@ -67,9 +67,9 @@ discard block
		block discarded – undo
67	67	$button = "<form action='index.php' method='post' name='ProspectListForm' id='ProspectListForm'>\n";
68	68	$button .= "<input type='hidden' name='module' value='ProspectLists'>\n";
69	69	if ($currentModule == 'Campaigns') {
70		- $button .= "<input type='hidden' name='campaign_id' value='$focus->id'>\n";
71		- $button .= "<input type='hidden' name='record' value='$focus->id'>\n";
72		- $button .= "<input type='hidden' name='campaign_name' value=\"$focus->name\">\n";
	70	+ $button .= "<input type='hidden' name='campaign_id' value='$focus->id'>\n";
	71	+ $button .= "<input type='hidden' name='record' value='$focus->id'>\n";
	72	+ $button .= "<input type='hidden' name='campaign_name' value=\"$focus->name\">\n";
73	73	}
74	74	$button .= "<input type='hidden' name='prospect_list_id' value=''>\n";
75	75	$button .= "<input type='hidden' name='return_module' value='".$currentModule."'>\n";
		@@ -80,28 +80,28 @@ discard block
		block discarded – undo
80	80	$button .= "<input title='".$app_strings['LBL_NEW_BUTTON_TITLE']."' accessyKey='".$app_strings['LBL_NEW_BUTTON_KEY']."' class='button' onclick=\"this.form.action.value='EditView'\" type='submit' name='New' value=' ".$app_strings['LBL_NEW_BUTTON_LABEL']." '>\n";
81	81	if ($currentModule == 'Campaigns')
82	82	{
83		- ///////////////////////////////////////
84		- ///
85		- /// SETUP PARENT POPUP
	83	+ ///////////////////////////////////////
	84	+ ///
	85	+ /// SETUP PARENT POPUP
86	86
87		- $popup_request_data = array(
88		- 'call_back_function' => 'set_return_prospect_list_and_save',
89		- 'form_name' => 'ProspectListForm',
90		- 'field_to_name_array' => array(
91		- 'id' => 'prospect_list_id',
92		- ),
93		- );
	87	+ $popup_request_data = array(
	88	+ 'call_back_function' => 'set_return_prospect_list_and_save',
	89	+ 'form_name' => 'ProspectListForm',
	90	+ 'field_to_name_array' => array(
	91	+ 'id' => 'prospect_list_id',
	92	+ ),
	93	+ );
94	94
95		- $json = getJSONobj();
96		- $encoded_popup_request_data = $json->encode($popup_request_data);
	95	+ $json = getJSONobj();
	96	+ $encoded_popup_request_data = $json->encode($popup_request_data);
97	97
98		- //
99		- ///////////////////////////////////////
	98	+ //
	99	+ ///////////////////////////////////////
100	100
101		- $button .= "<input title='".$app_strings['LBL_SELECT_BUTTON_TITLE']
102		- ." 'accessyKey='".$app_strings['LBL_SELECT_BUTTON_KEY']
103		- ."' type='button' class='button' value=' ".$app_strings['LBL_SELECT_BUTTON_LABEL']
104		- ." ' name='button' onclick='open_popup(\"ProspectLists\", 600, 400, \"\", false, true, {$encoded_popup_request_data});'>\n";
	101	+ $button .= "<input title='".$app_strings['LBL_SELECT_BUTTON_TITLE']
	102	+ ." 'accessyKey='".$app_strings['LBL_SELECT_BUTTON_KEY']
	103	+ ."' type='button' class='button' value=' ".$app_strings['LBL_SELECT_BUTTON_LABEL']
	104	+ ." ' name='button' onclick='open_popup(\"ProspectLists\", 600, 400, \"\", false, true, {$encoded_popup_request_data});'>\n";
105	105	// ." ' name='button' onclick='window.open(\"index.php?module=ProspectLists&action=Popup&html=Popup_picker&form=DetailView&form_submit=true&query=true\",\"new\",\"width=600,height=400,resizable=1,scrollbars=1\");'>\n";
106	106	}
107	107

		@@ -40,24 +40,24 @@
		block discarded – undo
40	40
41	41
42	42	$layout_defs['AOS_Products'] = array(
43		- // list of what Subpanels to show in the DetailView
44		- 'subpanel_setup' => array(
	43	+ // list of what Subpanels to show in the DetailView
	44	+ 'subpanel_setup' => array(
45	45
46		- 'aos_products_purchases' => array(
47		- 'order' => 100,
48		- 'module' => 'AOS_Quotes',
49		- 'subpanel_name' => 'ForProductPurchases',
50		- 'sort_order' => 'asc',
51		- 'sort_by' => 'id',
52		- 'title_key' => 'LBL_CUSTOMERS_PURCHASED_PRODUCTS_SUBPANEL_TITLE',
53		- //'get_subpanel_data' => 'aos_products_aos_quotes_1',
54		- 'get_subpanel_data' => 'function:getCustomersPurchasedProductsQuery',
55		- 'top_buttons' =>
56		- array(
57		- ),
58		- ),
	46	+ 'aos_products_purchases' => array(
	47	+ 'order' => 100,
	48	+ 'module' => 'AOS_Quotes',
	49	+ 'subpanel_name' => 'ForProductPurchases',
	50	+ 'sort_order' => 'asc',
	51	+ 'sort_by' => 'id',
	52	+ 'title_key' => 'LBL_CUSTOMERS_PURCHASED_PRODUCTS_SUBPANEL_TITLE',
	53	+ //'get_subpanel_data' => 'aos_products_aos_quotes_1',
	54	+ 'get_subpanel_data' => 'function:getCustomersPurchasedProductsQuery',
	55	+ 'top_buttons' =>
	56	+ array(
	57	+ ),
	58	+ ),
59	59
60		- ),
	60	+ ),
61	61	);
62	62
63	63

		@@ -30,27 +30,27 @@
		block discarded – undo
30	30	global $current_user;
31	31
32	32	$dashletData['AOS_ProductsDashlet']['searchFields'] = array('date_entered' => array('default' => ''),
33		- 'date_modified' => array('default' => ''),
	33	+ 'date_modified' => array('default' => ''),
34	34
35	35
36	36
37		- 'assigned_user_id' => array('type' => 'assigned_user_name',
38		- 'default' => $current_user->name));
	37	+ 'assigned_user_id' => array('type' => 'assigned_user_name',
	38	+ 'default' => $current_user->name));
39	39	$dashletData['AOS_ProductsDashlet']['columns'] = array( 'name' => array('width' => '40',
40		- 'label' => 'LBL_LIST_NAME',
41		- 'link' => true,
42		- 'default' => true),
43		- 'date_entered' => array('width' => '15',
44		- 'label' => 'LBL_DATE_ENTERED',
45		- 'default' => true),
46		- 'date_modified' => array('width' => '15',
47		- 'label' => 'LBL_DATE_MODIFIED'),
48		- 'created_by' => array('width' => '8',
	40	+ 'label' => 'LBL_LIST_NAME',
	41	+ 'link' => true,
	42	+ 'default' => true),
	43	+ 'date_entered' => array('width' => '15',
	44	+ 'label' => 'LBL_DATE_ENTERED',
	45	+ 'default' => true),
	46	+ 'date_modified' => array('width' => '15',
	47	+ 'label' => 'LBL_DATE_MODIFIED'),
	48	+ 'created_by' => array('width' => '8',
49	49	'label' => 'LBL_CREATED'),
50		- 'assigned_user_name' => array('width' => '8',
51		- 'label' => 'LBL_LIST_ASSIGNED_USER'),
	50	+ 'assigned_user_name' => array('width' => '8',
	51	+ 'label' => 'LBL_LIST_ASSIGNED_USER'),
52	52
53	53
54	54
55	55
56		- );
	56	+ );

		@@ -2,129 +2,129 @@
		block discarded – undo
2	2	$module_name = 'AOS_Products';
3	3	$viewdefs [$module_name] =
4	4	array (
5		- 'EditView' =>
6		- array (
	5	+ 'EditView' =>
	6	+ array (
7	7	'templateMeta' =>
8	8	array (
9		- 'maxColumns' => '2',
10		- 'widths' =>
11		- array (
	9	+ 'maxColumns' => '2',
	10	+ 'widths' =>
	11	+ array (
12	12	0 =>
13	13	array (
14		- 'label' => '10',
15		- 'field' => '30',
	14	+ 'label' => '10',
	15	+ 'field' => '30',
16	16	),
17	17	1 =>
18	18	array (
19		- 'label' => '10',
20		- 'field' => '30',
	19	+ 'label' => '10',
	20	+ 'field' => '30',
	21	+ ),
21	22	),
22		- ),
23		- 'form' =>
24		- array (
	23	+ 'form' =>
	24	+ array (
25	25	'enctype' => 'multipart/form-data',
26	26	'headerTpl' => 'modules/AOS_Products/tpls/EditViewHeader.tpl',
27		- ),
28		- 'includes' =>
29		- array (
	27	+ ),
	28	+ 'includes' =>
	29	+ array (
30	30	0 =>
31	31	array (
32		- 'file' => 'modules/AOS_Products/js/products.js',
	32	+ 'file' => 'modules/AOS_Products/js/products.js',
33	33	),
34		- ),
35		- 'useTabs' => false,
36		- 'tabDefs' =>
37		- array (
	34	+ ),
	35	+ 'useTabs' => false,
	36	+ 'tabDefs' =>
	37	+ array (
38	38	'DEFAULT' =>
39	39	array (
40		- 'newTab' => false,
41		- 'panelDefault' => 'expanded',
	40	+ 'newTab' => false,
	41	+ 'panelDefault' => 'expanded',
	42	+ ),
42	43	),
43		- ),
44	44	),
45	45	'panels' =>
46	46	array (
47		- 'default' =>
48		- array (
	47	+ 'default' =>
	48	+ array (
49	49	0 =>
50	50	array (
51		- 0 =>
52		- array (
	51	+ 0 =>
	52	+ array (
53	53	'name' => 'name',
54	54	'label' => 'LBL_NAME',
55		- ),
56		- 1 =>
57		- array (
	55	+ ),
	56	+ 1 =>
	57	+ array (
58	58	'name' => 'part_number',
59	59	'label' => 'LBL_PART_NUMBER',
60		- ),
	60	+ ),
61	61	),
62	62	1 =>
63	63	array (
64		- 0 =>
65		- array (
	64	+ 0 =>
	65	+ array (
66	66	'name' => 'aos_product_category_name',
67	67	'label' => 'LBL_AOS_PRODUCT_CATEGORYS_NAME',
68		- ),
69		- 1 =>
70		- array (
	68	+ ),
	69	+ 1 =>
	70	+ array (
71	71	'name' => 'type',
72	72	'label' => 'LBL_TYPE',
73		- ),
	73	+ ),
74	74	),
75	75	2 =>
76	76	array (
77		- 0 =>
78		- array (
	77	+ 0 =>
	78	+ array (
79	79	'name' => 'currency_id',
80	80	'studio' => 'visible',
81	81	'label' => 'LBL_CURRENCY',
82		- ),
	82	+ ),
83	83	),
84	84	3 =>
85	85	array (
86		- 0 =>
87		- array (
	86	+ 0 =>
	87	+ array (
88	88	'name' => 'cost',
89	89	'label' => 'LBL_COST',
90		- ),
91		- 1 =>
92		- array (
	90	+ ),
	91	+ 1 =>
	92	+ array (
93	93	'name' => 'price',
94	94	'label' => 'LBL_PRICE',
95		- ),
	95	+ ),
96	96	),
97	97	4 =>
98	98	array (
99		- 0 =>
100		- array (
	99	+ 0 =>
	100	+ array (
101	101	'name' => 'contact',
102	102	'label' => 'LBL_CONTACT',
103		- ),
104		- 1 =>
105		- array (
	103	+ ),
	104	+ 1 =>
	105	+ array (
106	106	'name' => 'url',
107	107	'label' => 'LBL_URL',
108		- ),
	108	+ ),
109	109	),
110	110	5 =>
111	111	array (
112		- 0 =>
113		- array (
	112	+ 0 =>
	113	+ array (
114	114	'name' => 'description',
115	115	'label' => 'LBL_DESCRIPTION',
116		- ),
	116	+ ),
117	117	),
118	118	6 =>
119	119	array (
120		- 0 =>
121		- array (
	120	+ 0 =>
	121	+ array (
122	122	'name' => 'product_image',
123	123	'customCode' => '{$PRODUCT_IMAGE}',
124		- ),
	124	+ ),
	125	+ ),
125	126	),
126		- ),
127	127	),
128		- ),
	128	+ ),
129	129	);
130	130	?>

		@@ -4,94 +4,94 @@
		block discarded – undo
4	4	'varName' => 'AOS_Products',
5	5	'orderBy' => 'aos_products.name',
6	6	'whereClauses' => array (
7		- 'name' => 'aos_products.name',
8		- 'part_number' => 'aos_products.part_number',
9		- 'cost' => 'aos_products.cost',
10		- 'price' => 'aos_products.price',
11		- 'created_by' => 'aos_products.created_by',
	7	+ 'name' => 'aos_products.name',
	8	+ 'part_number' => 'aos_products.part_number',
	9	+ 'cost' => 'aos_products.cost',
	10	+ 'price' => 'aos_products.price',
	11	+ 'created_by' => 'aos_products.created_by',
12	12	),
13	13	'searchInputs' => array (
14		- 1 => 'name',
15		- 4 => 'part_number',
16		- 5 => 'cost',
17		- 6 => 'price',
18		- 7 => 'created_by',
	14	+ 1 => 'name',
	15	+ 4 => 'part_number',
	16	+ 5 => 'cost',
	17	+ 6 => 'price',
	18	+ 7 => 'created_by',
19	19	),
20	20	'searchdefs' => array (
21		- 'name' =>
22		- array (
	21	+ 'name' =>
	22	+ array (
23	23	'name' => 'name',
24	24	'width' => '10%',
25		- ),
26		- 'part_number' =>
27		- array (
	25	+ ),
	26	+ 'part_number' =>
	27	+ array (
28	28	'name' => 'part_number',
29	29	'width' => '10%',
30		- ),
31		- 'cost' =>
32		- array (
	30	+ ),
	31	+ 'cost' =>
	32	+ array (
33	33	'name' => 'cost',
34	34	'width' => '10%',
35		- ),
36		- 'price' =>
37		- array (
	35	+ ),
	36	+ 'price' =>
	37	+ array (
38	38	'name' => 'price',
39	39	'width' => '10%',
40		- ),
41		- 'created_by' =>
42		- array (
	40	+ ),
	41	+ 'created_by' =>
	42	+ array (
43	43	'name' => 'created_by',
44	44	'label' => 'LBL_CREATED',
45	45	'type' => 'enum',
46	46	'function' =>
47	47	array (
48		- 'name' => 'get_user_array',
49		- 'params' =>
50		- array (
	48	+ 'name' => 'get_user_array',
	49	+ 'params' =>
	50	+ array (
51	51	0 => false,
52		- ),
	52	+ ),
53	53	),
54	54	'width' => '10%',
55		- ),
	55	+ ),
56	56	),
57	57	'listviewdefs' => array (
58		- 'NAME' =>
59		- array (
	58	+ 'NAME' =>
	59	+ array (
60	60	'width' => '25%',
61	61	'label' => 'LBL_NAME',
62	62	'default' => true,
63	63	'link' => true,
64	64	'name' => 'name',
65		- ),
66		- 'PART_NUMBER' =>
67		- array (
	65	+ ),
	66	+ 'PART_NUMBER' =>
	67	+ array (
68	68	'width' => '10%',
69	69	'label' => 'LBL_PART_NUMBER',
70	70	'default' => true,
71	71	'name' => 'part_number',
72		- ),
73		- 'COST' =>
74		- array (
	72	+ ),
	73	+ 'COST' =>
	74	+ array (
75	75	'width' => '10%',
76	76	'label' => 'LBL_COST',
77	77	'default' => true,
78	78	'name' => 'cost',
79		- ),
80		- 'PRICE' =>
81		- array (
	79	+ ),
	80	+ 'PRICE' =>
	81	+ array (
82	82	'width' => '10%',
83	83	'label' => 'LBL_PRICE',
84	84	'default' => true,
85	85	'name' => 'price',
86		- ),
87		- 'CURRENCY_ID' =>
88		- array (
	86	+ ),
	87	+ 'CURRENCY_ID' =>
	88	+ array (
89	89	'type' => 'id',
90	90	'studio' => 'visible',
91	91	'label' => 'LBL_CURRENCY',
92	92	'width' => '10%',
93	93	'default' => false,
94	94	'name' => 'currency_id',
95		- ),
	95	+ ),
96	96	),
97	97	);

		@@ -2,71 +2,71 @@
		block discarded – undo
2	2	$module_name = 'AOS_Products';
3	3	$searchdefs [$module_name] =
4	4	array (
5		- 'layout' =>
6		- array (
	5	+ 'layout' =>
	6	+ array (
7	7	'basic_search' =>
8	8	array (
9		- 0 => 'name',
10		- 1 =>
11		- array (
	9	+ 0 => 'name',
	10	+ 1 =>
	11	+ array (
12	12	'name' => 'current_user_only',
13	13	'label' => 'LBL_CURRENT_USER_FILTER',
14	14	'type' => 'bool',
15		- ),
	15	+ ),
16	16	'favorites_only' => array ('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',),
17	17	),
18	18	'advanced_search' =>
19	19	array (
20		- 'name' =>
21		- array (
	20	+ 'name' =>
	21	+ array (
22	22	'name' => 'name',
23	23	'default' => true,
24	24	'width' => '10%',
25		- ),
26		- 'part_number' =>
27		- array (
	25	+ ),
	26	+ 'part_number' =>
	27	+ array (
28	28	'name' => 'part_number',
29	29	'default' => true,
30	30	'width' => '10%',
31		- ),
32		- 'cost' =>
33		- array (
	31	+ ),
	32	+ 'cost' =>
	33	+ array (
34	34	'name' => 'cost',
35	35	'default' => true,
36	36	'width' => '10%',
37		- ),
38		- 'price' =>
39		- array (
	37	+ ),
	38	+ 'price' =>
	39	+ array (
40	40	'name' => 'price',
41	41	'default' => true,
42	42	'width' => '10%',
43		- ),
44		- 'created_by' =>
45		- array (
	43	+ ),
	44	+ 'created_by' =>
	45	+ array (
46	46	'name' => 'created_by',
47	47	'label' => 'LBL_CREATED',
48	48	'type' => 'enum',
49	49	'function' =>
50	50	array (
51		- 'name' => 'get_user_array',
52		- 'params' =>
53		- array (
	51	+ 'name' => 'get_user_array',
	52	+ 'params' =>
	53	+ array (
54	54	0 => false,
55		- ),
	55	+ ),
56	56	),
57	57	'default' => true,
58	58	'width' => '10%',
59		- ),
	59	+ ),
	60	+ ),
60	61	),
61		- ),
62		- 'templateMeta' =>
63		- array (
	62	+ 'templateMeta' =>
	63	+ array (
64	64	'maxColumns' => '3',
65	65	'widths' =>
66	66	array (
67		- 'label' => '10',
68		- 'field' => '30',
	67	+ 'label' => '10',
	68	+ 'field' => '30',
	69	+ ),
69	70	),
70		- ),
71	71	);
72	72	?>

		@@ -2,87 +2,87 @@
		block discarded – undo
2	2	// created: 2013-05-07 12:48:58
3	3	global $current_user;
4	4	$searchFields['AOS_Products'] = array (
5		- 'name' =>
6		- array (
	5	+ 'name' =>
	6	+ array (
7	7	'query_type' => 'default',
8		- ),
9		- 'current_user_only' =>
10		- array (
	8	+ ),
	9	+ 'current_user_only' =>
	10	+ array (
11	11	'query_type' => 'default',
12	12	'db_field' =>
13	13	array (
14		- 0 => 'created_by',
	14	+ 0 => 'created_by',
15	15	),
16	16	'my_items' => true,
17	17	'vname' => 'LBL_CURRENT_USER_FILTER',
18	18	'type' => 'bool',
19		- ),
20		- 'range_price' =>
21		- array (
	19	+ ),
	20	+ 'range_price' =>
	21	+ array (
22	22	'query_type' => 'default',
23	23	'enable_range_search' => true,
24		- ),
25		- 'start_range_price' =>
26		- array (
	24	+ ),
	25	+ 'start_range_price' =>
	26	+ array (
27	27	'query_type' => 'default',
28	28	'enable_range_search' => true,
29		- ),
30		- 'end_range_price' =>
31		- array (
	29	+ ),
	30	+ 'end_range_price' =>
	31	+ array (
32	32	'query_type' => 'default',
33	33	'enable_range_search' => true,
34		- ),
35		- 'range_cost' =>
36		- array (
	34	+ ),
	35	+ 'range_cost' =>
	36	+ array (
37	37	'query_type' => 'default',
38	38	'enable_range_search' => true,
39		- ),
40		- 'start_range_cost' =>
41		- array (
	39	+ ),
	40	+ 'start_range_cost' =>
	41	+ array (
42	42	'query_type' => 'default',
43	43	'enable_range_search' => true,
44		- ),
45		- 'end_range_cost' =>
46		- array (
	44	+ ),
	45	+ 'end_range_cost' =>
	46	+ array (
47	47	'query_type' => 'default',
48	48	'enable_range_search' => true,
49		- ),
50		- 'range_date_entered' =>
51		- array (
	49	+ ),
	50	+ 'range_date_entered' =>
	51	+ array (
52	52	'query_type' => 'default',
53	53	'enable_range_search' => true,
54	54	'is_date_field' => true,
55		- ),
56		- 'start_range_date_entered' =>
57		- array (
	55	+ ),
	56	+ 'start_range_date_entered' =>
	57	+ array (
58	58	'query_type' => 'default',
59	59	'enable_range_search' => true,
60	60	'is_date_field' => true,
61		- ),
62		- 'end_range_date_entered' =>
63		- array (
	61	+ ),
	62	+ 'end_range_date_entered' =>
	63	+ array (
64	64	'query_type' => 'default',
65	65	'enable_range_search' => true,
66	66	'is_date_field' => true,
67		- ),
68		- 'range_date_modified' =>
69		- array (
	67	+ ),
	68	+ 'range_date_modified' =>
	69	+ array (
70	70	'query_type' => 'default',
71	71	'enable_range_search' => true,
72	72	'is_date_field' => true,
73		- ),
74		- 'start_range_date_modified' =>
75		- array (
	73	+ ),
	74	+ 'start_range_date_modified' =>
	75	+ array (
76	76	'query_type' => 'default',
77	77	'enable_range_search' => true,
78	78	'is_date_field' => true,
79		- ),
80		- 'end_range_date_modified' =>
81		- array (
	79	+ ),
	80	+ 'end_range_date_modified' =>
	81	+ array (
82	82	'query_type' => 'default',
83	83	'enable_range_search' => true,
84	84	'is_date_field' => true,
85		- ),
	85	+ ),
86	86	'favorites_only' => array(
87	87	'query_type'=>'format',
88	88	'operator' => 'subquery',

		@@ -2,127 +2,127 @@
		block discarded – undo
2	2	$module_name = 'AOS_Products';
3	3	$viewdefs [$module_name] =
4	4	array (
5		- 'DetailView' =>
6		- array (
	5	+ 'DetailView' =>
	6	+ array (
7	7	'templateMeta' =>
8	8	array (
9		- 'form' =>
10		- array (
	9	+ 'form' =>
	10	+ array (
11	11	'buttons' =>
12	12	array (
13		- 0 => 'EDIT',
14		- 1 => 'DUPLICATE',
15		- 2 => 'DELETE',
	13	+ 0 => 'EDIT',
	14	+ 1 => 'DUPLICATE',
	15	+ 2 => 'DELETE',
	16	+ ),
16	17	),
17		- ),
18		- 'maxColumns' => '2',
19		- 'widths' =>
20		- array (
	18	+ 'maxColumns' => '2',
	19	+ 'widths' =>
	20	+ array (
21	21	0 =>
22	22	array (
23		- 'label' => '10',
24		- 'field' => '30',
	23	+ 'label' => '10',
	24	+ 'field' => '30',
25	25	),
26	26	1 =>
27	27	array (
28		- 'label' => '10',
29		- 'field' => '30',
	28	+ 'label' => '10',
	29	+ 'field' => '30',
	30	+ ),
30	31	),
31		- ),
32		- 'useTabs' => true,
33		- 'tabDefs' =>
34		- array (
	32	+ 'useTabs' => true,
	33	+ 'tabDefs' =>
	34	+ array (
35	35	'DEFAULT' =>
36	36	array (
37		- 'newTab' => true,
38		- 'panelDefault' => 'expanded',
	37	+ 'newTab' => true,
	38	+ 'panelDefault' => 'expanded',
	39	+ ),
39	40	),
40		- ),
41	41	),
42	42	'panels' =>
43	43	array (
44		- 'default' =>
45		- array (
	44	+ 'default' =>
	45	+ array (
46	46	0 =>
47	47	array (
48		- 0 =>
49		- array (
	48	+ 0 =>
	49	+ array (
50	50	'name' => 'name',
51	51	'label' => 'LBL_NAME',
52		- ),
53		- 1 =>
54		- array (
	52	+ ),
	53	+ 1 =>
	54	+ array (
55	55	'name' => 'part_number',
56	56	'label' => 'LBL_PART_NUMBER',
57		- ),
	57	+ ),
58	58	),
59	59	1 =>
60	60	array (
61		- 0 =>
62		- array (
	61	+ 0 =>
	62	+ array (
63	63	'name' => 'aos_product_category_name',
64	64	'label' => 'LBL_AOS_PRODUCT_CATEGORYS_NAME',
65		- ),
66		- 1 =>
67		- array (
	65	+ ),
	66	+ 1 =>
	67	+ array (
68	68	'name' => 'type',
69	69	'label' => 'LBL_TYPE',
70		- ),
	70	+ ),
71	71	),
72	72	2 =>
73	73	array (
74		- 0 =>
75		- array (
	74	+ 0 =>
	75	+ array (
76	76	'name' => 'currency_id',
77	77	'studio' => 'visible',
78	78	'label' => 'LBL_CURRENCY',
79		- ),
	79	+ ),
80	80	),
81	81	3 =>
82	82	array (
83		- 0 =>
84		- array (
	83	+ 0 =>
	84	+ array (
85	85	'name' => 'cost',
86	86	'label' => 'LBL_COST',
87		- ),
88		- 1 =>
89		- array (
	87	+ ),
	88	+ 1 =>
	89	+ array (
90	90	'name' => 'price',
91	91	'label' => 'LBL_PRICE',
92		- ),
	92	+ ),
93	93	),
94	94	4 =>
95	95	array (
96		- 0 =>
97		- array (
	96	+ 0 =>
	97	+ array (
98	98	'name' => 'contact',
99	99	'label' => 'LBL_CONTACT',
100		- ),
101		- 1 =>
102		- array (
	100	+ ),
	101	+ 1 =>
	102	+ array (
103	103	'name' => 'url',
104	104	'label' => 'LBL_URL',
105		- ),
	105	+ ),
106	106	),
107	107	5 =>
108	108	array (
109		- 0 =>
110		- array (
	109	+ 0 =>
	110	+ array (
111	111	'name' => 'description',
112	112	'label' => 'LBL_DESCRIPTION',
113		- ),
	113	+ ),
114	114	),
115	115	6 =>
116	116	array (
117		- 0 =>
118		- array (
	117	+ 0 =>
	118	+ array (
119	119	'name' => 'product_image',
120	120	'label' => 'LBL_PRODUCT_IMAGE',
121	121	'customCode' => '<img src="{$fields.product_image.value}"/>',
122		- ),
	122	+ ),
123	123	),
124		- ),
	124	+ ),
	125	+ ),
125	126	),
126		- ),
127	127	);
128	128	?>

		@@ -2,115 +2,115 @@
		block discarded – undo
2	2	$module_name = 'AOS_Products';
3	3	$viewdefs [$module_name] =
4	4	array (
5		- 'QuickCreate' =>
6		- array (
	5	+ 'QuickCreate' =>
	6	+ array (
7	7	'templateMeta' =>
8	8	array (
9		- 'maxColumns' => '2',
10		- 'widths' =>
11		- array (
	9	+ 'maxColumns' => '2',
	10	+ 'widths' =>
	11	+ array (
12	12	0 =>
13	13	array (
14		- 'label' => '10',
15		- 'field' => '30',
	14	+ 'label' => '10',
	15	+ 'field' => '30',
16	16	),
17	17	1 =>
18	18	array (
19		- 'label' => '10',
20		- 'field' => '30',
	19	+ 'label' => '10',
	20	+ 'field' => '30',
	21	+ ),
21	22	),
22		- ),
23		- 'form' =>
24		- array (
	23	+ 'form' =>
	24	+ array (
25	25	'enctype' => 'multipart/form-data',
26	26	'headerTpl' => 'modules/AOS_Products/tpls/EditViewHeader.tpl',
27		- ),
28		- 'includes' =>
29		- array (
	27	+ ),
	28	+ 'includes' =>
	29	+ array (
30	30	0 =>
31	31	array (
32		- 'file' => 'modules/AOS_Products/js/products.js',
	32	+ 'file' => 'modules/AOS_Products/js/products.js',
33	33	),
34		- ),
35		- 'useTabs' => false,
36		- 'tabDefs' =>
37		- array (
	34	+ ),
	35	+ 'useTabs' => false,
	36	+ 'tabDefs' =>
	37	+ array (
38	38	'DEFAULT' =>
39	39	array (
40		- 'newTab' => false,
41		- 'panelDefault' => 'expanded',
	40	+ 'newTab' => false,
	41	+ 'panelDefault' => 'expanded',
	42	+ ),
42	43	),
43		- ),
44	44	),
45	45	'panels' =>
46	46	array (
47		- 'default' =>
48		- array (
	47	+ 'default' =>
	48	+ array (
49	49	0 =>
50	50	array (
51		- 0 =>
52		- array (
	51	+ 0 =>
	52	+ array (
53	53	'name' => 'name',
54	54	'label' => 'LBL_NAME',
55		- ),
56		- 1 =>
57		- array (
	55	+ ),
	56	+ 1 =>
	57	+ array (
58	58	'name' => 'part_number',
59	59	'label' => 'LBL_PART_NUMBER',
60		- ),
	60	+ ),
61	61	),
62	62	1 =>
63	63	array (
64		- 0 =>
65		- array (
	64	+ 0 =>
	65	+ array (
66	66	'name' => 'url',
67	67	'label' => 'LBL_URL',
68		- ),
69		- 1 =>
70		- array (
	68	+ ),
	69	+ 1 =>
	70	+ array (
71	71	'name' => 'type',
72	72	'label' => 'LBL_TYPE',
73		- ),
	73	+ ),
74	74	),
75	75	2 =>
76	76	array (
77		- 0 =>
78		- array (
	77	+ 0 =>
	78	+ array (
79	79	'name' => 'cost',
80	80	'label' => 'LBL_COST',
81		- ),
82		- 1 =>
83		- array (
	81	+ ),
	82	+ 1 =>
	83	+ array (
84	84	'name' => 'price',
85	85	'label' => 'LBL_PRICE',
86		- ),
	86	+ ),
87	87	),
88	88	3 =>
89	89	array (
90		- 0 =>
91		- array (
	90	+ 0 =>
	91	+ array (
92	92	'name' => 'contact',
93	93	'label' => 'LBL_CONTACT',
94		- ),
	94	+ ),
95	95	),
96	96	4 =>
97	97	array (
98		- 0 =>
99		- array (
	98	+ 0 =>
	99	+ array (
100	100	'name' => 'description',
101	101	'label' => 'LBL_DESCRIPTION',
102		- ),
	102	+ ),
103	103	),
104	104	5 =>
105	105	array (
106		- 0 =>
107		- array (
	106	+ 0 =>
	107	+ array (
108	108	'name' => 'product_image',
109	109	'customCode' => '{$PRODUCT_IMAGE}',
110		- ),
	110	+ ),
	111	+ ),
111	112	),
112		- ),
113	113	),
114		- ),
	114	+ ),
115	115	);
116	116	?>

adamjakab / SuiteCRM

Push — console-installer ( 3d54e5...e2b50d )

Category

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

Indentation +16 added lines, -16 removed lines patch added patch discarded remove patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

Indentation +60 added lines, -60 removed lines patch added patch discarded remove patch

Indentation +44 added lines, -44 removed lines patch added patch discarded remove patch

Indentation +31 added lines, -31 removed lines patch added patch discarded remove patch

Indentation +43 added lines, -43 removed lines patch added patch discarded remove patch

Indentation +59 added lines, -59 removed lines patch added patch discarded remove patch

Indentation +54 added lines, -54 removed lines patch added patch discarded remove patch