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

Fix edit of capital

Browse Source
This commit is contained in:
Laurent Destailleur 2018-04-30 11:01:33 +02:00
parent 9a345e99ef
commit e79c907ae0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/societe/card.php
View File

@ -60,7 +60,7 @@ $mesg=''; $error=0; $errors=array();
$action = (GETPOST('action','aZ09') ? GETPOST('action','aZ09') : 'view'); $action = (GETPOST('action','aZ09') ? GETPOST('action','aZ09') : 'view');
$cancel = GETPOST('cancel','alpha'); $cancel = GETPOST('cancel','alpha');
$backtopage = GETPOST('backtopage','alpha'); $backtopage = GETPOST('backtopage','alpha');
$confirm = GETPOST('confirm'); $confirm = GETPOST('confirm','alpha');
$socid = GETPOST('socid','int')?GETPOST('socid','int'):GETPOST('id','int'); $socid = GETPOST('socid','int')?GETPOST('socid','int'):GETPOST('id','int');
if ($user->societe_id) $socid=$user->societe_id; if ($user->societe_id) $socid=$user->societe_id;
@ -181,12 +181,12 @@ if (empty($reshook))
// Merge categories // Merge categories
$static_cat = new Categorie($db); $static_cat = new Categorie($db);
$custcats_ori = $static_cat->containing($soc_origin->id, 'customer', 'id'); $custcats_ori = $static_cat->containing($soc_origin->id, 'customer', 'id');
$custcats = $static_cat->containing($object->id, 'customer', 'id'); $custcats = $static_cat->containing($object->id, 'customer', 'id');
$custcats = array_merge($custcats,$custcats_ori); $custcats = array_merge($custcats,$custcats_ori);
$object->setCategories($custcats, 'customer'); $object->setCategories($custcats, 'customer');
$suppcats_ori = $static_cat->containing($soc_origin->id, 'supplier', 'id'); $suppcats_ori = $static_cat->containing($soc_origin->id, 'supplier', 'id');
$suppcats = $static_cat->containing($object->id, 'supplier', 'id'); $suppcats = $static_cat->containing($object->id, 'supplier', 'id');
$suppcats = array_merge($suppcats,$suppcats_ori); $suppcats = array_merge($suppcats,$suppcats_ori);
@ -1885,7 +1885,9 @@ else
// Capital // Capital
print '<tr><td>'.fieldLabel('Capital','capital').'</td>'; print '<tr><td>'.fieldLabel('Capital','capital').'</td>';
print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="'.$object->capital.'"> <font class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</font></td></tr>'; print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="';
print dol_escape_htmltag(price($object->capital));
print '"> <font class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</font></td></tr>';
// Default language // Default language
if (! empty($conf->global->MAIN_MULTILANGS)) if (! empty($conf->global->MAIN_MULTILANGS))