diff --git a/layouts/v7/modules/Inventory/resources/Edit.js b/layouts/v7/modules/Inventory/resources/Edit.js
index 17b906ff8301d9dd50c21d7895151e140b73b4f3..7b1cc0f6c9e2385363bea7c6ac5c9257f6b9b541 100644
--- a/layouts/v7/modules/Inventory/resources/Edit.js
+++ b/layouts/v7/modules/Inventory/resources/Edit.js
@@ -1819,7 +1819,8 @@ Vtiger_Edit_Js("Inventory_Edit_Js", {
'animation' : true,
'title' : popOverTitle,
'trigger' : 'manual',
- 'template' : template,
+ 'template' : template[0].outerHTML,
+ 'sanitize' : false, /* to allow button / anchor */
'container' : self.lineItemsHolder
});
@@ -2008,7 +2009,8 @@ Vtiger_Edit_Js("Inventory_Edit_Js", {
'animation' : true,
'title' : popOverTitle,
'trigger' : 'manual',
- 'template' : template,
+ 'template' : template[0].outerHTML,
+ 'sanitize' : false, /* to allow button / anchor */
'container' : self.lineItemsHolder
});
@@ -2035,8 +2037,8 @@ Vtiger_Edit_Js("Inventory_Edit_Js", {
'animation' : true,
'title' : 'Discount',
'trigger' : 'manual',
- 'template' : popOverTemplate
-
+ 'template' : popOverTemplate[0].outerHTML,
+ 'sanitize' : false, /* to allow button / anchor */
});
this.finalDiscountEle.on('shown.bs.popover', function(){
if(jQuery(this.finalDiscountEle).next('.popover').find('.popover-content').height() > 300) {
@@ -2112,8 +2114,8 @@ Vtiger_Edit_Js("Inventory_Edit_Js", {
'animation' : true,
'title' : chargesTrigger.text(),
'trigger' : 'manual',
- 'template' : popOverTemplate
-
+ 'template' : popOverTemplate[0].outerHTML,
+ 'sanitize' : false, /* to allow button / anchor */
});
chargesTrigger.on('shown.bs.popover', function(){
@@ -2176,8 +2178,8 @@ Vtiger_Edit_Js("Inventory_Edit_Js", {
'animation' : true,
'title' : finalTaxUI.find('.popover_title').val(),
'trigger' : 'manual',
- 'template' : popOverTemplate
-
+ 'template' : popOverTemplate[0].outerHTML,
+ 'sanitize' : false, /* to allow button / anchor */
});
finalTaxTriggerer.on('shown.bs.popover', function(){
@@ -2239,8 +2241,8 @@ Vtiger_Edit_Js("Inventory_Edit_Js", {
'animation' : true,
'title' : 'Discount',
'trigger' : 'manual',
- 'template' : popOverTemplate
-
+ 'template' : popOverTemplate[0].outerHTML,
+ 'sanitize' : false, /* to allow button / anchor */
});
chargeTaxTriggerer.on('shown.bs.popover', function(){
diff --git a/layouts/v7/modules/Vtiger/resources/ListSidebar.js b/layouts/v7/modules/Vtiger/resources/ListSidebar.js
index 735d43e282d675162366efc980a6947ceecbc827..1f0d44bb2fb65b284f42743f71cd9510ccc617ea 100644
--- a/layouts/v7/modules/Vtiger/resources/ListSidebar.js
+++ b/layouts/v7/modules/Vtiger/resources/ListSidebar.js
@@ -200,7 +200,8 @@ Vtiger.Class('Vtiger_ListSidebar_Js',{},{
placement: 'left',
template: '<div class="popover" style="top: 0; position:absolute; z-index:0; margin-top:5px"><div class="popover-content"></div></div>',
content: contentEle.html(),
- container: jQuery('#module-filters')
+ container: jQuery('#module-filters'),
+ sanitize : false, /* to allow button / anchor */
};
jQuery(ele).popover(options);
diff --git a/layouts/v7/modules/Vtiger/resources/Tag.js b/layouts/v7/modules/Vtiger/resources/Tag.js
index ba37c68609b4b1b008cb8a605818d51215771e7d..310f453f1277be860921d918e9e382ffdf7c07cf 100644
--- a/layouts/v7/modules/Vtiger/resources/Tag.js
+++ b/layouts/v7/modules/Vtiger/resources/Tag.js
@@ -274,7 +274,8 @@ Vtiger.Class("Vtiger_Tag_Js",{},{
'animation' : true,
'trigger' : 'manual',
'template' : self.editTagTemplate,
- 'container' : container
+ 'container' : container,
+ 'sanitize' : false, /* to allow button / anchor */
});
element.popover('show');
diff --git a/layouts/vlayout/modules/Vtiger/resources/Vtiger.js b/layouts/vlayout/modules/Vtiger/resources/Vtiger.js
index 2f988a692c5997107438a78f6a228b3b87e64907..3fd5de29e3a98010de4648b0d85ec066876031c7 100644
--- a/layouts/vlayout/modules/Vtiger/resources/Vtiger.js
+++ b/layouts/vlayout/modules/Vtiger/resources/Vtiger.js
@@ -354,7 +354,8 @@ var Vtiger_Index_Js = {
content: data,
animation: false,
placement: the_placement,
- template: '<div class="popover popover-tooltip"><div class="arrow"></div><div class="popover-inner"><button name="vtTooltipClose" class="close" style="color:white;opacity:1;font-weight:lighter;position:relative;top:3px;right:3px;">x</button><h3 class="popover-title"></h3><div class="popover-content"><div></div></div></div></div>'
+ template: '<div class="popover popover-tooltip"><div class="arrow"></div><div class="popover-inner"><button name="vtTooltipClose" class="close" style="color:white;opacity:1;font-weight:lighter;position:relative;top:3px;right:3px;">x</button><h3 class="popover-title"></h3><div class="popover-content"><div></div></div></div></div>',
+ sanitize: false, /* to allow button / anchor */
});
lastPopovers.push(el.popover('show'));
registerToolTipDestroy();
diff --git a/modules/Migration/schema/810_to_820.php b/modules/Migration/schema/810_to_820.php
index d0315444bb21edc529a41c26dcc628b7deb84fc0..25e10335cb399608746624edac431f414011e511 100644
--- a/modules/Migration/schema/810_to_820.php
+++ b/modules/Migration/schema/810_to_820.php
@@ -41,4 +41,7 @@ if (defined('VTIGER_UPGRADE')) {
$db->pquery('ALTER TABLE vtiger_purchaseorder MODIFY s_h_percent DECIMAL(25,3)', array());
$db->pquery('ALTER TABLE vtiger_quotes MODIFY s_h_percent DECIMAL(25,3)', array());
+ // Make hidden mandatory fields optional
+ $db->pquery("UPDATE vtiger_field SET typeofdata = replace(typeofdata,'~M','~O') where presence =1 and typeofdata like '%~M%'", array());
+
}
diff --git a/modules/com_vtiger_workflow/VTWorkflowManager.inc b/modules/com_vtiger_workflow/VTWorkflowManager.inc
index 35a3c2aec7dca4f561c17438d0c40a87154668bf..6766a56b322c78ba38552a5f720185604534c8c1 100644
--- a/modules/com_vtiger_workflow/VTWorkflowManager.inc
+++ b/modules/com_vtiger_workflow/VTWorkflowManager.inc
@@ -87,7 +87,8 @@ class VTWorkflowManager{
$query = 'SELECT * FROM com_vtiger_workflows INNER JOIN vtiger_tab ON vtiger_tab.name = com_vtiger_workflows.module_name WHERE vtiger_tab.presence IN (0,2) AND execution_condition = ? AND status=?';
$params = array(VTWorkflowManager::$ON_SCHEDULE,1);
if($referenceTime != '') {
- $query .= " AND (nexttrigger_time = '' OR nexttrigger_time IS NULL OR nexttrigger_time <= ?)";
+ //Removed the coparision of empty string with the nexttrigger_time to avoid MySQL error INCORRECT DATE TIME VALUE
+ $query .= " AND (nexttrigger_time IS NULL OR nexttrigger_time <= ?)";
array_push($params, $referenceTime);
}
$result = $adb->pquery($query, $params);
diff --git a/packages/vtiger/mandatory/Import.zip b/packages/vtiger/mandatory/Import.zip
index 1e5043729d81f3a6245f59adee3d4a7c9dc57524..75a95984566ceea8da35811ee8da3a52c18b16c3 100644
Binary files a/packages/vtiger/mandatory/Import.zip and b/packages/vtiger/mandatory/Import.zip differ
diff --git a/packages/vtiger/mandatory/MailManager.zip b/packages/vtiger/mandatory/MailManager.zip
index 493acbcac7ae154aece5479e37a5d11aa024372a..66335f6a3c60151d63a2b6bfa545319194593b2b 100644
Binary files a/packages/vtiger/mandatory/MailManager.zip and b/packages/vtiger/mandatory/MailManager.zip differ
diff --git a/packages/vtiger/mandatory/Mobile.zip b/packages/vtiger/mandatory/Mobile.zip
index bb230ae2e9d772a6c2664200a57a6903b87e3881..1d5994b951e697d0f55ac13392cc7e17e626198e 100644
Binary files a/packages/vtiger/mandatory/Mobile.zip and b/packages/vtiger/mandatory/Mobile.zip differ
diff --git a/packages/vtiger/mandatory/ModTracker.zip b/packages/vtiger/mandatory/ModTracker.zip
index 8d4a3badcb55710b2eed960dd8ac7c598463c91f..e26bd9e772d96fd2df99a601d342d0b999447e42 100644
Binary files a/packages/vtiger/mandatory/ModTracker.zip and b/packages/vtiger/mandatory/ModTracker.zip differ
diff --git a/packages/vtiger/mandatory/PBXManager.zip b/packages/vtiger/mandatory/PBXManager.zip
index a6267feb056b5de67814d68504aac580959b0243..570a8acf91ca00b48877d2d9ea345df8c97385a6 100644
Binary files a/packages/vtiger/mandatory/PBXManager.zip and b/packages/vtiger/mandatory/PBXManager.zip differ
diff --git a/packages/vtiger/mandatory/ServiceContracts.zip b/packages/vtiger/mandatory/ServiceContracts.zip
index e98ec28a30099856bebef3f504e2522696221daf..78361db20a82a1a4423e36132a103aa3dd98bb7b 100644
Binary files a/packages/vtiger/mandatory/ServiceContracts.zip and b/packages/vtiger/mandatory/ServiceContracts.zip differ
diff --git a/packages/vtiger/mandatory/Services.zip b/packages/vtiger/mandatory/Services.zip
index aec2c658a8ff74e57fbe8aa49d7f2e301ad6b03a..846ae8626643b14417dcab29cfffae39767ef611 100644
Binary files a/packages/vtiger/mandatory/Services.zip and b/packages/vtiger/mandatory/Services.zip differ
diff --git a/packages/vtiger/mandatory/WSAPP.zip b/packages/vtiger/mandatory/WSAPP.zip
index 4c57ca0a0a95a542579a2120de744004c542ab1e..b98e0378aebea233cbd9be25050c80d3035539d2 100644
Binary files a/packages/vtiger/mandatory/WSAPP.zip and b/packages/vtiger/mandatory/WSAPP.zip differ
diff --git a/packages/vtiger/marketplace/ExtensionStore.zip b/packages/vtiger/marketplace/ExtensionStore.zip
index 6bc386966000825b7e541509ee6f312d43b3d6f9..8e365d1593bc4cb5296af28a227a1fa8077a7b33 100644
Binary files a/packages/vtiger/marketplace/ExtensionStore.zip and b/packages/vtiger/marketplace/ExtensionStore.zip differ
diff --git a/packages/vtiger/optional/Arabic_ar_ae.zip b/packages/vtiger/optional/Arabic_ar_ae.zip
index 7148db184d056d20b554a747ca1cbf6b6010c72c..b553579d6848903e544efa3e35ab309f7d6c0b57 100644
Binary files a/packages/vtiger/optional/Arabic_ar_ae.zip and b/packages/vtiger/optional/Arabic_ar_ae.zip differ
diff --git a/packages/vtiger/optional/Assets.zip b/packages/vtiger/optional/Assets.zip
index c4d50335959b92977e1532a43e54222aa65653d3..97fc3899c1b896561d00c3cc77961db0d6f078ab 100644
Binary files a/packages/vtiger/optional/Assets.zip and b/packages/vtiger/optional/Assets.zip differ
diff --git a/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip b/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip
index ed733fbd7620f08be64a3af3bb3f595cacdd2208..1312c392ae04a7d2132dd8dc5d4666c77a26d6c8 100644
Binary files a/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip and b/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip differ
diff --git a/packages/vtiger/optional/BritishLanguagePack_br_br.zip b/packages/vtiger/optional/BritishLanguagePack_br_br.zip
index fbccec7716a9fc3d5740047ec49ff890ad70584e..107a1147edf8c3bd49ce4e528f2e5921d38f88e3 100644
Binary files a/packages/vtiger/optional/BritishLanguagePack_br_br.zip and b/packages/vtiger/optional/BritishLanguagePack_br_br.zip differ
diff --git a/packages/vtiger/optional/CustomerPortal.zip b/packages/vtiger/optional/CustomerPortal.zip
index 95c38d83c8c2aa9c3465e0845d0e88942da9de2e..76cd0728acdfa4f5b248ab0b492cea002bd1dda6 100644
Binary files a/packages/vtiger/optional/CustomerPortal.zip and b/packages/vtiger/optional/CustomerPortal.zip differ
diff --git a/packages/vtiger/optional/Deutsch.zip b/packages/vtiger/optional/Deutsch.zip
index 4025414a4666ab65afb2b445000d2aaf453e6ea9..d51dd011309f4caac1a1ce4263a56365e4152a7e 100644
Binary files a/packages/vtiger/optional/Deutsch.zip and b/packages/vtiger/optional/Deutsch.zip differ
diff --git a/packages/vtiger/optional/Dutch.zip b/packages/vtiger/optional/Dutch.zip
index ea89c027a4bca19544b227cec9f9abc4e0afb564..d2b30129267ac79f9eec2e8c4623f04c55ada373 100644
Binary files a/packages/vtiger/optional/Dutch.zip and b/packages/vtiger/optional/Dutch.zip differ
diff --git a/packages/vtiger/optional/EmailTemplates.zip b/packages/vtiger/optional/EmailTemplates.zip
index 9d49c3cb38e39d95f4c018ab8047724a0ab33ca2..0a33497c04920753402ec5292660a19b208fb7db 100644
Binary files a/packages/vtiger/optional/EmailTemplates.zip and b/packages/vtiger/optional/EmailTemplates.zip differ
diff --git a/packages/vtiger/optional/French.zip b/packages/vtiger/optional/French.zip
index a41625c62bb66db2ecf82fb2cc046e5174518f57..0040e8b751f02420dff7b0654bed1327c5ab2219 100644
Binary files a/packages/vtiger/optional/French.zip and b/packages/vtiger/optional/French.zip differ
diff --git a/packages/vtiger/optional/Google.zip b/packages/vtiger/optional/Google.zip
index 1caf84d624c4337655d246d32b8a412766691f65..c042d5978b0de52596228f1c43af29d84da04533 100644
Binary files a/packages/vtiger/optional/Google.zip and b/packages/vtiger/optional/Google.zip differ
diff --git a/packages/vtiger/optional/Hungarian.zip b/packages/vtiger/optional/Hungarian.zip
index 07d70dc5924d0e21bc8380f1f599189feaade131..cfa6994d260fccfbc0e1bba90d04473974375b35 100644
Binary files a/packages/vtiger/optional/Hungarian.zip and b/packages/vtiger/optional/Hungarian.zip differ
diff --git a/packages/vtiger/optional/ItalianLanguagePack_it_it.zip b/packages/vtiger/optional/ItalianLanguagePack_it_it.zip
index a21703afa4c533572713add205aa4e77ec608f4d..0c9e64052464759802642bfa1816cee7921de5a2 100644
Binary files a/packages/vtiger/optional/ItalianLanguagePack_it_it.zip and b/packages/vtiger/optional/ItalianLanguagePack_it_it.zip differ
diff --git a/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip b/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip
index ce021be417cee597dbcd531494a0a20fd658d269..698045e178a1b67c0b280ec625d8c0e9e060cba9 100644
Binary files a/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip and b/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip differ
diff --git a/packages/vtiger/optional/ModComments.zip b/packages/vtiger/optional/ModComments.zip
index 83987c246124cc855d390a572dd9ce7e12a24973..f6737fe71ad172d4828328a64beb6af21b87009a 100644
Binary files a/packages/vtiger/optional/ModComments.zip and b/packages/vtiger/optional/ModComments.zip differ
diff --git a/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip b/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip
index ba893d7e2d2a72cf63d99d9f985ea8063a18ed26..4981faa6d9444da08360cfd72f5682cf73f6e116 100644
Binary files a/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip and b/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip differ
diff --git a/packages/vtiger/optional/Projects.zip b/packages/vtiger/optional/Projects.zip
index a9cfdfa5456776b74ffa6cce71031e695220934a..083ca969a143e672f1fcde63c4fa545af57a3fb0 100644
Binary files a/packages/vtiger/optional/Projects.zip and b/packages/vtiger/optional/Projects.zip differ
diff --git a/packages/vtiger/optional/RecycleBin.zip b/packages/vtiger/optional/RecycleBin.zip
index 8e4ffbd38204d253202e76877688ca0dcc88dff6..6ec83e0d03d1dd11d5e903cff930d8ce079964f6 100644
Binary files a/packages/vtiger/optional/RecycleBin.zip and b/packages/vtiger/optional/RecycleBin.zip differ
diff --git a/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip b/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip
index 048015c9482e52f1c45c12afce40da70cbdcde30..72ab095d121d9b1a052789b60d4d97f199e950a7 100644
Binary files a/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip and b/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip differ
diff --git a/packages/vtiger/optional/Russian.zip b/packages/vtiger/optional/Russian.zip
index 46d703c17ae6b6c36bc661490adec5a95e6d6d91..4ba81546d81b6a10ba7c0404d91641497a16b50b 100644
Binary files a/packages/vtiger/optional/Russian.zip and b/packages/vtiger/optional/Russian.zip differ
diff --git a/packages/vtiger/optional/SMSNotifier.zip b/packages/vtiger/optional/SMSNotifier.zip
index 8df176a4fc89b95995bb3a3175361471c414a0cd..c76cbd945ccb5dd84bffeb040ace02a7f77e3365 100644
Binary files a/packages/vtiger/optional/SMSNotifier.zip and b/packages/vtiger/optional/SMSNotifier.zip differ
diff --git a/packages/vtiger/optional/Spanish.zip b/packages/vtiger/optional/Spanish.zip
index b6be8d9c39922badb9154658fefe7fd3332aca73..c44ef0815ef1a4054f0f97bc0b7c5104ba85f759 100644
Binary files a/packages/vtiger/optional/Spanish.zip and b/packages/vtiger/optional/Spanish.zip differ
diff --git a/packages/vtiger/optional/Sweden_sv_se.zip b/packages/vtiger/optional/Sweden_sv_se.zip
index 3e1048f36a6c93094c9e94c3aa1dc654cc68b6b5..c6944675106d32695645f109d5bc6ff5e47f552f 100644
Binary files a/packages/vtiger/optional/Sweden_sv_se.zip and b/packages/vtiger/optional/Sweden_sv_se.zip differ
diff --git a/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip b/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip
index 6fb7d2c3450a700b4cf61b16d62a0e79722c5e80..bdb8c342997f247217e216cc576a498cf2ad1ede 100644
Binary files a/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip and b/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip differ
diff --git a/packages/vtiger/optional/Webforms.zip b/packages/vtiger/optional/Webforms.zip
index 2435fc1e64305358062ebc586335e0a0081917fb..07149559dbb64a38de52420f08ebc5c9bbc4c5f2 100644
Binary files a/packages/vtiger/optional/Webforms.zip and b/packages/vtiger/optional/Webforms.zip differ