diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 5da397b4183..233e241667f 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -23,7 +23,7 @@
* \file htdocs/compta/paiement.php
* \ingroup compta
* \brief Page to create a payment
- * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 eldy Exp $
+ * \version $Id: paiement.php,v 1.114 2011/08/08 01:01:46 eldy Exp $
*/
require('../main.inc.php');
@@ -289,7 +289,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
json["amountPayment"] = jQuery("#amountpayment").attr("value");
json["amounts"] = elemToJson(form.find("input[name*=\"amount_\"]"));
json["remains"] = elemToJson(form.find("input[name*=\"remain_\"]"));
-
+
if(imgId != null)json["imgClicked"] = imgId;
jQuery.post("ajaxpayment.php", json, function(data)
@@ -300,13 +300,13 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
for(var key in json)
{
- if(key == "result") {
- if(json["makeRed"]) {
+ if(key == "result") {
+ if(json["makeRed"]) {
jQuery("#"+key).css("color", "red");
} else {
jQuery("#"+key).removeAttr("style");
}
- json[key]=json["label"]+" "+json[key];
+ json[key]=json["label"]+" "+json[key];
jQuery("#"+key).text(json[key]);
} else {
form.find("input[name*=\""+key+"\"]").each(function() {
@@ -581,7 +581,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
$langs->load("withdrawals");
if ($conf->global->WITHDRAW_DISABLE_AUTOCREATE_ONPAYMENTS) print '
'.$langs->trans("IfInvoiceNeedOnWithdrawPaymentWontBeClosed");
}*/
- print '
';
+ print '
';
// print '';
}
@@ -672,5 +672,5 @@ if (! GETPOST('action'))
$db->close();
-llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $');
+llxFooter('$Date: 2011/08/08 01:01:46 $ - $Revision: 1.114 $');
?>
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index a95a0431c28..db4932eefcd 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -21,7 +21,7 @@
* \file htdocs/compta/paiement/class/paiement.class.php
* \ingroup facture
* \brief File of class to manage payments of customers invoices
- * \version $Id: paiement.class.php,v 1.23 2011/08/05 21:06:55 eldy Exp $
+ * \version $Id: paiement.class.php,v 1.24 2011/08/08 01:01:45 eldy Exp $
*/
require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php");
@@ -200,7 +200,8 @@ class Paiement extends CommonObject
}
}
- if ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
+ if ($invoice->type != 0 && $invoice->type != 1) dol_syslog("Invoice ".$facid." is not a standard nor replacement invoice. We do nothing more.");
+ else if ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
else $result=$invoice->set_paid($user,'','');
}