diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 3eec109e6b3..a66e8e66500 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -254,7 +254,7 @@ if ($socid > 0)
print '
';
print '
';
-
+
if(! $isCustomer && ! $isSupplier) {
print '
'.$langs->trans('ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts').'
';
@@ -266,8 +266,8 @@ if ($socid > 0)
$db->close();
exit;
}
-
-
+
+
print '
';
if($isCustomer) { // Calcul avoirs client en cours
@@ -293,7 +293,7 @@ if ($socid > 0)
print ''.$langs->trans("CustomerAbsoluteDiscountAllUsers").' ';
print ''.$remise_all.' '.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").' ';
-
+
if (! empty($user->fk_soc)) // No need to show this for external users
{
print ''.$langs->trans("CustomerAbsoluteDiscountMy").' ';
@@ -322,10 +322,10 @@ if ($socid > 0)
{
dol_print_error($db);
}
-
+
print ''.$langs->trans("SupplierAbsoluteDiscountAllUsers").' ';
print ''.$remise_all.' '.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").' ';
-
+
if (! empty($user->fk_soc)) // No need to show this for external users
{
print ''.$langs->trans("SupplierAbsoluteDiscountMy").' ';
@@ -344,11 +344,11 @@ if ($socid > 0)
print load_fiche_titre($langs->trans("NewGlobalDiscount"),'','');
print '
';
-
+
if($isCustomer && ! $isSupplier) {
print ' ';
}
-
+
if(! $isCustomer && $isSupplier) {
print ' ';
}
@@ -356,8 +356,8 @@ if ($socid > 0)
print '';
if($isCustomer && $isSupplier) {
print ''.$langs->trans('DiscountType').' ';
- print ' '.$langs->trans('Customer').' ';
- print ' '.$langs->trans('Supplier').' ';
+ print ' '.$langs->trans('Customer').' ';
+ print ' '.$langs->trans('Supplier').' ';
print ' ';
}
print ''.$langs->trans("AmountHT").' ';
@@ -401,7 +401,7 @@ if ($socid > 0)
/*
* Liste remises fixes client restant en cours (= liees a aucune facture ni ligne de facture)
*/
-
+
print load_fiche_titre($langs->trans("DiscountStillRemaining"));
if($isCustomer) {
@@ -424,10 +424,11 @@ if ($socid > 0)
$sql.= " AND rc.discount_type = 0"; // Eliminate supplier discounts
$sql.= " AND (rc.fk_facture_line IS NULL AND rc.fk_facture IS NULL)";
$sql.= " ORDER BY rc.datec DESC";
-
+
$resql=$db->query($sql);
if ($resql)
{
+ print '';
print '
';
print '';
print ''.$langs->trans("Date").' '; // Need 120+ for format with AM/PM
@@ -439,9 +440,9 @@ if ($socid > 0)
print ''.$langs->trans("DiscountOfferedBy").' ';
print ' ';
print ' ';
-
+
$showconfirminfo=array();
-
+
$i = 0;
$num = $db->num_rows($resql);
if ($num > 0)
@@ -449,7 +450,7 @@ if ($socid > 0)
while ($i < $num)
{
$obj = $db->fetch_object($resql);
-
+
print '';
print ''.dol_print_date($db->jdate($obj->dc),'dayhour').' ';
if (preg_match('/\(CREDIT_NOTE\)/',$obj->description))
@@ -502,7 +503,7 @@ if ($socid > 0)
}
else print ' ';
print ' ';
-
+
if ($_GET["action"]=='split' && GETPOST('remid') == $obj->rowid)
{
$showconfirminfo['rowid']=$obj->rowid;
@@ -517,7 +518,8 @@ if ($socid > 0)
}
$db->free($resql);
print "
";
-
+ print '
';
+
if (count($showconfirminfo))
{
$amount1=price2num($showconfirminfo['amount_ttc']/2,'MT');
@@ -561,10 +563,11 @@ if ($socid > 0)
$sql.= " AND rc.discount_type = 1"; // Eliminate customer discounts
$sql.= " AND (rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)";
$sql.= " ORDER BY rc.datec DESC";
-
+
$resql=$db->query($sql);
if ($resql)
{
+ print '';
print '
';
print '';
print ''.$langs->trans("Date").' '; // Need 120+ for format with AM/PM
@@ -576,9 +579,9 @@ if ($socid > 0)
print ''.$langs->trans("DiscountOfferedBy").' ';
print ' ';
print ' ';
-
+
$showconfirminfo=array();
-
+
$i = 0;
$num = $db->num_rows($resql);
if ($num > 0)
@@ -586,7 +589,7 @@ if ($socid > 0)
while ($i < $num)
{
$obj = $db->fetch_object($resql);
-
+
print '';
print ''.dol_print_date($db->jdate($obj->dc),'dayhour').' ';
if (preg_match('/\(CREDIT_NOTE\)/',$obj->description))
@@ -639,7 +642,7 @@ if ($socid > 0)
}
else print ' ';
print ' ';
-
+
if ($_GET["action"]=='split' && GETPOST('remid') == $obj->rowid)
{
$showconfirminfo['rowid']=$obj->rowid;
@@ -654,7 +657,8 @@ if ($socid > 0)
}
$db->free($resql);
print "
";
-
+ print '
';
+
if (count($showconfirminfo))
{
$amount1=price2num($showconfirminfo['amount_ttc']/2,'MT');
@@ -673,19 +677,19 @@ if ($socid > 0)
dol_print_error($db);
}
- if($isCustomer) {
+ if ($isCustomer) {
print ''; // class="ficheaddleft"
print ''; // class="fichehalfright"
print ''; // class="fichecenter"
}
}
- print ' ';
+ print '
';
/*
* List discount consumed (=liees a une ligne de facture ou facture)
*/
-
+
print load_fiche_titre($langs->trans("DiscountAlreadyCounted"));
if($isCustomer) {
@@ -730,12 +734,13 @@ if ($socid > 0)
$sql2.= " AND rc.fk_user = u.rowid";
$sql2.= " AND rc.discount_type = 0"; // Eliminate supplier discounts
$sql2.= " ORDER BY dc DESC";
-
+
$resql=$db->query($sql);
$resql2=null;
if ($resql) $resql2=$db->query($sql2);
if ($resql2)
{
+ print '';
print '
';
print '';
print ''.$langs->trans("Date").' '; // Need 120+ for format with AM/PM
@@ -747,7 +752,7 @@ if ($socid > 0)
print ''.$langs->trans("Author").' ';
print ' ';
print ' ';
-
+
$tab_sqlobj=array();
$tab_sqlobjOrder=array();
$num = $db->num_rows($resql);
@@ -761,7 +766,7 @@ if ($socid > 0)
}
}
$db->free($resql);
-
+
$num = $db->num_rows($resql2);
for ($i = 0;$i < $num;$i++)
{
@@ -771,7 +776,7 @@ if ($socid > 0)
}
$db->free($resql2);
array_multisort($tab_sqlobjOrder,SORT_DESC,$tab_sqlobj);
-
+
$num = count($tab_sqlobj);
if ($num > 0)
{
@@ -830,8 +835,9 @@ if ($socid > 0)
{
print ''.$langs->trans("None").' ';
}
-
+
print "
";
+ print '
';
}
else
{
@@ -882,12 +888,13 @@ if ($socid > 0)
$sql2.= " AND rc.fk_user = u.rowid";
$sql2.= " AND rc.discount_type = 1"; // Eliminate customer discounts
$sql2.= " ORDER BY dc DESC";
-
+
$resql=$db->query($sql);
$resql2=null;
if ($resql) $resql2=$db->query($sql2);
if ($resql2)
{
+ print '';
print '
';
print '';
print ''.$langs->trans("Date").' '; // Need 120+ for format with AM/PM
@@ -899,7 +906,7 @@ if ($socid > 0)
print ''.$langs->trans("Author").' ';
print ' ';
print ' ';
-
+
$tab_sqlobj=array();
$tab_sqlobjOrder=array();
$num = $db->num_rows($resql);
@@ -913,7 +920,7 @@ if ($socid > 0)
}
}
$db->free($resql);
-
+
$num = $db->num_rows($resql2);
for ($i = 0;$i < $num;$i++)
{
@@ -923,7 +930,7 @@ if ($socid > 0)
}
$db->free($resql2);
array_multisort($tab_sqlobjOrder,SORT_DESC,$tab_sqlobj);
-
+
$num = count($tab_sqlobj);
if ($num > 0)
{
@@ -982,8 +989,9 @@ if ($socid > 0)
{
print ''.$langs->trans("None").' ';
}
-
+
print "
";
+ print '
';
}
else
{