diff --git a/languages/de_de/Vtiger.php b/languages/de_de/Vtiger.php index a359b0ddfc73dc47cc1bfbc7a80de91b90ba1479..fa5fcc762f94bf9a414c1bec100ee924fe04a139 100644 --- a/languages/de_de/Vtiger.php +++ b/languages/de_de/Vtiger.php @@ -720,8 +720,7 @@ $jsLanguageStrings = array( 'JS_PBX_OUTGOING_FAILURE'=>'Anruf fehlgeschlagen', 'JS_PBX_FILL_ALL_FIELDS'=>'Bitte füllen Sie alle Felder', // ends - - //Edit view mode Translations - 'JS_CHANGES_WILL_BE_LOST' => 'Ihre Änderungen gehen verloren!', - + //Edit view mode Translations + 'JS_CHANGES_WILL_BE_LOST' => 'Ihre Änderungen gehen verloren!', + 'JS_BASE_CURRENCY_CHANGED_TO_DISABLE_CURRENCY' => 'Basiswährung muss geändert werden, um zu deaktivieren', ); \ No newline at end of file diff --git a/languages/en_gb/Vtiger.php b/languages/en_gb/Vtiger.php index 96058301afa2052d3a4606bf15a277dbdc7a7439..5d82597187827886cdc64b525a6bae108afeecfc 100644 --- a/languages/en_gb/Vtiger.php +++ b/languages/en_gb/Vtiger.php @@ -725,7 +725,8 @@ $jsLanguageStrings = array( 'JS_PBX_OUTGOING_FAILURE'=>'Call Failed', 'JS_PBX_FILL_ALL_FIELDS'=>'Please fill all the fields', // ends - - //Edit view mode Translations - 'JS_CHANGES_WILL_BE_LOST' => 'Your Changes Will Be Lost!', + + //Edit view mode Translations + 'JS_CHANGES_WILL_BE_LOST' => 'Your Changes Will Be Lost!', + 'JS_BASE_CURRENCY_CHANGED_TO_DISABLE_CURRENCY' => 'Base Currency has to be changed to disable ', ); \ No newline at end of file diff --git a/languages/en_us/Vtiger.php b/languages/en_us/Vtiger.php index 902afa0d8b5087aeb018c33f8f752f9b43a43345..30d47c7c2c16f905d5b0477bb3ce788197579c32 100644 --- a/languages/en_us/Vtiger.php +++ b/languages/en_us/Vtiger.php @@ -728,6 +728,7 @@ $jsLanguageStrings = array( 'JS_PLEASE_SELECT_ATLEAST_ONE_MANDATORY_FIELD' => 'Please select at least one Mandatory Field', 'JS_PLEASE_SELECT_ATLEAST_ONE_OPTION' => 'Please select at least one option', 'JS_PLEASE_SELECT_BASE_CURRENCY_FOR_PRODUCT' => 'Please select base currency for product', + 'JS_BASE_CURRENCY_CHANGED_TO_DISABLE_CURRENCY' => 'Base Currency has to be changed to disable ', 'JS_PLEASE_SELECT_ONE_FIELD_FOR_MERGE' => 'Select at least one field for merge criteria', 'JS_PLEASE_SELECT_ONE_RECORD' => 'Please select at least one record', 'JS_PLEASE_SPLIT_FILE_AND_IMPORT_AGAIN' => 'Please split the file into smaller files and import again.', diff --git a/languages/es_es/Vtiger.php b/languages/es_es/Vtiger.php index c6c78d8b70c7e655fdcdfa8ada1cc18f033647fc..847cae8823af36c9f30ca33784c0599be796b46d 100644 --- a/languages/es_es/Vtiger.php +++ b/languages/es_es/Vtiger.php @@ -761,5 +761,6 @@ $jsLanguageStrings = array( // ends //Edit view mode Translations - 'JS_CHANGES_WILL_BE_LOST' => 'Sus cambios se perderán!', -); + 'JS_CHANGES_WILL_BE_LOST' => 'Sus cambios se perderán!', + 'JS_BASE_CURRENCY_CHANGED_TO_DISABLE_CURRENCY' => 'Moneda base tiene que ser cambiado para desactivar', +); \ No newline at end of file diff --git a/languages/es_mx/Vtiger.php b/languages/es_mx/Vtiger.php index 1176757c479d73e54c9261a373ae2758450a4464..71e07856c8aaf1d194530a8d26af37a2e1d96db4 100644 --- a/languages/es_mx/Vtiger.php +++ b/languages/es_mx/Vtiger.php @@ -722,4 +722,5 @@ $jsLanguageStrings = array( 'JS_PBX_OUTGOING_FAILURE'=>'Llamada fallida', 'JS_PBX_FILL_ALL_FIELDS'=>'Por favor rellene todos los campos', // ends - ); + 'JS_BASE_CURRENCY_CHANGED_TO_DISABLE_CURRENCY' => 'Moneda base tiene que ser cambiado para desactivar', +); \ No newline at end of file diff --git a/languages/fr_fr/Vtiger.php b/languages/fr_fr/Vtiger.php index 14d99853f87eaa24201de388100bcc4a635a25af..a20eb5d9135a3f266fa5ce49235067dce6025320 100644 --- a/languages/fr_fr/Vtiger.php +++ b/languages/fr_fr/Vtiger.php @@ -722,7 +722,8 @@ $jsLanguageStrings = array( 'JS_PBX_OUTGOING_FAILURE'=>"Échec de l'appel", 'JS_PBX_FILL_ALL_FIELDS'=>"S'il vous plaît remplir tous les champs", // ends - - //Edit view mode Translations - 'JS_CHANGES_WILL_BE_LOST' => 'Vos modifications seront perdues!', -); \ No newline at end of file + + //Edit view mode Translations + 'JS_CHANGES_WILL_BE_LOST' => 'Vos modifications seront perdues!', + 'JS_BASE_CURRENCY_CHANGED_TO_DISABLE_CURRENCY' => 'Devise de base doit être modifié pour désactiver', +); diff --git a/languages/hu_hu/Vtiger.php b/languages/hu_hu/Vtiger.php index 33c1c22824528e1b60d69834e56b983b0b3026f3..8ec7cb80cb9580e3617b49253c1794467094ae59 100644 --- a/languages/hu_hu/Vtiger.php +++ b/languages/hu_hu/Vtiger.php @@ -758,6 +758,7 @@ $jsLanguageStrings = array( 'JS_PLEASE_SELECT_ATLEAST_ONE_MANDATORY_FIELD' => 'Kérjük,hogy legalább egy KötelezÅ‘ mezÅ‘t válasszon ki', 'JS_PLEASE_SELECT_ATLEAST_ONE_OPTION' => 'Kérjük,hogy legalább egy lehetÅ‘séget válasszon ki', 'JS_PLEASE_SELECT_BASE_CURRENCY_FOR_PRODUCT' => 'Kérjük,hogy válasszon alap pénznemet a termékekhez', + 'JS_BASE_CURRENCY_CHANGED_TO_DISABLE_CURRENCY' => 'Bázisvaluta meg kell változtatni, hogy tiltsa', 'JS_PLEASE_SELECT_ONE_FIELD_FOR_MERGE' => 'Kérjük,hogy legalább egy mezÅ‘t válasszon ki az egyesÃtés feltételei végett', 'JS_PLEASE_SELECT_ONE_RECORD' => 'Kérjük,hogy legalább egy rekordot válasszon ki', 'JS_PLEASE_SPLIT_FILE_AND_IMPORT_AGAIN' => 'Kérjük,hogy szeletelje fel a fájlt kisebb részekre,majd importálja újból.', @@ -808,7 +809,7 @@ $jsLanguageStrings = array( 'SHOULD_BE_LESS_THAN_TODAY' => 'Ennek a mai nap elÅ‘ttinek kell lennie', 'SINGLE_Accounts' => 'Szervezet' , 'SINGLE_Contacts' => 'Kapcsolat' , - -//Edit view mode Translations - 'JS_CHANGES_WILL_BE_LOST' => 'A változtatások elvesznek!', + + //Edit view mode Translations + 'JS_CHANGES_WILL_BE_LOST' => 'A változtatások elvesznek!', ); \ No newline at end of file diff --git a/languages/it_it/Vtiger.php b/languages/it_it/Vtiger.php index 7e2ddd83d8f3c48efff0cbdcee8bf9881e11ef3f..78586097ba27969e4427efd7ec2d174bca1fc763 100644 --- a/languages/it_it/Vtiger.php +++ b/languages/it_it/Vtiger.php @@ -722,8 +722,8 @@ $jsLanguageStrings = array( 'JS_PBX_OUTGOING_FAILURE'=>'Chiamata non riuscita', 'JS_PBX_FILL_ALL_FIELDS'=>'Si prega di compilare tutti i campi', // ends - // - //Edit view mode Translations - 'JS_CHANGES_WILL_BE_LOST' => 'Le tue modifiche saranno perse!', - + + //Edit view mode Translations + 'JS_CHANGES_WILL_BE_LOST' => 'Le tue modifiche saranno perse!', + 'JS_BASE_CURRENCY_CHANGED_TO_DISABLE_CURRENCY' => 'Valuta di base deve essere cambiato per disabilitare', ); diff --git a/languages/nl_nl/Vtiger.php b/languages/nl_nl/Vtiger.php index 7c30c9ec7ab0a9381fe175e9ea722748c079d0ff..1bb48b0b262e129bd310d9cec16cb4e833ba978b 100644 --- a/languages/nl_nl/Vtiger.php +++ b/languages/nl_nl/Vtiger.php @@ -714,7 +714,8 @@ $jsLanguageStrings = array( 'JS_PBX_OUTGOING_FAILURE'=>'Bel mislukt', 'JS_PBX_FILL_ALL_FIELDS'=>'Gelieve alle velden in te vullen', // ends - // - //Edit view mode Translations - 'JS_CHANGES_WILL_BE_LOST' => 'Uw wijzigingen zullen verloren gaan!', + + //Edit view mode Translations + 'JS_CHANGES_WILL_BE_LOST' => 'Uw wijzigingen zullen verloren gaan!', + 'JS_BASE_CURRENCY_CHANGED_TO_DISABLE_CURRENCY' => 'Basisvaluta moet worden gewijzigd om uit te schakelen', ); diff --git a/languages/pl_pl/Vtiger.php b/languages/pl_pl/Vtiger.php index 2ad832845cbb4c99956407fcdc7779513fdde4ea..f19bcf88199f5fd1d69b667dc36d802c958f50ca 100644 --- a/languages/pl_pl/Vtiger.php +++ b/languages/pl_pl/Vtiger.php @@ -628,7 +628,7 @@ $languageStrings = array( 'LBL_MERGE' => 'ÅÄ…czyć', 'LBL_CONVERSION_RATE' => 'Conversion Rate', //TOreview - + ); $jsLanguageStrings = array( @@ -722,4 +722,5 @@ $jsLanguageStrings = array( 'JS_PBX_OUTGOING_FAILURE'=>'PoÅ‚Ä…czenie nie powiodÅ‚o siÄ™', 'JS_PBX_FILL_ALL_FIELDS'=>'ProszÄ™ wypeÅ‚nić wszystkie pola', // ends - ); + 'JS_BASE_CURRENCY_CHANGED_TO_DISABLE_CURRENCY' => 'Waluta bazowa musi zostać zmieniony, aby wyÅ‚Ä…czyć', +); \ No newline at end of file diff --git a/languages/pt_br/Vtiger.php b/languages/pt_br/Vtiger.php index 14efb30699fb94c27f4ed6cae667b3a6be0af27f..b24ca7a441a110f3b08e678d8543ed9d7e2d04df 100644 --- a/languages/pt_br/Vtiger.php +++ b/languages/pt_br/Vtiger.php @@ -720,7 +720,8 @@ $jsLanguageStrings = array( 'JS_PBX_OUTGOING_FAILURE'=>'Ligação Perdida', 'JS_PBX_FILL_ALL_FIELDS'=>'Por favor, preencha todos os campos', // ends - - //Edit view mode Translations - 'JS_CHANGES_WILL_BE_LOST' => 'Suas alterações serão perdidas!', -); \ No newline at end of file + + //Edit view mode Translations + 'JS_CHANGES_WILL_BE_LOST' => 'Suas alterações serão perdidas!', + 'JS_BASE_CURRENCY_CHANGED_TO_DISABLE_CURRENCY' => 'Moeda Base tem que ser mudado para desativar', +); diff --git a/languages/ro_ro/Vtiger.php b/languages/ro_ro/Vtiger.php index a2fb64561678d65fded268e87a26dcdf1a25a8cd..de3b72217f2720a12fd068ed90c46877513273b0 100644 --- a/languages/ro_ro/Vtiger.php +++ b/languages/ro_ro/Vtiger.php @@ -722,7 +722,8 @@ $jsLanguageStrings = array( 'JS_PBX_OUTGOING_FAILURE'=>'Suna a eÈ™uat', 'JS_PBX_FILL_ALL_FIELDS'=>'Vă rugăm să completaÈ›i toate câmpurile', // ends - - //Edit view mode Translations - 'JS_CHANGES_WILL_BE_LOST' => 'Modificările dvs. se vor pierde!', + + //Edit view mode Translations + 'JS_CHANGES_WILL_BE_LOST' => 'Modificările dvs. se vor pierde!', + 'JS_BASE_CURRENCY_CHANGED_TO_DISABLE_CURRENCY' => 'Moneda de bază trebuie să fie schimbat pentru a dezactiva', ); diff --git a/languages/ru_ru/Vtiger.php b/languages/ru_ru/Vtiger.php index cfd3b1214969e90ce448a30f6a30d637fcbc6e42..44e2b9f72beb463d56d5097aabbe62c8f6fd0976 100644 --- a/languages/ru_ru/Vtiger.php +++ b/languages/ru_ru/Vtiger.php @@ -762,7 +762,8 @@ $jsLanguageStrings = array( 'LBL_SMS_MAX_CHARACTERS_ALLOWED' => 'МакÑимальные 160 Ñимволов разрешено Ð´Ð»Ñ Ñ‚ÐµÐºÑтового ÑообщениÑ', 'JS_VIEWNAME_ALERT' => 'МакÑимум 40 Ñимволов разрешены Ð´Ð»Ñ Ð¸Ð¼ÐµÐ½Ð¸ фильтра', 'JS_FUTURE_EVENT_CANNOT_BE_HELD' => 'Ðе может неÑти за будущее', - + //Edit view mode Translations - 'JS_CHANGES_WILL_BE_LOST' => 'Ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ потерÑны!', + 'JS_CHANGES_WILL_BE_LOST' => 'Ваши Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð±ÑƒÐ´ÑƒÑ‚ потерÑны!', + 'JS_BASE_CURRENCY_CHANGED_TO_DISABLE_CURRENCY' => 'Ð‘Ð°Ð·Ð¾Ð²Ð°Ñ Ð²Ð°Ð»ÑŽÑ‚Ð° должна быть изменена, чтобы отключить', ); diff --git a/languages/tr_tr/Vtiger.php b/languages/tr_tr/Vtiger.php index faa5d17a0554a8084c8178df3b4183f5d36583e3..87984d30e230c3ea858d65614e149ef5b9dd6763 100644 --- a/languages/tr_tr/Vtiger.php +++ b/languages/tr_tr/Vtiger.php @@ -720,7 +720,8 @@ $jsLanguageStrings = array( 'JS_PBX_OUTGOING_FAILURE'=>'ÇaÄŸrı BaÅŸarısız', 'JS_PBX_FILL_ALL_FIELDS'=>'Tüm alanları doldurunuz', // ends - + //Edit view mode Translations - 'JS_CHANGES_WILL_BE_LOST' => 'Sizin DeÄŸiÅŸiklikler Kayıp Will Be!', + 'JS_CHANGES_WILL_BE_LOST' => 'Sizin DeÄŸiÅŸiklikler Kayıp Will Be!', + 'JS_BASE_CURRENCY_CHANGED_TO_DISABLE_CURRENCY' => 'Baz Döviz devre dışı bırakmak için deÄŸiÅŸtirilmelidir', ); \ No newline at end of file diff --git a/layouts/vlayout/modules/Products/MoreCurrenciesList.tpl b/layouts/vlayout/modules/Products/MoreCurrenciesList.tpl index 043bfc869341103e4dfd4e8c4ec05be00cac0d18..23d573b20a3ebffe68a80c13f1f5bd3e636745ba 100644 --- a/layouts/vlayout/modules/Products/MoreCurrenciesList.tpl +++ b/layouts/vlayout/modules/Products/MoreCurrenciesList.tpl @@ -44,7 +44,7 @@ <td> <span class="row-fluid"> <span class="span8 alignBottom"> - <span class="pull-left">{$price.currencylabel|@getTranslatedCurrencyString} ({$price.currencysymbol})</span> + <span class="pull-left currencyName">{$price.currencylabel|@getTranslatedCurrencyString} ({$price.currencysymbol})</span> </span> <span class="span2"><input type="checkbox" name="cur_{$price.curid}_check" id="cur_{$price.curid}_check" class="small pull-right enableCurrency" {$check_value}></span> </span> diff --git a/layouts/vlayout/modules/Products/resources/Edit.js b/layouts/vlayout/modules/Products/resources/Edit.js index 36c39fd3a941c3cb5548ab9217ac173dbba6b3b9..e18aa368a98ce7cbf7202acfdb63141ee040e30c 100644 --- a/layouts/vlayout/modules/Products/resources/Edit.js +++ b/layouts/vlayout/modules/Products/resources/Edit.js @@ -179,13 +179,21 @@ Vtiger_Edit_Js("Products_Edit_Js",{ var calculatedPrice = price.toString().replace('.',unitPriceFieldData.decimalSeparator); jQuery('input.convertedPrice',parentRow).val(calculatedPrice) }else{ + var baseCurrency = jQuery('.baseCurrency', parentRow); + if (baseCurrency.is(':checked')) { + var currencyName = jQuery('.currencyName', parentRow).text(); + var params = { + 'type' : 'error', + 'title': app.vtranslate('JS_ERROR'), + 'text' : app.vtranslate('JS_BASE_CURRENCY_CHANGED_TO_DISABLE_CURRENCY') + '"' + currencyName + '"' + }; + Vtiger_Helper_Js.showPnotify(params); + elem.prop('checked', true); + return; + } jQuery('input',parentRow).attr('disabled', true); jQuery('input.enableCurrency',parentRow).removeAttr('disabled'); jQuery('button.currencyReset', parentRow).attr('disabled', 'disabled'); - var baseCurrency = jQuery('.baseCurrency', parentRow); - if(baseCurrency.is(':checked')){ - baseCurrency.removeAttr('checked'); - } } }) return this; @@ -256,8 +264,10 @@ Vtiger_Edit_Js("Products_Edit_Js",{ var multiCurrencyEditUI = jQuery('.multiCurrencyEditUI'); thisInstance.multiCurrencyContainer = multiCurrencyEditUI; thisInstance.calculateConversionRate(); - thisInstance.registerEventForEnableCurrency().registerEventForEnableBaseCurrency() - .registerEventForResetCurrency().triggerForBaseCurrencyCalc(); + thisInstance.registerEventForEnableCurrency(); + thisInstance.registerEventForEnableBaseCurrency(); + thisInstance.registerEventForResetCurrency(); + thisInstance.triggerForBaseCurrencyCalc(); } var moreCurrenciesContainer = jQuery('#moreCurrenciesContainer').find('.multiCurrencyEditUI'); var contentInsideForm = moreCurrenciesUi.find('.multiCurrencyContainer').html(); diff --git a/pkg/vtiger/translations/Arabic_ar_ae/modules/Vtiger.php b/pkg/vtiger/translations/Arabic_ar_ae/modules/Vtiger.php index 5fd18924d8d07e0efac13a724440a68fe90f0fc7..0cee9313f414f9f2cc9707099709d3b0dadaa689 100644 --- a/pkg/vtiger/translations/Arabic_ar_ae/modules/Vtiger.php +++ b/pkg/vtiger/translations/Arabic_ar_ae/modules/Vtiger.php @@ -961,7 +961,8 @@ $jsLanguageStrings = array( 'JS_PBX_OUTGOING_FAILURE'=>'استدعاء Ùشل', 'JS_PBX_FILL_ALL_FIELDS'=>'يرجى ملء جميع الØقول', // ends - - //No Tax exist - 'JS_LBL_NO_TAXES'=>'لا الضرائب', + + //No Tax exist + 'JS_LBL_NO_TAXES'=>'لا الضرائب', + 'JS_BASE_CURRENCY_CHANGED_TO_DISABLE_CURRENCY' => 'لابد من تغيير لتعطيل العملة الأساسية', ); diff --git a/pkg/vtiger/translations/Sweden_sv_se/modules/Vtiger.php b/pkg/vtiger/translations/Sweden_sv_se/modules/Vtiger.php index e64d25e307874073a0e47dc06710e995b6f38881..6daf601a1e31ec4d0aedd37db4010d4c4af0a666 100755 --- a/pkg/vtiger/translations/Sweden_sv_se/modules/Vtiger.php +++ b/pkg/vtiger/translations/Sweden_sv_se/modules/Vtiger.php @@ -936,6 +936,7 @@ $jsLanguageStrings = array( //More currencies message 'JS_PLEASE_ENABLE_BASE_CURRENCY_FOR_PRODUCT' => 'Vänligen aktivera basvaluta för produkt', 'JS_PLEASE_SELECT_BASE_CURRENCY_FOR_PRODUCT' => 'Vänligen aktivera basvaluta för produkt', + 'JS_BASE_CURRENCY_CHANGED_TO_DISABLE_CURRENCY' => 'Basvaluta mÃ¥ste ändras för att inaktivera', //Delete Records message 'JS_RECORDS_ARE_GETTING_DELETED' => 'Poster hÃ¥ller pÃ¥ att Raderas', @@ -994,4 +995,4 @@ $jsLanguageStrings = array( //No Tax exist 'JS_LBL_NO_TAXES'=>'Inga skatter', -); +); \ No newline at end of file