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

Merge pull request #1177 from FHenry/3.4

Browse Source 
Fix update extrafield do not display immediatly
This commit is contained in:
Juanjo Menent 2013-08-14 00:48:08 -07:00
commit 6b0e521920
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -6,6 +6,8 @@ English Dolibarr ChangeLog
Fix: [ bug #1029 ] Tulip numbering mask Fix: [ bug #1029 ] Tulip numbering mask
Fix: Supplier invoice and supplier order are not displayed into object link into agenda event card Fix: Supplier invoice and supplier order are not displayed into object link into agenda event card
Fix: [ bug #1033 ] SUPPLIER REF disappeared Fix: [ bug #1033 ] SUPPLIER REF disappeared
Fix: update extrafield do not display immediatly after update
Fix: Fix bug with canvas thirdparty
***** ChangeLog for 3.4 compared to 3.3.* ***** ***** ChangeLog for 3.4 compared to 3.3.* *****
For users: For users:

9
htdocs/core/class/commonobject.class.php
View File

@ -2221,7 +2221,14 @@ abstract class CommonObject
foreach($extrafields->attribute_label as $key=>$label) foreach($extrafields->attribute_label as $key=>$label)
{ {
$colspan='3'; $colspan='3';
$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$this->array_options["options_".$key]); switch($mode) {
case "view":
$value=$this->array_options["options_".$key];
break;
case "edit":
$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$this->array_options["options_".$key]);
break;
}
if ($extrafields->attribute_type[$key] == 'separate') if ($extrafields->attribute_type[$key] == 'separate')
{ {
$out .= $extrafields->showSeparator($key); $out .= $extrafields->showSeparator($key);

4
htdocs/societe/canvas/company/tpl/card_create.tpl.php
View File

@ -105,7 +105,7 @@
<tr> <tr>
<td valign="top"><?php echo $langs->trans('Address'); ?></td> <td valign="top"><?php echo $langs->trans('Address'); ?></td>
<td colspan="3"><textarea name="adresse" cols="40" rows="3"><?php echo $this->control->tpl['address']; ?></textarea></td> <td colspan="3"><textarea name="adress" cols="40" rows="3"><?php echo $this->control->tpl['address']; ?></textarea></td>
</tr> </tr>
<tr> <tr>
@ -127,7 +127,7 @@
<tr> <tr>
<td><?php echo $langs->trans('Phone'); ?></td> <td><?php echo $langs->trans('Phone'); ?></td>
<td><input type="text" name="tel" value="<?php echo $this->control->tpl['tel']; ?>"></td> <td><input type="text" name="phone" value="<?php echo $this->control->tpl['phone']; ?>"></td>
<td><?php echo $langs->trans('Fax'); ?></td> <td><?php echo $langs->trans('Fax'); ?></td>
<td><input type="text" name="fax" value="<?php echo $this->control->tpl['fax']; ?>"></td> <td><input type="text" name="fax" value="<?php echo $this->control->tpl['fax']; ?>"></td>
</tr> </tr>

4
htdocs/societe/canvas/company/tpl/card_edit.tpl.php
View File

@ -120,7 +120,7 @@ if ($this->control->tpl['fournisseur']) {
<tr> <tr>
<td valign="top"><?php echo $langs->trans('Address'); ?></td> <td valign="top"><?php echo $langs->trans('Address'); ?></td>
<td colspan="3"><textarea name="adresse" cols="40" rows="3"><?php echo $this->control->tpl['address']; ?></textarea></td> <td colspan="3"><textarea name="adress" cols="40" rows="3"><?php echo $this->control->tpl['address']; ?></textarea></td>
</tr> </tr>
<tr> <tr>
@ -142,7 +142,7 @@ if ($this->control->tpl['fournisseur']) {
<tr> <tr>
<td><?php echo $langs->trans('Phone'); ?></td> <td><?php echo $langs->trans('Phone'); ?></td>
<td><input type="text" name="tel" value="<?php echo $this->control->tpl['tel']; ?>"></td> <td><input type="text" name="phone" value="<?php echo $this->control->tpl['phone']; ?>"></td>
<td><?php echo $langs->trans('Fax'); ?></td> <td><?php echo $langs->trans('Fax'); ?></td>
<td><input type="text" name="fax" value="<?php echo $this->control->tpl['fax']; ?>"></td> <td><input type="text" name="fax" value="<?php echo $this->control->tpl['fax']; ?>"></td>
</tr> </tr>