Merge branch 'master' of github.com:colosa/processmaker

Conflicts: workflow/public_html/sysGeneric.php
2014-01-15 11:14:59 -04:00
parent bbfca418a7 7ca20324e7
commit 428da67762
23 changed files with 708 additions and 435 deletions
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -322,6 +322,7 @@ CREATE TABLE `LANGUAGE`
 (
 	`LAN_ID` VARCHAR(4) default '' NOT NULL,
 	`LAN_NAME` VARCHAR(30) default '' NOT NULL,
+	`LAN_LOCATION` VARCHAR(4) default '' NOT NULL,
 	`LAN_NATIVE_NAME` VARCHAR(30) default '' NOT NULL,
 	`LAN_DIRECTION` CHAR(1) default 'L' NOT NULL,
 	`LAN_WEIGHT` INTEGER default 0 NOT NULL,