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

Update consumption.php

Browse Source
This commit is contained in:
Frédéric FRANCE 2019-02-10 23:37:12 +01:00 committed by GitHub
parent 7d20321b3b
commit 9893e8d752
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/contact/consumption.php
View File

@ -322,18 +322,15 @@ if (!empty($sql_select))
$sql.=")"; $sql.=")";
} }
$sql.= $db->order($sortfield, $sortorder); $sql.= $db->order($sortfield, $sortorder);
//print ($sql);exit;
$resql=$db->query($sql); $resql=$db->query($sql);
$totalnboflines = $db->num_rows($resql); $totalnboflines = $db->num_rows($resql);
$sql.= $db->plimit($limit + 1, $offset); $sql.= $db->plimit($limit + 1, $offset);
//print $sql;
} }
$disabled=0; $disabled=0;
$showempty=2; $showempty=2;
if (empty($elementTypeArray) && ! $object->client && ! $object->fournisseur) if (empty($elementTypeArray) && ! $object->thirdparty->client && ! $object->thirdparty->fournisseur) {
{
$showempty=$langs->trans("ThirdpartyNotCustomerNotSupplierSoNoRef"); $showempty=$langs->trans("ThirdpartyNotCustomerNotSupplierSoNoRef");
$disabled=1; $disabled=1;
} }
@ -500,10 +497,7 @@ if ($sql_select)
elseif ($objp->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived"); elseif ($objp->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
elseif ($objp->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid"); elseif ($objp->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
//else $txt=$langs->trans("Discount"); //else $txt=$langs->trans("Discount");
print $txt; print $txt.'</a>';
?>
</a>
<?php
if ($objp->description) if ($objp->description)
{ {
if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0) if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0)