Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Look: Uniformize look and feel

Browse Source
This commit is contained in:
Laurent Destailleur
2011-09-08 21:28:57 +00:00
parent 4329db8608
commit 4f0830629a
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/fiche.php
View File

@@ -335,7 +335,7 @@ if ($socid > 0)
print '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$objsoc->id.'">'.img_edit($langs->trans("Modify")).'</a>';
}
print '</td></tr></table>';
print '</td><td colspan="3">'.($objsoc->remise_client?$objsoc->remise_client.'%':$langs->trans("DiscountNone")).'</td>';
print '</td><td colspan="3">'.($objsoc->remise_client?'<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$objsoc->id.'">'.$objsoc->remise_client.'%</a>':$langs->trans("DiscountNone")).'</td>';
print '</tr>';
// Absolute discounts (Discounts-Drawbacks-Rebates)
@@ -353,7 +353,7 @@ if ($socid > 0)
print '<td colspan="3">';
$amount_discount=$objsoc->getAvailableDiscounts();
if ($amount_discount < 0) dol_print_error($db,$societe->error);
if ($amount_discount > 0) print price($amount_discount).'&nbsp;'.$langs->trans("Currency".$conf->monnaie);
if ($amount_discount > 0) print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$objsoc->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$objsoc->id).'">'.price($amount_discount).'</a>&nbsp;'.$langs->trans("Currency".$conf->monnaie);
else print $langs->trans("DiscountNone");
print '</td>';
print '</tr>';

3
htdocs/comm/remise.php
View File

@@ -127,7 +127,8 @@ if ($_socid > 0)
print "</form>";
print "</div>\n";
dol_fiche_end();
print '<br>';

10
htdocs/comm/remx.php
View File

@@ -274,18 +274,20 @@ if ($_socid > 0)
print '<tr><td>'.$langs->trans("NoteReason").'</td>';
print '<td><input type="text" size="60" name="desc" value="'.$_POST["desc"].'"></td></tr>';
print '<tr><td align="center" colspan="2">';
print "</table>";
print '<center>';
print '<input type="submit" class="button" name="submit" value="'.$langs->trans("AddGlobalDiscount").'">';
if (GETPOST("backtopage"))
{
print '&nbsp; &nbsp; ';
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
}
print '</td></tr>';
print '</center>';
print "</table></form>";
print '</form>';
print "</div>\n";
dol_fiche_end();
print '<br>';