Update objectline_create.tpl.php

add label tags for product mode type
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 #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
Merge remote-tracking branch 'origin/3.6' into 3.7

Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fichinter/fiche.php