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

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2017-01-20 14:11:55 +01:00
commit 6780b20968
7 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/comm/card.php
View File

@ -834,7 +834,9 @@ if ($id > 0)
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="6"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastContracts",($num<=$MAXLIST?"":$MAXLIST)).'</td>'; print '<td colspan="6"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastContracts",($num<=$MAXLIST?"":$MAXLIST)).'</td>';
print '<td align="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->id.'">'.$langs->trans("AllContracts").' <span class="badge">'.$num.'</span></a></td></tr></table></td>'; print '<td align="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->id.'">'.$langs->trans("AllContracts").' <span class="badge">'.$num.'</span></a></td>';
//print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/contract/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
print '</tr></table></td>';
print '</tr>'; print '</tr>';
} }
$i = 0; $i = 0;
@ -895,7 +897,9 @@ if ($id > 0)
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastInterventions",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fichinter/list.php?socid='.$object->id.'">'.$langs->trans("AllInterventions").' <span class="badge">'.$num.'</span></td></tr></table></td>'; print '<td colspan="3"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastInterventions",($num<=$MAXLIST?"":$MAXLIST)).'</td><td align="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fichinter/list.php?socid='.$object->id.'">'.$langs->trans("AllInterventions").' <span class="badge">'.$num.'</span></td>';
print '<td width="20px" align="right"><a href="'.DOL_URL_ROOT.'/fichinter/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
print '</tr></table></td>';
print '</tr>'; print '</tr>';
$var=!$var; $var=!$var;
} }
@ -1065,7 +1069,15 @@ if ($id > 0)
if (! empty($conf->facture->enabled)) if (! empty($conf->facture->enabled))
{ {
if ($user->rights->facture->creer && $object->status==1) if (empty($user->rights->facture->creer))
{
print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
}
else if ($object->status != 1)
{
print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
}
else
{ {
$langs->load("bills"); $langs->load("bills");
$langs->load("orders"); $langs->load("orders");
@ -1080,10 +1092,6 @@ if ($id > 0)
else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>'; else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
} }
else
{
print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
}
} }
} }

4
htdocs/compta/facture.php
View File

@ -3736,6 +3736,8 @@ else if ($id > 0 || ! empty($ref))
} }
else // Credit note else // Credit note
{ {
$cssforamountpaymentcomplete='';
// Total already paid back // Total already paid back
print '<tr><td colspan="' . $nbcols . '" align="right">'; print '<tr><td colspan="' . $nbcols . '" align="right">';
print $langs->trans('AlreadyPaidBack'); print $langs->trans('AlreadyPaidBack');
@ -3751,7 +3753,7 @@ else if ($id > 0 || ! empty($ref))
else else
print $langs->trans('ExcessPaydBack'); print $langs->trans('ExcessPaydBack');
print ' :</td>'; print ' :</td>';
print '<td align="right" bgcolor="#f0f0f0"><b>' . price($sign * $resteapayeraffiche) . '</b></td>'; print '<td align="right"'.($resteapayeraffiche?' class="amountremaintopayback"':(' class="'.$cssforamountpaymentcomplete.'"')).'>' . price($sign * $resteapayeraffiche) . '</td>';
print '<td class="nowrap">&nbsp;</td></tr>'; print '<td class="nowrap">&nbsp;</td></tr>';
// Sold credit note // Sold credit note

12
htdocs/core/class/commoninvoice.class.php
View File

@ -233,7 +233,7 @@ abstract class CommonInvoice extends CommonObject
* @param int $status Id status * @param int $status Id status
* @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto
* @param integer $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) * @param integer $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
* @param int $type Type facture * @param int $type Type invoice
* @return string Libelle du statut * @return string Libelle du statut
*/ */
function LibStatut($paye,$status,$mode=0,$alreadypaid=-1,$type=0) function LibStatut($paye,$status,$mode=0,$alreadypaid=-1,$type=0)
@ -255,8 +255,8 @@ abstract class CommonInvoice extends CommonObject
} }
else else
{ {
if ($type == 2) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted'); if ($type == 2) return $langs->trans('Bill'.$prefix.'StatusPaidBackOrConverted'); // credit note
elseif ($type == 3) return $langs->trans('Bill'.$prefix.'StatusConverted'); elseif ($type == 3) return $langs->trans('Bill'.$prefix.'StatusConverted'); // deposit invoice
else return $langs->trans('Bill'.$prefix.'StatusPaid'); else return $langs->trans('Bill'.$prefix.'StatusPaid');
} }
} }
@ -340,7 +340,11 @@ abstract class CommonInvoice extends CommonObject
if ($status == 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusDraft').' </span>'.img_picto($langs->trans('BillStatusDraft'),'statut0'); if ($status == 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusDraft').' </span>'.img_picto($langs->trans('BillStatusDraft'),'statut0');
if (($status == 3 || $status == 2) && $alreadypaid <= 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusCanceled').' </span>'.img_picto($langs->trans('BillStatusCanceled'),'statut5'); if (($status == 3 || $status == 2) && $alreadypaid <= 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusCanceled').' </span>'.img_picto($langs->trans('BillStatusCanceled'),'statut5');
if (($status == 3 || $status == 2) && $alreadypaid > 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially').' </span>'.img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut7'); if (($status == 3 || $status == 2) && $alreadypaid > 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusClosedPaidPartially').' </span>'.img_picto($langs->trans('BillStatusClosedPaidPartially'),'statut7');
if ($alreadypaid <= 0) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotPaid').' </span>'.img_picto($langs->trans('BillStatusNotPaid'),'statut1'); if ($alreadypaid <= 0)
{
if ($type == 2) return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotRefunded').' </span>'.img_picto($langs->trans('StatusNotRefunded'),'statut1');
return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusNotPaid').' </span>'.img_picto($langs->trans('BillStatusNotPaid'),'statut1');
}
return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusStarted').' </span>'.img_picto($langs->trans('BillStatusStarted'),'statut3'); return '<span class="xhideonsmartphone">'.$langs->trans('Bill'.$prefix.'StatusStarted').' </span>'.img_picto($langs->trans('BillStatusStarted'),'statut3');
} }
else else

8
htdocs/langs/en_US/bills.lang
View File

@ -113,22 +113,24 @@ BillStatus=Invoice status
StatusOfGeneratedInvoices=Status of generated invoices StatusOfGeneratedInvoices=Status of generated invoices
BillStatusDraft=Draft (needs to be validated) BillStatusDraft=Draft (needs to be validated)
BillStatusPaid=Paid BillStatusPaid=Paid
BillStatusPaidBackOrConverted=Paid or converted into discount BillStatusPaidBackOrConverted=Refund or converted into discount
BillStatusConverted=Paid (ready for final invoice) BillStatusConverted=Paid (ready for final invoice)
BillStatusCanceled=Abandoned BillStatusCanceled=Abandoned
BillStatusValidated=Validated (needs to be paid) BillStatusValidated=Validated (needs to be paid)
BillStatusStarted=Started BillStatusStarted=Started
BillStatusNotPaid=Not paid BillStatusNotPaid=Not paid
BillStatusNotRefunded=Not refunded
BillStatusClosedUnpaid=Closed (unpaid) BillStatusClosedUnpaid=Closed (unpaid)
BillStatusClosedPaidPartially=Paid (partially) BillStatusClosedPaidPartially=Paid (partially)
BillShortStatusDraft=Draft BillShortStatusDraft=Draft
BillShortStatusPaid=Paid BillShortStatusPaid=Paid
BillShortStatusPaidBackOrConverted=Processed BillShortStatusPaidBackOrConverted=Refund or converted
BillShortStatusConverted=Processed BillShortStatusConverted=Processed
BillShortStatusCanceled=Abandoned BillShortStatusCanceled=Abandoned
BillShortStatusValidated=Validated BillShortStatusValidated=Validated
BillShortStatusStarted=Started BillShortStatusStarted=Started
BillShortStatusNotPaid=Not paid BillShortStatusNotPaid=Not paid
BillShortStatusNotRefunded=Not refunded
BillShortStatusClosedUnpaid=Closed BillShortStatusClosedUnpaid=Closed
BillShortStatusClosedPaidPartially=Paid (partially) BillShortStatusClosedPaidPartially=Paid (partially)
PaymentStatusToValidShort=To validate PaymentStatusToValidShort=To validate
@ -203,7 +205,7 @@ AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposi
Abandoned=Abandoned Abandoned=Abandoned
RemainderToPay=Remaining unpaid RemainderToPay=Remaining unpaid
RemainderToTake=Remaining amount to take RemainderToTake=Remaining amount to take
RemainderToPayBack=Remaining amount to pay back RemainderToPayBack=Remaining amount to refund
Rest=Pending Rest=Pending
AmountExpected=Amount claimed AmountExpected=Amount claimed
ExcessReceived=Excess received ExcessReceived=Excess received

1
htdocs/langs/en_US/companies.lang
View File

@ -391,6 +391,7 @@ LastModifiedThirdParties=Latest %s modified third parties
UniqueThirdParties=Total of unique third parties UniqueThirdParties=Total of unique third parties
InActivity=Open InActivity=Open
ActivityCeased=Closed ActivityCeased=Closed
ThirdPartyIsClosed=Third party is closed
ProductsIntoElements=List of products/services into %s ProductsIntoElements=List of products/services into %s
CurrentOutstandingBill=Current outstanding bill CurrentOutstandingBill=Current outstanding bill
OutstandingBill=Max. for outstanding bill OutstandingBill=Max. for outstanding bill

3
htdocs/theme/eldy/style.css.php
View File

@ -607,6 +607,9 @@ div.myavailability {
color: #880000; color: #880000;
font-weight: bold; font-weight: bold;
} }
.amountremaintopayback {
font-weight: bold;
}
.savingdocmask { .savingdocmask {
margin-top: 6px; margin-top: 6px;
margin-bottom: 12px; margin-bottom: 12px;

3
htdocs/theme/md/style.css.php
View File

@ -584,6 +584,9 @@ div.myavailability {
color: #880000; color: #880000;
font-weight: bold; font-weight: bold;
} }
.amountremaintopayback {
font-weight: bold;
}
.savingdocmask { .savingdocmask {
margin-top: 6px; margin-top: 6px;
margin-bottom: 12px; margin-bottom: 12px;