Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php

Untranslatable token Calendar in datepicker

Typo

This reverts commit fdac53bf.

Fix: Show sender Country on PDF docs

Use lowest buying price for margin when selling with POS or external
module. A POS user does not worry about suppliers.

Show sender Country on PDF docs when sender Country != receiver Country

Update objectline_create.tpl.php

Fixed [ bug #1595 ] Selected boolean extrafield in intervention creation page, does not save state

Fix bug 1692 Can't update phone_pro with the contact webservice

FIX: bad margin and buy_price calculation when total_ht = 0 (discount 100%) on a line

FIX: copy extrafields when creating order from propale and creating

add label tags for product mode type

100%) on a line

Some site disabled ssl v1 to 3 (ex: paypal).

planned transactions.

Avoid missing class error for fetch_thirdparty method

Fix problem on task creation with chrome for french browser.

invoice from order

Fix : The tva not coming from multi price for invoice

Conflicts:
	ChangeLog
	htdocs/core/class/commonobject.class.php

Fix : actioncomme report was not filtering by entity...