Fix: Delete linked element to supplier invoice when deleted (as done for
all other object into dolibarr)
Real ref filter
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Add dol_syslog
Fix bug on expedition create : create expedition with rowid (or
origin_id) that already exits, and you will have all product of the
other expedition and the new expedition form order
Revert previous commit filter sort on fourn/facture/index.php
Merge pull request #1211 from FHenry/3.4

Fix: Delete linked element to supplier invoice when deleted (as done for
Fix: Edit propal line was losing product supplier price id

Conflicts:
	ChangeLog
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4

Conflicts:
	ChangeLog
Enabled travis-ci on old branch
Enabled travis-ci on old branch
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Fix: permission check in invoice webservice
remove comment & indent code
Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	.travis.yml
Fix: sql init data does not match 3.4 data
Fix: Bug with php 5.4
Merge pull request #1224 from jfefe/fix_ws_invoice

Fix ws invoice
Fix: eof
Fix: data init
Fix: bug with php 5.4
Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	test/phpunit/PdfDocTest.php
Merge remote-tracking branch 'origin/3.4' into 3.4_backported

Conflicts:
	ChangeLog