Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
f2a6560d8f
@ -208,6 +208,7 @@ class DoliDBMysqli extends DoliDB
|
||||
try {
|
||||
$result = $this->db->select_db($database);
|
||||
} catch (Exception $e) {
|
||||
// Nothing done on error
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
|
||||
@ -150,6 +150,8 @@ ALTER TABLE llx_facture ADD INDEX idx_facture_datef (datef);
|
||||
|
||||
ALTER TABLE llx_projet_task_time ADD COLUMN fk_product integer NULL;
|
||||
|
||||
ALTER TABLE llx_c_action_trigger MODIFY elementtype VARCHAR(64);
|
||||
|
||||
INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_MODIFY','Customer proposal modified','Executed when a customer proposal is modified','propal',2);
|
||||
INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_MODIFY','Customer order modified','Executed when a customer order is set modified','commande',5);
|
||||
INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_MODIFY','Customer invoice modified','Executed when a customer invoice is modified','facture',7);
|
||||
|
||||
@ -871,6 +871,9 @@ textarea.centpercent {
|
||||
.cursorpointer {
|
||||
cursor: pointer;
|
||||
}
|
||||
.classfortooltiponclick .fa-question-circle {
|
||||
cursor: pointer;
|
||||
}
|
||||
.cursormove {
|
||||
cursor: move;
|
||||
}
|
||||
|
||||
@ -1020,6 +1020,9 @@ textarea.centpercent {
|
||||
.cursorpointer {
|
||||
cursor: pointer;
|
||||
}
|
||||
.classfortooltiponclick .fa-question-circle {
|
||||
cursor: pointer;
|
||||
}
|
||||
.cursormove {
|
||||
cursor: move;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user