';
print '
';
if ($filterdate || $filteraccountid > 0)
@@ -655,8 +655,7 @@ else
print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"b.amount", "",$param,'align="right"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("LineRecord"),$_SERVER["PHP_SELF"],"b.rowid", "",$param,'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Payment"),$_SERVER["PHP_SELF"],"p.rowid", "",$param,'align="center"',$sortfield,$sortorder);
- print_liste_field_titre('');
-
+ print_liste_field_titre('',$_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,'maxwidthsearch ');
print "\n";
$i=1;
$var=false;
@@ -699,17 +698,11 @@ else
print '';
if ($object->statut == 0)
{
- print '
rowid.'">'.img_delete().' | ';
+ print '
rowid.'">'.img_delete().'';
+ print 'rowid.'">'.img_picto($langs->trans("RejectCheck"),'disable').' | ';
}
- else
- {
- if($objp->statut == 0)
- {
- print '
rowid.'">'.img_picto($langs->trans("RejectCheck"),'disable').' | ';
- }
- else if($objp->statut == 2) {
- print '
'.img_picto($langs->trans('CheckRejected'),'statut8').' | ';
- }
+ else if($objp->statut == 2) {
+ print '
'.img_picto($langs->trans('CheckRejected'),'statut8').' | ';
}
print '';
$var=!$var;
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 82047342d35..20923222741 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -659,7 +659,7 @@ class RemiseCheque extends CommonObject
}
return 0;
}
-
+
/**
* Check rejection management
* Reopen linked invoices and saves a new negative payment
@@ -671,34 +671,35 @@ class RemiseCheque extends CommonObject
function reject_check($bank_id, $rejection_date)
{
global $db, $user;
-
+
$payment = new Paiement($db);
- $payment->fetch(0,$bank_id);
-
+ $payment->fetch(0,0,$bank_id);
+
$bankaccount = $payment->fk_account;
-
+
// Get invoice list to reopen them
$sql = 'SELECT pf.fk_facture, pf.amount';
$sql.= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
$sql.= ' WHERE pf.fk_paiement = '.$payment->id;
-
+
$resql=$db->query($sql);
if ($resql)
{
$rejectedPayment = new Paiement($db);
$rejectedPayment->amounts = array();
$rejectedPayment->datepaye = $rejection_date;
- $rejectedPayment->paiementid = 7; // type of payment: check
+ $rejectedPayment->paiementid = dol_getIdFromCode($this->db, 'CHQ', 'c_paiement');
$rejectedPayment->num_paiement = $payment->numero;
-
- while($obj = $db->fetch_object($resql)) {
+
+ while($obj = $db->fetch_object($resql))
+ {
$invoice = new Facture($db);
$invoice->fetch($obj->fk_facture);
$invoice->set_unpaid($user);
-
+
$rejectedPayment->amounts[$obj->fk_facture] = price2num($obj->amount) * -1;
}
-
+
if ($rejectedPayment->create($user) > 0)
{
$result=$rejectedPayment->addPaymentToBank($user,'payment','(CheckRejected)',$bankaccount,'','');
@@ -723,7 +724,7 @@ class RemiseCheque extends CommonObject
return -1;
}
}
-
+
/**
* Charge les proprietes ref_previous et ref_next
*
@@ -813,7 +814,7 @@ class RemiseCheque extends CommonObject
$sql = "UPDATE ".MAIN_DB_PREFIX."bordereau_cheque";
$sql.= " SET number = '".$number."'" ;
$sql.= " WHERE rowid = ".$this->id;
-
+
dol_syslog("RemiseCheque::set_number", LOG_DEBUG);
$resql=$this->db->query($sql);
if ($resql)
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index dc4be17aa07..e45d0936bcc 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -79,10 +79,11 @@ class Paiement extends CommonObject
* Load payment from database
*
* @param int $id Id of payment to get
+ * @param string $ref Ref of payment to get (currently ref = id but this may change in future)
* @param int $fk_bank Id of bank line associated to payment
* @return int <0 if KO, 0 if not found, >0 if OK
*/
- function fetch($id, $fk_bank='')
+ function fetch($id, $ref='', $fk_bank='')
{
$sql = 'SELECT p.rowid, p.datep as dp, p.amount, p.statut, p.fk_bank,';
$sql.= ' c.code as type_code, c.libelle as type_libelle,';
@@ -91,10 +92,12 @@ class Paiement extends CommonObject
$sql.= ' FROM '.MAIN_DB_PREFIX.'c_paiement as c, '.MAIN_DB_PREFIX.'paiement as p';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid ';
$sql.= ' WHERE p.fk_paiement = c.id';
- if ($fk_bank)
- $sql.= ' AND p.fk_bank = '.$fk_bank;
- else
+ if ($id > 0)
$sql.= ' AND p.rowid = '.$id;
+ else if ($ref)
+ $sql.= ' AND p.rowid = '.$ref;
+ else if ($fk_bank)
+ $sql.= ' AND p.fk_bank = '.$fk_bank;
dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$result = $this->db->query($sql);
@@ -670,7 +673,7 @@ class Paiement extends CommonObject
return -1;
}
}
-
+
/**
* Reject payment
*