Merge remote-tracking branch 'Upstream/develop' into develop-63

Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
This commit is contained in:
aspangaro
2015-09-07 21:45:13 +02:00
56 changed files with 1150 additions and 1175 deletions

View File

@@ -67,6 +67,7 @@ create table llx_societe
fk_stcomm integer DEFAULT 0 NOT NULL, -- commercial statut
note_private text, --
note_public text, --
model_pdf varchar(255),
prefix_comm varchar(5), -- prefix commercial
client tinyint DEFAULT 0, -- client 0/1/2
fournisseur tinyint DEFAULT 0, -- fournisseur 0/1