diff --git a/htdocs/compta/compta-files.php b/htdocs/compta/compta-files.php
index d8f4885a3b2..570f921a0fe 100644
--- a/htdocs/compta/compta-files.php
+++ b/htdocs/compta/compta-files.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'
restrictedArea($user,'banque');
-$langs->load("companies");
+$langs->load("accountancy");
if (! empty($conf->facture->enabled)) $langs->load("bills");
$date_start =GETPOST('date_start','alpha');
$date_startDay= GETPOST('date_startday','int');
@@ -218,98 +218,103 @@ if($result & $action=="dl"){
/*
* View
*/
+
+
+llxHeader('',$title,$help_url);
+
+$h=0;
+$head[$h][0] = $_SERVER["PHP_SELF"].$varlink;
+$head[$h][1] = $langs->trans("AccountantFiles");
+$head[$h][2] = 'AccountantFiles';
+dol_fiche_head($head, 'AccountantFiles');
$form = new Form($db);
$userstatic=new User($db);
$title=$langs->trans("ComptaFiles").' - '.$langs->trans("List");
-//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Symmary");
-$help_url='EN:Module_Accounting|FR:Module_Compatibilite'; //FIXME
-llxHeader('',$title,$help_url);
print '
'."\n\t\t";
-if (!empty($date_start) && !empty($date_stop))echo dol_print_date($date_start)." - ".dol_print_date($date_stop);
-print '';
-print '';
-//if (! empty($arrayfields['f.datef']['checked']))
-print_liste_field_titre($arrayfields['date']['label'],$_SERVER["PHP_SELF"],"date","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
-print '| '.$langs->trans("Type").' | ';
-print ''.$langs->trans("Ref").' | ';
-print ''.$langs->trans("File").' | ';
-print ''.$langs->trans("Paid").' | ';
-print ''.$langs->trans("Debit").' | ';
-print ''.$langs->trans("Credit").' | ';
-print ''.$langs->trans("Balance").' | ';
-print '
';
-if ($result)
-{
- $TData = dol_sort_array($filesarray, 'date', 'ASC');
- if(empty($TData)) {
- print '| '.$langs->trans("NoItem").' |
';
- } else {
- // Sort array by date ASC to calucalte balance
+print ''.$langs->trans("ReportPeriod").': '.$form->select_date($date_start,'date_start',0,0,0,"",1,1,1);
+print ' - '.$form->select_date($date_stop,'date_stop',0,0,0,"",1,1,1)."\n";
+print ''."\n\t\t";
+if (!empty($date_start) && !empty($date_stop)){
+ echo dol_print_date($date_start)." - ".dol_print_date($date_stop);
+ print '';
+ print '';
+ print_liste_field_titre($arrayfields['date']['label'],$_SERVER["PHP_SELF"],"date","",$param,'align="center" class="nowrap"',$sortfield,$sortorder);
+ print '| '.$langs->trans("Type").' | ';
+ print ''.$langs->trans("Ref").' | ';
+ print ''.$langs->trans("File").' | ';
+ print ''.$langs->trans("Paid").' | ';
+ print ''.$langs->trans("Debit").' | ';
+ print ''.$langs->trans("Credit").' | ';
+ print ''.$langs->trans("Balance").' | ';
+ print '
';
+ if ($result)
+ {
+ $TData = dol_sort_array($filesarray, 'date', 'ASC');
+ if(empty($TData)) {
+ print '| '.$langs->trans("NoItem").' |
';
+ } else {
+ // Sort array by date ASC to calucalte balance
- $totalDebit = 0;
- $totalCredit = 0;
- // Balance calculation
- $balance = 0;
- foreach($TData as &$data1) {
- if($data1['item']!='Invoice'&& $data1['item']!='Donation' ){
- $data1['amount']=-$data1['amount'];
- }
- if ($data1['amount']>0){
- }else{
- }
- $balance += $data1['amount'];
- $data1['balance'] = $balance;
- }
- // Display array
- foreach($TData as $data) {
- $html_class = '';
- //if (!empty($data['fk_facture'])) $html_class = 'facid-'.$data['fk_facture'];
- //elseif (!empty($data['fk_paiement'])) $html_class = 'payid-'.$data['fk_paiement'];
- print '';
- print "| ";
- print dol_print_date($data['date'],'day');
- print " | \n";
- print ''.$data['item'].' | ';
- print ''.$data['ref'].' | ';
- print ' ".$data['name']." | \n";
- print ''.$data['paid'].' | ';
- print ''.(($data['amount'] > 0) ? price(abs($data['amount'])) : '')." | \n";
- $totalDebit += ($data['amount'] > 0) ? abs($data['amount']) : 0;
- print ''.(($data['amount'] > 0) ? '' : price(abs($data['amount'])))." | \n";
- $totalCredit += ($data['amount'] > 0) ? 0 : abs($data['amount']);
- // Balance
- print ''.price($data['balance'])." | \n";
- print "
\n";
- }
- print '';
- print '| | ';
- print ''.price($totalDebit).' | ';
- print ''.price($totalCredit).' | ';
- print ''.price(price2num($totalDebit - $totalCredit, 'MT')).' | ';
- print ' | ';
- print "
\n";
- }
- }
-print "
";
-print '
";
+ print ''."\n\t\t\n\t\t\n\t\t\t";
+ //print '';
+ //print '';
+ //print '';
+ print ''."\n\t\t | \n\t\t\n\t\t\t";
+}
llxFooter();
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 2c2c2d999f7..e172a83697c 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1107,7 +1107,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
// Balance
$newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&leftmenu=accountancy_balance",$langs->trans("AccountBalance"),1,$user->rights->accounting->mouvements->lire);
-
+ // Files
+ $newmenu->add("/compta/compta-files.php?mainmenu=accountancy&leftmenu=accountancy_files",$langs->trans("AccountantFiles"),1,$user->rights->accounting->mouvements->lire);
// Reports
$langs->load("compta");
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 4f546828652..b9d2bc6dabb 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -229,6 +229,7 @@ ListOfProductsWithoutAccountingAccount=Liste des produits non liés à un compte
ChangeBinding=Changer les liens
Accounted=Comptabilisé
NotYetAccounted=Pas encore comptabilisé
+AccountantFiles = Justificatifs comptablilité
## Admin
ApplyMassCategories=Application en masse des catégories
|