Merge branch '16p1' of https://github.com/aspangaro/dolibarr into 16p1
This commit is contained in:
commit
ff0f44ab35
@ -362,9 +362,9 @@ if ($result) {
|
|||||||
$amount_ht[$obj->socid] = $obj->amount;
|
$amount_ht[$obj->socid] = $obj->amount;
|
||||||
$amount[$obj->socid] = $obj->amount_ttc;
|
$amount[$obj->socid] = $obj->amount_ttc;
|
||||||
$fullname = $obj->name;
|
$fullname = $obj->name;
|
||||||
if (!empty($obj->name_alias)) {
|
if (!empty($obj->name_alias)) {
|
||||||
$fullname .= ' ('.$obj->name_alias.')';
|
$fullname .= ' ('.$obj->name_alias.')';
|
||||||
}
|
}
|
||||||
$name[$obj->socid] = $fullname;
|
$name[$obj->socid] = $fullname;
|
||||||
$address_zip[$obj->socid] = $obj->zip;
|
$address_zip[$obj->socid] = $obj->zip;
|
||||||
$address_town[$obj->socid] = $obj->town;
|
$address_town[$obj->socid] = $obj->town;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user