diff --git a/languages/en_us/Vtiger.php b/languages/en_us/Vtiger.php index 1cf96cad04b17c75f43de3cd07361cd9a5fb2709..953a6f5267bc098bb41e536bd3732715572e0a38 100644 --- a/languages/en_us/Vtiger.php +++ b/languages/en_us/Vtiger.php @@ -1043,7 +1043,8 @@ $languageStrings = array( 'Pre Tax Total' => 'Pre Tax Total', 'Received' => 'Received', 'Balance' => 'Balance', - 'S&H Percent' => 'S&H Percent', + 'S&H Amount' => 'Charges', + 'S&H Percent' => 'Taxes On Charges', 'Tax Region' => 'Tax Region', //Singular Modulenames diff --git a/layouts/v7/modules/Calendar/resources/Calendar.js b/layouts/v7/modules/Calendar/resources/Calendar.js index a17cbcb6e2cf477d948b18e037b776d5480dbe01..763b18daaf25021deb71762fb030bb511a4cd3fd 100644 --- a/layouts/v7/modules/Calendar/resources/Calendar.js +++ b/layouts/v7/modules/Calendar/resources/Calendar.js @@ -1427,6 +1427,8 @@ Vtiger.Class("Calendar_Calendar_Js", { this.showEditEventModal(eventId, isRecurring); }, registerPopoverEvent: function (event, element, calendarView) { + var dateFormat = this.getUserPrefered('date_format'); + dateFormat = dateFormat.toUpperCase(); var hourFormat = this.getUserPrefered('time_format'); var timeFormat = 'HH:mm'; if (hourFormat === '12') { @@ -1434,18 +1436,27 @@ Vtiger.Class("Calendar_Calendar_Js", { } var generatePopoverContentHTML = function (eventObj) { - var timeString = eventObj._start.format(timeFormat); - if (eventObj._end !== null) { - timeString += ' - ' + eventObj._end.format(timeFormat); + var timeString = ''; + if (eventObj.activitytype === 'Task') { + timeString = moment(eventObj._start._i, eventObj._start._f).format(timeFormat); + } else if (eventObj.module === "Events") { + if (eventObj._start && typeof eventObj._start != 'undefined') { + timeString = eventObj._start.format(timeFormat); + } + if (eventObj._end && typeof eventObj._end != 'undefined') { + timeString += ' - ' + eventObj._end.format(timeFormat); + } + } else { + timeString = eventObj._start.format(dateFormat); } var sourceModule = eventObj.module; if (!sourceModule) { sourceModule = 'Calendar'; } var popOverHTML = '' + - '<span>' + - timeString + - '</span>'; + '<span>' + + timeString + + '</span>'; if (sourceModule === 'Calendar' || sourceModule == 'Events') { popOverHTML += '' + diff --git a/layouts/v7/modules/Settings/Vtiger/Sidebar.tpl b/layouts/v7/modules/Settings/Vtiger/Sidebar.tpl index c0bd28ac6411dd02ab67bf05d0765e374a5da0d9..68be5b099bb70175560ecf4f62fbbc792e8fa30c 100644 --- a/layouts/v7/modules/Settings/Vtiger/Sidebar.tpl +++ b/layouts/v7/modules/Settings/Vtiger/Sidebar.tpl @@ -20,9 +20,6 @@ {assign var=BLOCK_NAME value=$BLOCK_MENUS->getLabel()} {assign var=BLOCK_MENU_ITEMS value=$BLOCK_MENUS->getMenuItems()} {assign var=NUM_OF_MENU_ITEMS value= $BLOCK_MENU_ITEMS|@sizeof} - {if $BLOCK_NAME eq 'LBL_EXTENSIONS'} - {continue} - {/if} {if $NUM_OF_MENU_ITEMS gt 0} <div class="settingsgroup-panel panel panel-default instaSearch"> <div id="{$BLOCK_NAME}_accordion" class="app-nav" role="tab"> @@ -46,8 +43,6 @@ {assign var=MENU_LABEL value='LBL_TAX_MANAGEMENT'} {elseif $MENU eq 'INVENTORYTERMSANDCONDITIONS'} {assign var=MENU_LABEL value='LBL_TERMS_AND_CONDITIONS'} - {elseif $MENU eq 'LBL_PHONE_CALLS'} - {assign var=MENU_LABEL value='LBL_PHONE_CONFIGURATION'} {/if} {assign var=MENU_URL value=$MENUITEM->getUrl()} diff --git a/modules/Settings/LayoutEditor/models/Block.php b/modules/Settings/LayoutEditor/models/Block.php index 1bc0fc6242b03bb73033570e39d4ae26c93c917f..3152b952e71ce98cf41b6894302b95231d628015 100644 --- a/modules/Settings/LayoutEditor/models/Block.php +++ b/modules/Settings/LayoutEditor/models/Block.php @@ -23,14 +23,18 @@ class Settings_LayoutEditor_Block_Model extends Vtiger_Block_Model { * @return <Boolean> true/false */ public function isAddCustomFieldEnabled() { - $actionNotSupportedModules = array('events','faq', 'helpdesk'); - $blocksEliminatedArray = array('calendar' => array('LBL_TASK_INFORMATION', 'LBL_DESCRIPTION_INFORMATION'), - 'helpdesk' => array('LBL_TICKET_RESOLUTION', 'LBL_COMMENTS'), - 'faq' => array('LBL_COMMENT_INFORMATION'), - 'events' => array('LBL_INVITE_USER_BLOCK')); - if(in_array(strtolower($this->module->name), $actionNotSupportedModules)) { - if(!empty($blocksEliminatedArray[strtolower($this->module->name)])) { - if(in_array($this->get('label'), $blocksEliminatedArray[strtolower($this->module->name)])) { + $actionNotSupportedModules = array_merge(getInventoryModules(), array('Calendar', 'Events', 'Faq', 'HelpDesk')); + $blocksEliminatedArray = array( 'Calendar' => array('LBL_TASK_INFORMATION', 'LBL_DESCRIPTION_INFORMATION'), + 'HelpDesk' => array('LBL_TICKET_RESOLUTION', 'LBL_COMMENTS'), + 'Faq' => array('LBL_COMMENT_INFORMATION'), + 'Invoice' => array('LBL_ITEM_DETAILS'), + 'Quotes' => array('LBL_ITEM_DETAILS'), + 'SalesOrder' => array('LBL_ITEM_DETAILS'), + 'PurchaseOrder' => array('LBL_ITEM_DETAILS'), + 'Events' => array('LBL_INVITE_USER_BLOCK')); + if(in_array($this->module->name, $actionNotSupportedModules)) { + if(!empty($blocksEliminatedArray[$this->module->name])) { + if(in_array($this->get('label'), $blocksEliminatedArray[$this->module->name])) { return false; } } else { diff --git a/modules/Settings/LayoutEditor/models/Module.php b/modules/Settings/LayoutEditor/models/Module.php index 562febcfee5e140722b3f4f5f8ae718f6abe40d9..969a87afa37359b2580fbf3e303bfa022aef0a03 100644 --- a/modules/Settings/LayoutEditor/models/Module.php +++ b/modules/Settings/LayoutEditor/models/Module.php @@ -67,7 +67,7 @@ class Settings_LayoutEditor_Module_Model extends Vtiger_Module_Model { continue; } - if($block->get('label') != 'LBL_ITEM_DETAILS') { + if($block->get('label') != 'LBL_RELATED_PRODUCTS') { $blocksList[$block->get('label')] = $block; } } diff --git a/packages/vtiger/optional/Arabic_ar_ae.zip b/packages/vtiger/optional/Arabic_ar_ae.zip index d0dbc7879499ea40eb5ed0f6e7a25bdf72f5da86..2efd201fbcf7440d70e7f1d18a41e4eef5fd727f 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 b20ae7c46106a5458ee6e31eebf00e2a7f75def3..0e73bdec2e357853ac3c6fe2ec430a5feadace58 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 164c87d600da623568119b7ec91dc54da9a77207..d16efd48591234e259a4dc88deba673b1f75ab79 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 b5d63b2ed1b28fb796829c323040c966e9070044..1f01b2e3bc2a82ae5c1099199452d6de3f4d44e3 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 1709ec32351f2b62dac5afa1114eacb7fe26840a..dcc8411e2e2c1d5fd2001170f538bf63353647b1 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 0e8d338b14bf181284f37c48bb02d05e58a0c074..ff446807379c1f1190745fee071711535af18b80 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 ba30729ce9fc6454371d47f40ab079636df6b885..f41792905a48b0ad5ba07557fd161ae25b904d3f 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 ebb81045d4c00eea868c1f29470e04be80c05578..63210e317ed8ac21532b976646fa7cc323c0a892 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 68eae7991a94e5423b5f11d1851f111dcce8ea95..b78e757cd2a934ac50ec67a597ffadfe57627de0 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/PolishLanguagePack_pl_pl.zip b/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip index cd2b1cb7c4f770df5d27cab679dd815703fb6fd9..a1936b48c0883d38feb355b12fe1cfb6c2e4cce8 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/RomanianLanguagePack_rm_rm.zip b/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip index 3978137f32f84e9e925bc3804480d80ad9872578..921857dc94e68fb22916a62a2200809cc730ce19 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 6838493f16a7c28b1187cba35d4936d4bc681885..559eca8da17cbd653dc51d643ab17686dadc0779 100644 Binary files a/packages/vtiger/optional/Russian.zip and b/packages/vtiger/optional/Russian.zip differ diff --git a/packages/vtiger/optional/Spanish.zip b/packages/vtiger/optional/Spanish.zip index 9b09955f45fd4d72cabf7371952a7ad02349e5c8..48c1bba35826316d7b229b9264e7a5c700864a4d 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 fcd812d8a03909fe68a7b39399baa2350007ede6..4c9763545558b306516a3480c62b087fe9f6de1f 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 f81aae0f491b623343c0621b9a89c380af97ec7f..bb3794178a84aff616b646ecbb4e15b91045f0d9 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/translations/Arabic_ar_ae/modules/Vtiger.php b/pkg/vtiger/translations/Arabic_ar_ae/modules/Vtiger.php index 427552af1e9e9a86e1ad3c4a5b5c5305d4cde45f..f6b6403fe1e051e65cd04408219ac2b42c61feed 100644 --- a/pkg/vtiger/translations/Arabic_ar_ae/modules/Vtiger.php +++ b/pkg/vtiger/translations/Arabic_ar_ae/modules/Vtiger.php @@ -888,7 +888,8 @@ $languageStrings = array( 'Pre Tax Total' => 'قبل الضرائب إجمالي', 'Received' => 'تلقى', 'Balance' => 'توازن', - 'S&H Percent' => 'S & H ÙÙŠ المئة', + 'S&H Amount' => 'Ø´Øنة', + 'S&H Percent' => 'الضرائب على رسوم', 'Tax Region' => 'منطقة الضريبية', 'SINGLE_Potentials' => 'Ùرصة', diff --git a/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Vtiger.php b/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Vtiger.php index ddf3e4c5f8db41ab8db2c57fa7c7a7e66a378184..73ad96abfb8ea324797b7a7dbf0317266ec7728e 100644 --- a/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Vtiger.php +++ b/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Vtiger.php @@ -758,7 +758,8 @@ $languageStrings = array( 'Pre Tax Total' => 'Pré fiscal total', 'Received' => 'Recebido', 'Balance' => 'EquilÃbrio', - 'S&H Percent' => 'S & H Percent', + 'S&H Amount' => 'Cobranças', + 'S&H Percent' => 'Impostos sobre os encargos', 'Tax Region' => 'Região Fiscal', 'SINGLE_Potentials' => 'Oportunidade', diff --git a/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Vtiger.php b/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Vtiger.php index 4ae3176e48f8f1613ac6dc1fdbd3b16c1fccebcb..a7673e09c25f2e93c21e75e5c14efd81f580257e 100644 --- a/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Vtiger.php +++ b/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Vtiger.php @@ -751,7 +751,8 @@ $languageStrings = array( 'Pre Tax Total' => 'Pre Tax Total', 'Received' => 'Received', 'Balance' => 'Balance', - 'S&H Percent' => 'S&H Percent', + 'S&H Amount' => 'Charges', + 'S&H Percent' => 'Taxes On Charges', 'Tax Region' => 'Tax Region', //Singular Modulenames diff --git a/pkg/vtiger/translations/Deutsch/modules/Vtiger.php b/pkg/vtiger/translations/Deutsch/modules/Vtiger.php index 0f5760b401aa27db81c2817a5b37f78173b3a71b..d5c2a6d3cac44aeaf3e2c52bf43bc2fa74d1c07a 100644 --- a/pkg/vtiger/translations/Deutsch/modules/Vtiger.php +++ b/pkg/vtiger/translations/Deutsch/modules/Vtiger.php @@ -762,7 +762,8 @@ $languageStrings = array( 'Pre Tax Total' => 'Pre MwSt', 'Received' => 'Received', 'Balance' => 'Balance', - 'S&H Percent' => 'S & H Prozent', + 'S&H Amount' => 'Gebühren', + 'S&H Percent' => 'Steuern auf Gebühren', 'Tax Region' => 'Steuern Region', 'group' => 'Gruppe', 'individual' => 'Einzelne', diff --git a/pkg/vtiger/translations/Dutch/modules/Vtiger.php b/pkg/vtiger/translations/Dutch/modules/Vtiger.php index bce8e48fdc3bc0903a800c87d987bde255e183c1..7353bc96b88184cbe01ecb595f050bb85a63bd8d 100644 --- a/pkg/vtiger/translations/Dutch/modules/Vtiger.php +++ b/pkg/vtiger/translations/Dutch/modules/Vtiger.php @@ -757,7 +757,8 @@ $languageStrings = array( 'Pre Tax Total' => 'Pre Btw', 'Received' => 'Ontvangen', 'Balance' => 'Balans', - 'S&H Percent' => 'S & H Procent', + 'S&H Amount' => 'kosten', + 'S&H Percent' => 'Belastingen op beschuldiging', 'Tax Region' => 'Belasting Regio', 'group' => 'Groep', diff --git a/pkg/vtiger/translations/French/modules/Vtiger.php b/pkg/vtiger/translations/French/modules/Vtiger.php index b5f84770aaf62b5f2a2b50650a179fcaf6d7fcf7..09e64e76674f5511156864d92d85100d5302fb34 100644 --- a/pkg/vtiger/translations/French/modules/Vtiger.php +++ b/pkg/vtiger/translations/French/modules/Vtiger.php @@ -756,7 +756,8 @@ $languageStrings = array( 'Pre Tax Total' => 'Pré Total Tax', 'Received' => 'Reçu', 'Balance' => 'Balance', - 'S&H Percent' => 'S & H Pourcentage', + 'S&H Amount' => 'Des charges', + 'S&H Percent' => 'Taxes sur les redevances', 'Tax Region' => 'Région impôt', 'SINGLE_Potentials' => 'Occasion', diff --git a/pkg/vtiger/translations/Hungarian/modules/Vtiger.php b/pkg/vtiger/translations/Hungarian/modules/Vtiger.php index d1deb48d874390c225f0ae31bfa674b1df1d9caa..1f0bd0ae580247a1471155a4fe52cfab78247b36 100644 --- a/pkg/vtiger/translations/Hungarian/modules/Vtiger.php +++ b/pkg/vtiger/translations/Hungarian/modules/Vtiger.php @@ -760,7 +760,8 @@ $languageStrings = array( 'Pre Tax Total' => 'Adózás elÅ‘tti Total', 'Received' => 'Kapott', 'Balance' => 'Egyensúly', - 'S&H Percent' => 'S & H Percent', + 'S&H Amount' => 'dÃjak', + 'S&H Percent' => 'Adók vádjával', 'Tax Region' => 'Adó Régió', 'group' => 'Csoport', 'individual' => 'Egyéni', diff --git a/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Vtiger.php b/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Vtiger.php index 1f06d78bca713e544e5572f4acb36cdfe6c411fa..80c1c7f4cca854987151aa6da2517b182c2e64b5 100644 --- a/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Vtiger.php +++ b/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Vtiger.php @@ -758,7 +758,8 @@ $languageStrings = array( 'Pre Tax Total' => 'Pre Totale IVA', 'Received' => 'Ricevuto', 'Balance' => 'Equilibrio', - 'S&H Percent' => 'S & H Percent', + 'S&H Amount' => 'oneri', + 'S&H Percent' => 'Tasse sulle spese', 'Tax Region' => 'Regione Tax', 'group' => 'Gruppo', 'individual' => 'Individuale', diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Vtiger.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Vtiger.php index d5d644a1f8c953e9e8b1988dd8b5993d462faf36..9ffaabf53551d9d342d6520f7c9600be58705966 100644 --- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Vtiger.php +++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Vtiger.php @@ -751,7 +751,8 @@ $languageStrings = array( 'Pre Tax Total' => 'Pre Impuesto Total', 'Received' => 'Recibido', 'Balance' => 'Equilibrio', - 'S&H Percent' => 'S & H Porcentaje', + 'S&H Amount' => 'cargos', + 'S&H Percent' => 'Impuestos por cargos', 'Tax Region' => 'Región de Impuestos', 'SINGLE_Potentials' => 'Oportunidad', diff --git a/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Vtiger.php b/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Vtiger.php index 828cf1cb8351b037b351144ad1967caf174cb671..71a5ade4aa28aa335b8ad4a1f4cf585484edfbc2 100644 --- a/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Vtiger.php +++ b/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Vtiger.php @@ -782,7 +782,8 @@ $languageStrings = array( 'Pre Tax Total' => 'Pre podatkowa Razem', 'Received' => 'Otrzymane', 'Balance' => 'Bilans', - 'S&H Percent' => 'S & H Procent', + 'S&H Amount' => 'opÅ‚aty', + 'S&H Percent' => 'Podatki w sprawie opÅ‚at', 'Tax Region' => 'Region podatkowa', 'SINGLE_Potentials' => 'Okazja', diff --git a/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Vtiger.php b/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Vtiger.php index 7b77810e3520dfc740a983ff0b4ea0f3aa79c0fb..c4c745941bfd61ca6ababff0ffa9d8fe541855b7 100644 --- a/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Vtiger.php +++ b/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Vtiger.php @@ -790,7 +790,8 @@ $languageStrings = array( 'Pre Tax Total' => 'Pre totală de impozitare', 'Received' => 'Primit', 'Balance' => 'BalanÈ›a', - 'S&H Percent' => 'S & H Procent', + 'S&H Amount' => 'cheltuieli', + 'S&H Percent' => 'Impozite pe Taxe', 'Tax Region' => 'Taxa Regiune', 'SINGLE_Potentials' => 'Oportunitate', diff --git a/pkg/vtiger/translations/Russian/modules/Vtiger.php b/pkg/vtiger/translations/Russian/modules/Vtiger.php index 51b67dbd996fef98c91b4a1548047a2dc90ed1cf..435c55bfbbc9fa79c7b7a2a44af95e8c72a8d0ee 100644 --- a/pkg/vtiger/translations/Russian/modules/Vtiger.php +++ b/pkg/vtiger/translations/Russian/modules/Vtiger.php @@ -758,7 +758,8 @@ $languageStrings = array( 'Pre Tax Total' => 'Предварительно Ðалоговый Ð’Ñего', 'Received' => 'Получено', 'Balance' => 'БаланÑ', - 'S&H Percent' => 'S & H Процент', + 'S&H Amount' => 'раÑходы', + 'S&H Percent' => 'Ðалоги на Ñборах', 'Tax Region' => 'Ðалоговый Регион', 'SINGLE_Potentials' => 'ВозможноÑÑ‚ÑŒ', diff --git a/pkg/vtiger/translations/Spanish/modules/Vtiger.php b/pkg/vtiger/translations/Spanish/modules/Vtiger.php index 08321220147e24432169bc04a2e3f444332f329e..becd2646866f262fd650b396543dc596cea8bb94 100644 --- a/pkg/vtiger/translations/Spanish/modules/Vtiger.php +++ b/pkg/vtiger/translations/Spanish/modules/Vtiger.php @@ -773,7 +773,8 @@ $languageStrings = array( 'Pre Tax Total' => 'Pre Impuesto Total', 'Received' => 'Recibido', 'Balance' => 'Equilibrio', - 'S&H Percent' => 'S & H Porcentaje', + 'S&H Amount' => 'cargos', + 'S&H Percent' => 'Impuestos por cargos', 'Tax Region' => 'Región de Impuestos', 'SINGLE_Potentials' => 'Oportunidad', diff --git a/pkg/vtiger/translations/Sweden_sv_se/modules/Vtiger.php b/pkg/vtiger/translations/Sweden_sv_se/modules/Vtiger.php index 764a33944f50ae3ebd954bb0a42cf867200a700a..3f3e8745d295397c1c9f0e0cf6d4a8e4556c2f46 100755 --- a/pkg/vtiger/translations/Sweden_sv_se/modules/Vtiger.php +++ b/pkg/vtiger/translations/Sweden_sv_se/modules/Vtiger.php @@ -908,7 +908,8 @@ $languageStrings = array( 'Pre Tax Total' => 'Pre Skatt Total', 'Received' => 'Mottaget', 'Balance' => 'Balans', - 'S&H Percent' => 'S & H Procent', + 'S&H Amount' => 'Kostnader', + 'S&H Percent' => 'Skatter pÃ¥ avgifter', 'Tax Region' => 'Tax Region', 'SINGLE_Potentials' => 'Möjlighet', diff --git a/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Vtiger.php b/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Vtiger.php index 19a7ed0217fa30c268d9db7050905e1b1e2a8fab..88730bedb32d83e2e1266a507dabeb49fc4e0c28 100644 --- a/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Vtiger.php +++ b/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Vtiger.php @@ -789,7 +789,8 @@ $languageStrings = array( 'Pre Tax Total' => 'Ön Vergi Toplam', 'Received' => 'Alınan', 'Balance' => 'Denge', - 'S&H Percent' => 'S & H Yüzde', + 'S&H Amount' => 'Masraflar', + 'S&H Percent' => 'Masraflar On Vergiler', 'Tax Region' => 'Vergi Bölge', 'SINGLE_Potentials' => 'Fırsat', 'SINGLE_HelpDesk' => 'Bilet',