FIX: copy extrafields when creating order from propale and creating
invoice from order
check extrafields before inserting in DB
FIX: bad margin and buy_price calculation when total_ht = 0 (discount
100%) on a line
Update objectline_create.tpl.php

add label tags for product mode type
Merge pull request #2016 from altatof/3.5

FIX: copy extrafields when creating order from propale and creating
Merge remote-tracking branch 'origin/3.5' into 3.6
Fix bug 1692 Can't update phone_pro with the contact webservice
Fixed [ bug #1595 ] Selected boolean extrafield in intervention creation page, does not save state
Merge remote-tracking branch 'upstream/3.6' into 3.6
Merge pull request #2066 from altatof/fix_margin_recap

FIX: bad margin and buy_price calculation when total_ht = 0 (discount 100%) on a line
Merge pull request #2067 from frederic34/patch-2

Fix bug 1692 Can't update phone_pro with the contact webservice
Merge remote-tracking branch 'origin/3.5' into 3.6
Merge pull request #2077 from marcosgdf/3.6

Fixed [ bug #1595 ] Selected boolean extrafield in intervention creation page, does not save state
Merge pull request #2058 from defrance69/patch-30

Update objectline_create.tpl.php
Fix: Show sender Country on PDF docs

Show sender Country on PDF docs when sender Country != receiver Country
Fix: [ bug #1624 ] POS set buy price for margin

Use lowest buying price for margin when selling with POS or external
module. A POS user does not worry about suppliers.
Merge pull request #2099 from fappels/3.6

Fix: Show sender Country on PDF docs
Revert "Update objectline_create.tpl.php"

This reverts commit fdac53bfca37b034a8decfb4f0e568cbc93a5b27.
Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6_nomadic

Conflicts:
	htdocs/commande/class/commande.class.php