diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php index bba62298989..0688d4a8584 100644 --- a/htdocs/takepos/index.php +++ b/htdocs/takepos/index.php @@ -763,8 +763,10 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) { echo ' - '.dol_print_date(dol_now(), "day").''; ?> +
+
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index 77254be543f..e358b24602a 100644 --- a/htdocs/takepos/invoice.php +++ b/htdocs/takepos/invoice.php @@ -733,7 +733,7 @@ function DolibarrTakeposPrinting(id) { $( document ).ready(function() { - console.log("Set customer info in header"); + console.log("Set customer info and sales in header"); trans("Customer"); @@ -742,7 +742,9 @@ $( document ).ready(function() { } ?> - $("#customerandsales").html(''); + $("#customerandsales").html(''); + + $("#customerandsales").append(''); fetch_object($resql)) { echo '$("#customerandsales").append(\''; - if ($placeid == $obj->rowid) echo ""; echo 'ref)); echo $num_sale; if (str_replace("-", "", $num_sale) > $max_sale) $max_sale = str_replace("-", "", $num_sale); - echo '\\\';Refresh();">'.date('H:i', strtotime($obj->datec)); + echo '\\\';Refresh();">'; + if ($placeid == $obj->rowid) echo ""; + echo date('H:i', strtotime($obj->datec)); if ($placeid == $obj->rowid) echo ""; echo '\');'; } @@ -787,7 +790,7 @@ $( document ).ready(function() { adherent->enabled) && $invoice->socid != $conf->global->$constforcompanyid) + if (!empty($conf->adherent->enabled) && $invoice->socid > 0 && $invoice->socid != $conf->global->$constforcompanyid) { $s = ''; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';