Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 09:02:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu

Browse Source
This commit is contained in:
Regis Houssin
2019-07-19 09:37:34 +02:00
parent 6597c9f60d 2afefada40
commit cbda42d146
2228 changed files with 51044 additions and 20767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/commande/card.php
View File

@@ -1521,11 +1521,11 @@ if ($action == 'create' && $usercancreate)
if ($element == 'order' || $element == 'commande') {
$element = $subelement = 'commande';
}
if ($element == 'propal') {
elseif ($element == 'propal') {
$element = 'comm/propal';
$subelement = 'propal';
}
if ($element == 'contract') {
elseif ($element == 'contract') {
$element = $subelement = 'contrat';
}
@@ -1739,7 +1739,7 @@ if ($action == 'create' && $usercancreate)
if (!empty($conf->incoterm->enabled))
{
print '<tr>';
print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $objectsrc->libelle_incoterms, 1).'</label></td>';
print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $objectsrc->label_incoterms, 1).'</label></td>';
print '<td class="maxwidthonsmartphone">';
$incoterm_id = GETPOST('incoterm_id');
$incoterm_location = GETPOST('location_incoterms');
@@ -2363,7 +2363,7 @@ if ($action == 'create' && $usercancreate)
print '<td>';
if ($action != 'editincoterm')
{
print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1);
print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
}
else
{