Merge branch 'develop' into develop_orderextrafield

htdocs/install/mysql/tables/llx_facture_fourn.key.sql

@@ -18,7 +18,7 @@
 -- ============================================================================
 
 
-ALTER TABLE llx_facture_fourn ADD UNIQUE INDEX uk_facture_fourn_ref (facnumber, fk_soc, entity);
+ALTER TABLE llx_facture_fourn ADD UNIQUE INDEX uk_facture_fourn_ref (ref, fk_soc, entity);
 
 ALTER TABLE llx_facture_fourn ADD INDEX idx_facture_fourn_date_lim_reglement (date_lim_reglement);
 

htdocs/install/mysql/tables/llx_printer_ipp.sql

@@ -18,13 +18,13 @@
 
 CREATE TABLE llx_printer_ipp 
 (
-	rowid int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-	tms 	timestamp,
-	datec 	datetime,
-	printer_name text NOT NULL, 
-	printer_location text NOT NULL,
-	printer_uri varchar(256) NOT NULL,
-	copy int(11) NOT NULL DEFAULT '1',
-	module varchar(16) NOT NULL,
-	login varchar(32) NOT NULL
+ rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
+ tms 	timestamp,
+ datec 	datetime,
+ printer_name text NOT NULL, 
+ printer_location text NOT NULL,
+ printer_uri varchar(256) NOT NULL,
+ copy integer NOT NULL DEFAULT '1',
+ module varchar(16) NOT NULL,
+ login varchar(32) NOT NULL
 )ENGINE=innodb;

htdocs/install/pgsql/functions/functions.sql

@@ -117,3 +117,4 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_user FOR EACH ROW EX
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_user_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_usergroup FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_cronjob FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_printer_ipp FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();