lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2018-06-18 14:46:47 +02:00
commit b64b4abf07
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/product/canvas/product/actions_card_product.class.php
View File

@ -101,7 +101,7 @@ class ActionsCardProduct
$this->tpl['ref'] = $this->ref;
// Label
$this->tpl['label'] = $this->libelle;
$this->tpl['label'] = $this->label;
// Description
$this->tpl['description'] = nl2br($this->description);

2
htdocs/product/canvas/product/tpl/card_create.tpl.php
View File

@ -55,7 +55,7 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe
<tr>
<td class="fieldrequired"><?php echo $langs->trans("Label"); ?></td>
<td><input name="libelle" size="40" value="<?php echo $object->label; ?>"></td>
<td><input name="label" size="40" value="<?php echo $object->label; ?>"></td>
</tr>
<tr>

2
htdocs/product/canvas/product/tpl/card_edit.tpl.php
View File

@ -55,7 +55,7 @@ dol_htmloutput_errors($object->error,$object->errors);
<tr>
<td class="fieldrequired"><?php echo $langs->trans("Label"); ?></td>
<td><input name="libelle" size="40" value="<?php echo $object->label; ?>"></td>
<td><input name="label" size="40" value="<?php echo $object->label; ?>"></td>
</tr>
<tr>

2
htdocs/product/canvas/service/actions_card_service.class.php
View File

@ -100,7 +100,7 @@ class ActionsCardService
$this->tpl['ref'] = $this->ref;
// Label
$this->tpl['label'] = $this->libelle;
$this->tpl['label'] = $this->label;
// Description
$this->tpl['description'] = nl2br($this->description);

2
htdocs/product/canvas/service/tpl/card_create.tpl.php
View File

@ -52,7 +52,7 @@ $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSe
<tr>
<td class="fieldrequired"><?php echo $langs->trans("Label"); ?></td>
<td><input name="libelle" size="40" value="<?php echo $object->label; ?>"></td>
<td><input name="label" size="40" value="<?php echo $object->label; ?>"></td>
</tr>
<tr>

2
htdocs/product/canvas/service/tpl/card_edit.tpl.php
View File

@ -52,7 +52,7 @@ dol_htmloutput_errors($object->error,$object->errors);
<tr>
<td class="fieldrequired"><?php echo $langs->trans("Label"); ?></td>
<td><input name="libelle" size="40" value="<?php echo $object->label; ?>"></td>
<td><input name="label" size="40" value="<?php echo $object->label; ?>"></td>
</tr>
<tr>