diff --git a/data/CRMEntity.php b/data/CRMEntity.php
index 10a83cad5ae53f85c93a6e1ee39b488eeda84cad..668593cc1a568b231d744e1a7cca8531515827e5 100755
--- a/data/CRMEntity.php
+++ b/data/CRMEntity.php
@@ -136,7 +136,8 @@ class CRMEntity {
} else {
$file_name = $file_details['name'];
}
-
+
+ // Check 1
$save_file = 'true';
//only images are allowed for Image Attachmenttype
$mimeType = vtlib_mime_content_type($file_details['tmp_name']);
@@ -149,6 +150,13 @@ class CRMEntity {
return false;
}
+ // Check 2
+ $save_file = 'true';
+ //only images are allowed for these modules
+ if ($module == 'Contacts' || $module == 'Products') {
+ $save_file = validateImageFile($file_details);
+ }
+
$binFile = sanitizeUploadFileName($file_name, $upload_badext);
$current_id = $adb->getUniqueID("vtiger_crmentity");
@@ -164,12 +172,6 @@ class CRMEntity {
//upload the file in server
$upload_status = move_uploaded_file($filetmp_name, $upload_file_path . $current_id . "_" . $binFile);
- $save_file = 'true';
- //only images are allowed for these modules
- if ($module == 'Contacts' || $module == 'Products') {
- $save_file = validateImageFile($file_details);
- }
-
if ($save_file == 'true' && $upload_status == 'true') {
//This is only to update the attached filename in the vtiger_notes vtiger_table for the Notes module
if ($module == 'Contacts' || $module == 'Products') {
diff --git a/languages/fr_fr/Calendar.php b/languages/fr_fr/Calendar.php
index 9d3d3e9ca1b7a1eb1f85462daee8a94f21db67bd..6e07fca506f3ba9be6e41160cccb9e1afa968208 100644
--- a/languages/fr_fr/Calendar.php
+++ b/languages/fr_fr/Calendar.php
@@ -17,9 +17,9 @@ $languageStrings = array(
'LBL_CALENDAR_SETTINGS' => 'Calendar Settings' , // TODO: Review
'LBL_CALENDAR_SHARING' => 'Calendar Sharing' , // TODO: Review
'LBL_DEFAULT_EVENT_DURATION' => 'Default Event Duration' , // TODO: Review
- 'LBL_CALL' => 'Call' , // TODO: Review
+ 'LBL_CALL' => 'Appel' ,
'LBL_OTHER_EVENTS' => 'Other Events' , // TODO: Review
- 'LBL_MINUTES' => 'Minutes' , // TODO: Review
+ 'LBL_MINUTES' => 'Minutes' ,
'LBL_SELECT_USERS' => 'Select Users' , // TODO: Review
'LBL_EVENT_OR_TASK' => 'Evénement / Pour faire' ,
'LBL_TASK_INFORMATION' => 'Pour faire Information' ,
@@ -30,9 +30,9 @@ $languageStrings = array(
'Send Notification' => 'Envoyer notification' ,
'Location' => 'Localisation' ,
'End Date & Time' => 'Date et heure de fin' ,
- 'LBL_ACTIVITY_TYPES' => 'Activity Types' ,
+ 'LBL_ACTIVITY_TYPES' => 'Activity Types' , // TODO: Review
'LBL_CONTACTS_SUPPORT_END_DATE' => 'Fin de support' ,
- 'LBL_CONTACTS_BIRTH_DAY' => 'Date of Birth' ,
+ 'LBL_CONTACTS_BIRTH_DAY' => 'Date of Birth' , // TODO: Review
'LBL_ADDED_CALENDARS' => 'Added Calendars' , // TODO: Review
'Call' => 'Appels' ,
'Meeting' => 'Rendez-vous' ,
@@ -48,23 +48,23 @@ $languageStrings = array(
'LBL_CHANGE_OWNER' => 'Changer assignation' ,
'LBL_EVENT' => 'Activité' ,
'LBL_TASK' => 'Pour faire' ,
- 'LBL_TASKS' => 'Pour faire',
+ 'LBL_TASKS' => 'Pour faire',
'LBL_CALENDAR_VIEW' => 'Calendar View' ,
'LBL_SHARED_CALENDAR' => 'Shared Calendar' , // TODO: Review
- 'LBL_DAY0' => 'Sunday' , // TODO: Review
- 'LBL_DAY1' => 'Monday' , // TODO: Review
- 'LBL_DAY2' => 'Tuesday' , // TODO: Review
- 'LBL_DAY3' => 'Wednesday' , // TODO: Review
- 'LBL_DAY4' => 'Thursday' , // TODO: Review
- 'LBL_DAY5' => 'Friday' , // TODO: Review
- 'LBL_DAY6' => 'Saturday' , // TODO: Review
- 'first' => 'First' , // TODO: Review
- 'last' => 'Last' , // TODO: Review
+ 'LBL_DAY0' => 'Dimanche' , // TODO: Review
+ 'LBL_DAY1' => 'Lundi' ,
+ 'LBL_DAY2' => 'Mardi' ,
+ 'LBL_DAY3' => 'Mercredi' ,
+ 'LBL_DAY4' => 'Jeudi' ,
+ 'LBL_DAY5' => 'Vendredi' ,
+ 'LBL_DAY6' => 'Samedi' ,
+ 'first' => 'Premier' ,
+ 'last' => 'Dernier' ,
'LBL_DAY_OF_THE_MONTH' => 'day of the month' , // TODO: Review
- 'LBL_ON' => 'on' , // TODO: Review
- 'Daily' => 'Day(s)' , // TODO: Review
- 'Weekly' => 'Week(s)' , // TODO: Review
- 'Monthly' => 'Month(s)' , // TODO: Review
+ 'LBL_ON' => 'le' ,
+ 'Daily' => 'Jour(s)' ,
+ 'Weekly' => 'Semaine(s)' ,
+ 'Monthly' => 'Mois' ,
'Yearly' => 'Year' , // TODO: Review
'LBL_DEFAULT_STATUS_TYPE' => 'Statut par défaut & Type' ,
'LBL_STATUS' => 'Statut' ,
@@ -86,55 +86,55 @@ $jsLanguageStrings = array(
'JS_FUTURE_EVENT_CANNOT_BE_HELD' => 'Ne peut être tenue Pour l\'avenir',
//Calendar view label translation
- 'LBL_MONTH' => 'Month',
- 'LBL_TODAY' => 'Today',
- 'LBL_DAY' => 'Day',
- 'LBL_WEEK' => 'Week',
+ 'LBL_MONTH' => 'Mois',
+ 'LBL_TODAY' => 'Aujourd\'hui',
+ 'LBL_DAY' => 'Jour',
+ 'LBL_WEEK' => 'Semaine',
- 'LBL_SUNDAY' => 'Sunday',
- 'LBL_MONDAY' => 'Monday',
- 'LBL_TUESDAY' => 'Tuesday',
- 'LBL_WEDNESDAY' => 'Wednesday',
- 'LBL_THURSDAY' => 'Thursday',
- 'LBL_FRIDAY' => 'Friday',
- 'LBL_SATURDAY' => 'Saturday',
+ 'LBL_SUNDAY' => 'Dimanche',
+ 'LBL_MONDAY' => 'Lundi',
+ 'LBL_TUESDAY' => 'Mardi',
+ 'LBL_WEDNESDAY' => 'Mercredi',
+ 'LBL_THURSDAY' => 'Jeudi',
+ 'LBL_FRIDAY' => 'Vendredi',
+ 'LBL_SATURDAY' => 'Samedi',
- 'LBL_SUN' => 'Sun',
- 'LBL_MON' => 'Mon',
- 'LBL_TUE' => 'Tue',
- 'LBL_WED' => 'Wed',
- 'LBL_THU' => 'Thu',
- 'LBL_FRI' => 'Fri',
- 'LBL_SAT' => 'Sat',
+ 'LBL_SUN' => 'Dim',
+ 'LBL_MON' => 'Lun',
+ 'LBL_TUE' => 'Mar',
+ 'LBL_WED' => 'Mer',
+ 'LBL_THU' => 'Jeu',
+ 'LBL_FRI' => 'Ven',
+ 'LBL_SAT' => 'Sam',
- 'LBL_JANUARY' => 'January',
- 'LBL_FEBRUARY' => 'February',
- 'LBL_MARCH' => 'March',
- 'LBL_APRIL' => 'April',
- 'LBL_MAY' => 'May',
- 'LBL_JUNE' => 'June',
- 'LBL_JULY' => 'July',
- 'LBL_AUGUST' => 'August',
- 'LBL_SEPTEMBER' => 'September',
- 'LBL_OCTOBER' => 'October',
- 'LBL_NOVEMBER' => 'November',
- 'LBL_DECEMBER' => 'December',
+ 'LBL_JANUARY' => 'Janvier',
+ 'LBL_FEBRUARY' => 'February', // TODO: Review
+ 'LBL_MARCH' => 'Mars',
+ 'LBL_APRIL' => 'Avril',
+ 'LBL_MAY' => 'Mai',
+ 'LBL_JUNE' => 'Juin',
+ 'LBL_JULY' => 'Juillet',
+ 'LBL_AUGUST' => 'August', // TODO: Review
+ 'LBL_SEPTEMBER' => 'Septembre',
+ 'LBL_OCTOBER' => 'Octobre',
+ 'LBL_NOVEMBER' => 'Novembre',
+ 'LBL_DECEMBER' => 'Decembre',
'LBL_JAN' => 'Jan',
- 'LBL_FEB' => 'Feb',
+ 'LBL_FEB' => 'Fev',
'LBL_MAR' => 'Mar',
- 'LBL_APR' => 'Apr',
- 'LBL_MAY' => 'May',
+ 'LBL_APR' => 'Avr',
+ 'LBL_MAY' => 'Mai',
'LBL_JUN' => 'Jun',
'LBL_JUL' => 'Jul',
- 'LBL_AUG' => 'Aug',
+ 'LBL_AUG' => 'Aou',
'LBL_SEP' => 'Sep',
'LBL_OCT' => 'Oct',
'LBL_NOV' => 'Nov',
'LBL_DEC' => 'Dec',
- 'LBL_ALL_DAY' => 'All-Day',
- 'Mobile Call' => 'Mobile Call',
+ 'LBL_ALL_DAY' => 'All-Day', // TODO: Review
+ 'Mobile Call' => 'Mobile Call', // TODO: Review
//End
//Fixing colors for Shared Calendar and My Calendar
diff --git a/layouts/vlayout/modules/Migration/MigrationStep1.tpl b/layouts/vlayout/modules/Migration/MigrationStep1.tpl
index e559e4dfee5e1cc61b9ac66862e16ed95be1acd6..fbf97fbfb78ad988305ea56cc40ec0329d44a209 100644
--- a/layouts/vlayout/modules/Migration/MigrationStep1.tpl
+++ b/layouts/vlayout/modules/Migration/MigrationStep1.tpl
@@ -44,7 +44,7 @@
<input type="hidden" id="module" name="module" value="Migration">
<input type="hidden" id="view" name="view" value="Index">
<input type="hidden" name="mode" value="step2">
- <input type="submit" class="btn btn-large btn-primary" value="Next"/>
+ <input type="submit" class="btn btn-large btn-primary" value="{vtranslate('Next', $MODULE)}"/>
</form>
</div>
</div>
diff --git a/layouts/vlayout/modules/Migration/MigrationStep2.tpl b/layouts/vlayout/modules/Migration/MigrationStep2.tpl
index 166dba08f41fb3ecd33a0eaaa633b25ab509cabe..5452d20ad7aee08a808faa43d81b2232227a636f 100644
--- a/layouts/vlayout/modules/Migration/MigrationStep2.tpl
+++ b/layouts/vlayout/modules/Migration/MigrationStep2.tpl
@@ -49,7 +49,7 @@
<a href="//www.vtiger.com/products/crm/privacy_policy.html" target="_blank"><img src="{vimage_path('linkedin.png')}"></a>
<br><br>
<div class="button-container">
- <input type="button" onclick="window.location.href='index.php'" class="btn btn-large btn-primary" value="Finish"/>
+ <input type="button" onclick="window.location.href='index.php'" class="btn btn-large btn-primary" value="{vtranslate('Finish', $MODULE)}"/>
</div>
</div>
</div>
diff --git a/layouts/vlayout/modules/Settings/Groups/EditView.tpl b/layouts/vlayout/modules/Settings/Groups/EditView.tpl
index fcddbbfc21c69c7aec40b4c17f53fb0b84f90f67..ad23aeae82eeb8060ee8acd8e1c0120faf298901 100644
--- a/layouts/vlayout/modules/Settings/Groups/EditView.tpl
+++ b/layouts/vlayout/modules/Settings/Groups/EditView.tpl
@@ -51,7 +51,7 @@
{assign var="GROUP_MEMBERS" value=$RECORD_MODEL->getMembers()}
<select id="memberList" class="row-fluid members" multiple="true" name="members[]" data-placeholder="{vtranslate('LBL_ADD_USERS_ROLES', $QUALIFIED_MODULE)}" data-validation-engine="validate[required]">
{foreach from=$MEMBER_GROUPS key=GROUP_LABEL item=ALL_GROUP_MEMBERS}
- <optgroup label="{$GROUP_LABEL}">
+ <optgroup label="{vtranslate($GROUP_LABEL, $QUALIFIED_MODULE)}">
{foreach from=$ALL_GROUP_MEMBERS item=MEMBER}
{if $MEMBER->getName() neq $RECORD_MODEL->getName()}
<option value="{$MEMBER->getId()}" data-member-type="{$GROUP_LABEL}" {if isset($GROUP_MEMBERS[$GROUP_LABEL][$MEMBER->getId()])}selected="true"{/if}>{$MEMBER->getName()}</option>
diff --git a/layouts/vlayout/modules/Settings/MailConverter/ListViewContents.tpl b/layouts/vlayout/modules/Settings/MailConverter/ListViewContents.tpl
index ea1232738c2e7f9dab441716b085acdc8c5b03eb..325e785da03af191f4edbc275cb503c8135be89f 100644
--- a/layouts/vlayout/modules/Settings/MailConverter/ListViewContents.tpl
+++ b/layouts/vlayout/modules/Settings/MailConverter/ListViewContents.tpl
@@ -18,7 +18,7 @@
<span class="font-x-large">{$RECORD->getName()}</span>
<div class="pull-right btn-group">
<button class="btn dropdown-toggle" data-toggle="dropdown">
- Actions
+ {vtranslate('Actions',$QUALIFIED_MODULE)}
<span class="caret"></span>
</button>
<ul class="dropdown-menu pull-right">
diff --git a/layouts/vlayout/modules/Settings/Profiles/EditView.tpl b/layouts/vlayout/modules/Settings/Profiles/EditView.tpl
index 09eca1f21e04aa3a84974a21391c24b222138b48..d814a90cabaec83c9dc4e1cee336832966e7422b 100644
--- a/layouts/vlayout/modules/Settings/Profiles/EditView.tpl
+++ b/layouts/vlayout/modules/Settings/Profiles/EditView.tpl
@@ -215,7 +215,7 @@
{else}
style="border-right: 1px solid #DDD !important;"
{/if}>
- <input type="checkbox" class="alignTop" name="permissions[{$TABID}][actions][{$ACTIONID}]" {if $RECORD_MODEL->hasModuleActionPermission($PROFILE_MODULE, $ACTIONID)}checked="true" {elseif empty($RECORD_ID) && empty($IS_DUPLICATE_RECORD)} checked="true" {/if}> {$ACTION_MODEL->getName()}</td>
+ <input type="checkbox" class="alignTop" name="permissions[{$TABID}][actions][{$ACTIONID}]" {if $RECORD_MODEL->hasModuleActionPermission($PROFILE_MODULE, $ACTIONID)}checked="true" {elseif empty($RECORD_ID) && empty($IS_DUPLICATE_RECORD)} checked="true" {/if}> {vtranslate($ACTION_MODEL->getName(), $MODULE)}</td>
{if $smarty.foreach.actions.last OR ($smarty.foreach.actions.index+1) % 3 == 0}
</div>
{/if}
diff --git a/layouts/vlayout/modules/Settings/Vtiger/ListViewContents.tpl b/layouts/vlayout/modules/Settings/Vtiger/ListViewContents.tpl
index 2c2d112a1b5f938bb9e69e373f17744d9b1382c5..9fe2d2183f851f469acc06390cc301d96de78cbe 100644
--- a/layouts/vlayout/modules/Settings/Vtiger/ListViewContents.tpl
+++ b/layouts/vlayout/modules/Settings/Vtiger/ListViewContents.tpl
@@ -94,4 +94,4 @@
</table>
{/if}
</div>
-{/strip}
\ No newline at end of file
+{/strip}
diff --git a/layouts/vlayout/modules/Settings/Workflows/EditTask.tpl b/layouts/vlayout/modules/Settings/Workflows/EditTask.tpl
index f8e1b02f1a87c4f6a1689b06eab71489b077c88f..f446dac8a02ae909dbfd8e79b61bc91e81858f80 100644
--- a/layouts/vlayout/modules/Settings/Workflows/EditTask.tpl
+++ b/layouts/vlayout/modules/Settings/Workflows/EditTask.tpl
@@ -14,7 +14,7 @@
<div class='modelContainer' id="addTaskContainer">
<div class="modal-header contentsBackground">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
- <h3>{vtranslate('LBL_ADD_TASKS_FOR_WORKFLOW', $QUALIFIED_MODULE)} -> {$TASK_TYPE_MODEL->get('label')}</h3>
+ <h3>{vtranslate('LBL_ADD_TASKS_FOR_WORKFLOW', $QUALIFIED_MODULE)} -> {vtranslate($TASK_TYPE_MODEL->get('label'), $QUALIFIED_MODULE)}</h3>
</div>
<form class="form-horizontal" id="saveTask" method="post" action="index.php">
<input type="hidden" name="module" value="{$MODULE}" />
diff --git a/layouts/vlayout/modules/Users/ForgotPassword.tpl b/layouts/vlayout/modules/Users/ForgotPassword.tpl
index f0593237009f96587db8b92f52eb947fb38f4664..0c740c66b7fd960098f109d85965d6577eaab69d 100644
--- a/layouts/vlayout/modules/Users/ForgotPassword.tpl
+++ b/layouts/vlayout/modules/Users/ForgotPassword.tpl
@@ -99,7 +99,7 @@
<tr><td></td></tr>
<tr>
<td></td>
- <td><input type="submit" id="btn" value="Submit" onclick="return checkPassword();"/></td>
+ <td><input type="submit" id="btn" value={vtranslate('Submit', $MODULE)} onclick="return checkPassword();"/></td>
</tr>
</table>
</form>
diff --git a/layouts/vlayout/modules/Users/ListViewContents.tpl b/layouts/vlayout/modules/Users/ListViewContents.tpl
index 950024ab87ec17560d8c0bb05e110176de61a22d..79eff817fa8bdd850290000e5d1ec73ebcb588c9 100644
--- a/layouts/vlayout/modules/Users/ListViewContents.tpl
+++ b/layouts/vlayout/modules/Users/ListViewContents.tpl
@@ -139,4 +139,4 @@
{/if}
</div>
-{/strip}
\ No newline at end of file
+{/strip}
diff --git a/layouts/vlayout/modules/Users/UserSetup.tpl b/layouts/vlayout/modules/Users/UserSetup.tpl
index 395eac2dd06611e640c9c766a694119dae1ecd09..d07613b16ce04bd224cad23c1c69a8dea68b78de 100644
--- a/layouts/vlayout/modules/Users/UserSetup.tpl
+++ b/layouts/vlayout/modules/Users/UserSetup.tpl
@@ -1,459 +1,459 @@
-{*<!--
-/*********************************************************************************
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
-* ("License"); You may not use this file except in compliance with the License
-* The Original Code is: vtiger CRM Open Source
-* The Initial Developer of the Original Code is vtiger.
-* Portions created by vtiger are Copyright (C) vtiger.
-* All Rights Reserved.
-*
-********************************************************************************/
--->*}
-{strip}
-<!DOCTYPE html>
-<html>
- <head>
- <title>Vtiger</title>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
- <link REL="SHORTCUT ICON" HREF="layouts/vlayout/skins/images/favicon.ico">
- <link rel="stylesheet" href="libraries/bootstrap/css/bootstrap.css" type="text/css" media="screen" />
- <link rel="stylesheet" href="resources/styles.css" type="text/css" media="screen" />
- <link rel="stylesheet" href="libraries/jquery/select2/select2.css" />
- <link rel="stylesheet" href="libraries/jquery/posabsolute-jQuery-Validation-Engine/css/validationEngine.jquery.css" />
-
- <script type="text/javascript" src="libraries/jquery/jquery.min.js"></script>
- <script type="text/javascript" src="libraries/bootstrap/js/bootstrap-tooltip.js"></script>
- <script type="text/javascript" src="libraries/jquery/select2/select2.min.js"></script>
- <script type="text/javascript" src="libraries/jquery/posabsolute-jQuery-Validation-Engine/js/jquery.validationEngine.js" ></script>
- <script type="text/javascript" src="libraries/jquery/posabsolute-jQuery-Validation-Engine/js/jquery.validationEngine-en.js" ></script>
-
- <script type="text/javascript">{literal}
- jQuery(function(){
- jQuery('select').select2({blurOnChange:true});
- jQuery('[rel="tooltip"]').tooltip();
- jQuery('form').validationEngine({
- prettySelect: true,
- usePrefix: 's2id_',
- autoPositionUpdate: true,
- promptPosition : "topLeft",
- showOneMessage: true
- });
- jQuery('#currency_name_controls').mouseenter(function() {
- jQuery('#currency_name_tooltip').tooltip('show');
- });
- jQuery('#currency_name_controls').mouseleave(function() {
- jQuery('#currency_name_tooltip').tooltip('hide');
- });
- });
- {/literal}</script>
- <style type="text/css">{literal}
- body { background: #ffffff url('layouts/vlayout/skins/images/usersetupbg.png') no-repeat center top; background-size: 100%; font-size: 14px; }
- .modal-backdrop { opacity: 0.35; }
- .tooltip { z-index: 1055; }
- input, select, textarea { font-size: 14px; }
- {/literal}</style>
- </head>
- <body>
-
- <div class="container">
- <div class="modal-backdrop"></div>
- <form class="form" method="POST" action="index.php?module=Users&action=UserSetupSave">
- <div class="modal" {if false && $IS_FIRST_USER}style="width: 700px;"{/if}> {* FirstUser information gather - paused *}
- <div class="modal-header">
- <h3>{vtranslate('LBL_ALMOST_THERE', $MODULE)}</h3>
- </div>
- <div class="modal-body">
- <div class="row">
- {if false && $IS_FIRST_USER} {* FirstUser information gather - paused *}
- <div class="span4">
- <label class="control-label"><strong>{vtranslate('LBL_ABOUT_ME', $MODULE)}</strong> <span class="muted">{vtranslate('LBL_WE_PROMISE_TO_KEEP_THIS_PRIVATE', $MODULE)}</span></label>
- <div class="controls">
- <input type="text" name="about[phone]" id="phone" placeholder="{vtranslate('LBL_PHONE', $MODULE)}" rel="tooltip" title="{vtranslate('LBL_YOUR_CONTACT_NUMBER', $MODULE)}" style="width:250px;">
- </div>
- <div class="controls">
- <select name="about[country]" id="country" placeholder="{vtranslate('LBL_SELECT_COUNTRY', $MODULE)}" rel="tooltip" title="{vtranslate('LBL_WHERE_ARE_YOU_FROM', $MODULE)}" style="width:250px;">
- <option value=""></option><!-- to allow select2 pick placeholder -->
- <option value="Prefer Not to Disclose">Prefer Not to Disclose</option>
- <option value="United States">United States</option>
- <option value="Afghanistan">Afghanistan</option>
- <option value="Africa">Africa</option>
- <option value="Albania">Albania</option>
- <option value="Algeria">Algeria</option>
- <option value="American Samoa">American Samoa</option>
- <option value="Andorra">Andorra</option>
- <option value="Angola">Angola</option>
- <option value="Anguilla">Anguilla</option>
- <option value="Antarctica">Antarctica</option>
- <option value="Antigua & Barbuda">Antigua & Barbuda</option>
- <option value="Antilles, Netherlands">Antilles, Netherlands</option>
- <option value="Arabia, Saudi">Arabia, Saudi</option>
- <option value="Argentina">Argentina</option>
- <option value="Armenia">Armenia</option>
- <option value="Aruba">Aruba</option>
- <option value="Asia">Asia</option>
- <option value="Australia">Australia</option>
- <option value="Austria">Austria</option>
- <option value="Azerbaijan">Azerbaijan</option>
- <option value="Bahamas, The">Bahamas, The</option>
- <option value="Bahrain">Bahrain</option>
- <option value="Bangladesh">Bangladesh</option>
- <option value="Barbados">Barbados</option>
- <option value="Belarus">Belarus</option>
- <option value="Belgium">Belgium</option>
- <option value="Belize">Belize</option>
- <option value="Benin">Benin</option>
- <option value="Bermuda">Bermuda</option>
- <option value="Bhutan">Bhutan</option>
- <option value="Bolivia">Bolivia</option>
- <option value="Bosnia and Herzegovina">Bosnia and Herzegovina</option>
- <option value="Botswana">Botswana</option>
- <option value="Bouvet Island">Bouvet Island</option>
- <option value="Brazil">Brazil</option>
- <option value="British Indian Ocean T.">British Indian Ocean T.</option>
- <option value="British Virgin Islands">British Virgin Islands</option>
- <option value="Brunei Darussalam">Brunei Darussalam</option>
- <option value="Bulgaria">Bulgaria</option>
- <option value="Burkina Faso">Burkina Faso</option>
- <option value="Burundi">Burundi</option>
- <option value="Cambodia">Cambodia</option>
- <option value="Cameroon">Cameroon</option>
- <option value="Canada">Canada</option>
- <option value="Cape Verde">Cape Verde</option>
- <option value="Caribbean, the">Caribbean, the</option>
- <option value="Cayman Islands">Cayman Islands</option>
- <option value="Central African Republic">Central African Republic</option>
- <option value="Central America">Central America</option>
- <option value="Chad">Chad</option>
- <option value="Chile">Chile</option>
- <option value="China">China</option>
- <option value="Christmas Island">Christmas Island</option>
- <option value="Cocos (Keeling) Islands">Cocos (Keeling) Islands</option>
- <option value="Colombia">Colombia</option>
- <option value="Comoros">Comoros</option>
- <option value="Congo">Congo</option>
- <option value="Congo, Dem. Rep. of the">Congo, Dem. Rep. of the</option>
- <option value="Cook Islands">Cook Islands</option>
- <option value="Costa Rica">Costa Rica</option>
- <option value="Cote D'Ivoire">Cote D'Ivoire</option>
- <option value="Croatia">Croatia</option>
- <option value="Cuba">Cuba</option>
- <option value="Cyprus">Cyprus</option>
- <option value="Czech Republic">Czech Republic</option>
- <option value="Denmark">Denmark</option>
- <option value="Djibouti">Djibouti</option>
- <option value="Dominica">Dominica</option>
- <option value="Dominican Republic">Dominican Republic</option>
- <option value="East Timor (Timor-Leste)">East Timor (Timor-Leste)</option>
- <option value="Ecuador">Ecuador</option>
- <option value="Egypt">Egypt</option>
- <option value="El Salvador">El Salvador</option>
- <option value="Equatorial Guinea">Equatorial Guinea</option>
- <option value="Eritrea">Eritrea</option>
- <option value="Estonia">Estonia</option>
- <option value="Ethiopia">Ethiopia</option>
- <option value="Europe">Europe</option>
- <option value="European Union">European Union</option>
- <option value="Falkland Islands (Malvinas)">Falkland Islands (Malvinas)</option>
- <option value="Faroe Islands">Faroe Islands</option>
- <option value="Fiji">Fiji</option>
- <option value="Finland">Finland</option>
- <option value="France">France</option>
- <option value="French Guiana">French Guiana</option>
- <option value="French Polynesia">French Polynesia</option>
- <option value="French Southern Terr.">French Southern Terr.</option>
- <option value="Gabon">Gabon</option>
- <option value="Gambia, the">Gambia, the</option>
- <option value="Georgia">Georgia</option>
- <option value="Germany">Germany</option>
- <option value="Ghana">Ghana</option>
- <option value="Gibraltar">Gibraltar</option>
- <option value="Greece">Greece</option>
- <option value="Greenland">Greenland</option>
- <option value="Grenada">Grenada</option>
- <option value="Guadeloupe">Guadeloupe</option>
- <option value="Guam">Guam</option>
- <option value="Guatemala">Guatemala</option>
- <option value="Guernsey and Alderney">Guernsey and Alderney</option>
- <option value="Guiana, French">Guiana, French</option>
- <option value="Guinea">Guinea</option>
- <option value="Guinea-Bissau">Guinea-Bissau</option>
- <option value="Guinea, Equatorial">Guinea, Equatorial</option>
- <option value="Guyana">Guyana</option>
- <option value="Haiti">Haiti</option>
- <option value="Heard & McDonald Is.(AU)">Heard & McDonald Is.(AU)</option>
- <option value="Holy See (Vatican)">Holy See (Vatican)</option>
- <option value="Honduras">Honduras</option>
- <option value="Hong Kong, (China)">Hong Kong, (China)</option>
- <option value="Hungary">Hungary</option>
- <option value="Iceland">Iceland</option>
- <option value="India">India</option>
- <option value="Indonesia">Indonesia</option>
- <option value="Iran, Islamic Republic of">Iran, Islamic Republic of</option>
- <option value="Iraq">Iraq</option>
- <option value="Ireland">Ireland</option>
- <option value="Israel">Israel</option>
- <option value="Italy">Italy</option>
- <option value="Ivory Coast (Cote d'Ivoire)">Ivory Coast (Cote d'Ivoire)</option>
- <option value="Jamaica">Jamaica</option>
- <option value="Japan">Japan</option>
- <option value="Jersey">Jersey</option>
- <option value="Jordan">Jordan</option>
- <option value="Kazakhstan">Kazakhstan</option>
- <option value="Kenya">Kenya</option>
- <option value="Kiribati">Kiribati</option>
- <option value="Korea Dem. People's Rep.">Korea Dem. People's Rep.</option>
- <option value="Korea, (South) Republic of">Korea, (South) Republic of</option>
- <option value="Kosovo">Kosovo</option>
- <option value="Kuwait">Kuwait</option>
- <option value="Kyrgyzstan">Kyrgyzstan</option>
- <option value="Lao People's Democ. Rep.">Lao People's Democ. Rep.</option>
- <option value="Latvia">Latvia</option>
- <option value="Lebanon">Lebanon</option>
- <option value="Lesotho">Lesotho</option>
- <option value="Liberia">Liberia</option>
- <option value="Libyan Arab Jamahiriya">Libyan Arab Jamahiriya</option>
- <option value="Liechtenstein">Liechtenstein</option>
- <option value="Lithuania">Lithuania</option>
- <option value="Luxembourg">Luxembourg</option>
- <option value="Macao, (China)">Macao, (China)</option>
- <option value="Macedonia, TFYR">Macedonia, TFYR</option>
- <option value="Madagascar">Madagascar</option>
- <option value="Malawi">Malawi</option>
- <option value="Malaysia">Malaysia</option>
- <option value="Maldives">Maldives</option>
- <option value="Mali">Mali</option>
- <option value="Malta">Malta</option>
- <option value="Man, Isle of">Man, Isle of</option>
- <option value="Marshall Islands">Marshall Islands</option>
- <option value="Martinique (FR)">Martinique (FR)</option>
- <option value="Mauritania">Mauritania</option>
- <option value="Mauritius">Mauritius</option>
- <option value="Mayotte (FR)">Mayotte (FR)</option>
- <option value="Mexico">Mexico</option>
- <option value="Micronesia, Fed. States of">Micronesia, Fed. States of</option>
- <option value="Middle East">Middle East</option>
- <option value="Moldova, Republic of">Moldova, Republic of</option>
- <option value="Monaco">Monaco</option>
- <option value="Mongolia">Mongolia</option>
- <option value="Montenegro">Montenegro</option>
- <option value="Montserrat">Montserrat</option>
- <option value="Morocco">Morocco</option>
- <option value="Mozambique">Mozambique</option>
- <option value="Myanmar (ex-Burma)">Myanmar (ex-Burma)</option>
- <option value="Namibia">Namibia</option>
- <option value="Nauru">Nauru</option>
- <option value="Nepal">Nepal</option>
- <option value="Netherlands">Netherlands</option>
- <option value="Netherlands Antilles">Netherlands Antilles</option>
- <option value="New Caledonia">New Caledonia</option>
- <option value="New Zealand">New Zealand</option>
- <option value="Nicaragua">Nicaragua</option>
- <option value="Niger">Niger</option>
- <option value="Nigeria">Nigeria</option>
- <option value="Niue">Niue</option>
- <option value="Norfolk Island">Norfolk Island</option>
- <option value="North America">North America</option>
- <option value="Northern Mariana Islands">Northern Mariana Islands</option>
- <option value="Norway">Norway</option>
- <option value="Oceania">Oceania</option>
- <option value="Oman">Oman</option>
- <option value="Pakistan">Pakistan</option>
- <option value="Palau">Palau</option>
- <option value="Palestinian Territory">Palestinian Territory</option>
- <option value="Panama">Panama</option>
- <option value="Papua New Guinea">Papua New Guinea</option>
- <option value="Paraguay">Paraguay</option>
- <option value="Peru">Peru</option>
- <option value="Philippines">Philippines</option>
- <option value="Pitcairn Island">Pitcairn Island</option>
- <option value="Poland">Poland</option>
- <option value="Portugal">Portugal</option>
- <option value="Puerto Rico">Puerto Rico</option>
- <option value="Qatar">Qatar</option>
- <option value="Reunion (FR)">Reunion (FR)</option>
- <option value="Romania">Romania</option>
- <option value="Russia (Russian Fed.)">Russia (Russian Fed.)</option>
- <option value="Rwanda">Rwanda</option>
- <option value="Sahara, Western">Sahara, Western</option>
- <option value="Saint Barthelemy (FR)">Saint Barthelemy (FR)</option>
- <option value="Saint Helena (UK)">Saint Helena (UK)</option>
- <option value="Saint Kitts and Nevis">Saint Kitts and Nevis</option>
- <option value="Saint Lucia">Saint Lucia</option>
- <option value="Saint Martin (FR)">Saint Martin (FR)</option>
- <option value="S Pierre & Miquelon(FR)">S Pierre & Miquelon(FR)</option>
- <option value="S Vincent & Grenadines">S Vincent & Grenadines</option>
- <option value="Samoa">Samoa</option>
- <option value="San Marino">San Marino</option>
- <option value="Sao Tome and Principe">Sao Tome and Principe</option>
- <option value="Saudi Arabia">Saudi Arabia</option>
- <option value="Senegal">Senegal</option>
- <option value="Serbia">Serbia</option>
- <option value="Seychelles">Seychelles</option>
- <option value="Sierra Leone">Sierra Leone</option>
- <option value="Singapore">Singapore</option>
- <option value="Slovakia">Slovakia</option>
- <option value="Slovenia">Slovenia</option>
- <option value="Solomon Islands">Solomon Islands</option>
- <option value="Somalia">Somalia</option>
- <option value="South Africa">South Africa</option>
- <option value="South America">South America</option>
- <option value="S.George & S.Sandwich">S.George & S.Sandwich</option>
- <option value="South Sudan">South Sudan</option>
- <option value="Spain">Spain</option>
- <option value="Sri Lanka (ex-Ceilan)">Sri Lanka (ex-Ceilan)</option>
- <option value="Sudan">Sudan</option>
- <option value="Suriname">Suriname</option>
- <option value="Svalbard & Jan Mayen Is.">Svalbard & Jan Mayen Is.</option>
- <option value="Swaziland">Swaziland</option>
- <option value="Sweden">Sweden</option>
- <option value="Switzerland">Switzerland</option>
- <option value="Syrian Arab Republic">Syrian Arab Republic</option>
- <option value="Taiwan">Taiwan</option>
- <option value="Tajikistan">Tajikistan</option>
- <option value="Tanzania, United Rep. of">Tanzania, United Rep. of</option>
- <option value="Thailand">Thailand</option>
- <option value="Timor-Leste (East Timor)">Timor-Leste (East Timor)</option>
- <option value="Togo">Togo</option>
- <option value="Tokelau">Tokelau</option>
- <option value="Tonga">Tonga</option>
- <option value="Trinidad & Tobago">Trinidad & Tobago</option>
- <option value="Tunisia">Tunisia</option>
- <option value="Turkey">Turkey</option>
- <option value="Turkmenistan">Turkmenistan</option>
- <option value="Turks and Caicos Is.">Turks and Caicos Is.</option>
- <option value="Tuvalu">Tuvalu</option>
- <option value="Uganda">Uganda</option>
- <option value="Ukraine">Ukraine</option>
- <option value="United Arab Emirates">United Arab Emirates</option>
- <option value="United Kingdom">United Kingdom</option>
- <option value="US Minor Outlying Isl.">US Minor Outlying Isl.</option>
- <option value="Uruguay">Uruguay</option>
- <option value="Uzbekistan">Uzbekistan</option>
- <option value="Vanuatu">Vanuatu</option>
- <option value="Vatican (Holy See)">Vatican (Holy See)</option>
- <option value="Venezuela">Venezuela</option>
- <option value="Viet Nam">Viet Nam</option>
- <option value="Virgin Islands, British">Virgin Islands, British</option>
- <option value="Virgin Islands, U.S.">Virgin Islands, U.S.</option>
- <option value="Wallis and Futuna">Wallis and Futuna</option>
- <option value="Western Sahara">Western Sahara</option>
- <option value="Yemen">Yemen</option>
- <option value="Zambia">Zambia</option>
- <option value="Zimbabwe">Zimbabwe</option>
- </select>
- <div style="padding-top:10px;"></div>
- </div>
- <div class="controls">
- <select name="about[company_size]" id="company_size" placeholder="{vtranslate('LBL_COMPANY_SIZE', $MODULE)}" style="width:250px;">
- <option value=""></option><!-- to allow select2 pick placeholder -->
- <option value="Prefer Not to Disclose">Prefer Not to Disclose</option>
- <option value="1">1</option>
- <option value="2 - 3">2 - 3</option>
- <option value="4 - 7">4 - 7</option>
- <option value="8 - 15">8 - 15</option>
- <option value="16 - 25">16 - 25</option>
- <option value="26 - 50">26 - 50</option>
- <option value="51 - 100">51 - 100</option>
- <option value="101 - 250">101 - 250</option>
- <option value="251 - 500">251 - 500</option>
- <option value="501 +">501 +</option>
- </select>
- <div style="padding-top:10px;"></div>
- </div>
- <div class="controls">
- <select name="about[company_job]" id="company_job" placeholder="{vtranslate('LBL_JOB_TITLE', $MODULE)}" style="width:250px;">
- <option value=""></option><!-- to allow select2 pick placeholder -->
- <option value="Prefer Not to Disclose">Prefer Not to Disclose</option>
- <option value="CEO/President">CEO/President</option>
- <option value="Chief Officer">Chief Officer</option>
- <option value="Vice President">Vice President</option>
- <option value="Director">Director</option>
- <option value="Manager">Manager</option>
- <option value="Project Manager">Project Manager</option>
- <option value="Specialist">Specialist</option>
- <option value="Consultant">Consultant</option>
- <option value="Employee">Employee</option>
- <option value="Other">Other</option>
- </select>
- <div style="padding-top:10px;"></div>
- </div>
- <div class="controls">
- <select name="about[department]" id="department" placeholder="{vtranslate('LBL_DEPARTMENT', $MODULE)}" style="width:250px;">
- <option value=""></option><!-- to allow select2 pick placeholder -->
- <option value="Prefer Not to Disclose">Prefer Not to Disclose</option>
- <option value="Administration">Administration</option>
- <option value="Sales">Sales</option>
- <option value="Marketing">Marketing</option>
- <option value="Support/Customer Service">Support/Customer Service</option>
- <option value="Information Technology">Information Technology</option>
- <option value="Finance/Accounting">Finance/Accounting</option>
- <option value="Business Development">Business Development</option>
- <option value="Product Development">Product Development</option>
- <option value="Professional Services">Professional Services</option>
- <option value="Project Management">Project Management</option>
- <option value="Other">Other</option>
- </select>
- <div style="padding-top:10px;"></div>
- </div>
- </div>
- {/if}
-
- <div class="span4">
- <label class="control-label"><strong>Preferences</strong> <span class="muted">{vtranslate('LBL_ALL_FIELDS_BELOW_ARE_REQUIRED', $MODULE)}</label>
-
- {if $IS_FIRST_USER}
- <div class="controls" id="currency_name_controls">
- <select name="currency_name" id="currency_name" placeholder="{vtranslate('LBL_BASE_CURRENCY', $MODULE)}" data-errormessage="{vtranslate('LBL_CHOOSE_BASE_CURRENCY', $MODULE)}" class="validate[required]" style="width:250px;">
- <option value=""></option>
+{*<!--
+/*********************************************************************************
+** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+* ("License"); You may not use this file except in compliance with the License
+* The Original Code is: vtiger CRM Open Source
+* The Initial Developer of the Original Code is vtiger.
+* Portions created by vtiger are Copyright (C) vtiger.
+* All Rights Reserved.
+*
+********************************************************************************/
+-->*}
+{strip}
+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Vtiger</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+ <link REL="SHORTCUT ICON" HREF="layouts/vlayout/skins/images/favicon.ico">
+ <link rel="stylesheet" href="libraries/bootstrap/css/bootstrap.css" type="text/css" media="screen" />
+ <link rel="stylesheet" href="resources/styles.css" type="text/css" media="screen" />
+ <link rel="stylesheet" href="libraries/jquery/select2/select2.css" />
+ <link rel="stylesheet" href="libraries/jquery/posabsolute-jQuery-Validation-Engine/css/validationEngine.jquery.css" />
+
+ <script type="text/javascript" src="libraries/jquery/jquery.min.js"></script>
+ <script type="text/javascript" src="libraries/bootstrap/js/bootstrap-tooltip.js"></script>
+ <script type="text/javascript" src="libraries/jquery/select2/select2.min.js"></script>
+ <script type="text/javascript" src="libraries/jquery/posabsolute-jQuery-Validation-Engine/js/jquery.validationEngine.js" ></script>
+ <script type="text/javascript" src="libraries/jquery/posabsolute-jQuery-Validation-Engine/js/jquery.validationEngine-en.js" ></script>
+
+ <script type="text/javascript">{literal}
+ jQuery(function(){
+ jQuery('select').select2({blurOnChange:true});
+ jQuery('[rel="tooltip"]').tooltip();
+ jQuery('form').validationEngine({
+ prettySelect: true,
+ usePrefix: 's2id_',
+ autoPositionUpdate: true,
+ promptPosition : "topLeft",
+ showOneMessage: true
+ });
+ jQuery('#currency_name_controls').mouseenter(function() {
+ jQuery('#currency_name_tooltip').tooltip('show');
+ });
+ jQuery('#currency_name_controls').mouseleave(function() {
+ jQuery('#currency_name_tooltip').tooltip('hide');
+ });
+ });
+ {/literal}</script>
+ <style type="text/css">{literal}
+ body { background: #ffffff url('layouts/vlayout/skins/images/usersetupbg.png') no-repeat center top; background-size: 100%; font-size: 14px; }
+ .modal-backdrop { opacity: 0.35; }
+ .tooltip { z-index: 1055; }
+ input, select, textarea { font-size: 14px; }
+ {/literal}</style>
+ </head>
+ <body>
+
+ <div class="container">
+ <div class="modal-backdrop"></div>
+ <form class="form" method="POST" action="index.php?module=Users&action=UserSetupSave">
+ <div class="modal" {if false && $IS_FIRST_USER}style="width: 700px;"{/if}> {* FirstUser information gather - paused *}
+ <div class="modal-header">
+ <h3>{vtranslate('LBL_ALMOST_THERE', $MODULE)}</h3>
+ </div>
+ <div class="modal-body">
+ <div class="row">
+ {if false && $IS_FIRST_USER} {* FirstUser information gather - paused *}
+ <div class="span4">
+ <label class="control-label"><strong>{vtranslate('LBL_ABOUT_ME', $MODULE)}</strong> <span class="muted">{vtranslate('LBL_WE_PROMISE_TO_KEEP_THIS_PRIVATE', $MODULE)}</span></label>
+ <div class="controls">
+ <input type="text" name="about[phone]" id="phone" placeholder="{vtranslate('LBL_PHONE', $MODULE)}" rel="tooltip" title="{vtranslate('LBL_YOUR_CONTACT_NUMBER', $MODULE)}" style="width:250px;">
+ </div>
+ <div class="controls">
+ <select name="about[country]" id="country" placeholder="{vtranslate('LBL_SELECT_COUNTRY', $MODULE)}" rel="tooltip" title="{vtranslate('LBL_WHERE_ARE_YOU_FROM', $MODULE)}" style="width:250px;">
+ <option value=""></option><!-- to allow select2 pick placeholder -->
+ <option value="Prefer Not to Disclose">Prefer Not to Disclose</option>
+ <option value="United States">United States</option>
+ <option value="Afghanistan">Afghanistan</option>
+ <option value="Africa">Africa</option>
+ <option value="Albania">Albania</option>
+ <option value="Algeria">Algeria</option>
+ <option value="American Samoa">American Samoa</option>
+ <option value="Andorra">Andorra</option>
+ <option value="Angola">Angola</option>
+ <option value="Anguilla">Anguilla</option>
+ <option value="Antarctica">Antarctica</option>
+ <option value="Antigua & Barbuda">Antigua & Barbuda</option>
+ <option value="Antilles, Netherlands">Antilles, Netherlands</option>
+ <option value="Arabia, Saudi">Arabia, Saudi</option>
+ <option value="Argentina">Argentina</option>
+ <option value="Armenia">Armenia</option>
+ <option value="Aruba">Aruba</option>
+ <option value="Asia">Asia</option>
+ <option value="Australia">Australia</option>
+ <option value="Austria">Austria</option>
+ <option value="Azerbaijan">Azerbaijan</option>
+ <option value="Bahamas, The">Bahamas, The</option>
+ <option value="Bahrain">Bahrain</option>
+ <option value="Bangladesh">Bangladesh</option>
+ <option value="Barbados">Barbados</option>
+ <option value="Belarus">Belarus</option>
+ <option value="Belgium">Belgium</option>
+ <option value="Belize">Belize</option>
+ <option value="Benin">Benin</option>
+ <option value="Bermuda">Bermuda</option>
+ <option value="Bhutan">Bhutan</option>
+ <option value="Bolivia">Bolivia</option>
+ <option value="Bosnia and Herzegovina">Bosnia and Herzegovina</option>
+ <option value="Botswana">Botswana</option>
+ <option value="Bouvet Island">Bouvet Island</option>
+ <option value="Brazil">Brazil</option>
+ <option value="British Indian Ocean T.">British Indian Ocean T.</option>
+ <option value="British Virgin Islands">British Virgin Islands</option>
+ <option value="Brunei Darussalam">Brunei Darussalam</option>
+ <option value="Bulgaria">Bulgaria</option>
+ <option value="Burkina Faso">Burkina Faso</option>
+ <option value="Burundi">Burundi</option>
+ <option value="Cambodia">Cambodia</option>
+ <option value="Cameroon">Cameroon</option>
+ <option value="Canada">Canada</option>
+ <option value="Cape Verde">Cape Verde</option>
+ <option value="Caribbean, the">Caribbean, the</option>
+ <option value="Cayman Islands">Cayman Islands</option>
+ <option value="Central African Republic">Central African Republic</option>
+ <option value="Central America">Central America</option>
+ <option value="Chad">Chad</option>
+ <option value="Chile">Chile</option>
+ <option value="China">China</option>
+ <option value="Christmas Island">Christmas Island</option>
+ <option value="Cocos (Keeling) Islands">Cocos (Keeling) Islands</option>
+ <option value="Colombia">Colombia</option>
+ <option value="Comoros">Comoros</option>
+ <option value="Congo">Congo</option>
+ <option value="Congo, Dem. Rep. of the">Congo, Dem. Rep. of the</option>
+ <option value="Cook Islands">Cook Islands</option>
+ <option value="Costa Rica">Costa Rica</option>
+ <option value="Cote D'Ivoire">Cote D'Ivoire</option>
+ <option value="Croatia">Croatia</option>
+ <option value="Cuba">Cuba</option>
+ <option value="Cyprus">Cyprus</option>
+ <option value="Czech Republic">Czech Republic</option>
+ <option value="Denmark">Denmark</option>
+ <option value="Djibouti">Djibouti</option>
+ <option value="Dominica">Dominica</option>
+ <option value="Dominican Republic">Dominican Republic</option>
+ <option value="East Timor (Timor-Leste)">East Timor (Timor-Leste)</option>
+ <option value="Ecuador">Ecuador</option>
+ <option value="Egypt">Egypt</option>
+ <option value="El Salvador">El Salvador</option>
+ <option value="Equatorial Guinea">Equatorial Guinea</option>
+ <option value="Eritrea">Eritrea</option>
+ <option value="Estonia">Estonia</option>
+ <option value="Ethiopia">Ethiopia</option>
+ <option value="Europe">Europe</option>
+ <option value="European Union">European Union</option>
+ <option value="Falkland Islands (Malvinas)">Falkland Islands (Malvinas)</option>
+ <option value="Faroe Islands">Faroe Islands</option>
+ <option value="Fiji">Fiji</option>
+ <option value="Finland">Finland</option>
+ <option value="France">France</option>
+ <option value="French Guiana">French Guiana</option>
+ <option value="French Polynesia">French Polynesia</option>
+ <option value="French Southern Terr.">French Southern Terr.</option>
+ <option value="Gabon">Gabon</option>
+ <option value="Gambia, the">Gambia, the</option>
+ <option value="Georgia">Georgia</option>
+ <option value="Germany">Germany</option>
+ <option value="Ghana">Ghana</option>
+ <option value="Gibraltar">Gibraltar</option>
+ <option value="Greece">Greece</option>
+ <option value="Greenland">Greenland</option>
+ <option value="Grenada">Grenada</option>
+ <option value="Guadeloupe">Guadeloupe</option>
+ <option value="Guam">Guam</option>
+ <option value="Guatemala">Guatemala</option>
+ <option value="Guernsey and Alderney">Guernsey and Alderney</option>
+ <option value="Guiana, French">Guiana, French</option>
+ <option value="Guinea">Guinea</option>
+ <option value="Guinea-Bissau">Guinea-Bissau</option>
+ <option value="Guinea, Equatorial">Guinea, Equatorial</option>
+ <option value="Guyana">Guyana</option>
+ <option value="Haiti">Haiti</option>
+ <option value="Heard & McDonald Is.(AU)">Heard & McDonald Is.(AU)</option>
+ <option value="Holy See (Vatican)">Holy See (Vatican)</option>
+ <option value="Honduras">Honduras</option>
+ <option value="Hong Kong, (China)">Hong Kong, (China)</option>
+ <option value="Hungary">Hungary</option>
+ <option value="Iceland">Iceland</option>
+ <option value="India">India</option>
+ <option value="Indonesia">Indonesia</option>
+ <option value="Iran, Islamic Republic of">Iran, Islamic Republic of</option>
+ <option value="Iraq">Iraq</option>
+ <option value="Ireland">Ireland</option>
+ <option value="Israel">Israel</option>
+ <option value="Italy">Italy</option>
+ <option value="Ivory Coast (Cote d'Ivoire)">Ivory Coast (Cote d'Ivoire)</option>
+ <option value="Jamaica">Jamaica</option>
+ <option value="Japan">Japan</option>
+ <option value="Jersey">Jersey</option>
+ <option value="Jordan">Jordan</option>
+ <option value="Kazakhstan">Kazakhstan</option>
+ <option value="Kenya">Kenya</option>
+ <option value="Kiribati">Kiribati</option>
+ <option value="Korea Dem. People's Rep.">Korea Dem. People's Rep.</option>
+ <option value="Korea, (South) Republic of">Korea, (South) Republic of</option>
+ <option value="Kosovo">Kosovo</option>
+ <option value="Kuwait">Kuwait</option>
+ <option value="Kyrgyzstan">Kyrgyzstan</option>
+ <option value="Lao People's Democ. Rep.">Lao People's Democ. Rep.</option>
+ <option value="Latvia">Latvia</option>
+ <option value="Lebanon">Lebanon</option>
+ <option value="Lesotho">Lesotho</option>
+ <option value="Liberia">Liberia</option>
+ <option value="Libyan Arab Jamahiriya">Libyan Arab Jamahiriya</option>
+ <option value="Liechtenstein">Liechtenstein</option>
+ <option value="Lithuania">Lithuania</option>
+ <option value="Luxembourg">Luxembourg</option>
+ <option value="Macao, (China)">Macao, (China)</option>
+ <option value="Macedonia, TFYR">Macedonia, TFYR</option>
+ <option value="Madagascar">Madagascar</option>
+ <option value="Malawi">Malawi</option>
+ <option value="Malaysia">Malaysia</option>
+ <option value="Maldives">Maldives</option>
+ <option value="Mali">Mali</option>
+ <option value="Malta">Malta</option>
+ <option value="Man, Isle of">Man, Isle of</option>
+ <option value="Marshall Islands">Marshall Islands</option>
+ <option value="Martinique (FR)">Martinique (FR)</option>
+ <option value="Mauritania">Mauritania</option>
+ <option value="Mauritius">Mauritius</option>
+ <option value="Mayotte (FR)">Mayotte (FR)</option>
+ <option value="Mexico">Mexico</option>
+ <option value="Micronesia, Fed. States of">Micronesia, Fed. States of</option>
+ <option value="Middle East">Middle East</option>
+ <option value="Moldova, Republic of">Moldova, Republic of</option>
+ <option value="Monaco">Monaco</option>
+ <option value="Mongolia">Mongolia</option>
+ <option value="Montenegro">Montenegro</option>
+ <option value="Montserrat">Montserrat</option>
+ <option value="Morocco">Morocco</option>
+ <option value="Mozambique">Mozambique</option>
+ <option value="Myanmar (ex-Burma)">Myanmar (ex-Burma)</option>
+ <option value="Namibia">Namibia</option>
+ <option value="Nauru">Nauru</option>
+ <option value="Nepal">Nepal</option>
+ <option value="Netherlands">Netherlands</option>
+ <option value="Netherlands Antilles">Netherlands Antilles</option>
+ <option value="New Caledonia">New Caledonia</option>
+ <option value="New Zealand">New Zealand</option>
+ <option value="Nicaragua">Nicaragua</option>
+ <option value="Niger">Niger</option>
+ <option value="Nigeria">Nigeria</option>
+ <option value="Niue">Niue</option>
+ <option value="Norfolk Island">Norfolk Island</option>
+ <option value="North America">North America</option>
+ <option value="Northern Mariana Islands">Northern Mariana Islands</option>
+ <option value="Norway">Norway</option>
+ <option value="Oceania">Oceania</option>
+ <option value="Oman">Oman</option>
+ <option value="Pakistan">Pakistan</option>
+ <option value="Palau">Palau</option>
+ <option value="Palestinian Territory">Palestinian Territory</option>
+ <option value="Panama">Panama</option>
+ <option value="Papua New Guinea">Papua New Guinea</option>
+ <option value="Paraguay">Paraguay</option>
+ <option value="Peru">Peru</option>
+ <option value="Philippines">Philippines</option>
+ <option value="Pitcairn Island">Pitcairn Island</option>
+ <option value="Poland">Poland</option>
+ <option value="Portugal">Portugal</option>
+ <option value="Puerto Rico">Puerto Rico</option>
+ <option value="Qatar">Qatar</option>
+ <option value="Reunion (FR)">Reunion (FR)</option>
+ <option value="Romania">Romania</option>
+ <option value="Russia (Russian Fed.)">Russia (Russian Fed.)</option>
+ <option value="Rwanda">Rwanda</option>
+ <option value="Sahara, Western">Sahara, Western</option>
+ <option value="Saint Barthelemy (FR)">Saint Barthelemy (FR)</option>
+ <option value="Saint Helena (UK)">Saint Helena (UK)</option>
+ <option value="Saint Kitts and Nevis">Saint Kitts and Nevis</option>
+ <option value="Saint Lucia">Saint Lucia</option>
+ <option value="Saint Martin (FR)">Saint Martin (FR)</option>
+ <option value="S Pierre & Miquelon(FR)">S Pierre & Miquelon(FR)</option>
+ <option value="S Vincent & Grenadines">S Vincent & Grenadines</option>
+ <option value="Samoa">Samoa</option>
+ <option value="San Marino">San Marino</option>
+ <option value="Sao Tome and Principe">Sao Tome and Principe</option>
+ <option value="Saudi Arabia">Saudi Arabia</option>
+ <option value="Senegal">Senegal</option>
+ <option value="Serbia">Serbia</option>
+ <option value="Seychelles">Seychelles</option>
+ <option value="Sierra Leone">Sierra Leone</option>
+ <option value="Singapore">Singapore</option>
+ <option value="Slovakia">Slovakia</option>
+ <option value="Slovenia">Slovenia</option>
+ <option value="Solomon Islands">Solomon Islands</option>
+ <option value="Somalia">Somalia</option>
+ <option value="South Africa">South Africa</option>
+ <option value="South America">South America</option>
+ <option value="S.George & S.Sandwich">S.George & S.Sandwich</option>
+ <option value="South Sudan">South Sudan</option>
+ <option value="Spain">Spain</option>
+ <option value="Sri Lanka (ex-Ceilan)">Sri Lanka (ex-Ceilan)</option>
+ <option value="Sudan">Sudan</option>
+ <option value="Suriname">Suriname</option>
+ <option value="Svalbard & Jan Mayen Is.">Svalbard & Jan Mayen Is.</option>
+ <option value="Swaziland">Swaziland</option>
+ <option value="Sweden">Sweden</option>
+ <option value="Switzerland">Switzerland</option>
+ <option value="Syrian Arab Republic">Syrian Arab Republic</option>
+ <option value="Taiwan">Taiwan</option>
+ <option value="Tajikistan">Tajikistan</option>
+ <option value="Tanzania, United Rep. of">Tanzania, United Rep. of</option>
+ <option value="Thailand">Thailand</option>
+ <option value="Timor-Leste (East Timor)">Timor-Leste (East Timor)</option>
+ <option value="Togo">Togo</option>
+ <option value="Tokelau">Tokelau</option>
+ <option value="Tonga">Tonga</option>
+ <option value="Trinidad & Tobago">Trinidad & Tobago</option>
+ <option value="Tunisia">Tunisia</option>
+ <option value="Turkey">Turkey</option>
+ <option value="Turkmenistan">Turkmenistan</option>
+ <option value="Turks and Caicos Is.">Turks and Caicos Is.</option>
+ <option value="Tuvalu">Tuvalu</option>
+ <option value="Uganda">Uganda</option>
+ <option value="Ukraine">Ukraine</option>
+ <option value="United Arab Emirates">United Arab Emirates</option>
+ <option value="United Kingdom">United Kingdom</option>
+ <option value="US Minor Outlying Isl.">US Minor Outlying Isl.</option>
+ <option value="Uruguay">Uruguay</option>
+ <option value="Uzbekistan">Uzbekistan</option>
+ <option value="Vanuatu">Vanuatu</option>
+ <option value="Vatican (Holy See)">Vatican (Holy See)</option>
+ <option value="Venezuela">Venezuela</option>
+ <option value="Viet Nam">Viet Nam</option>
+ <option value="Virgin Islands, British">Virgin Islands, British</option>
+ <option value="Virgin Islands, U.S.">Virgin Islands, U.S.</option>
+ <option value="Wallis and Futuna">Wallis and Futuna</option>
+ <option value="Western Sahara">Western Sahara</option>
+ <option value="Yemen">Yemen</option>
+ <option value="Zambia">Zambia</option>
+ <option value="Zimbabwe">Zimbabwe</option>
+ </select>
+ <div style="padding-top:10px;"></div>
+ </div>
+ <div class="controls">
+ <select name="about[company_size]" id="company_size" placeholder="{vtranslate('LBL_COMPANY_SIZE', $MODULE)}" style="width:250px;">
+ <option value=""></option><!-- to allow select2 pick placeholder -->
+ <option value="Prefer Not to Disclose">Prefer Not to Disclose</option>
+ <option value="1">1</option>
+ <option value="2 - 3">2 - 3</option>
+ <option value="4 - 7">4 - 7</option>
+ <option value="8 - 15">8 - 15</option>
+ <option value="16 - 25">16 - 25</option>
+ <option value="26 - 50">26 - 50</option>
+ <option value="51 - 100">51 - 100</option>
+ <option value="101 - 250">101 - 250</option>
+ <option value="251 - 500">251 - 500</option>
+ <option value="501 +">501 +</option>
+ </select>
+ <div style="padding-top:10px;"></div>
+ </div>
+ <div class="controls">
+ <select name="about[company_job]" id="company_job" placeholder="{vtranslate('LBL_JOB_TITLE', $MODULE)}" style="width:250px;">
+ <option value=""></option><!-- to allow select2 pick placeholder -->
+ <option value="Prefer Not to Disclose">Prefer Not to Disclose</option>
+ <option value="CEO/President">CEO/President</option>
+ <option value="Chief Officer">Chief Officer</option>
+ <option value="Vice President">Vice President</option>
+ <option value="Director">Director</option>
+ <option value="Manager">Manager</option>
+ <option value="Project Manager">Project Manager</option>
+ <option value="Specialist">Specialist</option>
+ <option value="Consultant">Consultant</option>
+ <option value="Employee">Employee</option>
+ <option value="Other">Other</option>
+ </select>
+ <div style="padding-top:10px;"></div>
+ </div>
+ <div class="controls">
+ <select name="about[department]" id="department" placeholder="{vtranslate('LBL_DEPARTMENT', $MODULE)}" style="width:250px;">
+ <option value=""></option><!-- to allow select2 pick placeholder -->
+ <option value="Prefer Not to Disclose">Prefer Not to Disclose</option>
+ <option value="Administration">Administration</option>
+ <option value="Sales">Sales</option>
+ <option value="Marketing">Marketing</option>
+ <option value="Support/Customer Service">Support/Customer Service</option>
+ <option value="Information Technology">Information Technology</option>
+ <option value="Finance/Accounting">Finance/Accounting</option>
+ <option value="Business Development">Business Development</option>
+ <option value="Product Development">Product Development</option>
+ <option value="Professional Services">Professional Services</option>
+ <option value="Project Management">Project Management</option>
+ <option value="Other">Other</option>
+ </select>
+ <div style="padding-top:10px;"></div>
+ </div>
+ </div>
+ {/if}
+
+ <div class="span4">
+ <label class="control-label"><strong>{vtranslate('Preferences', $MODULE)}</strong> <span class="muted">{vtranslate('LBL_ALL_FIELDS_BELOW_ARE_REQUIRED', $MODULE)}</label>
+
+ {if $IS_FIRST_USER}
+ <div class="controls" id="currency_name_controls">
+ <select name="currency_name" id="currency_name" placeholder="{vtranslate('LBL_BASE_CURRENCY', $MODULE)}" data-errormessage="{vtranslate('LBL_CHOOSE_BASE_CURRENCY', $MODULE)}" class="validate[required]" style="width:250px;">
+ <option value=""></option>
{foreach key=header item=currency from=$CURRENCIES}
- <!--Open source fix to select user preferred currency during installation -->
- <option value="{$header}" {if $header eq $CURRENT_USER_MODEL->get('currency_name')}selected{/if}>{$header|@getTranslatedCurrencyString}({$currency.1})</option>
- {/foreach}
- </select>
-
- <span rel="tooltip" title="{vtranslate('LBL_OPERATING_CURRENCY', $MODULE)}" id="currency_name_tooltip" class="icon-info-sign"></span>
- <div style="padding-top:10px;"></div>
- </div>
- {/if}
-
- <div class="controls">
- <select name="lang_name" id="lang_name" style="width:250px;" placeholder="{vtranslate('LBL_LANGUAGE', $MODULE)}" data-errormessage="{vtranslate('LBL_CHOOSE_LANGUAGE', $MODULE)}" class="validate[required]">
- <option value=""></option>
- {foreach key=header item=language from=$LANGUAGES}
- <option value="{$header}" {if $header eq $CURRENT_USER_MODEL->get('language')}selected{/if}>{$language|@getTranslatedString:$MODULE}</option>
- {/foreach}
- </select>
- <div style="padding-top:10px;"></div>
- </div>
- <div class="controls">
- <select name="time_zone" id="time_zone" style="width:250px;" placeholder="{vtranslate('LBL_CHOOSE_TIMEZONE', $MODULE)}" data-errormessage="{vtranslate('LBL_CHOOSE_TIMEZONE', $MODULE)}" class="validate[required]">
- <option value=""></option>
- {foreach key=header item=time_zone from=$TIME_ZONES}
- <option value="{$header}" {if $header eq $CURRENT_USER_MODEL->get('time_zone')}selected{/if}>{$time_zone|@getTranslatedString:$MODULE}</option>
- {/foreach}
- </select>
- <div style="padding-top:10px;"></div>
- </div>
- <div class="controls">
- <select name="date_format" id="date_format" style="width:250px;" placeholder="{vtranslate('LBL_DATE_FORMAT', $MODULE)}" data-errormessage="{vtranslate('LBL_CHOOSE_DATE_FORMAT', $MODULE)}" class="validate[required]">
- <option value=""></option>
- <option value="dd-mm-yyyy" {if $CURRENT_USER_MODEL->get('date_format') eq "dd-mm-yyyy"} selected{/if}>dd-mm-yyyy</option>
- <option value="mm-dd-yyyy" {if $CURRENT_USER_MODEL->get('date_format') eq "mm-dd-yyyy"} selected{/if}>mm-dd-yyyy</option>
- <option value="yyyy-mm-dd" {if $CURRENT_USER_MODEL->get('date_format') eq "yyyy-mm-dd"} selected{/if}>yyyy-mm-dd</option>
- </select>
- <div style="padding-top:10px;"></div>
- </div>
- </div>
- </div>
- </div>
- <div class="modal-footer">
- <button class="btn btn-success" type="submit">{vtranslate('LBL_GET_STARTED', $MODULE)}</button>
- </div>
- </div>
- </form>
- </div>
-
- </body>
-</html>
-{/strip}
+ <!--Open source fix to select user preferred currency during installation -->
+ <option value="{$header}" {if $header eq $CURRENT_USER_MODEL->get('currency_name')}selected{/if}>{$header|@getTranslatedCurrencyString}({$currency.1})</option>
+ {/foreach}
+ </select>
+
+ <span rel="tooltip" title="{vtranslate('LBL_OPERATING_CURRENCY', $MODULE)}" id="currency_name_tooltip" class="icon-info-sign"></span>
+ <div style="padding-top:10px;"></div>
+ </div>
+ {/if}
+
+ <div class="controls">
+ <select name="lang_name" id="lang_name" style="width:250px;" placeholder="{vtranslate('LBL_LANGUAGE', $MODULE)}" data-errormessage="{vtranslate('LBL_CHOOSE_LANGUAGE', $MODULE)}" class="validate[required]">
+ <option value=""></option>
+ {foreach key=header item=language from=$LANGUAGES}
+ <option value="{$header}" {if $header eq $CURRENT_USER_MODEL->get('language')}selected{/if}>{$language|@getTranslatedString:$MODULE}</option>
+ {/foreach}
+ </select>
+ <div style="padding-top:10px;"></div>
+ </div>
+ <div class="controls">
+ <select name="time_zone" id="time_zone" style="width:250px;" placeholder="{vtranslate('LBL_CHOOSE_TIMEZONE', $MODULE)}" data-errormessage="{vtranslate('LBL_CHOOSE_TIMEZONE', $MODULE)}" class="validate[required]">
+ <option value=""></option>
+ {foreach key=header item=time_zone from=$TIME_ZONES}
+ <option value="{$header}" {if $header eq $CURRENT_USER_MODEL->get('time_zone')}selected{/if}>{$time_zone|@getTranslatedString:$MODULE}</option>
+ {/foreach}
+ </select>
+ <div style="padding-top:10px;"></div>
+ </div>
+ <div class="controls">
+ <select name="date_format" id="date_format" style="width:250px;" placeholder="{vtranslate('LBL_DATE_FORMAT', $MODULE)}" data-errormessage="{vtranslate('LBL_CHOOSE_DATE_FORMAT', $MODULE)}" class="validate[required]">
+ <option value=""></option>
+ <option value="dd-mm-yyyy" {if $CURRENT_USER_MODEL->get('date_format') eq "dd-mm-yyyy"} selected{/if}>dd-mm-yyyy</option>
+ <option value="mm-dd-yyyy" {if $CURRENT_USER_MODEL->get('date_format') eq "mm-dd-yyyy"} selected{/if}>mm-dd-yyyy</option>
+ <option value="yyyy-mm-dd" {if $CURRENT_USER_MODEL->get('date_format') eq "yyyy-mm-dd"} selected{/if}>yyyy-mm-dd</option>
+ </select>
+ <div style="padding-top:10px;"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="modal-footer">
+ <button class="btn btn-success" type="submit">{vtranslate('LBL_GET_STARTED', $MODULE)}</button>
+ </div>
+ </div>
+ </form>
+ </div>
+
+ </body>
+</html>
+{/strip}
diff --git a/layouts/vlayout/modules/Vtiger/MenuBar.tpl b/layouts/vlayout/modules/Vtiger/MenuBar.tpl
index cbce281797c407ec58c09ad628a3f0dc7701c97e..2fdfcdc5ae98c8713b48380fb5feb5958c5436bb 100644
--- a/layouts/vlayout/modules/Vtiger/MenuBar.tpl
+++ b/layouts/vlayout/modules/Vtiger/MenuBar.tpl
@@ -128,7 +128,7 @@
<span id="headerLinksBig" class="pull-right headerLinksContainer">
<span class="dropdown span settingIcons">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
- <img src="{vimage_path('theme_brush.png')}" alt="theme roller" title="Theme Roller" />
+ <img src="{vimage_path('theme_brush.png')}" alt="theme roller" title="{vtranslate('Theme Roller',$MODULE)}" />
</a>
<ul class="dropdown-menu themeMenuContainer">
<div id="themeContainer">
diff --git a/layouts/vlayout/modules/Vtiger/MergeRecords.tpl b/layouts/vlayout/modules/Vtiger/MergeRecords.tpl
index 0b94f7747d8ba42f5b2bce115fcea5ede231c7f3..d9d2ae3d1341a8cfa5a47324048ccfeab5a6b437 100644
--- a/layouts/vlayout/modules/Vtiger/MergeRecords.tpl
+++ b/layouts/vlayout/modules/Vtiger/MergeRecords.tpl
@@ -13,7 +13,7 @@
<div style='background: white;'>
<div>
<br>
- <div style='margin-left:10px'><h3>{vtranslate('LBL_MERGE_RECORDS_IN', $MODULE)} > {$MODULE}</h3></div><br>
+ <div style='margin-left:10px'><h3>{vtranslate('LBL_MERGE_RECORDS_IN', $MODULE)} > {vtranslate($MODULE, $MODULE)}</h3></div><br>
<div class='alert-info'>{vtranslate('LBL_MERGE_RECORDS_DESCRIPTION', $MODULE)}</div>
</div>
diff --git a/layouts/vlayout/modules/Vtiger/RecentActivities.tpl b/layouts/vlayout/modules/Vtiger/RecentActivities.tpl
index 0d49a85d07bc4a896ed83d7b03ce8134c4beb33c..dcdc7041a461ea325a81e85ace87de22d99c8a6d 100644
--- a/layouts/vlayout/modules/Vtiger/RecentActivities.tpl
+++ b/layouts/vlayout/modules/Vtiger/RecentActivities.tpl
@@ -64,7 +64,8 @@
<li>
<div class="row-fluid">
{assign var=RELATION value=$RECENT_ACTIVITY->getRelationInstance()}
- <span>{vtranslate($RELATION->getLinkedRecord()->getModuleName(), $RELATION->getLinkedRecord()->getModuleName())}</span> <span>
+ <span><strong>{$RECENT_ACTIVITY->getModifiedBy()->getName()} </strong></span>
+ <span>
{if $RECENT_ACTIVITY->isRelationLink()}
{vtranslate('LBL_ADDED', $MODULE_NAME)}
{else}
@@ -73,6 +74,7 @@
{if $RELATION->getLinkedRecord()->getModuleName() eq 'Calendar'}
{if isPermitted('Calendar', 'DetailView', $RELATION->getLinkedRecord()->getId()) eq 'yes'} <strong>{$RELATION->getLinkedRecord()->getName()}</strong> {else} {/if}
{else} <strong>{$RELATION->getLinkedRecord()->getName()}</strong> {/if}</span>
+ (<span>{vtranslate($RELATION->getLinkedRecord()->getModuleName(), $RELATION->getLinkedRecord()->getModuleName())}</span>)
<span class="pull-right"><p class="muted"><small title="{Vtiger_Util_Helper::formatDateTimeIntoDayString($RELATION->get('changedon'))}">{Vtiger_Util_Helper::formatDateDiffInStrings($RELATION->get('changedon'))}</small></p></span>
</div>
</li>
@@ -99,4 +101,4 @@
</div>
<span class="clearfix"></span>
</div>
-{/strip}
\ No newline at end of file
+{/strip}
diff --git a/layouts/vlayout/modules/Vtiger/RecordNamesList.tpl b/layouts/vlayout/modules/Vtiger/RecordNamesList.tpl
index ec395996437592bc8e5a2270574202e15952b1c7..55d1db8a21cc4556cdd87a4ee48abef89bba6e7c 100644
--- a/layouts/vlayout/modules/Vtiger/RecordNamesList.tpl
+++ b/layouts/vlayout/modules/Vtiger/RecordNamesList.tpl
@@ -27,4 +27,4 @@
</div>
</div>
</div>
-{/strip}
\ No newline at end of file
+{/strip}
diff --git a/layouts/vlayout/modules/Vtiger/dashboards/MiniListWizard.tpl b/layouts/vlayout/modules/Vtiger/dashboards/MiniListWizard.tpl
index 679ff6b9aa2a87b4703a9febda83a1da4d44014e..729f2151cffd7d41f6e34acd5e4329ede75a8a50 100644
--- a/layouts/vlayout/modules/Vtiger/dashboards/MiniListWizard.tpl
+++ b/layouts/vlayout/modules/Vtiger/dashboards/MiniListWizard.tpl
@@ -57,7 +57,7 @@
{elseif $WIZARD_STEP eq 'step2'}
<option></option>
{foreach from=$ALLFILTERS item=FILTERS key=FILTERGROUP}
- <optgroup label="{$FILTERGROUP}">
+ <optgroup label="{vtranslate($FILTERGROUP)}">
{foreach from=$FILTERS item=FILTER key=FILTERNAME}
<option value="{$FILTER->getId()}">{$FILTER->get('viewname')}</option>
{/foreach}
@@ -69,4 +69,4 @@
<option value="{$FIELD_NAME}">{vtranslate($FIELD->getFieldLabelKey(),$SELECTED_MODULE)}</option>
{/foreach}
{/if}
-{/strip}
\ No newline at end of file
+{/strip}
diff --git a/layouts/vlayout/modules/Vtiger/resources/Vtiger.js b/layouts/vlayout/modules/Vtiger/resources/Vtiger.js
index 09900085c9e7fc62dbe446f13fa13f9b76e87de8..2f988a692c5997107438a78f6a228b3b87e64907 100644
--- a/layouts/vlayout/modules/Vtiger/resources/Vtiger.js
+++ b/layouts/vlayout/modules/Vtiger/resources/Vtiger.js
@@ -382,6 +382,8 @@ var Vtiger_Index_Js = {
jQuery('button[name="vtTooltipClose"]').on('click', function(e){
var lastPopover = lastPopovers.pop();
lastPopover.popover('hide');
+ // Fix suggested http://code.vtiger.com/vtiger/vtigercrm/issues/43
+ jQuery('.popover').css( "display", "none", "important");
});
}
},
@@ -436,4 +438,4 @@ jQuery(document).ready(function() {
app.listenPostAjaxReady(function() {
Vtiger_Index_Js.registerPostAjaxEvents();
});
-});
\ No newline at end of file
+});
diff --git a/layouts/vlayout/modules/Vtiger/uitypes/Image.tpl b/layouts/vlayout/modules/Vtiger/uitypes/Image.tpl
index 838cbf3b4c6d1f20a28667385bd97aea46d15804..fa3de99f5432c6c883fdf13ec84f1c98ce24fa40 100644
--- a/layouts/vlayout/modules/Vtiger/uitypes/Image.tpl
+++ b/layouts/vlayout/modules/Vtiger/uitypes/Image.tpl
@@ -26,7 +26,7 @@
<span class="span8" name="existingImages"><img src="{$IMAGE_INFO.path}_{$IMAGE_INFO.orgname}" data-image-id="{$IMAGE_INFO.id}"></span>
<span class="span3 row-fluid">
<span class="row-fluid">[{$IMAGE_INFO.name}]</span>
- <span class="row-fluid"><input type="button" id="file_{$ITER}" value="Delete" class="imageDelete"></span>
+ <span class="row-fluid"><input type="button" id="file_{$ITER}" value={vtranslate("LBL_DELETE")} class="imageDelete"></span>
</span>
{/if}
</div>
diff --git a/layouts/vlayout/modules/Vtiger/uitypes/StringDetailView.tpl b/layouts/vlayout/modules/Vtiger/uitypes/StringDetailView.tpl
index 89c4de2c2b213a5fb06604edba4910654ee3bea3..c6dcdb4e7eef304aa67e5953a49d2b90910667fa 100644
--- a/layouts/vlayout/modules/Vtiger/uitypes/StringDetailView.tpl
+++ b/layouts/vlayout/modules/Vtiger/uitypes/StringDetailView.tpl
@@ -12,4 +12,4 @@
{* TODO: Review the order of parameters - good to eliminate $RECORD->getId, $RECORD should be used *}
-{$FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'), $RECORD->getId(), $RECORD)}
\ No newline at end of file
+{$FIELD_MODEL->getDisplayValue($FIELD_MODEL->get('fieldvalue'), $RECORD->getId(), $RECORD)}
diff --git a/modules/Contacts/ContactsHandler.php b/modules/Contacts/ContactsHandler.php
index 3bac7d4a38f620f6c58ba991feec1b27e4c60414..972f44a2ab9ca8797050239b6a768d5147dee132 100644
--- a/modules/Contacts/ContactsHandler.php
+++ b/modules/Contacts/ContactsHandler.php
@@ -14,7 +14,8 @@ function Contacts_sendCustomerPortalLoginDetails($entityData){
$wsId = $entityData->getId();
$parts = explode('x', $wsId);
$entityId = $parts[1];
-
+ $entityDelta = new VTEntityDelta();
+ $portalChanged = $entityDelta->hasChanged($moduleName, $entityId, 'portal');
$email = $entityData->get('email');
if ($entityData->get('portal') == 'on' || $entityData->get('portal') == '1') {
@@ -29,9 +30,8 @@ function Contacts_sendCustomerPortalLoginDetails($entityData){
if($email == $dbusername && $isactive == 1 && !$entityData->isNew()){
$update = false;
} else if($entityData->get('portal') == 'on' || $entityData->get('portal') == '1'){
- $sql = "UPDATE vtiger_portalinfo SET user_name=?, isactive=1 WHERE id=?";
- $adb->pquery($sql, array($email, $entityId));
- $password = $adb->query_result($result,0,'user_password');
+ $sql = "UPDATE vtiger_portalinfo SET user_name=?, isactive=? WHERE id=?";
+ $adb->pquery($sql, array($email, 1, $entityId));
$update = true;
} else {
$sql = "UPDATE vtiger_portalinfo SET user_name=?, isactive=? WHERE id=?";
@@ -39,19 +39,38 @@ function Contacts_sendCustomerPortalLoginDetails($entityData){
$update = false;
}
}
- if($insert == true){
- $password = makeRandomPassword();
+ $password = makeRandomPassword();
+ $md5_password = md5($password);
+ if ($insert == true) {
$sql = "INSERT INTO vtiger_portalinfo(id,user_name,user_password,type,isactive) VALUES(?,?,?,?,?)";
- $params = array($entityId, $email, $password, 'C', 1);
+ $params = array($entityId, $email, $md5_password, 'C', 1);
$adb->pquery($sql, $params);
}
-
- if($insert == true || $update == true) {
+ if ($update == true && $portalChanged == true) {
+ $sql = "UPDATE vtiger_portalinfo SET user_password=? WHERE id=?";
+ $params = array($md5_password, $entityId);
+ $adb->pquery($sql, $params);
+ }
+ if (($insert == true || ($update = true && $portalChanged == true)) && $entityData->get('emailoptout') == 0) {
global $current_user,$HELPDESK_SUPPORT_EMAIL_ID, $HELPDESK_SUPPORT_NAME;
require_once("modules/Emails/mail.php");
$emailData = Contacts::getPortalEmailContents($entityData,$password,'LoginDetails');
$subject = $emailData['subject'];
+ if(empty($subject)) {
+ $subject = 'Customer Portal Login Details';
+ }
$contents = $emailData['body'];
+ $contents= decode_html(getMergedDescription($contents, $entityId, 'Contacts'));
+ if(empty($contents)) {
+ require_once 'config.inc.php';
+ global $PORTAL_URL;
+ $contents = 'LoginDetails';
+ $contents .= "<br><br> User ID : ".$entityData->get('email');
+ $contents .= "<br> Password: ".$password;
+ $portalURL = vtranslate('Please ',$moduleName).'<a href="'.$PORTAL_URL.'" style="font-family:Arial, Helvetica, sans-serif;font-size:13px;">'. vtranslate('click here', $moduleName).'</a>';
+ $contents .= "<br>".$portalURL;
+ }
+ $subject= decode_html(getMergedDescription($subject, $entityId,'Contacts'));
send_mail('Contacts', $entityData->get('email'), $HELPDESK_SUPPORT_NAME, $HELPDESK_SUPPORT_EMAIL_ID, $subject, $contents,'','','','','',true);
}
} else {
diff --git a/modules/Migration/models/Module.php b/modules/Migration/models/Module.php
index a3ddece73d3cccb3bcf3c6ad4945f4557e94457c..017ef11c5109099585372102d25f3f9385ef789f 100644
--- a/modules/Migration/models/Module.php
+++ b/modules/Migration/models/Module.php
@@ -33,7 +33,8 @@ class Migration_Module_Model extends Vtiger_Module_Model {
array('610' => '6.1.0'),
array('620' => '6.2.0'),
array('630' => '6.3.0'),
- array('640' => '6.4.0')
+ array('640' => '6.4.0'),
+ array('650' => '6.5.0')
);
return $versions;
}
diff --git a/modules/Migration/schema/640_to_650.php b/modules/Migration/schema/640_to_650.php
new file mode 100644
index 0000000000000000000000000000000000000000..432024594bba15a8e3d49c76429e8241d3a68934
--- /dev/null
+++ b/modules/Migration/schema/640_to_650.php
@@ -0,0 +1,24 @@
+<?php
+/*+********************************************************************************
+ * The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is: vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+ *********************************************************************************/
+
+if(defined('VTIGER_UPGRADE')) {
+
+//Start add new currency - 'CFP Franc or Pacific Franc'
+global $db;
+
+//Updating existing users password to thier md5 hash
+
+$selectQuery = 'SELECT 1 FROM vtiger_portalinfo';
+$resultSet = $db->pquery($selectQuery, array());
+if ($db->num_rows($resultSet) > 0) {
+ $updateQuery = 'UPDATE vtiger_portalinfo SET user_password=MD5(user_password)';
+ $db->pquery($updateQuery, array());
+}
+}
\ No newline at end of file
diff --git a/modules/Reports/ReportRun.php b/modules/Reports/ReportRun.php
index dd983d759c73aa918c86b8512afa616e852cf83a..7cf348876dda5f5e9b6d5f74e1b784682a1effcb 100644
--- a/modules/Reports/ReportRun.php
+++ b/modules/Reports/ReportRun.php
@@ -619,7 +619,9 @@ class ReportRun extends CRMEntity
foreach($fieldSqlColumns as $columnSql) {
$queryColumn .= " WHEN $columnSql NOT LIKE '' THEN $columnSql";
}
- $queryColumn .= " ELSE '' END) ELSE '' END) AS $moduleFieldLabel";
+ // Fix for http://code.vtiger.com/vtiger/vtigercrm/issues/48
+ $moduleFieldLabel = vtlib_purify(decode_html($moduleFieldLabel));
+ $queryColumn .= " ELSE '' END) ELSE '' END) AS '$moduleFieldLabel'";
$this->queryPlanner->addTable($tableName);
}
}
diff --git a/modules/SalesOrder/models/DetailView.php b/modules/SalesOrder/models/DetailView.php
index 5e3950251f229a0fe2e815508be217fef1de329f..0f06754c5498803d3a2dcae4036e34b5c4e5e7fd 100644
--- a/modules/SalesOrder/models/DetailView.php
+++ b/modules/SalesOrder/models/DetailView.php
@@ -32,6 +32,17 @@ class SalesOrder_DetailView_Model extends Inventory_DetailView_Model {
);
$linkModelList['DETAILVIEW'][] = Vtiger_Link_Model::getInstanceFromValues($basicActionLink);
}
+
+ $purchaseOrderModuleModel = Vtiger_Module_Model::getInstance('PurchaseOrder');
+ if($currentUserModel->hasModuleActionPermission($purchaseOrderModuleModel->getId(), 'EditView')) {
+ $basicActionLink = array(
+ 'linktype' => 'DETAILVIEW',
+ 'linklabel' => vtranslate('LBL_CREATE').' '.vtranslate($purchaseOrderModuleModel->getSingularLabelKey(), 'PurchaseOrder'),
+ 'linkurl' => $recordModel->getCreatePurchaseOrderUrl(),
+ 'linkicon' => ''
+ );
+ $linkModelList['DETAILVIEW'][] = Vtiger_Link_Model::getInstanceFromValues($basicActionLink);
+ }
return $linkModelList;
}
diff --git a/modules/SalesOrder/models/Record.php b/modules/SalesOrder/models/Record.php
index 10b807b4316badcb8e19c0835bd022d3660c8361..ed554b25d94f25b3282d0c450c6a01ece5e18fdb 100644
--- a/modules/SalesOrder/models/Record.php
+++ b/modules/SalesOrder/models/Record.php
@@ -18,5 +18,10 @@ class SalesOrder_Record_Model extends Inventory_Record_Model {
return "index.php?module=".$invoiceModuleModel->getName()."&view=".$invoiceModuleModel->getEditViewName()."&salesorder_id=".$this->getId();
}
+
+ function getCreatePurchaseOrderUrl() {
+ $purchaseOrderModuleModel = Vtiger_Module_Model::getInstance('PurchaseOrder');
+ return "index.php?module=".$purchaseOrderModuleModel->getName()."&view=".$purchaseOrderModuleModel->getEditViewName()."&salesorder_id=".$this->getId();
+ }
}
\ No newline at end of file
diff --git a/modules/Vtiger/actions/ExportData.php b/modules/Vtiger/actions/ExportData.php
index 737775290901f328c6f1d4d87a4ee6506832187b..d43d99546e9d12c702e5eb45c09b0dc76fb21fe6 100644
--- a/modules/Vtiger/actions/ExportData.php
+++ b/modules/Vtiger/actions/ExportData.php
@@ -176,6 +176,10 @@ class Vtiger_ExportData_Action extends Vtiger_Mass_Action {
echo $header;
foreach($entries as $row) {
+ // Escape double quotes in the value.
+ foreach ($row as $key => $value) {
+ $row[$key] = str_replace('"', '""', $value);
+ }
$line = implode("\",\"",$row);
$line = "\"" .$line;
$line .= "\"\r\n";
@@ -271,4 +275,4 @@ class Vtiger_ExportData_Action extends Vtiger_Mass_Action {
}
return $arr;
}
-}
\ No newline at end of file
+}
diff --git a/modules/Vtiger/models/DetailView.php b/modules/Vtiger/models/DetailView.php
index 4645b615cae973211f373d9ddb4fd6b531694c2b..04184ea2d220e33c1562114cc93643cf4565e6f8 100644
--- a/modules/Vtiger/models/DetailView.php
+++ b/modules/Vtiger/models/DetailView.php
@@ -56,7 +56,7 @@ class Vtiger_DetailView_Model extends Vtiger_Base_Model {
* array('linktype'=>list of link models);
*/
public function getDetailViewLinks($linkParams) {
- $linkTypes = array('DETAILVIEWBASIC','DETAILVIEW');
+ $linkTypes = array('DETAILVIEWBASIC','DETAILVIEW','DETAILVIEWTAB');
$moduleModel = $this->getModule();
$recordModel = $this->getRecord();
@@ -121,6 +121,13 @@ class Vtiger_DetailView_Model extends Vtiger_Base_Model {
$linkModelList[$relatedLink->getType()][] = $relatedLink;
}
+ $detailViewBasicTablinks = $linkModelListDetails['DETAILVIEWTAB'];
+ if(!empty($detailViewBasicTablinks)) {
+ foreach($detailViewBasicTablinks as $linkModel) {
+ $linkModelList['DETAILVIEWTAB'][] = $linkModel;
+ }
+ }
+
$widgets = $this->getWidgets();
foreach($widgets as $widgetLinkModel) {
$linkModelList['DETAILVIEWWIDGET'][] = $widgetLinkModel;
diff --git a/modules/Vtiger/models/Module.php b/modules/Vtiger/models/Module.php
index ab43fd4ec237eb9c2119db8d9346c10214bad41f..b716f580144c28cb488b66010f3a2200b09a30d7 100644
--- a/modules/Vtiger/models/Module.php
+++ b/modules/Vtiger/models/Module.php
@@ -1449,9 +1449,12 @@ class Vtiger_Module_Model extends Vtiger_Module {
$sql .= " INNER JOIN $tablename ON $tablename.$tabIndex = vtiger_crmentity.crmid
WHERE $tablename.$relIndex IN (". generateQuestionMarks($recordIds).")";
}
+
+ $sql .=' AND vtiger_crmentity.deleted = 0';
foreach ($recordIds as $key => $recordId) {
array_push($params, $recordId);
}
+
$result1 = $db->pquery($sql, $params);
$num_rows = $db->num_rows($result1);
for($j=0; $j<$num_rows; $j++){
diff --git a/pkg/vtiger/modules/SMSNotifier/modules/SMSNotifier/models/Record.php b/pkg/vtiger/modules/SMSNotifier/modules/SMSNotifier/models/Record.php
index e7a5fc9f25c6ab298beebadfbff2c1c2b2e5b7f0..144c31081b92b50a38e113b799afe770f6cbbd55 100644
--- a/pkg/vtiger/modules/SMSNotifier/modules/SMSNotifier/models/Record.php
+++ b/pkg/vtiger/modules/SMSNotifier/modules/SMSNotifier/models/Record.php
@@ -20,7 +20,8 @@ class SMSNotifier_Record_Model extends Vtiger_Record_Model {
$statusColor = $this->getColorForStatus($statusDetails[0]['status']);
- $this->setData($statusDetails[0]);
+ $data = array_merge($statusDetails[0], array('statuscolor' => $statusColor));
+ $this->setData($data);
return $this;
}
diff --git a/soap/customerportal.php b/soap/customerportal.php
index fdf128f04c0786a8d0fab9d4d2fd34ae78b99bca..77f640a5b43d72fa50d19a53a84514723a170e66 100755
--- a/soap/customerportal.php
+++ b/soap/customerportal.php
@@ -1065,7 +1065,7 @@ function change_password($input_array)
return array('MORE_THAN_ONE_USER');
}
$sql = "update vtiger_portalinfo set user_password=? where id=? and user_name=?";
- $result = $adb->pquery($sql, array($password, $id, $username));
+ $result = $adb->pquery($sql, array(md5($password), $id, $username));
$log->debug("Exiting customer portal function change_password");
return $list;