Improved margins es_ES translation
Fixed bug #807: Margins modules with orders2invoice does not respect cost price
Also, removed duplicated requires in orderstoinvoice.php
Converted indentation to tabs
Updated changelog
Merge pull request #831 from marcosgdf/translations

Improved margins module es_ES translation
Merge pull request #830 from marcosgdf/bug-807

Fixed bug #807: Margins modules with orders2invoice does not respect cost price
Improved margins ca_ES translation
Improved es_ES holidays translations
Improved holidays module translations
Merge pull request #834 from marcosgdf/translations-3.3

Improved es_ES holidays translations
Fix: Bad link to all proposals into Third party card if customer is
prospect
Fix: missing current entity record
Fix: missing quote
Fix [ bug #789 ] VAT not being calculated in POS
Merge pull request #837 from FHenry/3.3

Fix [ bug #789 ] VAT not being calculated in POS
Update ChangeLog
Fix: bug into is_erasable function.

Conflicts:
	test/phpunit/NumberingModulesTest.php
Qual: Include is_erasable() into test

Conflicts:
	test/phpunit/NumberingModulesTest.php
Fix bug
http://www.dolibarr.org/forum/527-bugs-on-a-stable-version/22542-table-prefix-bug
update change log