Commit Graph

5 Commits

Author SHA1 Message Date
Laurent Destailleur
8bad4a3c1d Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/install/mysql/tables/llx_expeditiondet_batch.key.sql
	htdocs/install/mysql/tables/llx_product_batch.key.sql
2014-07-08 22:45:31 +02:00
Laurent Destailleur
f0056b3b95 Fix: Migration does not match tables 2014-07-08 22:40:06 +02:00
Laurent Destailleur
a137b31a47 Fix: ON DELETE CASCADE is forbidden.
Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	test/phpunit/SqlTest.php
2014-07-08 21:50:29 +02:00
Laurent Destailleur
9b6b5feb4f Fix: ON DELETE CASCADE is forbidden. 2014-07-08 21:38:20 +02:00
KreizIT
c1f88d99b9 Batch number management step 1 : database modification 2014-03-03 14:11:19 +01:00