diff --git a/layouts/vlayout/modules/Reports/step2.tpl b/layouts/vlayout/modules/Reports/step2.tpl index ae857a9310dcf3615c0604f5f4a0798b104c33c8..0bf95a74b7fde06fad7470488080e023c399ec15 100644 --- a/layouts/vlayout/modules/Reports/step2.tpl +++ b/layouts/vlayout/modules/Reports/step2.tpl @@ -45,7 +45,7 @@ {foreach key=BLOCK_LABEL item=BLOCK from=$PRIMARY_MODULE} <optgroup label='{vtranslate($PRIMARY_MODULE_NAME,$MODULE)}-{vtranslate($BLOCK_LABEL,$PRIMARY_MODULE_NAME)}'> {foreach key=FIELD_KEY item=FIELD_LABEL from=$BLOCK} - <option value="{$FIELD_KEY}" {if !empty($SELECTED_FIELDS) && in_array($FIELD_KEY,array_map('decode_html',$SELECTED_FIELDS))}selected=""{/if}>{vtranslate($FIELD_LABEL, $PRIMARY_MODULE_NAME)}</option> + <option value="{$FIELD_KEY}" {if !empty($SELECTED_FIELDS) && in_array($FIELD_KEY,array_map('decode_html',$SELECTED_FIELDS))}selected=""{/if}>{vtranslate($PRIMARY_MODULE_NAME, $PRIMARY_MODULE_NAME)} {vtranslate($FIELD_LABEL, $PRIMARY_MODULE_NAME)}</option> {/foreach} </optgroup> {/foreach} @@ -54,7 +54,7 @@ {foreach key=BLOCK_LABEL item=BLOCK from=$SECONDARY_MODULE} <optgroup label='{vtranslate($SECONDARY_MODULE_NAME,$MODULE)}-{vtranslate($BLOCK_LABEL,$SECONDARY_MODULE_NAME)}'> {foreach key=FIELD_KEY item=FIELD_LABEL from=$BLOCK} - <option value="{$FIELD_KEY}"{if !empty($SELECTED_FIELDS) && in_array($FIELD_KEY,array_map('decode_html',$SELECTED_FIELDS))}selected=""{/if}>{vtranslate($FIELD_LABEL, $SECONDARY_MODULE_NAME)}</option> + <option value="{$FIELD_KEY}"{if !empty($SELECTED_FIELDS) && in_array($FIELD_KEY,array_map('decode_html',$SELECTED_FIELDS))}selected=""{/if}>{vtranslate($SECONDARY_MODULE_NAME, $SECONDARY_MODULE_NAME)} {vtranslate($FIELD_LABEL, $SECONDARY_MODULE_NAME)}</option> {/foreach} </optgroup> {/foreach} diff --git a/modules/Reports/models/Record.php b/modules/Reports/models/Record.php index 0891a801e5e9ec7e09f05beceaa0581bc092f3a9..87925215123c7d76d07b12f15183375fc1dc25c9 100644 --- a/modules/Reports/models/Record.php +++ b/modules/Reports/models/Record.php @@ -277,7 +277,7 @@ class Reports_Record_Model extends Vtiger_Record_Model { $dbFieldLabel = trim(str_replace(array($module, '_'), " ", $moduleFieldLabel)); $translatedFieldLabel = vtranslate($dbFieldLabel, $module); if(CheckFieldPermission($fieldName, $module) == 'true' && $columnName != 'crmid') { - $selectedColumns[$translatedFieldLabel] = $column; + $selectedColumns[$module.'_'.$translatedFieldLabel] = $column; } } return $selectedColumns;