diff --git a/agc_2-X/branches/agc_2.4/www/vicidial/admin.php b/agc_2-X/branches/agc_2.4/www/vicidial/admin.php
index 61051d80..d4af41d3 100644
--- a/agc_2-X/branches/agc_2.4/www/vicidial/admin.php
+++ b/agc_2-X/branches/agc_2.4/www/vicidial/admin.php
@@ -7149,6 +7149,8 @@ if ($ADD==99999)
Email Address
Security Phrase
Comments
+ Rank
+ Owner
NOTES: The Excel Lead loader functionality is enabled by a series of perl scripts and needs to have a properly configured /etc/astguiclient.conf file in place on the web server. Also, a couple perl modules must be loaded for it to work as well - OLE-Storage_Lite and Spreadsheet-ParseExcel. You can check for runtime errors in these by looking at your apache error_log file. Also, for duplication checks against gampaign lists, the list that has new leads going into it does need to be created in the system before you start to load the leads.
diff --git a/agc_2-X/branches/agc_2.7/LANG_www/agc_br/vicidial.php b/agc_2-X/branches/agc_2.7/LANG_www/agc_br/vicidial.php
index 4939c0d1..a0adc3af 100644
--- a/agc_2-X/branches/agc_2.7/LANG_www/agc_br/vicidial.php
+++ b/agc_2-X/branches/agc_2.7/LANG_www/agc_br/vicidial.php
@@ -400,10 +400,11 @@
# 130402-2250 - Added user_group variable in scripts, forms and webforms
# 130412-1359 - Added SIP message for failed calls
# 130417-1937 - Changed locked agent choose in-group/closer/territories to auto-close
+# 130508-2255 - Release version 2.7
#
-$version = '2.6-368c';
-$build = '130417-1937';
+$version = '2.7-370c';
+$build = '130508-2255';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=79;
$one_mysql_log=0;
diff --git a/agc_2-X/branches/agc_2.7/LANG_www/agc_de/vicidial.php b/agc_2-X/branches/agc_2.7/LANG_www/agc_de/vicidial.php
index 8aef887d..27dc6f87 100644
--- a/agc_2-X/branches/agc_2.7/LANG_www/agc_de/vicidial.php
+++ b/agc_2-X/branches/agc_2.7/LANG_www/agc_de/vicidial.php
@@ -400,10 +400,11 @@
# 130402-2250 - Added user_group variable in scripts, forms and webforms
# 130412-1359 - Added SIP message for failed calls
# 130417-1937 - Changed locked agent choose in-group/closer/territories to auto-close
+# 130508-2255 - Release version 2.7
#
-$version = '2.6-368c';
-$build = '130417-1937';
+$version = '2.7-370c';
+$build = '130508-2255';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=79;
$one_mysql_log=0;
diff --git a/agc_2-X/branches/agc_2.7/LANG_www/agc_dk/vicidial.php b/agc_2-X/branches/agc_2.7/LANG_www/agc_dk/vicidial.php
index 6809a938..4686a71f 100644
--- a/agc_2-X/branches/agc_2.7/LANG_www/agc_dk/vicidial.php
+++ b/agc_2-X/branches/agc_2.7/LANG_www/agc_dk/vicidial.php
@@ -400,10 +400,11 @@
# 130402-2250 - Added user_group variable in scripts, forms and webforms
# 130412-1359 - Added SIP message for failed calls
# 130417-1937 - Changed locked agent choose in-group/closer/territories to auto-close
+# 130508-2255 - Release version 2.7
#
-$version = '2.6-368c';
-$build = '130417-1937';
+$version = '2.7-370c';
+$build = '130508-2255';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=79;
$one_mysql_log=0;
diff --git a/agc_2-X/branches/agc_2.7/LANG_www/agc_el/vicidial.php b/agc_2-X/branches/agc_2.7/LANG_www/agc_el/vicidial.php
index 2ac4b4e0..21ac9634 100644
--- a/agc_2-X/branches/agc_2.7/LANG_www/agc_el/vicidial.php
+++ b/agc_2-X/branches/agc_2.7/LANG_www/agc_el/vicidial.php
@@ -400,10 +400,11 @@
# 130402-2250 - Added user_group variable in scripts, forms and webforms
# 130412-1359 - Added SIP message for failed calls
# 130417-1937 - Changed locked agent choose in-group/closer/territories to auto-close
+# 130508-2255 - Release version 2.7
#
-$version = '2.6-368c';
-$build = '130417-1937';
+$version = '2.7-370c';
+$build = '130508-2255';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=79;
$one_mysql_log=0;
diff --git a/agc_2-X/branches/agc_2.7/LANG_www/agc_es/vicidial.php b/agc_2-X/branches/agc_2.7/LANG_www/agc_es/vicidial.php
index 94afd7e3..1e9e7566 100644
--- a/agc_2-X/branches/agc_2.7/LANG_www/agc_es/vicidial.php
+++ b/agc_2-X/branches/agc_2.7/LANG_www/agc_es/vicidial.php
@@ -400,10 +400,11 @@
# 130402-2250 - Added user_group variable in scripts, forms and webforms
# 130412-1359 - Added SIP message for failed calls
# 130417-1937 - Changed locked agent choose in-group/closer/territories to auto-close
+# 130508-2255 - Release version 2.7
#
-$version = '2.6-368c';
-$build = '130417-1937';
+$version = '2.7-370c';
+$build = '130508-2255';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=79;
$one_mysql_log=0;
diff --git a/agc_2-X/branches/agc_2.7/LANG_www/agc_fr/vicidial.php b/agc_2-X/branches/agc_2.7/LANG_www/agc_fr/vicidial.php
index ae2550a4..5bcf57e9 100644
--- a/agc_2-X/branches/agc_2.7/LANG_www/agc_fr/vicidial.php
+++ b/agc_2-X/branches/agc_2.7/LANG_www/agc_fr/vicidial.php
@@ -400,10 +400,11 @@
# 130402-2250 - Added user_group variable in scripts, forms and webforms
# 130412-1359 - Added SIP message for failed calls
# 130417-1937 - Changed locked agent choose in-group/closer/territories to auto-close
+# 130508-2255 - Release version 2.7
#
-$version = '2.6-368c';
-$build = '130417-1937';
+$version = '2.7-370c';
+$build = '130508-2255';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=79;
$one_mysql_log=0;
diff --git a/agc_2-X/branches/agc_2.7/LANG_www/agc_it/vicidial.php b/agc_2-X/branches/agc_2.7/LANG_www/agc_it/vicidial.php
index 846851a6..cd725226 100644
--- a/agc_2-X/branches/agc_2.7/LANG_www/agc_it/vicidial.php
+++ b/agc_2-X/branches/agc_2.7/LANG_www/agc_it/vicidial.php
@@ -400,10 +400,11 @@
# 130402-2250 - Added user_group variable in scripts, forms and webforms
# 130412-1359 - Added SIP message for failed calls
# 130417-1937 - Changed locked agent choose in-group/closer/territories to auto-close
+# 130508-2255 - Release version 2.7
#
-$version = '2.6-368c';
-$build = '130417-1937';
+$version = '2.7-370c';
+$build = '130508-2255';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=79;
$one_mysql_log=0;
diff --git a/agc_2-X/branches/agc_2.7/LANG_www/agc_jp/vicidial.php b/agc_2-X/branches/agc_2.7/LANG_www/agc_jp/vicidial.php
index 0863d63e..43539b1c 100644
--- a/agc_2-X/branches/agc_2.7/LANG_www/agc_jp/vicidial.php
+++ b/agc_2-X/branches/agc_2.7/LANG_www/agc_jp/vicidial.php
@@ -400,10 +400,11 @@
# 130402-2250 - Added user_group variable in scripts, forms and webforms
# 130412-1359 - Added SIP message for failed calls
# 130417-1937 - Changed locked agent choose in-group/closer/territories to auto-close
+# 130508-2255 - Release version 2.7
#
-$version = '2.6-368c';
-$build = '130417-1937';
+$version = '2.7-370c';
+$build = '130508-2255';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=79;
$one_mysql_log=0;
diff --git a/agc_2-X/branches/agc_2.7/LANG_www/agc_nl/vicidial.php b/agc_2-X/branches/agc_2.7/LANG_www/agc_nl/vicidial.php
index cbf01ebe..0078b058 100644
--- a/agc_2-X/branches/agc_2.7/LANG_www/agc_nl/vicidial.php
+++ b/agc_2-X/branches/agc_2.7/LANG_www/agc_nl/vicidial.php
@@ -400,10 +400,11 @@
# 130402-2250 - Added user_group variable in scripts, forms and webforms
# 130412-1359 - Added SIP message for failed calls
# 130417-1937 - Changed locked agent choose in-group/closer/territories to auto-close
+# 130508-2255 - Release version 2.7
#
-$version = '2.6-368c';
-$build = '130417-1937';
+$version = '2.7-370c';
+$build = '130508-2255';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=79;
$one_mysql_log=0;
diff --git a/agc_2-X/branches/agc_2.7/LANG_www/agc_pl/vicidial.php b/agc_2-X/branches/agc_2.7/LANG_www/agc_pl/vicidial.php
index febe5302..86921454 100644
--- a/agc_2-X/branches/agc_2.7/LANG_www/agc_pl/vicidial.php
+++ b/agc_2-X/branches/agc_2.7/LANG_www/agc_pl/vicidial.php
@@ -400,10 +400,11 @@
# 130402-2250 - Added user_group variable in scripts, forms and webforms
# 130412-1359 - Added SIP message for failed calls
# 130417-1937 - Changed locked agent choose in-group/closer/territories to auto-close
+# 130508-2255 - Release version 2.7
#
-$version = '2.6-368c';
-$build = '130417-1937';
+$version = '2.7-370c';
+$build = '130508-2255';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=79;
$one_mysql_log=0;
diff --git a/agc_2-X/branches/agc_2.7/LANG_www/agc_pt/vicidial.php b/agc_2-X/branches/agc_2.7/LANG_www/agc_pt/vicidial.php
index b086bf19..60fa8540 100644
--- a/agc_2-X/branches/agc_2.7/LANG_www/agc_pt/vicidial.php
+++ b/agc_2-X/branches/agc_2.7/LANG_www/agc_pt/vicidial.php
@@ -400,10 +400,11 @@
# 130402-2250 - Added user_group variable in scripts, forms and webforms
# 130412-1359 - Added SIP message for failed calls
# 130417-1937 - Changed locked agent choose in-group/closer/territories to auto-close
+# 130508-2255 - Release version 2.7
#
-$version = '2.6-368c';
-$build = '130417-1937';
+$version = '2.7-370c';
+$build = '130508-2255';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=79;
$one_mysql_log=0;
diff --git a/agc_2-X/branches/agc_2.7/LANG_www/agc_ru/vicidial.php b/agc_2-X/branches/agc_2.7/LANG_www/agc_ru/vicidial.php
index 652aaab4..226e951e 100644
--- a/agc_2-X/branches/agc_2.7/LANG_www/agc_ru/vicidial.php
+++ b/agc_2-X/branches/agc_2.7/LANG_www/agc_ru/vicidial.php
@@ -400,10 +400,11 @@
# 130402-2250 - Added user_group variable in scripts, forms and webforms
# 130412-1359 - Added SIP message for failed calls
# 130417-1937 - Changed locked agent choose in-group/closer/territories to auto-close
+# 130508-2255 - Release version 2.7
#
-$version = '2.6-368c';
-$build = '130417-1937';
+$version = '2.7-370c';
+$build = '130508-2255';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=79;
$one_mysql_log=0;
diff --git a/agc_2-X/branches/agc_2.7/LANG_www/agc_se/vicidial.php b/agc_2-X/branches/agc_2.7/LANG_www/agc_se/vicidial.php
index cab87a47..4db85a3e 100644
--- a/agc_2-X/branches/agc_2.7/LANG_www/agc_se/vicidial.php
+++ b/agc_2-X/branches/agc_2.7/LANG_www/agc_se/vicidial.php
@@ -400,10 +400,11 @@
# 130402-2250 - Added user_group variable in scripts, forms and webforms
# 130412-1359 - Added SIP message for failed calls
# 130417-1937 - Changed locked agent choose in-group/closer/territories to auto-close
+# 130508-2255 - Release version 2.7
#
-$version = '2.6-368c';
-$build = '130417-1937';
+$version = '2.7-370c';
+$build = '130508-2255';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=79;
$one_mysql_log=0;
diff --git a/agc_2-X/branches/agc_2.7/LANG_www/agc_sk/vicidial.php b/agc_2-X/branches/agc_2.7/LANG_www/agc_sk/vicidial.php
index 9eda6c39..07033182 100644
--- a/agc_2-X/branches/agc_2.7/LANG_www/agc_sk/vicidial.php
+++ b/agc_2-X/branches/agc_2.7/LANG_www/agc_sk/vicidial.php
@@ -400,10 +400,11 @@
# 130402-2250 - Added user_group variable in scripts, forms and webforms
# 130412-1359 - Added SIP message for failed calls
# 130417-1937 - Changed locked agent choose in-group/closer/territories to auto-close
+# 130508-2255 - Release version 2.7
#
-$version = '2.6-368c';
-$build = '130417-1937';
+$version = '2.7-370c';
+$build = '130508-2255';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=79;
$one_mysql_log=0;
diff --git a/agc_2-X/branches/agc_2.7/LANG_www/agc_tw/vicidial.php b/agc_2-X/branches/agc_2.7/LANG_www/agc_tw/vicidial.php
index 17bddf02..f4993e28 100644
--- a/agc_2-X/branches/agc_2.7/LANG_www/agc_tw/vicidial.php
+++ b/agc_2-X/branches/agc_2.7/LANG_www/agc_tw/vicidial.php
@@ -400,10 +400,11 @@
# 130402-2250 - Added user_group variable in scripts, forms and webforms
# 130412-1359 - Added SIP message for failed calls
# 130417-1937 - Changed locked agent choose in-group/closer/territories to auto-close
+# 130508-2255 - Release version 2.7
#
-$version = '2.6-368c';
-$build = '130417-1937';
+$version = '2.7-370c';
+$build = '130508-2255';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=79;
$one_mysql_log=0;
diff --git a/agc_2-X/branches/agc_2.7/LANG_www/vicidial_br/admin.php b/agc_2-X/branches/agc_2.7/LANG_www/vicidial_br/admin.php
index 278854de..e8e42a6a 100644
--- a/agc_2-X/branches/agc_2.7/LANG_www/vicidial_br/admin.php
+++ b/agc_2-X/branches/agc_2.7/LANG_www/vicidial_br/admin.php
@@ -3244,12 +3244,13 @@ else
# 130424-1601 - Added survey_wait_sec campaign survey option
# 130425-0700 - Added DROP option for survey_no_response_action to go to campaign drop method
# 130503-1509 - Added red color to server table on reports page if asterisk out of sync
+# 130508-2256 - Release version 2.7
#
# make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time
-$admin_version = '2.6-400a';
-$build = '130503-1509';
+$admin_version = '2.7-401a';
+$build = '130508-2256';
$STARTtime = date("U");
$SQLdate = date("Y-m-d H:i:s");
diff --git a/agc_2-X/branches/agc_2.7/LANG_www/vicidial_de/admin.php b/agc_2-X/branches/agc_2.7/LANG_www/vicidial_de/admin.php
index c1782de1..0f2ebff8 100644
--- a/agc_2-X/branches/agc_2.7/LANG_www/vicidial_de/admin.php
+++ b/agc_2-X/branches/agc_2.7/LANG_www/vicidial_de/admin.php
@@ -3244,12 +3244,13 @@ else
# 130424-1601 - Added survey_wait_sec campaign survey option
# 130425-0700 - Added DROP option for survey_no_response_action to go to campaign drop method
# 130503-1509 - Added red color to server table on reports page if asterisk out of sync
+# 130508-2256 - Release version 2.7
#
# make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time
-$admin_version = '2.6-400a';
-$build = '130503-1509';
+$admin_version = '2.7-401a';
+$build = '130508-2256';
$STARTtime = date("U");
$SQLdate = date("Y-m-d H:i:s");
diff --git a/agc_2-X/branches/agc_2.7/LANG_www/vicidial_el/admin.php b/agc_2-X/branches/agc_2.7/LANG_www/vicidial_el/admin.php
index b6ced24a..f3d8d493 100644
--- a/agc_2-X/branches/agc_2.7/LANG_www/vicidial_el/admin.php
+++ b/agc_2-X/branches/agc_2.7/LANG_www/vicidial_el/admin.php
@@ -3244,12 +3244,13 @@ else
# 130424-1601 - Added survey_wait_sec campaign survey option
# 130425-0700 - Added DROP option for survey_no_response_action to go to campaign drop method
# 130503-1509 - Added red color to server table on reports page if asterisk out of sync
+# 130508-2256 - Release version 2.7
#
# make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time
-$admin_version = '2.6-400a';
-$build = '130503-1509';
+$admin_version = '2.7-401a';
+$build = '130508-2256';
$STARTtime = date("U");
$SQLdate = date("Y-m-d H:i:s");
diff --git a/agc_2-X/branches/agc_2.7/LANG_www/vicidial_es/admin.php b/agc_2-X/branches/agc_2.7/LANG_www/vicidial_es/admin.php
index e4305857..89d82485 100644
--- a/agc_2-X/branches/agc_2.7/LANG_www/vicidial_es/admin.php
+++ b/agc_2-X/branches/agc_2.7/LANG_www/vicidial_es/admin.php
@@ -3244,12 +3244,13 @@ else
# 130424-1601 - Added survey_wait_sec campaign survey option
# 130425-0700 - Added DROP option for survey_no_response_action to go to campaign drop method
# 130503-1509 - Added red color to server table on reports page if asterisk out of sync
+# 130508-2256 - Release version 2.7
#
# make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time
-$admin_version = '2.6-400a';
-$build = '130503-1509';
+$admin_version = '2.7-401a';
+$build = '130508-2256';
$STARTtime = date("U");
$SQLdate = date("Y-m-d H:i:s");
diff --git a/agc_2-X/branches/agc_2.7/LANG_www/vicidial_fr/admin.php b/agc_2-X/branches/agc_2.7/LANG_www/vicidial_fr/admin.php
index 56985444..5e56a117 100644
--- a/agc_2-X/branches/agc_2.7/LANG_www/vicidial_fr/admin.php
+++ b/agc_2-X/branches/agc_2.7/LANG_www/vicidial_fr/admin.php
@@ -3244,12 +3244,13 @@ else
# 130424-1601 - Added survey_wait_sec campaign survey option
# 130425-0700 - Added DROP option for survey_no_response_action to go to campaign drop method
# 130503-1509 - Added red color to server table on reports page if asterisk out of sync
+# 130508-2256 - Release version 2.7
#
# make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time
-$admin_version = '2.6-400a';
-$build = '130503-1509';
+$admin_version = '2.7-401a';
+$build = '130508-2256';
$STARTtime = date("U");
$SQLdate = date("Y-m-d H:i:s");
diff --git a/agc_2-X/branches/agc_2.7/LANG_www/vicidial_it/admin.php b/agc_2-X/branches/agc_2.7/LANG_www/vicidial_it/admin.php
index eebd1fd7..e8bf3f38 100644
--- a/agc_2-X/branches/agc_2.7/LANG_www/vicidial_it/admin.php
+++ b/agc_2-X/branches/agc_2.7/LANG_www/vicidial_it/admin.php
@@ -3244,12 +3244,13 @@ else
# 130424-1601 - Added survey_wait_sec campaign survey option
# 130425-0700 - Added DROP option for survey_no_response_action to go to campaign drop method
# 130503-1509 - Added red color to server table on reports page if asterisk out of sync
+# 130508-2256 - Release version 2.7
#
# make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time
-$admin_version = '2.6-400a';
-$build = '130503-1509';
+$admin_version = '2.7-401a';
+$build = '130508-2256';
$STARTtime = date("U");
$SQLdate = date("Y-m-d H:i:s");
diff --git a/agc_2-X/branches/agc_2.7/UPGRADE b/agc_2-X/branches/agc_2.7/UPGRADE
index cacecc53..eccdf9e5 100644
--- a/agc_2-X/branches/agc_2.7/UPGRADE
+++ b/agc_2-X/branches/agc_2.7/UPGRADE
@@ -8,7 +8,7 @@ NOTE: Upgrading from 2.0.2 to 2.0.3 is below the fifth section
NOTE: Upgrading from 2.0.1 to 2.0.2 is in the next section
NOTE: Upgrading from 1.1.12-3 to 2.0.1 is at the bottom
-########## UPGRADING FROM 2.4 TO 2.6 ##########
+########## UPGRADING FROM 2.4 TO 2.7 ##########
OPTIONAL STEPS(But highly recommended) - Backup existing system:
diff --git a/agc_2-X/branches/agc_2.7/extras/MySQL_AST_CREATE_tables.sql b/agc_2-X/branches/agc_2.7/extras/MySQL_AST_CREATE_tables.sql
index 20abe351..c4d7856f 100644
--- a/agc_2-X/branches/agc_2.7/extras/MySQL_AST_CREATE_tables.sql
+++ b/agc_2-X/branches/agc_2.7/extras/MySQL_AST_CREATE_tables.sql
@@ -2918,7 +2918,7 @@ INSERT INTO vicidial_inbound_groups(group_id,group_name,group_color,active,queue
INSERT INTO vicidial_lists SET list_id='999',list_name='Default inbound list',campaign_id='TESTCAMP',active='N';
INSERT INTO vicidial_lists SET list_id='998',list_name='Default Manual list',campaign_id='TESTCAMP',active='N';
-INSERT INTO system_settings (version,install_date,first_login_trigger) values('2.6b0.5', CURDATE(), 'Y');
+INSERT INTO system_settings (version,install_date,first_login_trigger) values('2.7rc1', CURDATE(), 'Y');
INSERT INTO vicidial_status_categories (vsc_id,vsc_name) values('UNDEFINED','Default Category');
@@ -3123,4 +3123,4 @@ UPDATE vicidial_configuration set value='1766' where name='qc_database_version';
UPDATE system_settings set vdc_agent_api_active='1';
-UPDATE system_settings SET db_schema_version='1347',db_schema_update_date=NOW();
+UPDATE system_settings SET db_schema_version='1348',db_schema_update_date=NOW();
diff --git a/agc_2-X/branches/agc_2.7/extras/upgrade_2.6.sql b/agc_2-X/branches/agc_2.7/extras/upgrade_2.6.sql
index de502d98..db63cbd4 100644
--- a/agc_2-X/branches/agc_2.7/extras/upgrade_2.6.sql
+++ b/agc_2-X/branches/agc_2.7/extras/upgrade_2.6.sql
@@ -364,3 +364,5 @@ UPDATE system_settings SET db_schema_version='1346',db_schema_update_date=NOW()
ALTER TABLE vicidial_campaigns MODIFY survey_no_response_action ENUM('OPTIN','OPTOUT','DROP') default 'OPTIN';
UPDATE system_settings SET db_schema_version='1347',db_schema_update_date=NOW() where db_schema_version < 1347;
+
+UPDATE system_settings SET db_schema_version='1348',version='2.7rc1',db_schema_update_date=NOW() where db_schema_version < 1348;
diff --git a/agc_2-X/branches/agc_2.7/version b/agc_2-X/branches/agc_2.7/version
index 2e1a49db..64b5caa3 100644
--- a/agc_2-X/branches/agc_2.7/version
+++ b/agc_2-X/branches/agc_2.7/version
@@ -1 +1 @@
-2.6b0.5
+2.7rc1
diff --git a/agc_2-X/branches/agc_2.7/www/agc/vicidial.php b/agc_2-X/branches/agc_2.7/www/agc/vicidial.php
index 720198c3..78602db6 100644
--- a/agc_2-X/branches/agc_2.7/www/agc/vicidial.php
+++ b/agc_2-X/branches/agc_2.7/www/agc/vicidial.php
@@ -401,10 +401,11 @@
# 130412-1359 - Added SIP message for failed calls
# 130417-1937 - Changed locked agent choose in-group/closer/territories to auto-close
# 130508-2223 - Cleanup for other language builds
+# 130508-2255 - Release version 2.7
#
-$version = '2.6-369c';
-$build = '130508-2223';
+$version = '2.7-370c';
+$build = '130508-2255';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=79;
$one_mysql_log=0;
diff --git a/agc_2-X/branches/agc_2.7/www/vicidial/admin.php b/agc_2-X/branches/agc_2.7/www/vicidial/admin.php
index 1ae76336..2a968927 100644
--- a/agc_2-X/branches/agc_2.7/www/vicidial/admin.php
+++ b/agc_2-X/branches/agc_2.7/www/vicidial/admin.php
@@ -3244,12 +3244,13 @@ else
# 130424-1601 - Added survey_wait_sec campaign survey option
# 130425-0700 - Added DROP option for survey_no_response_action to go to campaign drop method
# 130503-1509 - Added red color to server table on reports page if asterisk out of sync
+# 130508-2256 - Release version 2.7
#
# make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time
-$admin_version = '2.6-400a';
-$build = '130503-1509';
+$admin_version = '2.7-401a';
+$build = '130508-2256';
$STARTtime = date("U");
$SQLdate = date("Y-m-d H:i:s");
diff --git a/agc_2-X/trunk/UPGRADE b/agc_2-X/trunk/UPGRADE
index cacecc53..fe02d625 100644
--- a/agc_2-X/trunk/UPGRADE
+++ b/agc_2-X/trunk/UPGRADE
@@ -1,5 +1,6 @@
################ UPGRADE
+NOTE: Upgrading from 2.4 to 2.7 is below the first section
NOTE: Upgrading from 2.2.1 to 2.4 is below the first section
NOTE: Upgrading from 2.0.5 to 2.2.0 is below the second section
NOTE: Upgrading from 2.0.4 to 2.0.5 is below the third section
@@ -8,6 +9,55 @@ NOTE: Upgrading from 2.0.2 to 2.0.3 is below the fifth section
NOTE: Upgrading from 2.0.1 to 2.0.2 is in the next section
NOTE: Upgrading from 1.1.12-3 to 2.0.1 is at the bottom
+########## UPGRADING FROM 2.7 TO 2.8 ##########
+
+OPTIONAL STEPS(But highly recommended) - Backup existing system:
+
+1. Run this for a 1-server system or server with database on it:
+ (this may take hours on large system)
+ /usr/share/astguiclient/ADMIN_backup.pl --debugX
+
+2. Run this on dialer/Asterisk-only servers:
+ (do not run this if you only have one server):
+ /usr/share/astguiclient/ADMIN_backup.pl --debugX --without-db --without-web
+
+
+REQUIRED STEPS!!!
+
+1. Check system_settings, make sure you are at DB Schema Version 1347 or higher
+ If not, run the instructions for 2.4 to 2.7 before this section.
+
+2. upgrade the MySQL asterisk database(you have two options):
+ A. Running the upgrade file directly from Linux:
+ mysql -f --database=asterisk < /path/from/root/extras/upgrade_2.8.sql
+
+ B. Going into mysql and executing the upgrade sql file:
+ mysql
+ use asterisk
+ \. /path/from/root/extras/upgrade_2.8.sql
+ quit
+
+3. install new files:
+ perl ./install.pl
+ NOTES: If you have customized any scripts in the bin or agi folders,
+ then make sure you back them up before running the install.pl script.
+ This script will replace existing files in the astguiclient installation.
+
+4. For each of your ViciDial servers, go the Admin -> Servers -> Modify Server
+ page and set each one to "Rebuild conf files = Y" and click submit.
+ This will rebuild the conf files to ensure any changes are updated.
+
+5. On one server only, update your phone codes data:
+ /usr/share/astguiclient/ADMIN_area_code_populate.pl --purge-table --debug
+
+
+OTHER CHANGES:
+
+1. Nothing yet, 2.7 was just branched, trunk becomes 2.8
+
+
+
+
########## UPGRADING FROM 2.4 TO 2.6 ##########
OPTIONAL STEPS(But highly recommended) - Backup existing system:
diff --git a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql
index 20abe351..a9577d15 100644
--- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql
+++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql
@@ -2918,7 +2918,7 @@ INSERT INTO vicidial_inbound_groups(group_id,group_name,group_color,active,queue
INSERT INTO vicidial_lists SET list_id='999',list_name='Default inbound list',campaign_id='TESTCAMP',active='N';
INSERT INTO vicidial_lists SET list_id='998',list_name='Default Manual list',campaign_id='TESTCAMP',active='N';
-INSERT INTO system_settings (version,install_date,first_login_trigger) values('2.6b0.5', CURDATE(), 'Y');
+INSERT INTO system_settings (version,install_date,first_login_trigger) values('2.8b0.5', CURDATE(), 'Y');
INSERT INTO vicidial_status_categories (vsc_id,vsc_name) values('UNDEFINED','Default Category');
@@ -3123,4 +3123,4 @@ UPDATE vicidial_configuration set value='1766' where name='qc_database_version';
UPDATE system_settings set vdc_agent_api_active='1';
-UPDATE system_settings SET db_schema_version='1347',db_schema_update_date=NOW();
+UPDATE system_settings SET db_schema_version='1349',db_schema_update_date=NOW();
diff --git a/agc_2-X/trunk/extras/upgrade_2.8.sql b/agc_2-X/trunk/extras/upgrade_2.8.sql
new file mode 100644
index 00000000..4008d951
--- /dev/null
+++ b/agc_2-X/trunk/extras/upgrade_2.8.sql
@@ -0,0 +1 @@
+UPDATE system_settings SET db_schema_version='1349',version='2.8b0.5',db_schema_update_date=NOW() where db_schema_version < 1349;
diff --git a/agc_2-X/trunk/version b/agc_2-X/trunk/version
index 2e1a49db..65966096 100644
--- a/agc_2-X/trunk/version
+++ b/agc_2-X/trunk/version
@@ -1 +1 @@
-2.6b0.5
+2.8b0.5
diff --git a/agc_2-X/trunk/www/agc/vicidial.php b/agc_2-X/trunk/www/agc/vicidial.php
index 720198c3..775966cf 100644
--- a/agc_2-X/trunk/www/agc/vicidial.php
+++ b/agc_2-X/trunk/www/agc/vicidial.php
@@ -401,10 +401,11 @@
# 130412-1359 - Added SIP message for failed calls
# 130417-1937 - Changed locked agent choose in-group/closer/territories to auto-close
# 130508-2223 - Cleanup for other language builds
+# 130508-2307 - Branched 2.7, trunk becomes 2.8
#
-$version = '2.6-369c';
-$build = '130508-2223';
+$version = '2.8-371c';
+$build = '130508-2307';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=79;
$one_mysql_log=0;
diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php
index 1ae76336..beb9860b 100644
--- a/agc_2-X/trunk/www/vicidial/admin.php
+++ b/agc_2-X/trunk/www/vicidial/admin.php
@@ -3244,12 +3244,13 @@ else
# 130424-1601 - Added survey_wait_sec campaign survey option
# 130425-0700 - Added DROP option for survey_no_response_action to go to campaign drop method
# 130503-1509 - Added red color to server table on reports page if asterisk out of sync
+# 130508-2306 - Branched 2.7, trunk becomes 2.8
#
# make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time
-$admin_version = '2.6-400a';
-$build = '130503-1509';
+$admin_version = '2.8-402a';
+$build = '130508-2306';
$STARTtime = date("U");
$SQLdate = date("Y-m-d H:i:s");