Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts: htdocs/product/stock/card.php
This commit is contained in:
commit
ae58a77208
@ -662,3 +662,4 @@ DELETE FROM llx_cronjob WHERE label = 'PurgeDeleteTemporaryFilesShort' AND param
|
||||
ALTER TABLE llx_cronjob DROP INDEX uk_cronjob;
|
||||
ALTER TABLE llx_cronjob ADD UNIQUE INDEX uk_cronjob (label, entity);
|
||||
|
||||
ALTER TABLE llx_expedition ADD COLUMN billed smallint DEFAULT 0;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user