Completed
Push — develop ( 7c1bda...edae1e )
by Adam
18:38 queued 03:14
created
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
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
 ?>
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
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
 ?>
Please login to merge, or discard this patch.
modules/AOS_Products/metadata/listviewdefs.php 1 patch
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -1,35 +1,35 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 $listViewDefs ['AOS_Products'] = 
3 3
 array (
4
-  'NAME' => 
5
-  array (
4
+    'NAME' => 
5
+    array (
6 6
     'width' => '15%',
7 7
     'label' => 'LBL_NAME',
8 8
     'default' => true,
9 9
     'link' => true,
10
-  ),
11
-  'PART_NUMBER' => 
12
-  array (
10
+    ),
11
+    'PART_NUMBER' => 
12
+    array (
13 13
     'width' => '10%',
14 14
     'label' => 'LBL_PART_NUMBER',
15 15
     'default' => true,
16
-  ),
17
-  'COST' => 
18
-  array (
16
+    ),
17
+    'COST' => 
18
+    array (
19 19
     'width' => '10%',
20 20
     'label' => 'LBL_COST',
21 21
     'currency_format' => true,
22 22
     'default' => true,
23
-  ),
24
-  'PRICE' => 
25
-  array (
23
+    ),
24
+    'PRICE' => 
25
+    array (
26 26
     'width' => '10%',
27 27
     'label' => 'LBL_PRICE',
28 28
     'currency_format' => true,
29 29
     'default' => true,
30
-  ),
31
-  'AOS_PRODUCT_CATEGORY_NAME' => 
32
-  array (
30
+    ),
31
+    'AOS_PRODUCT_CATEGORY_NAME' => 
32
+    array (
33 33
     'type' => 'relate',
34 34
     'studio' => 'visible',
35 35
     'label' => 'LBL_AOS_PRODUCT_CATEGORYS_NAME',
@@ -38,24 +38,24 @@  discard block
 block discarded – undo
38 38
     'width' => '10%',
39 39
     'default' => true,
40 40
     'related_fields' =>
41
-      array (
42
-          'aos_product_category_id',
43
-      ),
44
-  ),
45
-  'CREATED_BY_NAME' => 
46
-  array (
41
+        array (
42
+            'aos_product_category_id',
43
+        ),
44
+    ),
45
+    'CREATED_BY_NAME' => 
46
+    array (
47 47
     'width' => '10%',
48 48
     'label' => 'LBL_CREATED',
49 49
     'default' => true,
50 50
     'module' => 'Users',
51 51
     'link' => true,
52 52
     'id' => 'CREATED_BY',
53
-  ),
54
-  'DATE_ENTERED' => 
55
-  array (
53
+    ),
54
+    'DATE_ENTERED' => 
55
+    array (
56 56
     'width' => '5%',
57 57
     'label' => 'LBL_DATE_ENTERED',
58 58
     'default' => true,
59
-  ),
59
+    ),
60 60
 );
61 61
 ?>
Please login to merge, or discard this patch.
modules/TableDictionary.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -125,6 +125,6 @@
 block discarded – undo
125 125
 include('metadata/securitygroups_usersMetaData.php');
126 126
 
127 127
 if(file_exists('custom/application/Ext/TableDictionary/tabledictionary.ext.php')){
128
-	include('custom/application/Ext/TableDictionary/tabledictionary.ext.php');
128
+    include('custom/application/Ext/TableDictionary/tabledictionary.ext.php');
129 129
 }
130 130
 ?>
Please login to merge, or discard this patch.
modules/Project/ProjectQuickCreate.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -66,24 +66,24 @@
 block discarded – undo
66 66
         $this->javascript->setSugarBean($focus);
67 67
         $this->javascript->addAllFields('');
68 68
 
69
-		//$this->ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['project_status_dom'], $focus->status));
69
+        //$this->ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['project_status_dom'], $focus->status));
70 70
         $this->ss->assign('additionalScripts', $this->javascript->getScript(false));
71 71
         $this->ss->assign('CALENDAR_DATEFORMAT', $timedate->get_cal_date_format());
72 72
         
73 73
         
74 74
         $json = getJSONobj();
75 75
         
76
-		$popup_request_data = array(
77
-			'call_back_function' => 'set_return',
78
-			'form_name' => 'projectsQuickCreate',
79
-			'field_to_name_array' => array(
80
-				'id' => 'account_id',
81
-				'name' => 'account_name',
82
-			),
83
-		);
76
+        $popup_request_data = array(
77
+            'call_back_function' => 'set_return',
78
+            'form_name' => 'projectsQuickCreate',
79
+            'field_to_name_array' => array(
80
+                'id' => 'account_id',
81
+                'name' => 'account_name',
82
+            ),
83
+        );
84 84
 	
85
-		$encoded_popup_request_data = $json->encode($popup_request_data);
86
-		$this->ss->assign('encoded_popup_request_data', $encoded_popup_request_data);        
85
+        $encoded_popup_request_data = $json->encode($popup_request_data);
86
+        $this->ss->assign('encoded_popup_request_data', $encoded_popup_request_data);        
87 87
 
88 88
         
89 89
     }   
Please login to merge, or discard this patch.
modules/Project/metadata/additionalDetails.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -42,25 +42,25 @@
 block discarded – undo
42 42
 
43 43
 
44 44
 function additionalDetailsProject($fields) {
45
-	static $mod_strings;
46
-	if(empty($mod_strings)) {
47
-		global $current_language;
48
-		$mod_strings = return_module_language($current_language, 'Project');
49
-	}
45
+    static $mod_strings;
46
+    if(empty($mod_strings)) {
47
+        global $current_language;
48
+        $mod_strings = return_module_language($current_language, 'Project');
49
+    }
50 50
 		
51
-	$overlib_string = '';
51
+    $overlib_string = '';
52 52
 	
53
-	if(!empty($fields['DESCRIPTION'])) {
54
-		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
55
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
56
-	}	
53
+    if(!empty($fields['DESCRIPTION'])) {
54
+        $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
55
+        if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
56
+    }	
57 57
 
58
-	return array('fieldToAddTo' => 'NAME', 
59
-				 'string' => $overlib_string, 
60
-				 'editLink' => "index.php?action=EditView&module=Project&return_module=Project&record={$fields['ID']}", 
61
-				 'viewLink' => "index.php?action=DetailView&module=Project&return_module=Project&record={$fields['ID']}");
58
+    return array('fieldToAddTo' => 'NAME', 
59
+                    'string' => $overlib_string, 
60
+                    'editLink' => "index.php?action=EditView&module=Project&return_module=Project&record={$fields['ID']}", 
61
+                    'viewLink' => "index.php?action=DetailView&module=Project&return_module=Project&record={$fields['ID']}");
62 62
 }
63 63
  
64
- ?>
64
+    ?>
65 65
  
66 66
  
67 67
\ No newline at end of file
Please login to merge, or discard this patch.
modules/Project/metadata/dashletviewdefs.php 1 patch
Indentation   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -1,78 +1,78 @@
 block discarded – undo
1 1
 <?php
2 2
 $dashletData['ProjectDashlet']['searchFields'] = array (
3
-  'date_entered' => 
4
-  array (
3
+    'date_entered' => 
4
+    array (
5 5
     'default' => '',
6
-  ),
7
-  'date_modified' => 
8
-  array (
6
+    ),
7
+    'date_modified' => 
8
+    array (
9 9
     'default' => '',
10
-  ),
11
-  'assigned_user_id' => 
12
-  array (
10
+    ),
11
+    'assigned_user_id' => 
12
+    array (
13 13
     'type' => 'assigned_user_name',
14 14
     'default' => 'Administrator',
15
-  ),
15
+    ),
16 16
 );
17 17
 $dashletData['ProjectDashlet']['columns'] = array (
18
-  'name' => 
19
-  array (
18
+    'name' => 
19
+    array (
20 20
     'width' => '30%',
21 21
     'label' => 'LBL_LIST_NAME',
22 22
     'link' => true,
23 23
     'default' => true,
24 24
     'name' => 'name',
25
-  ),
26
-  'status' => 
27
-  array (
25
+    ),
26
+    'status' => 
27
+    array (
28 28
     'type' => 'enum',
29 29
     'default' => true,
30 30
     'label' => 'LBL_STATUS',
31 31
     'width' => '10%',
32 32
     'name' => 'status',
33
-  ),
34
-  'estimated_start_date' => 
35
-  array (
33
+    ),
34
+    'estimated_start_date' => 
35
+    array (
36 36
     'type' => 'date',
37 37
     'label' => 'LBL_DATE_START',
38 38
     'width' => '10%',
39 39
     'default' => true,
40 40
     'name' => 'estimated_start_date',
41
-  ),
42
-  'assigned_user_name' => 
43
-  array (
41
+    ),
42
+    'assigned_user_name' => 
43
+    array (
44 44
     'width' => '8%',
45 45
     'label' => 'LBL_LIST_ASSIGNED_USER',
46 46
     'name' => 'assigned_user_name',
47 47
     'default' => true,
48
-  ),
49
-  'estimated_end_date' => 
50
-  array (
48
+    ),
49
+    'estimated_end_date' => 
50
+    array (
51 51
     'type' => 'date',
52 52
     'label' => 'LBL_DATE_END',
53 53
     'width' => '10%',
54 54
     'default' => true,
55 55
     'name' => 'estimated_end_date',
56
-  ),
57
-  'date_modified' => 
58
-  array (
56
+    ),
57
+    'date_modified' => 
58
+    array (
59 59
     'width' => '15%',
60 60
     'label' => 'LBL_DATE_MODIFIED',
61 61
     'name' => 'date_modified',
62 62
     'default' => false,
63
-  ),
64
-  'date_entered' => 
65
-  array (
63
+    ),
64
+    'date_entered' => 
65
+    array (
66 66
     'width' => '15%',
67 67
     'label' => 'LBL_DATE_ENTERED',
68 68
     'default' => false,
69 69
     'name' => 'date_entered',
70
-  ),
71
-  'created_by' => 
72
-  array (
70
+    ),
71
+    'created_by' => 
72
+    array (
73 73
     'width' => '8%',
74 74
     'label' => 'LBL_CREATED',
75 75
     'name' => 'created_by',
76 76
     'default' => false,
77
-  ),
77
+    ),
78 78
 );
Please login to merge, or discard this patch.
modules/Project/metadata/popupdefs.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -40,13 +40,13 @@
 block discarded – undo
40 40
 
41 41
 
42 42
 $popupMeta = array('moduleMain' => 'Project',
43
-						'varName' => 'PROJECT',
44
-						'orderBy' => 'name',
45
-						'whereClauses' => 
46
-							array('name' => 'project.name'),
47
-						'searchInputs' =>
48
-							array('name')
49
-						);
43
+                        'varName' => 'PROJECT',
44
+                        'orderBy' => 'name',
45
+                        'whereClauses' => 
46
+                            array('name' => 'project.name'),
47
+                        'searchInputs' =>
48
+                            array('name')
49
+                        );
50 50
 
51 51
 
52 52
 ?>
Please login to merge, or discard this patch.
modules/Project/metadata/searchdefs.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -38,28 +38,28 @@
 block discarded – undo
38 38
  ********************************************************************************/
39 39
 
40 40
 
41
-  $searchdefs['Project'] = array(
42
-					'templateMeta' => array(
43
-							'maxColumns' => '3', 
44
-  							'maxColumnsBasic' => '4', 
41
+    $searchdefs['Project'] = array(
42
+                    'templateMeta' => array(
43
+                            'maxColumns' => '3', 
44
+                                'maxColumnsBasic' => '4', 
45 45
                             'widths' => array('label' => '10', 'field' => '30'),                 
46
-                           ),
46
+                            ),
47 47
                     'layout' => array(  					
48
-						'basic_search' => array(
49
-						 	'name',
50
-						 	array('name'=>'current_user_only', 'label'=>'LBL_CURRENT_USER_FILTER', 'type'=>'bool'),
48
+                        'basic_search' => array(
49
+                                'name',
50
+                                array('name'=>'current_user_only', 'label'=>'LBL_CURRENT_USER_FILTER', 'type'=>'bool'),
51 51
                             array ('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',),
52 52
 
53 53
 
54 54
                         ),
55
-						'advanced_search' => array(
56
-							'name', 
57
-							'estimated_start_date',
58
-							'estimated_end_date',
59
-							'status',
60
-							'priority',		
55
+                        'advanced_search' => array(
56
+                            'name', 
57
+                            'estimated_start_date',
58
+                            'estimated_end_date',
59
+                            'status',
60
+                            'priority',		
61 61
 							
62
-						),
63
-					),
64
- 			   );
62
+                        ),
63
+                    ),
64
+                );
65 65
 ?>
Please login to merge, or discard this patch.