Merge branch 'Developer'

config/version.php

@@ -9,6 +9,6 @@
  * Contributor(s): YetiForce.com
  ********************************************************************************/
 // -ve timestamp before release, +ve timestamp after release.
-$patch_version = '20150213';  
-$YetiForce_current_version = '1.3.13 RC';
+$patch_version = '20150217';  
+$YetiForce_current_version = '1.3.14 RC';
 $_SESSION['yetiforce_version'] = $YetiForce_current_version;

install/install_schema/data.sql

@@ -1,6 +1,6 @@
 /*
-SQLyog Ultimate v11.11 (64 bit)
-MySQL - 5.1.53-community-log : Database - yetiforcecrm
+SQLyog Ultimate v12.07 (64 bit)
+MySQL - 5.5.24 : Database - yetiforce
 *********************************************************************
 */
 
@@ -571,6 +571,8 @@ insert  into `vtiger_blocks`(`blockid`,`tabid`,`blocklabel`,`sequence`,`show_tit
 insert  into `vtiger_blocks`(`blockid`,`tabid`,`blocklabel`,`sequence`,`show_title`,`visible`,`create_view`,`edit_view`,`detail_view`,`display_status`,`iscustom`) values (237,75,'LBL_SHARING_INFORMATION',2,0,0,0,0,0,1,0);
 insert  into `vtiger_blocks`(`blockid`,`tabid`,`blocklabel`,`sequence`,`show_title`,`visible`,`create_view`,`edit_view`,`detail_view`,`display_status`,`iscustom`) values (238,75,'LBL_DESCRIPTION_INFORMATION',3,0,0,0,0,0,1,0);
 
+/*Data for the table `vtiger_blocks_hide` */
+
 /*Data for the table `vtiger_blocks_seq` */
 
 insert  into `vtiger_blocks_seq`(`id`) values (238);
@@ -1039,7 +1041,7 @@ insert  into `vtiger_currency_grouping_separator_seq`(`id`) values (5);
 
 /*Data for the table `vtiger_currency_info` */
 
-insert  into `vtiger_currency_info`(`id`,`currency_name`,`currency_code`,`currency_symbol`,`conversion_rate`,`currency_status`,`defaultid`,`deleted`) values (1,'Poland, Zlotych','PLN','zł',1.00000,'Active','-11',0);
+insert  into `vtiger_currency_info`(`id`,`currency_name`,`currency_code`,`currency_symbol`,`conversion_rate`,`currency_status`,`defaultid`,`deleted`) values (1,'Poland, Zlotych','PLN','zł','1.00000','Active','-11',0);
 
 /*Data for the table `vtiger_currency_info_seq` */
 
@@ -4706,9 +4708,9 @@ insert  into `vtiger_inventoryproductrel_seq`(`id`) values (0);
 
 /*Data for the table `vtiger_inventorytaxinfo` */
 
-insert  into `vtiger_inventorytaxinfo`(`taxid`,`taxname`,`taxlabel`,`percentage`,`deleted`) values (1,'tax1','VAT',23.000,0);
-insert  into `vtiger_inventorytaxinfo`(`taxid`,`taxname`,`taxlabel`,`percentage`,`deleted`) values (2,'tax2','Sales',8.000,0);
-insert  into `vtiger_inventorytaxinfo`(`taxid`,`taxname`,`taxlabel`,`percentage`,`deleted`) values (3,'tax3','Service',5.000,0);
+insert  into `vtiger_inventorytaxinfo`(`taxid`,`taxname`,`taxlabel`,`percentage`,`deleted`) values (1,'tax1','VAT','23.000',0);
+insert  into `vtiger_inventorytaxinfo`(`taxid`,`taxname`,`taxlabel`,`percentage`,`deleted`) values (2,'tax2','Sales','8.000',0);
+insert  into `vtiger_inventorytaxinfo`(`taxid`,`taxname`,`taxlabel`,`percentage`,`deleted`) values (3,'tax3','Service','5.000',0);
 
 /*Data for the table `vtiger_inventorytaxinfo_seq` */
 
@@ -18235,10 +18237,11 @@ insert  into `vtiger_settings_field`(`fieldid`,`blockid`,`name`,`iconpath`,`desc
 insert  into `vtiger_settings_field`(`fieldid`,`blockid`,`name`,`iconpath`,`description`,`linkto`,`sequence`,`active`,`pinned`) values (69,5,'LBL_MOBILE_KEYS',NULL,'LBL_MOBILE_KEYS_DESCRIPTION','index.php?parent=Settings&module=MobileApps&view=MobileKeys',5,0,0);
 insert  into `vtiger_settings_field`(`fieldid`,`blockid`,`name`,`iconpath`,`description`,`linkto`,`sequence`,`active`,`pinned`) values (70,2,'LBL_TREES_MANAGER',NULL,'LBL_TREES_MANAGER_DESCRIPTION','index.php?module=TreesManager&parent=Settings&view=List',15,0,0);
 insert  into `vtiger_settings_field`(`fieldid`,`blockid`,`name`,`iconpath`,`description`,`linkto`,`sequence`,`active`,`pinned`) values (71,2,'LBL_MODTRACKER_SETTINGS',NULL,'LBL_MODTRACKER_SETTINGS_DESCRIPTION','index.php?module=ModTracker&parent=Settings&view=List',16,0,0);
+insert  into `vtiger_settings_field`(`fieldid`,`blockid`,`name`,`iconpath`,`description`,`linkto`,`sequence`,`active`,`pinned`) values (72,2,'LBL_HIDEBLOCKS',NULL,'LBL_HIDEBLOCKS_DESCRIPTION','index.php?module=HideBlocks&parent=Settings&view=List',17,0,0);
 
 /*Data for the table `vtiger_settings_field_seq` */
 
-insert  into `vtiger_settings_field_seq`(`id`) values (71);
+insert  into `vtiger_settings_field_seq`(`id`) values (72);
 
 /*Data for the table `vtiger_sharedcalendar` */
 

install/install_schema/scheme.sql

@@ -1,6 +1,6 @@
 /*
-SQLyog Ultimate v11.11 (64 bit)
-MySQL - 5.1.53-community-log : Database - yetiforcecrm
+SQLyog Ultimate v12.07 (64 bit)
+MySQL - 5.5.24 : Database - yetiforce
 *********************************************************************
 */
 
@@ -803,6 +803,17 @@ CREATE TABLE `vtiger_blocks` (
   CONSTRAINT `fk_1_vtiger_blocks` FOREIGN KEY (`tabid`) REFERENCES `vtiger_tab` (`tabid`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+/*Table structure for table `vtiger_blocks_hide` */
+
+CREATE TABLE `vtiger_blocks_hide` (
+  `id` int(19) NOT NULL AUTO_INCREMENT,
+  `blockid` int(19) DEFAULT NULL,
+  `conditions` text,
+  `enabled` tinyint(1) DEFAULT NULL,
+  `view` varchar(100) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
 /*Table structure for table `vtiger_blocks_seq` */
 
 CREATE TABLE `vtiger_blocks_seq` (

languages/pl_pl/Settings/HideBlocks.php

@@ -0,0 +1,25 @@
+<?php
+/*+***********************************************************************************************************************************
+ * The contents of this file are subject to the YetiForce Public License Version 1.1 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
+ * See the License for the specific language governing rights and limitations under the License.
+ * The Original Code is YetiForce.
+ * The Initial Developer of the Original Code is YetiForce. Portions created by YetiForce are Copyright (C) www.yetiforce.com. 
+ * All Rights Reserved.
+ *************************************************************************************************************************************/
+$languageStrings = array(
+	'HideBlocks' => 'Ukrywanie bloków',
+	'LBL_HIDEBLOCKS' => 'Ukrywanie bloków',
+	'LBL_HIDEBLOCKS_DESCRIPTION' => 'Zarządzanie ukrywaniem bloków z polami',
+	'LBL_BLOCK_LABEL' => 'Blok',
+	'LBL_MODULE' => 'Moduł',
+	'LBL_ENABLED' => 'Aktywny',
+	'LBL_EDIT_BLOCK' => 'Edycja',
+	'LBL_NEW_BLOCK' => 'Tworzenie',
+	'LBL_BLOCK' => 'Blok',
+	'LBL_ENABLED' => 'Aktywny',
+	'LBL_NEXT' => 'Dalej',
+	'LBL_VIEW' => 'Widok',
+	'LBL_MANDATORY_FIELDS_EXIST' => 'Nie można ukryć tego bloku ponieważ istnieją w nim pola obowiązkowe.',
+);

languages/pl_pl/Settings/Vtiger.php

@@ -242,6 +242,8 @@
 	'LBL_TREES_MANAGER_DESCRIPTION' => 'Zarządzanie listami drzew',
 	'LBL_MODTRACKER_SETTINGS' => 'Historia zmian',
 	'LBL_MODTRACKER_SETTINGS_DESCRIPTION' => 'Zarządzanie historią zmian w modułach',
+	'LBL_HIDEBLOCKS' => 'Ukrywanie bloków',
+	'LBL_HIDEBLOCKS_DESCRIPTION' => 'Zarządzanie ukrywaniem bloków z polami',
 
 	/* Role */
 	'Board of Management'	=> 'Zarząd',

layouts/vlayout/modules/Inventory/EditViewBlocks.tpl

@@ -9,7 +9,6 @@
    * Contributor(s): YetiForce.com
  ********************************************************************************/
 -->*}
-
 {strip}
 <div class='editViewContainer container-fluid'>
 	<form class="form-horizontal recordEditView" id="EditView" name="EditView" method="post" action="index.php" enctype="multipart/form-data">
@@ -59,6 +58,8 @@
 			{if $BLOCK_FIELDS|@count lte 0}{continue}{/if}
 			{assign var=BLOCK value=$BLOCK_LIST[$BLOCK_LABEL]}
 			{assign var=IS_HIDDEN value=$BLOCK->isHidden()}
+			{assign var=BLOCKS_HIDE value=$BLOCK->isHideBlock($RECORD,$VIEW)}
+			{if $BLOCKS_HIDE}
 			<table class="table table-bordered blockContainer showInlineTable" data-label="{$BLOCK_LABEL}">
 			<thead>
 				<tr>
@@ -156,5 +157,6 @@
 			</tbody>
 			</table>
 			<br>
+			{/if}
 		{/foreach}
 {/strip}

layouts/vlayout/modules/OSSMailTemplates/EditViewBlocks.tpl

@@ -9,7 +9,6 @@
  * All Rights Reserved.
  *************************************************************************************************************************************/
 -->*}
-
 {strip}
     <div class='container-fluid editViewContainer'>
         <form class="form-horizontal recordEditView" id="EditView" name="EditView" method="post" action="index.php" enctype="multipart/form-data">
@@ -52,6 +51,8 @@
             </div>
             {foreach key=BLOCK_LABEL item=BLOCK_FIELDS from=$RECORD_STRUCTURE name="EditViewBlockLevelLoop"}
             {if $BLOCK_FIELDS|@count lte 0}{continue}{/if}
+			{assign var=BLOCKS_HIDE value=$BLOCK->isHideBlock($RECORD,$VIEW)}
+			{if $BLOCKS_HIDE}
             <table class="table table-bordered blockContainer showInlineTable">
                 <tr>
                     <th class="blockHeader" colspan="4">{vtranslate($BLOCK_LABEL, $MODULE)}</th>
@@ -164,5 +165,6 @@
                 {/if}
             </table>
             <br>
+			{/if}
         {/foreach}
     {/strip}

layouts/vlayout/modules/OSSMailView/DetailViewBlockView.tpl

@@ -13,25 +13,25 @@
 	{foreach key=BLOCK_LABEL_KEY item=FIELD_MODEL_LIST from=$RECORD_STRUCTURE name=block}
 	{assign var=BLOCK value=$BLOCK_LIST[$BLOCK_LABEL_KEY]}
 	{if $BLOCK eq null or $FIELD_MODEL_LIST|@count lte 0}{continue}{/if}
+	{assign var=BLOCKS_HIDE value=$BLOCK->isHideBlock($RECORD,$VIEW)}
 	{assign var=IS_HIDDEN value=$BLOCK->isHidden()}
 	{assign var=WIDTHTYPE value=$USER_MODEL->get('rowheight')}
-	<input type="hidden" name="timeFormatOptions" data-value='{$DAY_STARTS}' />
+	{if $BLOCKS_HIDE}
 	<table class="table table-bordered equalSplit detailview-table">
 		<thead>
-		<tr>
+			<tr>
 				<th class="blockHeader" colspan="4">
-                                    {if $smarty.foreach.block.last}
-                                                                                <img class="cursorPointer alignMiddle blockToggle {if ($IS_HIDDEN)} hide {/if}"  src="{vimage_path('arrowDown.png')}" data-mode="show" data-id={$BLOCK_LIST[$BLOCK_LABEL_KEY]->get('id')}>
-
-                                        <img class="cursorPointer alignMiddle blockToggle {if !($IS_HIDDEN)} hide {/if} "  src="{vimage_path('arrowRight.png')}" data-mode="hide" data-id={$BLOCK_LIST[$BLOCK_LABEL_KEY]->get('id')}>
-                                        &nbsp;&nbsp;{vtranslate({$BLOCK_LABEL_KEY},{$MODULE_NAME})}
-                                    {else}
-                                            <img class="cursorPointer alignMiddle blockToggle {if !($IS_HIDDEN)} hide {/if} "  src="{vimage_path('arrowRight.png')}" data-mode="hide" data-id={$BLOCK_LIST[$BLOCK_LABEL_KEY]->get('id')}>
-                                            <img class="cursorPointer alignMiddle blockToggle {if ($IS_HIDDEN)} hide {/if}"  src="{vimage_path('arrowDown.png')}" data-mode="show" data-id={$BLOCK_LIST[$BLOCK_LABEL_KEY]->get('id')}>
-                                            &nbsp;&nbsp;{vtranslate({$BLOCK_LABEL_KEY},{$MODULE_NAME})}
-                                    {/if}
+					{if $smarty.foreach.block.last}
+						<img class="cursorPointer alignMiddle blockToggle {if ($IS_HIDDEN)} hide {/if}"  src="{vimage_path('arrowDown.png')}" data-mode="show" data-id={$BLOCK_LIST[$BLOCK_LABEL_KEY]->get('id')}>
+						<img class="cursorPointer alignMiddle blockToggle {if !($IS_HIDDEN)} hide {/if} "  src="{vimage_path('arrowRight.png')}" data-mode="hide" data-id={$BLOCK_LIST[$BLOCK_LABEL_KEY]->get('id')}>
+						&nbsp;&nbsp;{vtranslate({$BLOCK_LABEL_KEY},{$MODULE_NAME})}
+					{else}
+						<img class="cursorPointer alignMiddle blockToggle {if !($IS_HIDDEN)} hide {/if} "  src="{vimage_path('arrowRight.png')}" data-mode="hide" data-id={$BLOCK_LIST[$BLOCK_LABEL_KEY]->get('id')}>
+						<img class="cursorPointer alignMiddle blockToggle {if ($IS_HIDDEN)} hide {/if}"  src="{vimage_path('arrowDown.png')}" data-mode="show" data-id={$BLOCK_LIST[$BLOCK_LABEL_KEY]->get('id')}>
+						&nbsp;&nbsp;{vtranslate({$BLOCK_LABEL_KEY},{$MODULE_NAME})}
+					{/if}
 				</th>
-		</tr>
+			</tr>
 		</thead>
 		 <tbody {if $IS_HIDDEN} class="hide" {/if}>
 		{assign var=COUNTER value=0}
@@ -125,5 +125,6 @@
 		</tbody>
 	</table>
 	<br>
+	{/if}
 	{/foreach}
 {/strip}

layouts/vlayout/modules/OSSPasswords/DetailViewBlockView.tpl

@@ -13,8 +13,9 @@
 	{foreach key=BLOCK_LABEL_KEY item=FIELD_MODEL_LIST from=$RECORD_STRUCTURE}
 	{assign var=BLOCK value=$BLOCK_LIST[$BLOCK_LABEL_KEY]}
 	{if $BLOCK eq null or $FIELD_MODEL_LIST|@count lte 0}{continue}{/if}
+	{assign var=BLOCKS_HIDE value=$BLOCK->isHideBlock($RECORD,$VIEW)}
 	{assign var=IS_HIDDEN value=$BLOCK->isHidden()}
-	<input type="hidden" name="timeFormatOptions" data-value='{$DAY_STARTS}' />
+	{if $BLOCKS_HIDE}
 	<table class="table table-bordered equalSplit detailview-table">
 		<thead>
 		<tr>
@@ -112,6 +113,7 @@
 		</tr>
 		</tbody>
 	</table>
+	{/if}
 	{/foreach}    
 
     <div class="contentHeader row-fluid">

layouts/vlayout/modules/OSSPasswords/EditViewBlocks.tpl

@@ -9,7 +9,6 @@
  * All Rights Reserved.
  *************************************************************************************************************************************/
 -->*}
-
 {strip}
 <div class='editViewContainer'>
 	<form class="form-horizontal recordEditView" id="EditView" name="EditView" method="post" action="index.php" enctype="multipart/form-data">
@@ -51,6 +50,8 @@
 		</div>
 		{foreach key=BLOCK_LABEL item=BLOCK_FIELDS from=$RECORD_STRUCTURE name="EditViewBlockLevelLoop"}
 			{if $BLOCK_FIELDS|@count lte 0}{continue}{/if}
+			{assign var=BLOCKS_HIDE value=$BLOCK->isHideBlock($RECORD_MODEL,$VIEW)}
+			{if $BLOCKS_HIDE}
 			<table class="table table-bordered blockContainer showInlineTable">
 			<tr>
 				<th class="blockHeader" colspan="4">{vtranslate($BLOCK_LABEL, $MODULE)}</th>
@@ -120,5 +121,6 @@
 			{/foreach}
 			</tr>
 			</table>
+			{/if}
 		{/foreach}
 {/strip}

layouts/vlayout/modules/OSSPdf/DetailViewBlockView.tpl

@@ -9,7 +9,6 @@
  * All Rights Reserved.
  *************************************************************************************************************************************/
 -->*}
-
 <style>
 ul > li.blockHeader {
   padding:5px; 
@@ -37,10 +36,6 @@ ul > li.blockHeader {
 	{foreach key=BLOCK_LABEL_KEY item=FIELD_MODEL_LIST from=$RECORD_STRUCTURE}
 	{if $FIELD_MODEL_LIST|@count lte 0}{continue}{/if}
 	{assign var=IS_HIDDEN value=$BLOCK_LIST[$BLOCK_LABEL_KEY]->isHidden()}
-	<input type="hidden" name="timeFormatOptions" data-value='{$DAY_STARTS}' />
-
-	{if $BLOCK_LABEL_KEY eq 'HEADER'}
-
 		<div class="">
 			<ul id="tabs" class="nav" style="list-style-type: none;border-radius: 10px;">
 				<li class="{$BLOCK_LABEL_KEY} blockHeader font" style=" margin:0px 10px 0px 10px;" >

layouts/vlayout/modules/OSSTimeControl/EditViewBlocks.tpl

@@ -54,6 +54,8 @@
 			{if $BLOCK_FIELDS|@count lte 0}{continue}{/if}
 			{assign var=BLOCK value=$BLOCK_LIST[$BLOCK_LABEL]}
 			{assign var=IS_HIDDEN value=$BLOCK->isHidden()}
+			{assign var=BLOCKS_HIDE value=$BLOCK->isHideBlock($RECORD,$VIEW)}
+			{if $BLOCKS_HIDE}
 			<table class="table table-bordered blockContainer showInlineTable">
 				<thead>
 					<tr>
@@ -138,5 +140,6 @@
 			</tbody>
 			</table>
 			<br>
+			{/if}
 		{/foreach}
 {/strip}

layouts/vlayout/modules/Settings/HideBlocks/Conditions.tpl

@@ -0,0 +1,56 @@
+{*<!--
+/*+***********************************************************************************************************************************
+ * The contents of this file are subject to the YetiForce Public License Version 1.1 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
+ * See the License for the specific language governing rights and limitations under the License.
+ * The Original Code is YetiForce.
+ * The Initial Developer of the Original Code is YetiForce. Portions created by YetiForce are Copyright (C) www.yetiforce.com. 
+ * All Rights Reserved.
+ *************************************************************************************************************************************/
+-->*}
+{strip}
+<div class="targetFieldsTableContainer">
+	<div class="widget_header row-fluid">
+		<h3>{vtranslate('LBL_HIDEBLOCKS', $QUALIFIED_MODULE)}</h3>
+		{vtranslate('LBL_HIDEBLOCKS_DESCRIPTION', $QUALIFIED_MODULE)}
+	</div>
+	<hr>
+	{if $MANDATORY_FIELDS}
+		<div class="alert alert-error">
+			{vtranslate('LBL_MANDATORY_FIELDS_EXIST', $QUALIFIED_MODULE)}
+		</div>
+		<br>	
+		<div class="row-fluid">
+			 <div class="pull-right">
+				 <a class="btn btn-danger" type="reset" onclick="javascript:window.history.back();">{vtranslate('LBL_BACK', $MODULE)}</a>
+			 </div>
+			 <div class="clearfix"></div>
+		</div>
+	{else}
+		<form method="post" action="index.php">
+			<input type="hidden" name="module" value="{$MODULE}"/>
+			<input type="hidden" name="parent" value="Settings"/>
+			<input type="hidden" name="action" value="Save" />
+			<input type="hidden" name="record" value="{$RECORD_ID}"/>
+			<input type="hidden" name="blockid" value="{$BLOCKID}"/>
+			<input type="hidden" name="enabled" value="{$ENABLED}"/>
+			<input type="hidden" name="views" value="{$VIEWS}"/>
+			<input type="hidden" name="conditions" class="advanced_filter" value="{$ENABLED}"/>
+			<div class="listViewEntriesDiv contents-bottomscroll" style="overflow-x: visible !important;">
+				<div class="bottomscroll-div">
+					{include file='AdvanceFilter.tpl'|@vtemplate_path RECORD_STRUCTURE=$RECORD_STRUCTURE}
+				</div>
+			</div>
+			<br>	
+			<div class="row-fluid">
+				 <div class="pull-right">
+					 <a class="saveLink btn btn-success" ><strong>{vtranslate('LBL_SAVE', $MODULE)}</strong></a>
+					 <a class="cancelLink" type="reset" onclick="javascript:window.history.back();">{vtranslate('LBL_BACK', $MODULE)}</a>
+				 </div>
+				 <div class="clearfix"></div>
+			</div>
+		</form>	
+	{/if}
+</div>
+{/strip}