fixed aos related field link in aos list view

SinergiaTIC · Nov 1, 2013 · f797048 · f797048
1 parent 2929787
commit f797048
Show file tree

Hide file tree

Showing 17 changed files with 55 additions and 34 deletions.
diff --git a/custom/include/globalControlLinks.php b/custom/include/globalControlLinks.php
diff --git a/custom/modules/Calendar/Cal.css b/custom/modules/Calendar/Cal.css
diff --git a/custom/modules/Cases/metadata/SearchFields.php b/custom/modules/Cases/metadata/SearchFields.php
diff --git a/custom/modules/Contacts/disablePortalUser.php b/custom/modules/Contacts/disablePortalUser.php
diff --git a/custom/modules/Contacts/enablePortalUser.php b/custom/modules/Contacts/enablePortalUser.php
diff --git a/custom/modules/Contacts/views/view.detail.php b/custom/modules/Contacts/views/view.detail.php
@@ -36,6 +36,8 @@
  * "Powered by SugarCRM".
  ********************************************************************************/
 
+require_once('modules/Contacts/views/view.detail.php');
+
 class CustomContactsViewDetail extends ContactsViewDetail{
     public function display(){
         global $sugar_config;

diff --git a/custom/modules/Home/About.php b/custom/modules/Home/About.php
@@ -54,7 +54,7 @@
         print( "&nbsp;&nbsp;&nbsp;" . $custom_version );
     }?>
 </b>
-<p>Sugar<?php echo $mod_strings['LBL_VERSION']." ".$sugar_version." (".$mod_strings['LBL_BUILD']." ".$sugar_build.")";?></p>
+<p>Sugar <?php echo $mod_strings['LBL_VERSION']." ".$sugar_version." (".$mod_strings['LBL_BUILD']." ".$sugar_build.")";?></p>
 <br>
 <h1><?php echo $mod_strings['LBL_CONTRIBUTOR_SUITECRM']; ?></h1>
 <table id="about_table" class="contentBox">

diff --git a/custom/modules/Home/AboutSugar.php b/custom/modules/Home/AboutSugar.php
diff --git a/index.php b/index.php
@@ -1,4 +1,5 @@
 <?php
+ini_set('display_errors',1);
 if(!defined('sugarEntry'))define('sugarEntry', true);
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by

diff --git a/modules/AOS_Contracts/metadata/listviewdefs.php b/modules/AOS_Contracts/metadata/listviewdefs.php
@@ -60,6 +60,10 @@
     'module' => 'Accounts',
     'id' => 'CONTRACT_ACCOUNT_ID',
     'link' => true,
+      'related_fields' =>
+          array (
+              'contract_account_id',
+          ),
   ),
   'TOTAL_CONTRACT_VALUE' => 
   array (

diff --git a/modules/AOS_Invoices/metadata/listviewdefs.php b/modules/AOS_Invoices/metadata/listviewdefs.php
@@ -54,6 +54,10 @@
     'module' => 'Contacts',
     'id' => 'BILLING_CONTACT_ID',
     'link' => true,
+      'related_fields' =>
+          array (
+              'billing_contact_id',
+          ),
   ),
   'BILLING_ACCOUNT' => 
   array (
@@ -63,6 +67,10 @@
     'module' => 'Accounts',
     'id' => 'BILLING_ACCOUNT_ID',
     'link' => true,
+      'related_fields' =>
+          array (
+              'billing_account_id',
+          ),
   ),
   'TOTAL_AMOUNT' => 
   array (

diff --git a/modules/AOS_Products/metadata/listviewdefs.php b/modules/AOS_Products/metadata/listviewdefs.php
@@ -3,7 +3,7 @@
 array (
   'NAME' => 
   array (
-    'width' => '25%',
+    'width' => '15%',
     'label' => 'LBL_NAME',
     'default' => true,
     'link' => true,
@@ -28,6 +28,20 @@
     'currency_format' => true,
     'default' => true,
   ),
+  'AOS_PRODUCT_CATEGORY_NAME' => 
+  array (
+    'type' => 'relate',
+    'studio' => 'visible',
+    'label' => 'LBL_AOS_PRODUCT_CATEGORYS_NAME',
+    'id' => 'AOS_PRODUCT_CATEGORY_ID',
+    'link' => true,
+    'width' => '10%',
+    'default' => true,
+    'related_fields' =>
+      array (
+          'aos_product_category_id',
+      ),
+  ),
   'CREATED_BY_NAME' => 
   array (
     'width' => '10%',

diff --git a/modules/AOS_Products/vardefs.php b/modules/AOS_Products/vardefs.php
@@ -244,17 +244,26 @@
         'bean_name'=>'AOS_Product_Categories',
         'vname' => 'LBL_AOS_PRODUCT_CATEGORIES_AOS_PRODUCTS_FROM_AOS_PRODUCT_CATEGORIES_TITLE',
     ),
-    "aos_product_category_name" => array (
+    'aos_product_category_name' => array (
+        'required' => false,
+        'source' => 'non-db',
         'name' => 'aos_product_category_name',
-        'rname' => 'name',
-        'id_name' => 'aos_product_category_id',
         'vname' => 'LBL_AOS_PRODUCT_CATEGORYS_NAME',
         'type' => 'relate',
-        'table' => 'aos_product_categories',
-        'join_name'=>'aos_product_categories',
+        'massupdate' => 0,
+        'comments' => '',
+        'help' => '',
+        'importable' => 'true',
+        'duplicate_merge' => 'disabled',
+        'duplicate_merge_dom_value' => '0',
+        'audited' => 1,
+        'reportable' => true,
+        'len' => '255',
+        'id_name' => 'aos_product_category_id',
+        'ext2' => 'AOS_Product_Categories',
         'module' => 'AOS_Product_Categories',
-        'link' => 'product_categories',
-        'source' => 'non-db',
+        'quicksearch' => 'enabled',
+        'studio' => 'visible',
     ),
     "aos_product_category_id" => array (
         'name' => 'aos_product_category_id',

diff --git a/modules/AOS_Quotes/metadata/listviewdefs.php b/modules/AOS_Quotes/metadata/listviewdefs.php
@@ -53,6 +53,10 @@
     'module' => 'Contacts',
     'id' => 'BILLING_CONTACT_ID',
     'link' => true,
+      'related_fields' =>
+          array (
+              'billing_contact_id',
+          ),
   ),
   'BILLING_ACCOUNT' => 
   array (
@@ -62,6 +66,10 @@
     'module' => 'Accounts',
     'id' => 'BILLING_ACCOUNT_ID',
     'link' => true,
+      'related_fields' =>
+          array (
+              'billing_account_id',
+          ),
   ),
   'TOTAL_AMOUNT' => 
   array (
@@ -91,30 +99,6 @@
     'label' => 'LBL_TYPE',
     'default' => false,
   ),
-  'INDUSTRY' => 
-  array (
-    'width' => '10%',
-    'label' => 'LBL_INDUSTRY',
-    'default' => false,
-  ),
-  'ANNUAL_REVENUE' => 
-  array (
-    'width' => '10%',
-    'label' => 'LBL_ANNUAL_REVENUE',
-    'default' => false,
-  ),
-  'PHONE_FAX' => 
-  array (
-    'width' => '10%',
-    'label' => 'LBL_PHONE_FAX',
-    'default' => false,
-  ),
-  'PHONE_OFFICE' => 
-  array (
-    'width' => '10%',
-    'label' => 'LBL_PHONE',
-    'default' => false,
-  ),
   'BILLING_ADDRESS_STREET' => 
   array (
     'width' => '15%',

diff --git a/modules/Contacts/vardefs.php b/modules/Contacts/vardefs.php
@@ -93,7 +93,6 @@
 			'massupdate' => false,
             'duplicate_merge'=> 'disabled',
             'hideacl'=>true,
-
 		),
 	'opportunity_role_fields' =>
 		array (

diff --git a/themes/Suite7/tpls/Home.tpl b/themes/Suite7/tpls/Home.tpl
diff --git a/upload/index.html b/upload/index.html