From ebe625aa16ac310805f21f715ec83de6471db523 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 21 Feb 2017 13:16:28 +0100 Subject: [PATCH] Fix debug direct debit module --- ... Mandate 19-Morgan Bank-RUM1301-0008-0.pdf | Bin 0 -> 14862 bytes htdocs/compta/prelevement/card.php | 78 +++++----- .../class/bonprelevement.class.php | 2 +- .../class/ligneprelevement.class.php | 12 +- htdocs/compta/prelevement/create.php | 2 + htdocs/compta/prelevement/demandes.php | 10 +- htdocs/compta/prelevement/factures.php | 139 ++++++++++++------ htdocs/compta/prelevement/fiche-rejet.php | 87 ++++++----- htdocs/compta/prelevement/fiche-stat.php | 16 +- htdocs/langs/en_US/withdrawals.lang | 1 + 10 files changed, 199 insertions(+), 148 deletions(-) create mode 100644 dev/initdemo/documents_demo/societe/19/SEPA Mandate 19-Morgan Bank-RUM1301-0008-0.pdf diff --git a/dev/initdemo/documents_demo/societe/19/SEPA Mandate 19-Morgan Bank-RUM1301-0008-0.pdf b/dev/initdemo/documents_demo/societe/19/SEPA Mandate 19-Morgan Bank-RUM1301-0008-0.pdf new file mode 100644 index 0000000000000000000000000000000000000000..5965a6efa64b187485c02c74ec5e433d4aa1ee6e GIT binary patch literal 14862 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 JFtjjY{XZty(@X#W literal 0 HcmV?d00001 diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php index f3d7f09f0b4..bd16ec0e23b 100644 --- a/htdocs/compta/prelevement/card.php +++ b/htdocs/compta/prelevement/card.php @@ -45,16 +45,25 @@ if ($user->societe_id > 0) accessforbidden(); // Get supervariables $action = GETPOST('action','alpha'); $id = GETPOST('id','int'); - $socid = GETPOST('socid','int'); -$page = GETPOST('page','int'); -$sortorder = ((GETPOST('sortorder','alpha')=="")) ? "DESC" : GETPOST('sortorder','alpha'); -$sortfield = ((GETPOST('sortfield','alpha')=="")) ? "pl.fk_soc" : GETPOST('sortfield','alpha'); + + +$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit; +$sortfield = GETPOST("sortfield",'alpha'); +$sortorder = GETPOST("sortorder",'alpha'); +$page = GETPOST("page",'int'); +if ($page == -1) { $page = 0; } +$offset = $limit * $page; +$pageprev = $page - 1; +$pagenext = $page + 1; +if (! $sortfield) $sortfield='pl.fk_soc'; +if (! $sortorder) $sortorder='DESC'; /* * Actions */ + if ( $action == 'confirm_delete' ) { $bon = new BonPrelevement($db,""); @@ -73,10 +82,12 @@ if ( $action == 'confirm_credite' && GETPOST('confirm','alpha') == 'yes') $bon = new BonPrelevement($db,""); $bon->fetch($id); - $bon->set_credite(); - - header("Location: card.php?id=".$id); - exit; + $res=$bon->set_credite(); + if ($res >= 0) + { + header("Location: card.php?id=".$id); + exit; + } } if ($action == 'infotrans' && $user->rights->prelevement->bons->send) @@ -162,12 +173,12 @@ if ($id > 0) print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; // Status - print ''; + print ''; print ''; print ''; @@ -176,16 +187,16 @@ if ($id > 0) $muser = new User($db); $muser->fetch($bon->user_trans); - print ''; - print ''; } if($bon->date_credit <> 0) { - print ''; } @@ -194,7 +205,7 @@ if ($id > 0) print '
'; - print '
'.$langs->trans("Ref").''.$bon->getNomUrl(1).'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'day').'
'.$langs->trans("Amount").''.price($bon->amount).'
'.$langs->trans("Ref").''.$bon->getNomUrl(1).'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'day').'
'.$langs->trans("Amount").''.price($bon->amount).'
'.$langs->trans('Status').'
'.$langs->trans('Status').''.$bon->getLibStatut(1).'
'.$langs->trans("TransData").''; + print '
'.$langs->trans("TransData").''; print dol_print_date($bon->date_trans,'day'); print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'
'.$langs->trans("TransMetod").''; + print '
'.$langs->trans("TransMetod").''; print $bon->methodes_trans[$bon->method_trans]; print '
'.$langs->trans('CreditDate').''; + print '
'.$langs->trans('CreditDate').''; print dol_print_date($bon->date_credit,'day'); print '
'; + print ''; print_liste_field_titre($langs->trans("Lines"),$_SERVER["PHP_SELF"],"pl.rowid",'',$urladd); print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom",'',$urladd); - print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"pl.amount","",$urladd,'align="center"'); + print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"pl.amount","",$urladd,'align="right"'); print_liste_field_titre(''); print "\n"; @@ -320,13 +324,12 @@ if ($id > 0) print ""; + // Status of line print "'; $thirdparty=new Societe($db); @@ -335,7 +338,7 @@ if ($id > 0) print $thirdparty->getNomUrl(1); print "\n"; - print '\n"; + print '\n"; print ''; - $total += $obj->total_ttc; + $total += $obj->amount; $var=!$var; $i++; } - if($socid) + if ($num > 0) { - print ""; - + print ''; print ''; - - print '\n"; - print ''; - + print '\n"; print ''; - print "\n"; } diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index 9373527e20c..bc32d090f84 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -323,7 +323,7 @@ class BonPrelevement extends CommonObject /** * Set credite and set status of linked invoices * - * @return int <0 if KO, >0 if OK + * @return int <0 if KO, >=0 if OK */ function set_credite() { diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php index 0cc1b3d2f94..fa8545c4ea2 100644 --- a/htdocs/compta/prelevement/class/ligneprelevement.class.php +++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php @@ -136,24 +136,22 @@ class LignePrelevement { return $langs->trans($this->statuts[$statut]); } - if ($mode == 1) { - if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]); - if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]); - if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]); + if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut1').' '.$langs->trans($this->statuts[$statut]); // Waiting + if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut6').' '.$langs->trans($this->statuts[$statut]); // Credited + if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]); // Refused } if ($mode == 2) { if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut1'); - if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut4'); + if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut6'); if ($statut==3) return img_picto($langs->trans($this->statuts[$statut]),'statut8'); } - if ($mode == 3) { if ($statut==0) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut1'); - if ($statut==2) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut4'); + if ($statut==2) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut6'); if ($statut==3) return $langs->trans($this->statuts[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut8'); } } diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index a0b8e67365f..b45a49dbe69 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -239,6 +239,7 @@ else /* * List of latest withdraws */ +/* $limit=5; print load_fiche_titre($langs->trans("LastWithdrawalReceipts",$limit),'',''); @@ -291,6 +292,7 @@ else { dol_print_error($db); } +*/ llxFooter(); $db->close(); diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index 173505329dc..e104ba75a1a 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -110,10 +110,10 @@ if ($resql) print '
'; print $langs->trans("WithdrawalFile").''; $relativepath = 'receipts/'.$bon->ref.'.xml'; print ''.$relativepath.''; @@ -204,7 +215,6 @@ if ($id > 0) - if (empty($bon->date_trans) && $user->rights->prelevement->bons->send && $action=='settransmitted') { print '
'; @@ -236,7 +246,7 @@ if ($id > 0) print ''; print ''; print ''; - print ''; print '
'.$langs->trans("NotifyCredit").'
'.$langs->trans('CreditDate').''; + print '
'.$langs->trans('CreditDate').''; print $form->select_date('','','','','',"infocredit",1,1); print '
'; @@ -269,17 +279,11 @@ if ($id > 0) $ligne=new LignePrelevement($db,$user); - if ($page == -1) { $page = 0 ; } - - $offset = $conf->liste_limit * $page ; - $pageprev = $page - 1; - $pagenext = $page + 1; - /* * Lines into withdraw request */ - $sql = "SELECT pl.rowid, pl.statut, pl.amount"; - $sql.= ", s.rowid as socid, s.nom as name"; + $sql = "SELECT pl.rowid, pl.statut, pl.amount,"; + $sql.= " s.rowid as socid, s.nom as name"; $sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl"; $sql.= ", ".MAIN_DB_PREFIX."prelevement_bons as pb"; $sql.= ", ".MAIN_DB_PREFIX."societe as s"; @@ -306,7 +310,7 @@ if ($id > 0) print '
"; - print $ligne->LibStatut($obj->statut,2); print " "; - print ''; - print substr('000000'.$obj->rowid, -6); + print sprintf("%06s",$obj->rowid); print ''.price($obj->amount)."'.price($obj->amount)."'; @@ -350,23 +353,18 @@ if ($id > 0) print '
'.$langs->trans("Total").''.price($total)." '.price($total)." 
'; print ''; - print_liste_field_titre($langs->trans("Bill")); - print_liste_field_titre($langs->trans("Company")); - print_liste_field_titre($langs->trans("Amount")); - print_liste_field_titre($langs->trans("DateRequest")); + print_liste_field_titre($langs->trans("Bill"), $_SERVER["PHP_SELF"]); + print_liste_field_titre($langs->trans("Company"), $_SERVER["PHP_SELF"]); + print_liste_field_titre($langs->trans("Amount"), $_SERVER["PHP_SELF"], "", "", $param, 'align="right"'); + print_liste_field_titre($langs->trans("DateRequest"), $_SERVER["PHP_SELF"], "", "", $param, 'align="center"'); print_liste_field_titre(''); print ''; @@ -154,7 +154,7 @@ if ($resql) print ''; - print ''; + print ''; print ''; diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 1727bc16224..33a7a4486a0 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005 Laurent Destailleur + * Copyright (C) 2005-2017 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2010-2012 Juanjo Menent * @@ -43,9 +43,25 @@ if ($user->societe_id > 0) accessforbidden(); // Get supervariables $prev_id = GETPOST('id','int'); $socid = GETPOST('socid','int'); -$page = GETPOST('page','int'); -$sortorder = ((GETPOST('sortorder','alpha')=="")) ? "DESC" : GETPOST('sortorder','alpha'); -$sortfield = ((GETPOST('sortfield','alpha')=="")) ? "p.ref" : GETPOST('sortfield','alpha'); + +$limit = GETPOST("limit")?GETPOST("limit","int"):$conf->liste_limit; +$sortfield = GETPOST("sortfield",'alpha'); +$sortorder = GETPOST("sortorder",'alpha'); +$page = GETPOST("page",'int'); +if ($page == -1) { $page = 0; } +$offset = $limit * $page; +$pageprev = $page - 1; +$pagenext = $page + 1; +if (! $sortfield) $sortfield='p.ref'; +if (! $sortorder) $sortorder='DESC'; + + +/* + * View + */ + +$invoicetmp = new Facture($db); +$thirdpartytmp = new Societe($db); llxHeader('',$langs->trans("WithdrawalsReceipts")); @@ -60,30 +76,27 @@ if ($prev_id) print '
'.price($obj->total_ttc).''.dol_print_date($db->jdate($obj->date_demande),'day').''.dol_print_date($db->jdate($obj->date_demande),'day').'
'; - print ''; - print ''; - print ''; - + print ''; + print ''; + print ''; // Status - print ''; - print ''; - print ''; + print ''; if($bon->date_trans <> 0) { $muser = new User($db); $muser->fetch($bon->user_trans); - print ''; - print ''; } if($bon->date_credit <> 0) { - print ''; } @@ -92,7 +105,7 @@ if ($prev_id) print '
'; - print '
'.$langs->trans("Ref").''.$bon->getNomUrl(1).'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'day').'
'.$langs->trans("Amount").''.price($bon->amount).'
'.$langs->trans("Ref").''.$bon->getNomUrl(1).'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'day').'
'.$langs->trans("Amount").''.price($bon->amount).'
'.$langs->trans('Status').''.$bon->getLibStatut(1).'
'.$langs->trans('Status').''.$bon->getLibStatut(1).'
'.$langs->trans("TransData").''; + print '
'.$langs->trans("TransData").''; print dol_print_date($bon->date_trans,'day'); print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'
'.$langs->trans("TransMetod").''; + print '
'.$langs->trans("TransMetod").''; print $bon->methodes_trans[$bon->method_trans]; print '
'.$langs->trans('CreditDate').''; + print '
'.$langs->trans('CreditDate').''; print dol_print_date($bon->date_credit,'day'); print '
'; + print '
'; print $langs->trans("WithdrawalFile").''; $relativepath = 'receipts/'.$bon->ref.'.xml'; print ''.$relativepath.''; @@ -107,11 +120,8 @@ if ($prev_id) } } -$offset = $conf->liste_limit * $page ; -/* - * Liste des factures - */ +// List of invoices $sql = "SELECT pf.rowid"; $sql.= ",f.rowid as facid, f.facnumber as ref, f.total_ttc"; $sql.= ", s.rowid as socid, s.nom as name, pl.statut"; @@ -127,27 +137,49 @@ $sql.= " AND pf.fk_facture = f.rowid"; $sql.= " AND f.entity = ".$conf->entity; if ($prev_id) $sql.= " AND p.rowid=".$prev_id; if ($socid) $sql.= " AND s.rowid = ".$socid; -$sql.= " ORDER BY $sortfield $sortorder "; -$sql.= $db->plimit($conf->liste_limit+1, $offset); + +$sql.= $db->order($sortfield,$sortorder); + +// Count total nb of records +$nbtotalofrecords = ''; +if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) +{ + $result = $db->query($sql); + $nbtotalofrecords = $db->num_rows($result); +} + +$sql.= $db->plimit($limit + 1,$offset); $result = $db->query($sql); - if ($result) { $num = $db->num_rows($result); $i = 0; - $urladd = "&id=".$prev_id; + $param = "&id=".$prev_id; - print_barre_liste("", $page, "factures.php", $urladd, $sortfield, $sortorder, '', $num); + // Lines of title fields + print ''; + if ($optioncss != '') print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + $massactionbutton=''; + + print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, '', '', $limit); + print"\n\n"; print ''; print ''; - print_liste_field_titre($langs->trans("Bill"),$_SERVER["PHP_SELF"],"p.ref",'',$urladd,'class="liste_titre"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom",'',$urladd,'class="liste_titre"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"f.total_ttc","",$urladd,'class="liste_titre" align="center"',$sortfield,$sortorder); - print_liste_field_titre(''); + print_liste_field_titre($langs->trans("Bill"),$_SERVER["PHP_SELF"],"p.ref",'',$param,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom",'',$param,'',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"f.total_ttc","",$param,'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("StatusDebitCredit"),$_SERVER["PHP_SELF"],"","",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre(''); print "\n"; @@ -155,24 +187,31 @@ if ($result) $total = 0; - while ($i < min($num,$conf->liste_limit)) + while ($i < min($num, $limit)) { $obj = $db->fetch_object($result); - print "\n"; - - print '\n"; - - print '\n"; + $invoicetmp->id = $obj->facid; + $invoicetmp->ref = $obj->ref; + + $thirdpartytmp->id = $obj->socid; + $thirdpartytmp->name = $obj->name; + + print ""; + + print "\n"; print '\n"; + + // Amount + print '\n"; + + // Status of requests + print '\n"; + print ""; + + print ""; + + print "\n"; $total += $obj->total_ttc; $var=!$var; $i++; } - if($socid) + if ($num > 0) { - print "'; print ''; - - print '\n"; - print ''; - + print '\n"; + print ''; + print ''; print "\n"; } diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php index de6d368afd7..d013f605504 100644 --- a/htdocs/compta/prelevement/fiche-rejet.php +++ b/htdocs/compta/prelevement/fiche-rejet.php @@ -59,12 +59,12 @@ if ($prev_id) print '
"; - - print ''; - print img_object($langs->trans("ShowBill"),"bill"); - print ' '; - - print ''.$obj->ref."'; - print img_object($langs->trans("ShowCompany"),"company"). ' '.$obj->name."'.price($obj->total_ttc)."
"; + print $invoicetmp->getNomUrl(1); + print "'; + print $thirdpartytmp->getNomUrl(1); + print "'.price($obj->total_ttc)."'; if ($obj->statut == 0) { @@ -187,23 +226,25 @@ if ($result) print ''.$langs->trans("StatusRefused").''; } - print "
"; - + print '
'.$langs->trans("Total").''.price($total)." '.price($total)."  
'; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; // Status - print ''; + print ''; print ''; print ''; @@ -73,16 +73,16 @@ if ($prev_id) $muser = new User($db); $muser->fetch($bon->user_trans); - print ''; - print ''; } if($bon->date_credit <> 0) { - print ''; } @@ -91,7 +91,7 @@ if ($prev_id) print '
'; - print '
'.$langs->trans("Ref").''.$bon->getNomUrl(1).'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'day').'
'.$langs->trans("Amount").''.price($bon->amount).'
'.$langs->trans("Ref").''.$bon->getNomUrl(1).'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'day').'
'.$langs->trans("Amount").''.price($bon->amount).'
'.$langs->trans('Status').'
'.$langs->trans('Status').''.$bon->getLibStatut(1).'
'.$langs->trans("TransData").''; + print '
'.$langs->trans("TransData").''; print dol_print_date($bon->date_trans,'day'); print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'
'.$langs->trans("TransMetod").''; + print '
'.$langs->trans("TransMetod").''; print $bon->methodes_trans[$bon->method_trans]; print '
'.$langs->trans('CreditDate').''; + print '
'.$langs->trans('CreditDate').''; print dol_print_date($bon->date_credit,'day'); print '
'; + print ''; + } + + if ($num > 0) + { + print ''; + print ''; + print '\n"; + print ''; + print "\n"; + } + print "
'; print $langs->trans("WithdrawalFile").''; $relativepath = 'receipts/'.$bon->ref.'.xml'; print ''.$relativepath.''; @@ -130,8 +130,7 @@ $sql.= " ORDER BY pl.amount DESC"; $resql = $db->query($sql); if ($resql) { - $num = $db->num_rows($resql); - $i = 0; + $num = $db->num_rows($resql); print"\n\n"; print ''; @@ -142,35 +141,47 @@ if ($resql) $var=True; $total = 0; - while ($i < $num) - { - $obj = $db->fetch_object($resql); - - print "'; - print '\n"; - - print '\n"; - print ''; - - print ''; - print ''; - print "\n"; - - $total += $obj->amount; - $var=!$var; - $i++; + if ($num > 0) + { + $i = 0; + while ($i < $num) + { + $obj = $db->fetch_object($resql); + + print "'; + print '\n"; + + print '\n"; + print ''; + + print ''; + print ''; + print "\n"; + + $total += $obj->amount; + $var=!$var; + $i++; + } } - - print ''; - print ''; - print '\n"; - print ''; - print "\n
"; - - print ''; - print img_picto('', 'statut'.$obj->statut).' '; - print substr('000000'.$obj->rowid, -6); - print ''.$obj->name."'.price($obj->amount)."'.$rej->motifs[$obj->motif].''.yn($obj->afacturer).''.$obj->fk_facture.'
"; + + print ''; + print img_picto('', 'statut'.$obj->statut).' '; + print substr('000000'.$obj->rowid, -6); + print ''.$obj->name."'.price($obj->amount)."'.$rej->motifs[$obj->motif].''.yn($obj->afacturer).''.$obj->fk_facture.'
 '.$langs->trans("Total").''.price($total)." 
\n"; + else + { + print '
'.$langs->trans("None").'
 '.$langs->trans("Total").''.price($total)." 
\n"; $db->free($resql); } else diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index 5fc3966fdf9..a86280e66bd 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -57,12 +57,12 @@ if ($prev_id) print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; // Status - print ''; + print ''; print ''; print ''; @@ -71,16 +71,16 @@ if ($prev_id) $muser = new User($db); $muser->fetch($bon->user_trans); - print ''; - print ''; } if($bon->date_credit <> 0) { - print ''; } @@ -89,7 +89,7 @@ if ($prev_id) print '
'; - print '
'.$langs->trans("Ref").''.$bon->getNomUrl(1).'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'day').'
'.$langs->trans("Amount").''.price($bon->amount).'
'.$langs->trans("Ref").''.$bon->getNomUrl(1).'
'.$langs->trans("Date").''.dol_print_date($bon->datec,'day').'
'.$langs->trans("Amount").''.price($bon->amount).'
'.$langs->trans('Status').'
'.$langs->trans('Status').''.$bon->getLibStatut(1).'
'.$langs->trans("TransData").''; + print '
'.$langs->trans("TransData").''; print dol_print_date($bon->date_trans,'day'); print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'
'.$langs->trans("TransMetod").''; + print '
'.$langs->trans("TransMetod").''; print $bon->methodes_trans[$bon->method_trans]; print '
'.$langs->trans('CreditDate').''; + print '
'.$langs->trans('CreditDate').''; print dol_print_date($bon->date_credit,'day'); print '
'; + print '
'; print $langs->trans("WithdrawalFile").''; $relativepath = 'receipts/'.$bon->ref.'.xml'; print ''.$relativepath.''; diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang index 1e7f42c2f51..bfe024268e4 100644 --- a/htdocs/langs/en_US/withdrawals.lang +++ b/htdocs/langs/en_US/withdrawals.lang @@ -40,6 +40,7 @@ RefusedReason=Reason for rejection RefusedInvoicing=Billing the rejection NoInvoiceRefused=Do not charge the rejection InvoiceRefused=Invoice refused (Charge the rejection to customer) +StatusDebitCredit=Status debit/credit StatusWaiting=Waiting StatusTrans=Sent StatusCredited=Credited