lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.1-beta' of git@github.com:Dolibarr/dolibarr.git into

Browse Source 
3.1-beta

Conflicts:
	htdocs/install/mysql/migration/3.0.0-3.1.0.sql
This commit is contained in:
eldy 2011-08-24 18:59:11 +02:00
commit 98f6ec14f0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.settings/org.eclipse.php.core.prefs
View File

@ -1,6 +1,6 @@
#Thu Aug 11 02:31:31 CEST 2011
#Wed Aug 24 17:30:40 CEST 2011
eclipse.preferences.version=1
include_path=0;/dolibarrgitold
include_path=0;/dolibarrgitoldssh
org.eclipse.php.core.taskCaseSensitive=enabled
org.eclipse.php.core.taskPriorities=NORMAL,HIGH,NORMAL
org.eclipse.php.core.taskTags=TODO,FIXME,@todo

1
htdocs/install/mysql/migration/3.0.0-3.1.0.sql
View File

@ -132,6 +132,7 @@ ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_user FOR
ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_usergroup FOREIGN KEY (fk_usergroup) REFERENCES llx_usergroup (rowid);
-- V4.1 DELETE FROM llx_product_fournisseur_price_log where fk_product_fournisseur NOT IN (SELECT pf.rowid from llx_product_fournisseur as pf, llx_product as p WHERE pf.fk_product = p.rowid);
-- V4.1 DELETE FROM llx_product_fournisseur_price where fk_product_fournisseur NOT IN (SELECT pf.rowid from llx_product_fournisseur as pf, llx_product as p WHERE pf.fk_product = p.rowid);
-- V4.1 DELETE FROM llx_product_fournisseur where fk_product NOT IN (SELECT rowid from llx_product);
ALTER TABLE llx_product_fournisseur ADD CONSTRAINT fk_product_fournisseur_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid);