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

New: Add a cancel button on discount creation page

Browse Source
This commit is contained in:
Laurent Destailleur 2011-02-19 12:50:31 +00:00
parent 87f2b821de
commit e8a49fe288
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/comm/fiche.php
View File

@ -323,7 +323,7 @@ if ($socid > 0)
print "</td>";
print '</tr>';
// Reductions relative (Discounts-Drawbacks-Rebates)
// Relative discounts (Discounts-Drawbacks-Rebates)
print '<tr><td nowrap>';
print '<table width="100%" class="nobordernopadding"><tr><td nowrap>';
print $langs->trans("CustomerRelativeDiscountShort");
@ -336,7 +336,7 @@ if ($socid > 0)
print '</td><td colspan="3">'.($objsoc->remise_client?$objsoc->remise_client.'%':$langs->trans("DiscountNone")).'</td>';
print '</tr>';
// Reductions absolues (Discounts-Drawbacks-Rebates)
// Absolute discounts (Discounts-Drawbacks-Rebates)
print '<tr><td nowrap>';
print '<table width="100%" class="nobordernopadding">';
print '<tr><td nowrap>';
@ -344,7 +344,7 @@ if ($socid > 0)
print '<td><td align="right">';
if ($user->rights->societe->creer && !$user->societe_id > 0)
{
print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$objsoc->id.'">'.img_edit($langs->trans("Modify")).'</a>';
print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$objsoc->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$objsoc->id).'">'.img_edit($langs->trans("Modify")).'</a>';
}
print '</td></tr></table>';
print '</td>';

14
htdocs/comm/remx.php
View File

@ -318,13 +318,13 @@ if ($_socid > 0)
print '<table width="100%" class="noborder">';
print '<tr class="liste_titre">';
print '<td width="120" align="left">'.$langs->trans("Date").'</td>'; // Need 120+ for format with AM/PM
print '<td width="150" align="left">'.$langs->trans("ReasonDiscount").'</td>';
print '<td align="left" nowrap="nowrap">'.$langs->trans("ConsumedBy").'</td>';
print '<td align="left">'.$langs->trans("ReasonDiscount").'</td>';
print '<td width="150" nowrap="nowrap">'.$langs->trans("ConsumedBy").'</td>';
print '<td width="120" align="right">'.$langs->trans("AmountHT").'</td>';
print '<td width="80" align="right">'.$langs->trans("VATRate").'</td>';
print '<td width="120" align="right">'.$langs->trans("AmountTTC").'</td>';
print '<td width="100" align="center">'.$langs->trans("DiscountOfferedBy").'</td>';
print '<td width="20">&nbsp;</td>';
print '<td width="50">&nbsp;</td>';
print '</tr>';
$var = true;
@ -360,7 +360,7 @@ if ($_socid > 0)
print $obj->description;
print '</td>';
}
print '<td align="left" nowrap="nowrap">'.$langs->trans("NotConsumed").'</td>';
print '<td nowrap="nowrap">'.$langs->trans("NotConsumed").'</td>';
print '<td align="right">'.price($obj->amount_ht).'</td>';
print '<td align="right">'.price2num($obj->tva_tx,'MU').'%</td>';
print '<td align="right">'.price($obj->amount_ttc).'</td>';
@ -454,13 +454,13 @@ if ($_socid > 0)
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td width="120" align="left">'.$langs->trans("Date").'</td>'; // Need 120+ for format with AM/PM
print '<td width="150" align="left">'.$langs->trans("ReasonDiscount").'</td>';
print '<td align="left" nowrap="nowrap">'.$langs->trans("ConsumedBy").'</td>';
print '<td align="left">'.$langs->trans("ReasonDiscount").'</td>';
print '<td width="150" nowrap="nowrap">'.$langs->trans("ConsumedBy").'</td>';
print '<td width="120" align="right">'.$langs->trans("AmountHT").'</td>';
print '<td width="80" align="right">'.$langs->trans("VATRate").'</td>';
print '<td width="120" align="right">'.$langs->trans("AmountTTC").'</td>';
print '<td width="100" align="center">'.$langs->trans("Author").'</td>';
print '<td width="20">&nbsp;</td>';
print '<td width="50">&nbsp;</td>';
print '</tr>';
$var = true;