From fdd59b61f88459e9a59367974c2f7f67244962f3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Aug 2011 23:51:31 +0000 Subject: [PATCH] Work on package --- htdocs/compta/paiement.php | 14 +++++++------- htdocs/compta/paiement/class/paiement.class.php | 5 ++--- htdocs/langs/en_US/bills.lang | 2 +- htdocs/langs/fr_FR/bills.lang | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 233e241667f..5da397b4183 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.114 2011/08/08 01:01:46 eldy Exp $ + * \version $Id: paiement.php,v 1.113 2011/08/03 00:46:23 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/08 01:01:46 $ - $Revision: 1.114 $'); +llxFooter('$Date: 2011/08/03 00:46:23 $ - $Revision: 1.113 $'); ?> diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index db4932eefcd..a95a0431c28 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.24 2011/08/08 01:01:45 eldy Exp $ + * \version $Id: paiement.class.php,v 1.23 2011/08/05 21:06:55 eldy Exp $ */ require_once(DOL_DOCUMENT_ROOT ."/core/class/commonobject.class.php"); @@ -200,8 +200,7 @@ class Paiement extends CommonObject } } - 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."); + 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,'',''); } diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 93e3b307c3a..3918702c260 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -366,7 +366,7 @@ DisabledBecausePayments=Not possible since there is some payments CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified payed ExpectedToPay=Expected payment PayedByThisPayment=Payed by this payment -ClosePaidInvoicesAutomatically=Classify "Payed" all standard or replacement invoices entierely payed. +ClosePaidInvoicesAutomatically=Classify "Payed" all invoices entierely payed. AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Payed". ##### Types de contacts ##### TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index 0176649a21c..3e510424795 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -366,7 +366,7 @@ DisabledBecausePayments=Non disponible car il existe des paiements CantRemovePaymentWithOneInvoicePaid=Suppression impossible quand il existe au moins une facture classée payée. ExpectedToPay=Paiement attendu PayedByThisPayment=Règlé par ce paiement -ClosePaidInvoicesAutomatically=Classer automatiquement à "Payé" les factures standards et de remplacement entièrement payées. +ClosePaidInvoicesAutomatically=Classer automatiquement à "Payé" les factures entièrement payées. AllCompletelyPayedInvoiceWillBeClosed=Toutes les factures avec un reste à payer nul seront automatiquement fermées au statut "Payé". ##### Types de contacts ##### TypeContact_facture_internal_SALESREPFOLL=Responsable suivi facture client