This commit is contained in:
Laurent Destailleur 2019-10-20 15:37:20 +02:00
parent 5a4960f7ae
commit 05352a62e5
2 changed files with 9 additions and 9 deletions

View File

@ -132,7 +132,7 @@ table.postablelines tr td {
div.paymentbordline div.paymentbordline
{ {
width:50%; width:50%;
background-color:#666; background-color:#888;
border-radius: 8px; border-radius: 8px;
margin-bottom: 4px; margin-bottom: 4px;
} }

View File

@ -658,7 +658,7 @@ if ($placeid > 0)
{ {
//In Phone basic layout hide some content depends situation //In Phone basic layout hide some content depends situation
if ($_SESSION["basiclayout"]==1 && $mobilepage!="invoice" && $action!="order") return; if ($_SESSION["basiclayout"]==1 && $mobilepage!="invoice" && $action!="order") return;
if (is_array($invoice->lines) && count($invoice->lines)) if (is_array($invoice->lines) && count($invoice->lines))
{ {
$tmplines = array_reverse($invoice->lines); $tmplines = array_reverse($invoice->lines);
@ -718,10 +718,12 @@ print '</table>';
if ($invoice->socid != $conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]}) if ($invoice->socid != $conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]})
{ {
$soc = new Societe($db); $constforcompanyid='CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"];
$soc = new Societe($db);
if ($invoice->socid > 0) $soc->fetch($invoice->socid); if ($invoice->socid > 0) $soc->fetch($invoice->socid);
else $soc->fetch($conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]}); else $soc->fetch($conf->global->$constforcompanyid);
print '<!-- Show customer --><p style="font-size:120%;" class="right">'; print '<!-- Show customer -->';
print '<p class="right">';
print $langs->trans("Customer").': '.$soc->name; print $langs->trans("Customer").': '.$soc->name;
$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"]; $constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];
@ -732,15 +734,13 @@ if ($invoice->socid != $conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takep
$warehouse->fetch($conf->global->$constantforkey); $warehouse->fetch($conf->global->$constantforkey);
print '<br>'.$langs->trans("Warehouse").': '.$warehouse->ref; print '<br>'.$langs->trans("Warehouse").': '.$warehouse->ref;
} }
print '</p>';
// Module Adherent // Module Adherent
if (! empty($conf->adherent->enabled)) if (! empty($conf->adherent->enabled))
{ {
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
$langs->load("members"); $langs->load("members");
print '<p style="font-size:120%;" class="right">'; print '<br>'.$langs->trans("Member").': ';
print $langs->trans("Member").': ';
$adh=new Adherent($db); $adh=new Adherent($db);
$result=$adh->fetch('', '', $invoice->socid); $result=$adh->fetch('', '', $invoice->socid);
if ($result > 0) if ($result > 0)
@ -765,8 +765,8 @@ if ($invoice->socid != $conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takep
{ {
print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>'; print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
} }
print '</p>';
} }
print '</p>';
} }
if ($action == "search") if ($action == "search")