diff --git a/languages/en_us/Settings/Vtiger.php b/languages/en_us/Settings/Vtiger.php
index 1e9cb65ac191e54cf843a5355587a711d570d289..652349d151ff588f0d161031fe5850cc02c816a0 100644
--- a/languages/en_us/Settings/Vtiger.php
+++ b/languages/en_us/Settings/Vtiger.php
@@ -277,7 +277,8 @@ $languageStrings = array(
'phone' => 'Phone',
'fax' => 'Fax',
'website' => 'Website',
- 'facebook' => 'Facebook',
+ 'vatid' => 'VAT ID',
+ 'facebook' => 'Facebook',
'twitter' => 'Twitter',
'linkedin' => 'LinkedIn',
'LBL_IMAGE_CORRUPTED' => 'Virus detected or Uploaded image corrupted',
diff --git a/layouts/v7/modules/Calendar/CalendarHeader.tpl b/layouts/v7/modules/Calendar/CalendarHeader.tpl
index 18f944d2a64ec7ca84b4852ef00fe07e5184b327..b297354f95cdf20b31fe3ca25472ca14e86abc6e 100644
--- a/layouts/v7/modules/Calendar/CalendarHeader.tpl
+++ b/layouts/v7/modules/Calendar/CalendarHeader.tpl
@@ -54,7 +54,7 @@
<li id="{$MODULE_NAME}_listview_advancedAction_{$SETTING->getLabel()}_WORKFLOWS"><a href="{$SETTING->getUrl()}&sourceModule=Events">{vtranslate('LBL_EVENTS', $MODULE_NAME)} {vtranslate('LBL_WORKFLOWS',$MODULE_NAME)}</a></li>
<li id="{$MODULE_NAME}_listview_advancedAction_{$SETTING->getLabel()}_WORKFLOWS"><a href="{$SETTING->getUrl()}&sourceModule=Calendar">{vtranslate('LBL_TASKS', 'Calendar')} {vtranslate('LBL_WORKFLOWS',$MODULE_NAME)}</a></li>
{else}
- <li id="{$MODULE_NAME}_listview_advancedAction_{$SETTING->getLabel()}"><a href={$SETTING->getUrl()}>{vtranslate($SETTING->getLabel(), $MODULE_NAME, vtranslate($MODULE_NAME))}</a></li>
+ <li id="{$MODULE_NAME}_listview_advancedAction_{$SETTING->getLabel()}"><a href={$SETTING->getUrl()}>{vtranslate($SETTING->getLabel(), $MODULE_NAME, vtranslate($MODULE_NAME, $MODULE_NAME))}</a></li>
{/if}
{/foreach}
<li>
diff --git a/layouts/v7/modules/Calendar/ModuleHeader.tpl b/layouts/v7/modules/Calendar/ModuleHeader.tpl
index 82d9bfd4b90f0501af85c412e771fa0d6a42a7fe..45767bad4dfddf8656b9c4da3618e9a36ad1652e 100644
--- a/layouts/v7/modules/Calendar/ModuleHeader.tpl
+++ b/layouts/v7/modules/Calendar/ModuleHeader.tpl
@@ -95,7 +95,7 @@
<li id="{$MODULE_NAME}_listview_advancedAction_{$SETTING->getLabel()}_WORKFLOWS"><a href="{$SETTING->getUrl()}&sourceModule=Events">{vtranslate('LBL_EVENTS', $MODULE_NAME)} {vtranslate('LBL_WORKFLOWS',$MODULE_NAME)}</a></li>
<li id="{$MODULE_NAME}_listview_advancedAction_{$SETTING->getLabel()}_WORKFLOWS"><a href="{$SETTING->getUrl()}&sourceModule=Calendar">{vtranslate('LBL_TASKS', 'Calendar')} {vtranslate('LBL_WORKFLOWS',$MODULE_NAME)}</a></li>
{else}
- <li id="{$MODULE_NAME}_listview_advancedAction_{$SETTING->getLabel()}"><a href={$SETTING->getUrl()}>{vtranslate($SETTING->getLabel(), $MODULE_NAME, vtranslate($MODULE_NAME))}</a></li>
+ <li id="{$MODULE_NAME}_listview_advancedAction_{$SETTING->getLabel()}"><a href={$SETTING->getUrl()}>{vtranslate($SETTING->getLabel(), $MODULE_NAME, vtranslate($MODULE_NAME, $MODULE_NAME))}</a></li>
{/if}
{/foreach}
</ul>
diff --git a/layouts/v7/modules/Campaigns/RelatedList.tpl b/layouts/v7/modules/Campaigns/RelatedList.tpl
index bafe1bc30ea783ed73234bb9428d01b3bd71b7dd..9b0ee10034af5fa915f0db8fa115fe82260f6e67 100644
--- a/layouts/v7/modules/Campaigns/RelatedList.tpl
+++ b/layouts/v7/modules/Campaigns/RelatedList.tpl
@@ -73,7 +73,7 @@
<select id="recordsFilter" class="select2 col-lg-8" data-placeholder="{vtranslate('LBL_SELECT_TO_LOAD_LIST', $RELATED_MODULE_NAME)}">
<option></option>
{foreach key=GROUP_LABEL item=GROUP_CUSTOM_VIEWS from=$CUSTOM_VIEWS}
- <optgroup label=' {if $GROUP_LABEL eq 'Mine'} {else if} {vtranslate($GROUP_LABEL)} {/if}' >
+ <optgroup label=' {if $GROUP_LABEL eq 'Mine'} {else if} {vtranslate($GROUP_LABEL, $RELATED_MODULE_NAME)} {/if}' >
{foreach item="CUSTOM_VIEW" from=$GROUP_CUSTOM_VIEWS}
<option id="filterOptionId_{$CUSTOM_VIEW->get('cvid')}" value="{$CUSTOM_VIEW->get('cvid')}" class="filterOptionId_{$CUSTOM_VIEW->get('cvid')}" data-id="{$CUSTOM_VIEW->get('cvid')}">{if $CUSTOM_VIEW->get('viewname') eq 'All'}{vtranslate($CUSTOM_VIEW->get('viewname'), $RELATED_MODULE_NAME)} {vtranslate($RELATED_MODULE_NAME, $RELATED_MODULE_NAME)}{else}{vtranslate($CUSTOM_VIEW->get('viewname'), $RELATED_MODULE_NAME)}{/if}{if $GROUP_LABEL neq 'Mine'} [ {$CUSTOM_VIEW->getOwnerName()} ] {/if}</option>
{/foreach}
diff --git a/layouts/v7/modules/Documents/ModuleHeader.tpl b/layouts/v7/modules/Documents/ModuleHeader.tpl
index 233212f49bc4010d76ba6690d0db0222eceacb23..fdbc8d1eedf77f2d94e4b26fee030e8ad5810988 100644
--- a/layouts/v7/modules/Documents/ModuleHeader.tpl
+++ b/layouts/v7/modules/Documents/ModuleHeader.tpl
@@ -88,7 +88,7 @@
<ul class="detailViewSetting dropdown-menu">
{foreach item=SETTING from=$MODULE_SETTING_ACTIONS}
{if {vtranslate($SETTING->getLabel())} eq "%s Numbering"}
- <li id="{$MODULE_NAME}_listview_advancedAction_{$SETTING->getLabel()}"><a href={$SETTING->getUrl()}>{vtranslate($SETTING->getLabel(), $MODULE_NAME ,vtranslate($MODULE_NAME))}</a></li>
+ <li id="{$MODULE_NAME}_listview_advancedAction_{$SETTING->getLabel()}"><a href={$SETTING->getUrl()}>{vtranslate($SETTING->getLabel(), $MODULE_NAME ,vtranslate($MODULE_NAME, $MODULE_NAME))}</a></li>
{else}
<li id="{$MODULE_NAME}_listview_advancedAction_{$SETTING->getLabel()}"><a href={$SETTING->getUrl()}>{vtranslate($SETTING->getLabel(), $MODULE_NAME, vtranslate("SINGLE_$MODULE_NAME", $MODULE_NAME))}</a></li>
{/if}
diff --git a/layouts/v7/modules/Vtiger/Comment.tpl b/layouts/v7/modules/Vtiger/Comment.tpl
index 7aaf40aee6a160375953f2bd54e8868d209eb856..36b2595bceadc7ad51f3df25f5fcacf606fd36b3 100644
--- a/layouts/v7/modules/Vtiger/Comment.tpl
+++ b/layouts/v7/modules/Vtiger/Comment.tpl
@@ -39,7 +39,7 @@
{assign var=ENTITY_NAME value=getEntityName($COMMENT->get('module'), array($COMMENT->get('related_to')))}
<span class="text-muted">
{vtranslate('LBL_ON','Vtiger')}
- {vtranslate($SINGULR_MODULE)}
+ {vtranslate($SINGULR_MODULE, $COMMENT->get('module'))}
<a href="index.php?module={$COMMENT->get('module')}&view=Detail&record={$COMMENT->get('related_to')}">
{$ENTITY_NAME[$COMMENT->get('related_to')]}
</a>
diff --git a/layouts/v7/modules/Vtiger/ModuleHeader.tpl b/layouts/v7/modules/Vtiger/ModuleHeader.tpl
index 83780d4c44a153d76ecaf8638a015f925f41cece..1bcdfb3d0849b192b7cf3d3b21c43dab777f12ee 100644
--- a/layouts/v7/modules/Vtiger/ModuleHeader.tpl
+++ b/layouts/v7/modules/Vtiger/ModuleHeader.tpl
@@ -86,7 +86,7 @@
</button>
<ul class="detailViewSetting dropdown-menu">
{foreach item=SETTING from=$MODULE_SETTING_ACTIONS}
- <li id="{$MODULE_NAME}_listview_advancedAction_{$SETTING->getLabel()}"><a href={$SETTING->getUrl()}>{vtranslate($SETTING->getLabel(), $MODULE_NAME ,vtranslate($MODULE_NAME))}</a></li>
+ <li id="{$MODULE_NAME}_listview_advancedAction_{$SETTING->getLabel()}"><a href={$SETTING->getUrl()}>{vtranslate($SETTING->getLabel(), $MODULE_NAME ,vtranslate($MODULE_NAME, $MODULE_NAME))}</a></li>
{/foreach}
</ul>
</div>
diff --git a/modules/Accounts/actions/TransferOwnership.php b/modules/Accounts/actions/TransferOwnership.php
index 21179f05580faed36e96a9afd5642e3bb74a3c3d..154e2a5ae5a6885c5791958cf49d77aabf12b5bc 100644
--- a/modules/Accounts/actions/TransferOwnership.php
+++ b/modules/Accounts/actions/TransferOwnership.php
@@ -16,7 +16,7 @@ class Accounts_TransferOwnership_Action extends Vtiger_Action_Controller {
$currentUserPriviligesModel = Users_Privileges_Model::getCurrentUserPrivilegesModel();
if(!$currentUserPriviligesModel->hasModuleActionPermission($moduleModel->getId(), 'Save')) {
- throw new AppException(vtranslate($moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
+ throw new AppException(vtranslate($moduleName, $moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
}
}
diff --git a/modules/Accounts/views/AccountHierarchy.php b/modules/Accounts/views/AccountHierarchy.php
index 110467a64cf0e83cbe3ba748819cdf1134cea385..ea3bc8836d982e9a77c26492ecbb1eb824e8c58e 100644
--- a/modules/Accounts/views/AccountHierarchy.php
+++ b/modules/Accounts/views/AccountHierarchy.php
@@ -16,7 +16,7 @@ class Accounts_AccountHierarchy_View extends Vtiger_View_Controller {
$currentUserPriviligesModel = Users_Privileges_Model::getCurrentUserPrivilegesModel();
if(!$currentUserPriviligesModel->hasModulePermission($moduleModel->getId())) {
- throw new AppException(vtranslate($moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
+ throw new AppException(vtranslate($moduleName, $moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
}
}
diff --git a/modules/Emails/actions/CheckServerInfo.php b/modules/Emails/actions/CheckServerInfo.php
index ceba269ccc98a235e78abd1fc510fb56c3fdec65..d34f6a1e343d8e14d3347a33000164d997d58f5a 100644
--- a/modules/Emails/actions/CheckServerInfo.php
+++ b/modules/Emails/actions/CheckServerInfo.php
@@ -16,7 +16,7 @@ class Emails_CheckServerInfo_Action extends Vtiger_Action_Controller {
$currentUserPriviligesModel = Users_Privileges_Model::getCurrentUserPrivilegesModel();
if(!$currentUserPriviligesModel->hasModulePermission($moduleModel->getId())) {
- throw new AppException(vtranslate($moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
+ throw new AppException(vtranslate($moduleName, $moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
}
}
diff --git a/modules/Emails/views/MassSaveAjax.php b/modules/Emails/views/MassSaveAjax.php
index b90a5ebc4660ab0281241f01578752c1465f96e0..9478dba2f9c68b198980042ca72910661d79244e 100644
--- a/modules/Emails/views/MassSaveAjax.php
+++ b/modules/Emails/views/MassSaveAjax.php
@@ -18,7 +18,7 @@ class Emails_MassSaveAjax_View extends Vtiger_Footer_View {
$moduleName = $request->getModule();
if (!Users_Privileges_Model::isPermitted($moduleName, 'Save')) {
- throw new AppException(vtranslate($moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
+ throw new AppException(vtranslate($moduleName, $moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
}
}
diff --git a/modules/PriceBooks/actions/ProductListPrice.php b/modules/PriceBooks/actions/ProductListPrice.php
index dd1fb4298b87df0696c924c2c39ba5686509b83a..d5c6734d68975304057616c367507922a4e44f73 100644
--- a/modules/PriceBooks/actions/ProductListPrice.php
+++ b/modules/PriceBooks/actions/ProductListPrice.php
@@ -16,7 +16,7 @@ class PriceBooks_ProductListPrice_Action extends Vtiger_Action_Controller {
$currentUserPriviligesModel = Users_Privileges_Model::getCurrentUserPrivilegesModel();
if(!$currentUserPriviligesModel->hasModulePermission($moduleModel->getId())) {
- throw new AppException(vtranslate($moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
+ throw new AppException(vtranslate($moduleName, $moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
}
}
diff --git a/modules/PriceBooks/views/ListPriceUpdate.php b/modules/PriceBooks/views/ListPriceUpdate.php
index 4393c91683fc64cf29062567bcece598a3e771ac..c52d16e00d89bd24fe28fd8a5b66d39b1390a8b6 100644
--- a/modules/PriceBooks/views/ListPriceUpdate.php
+++ b/modules/PriceBooks/views/ListPriceUpdate.php
@@ -16,7 +16,7 @@ class PriceBooks_ListPriceUpdate_View extends Vtiger_View_Controller {
$currentUserPriviligesModel = Users_Privileges_Model::getCurrentUserPrivilegesModel();
if(!$currentUserPriviligesModel->hasModulePermission($moduleModel->getId())) {
- throw new AppException(vtranslate($moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
+ throw new AppException(vtranslate($moduleName, $moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
}
}
diff --git a/modules/Products/actions/SubProducts.php b/modules/Products/actions/SubProducts.php
index eee711b8ade693700ce1fb74608e9e936b169584..b62c686c5458b0a497daa4e10e6e39f0667e4c2b 100644
--- a/modules/Products/actions/SubProducts.php
+++ b/modules/Products/actions/SubProducts.php
@@ -16,7 +16,7 @@ class Products_SubProducts_Action extends Vtiger_Action_Controller {
$currentUserPriviligesModel = Users_Privileges_Model::getCurrentUserPrivilegesModel();
if(!$currentUserPriviligesModel->hasModulePermission($moduleModel->getId())) {
- throw new AppException(vtranslate($moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
+ throw new AppException(vtranslate($moduleName, $moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
}
}
diff --git a/modules/Products/views/SubProductQuantityUpdate.php b/modules/Products/views/SubProductQuantityUpdate.php
index 63f4e1848b0199583536ed8da2cf38341d726f32..4f3b36b2fd15cc3345807c24e429d90aebdaf859 100644
--- a/modules/Products/views/SubProductQuantityUpdate.php
+++ b/modules/Products/views/SubProductQuantityUpdate.php
@@ -16,7 +16,7 @@ class Products_SubProductQuantityUpdate_View extends Vtiger_View_Controller {
$currentUserPriviligesModel = Users_Privileges_Model::getCurrentUserPrivilegesModel();
if (!$currentUserPriviligesModel->hasModulePermission($moduleModel->getId())) {
- throw new AppException(vtranslate($moduleName) . ' ' . vtranslate('LBL_NOT_ACCESSIBLE'));
+ throw new AppException(vtranslate($moduleName, $moduleName) . ' ' . vtranslate('LBL_NOT_ACCESSIBLE'));
}
}
diff --git a/modules/PurchaseOrder/actions/CompanyDetails.php b/modules/PurchaseOrder/actions/CompanyDetails.php
index d9c623939e7a228d5d9a2953f4d21da6855910ff..942b374c355133b15ffa663d8daadd8923f6508b 100644
--- a/modules/PurchaseOrder/actions/CompanyDetails.php
+++ b/modules/PurchaseOrder/actions/CompanyDetails.php
@@ -16,7 +16,7 @@ class PurchaseOrder_CompanyDetails_Action extends Vtiger_Action_Controller {
$currentUserPriviligesModel = Users_Privileges_Model::getCurrentUserPrivilegesModel();
if(!$currentUserPriviligesModel->hasModulePermission($moduleModel->getId())) {
- throw new AppException(vtranslate($moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
+ throw new AppException(vtranslate($moduleName, $moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
}
}
diff --git a/modules/Reports/views/ChartDetail.php b/modules/Reports/views/ChartDetail.php
index 93ea9239f613829b94efd915c3e9411823250ec1..5ac9fd1aa18dfd5645676547c7f489798ea358a1 100644
--- a/modules/Reports/views/ChartDetail.php
+++ b/modules/Reports/views/ChartDetail.php
@@ -187,6 +187,19 @@ class Reports_ChartDetail_View extends Vtiger_Index_View {
"modules.$moduleName.resources.ChartEdit2",
"modules.$moduleName.resources.ChartEdit3",
"modules.$moduleName.resources.ChartDetail",
+ '~/libraries/jquery/gridster/jquery.gridster.min.js',
+ '~/libraries/jquery/jqplot/jquery.jqplot.min.js',
+ '~/libraries/jquery/jqplot/plugins/jqplot.canvasTextRenderer.min.js',
+ '~/libraries/jquery/jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js',
+ '~/libraries/jquery/jqplot/plugins/jqplot.pieRenderer.min.js',
+ '~/libraries/jquery/jqplot/plugins/jqplot.barRenderer.min.js',
+ '~/libraries/jquery/jqplot/plugins/jqplot.categoryAxisRenderer.min.js',
+ '~/libraries/jquery/jqplot/plugins/jqplot.pointLabels.min.js',
+ '~/libraries/jquery/jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js',
+ '~/libraries/jquery/jqplot/plugins/jqplot.funnelRenderer.min.js',
+ '~/libraries/jquery/jqplot/plugins/jqplot.barRenderer.min.js',
+ '~/libraries/jquery/jqplot/plugins/jqplot.logAxisRenderer.min.js',
+ '~/libraries/jquery/VtJqplotInterface.js',
'~/libraries/jquery/vtchart.js',
);
diff --git a/modules/Settings/Vtiger/models/CompanyDetails.php b/modules/Settings/Vtiger/models/CompanyDetails.php
index 74a561a957dfff2c87064702ee420138930db209..fc4a38c8bd98c1da8b858d2e8250043560d4896d 100644
--- a/modules/Settings/Vtiger/models/CompanyDetails.php
+++ b/modules/Settings/Vtiger/models/CompanyDetails.php
@@ -30,6 +30,7 @@ class Settings_Vtiger_CompanyDetails_Model extends Settings_Vtiger_Module_Model
'phone' => 'text',
'fax' => 'text',
'website' => 'text',
+ 'vatid' => 'text'
);
var $companyBasicFields = array(
@@ -42,7 +43,8 @@ class Settings_Vtiger_CompanyDetails_Model extends Settings_Vtiger_Module_Model
'code' => 'text',
'country' => 'text',
'phone' => 'text',
- 'fax' => 'text'
+ 'fax' => 'text',
+ 'vatid' => 'text'
);
var $companySocialLinks = array(
diff --git a/modules/Settings/Vtiger/views/Extension.php b/modules/Settings/Vtiger/views/Extension.php
index 905bdeec564556760c55eacb78853b3839235753..b9a1223dd641b044a5583ae2536284631d7866d3 100644
--- a/modules/Settings/Vtiger/views/Extension.php
+++ b/modules/Settings/Vtiger/views/Extension.php
@@ -21,7 +21,7 @@ class Settings_Vtiger_Extension_View extends Settings_Vtiger_Index_View {
$userPrivilegesModel = Users_Privileges_Model::getCurrentUserPrivilegesModel();
$permission = $userPrivilegesModel->hasModulePermission($moduleModel->getId());
if (!$permission) {
- throw new AppException(vtranslate($moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
+ throw new AppException(vtranslate($moduleName, $moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
}
return true;
diff --git a/modules/Users/views/Login.php b/modules/Users/views/Login.php
index d2b012404cb8415e0b0a9abf5df5c092f8be7520..f7716eb4ea7fd6def67f693b4f42322de41bf33c 100644
--- a/modules/Users/views/Login.php
+++ b/modules/Users/views/Login.php
@@ -19,17 +19,12 @@ class Users_Login_View extends Vtiger_View_Controller {
}
function preProcess(Vtiger_Request $request, $display = true) {
- $loginUrl = VtigerConfig::getOD('LOGIN_URL');
- if(!empty($loginUrl)) {
- header('Location:' .$loginUrl);
- exit;
- }
-
$viewer = $this->getViewer($request);
$viewer->assign('PAGETITLE', $this->getPageTitle($request));
$viewer->assign('SCRIPTS',$this->getHeaderScripts($request));
$viewer->assign('STYLES',$this->getHeaderCss($request));
- if($display) {
+ $viewer->assign('LANGUAGE_STRINGS', array());
+ if ($display) {
$this->preProcessDisplay($request);
}
}
@@ -39,11 +34,9 @@ class Users_Login_View extends Vtiger_View_Controller {
$viewer->view('Login.tpl', 'Users');
}
- function postProcess(Vtiger_Request $request) {
- $moduleName = $request->getModule();
+ function postProcess(Vtiger_Request $request) {
+ $moduleName = $request->getModule();
$viewer = $this->getViewer($request);
- $currentUser = Users_Record_Model::getCurrentUserModel();
- $viewer->assign('ACTIVITY_REMINDER', $currentUser->getCurrentUserActivityReminderInSeconds());
$viewer->view('LoginFooter.tpl', $moduleName);
}
@@ -51,4 +44,16 @@ class Users_Login_View extends Vtiger_View_Controller {
$companyDetails = Vtiger_CompanyDetails_Model::getInstanceById();
return $companyDetails->get('organizationname');
}
+
+ function getHeaderScripts(Vtiger_Request $request){
+ $headerScriptInstances = parent::getHeaderScripts($request);
+
+ $jsFileNames = array(
+ 'modules.Vtiger.resources.List',
+ 'modules.Vtiger.resources.Popup',
+ );
+ $jsScriptInstances = $this->checkAndConvertJsScripts($jsFileNames);
+ $headerScriptInstances = array_merge($jsScriptInstances,$headerScriptInstances);
+ return $headerScriptInstances;
+ }
}
\ No newline at end of file
diff --git a/modules/Vtiger/actions/MassSave.php b/modules/Vtiger/actions/MassSave.php
index 4eb71f971f15899eb156748a8affdc8c9c5becf1..7ebd215891f0c7f327f6de0415041017b3c9d65f 100644
--- a/modules/Vtiger/actions/MassSave.php
+++ b/modules/Vtiger/actions/MassSave.php
@@ -16,7 +16,7 @@ class Vtiger_MassSave_Action extends Vtiger_Mass_Action {
$currentUserPriviligesModel = Users_Privileges_Model::getCurrentUserPrivilegesModel();
if(!$currentUserPriviligesModel->hasModuleActionPermission($moduleModel->getId(), 'Save')) {
- throw new AppException(vtranslate($moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
+ throw new AppException(vtranslate($moduleName, $moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
}
}
diff --git a/modules/Vtiger/views/Extension.php b/modules/Vtiger/views/Extension.php
index 92d9950a036933b2561b2404974b027651c414a2..97156b65a7a1dbea983dde67ea74d1e87fd96a5a 100644
--- a/modules/Vtiger/views/Extension.php
+++ b/modules/Vtiger/views/Extension.php
@@ -21,7 +21,7 @@ class Vtiger_Extension_View extends Vtiger_List_View {
$userPrivilegesModel = Users_Privileges_Model::getCurrentUserPrivilegesModel();
$permission = $userPrivilegesModel->hasModulePermission($moduleModel->getId());
if (!$permission) {
- throw new AppException(vtranslate($moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
+ throw new AppException(vtranslate($moduleName, $moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
}
return true;
diff --git a/modules/Vtiger/views/Popup.php b/modules/Vtiger/views/Popup.php
index bbe8b347532f0d700f139ad79b7d39123885b658..2185cbc1876194206fe4e8953513e2b8da77c5ed 100644
--- a/modules/Vtiger/views/Popup.php
+++ b/modules/Vtiger/views/Popup.php
@@ -18,7 +18,7 @@ class Vtiger_Popup_View extends Vtiger_Footer_View {
$currentUserPrivilegesModel = Users_Privileges_Model::getCurrentUserPrivilegesModel();
if(!$currentUserPrivilegesModel->hasModulePermission($moduleModel->getId())) {
- throw new AppException(vtranslate($moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
+ throw new AppException(vtranslate($moduleName, $moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
}
}
diff --git a/packages/vtiger/optional/Arabic_ar_ae.zip b/packages/vtiger/optional/Arabic_ar_ae.zip
index f13dae49a7d426a0fb6d847fe91f8421bcb9486b..d0dbc7879499ea40eb5ed0f6e7a25bdf72f5da86 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/BrazilianLanguagePack_bz_bz.zip b/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip
index a5240f652186f2550ddda6346708e7ce9899b0aa..b20ae7c46106a5458ee6e31eebf00e2a7f75def3 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 4f9b16e0303a9d5cbdcce9aab1d60af7867421d6..164c87d600da623568119b7ec91dc54da9a77207 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/Deutsch.zip b/packages/vtiger/optional/Deutsch.zip
index 95458358ef555611153d8606da58d743b388496b..b5d63b2ed1b28fb796829c323040c966e9070044 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 137d1a1745631f7ca19bcc369c1d583da8439b74..1709ec32351f2b62dac5afa1114eacb7fe26840a 100644
Binary files a/packages/vtiger/optional/Dutch.zip and b/packages/vtiger/optional/Dutch.zip differ
diff --git a/packages/vtiger/optional/French.zip b/packages/vtiger/optional/French.zip
index c5525d4c8d6acaf39bdde945a93617c261acefb1..0e8d338b14bf181284f37c48bb02d05e58a0c074 100644
Binary files a/packages/vtiger/optional/French.zip and b/packages/vtiger/optional/French.zip differ
diff --git a/packages/vtiger/optional/Hungarian.zip b/packages/vtiger/optional/Hungarian.zip
index afd8d006ecc3e9905334d476de57631416f2dd10..ba30729ce9fc6454371d47f40ab079636df6b885 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 c8622be8729966348bfd22bb7edea121c81e616c..ebb81045d4c00eea868c1f29470e04be80c05578 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 cf8e6b42f34c97df2f749820f1436f124c0fd1f9..68eae7991a94e5423b5f11d1851f111dcce8ea95 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 a1aadfc0c89899d354072daf8f9067800ba711a0..ca8f2eeef4ad0bc476360bca7df182e2497a3346 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 41142f7e9a43f2bcc060ff87f78c59bddb855b3c..cd2b1cb7c4f770df5d27cab679dd815703fb6fd9 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 f4328db0332d7aed5c7e0eb2d4c79d31797b4141..e0c3fbc5bd31555c3fff35e39f9226bb2ace81d4 100644
Binary files a/packages/vtiger/optional/Projects.zip and b/packages/vtiger/optional/Projects.zip differ
diff --git a/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip b/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip
index 63e759a9c99fa2a86f1c8a106b3b83101cd38ac3..3978137f32f84e9e925bc3804480d80ad9872578 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 4a22d50258fb068abbeaa707c1d51a6d25235220..6838493f16a7c28b1187cba35d4936d4bc681885 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 6699319451ba30280908b83051cbd9f842a1cb26..12b3640debe440698ab53d64d60b7d7cbf1209fd 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 4942fe15777f9e4d3453d5f55850b869665526d2..9b09955f45fd4d72cabf7371952a7ad02349e5c8 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 97c330cb0f9e06395ff4c679c8740e6253591585..fcd812d8a03909fe68a7b39399baa2350007ede6 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 8229eb93d2e4ab25bd6069881704fa50b9c33d29..f81aae0f491b623343c0621b9a89c380af97ec7f 100644
Binary files a/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip and b/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip differ
diff --git a/pkg/vtiger/modules/ModComments/modules/ModComments/actions/MassSaveAjax.php b/pkg/vtiger/modules/ModComments/modules/ModComments/actions/MassSaveAjax.php
index 7b4767d48eaaa0413426bbe93da105f04355afbf..df821ad16d310a24a2d90ce5d00fc2807d8a0976 100644
--- a/pkg/vtiger/modules/ModComments/modules/ModComments/actions/MassSaveAjax.php
+++ b/pkg/vtiger/modules/ModComments/modules/ModComments/actions/MassSaveAjax.php
@@ -16,7 +16,7 @@ class ModComments_MassSaveAjax_Action extends Vtiger_Mass_Action {
$currentUserPriviligesModel = Users_Privileges_Model::getCurrentUserPrivilegesModel();
if(!$currentUserPriviligesModel->hasModuleActionPermission($moduleModel->getId(), 'Save')) {
- throw new AppException(vtranslate($moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
+ throw new AppException(vtranslate($moduleName, $moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
}
}
diff --git a/pkg/vtiger/modules/Projects/Project/templates/SummaryWidgets.tpl b/pkg/vtiger/modules/Projects/Project/templates/SummaryWidgets.tpl
index f1861c26c10568ed2f1f4b4fdcb99ed341b84992..c50ff89603ff11c1c893c69986e44be566019c5e 100644
--- a/pkg/vtiger/modules/Projects/Project/templates/SummaryWidgets.tpl
+++ b/pkg/vtiger/modules/Projects/Project/templates/SummaryWidgets.tpl
@@ -18,7 +18,7 @@
{include file=$FILENAME|vtemplate_path:$MODULE RELATED_RECORDS=$RELATED_RECORDS}
{else}
<div class="summaryWidgetContainer">
- <p class="textAlignCenter">{vtranslate('LBL_NO_RELATED',$MODULE)} {vtranslate($RELATED_MODULE)}</p>
+ <p class="textAlignCenter">{vtranslate('LBL_NO_RELATED',$MODULE)} {vtranslate($RELATED_MODULE, $RELATED_MODULE)}</p>
</div>
{/if}
{/strip}
\ No newline at end of file
diff --git a/pkg/vtiger/modules/SMSNotifier/modules/SMSNotifier/actions/CheckServerInfo.php b/pkg/vtiger/modules/SMSNotifier/modules/SMSNotifier/actions/CheckServerInfo.php
index e3749075b9388c553240e6d61920de43a732e8ee..4a6eadf87da2f18fd9f28e799af158bf31811c42 100644
--- a/pkg/vtiger/modules/SMSNotifier/modules/SMSNotifier/actions/CheckServerInfo.php
+++ b/pkg/vtiger/modules/SMSNotifier/modules/SMSNotifier/actions/CheckServerInfo.php
@@ -16,7 +16,7 @@ class SMSNotifier_CheckServerInfo_Action extends Vtiger_Action_Controller {
$currentUserPriviligesModel = Users_Privileges_Model::getCurrentUserPrivilegesModel();
if(!$currentUserPriviligesModel->hasModulePermission($moduleModel->getId())) {
- throw new AppException(vtranslate($moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
+ throw new AppException(vtranslate($moduleName, $moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
}
}
diff --git a/pkg/vtiger/modules/SMSNotifier/modules/SMSNotifier/actions/MassSaveAjax.php b/pkg/vtiger/modules/SMSNotifier/modules/SMSNotifier/actions/MassSaveAjax.php
index 58843bd937ad274735550891db79a394f4457553..a03a9ae4b5f45336fb2b8bd65289eeae33184889 100644
--- a/pkg/vtiger/modules/SMSNotifier/modules/SMSNotifier/actions/MassSaveAjax.php
+++ b/pkg/vtiger/modules/SMSNotifier/modules/SMSNotifier/actions/MassSaveAjax.php
@@ -16,7 +16,7 @@ class SMSNotifier_MassSaveAjax_Action extends Vtiger_Mass_Action {
$currentUserPriviligesModel = Users_Privileges_Model::getCurrentUserPrivilegesModel();
if(!$currentUserPriviligesModel->hasModuleActionPermission($moduleModel->getId(), 'Save')) {
- throw new AppException(vtranslate($moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
+ throw new AppException(vtranslate($moduleName, $moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
}
}
diff --git a/pkg/vtiger/modules/SMSNotifier/modules/SMSNotifier/views/CheckStatus.php b/pkg/vtiger/modules/SMSNotifier/modules/SMSNotifier/views/CheckStatus.php
index 6aab34f2e06db5c98cd005ca121fc2091e648235..e2a3e5b8af45b848438afa36a518ceb471b42696 100644
--- a/pkg/vtiger/modules/SMSNotifier/modules/SMSNotifier/views/CheckStatus.php
+++ b/pkg/vtiger/modules/SMSNotifier/modules/SMSNotifier/views/CheckStatus.php
@@ -14,7 +14,7 @@ class SMSNotifier_CheckStatus_View extends Vtiger_IndexAjax_View {
$moduleName = $request->getModule();
if(!Users_Privileges_Model::isPermitted($moduleName, 'DetailView', $request->get('record'))) {
- throw new AppException(vtranslate($moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
+ throw new AppException(vtranslate($moduleName, $moduleName).' '.vtranslate('LBL_NOT_ACCESSIBLE'));
}
}
diff --git a/pkg/vtiger/translations/Arabic_ar_ae/modules/Settings/Vtiger.php b/pkg/vtiger/translations/Arabic_ar_ae/modules/Settings/Vtiger.php
index e58e67ef164b1cad6ed46ba5161dfd814eb6c09c..ac9a6e790115f1479bf73d055daa865764588525 100644
--- a/pkg/vtiger/translations/Arabic_ar_ae/modules/Settings/Vtiger.php
+++ b/pkg/vtiger/translations/Arabic_ar_ae/modules/Settings/Vtiger.php
@@ -269,6 +269,7 @@ $languageStrings = array(
'phone' => 'Phone',
'fax' => 'Fax',
'website' => 'Website',
+ 'vatid' => 'VAT ID',
'facebook' => 'الÙيسبوك',
'twitter' => 'تغريد',
'linkedin' => 'ينكدين',
@@ -378,8 +379,8 @@ $languageStrings = array(
'LBL_TALLY' => 'تالي',
'LBL_SHOPPINGCART' => 'ShoppingCart',
-);
+);
$jsLanguageStrings = array(
'JS_PLEASE_SELECT_ATLEAST_ONE_MEMBER_FOR_A_GROUP' => 'Please select atleast one member for a group',
'JS_GROUP_DELETED_SUCCESSFULLY' => 'Group deleted successfully',
diff --git a/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Settings/Vtiger.php b/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Settings/Vtiger.php
index 0a1a59e9bb63ffdb0d282580f9a31b46edb43727..de64a90923fe3ab94cba33a8ebb6a66b3b02ad6e 100644
--- a/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Settings/Vtiger.php
+++ b/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Settings/Vtiger.php
@@ -171,6 +171,7 @@ $languageStrings = array(
'phone' => 'Phone' , // TODO: Review
'fax' => 'Fax' , // TODO: Review
'website' => 'Website' , // TODO: Review
+ 'vatid' => 'IVA ID',
'facebook' => 'Facebook' ,
'twitter' => 'Twitter' ,
'linkedin' => 'LinkedIn' ,
diff --git a/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Settings/Vtiger.php b/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Settings/Vtiger.php
index d23c0cdca9d0c18f0966db3f1f15da83a2466b43..6294c316c47e8f3876f8f1dc7278b61f6a5c19c5 100644
--- a/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Settings/Vtiger.php
+++ b/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Settings/Vtiger.php
@@ -222,6 +222,7 @@ $languageStrings = array(
'phone' => 'Phone' , // TODO: Review
'fax' => 'Fax' , // TODO: Review
'website' => 'Website' , // TODO: Review
+ 'vatid' => 'VAT ID',
'facebook' => 'Facebook' ,
'twitter' => 'Twitter' ,
'linkedin' => 'LinkedIn' ,
diff --git a/pkg/vtiger/translations/Deutsch/modules/Settings/Vtiger.php b/pkg/vtiger/translations/Deutsch/modules/Settings/Vtiger.php
index e7c9ed1bb1892344642e9e53d575ffcd050329e7..9ff956a92585af288204110d3568975e457b5609 100644
--- a/pkg/vtiger/translations/Deutsch/modules/Settings/Vtiger.php
+++ b/pkg/vtiger/translations/Deutsch/modules/Settings/Vtiger.php
@@ -219,6 +219,7 @@ $languageStrings = array(
'phone' => 'Phone' ,
'fax' => 'Fax' ,
'website' => 'Website' ,
+ 'vatid' => 'Umsatzsteuer-ID',
'facebook' => 'Facebook' ,
'twitter' => 'Twitter' ,
'linkedin' => 'LinkedIn' ,
diff --git a/pkg/vtiger/translations/Dutch/modules/Settings/Vtiger.php b/pkg/vtiger/translations/Dutch/modules/Settings/Vtiger.php
index 2f90afdd620990ba4808e085c2c1d49767ba5e09..d54a703ea7aa5ef61aeb9b18c11c664c321fb8c3 100644
--- a/pkg/vtiger/translations/Dutch/modules/Settings/Vtiger.php
+++ b/pkg/vtiger/translations/Dutch/modules/Settings/Vtiger.php
@@ -220,6 +220,7 @@ $languageStrings = array(
'phone' => 'Phone' , // TODO: Review
'fax' => 'Fax' , // TODO: Review
'website' => 'Website' , // TODO: Review
+ 'vatid' => 'BTW-nummer',
'facebook' => 'Facebook' ,
'twitter' => 'Twitter' ,
'linkedin' => 'LinkedIn' ,
diff --git a/pkg/vtiger/translations/French/modules/Settings/Vtiger.php b/pkg/vtiger/translations/French/modules/Settings/Vtiger.php
index 504a6ad73f1717bd5ac23fa27360dc7eda0a0646..05b78d42bf3829303e66e5f71a571a8c5e758ee9 100644
--- a/pkg/vtiger/translations/French/modules/Settings/Vtiger.php
+++ b/pkg/vtiger/translations/French/modules/Settings/Vtiger.php
@@ -220,6 +220,7 @@ $languageStrings = array(
'phone' => 'Phone' , // TODO: Review
'fax' => 'Fax' , // TODO: Review
'website' => 'Website' , // TODO: Review
+ 'vatid' => 'TVA ID',
'facebook' => 'Facebook' ,
'twitter' => 'Twitter' ,
'linkedin' => 'LinkedIn' ,
diff --git a/pkg/vtiger/translations/Hungarian/modules/Settings/Vtiger.php b/pkg/vtiger/translations/Hungarian/modules/Settings/Vtiger.php
index b9f6e15f7b467dcbb5394e50cfef87d528c40cae..344b02f42d221d1b5a12be2ba38180e31314b314 100644
--- a/pkg/vtiger/translations/Hungarian/modules/Settings/Vtiger.php
+++ b/pkg/vtiger/translations/Hungarian/modules/Settings/Vtiger.php
@@ -222,6 +222,7 @@ $languageStrings = array(
'phone' => 'Phone' , // TODO: Review
'fax' => 'Fax' , // TODO: Review
'website' => 'Website' , // TODO: Review
+ 'vatid' => 'adószámot',
'facebook' => 'Facebook' ,
'twitter' => 'Twitter' ,
'linkedin' => 'LinkedIn' ,
diff --git a/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Settings/Vtiger.php b/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Settings/Vtiger.php
index bf1eb25d5460e1e757c73df62a06b2837831106d..c7396d5a2933dfc34009a05d327cf6642057d24f 100644
--- a/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Settings/Vtiger.php
+++ b/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Settings/Vtiger.php
@@ -220,6 +220,7 @@ $languageStrings = array(
'phone' => 'Phone' , // TODO: Review
'fax' => 'Fax' , // TODO: Review
'website' => 'Website' , // TODO: Review
+ 'vatid' => 'partita Iva',
'facebook' => 'Facebook' ,
'twitter' => 'Twitter' ,
'linkedin' => 'LinkedIn' ,
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/Vtiger.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/Vtiger.php
index bb57f695105ca74accbca3c1c1eb426b01057f99..bb23118ff904fd5f77a98f224a440681551126d4 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/Vtiger.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Settings/Vtiger.php
@@ -220,6 +220,7 @@ $languageStrings = array(
'phone' => 'Phone' , // TODO: Review
'fax' => 'Fax' , // TODO: Review
'website' => 'Website' , // TODO: Review
+ 'vatid' => 'ID de IVA',
'facebook' => 'Facebook' ,
'twitter' => 'Twitter' ,
'linkedin' => 'LinkedIn' ,
diff --git a/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Settings/Vtiger.php b/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Settings/Vtiger.php
index bad5b285fc90e2a0553dfac11acea811020d5642..2af20809fff07824b800103e995bddaadf314a51 100644
--- a/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Settings/Vtiger.php
+++ b/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Settings/Vtiger.php
@@ -329,6 +329,7 @@ $languageStrings = array(
'country' => 'Kraj',
'fax' => 'Faks',
'website' => 'Strona',
+ 'vatid' => 'NIP',
'LBL_IMAGE_CORRUPTED' => 'Wykryty wirus lub Przesłany plik jest uszkodzony',
'LBL_LOGO_RECOMMENDED_MESSAGE' => 'Dozwolony rozmiar 150X40 pikseli (format .jpeg, .jpg, .png, .gif, .pjpeg, .x-png).',
'LBL_COMPANY_INFORMATION' => 'Informacje O Firmie',
@@ -377,8 +378,8 @@ $languageStrings = array(
'LBL_TALLY' => 'Tully',
'LBL_SHOPPINGCART' => 'Fura sam',
-);
+);
$jsLanguageStrings = array(
'JS_DEFAULT_TAX_MODE_SET_AS' => 'Tryb domyślny ustawiony jako podatek ',
'JS_SELECT_SIMPLE_TAXES' => 'Wybierz proste podatki',
diff --git a/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Settings/Vtiger.php b/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Settings/Vtiger.php
index 7fb421ed72d7fdee80982054fbda2e93e1d77a79..5f7cb87fc9fb23d2daa3365d5306118678497d4c 100644
--- a/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Settings/Vtiger.php
+++ b/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Settings/Vtiger.php
@@ -220,6 +220,7 @@ $languageStrings = array(
'phone' => 'Phone' , // TODO: Review
'fax' => 'Fax' , // TODO: Review
'website' => 'Website' , // TODO: Review
+ 'vatid' => 'Cod TVA',
'facebook' => 'Facebook' ,
'twitter' => 'Twitter' ,
'linkedin' => 'LinkedIn' ,
diff --git a/pkg/vtiger/translations/Russian/modules/Settings/Vtiger.php b/pkg/vtiger/translations/Russian/modules/Settings/Vtiger.php
index 05e120af3cc1677104bb9c838ab4542e00caf9c4..9140ce1ef20b5b035e36b930ac426f66ce537848 100644
--- a/pkg/vtiger/translations/Russian/modules/Settings/Vtiger.php
+++ b/pkg/vtiger/translations/Russian/modules/Settings/Vtiger.php
@@ -220,6 +220,7 @@ $languageStrings = array(
'phone' => 'Тел.' , // KEY 5.x: Phone
'fax' => 'ФакÑ' , // KEY 5.x: LBL_ORGANIZATION_FAX
'website' => 'ВебÑайт' , // KEY 5.x: LBL_ORGANIZATION_WEBSITE
+ 'vatid' => 'Код плательщика ÐДС',
'facebook' => 'Facebook' ,
'twitter' => 'Twitter' ,
'linkedin' => 'LinkedIn' ,
diff --git a/pkg/vtiger/translations/Spanish/modules/Settings/Vtiger.php b/pkg/vtiger/translations/Spanish/modules/Settings/Vtiger.php
index 21f0a18f07f8bdcfde6dbdf3581dd6fcd38dce26..a820bbfa299f4ee1a23728d62cd5f5fea0d3b891 100644
--- a/pkg/vtiger/translations/Spanish/modules/Settings/Vtiger.php
+++ b/pkg/vtiger/translations/Spanish/modules/Settings/Vtiger.php
@@ -257,6 +257,7 @@ $languageStrings = array(
'phone' => 'Teléfono',
'fax' => 'Fax',
'website' => 'Website',
+ 'vatid' => 'ID de IVA',
'facebook' => 'Facebook',
'twitter' => 'Twitter',
'linkedin' => 'LinkedIn',
@@ -364,8 +365,8 @@ $languageStrings = array(
'LBL_TALLY' => 'Tally',
'LBL_SHOPPINGCART' => 'ShoppingCart',
-);
+);
$jsLanguageStrings = array(
'JS_PLEASE_SELECT_ATLEAST_ONE_MEMBER_FOR_A_GROUP' => 'Selecciona al menos un miembro para el grupo',
'JS_GROUP_DELETED_SUCCESSFULLY' => 'Se ha eliminado el grupo',
diff --git a/pkg/vtiger/translations/Sweden_sv_se/modules/Settings/Vtiger.php b/pkg/vtiger/translations/Sweden_sv_se/modules/Settings/Vtiger.php
index fc13df7a6a2fad266419b83dfdeba7569b0bc4c8..02d8104049705b1cc8790eb4af4bf876f0824e40 100755
--- a/pkg/vtiger/translations/Sweden_sv_se/modules/Settings/Vtiger.php
+++ b/pkg/vtiger/translations/Sweden_sv_se/modules/Settings/Vtiger.php
@@ -264,6 +264,7 @@ $languageStrings = array(
'phone' => 'Telefon',
'fax' => 'Fax',
'website' => 'Hemsida',
+ 'vatid' => 'Momsregistreringsnummer',
'facebook' => 'Facebook',
'twitter' => 'Twitter',
'linkedin' => 'LinkedIn',
@@ -373,8 +374,8 @@ $languageStrings = array(
'LBL_TALLY' => 'Stämmer',
'LBL_SHOPPINGCART' => 'Varukorg',
-);
+);
$jsLanguageStrings = array(
'JS_PLEASE_SELECT_ATLEAST_ONE_MEMBER_FOR_A_GROUP' => 'Vänligen välj minst en medlem för en grupp',
'JS_GROUP_DELETED_SUCCESSFULLY' => 'Gruppen har raderats framgångsrikt',
diff --git a/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Settings/Vtiger.php b/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Settings/Vtiger.php
index 2787000f010b1bc3e03a8dc2c9329729e2425e0f..fee7412b1b66c07eb1ead83e1c698f060fe8552d 100644
--- a/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Settings/Vtiger.php
+++ b/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Settings/Vtiger.php
@@ -220,6 +220,7 @@ $languageStrings = array(
'phone' => 'Phone' , // TODO: Review
'fax' => 'Fax' , // TODO: Review
'website' => 'Website' , // TODO: Review
+ 'vatid' => 'KDV KimliÄŸi',
'facebook' => 'Facebook' ,
'twitter' => 'Twitter' ,
'linkedin' => 'LinkedIn' ,