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 00000000000..5965a6efa64 Binary files /dev/null and b/dev/initdemo/documents_demo/societe/19/SEPA Mandate 19-Morgan Bank-RUM1301-0008-0.pdf differ 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