diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 857a3f381d3..1a1ad7a5f56 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -1023,6 +1023,9 @@ print ''; if (empty($arrayfields['customerorsupplier']['checked'])) { print ''; } +if (!empty($place)) { + print ''; +} print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'building', 0, $newcardbutton, '', $limit, 0, 0, 1); diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index 592da00c24d..56a850f11fd 100644 --- a/htdocs/takepos/invoice.php +++ b/htdocs/takepos/invoice.php @@ -460,7 +460,7 @@ if (empty($reshook)) { } if (($action == "addline" || $action == "freezone") && $placeid == 0) { - $invoice->socid = getDolGlobalString("$constforcompanyid"); + $invoice->socid = getDolGlobalString($constforcompanyid); $invoice->date = dol_now(); $invoice->module_source = 'takepos'; $invoice->pos_source = isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '' ; @@ -537,7 +537,7 @@ if (empty($reshook)) { $invoice->fetch_thirdparty(); $array_options = array(); - $line = array('description' => $prod->description, 'price' => $price, 'tva_tx' => $tva_tx, 'locatax1_tx' => $localtax1_tx, 'locatax2_tx' => $localtax2_tx, 'remise_percent' => $customer->remise_percent, 'price_ttc' => $price_ttc, 'array_options' => $array_options); + $line = array('description' => $prod->description, 'price' => $price, 'tva_tx' => $tva_tx, 'localtax1_tx' => $localtax1_tx, 'localtax2_tx' => $localtax2_tx, 'remise_percent' => $customer->remise_percent, 'price_ttc' => $price_ttc, 'array_options' => $array_options); /* setup of margin calculation */ if (isset($conf->global->MARGIN_TYPE)) {