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

Look and feel v12

Browse Source
This commit is contained in:
Laurent Destailleur 2020-02-24 05:23:34 +01:00
parent a9155d020a
commit 457d0668c8
7 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/compta/facture/class/facture.class.php
View File

@ -1397,6 +1397,9 @@ class Facture extends CommonInvoice
if (!empty($this->total_ttc))
$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
if ($moretitle) $label .= ' - '.$moretitle;
if (isset($this->statut) && isset($this->alreadypaid)) {
$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5, $this->alreadypaid);
}
}
$linkclose = ($target ? ' target="'.$target.'"' : '');

2
htdocs/compta/facture/list.php
View File

@ -1041,6 +1041,8 @@ if ($resql)
$totalpay = price2num($facturestatic->total_ttc - $remaintopay);
}
$facturestatic->alreadypaid = $paiement;
print '<tr class="oddeven"';
if ($contextpage == 'poslist')
{

6
htdocs/fichinter/class/fichinter.class.php
View File

@ -753,8 +753,10 @@ class Fichinter extends CommonObject
$result = '';
$label = '<u>'.$langs->trans("ShowIntervention").'</u>';
if (!empty($this->ref))
$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
if (isset($this->statut)) {
$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
}
$url = DOL_URL_ROOT.'/fichinter/card.php?id='.$this->id;

12
htdocs/fichinter/list.php
View File

@ -204,7 +204,7 @@ foreach ($arrayfields as $tmpkey => $tmpval)
$sql = "SELECT";
$sql .= " f.ref, f.rowid, f.fk_statut, f.description, f.datec as date_creation, f.tms as date_update, f.note_private,";
if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) $sql .= "fd.rowid as lineid, fd.description as descriptiondetail, fd.date as dp, fd.duree,";
$sql .= " s.nom as name, s.rowid as socid, s.client";
$sql .= " s.nom as name, s.rowid as socid, s.client, s.fournisseur, s.email, s.status as thirdpartystatus";
if (!empty($conf->projet->enabled)) {
$sql .= ", pr.rowid as projet_id, pr.ref as projet_ref, pr.title as projet_title";
}
@ -479,6 +479,13 @@ if ($resql)
$objectstatic->ref = $obj->ref;
$objectstatic->statut = $obj->fk_statut;
$companystatic->name=$obj->name;
$companystatic->id=$obj->socid;
$companystatic->client=$obj->client;
$companystatic->fournisseur=$obj->fournisseur;
$companystatic->email=$obj->email;
$companystatic->status=$obj->thirdpartystatus;
print '<tr class="oddeven">';
if (!empty($arrayfields['f.ref']['checked']))
@ -521,9 +528,6 @@ if ($resql)
if (! empty($arrayfields['s.nom']['checked']))
{
print '<td>';
$companystatic->name=$obj->name;
$companystatic->id=$obj->socid;
$companystatic->client=$obj->client;
print $companystatic->getNomUrl(1, '', 44);
print '</td>';
if (! $i) $totalarray['nbfield']++;

3
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -2358,6 +2358,9 @@ class FactureFournisseur extends CommonInvoice
elseif ($this->type == self::TYPE_CREDIT_NOTE) $label = $langs->transnoentitiesnoconv("ShowInvoiceAvoir").': '.$this->ref;
elseif ($this->type == self::TYPE_DEPOSIT) $label = $langs->transnoentitiesnoconv("ShowInvoiceDeposit").': '.$this->ref;
if ($moretitle) $label .= ' - '.$moretitle;
if (isset($this->statut) && isset($this->alreadypaid)) {
$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5, $this->alreadypaid);
}
$ref = $this->ref;
if (empty($ref)) $ref = $this->id;

4
htdocs/fourn/facture/list.php
View File

@ -849,6 +849,9 @@ if ($resql)
$totalpay = $paiement + $totalcreditnotes + $totaldeposits;
$remaintopay = $obj->total_ttc - $totalpay;
$facturestatic->alreadypaid = ($paiement ? $paiement : 0);
//If invoice has been converted and the conversion has been used, we dont have remain to pay on invoice
if ($facturestatic->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
if ($facturestatic->isCreditNoteUsed()) {
@ -1081,7 +1084,6 @@ if ($resql)
if (!empty($arrayfields['f.fk_statut']['checked']))
{
print '<td class="right nowrap">';
// TODO $paiement is not yet defined
print $facturestatic->LibStatut($obj->paye, $obj->fk_statut, 5, $paiement, $obj->type);
print "</td>";
if (!$i) $totalarray['nbfield']++;

4
htdocs/societe/class/societe.class.php
View File

@ -2417,7 +2417,9 @@ class Societe extends CommonObject
$label .= '<br><b>'.$langs->trans('CustomerAccountancyCode').':</b> '.($this->code_compta ? $this->code_compta : $this->code_compta_client);
if (!empty($conf->accounting->enabled) && $this->fournisseur)
$label .= '<br><b>'.$langs->trans('SupplierAccountancyCode').':</b> '.$this->code_compta_fournisseur;
if (isset($this->status)) {
$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
}
$label .= '</div>';
// Add type of canvas