Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql)
Merge pull request #1043 from FHenry/3.3

Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql)
Fix: [ bug #947 ] Can't create proposal lines with unit price = 0
Fixed es_ES translation typo
Fix trad holidays module
Merge pull request #1058 from marcosgdf/bug-947

Fix: [ bug #947 ] Can't create proposal lines with unit price = 0
Merge pull request #1059 from marcosgdf/translations

Fixed es_ES translation typo
Merge pull request #1060 from FHenry/3.3

Fix trad holidays module
Fix: Bad regex
[Bug #958] LocalTax2 for Spain fails on Suppliers
Fix: Bad translation. Must use a different string than products
Add parameter to force user in dol_check_access_document function
This required by webservice where global $user is not available
More info into log
Merge pull request #1067 from jfefe/3.4-fixfuser

Add parameter to force user in dol_check_access_document function
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Prepare 3.3.3
Fix: warning not always visible. Depends if addon modules were
installed. Var should provide a quick fix.
Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
Merge remote-tracking branch 'origin/3.4' into develop

Conflicts:
	build/perl/virtualmin/dolibarr.pl
	htdocs/core/lib/files.lib.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/public/paybox/paymentko.php
	htdocs/public/paybox/paymentok.php
	htdocs/public/paypal/paymentko.php
	htdocs/public/paypal/paymentok.php
	htdocs/webservices/server_other.php