Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.7' into develop

Browse Source 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_US/stocks.lang
This commit is contained in:
Laurent Destailleur
2015-02-16 20:59:04 +01:00
parent aa380f6ee0 5688e8ecd8
commit 23562a01ab
10 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
View File

@@ -1156,4 +1156,5 @@ ALTER TABLE llx_resource MODIFY COLUMN entity integer DEFAULT 1 NOT NULL;
ALTER TABLE llx_product ADD CONSTRAINT fk_product_barcode_type FOREIGN KEY (fk_barcode_type) REFERENCES llx_c_barcode_type(rowid);
-- this update change the old formated url on llx_bank_url
UPDATE llx_bank_url set url = replace( url, 'fiche.php', 'card.php');
UPDATE llx_bank_url set url = REPLACE( url, 'fiche.php', 'card.php');