Merge branch 'fr-2613' of https://github.com/marcosgdf/dolibarr into develop

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
This commit is contained in:
Laurent Destailleur
2015-04-18 20:52:02 +02:00
15 changed files with 14 additions and 7 deletions

View File

@@ -537,4 +537,3 @@ CREATE TABLE IF NOT EXISTS llx_propal_merge_pdf_product (
ALTER TABLE llx_categorie_societe CHANGE COLUMN fk_societe fk_soc INTEGER NOT NULL;
ALTER TABLE llx_societe CHANGE COLUMN fk_societe fk_soc INTEGER NOT NULL;