From 4b968c344c431ca24c7d05fdb1b94de9a4011f7b Mon Sep 17 00:00:00 2001 From: Yoan Mollard Date: Sat, 19 Oct 2024 17:54:03 +0200 Subject: [PATCH] Drop TVA, and show detailed list --- htdocs/compta/resultat/projects.php | 646 +++++++++------------------- htdocs/langs/en_US/accountancy.lang | 1 + 2 files changed, 212 insertions(+), 435 deletions(-) diff --git a/htdocs/compta/resultat/projects.php b/htdocs/compta/resultat/projects.php index 77caded76644a..fe078801fcfab 100644 --- a/htdocs/compta/resultat/projects.php +++ b/htdocs/compta/resultat/projects.php @@ -215,32 +215,34 @@ } $calcmode .= ''; - report_header($name, '', $period, $periodlink, "", $builddate, $exportlink, array('modecompta'=>$modecompta, 'showaccountdetail'=>$showaccountdetail), $calcmode); -if (isModEnabled('accounting') && $modecompta != 'BOOKKEEPING') { - print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1); -} - // Show report array $param = '&modecompta='.urlencode($modecompta).'&showaccountdetail='.urlencode($showaccountdetail); +$search_date_url = ''; if ($date_startday) { $param .= '&date_startday='.$date_startday; + $search_date_url .= '&search_date_startday='.$date_startday; } if ($date_startmonth) { $param .= '&date_startmonth='.$date_startmonth; + $search_date_url .= '&search_date_startmonth='.$date_startmonth; } if ($date_startyear) { $param .= '&date_startyear='.$date_startyear; + $search_date_url .= '&search_date_startyear='.$date_startyear; } if ($date_endday) { $param .= '&date_endday='.$date_endday; + $search_date_url .= '&search_date_endday='.$date_endday; } if ($date_endmonth) { $param .= '&date_endmonth='.$date_endmonth; + $search_date_url .= '&search_date_endmonth='.$date_endmonth; } if ($date_endyear) { $param .= '&date_endyear='.$date_endyear; + $search_date_url .= '&search_date_endyear='.$date_endyear; } print ''; @@ -318,22 +320,30 @@ $i = 0; while ($i < $num) { $objp = $db->fetch_object($result); - - print ''; - print ''; - $project_name = empty($objp->project_name)? $langs->trans("None"): $objp->project_name; - print "\n"; - - print ''; + echo ''; + echo "\n"; + echo '\n"; - print '\n"; + echo "\n"; + echo '\n"; $total_ht += (isset($objp->amount_ht) ? $objp->amount_ht : 0); $total_ttc += $objp->amount_ttc; - print "\n"; + echo "\n"; $i++; } $db->free($result); @@ -342,32 +352,32 @@ } if ($total_ttc == 0) { - print ''; - print ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; + echo ''; } $total_ht_income += $total_ht; $total_ttc_income += $total_ttc; - print ''; - print ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; /* * Donations */ if (isModEnabled('don')) { - print ''; + echo ''; if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES') { if ($modecompta == 'CREANCES-DETTES') { @@ -418,24 +428,24 @@ $subtotal_ht += $obj->amount; $subtotal_ttc += $obj->amount; - print ''; - print ''; + echo ''; + echo ''; $project_name = empty($obj->project_name)? $langs->trans("None"): $obj->project_name; - print "\n"; + echo "\n"; - print ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; $i++; } } else { - print ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; } } else { dol_print_error($db); @@ -444,16 +454,16 @@ $total_ht_income += $subtotal_ht; $total_ttc_income += $subtotal_ttc; - print ''; - print ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; } /* @@ -494,7 +504,7 @@ $sql .= " GROUP BY project_name"; $sql .= $db->order($sortfield, $sortorder); - print ''; + echo ''; $subtotal_ht = 0; $subtotal_ttc = 0; @@ -506,33 +516,43 @@ if ($num > 0) { while ($i < $num) { $objp = $db->fetch_object($result); - - $project_name = !empty($objp->project_name) ? $objp->project_name : $langs->trans("None"); - - print ''; - print ''; - print "'."\n"; - - print ''; + echo ''; + + echo "\n"; + + echo '\n"; - print '\n"; + echo "\n"; + echo '\n"; $total_ht -= (isset($objp->amount_ht) ? $objp->amount_ht : 0); $total_ttc -= $objp->amount_ttc; $subtotal_ht += (isset($objp->amount_ht) ? $objp->amount_ht : 0); $subtotal_ttc += $objp->amount_ttc; - print "\n"; + echo "\n"; $i++; } } else { - print ''; - print ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; + echo ''; } $db->free($result); @@ -543,23 +563,23 @@ $total_ht_outcome += $subtotal_ht; $total_ttc_outcome += $subtotal_ttc; - print ''; - print ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; /* * Salaries */ if (isModEnabled('salaries')) { - print ''; + echo ''; if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES') { if ($modecompta == 'CREANCES-DETTES') { @@ -620,22 +640,22 @@ $subtotal_ht += $obj->amount; $subtotal_ttc += $obj->amount; - print ''; - print "\n"; - print ''; + echo "\n"; + echo ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; $i++; } } else { - print ''; - print ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; + echo ''; } } else { dol_print_error($db); @@ -644,16 +664,16 @@ $total_ht_outcome += $subtotal_ht; $total_ttc_outcome += $subtotal_ttc; - print ''; - print ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; } @@ -665,7 +685,7 @@ if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES') { $langs->load('trips'); if ($modecompta == 'CREANCES-DETTES') { - $sql = "SELECT ed.rowid as rowid, ed.fk_projet, p.ref as project_name, sum(ed.total_ht) as amount_ht, sum(ed.total_ttc) as amount_ttc"; + $sql = "SELECT ed.rowid as rowid, ed.fk_projet, p.rowid as project_rowid, p.ref as project_name, sum(ed.total_ht) as amount_ht, sum(ed.total_ttc) as amount_ttc"; $sql .= " FROM ".MAIN_DB_PREFIX."expensereport_det as ed"; $sql .= " INNER JOIN ".MAIN_DB_PREFIX."expensereport as e ON ed.fk_expensereport = e.rowid"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON ed.fk_projet = p.rowid"; @@ -674,7 +694,7 @@ $column = 'e.date_valid'; } else { - $sql = "SELECT ed.rowid as rowid, ed.fk_projet, p.ref as project_name, sum(pe.amount) as amount_ht, sum(pe.amount) as amount_ttc"; + $sql = "SELECT ed.rowid as rowid, ed.fk_projet, p.rowid as project_rowid, p.ref as project_name, sum(pe.amount) as amount_ht, sum(pe.amount) as amount_ttc"; $sql .= " FROM ".MAIN_DB_PREFIX."expensereport_det as ed"; $sql .= " INNER JOIN ".MAIN_DB_PREFIX."expensereport as e ON ed.fk_expensereport = e.rowid"; $sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_expensereport as pe ON pe.fk_expensereport = e.rowid"; @@ -697,7 +717,7 @@ $sql .= $db->order($newsortfield, $sortorder); } - print ''; + echo ''; dol_syslog("by project, get expense report outcome"); $result = $db->query($sql); @@ -714,22 +734,34 @@ $subtotal_ht += $obj->amount_ht; $subtotal_ttc += $obj->amount_ttc; - print ''; - print ''; - print "\n"; - print ''; + echo ''; + + echo "\n"; + + echo ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; } } else { - print ''; - print ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; + echo ''; } } else { dol_print_error($db); @@ -738,16 +770,16 @@ $total_ht_outcome += $subtotal_ht; $total_ttc_outcome += $subtotal_ttc; - print ''; - print ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; } @@ -762,7 +794,7 @@ $subtotal_ht = 0; $subtotal_ttc = 0; - print ''; + echo ''; // Debit $sql = "SELECT p.rowid as rowid, p.ref as project_name, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various as p"; @@ -790,16 +822,16 @@ $total_ht_outcome += $obj->amount; $total_ttc_outcome += $obj->amount; } - print ''; - print ''; - print "\n"; - print ''; + echo ''; + echo "\n"; + echo ''; - print '\n"; - print "\n"; + echo ''; + echo '\n"; + echo "\n"; // Credit (payment received from customer for example) if (isset($obj->amount)) { @@ -809,36 +841,36 @@ $total_ht_income += $obj->amount; $total_ttc_income += $obj->amount; } - print ''; - print "\n"; - print ''; + echo "\n"; + echo ''; - print '\n"; - print "\n"; + echo ''; + echo '\n"; + echo "\n"; } } else { - print ''; - print ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; + echo ''; } // Total $total_ht += $subtotal_ht; $total_ttc += $subtotal_ttc; - print ''; - print ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; } else { dol_print_error($db); } @@ -852,7 +884,7 @@ $subtotal_ht = 0; $subtotal_ttc = 0; - print ''; + echo ''; $sql = 'SELECT pj.rowid as rowid, pj.ref as project_name, SUM(p.amount_capital + p.amount_insurance + p.amount_interest) as amount FROM '.MAIN_DB_PREFIX.'payment_loan as p'; $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'loan AS l ON l.rowid = p.fk_loan'; @@ -872,13 +904,13 @@ while ($obj = $db->fetch_object($result)) { $project_name = !empty($obj->project_name) ? $obj->project_name : $langs->trans("None"); - print ''; - print "\n"; + echo ''; + echo "\n"; if ($modecompta == 'CREANCES-DETTES') { - print ''; + echo ''; } - print '\n"; - print "\n"; + echo '\n"; + echo "\n"; $subtotal_ht -= $obj->amount; $subtotal_ttc -= $obj->amount; } @@ -888,276 +920,20 @@ $total_ht_income += $subtotal_ht; $total_ttc_income += $subtotal_ttc; - print ''; - print ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; - print ''; - print ''; + echo ''; + echo ''; + echo ''; } else { dol_print_error($db); } } - - /* - * VAT - */ - - print ''; - $subtotal_ht = 0; - $subtotal_ttc = 0; - - if (isModEnabled('tax') && ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES')) { - if ($modecompta == 'CREANCES-DETTES') { - // VAT to pay - $amount = 0; - $sql = "SELECT pj.rowid, pj.ref as project_name, sum(f.total_tva) as amount"; - $sql .= " FROM ".MAIN_DB_PREFIX."facture as f"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet AS pj ON f.fk_projet = pj.rowid"; - $sql .= " WHERE f.fk_statut IN (1,2)"; - if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) { - $sql .= " AND f.type IN (0,1,2,5)"; - } else { - $sql .= " AND f.type IN (0,1,2,3,5)"; - } - if (!empty($date_start) && !empty($date_end)) { - $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; - } - $sql .= " AND f.entity IN (".getEntity('invoice').")"; - $sql .= " GROUP BY project_name"; - $sql .= " HAVING amount > 0.0"; - $newsortfield = $sortfield; - if ($newsortfield == 's.nom, s.rowid') { - $newsortfield = 'project_name'; - } - if ($newsortfield == 'amount_ht') { - $newsortfield = 'amount'; - } - if ($newsortfield == 'amount_ttc') { - $newsortfield = 'amount'; - } - $sql .= $db->order($newsortfield, $sortorder); - - dol_syslog("by project, get vat to pay", LOG_DEBUG); - $result = $db->query($sql); - if ($result) { - $num = $db->num_rows($result); - $i = 0; - if ($num) { - while ($i < $num) { - $obj = $db->fetch_object($result); - $project_name = !empty($obj->project_name) ? $obj->project_name : $langs->trans("None"); - - $amount -= $obj->amount; - $total_ttc -= $obj->amount; - $subtotal_ttc -= $obj->amount; - $i++; - - print ''; - print ''; - print "\n"; - print ''."\n"; - print '\n"; - print "\n"; - } - } - } else { - dol_print_error($db); - } - - $total_ht_outcome -= 0; - $total_ttc_outcome -= $amount; - - // VAT to retrieve - $amount = 0; - $sql = "SELECT pj.rowid, pj.ref as project_name, sum(f.total_tva) as amount"; - $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet AS pj ON f.fk_projet = pj.rowid"; - $sql .= " WHERE f.fk_statut IN (1,2)"; - if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) { - $sql .= " AND f.type IN (0,1,2)"; - } else { - $sql .= " AND f.type IN (0,1,2,3)"; - } - if (!empty($date_start) && !empty($date_end)) { - $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'"; - } - $sql .= " AND f.entity = ".$conf->entity; - $sql .= " GROUP BY project_name"; - $sql .= " HAVING amount > 0.0"; - $newsortfield = $sortfield; - if ($newsortfield == 's.nom, s.rowid') { - $newsortfield = 'project_name'; - } - if ($newsortfield == 'amount_ht') { - $newsortfield = 'amount'; - } - if ($newsortfield == 'amount_ttc') { - $newsortfield = 'amount'; - } - $sql .= $db->order($newsortfield, $sortorder); - - dol_syslog("by project, get vat received back", LOG_DEBUG); - $result = $db->query($sql); - if ($result) { - $num = $db->num_rows($result); - $i = 0; - if ($num) { - while ($i < $num) { - $obj = $db->fetch_object($result); - $project_name = !empty($obj->project_name) ? $obj->project_name : $langs->trans("None"); - - $amount += $obj->amount; - $total_ttc += $obj->amount; - $subtotal_ttc += $obj->amount; - - $i++; - - print ''; - print ''; - print "\n"; - print ''."\n"; - print '\n"; - print "\n"; - } - } - } else { - dol_print_error($db); - } - - $total_ht_income += 0; - $total_ttc_income += $amount; - } else { - // VAT really already paid - $amount = 0; - $sql = "SELECT pj.ref as project_name, sum(t.amount) as amount"; - $sql .= " FROM ".MAIN_DB_PREFIX."tva as t"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet AS pj ON t.fk_projet = pj.rowid"; - $sql .= " WHERE amount > 0"; - if (!empty($date_start) && !empty($date_end)) { - $sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'"; - } - $sql .= " AND t.entity = ".$conf->entity; - $sql .= " GROUP BY project_name"; - $newsortfield = $sortfield; - if ($newsortfield == 's.nom, s.rowid') { - $newsortfield = 'project_name'; - } - if ($newsortfield == 'amount_ht') { - $newsortfield = 'amount'; - } - if ($newsortfield == 'amount_ttc') { - $newsortfield = 'amount'; - } - $sql .= $db->order($newsortfield, $sortorder); - - dol_syslog("by project, get vat really paid", LOG_DEBUG); - $result = $db->query($sql); - if ($result) { - $num = $db->num_rows($result); - $i = 0; - if ($num) { - while ($i < $num) { - $obj = $db->fetch_object($result); - $project_name = !empty($obj->project_name) ? $obj->project_name : $langs->trans("None"); - - $amount -= $obj->amount; - $total_ht -= $obj->amount; - $total_ttc -= $obj->amount; - $subtotal_ht -= $obj->amount; - $subtotal_ttc -= $obj->amount; - - $i++; - - print ''; - print ''; - print "\n"; - print ''."\n"; - print '\n"; - print "\n"; - } - } - $db->free($result); - } else { - dol_print_error($db); - } - - $total_ht_outcome -= 0; - $total_ttc_outcome -= $amount; - - // VAT really received - $amount = 0; - $sql = "SELECT pj.ref as project_name, sum(t.amount) as amount"; - $sql .= " FROM ".MAIN_DB_PREFIX."tva as t"; - $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet AS pj ON t.fk_projet = pj.rowid"; - $sql .= " WHERE amount < 0"; - if (!empty($date_start) && !empty($date_end)) { - $sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'"; - } - $sql .= " AND t.entity = ".$conf->entity; - $sql .= " GROUP BY project_name"; - $newsortfield = $sortfield; - if ($newsortfield == 's.nom, s.rowid') { - $newsortfield = 'project_name'; - } - if ($newsortfield == 'amount_ht') { - $newsortfield = 'amount'; - } - if ($newsortfield == 'amount_ttc') { - $newsortfield = 'amount'; - } - $sql .= $db->order($newsortfield, $sortorder); - - dol_syslog("by project, get vat really received back", LOG_DEBUG); - $result = $db->query($sql); - if ($result) { - $num = $db->num_rows($result); - $i = 0; - if ($num) { - while ($i < $num) { - $obj = $db->fetch_object($result); - $project_name = !empty($obj->project_name) ? $obj->project_name : $langs->trans("None"); - - $amount += -$obj->amount; - $total_ht += -$obj->amount; - $total_ttc += -$obj->amount; - $subtotal_ht += -$obj->amount; - $subtotal_ttc += -$obj->amount; - - $i++; - - print ''; - print ''; - print "\n"; - print ''."\n"; - print '\n"; - print "\n"; - } - } - $db->free($result); - } else { - dol_print_error($db); - } - - $total_ht_income += 0; - $total_ttc_income += $amount; - } - } - - if ($mysoc->tva_assuj != '0') { // Assujetti - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - } - - } $action = "balanceclient"; @@ -1168,42 +944,42 @@ // Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('externalbalance')); $reshook = $hookmanager->executeHooks('addBalanceLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks -print $hookmanager->resPrint; +echo $hookmanager->resPrint; // Total -print ''; -print ''; -print ''; +echo ''; +echo ''; +echo ''; -print ''; +echo ''; if ($modecompta == 'CREANCES-DETTES') { - print ''; + echo ''; } elseif ($modecompta == 'RECETTES-DEPENSES') { - print ''; + echo ''; } -print ''; -print ''; -print ''; +echo ''; +echo ''; +echo ''; if ($modecompta == 'CREANCES-DETTES') { - print ''; + echo ''; } elseif ($modecompta == 'RECETTES-DEPENSES') { - print ''; + echo ''; } -print ''; -print ''; -print ''; +echo ''; +echo ''; +echo ''; if ($modecompta == 'CREANCES-DETTES') { - print ''; + echo ''; } elseif ($modecompta == 'RECETTES-DEPENSES') { - print ''; + echo ''; } -print ''; -print ''; +echo ''; +echo ''; -print "
 ".$langs->trans("Project").' '.$project_name."'; + echo '
 ".$langs->trans("Project")." "; + if(!empty($objp->project_name)) { + echo ' '.$objp->project_name.''; + } + else { + echo $langs->trans("None"); + } + $detailed_list_url = '?search_project_ref='.urlencode($search_project_ref); + $detailed_list_url .= empty($objp->project_name)? "!*": $objp->project_name; + $detailed_list_url .= $search_date_url; + echo ' ('.$langs->trans("DetailedListLowercase").")\n"; + echo "'; if ($modecompta == 'CREANCES-DETTES') { - print ''.price($objp->amount_ht).""; + echo ''.price($objp->amount_ht).""; } - print "'.price($objp->amount_ttc)."'.price($objp->amount_ttc)."
 '.$langs->trans("None").'
 '.$langs->trans("None").'
'; + echo '
'; if ($modecompta == 'CREANCES-DETTES') { - print price($total_ht); + echo price($total_ht); } - print ''.price($total_ttc).'
'.price($total_ttc).'
'.$langs->trans("Donations").'
'.$langs->trans("Donations").'
 
 ".$langs->trans("Project")." ref."\">".$project_name."".$langs->trans("Project")." ref."\">".$project_name."'; + echo ''; if ($modecompta == 'CREANCES-DETTES') { - print ''.price($obj->amount).''; + echo ''.price($obj->amount).''; } - print ''.price($obj->amount).'
'.price($obj->amount).'
 '.$langs->trans("None").'
 '.$langs->trans("None").'
'; + echo '
'; if ($modecompta == 'CREANCES-DETTES') { - print price($subtotal_ht); + echo price($subtotal_ht); } - print ''.price($subtotal_ttc).'
'.price($subtotal_ttc).'
'.$langs->trans("SuppliersInvoices").'
'.$langs->trans("SuppliersInvoices").'
 ".$langs->trans("Project").' '.$project_name.''; + + echo '
 ".$langs->trans("Project")." "; + if(!empty($objp->project_name)) { + echo ' '.$objp->project_name.''; + } + else { + echo $langs->trans("None"); + } + $detailed_list_url = '?search_project='.urlencode($search_project_ref); + $detailed_list_url .= empty($objp->project_name)? "!*": $objp->project_name; + $detailed_list_url .= $search_date_url; + echo ' ('.$langs->trans("DetailedListLowercase").")\n"; + echo "'; if ($modecompta == 'CREANCES-DETTES') { - print ''.price(-$objp->amount_ht).""; + echo ''.price(-$objp->amount_ht).""; } - print "'.price(-$objp->amount_ttc)."'.price(-$objp->amount_ttc)."
 '.$langs->trans("None").'
 '.$langs->trans("None").'
'; + echo '
'; if ($modecompta == 'CREANCES-DETTES') { - print price(-$subtotal_ht); + echo price(-$subtotal_ht); } - print ''.price(-$subtotal_ttc).'
'.price(-$subtotal_ttc).'
'.$langs->trans("Salaries").'
'.$langs->trans("Salaries").'
 ".$langs->trans("Project")." ".$project_name."'; + echo '
 ".$langs->trans("Project")." ".$project_name."'; if ($modecompta == 'CREANCES-DETTES') { - print ''.price(-$obj->amount).''; + echo ''.price(-$obj->amount).''; } - print ''.price(-$obj->amount).'
'.price(-$obj->amount).'
 '.$langs->trans("None").'
 '.$langs->trans("None").'
'; + echo '
'; if ($modecompta == 'CREANCES-DETTES') { - print price(-$subtotal_ht); + echo price(-$subtotal_ht); } - print ''.price(-$subtotal_ttc).'
'.price(-$subtotal_ttc).'
'.$langs->trans("ExpenseReport").'
'.$langs->trans("ExpenseReport").'
 ".$langs->trans("Project")." rowid)."\">".$project_name."'; + echo '
 ".$langs->trans("Project")." "; + if(!empty($obj->project_name)) { + echo ' '.$obj->project_name.''; + } + else { + echo $langs->trans("None"); + } + $detailed_list_url = '?id='.$obj->project_rowid; + $detailed_list_url .= $search_date_url; + echo ' ('.$langs->trans("DetailedListLowercase").")\n"; + echo "'; if ($modecompta == 'CREANCES-DETTES') { - print ''.price(-$obj->amount_ht).''; + echo ''.price(-$obj->amount_ht).''; } - print ''.price(-$obj->amount_ttc).'
'.price(-$obj->amount_ttc).'
 '.$langs->trans("None").'
 '.$langs->trans("None").'
'; + echo '
'; if ($modecompta == 'CREANCES-DETTES') { - print price(-$subtotal_ht); + echo price(-$subtotal_ht); } - print ''.price(-$subtotal_ttc).'
'.price(-$subtotal_ttc).'
'.$langs->trans("VariousPayment").'
'.$langs->trans("VariousPayment").'
 ".$langs->trans("Project")." project_id)."\">".$project_name."'; + echo '
 ".$langs->trans("Project")." project_id)."\">".$project_name."'; if ($modecompta == 'CREANCES-DETTES') { - print ''.price(-$obj->amount).''; + echo ''.price(-$obj->amount).''; } - print ''.price(-$obj->amount)."
'.price(-$obj->amount)."
 ".$langs->trans("Project")." project_id)."\">".$project_name."'; + echo '
 ".$langs->trans("Project")." project_id)."\">".$project_name."'; if ($modecompta == 'CREANCES-DETTES') { - print ''.price($obj->amount).''; + echo ''.price($obj->amount).''; } - print ''.price($obj->amount)."
'.price($obj->amount)."
 '.$langs->trans("None").'
 '.$langs->trans("None").'
'; + echo '
'; if ($modecompta == 'CREANCES-DETTES') { - print price($subtotal_ht); + echo price($subtotal_ht); } - print ''.price($subtotal_ttc).'
'.price($subtotal_ttc).'
'.$langs->trans("PaymentLoan").'
'.$langs->trans("PaymentLoan").'
 ".$langs->trans("Project")." project_id)."\">".$project_name."
 ".$langs->trans("Project")." project_id)."\">".$project_name."'.price(-$obj->amount).''.price(-$obj->amount).''.price(-$obj->amount)."
'.price(-$obj->amount)."
'; + echo '
'; if ($modecompta == 'CREANCES-DETTES') { - print price($subtotal_ht); + echo price($subtotal_ht); } - print ''.price($subtotal_ttc).'
'.price($subtotal_ttc).'
'.$langs->trans("VAT").'
 ".$langs->trans("VATToPay")." rowid)."\">".$project_name." '.price($obj->amount)."
 ".$langs->trans("VATToCollect")." rowid)."\">".$project_name." '.price($obj->amount)."
 ".$langs->trans("VATPaid")." ".$project_name."'.price($obj->amount)."
 ".$langs->trans("VATCollected")." ".$project_name."'.price($obj->amount)."
 '.price(price2num($subtotal_ttc, 'MT')).'
 
 
'.$langs->trans("Income").'
'.$langs->trans("Income").''.price(price2num($total_ht_income, 'MT')).''.price(price2num($total_ht_income, 'MT')).''.price(price2num($total_ttc_income, 'MT')).'
'.$langs->trans("Outcome").''.price(price2num($total_ttc_income, 'MT')).'
'.$langs->trans("Outcome").''.price(price2num(-$total_ht_outcome, 'MT')).''.price(price2num(-$total_ht_outcome, 'MT')).''.price(price2num(-$total_ttc_outcome, 'MT')).'
'.$langs->trans("Profit").''.price(price2num(-$total_ttc_outcome, 'MT')).'
'.$langs->trans("Profit").''.price(price2num($total_ht, 'MT')).''.price(price2num($total_ht, 'MT')).''.price(price2num($total_ttc, 'MT')).'
'.price(price2num($total_ttc, 'MT')).'
"; -print '
'; +echo ""; +echo '
'; // End of page llxFooter(); diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index d5c7773fc2fae..afcd08bdab48b 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -396,6 +396,7 @@ CleanFixHistory=Remove accounting code from lines that not exists into charts of CleanHistory=Reset all bindings for selected year PredefinedGroups=Predefined groups ByProject=By project +DetailedListLowercase=detailed list WithoutValidAccount=Without valid dedicated account WithValidAccount=With valid dedicated account ValueNotIntoChartOfAccount=This value of accounting account does not exist into chart of account