Ajout rapport tva par taux et par trimestre dans menu + traduction
This commit is contained in:
parent
6a1390c4f5
commit
c5c48844c1
@ -181,12 +181,9 @@ $textprevyear="<a href=\"quadri_detail.php?year=" . ($year_current-1) . "\">".im
|
|||||||
$textnextyear=" <a href=\"quadri_detail.php?year=" . ($year_current+1) . "\">".img_next()."</a>";
|
$textnextyear=" <a href=\"quadri_detail.php?year=" . ($year_current+1) . "\">".img_next()."</a>";
|
||||||
|
|
||||||
print_fiche_titre($langs->trans("VAT"),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear");
|
print_fiche_titre($langs->trans("VAT"),"$textprevyear ".$langs->trans("Year")." $year_start $textnextyear");
|
||||||
|
print '<br>';
|
||||||
|
|
||||||
echo '<table class="noborder" width="100%">';
|
echo '<table class="noborder" width="100%">';
|
||||||
echo '<tr><td colspan="3">';
|
|
||||||
print_fiche_titre($langs->trans("VATSummary"));
|
|
||||||
echo '</td></tr>';
|
|
||||||
|
|
||||||
if ($conf->compta->mode == "CREANCES-DETTES")
|
if ($conf->compta->mode == "CREANCES-DETTES")
|
||||||
{
|
{
|
||||||
@ -263,7 +260,7 @@ if ($conf->compta->mode == "CREANCES-DETTES")
|
|||||||
$var=!$var;
|
$var=!$var;
|
||||||
if(is_array($x_both[$rate]['coll']['detail'])){
|
if(is_array($x_both[$rate]['coll']['detail'])){
|
||||||
print "<tr>";
|
print "<tr>";
|
||||||
print '<td class="tax_rate">'.$rate.'%</td><td colspan="3"></td>';
|
print '<td class="tax_rate">'.$langs->trans("Rate").': '.$rate.'%</td><td colspan="3"></td>';
|
||||||
print '</tr>'."\n";
|
print '</tr>'."\n";
|
||||||
foreach($x_both[$rate]['coll']['detail'] as $index=>$fields){
|
foreach($x_both[$rate]['coll']['detail'] as $index=>$fields){
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
|
|||||||
@ -440,6 +440,7 @@ class MenuLeft {
|
|||||||
if ($leftmenu=="vat") $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/fiche.php?action=create",$langs->trans("NewPayment"),1,$user->rights->tax->charges->creer);
|
if ($leftmenu=="vat") $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/fiche.php?action=create",$langs->trans("NewPayment"),1,$user->rights->tax->charges->creer);
|
||||||
if ($leftmenu=="vat") $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/reglement.php",$langs->trans("Payments"),1,$user->rights->tax->charges->lire);
|
if ($leftmenu=="vat") $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/reglement.php",$langs->trans("Payments"),1,$user->rights->tax->charges->lire);
|
||||||
if ($leftmenu=="vat") $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/clients.php", $langs->trans("ReportByCustomers"), 1, $user->rights->tax->charges->lire);
|
if ($leftmenu=="vat") $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/clients.php", $langs->trans("ReportByCustomers"), 1, $user->rights->tax->charges->lire);
|
||||||
|
if ($leftmenu=="vat") $newmenu->add_submenu(DOL_URL_ROOT."/compta/tva/quadri_detail.php", $langs->trans("ReportByQuarter"), 1, $user->rights->tax->charges->lire);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Compta simple
|
// Compta simple
|
||||||
|
|||||||
@ -29,6 +29,7 @@ ThirdPartyCustomersWithIdProf12=Customers with %s or %s
|
|||||||
ThirdPartySuppliers=Suppliers
|
ThirdPartySuppliers=Suppliers
|
||||||
ParentCompany=Parent company
|
ParentCompany=Parent company
|
||||||
ReportByCustomers=Report by customers
|
ReportByCustomers=Report by customers
|
||||||
|
ReportByQuarter=Report by quarter
|
||||||
CivilityCode=Civility code
|
CivilityCode=Civility code
|
||||||
RegisteredOffice=Registered office
|
RegisteredOffice=Registered office
|
||||||
Name=Name
|
Name=Name
|
||||||
|
|||||||
@ -165,6 +165,8 @@ Seconds=Seconds
|
|||||||
Today=Today
|
Today=Today
|
||||||
Yesterday=Yesterday
|
Yesterday=Yesterday
|
||||||
Tomorrow=Tomorrow
|
Tomorrow=Tomorrow
|
||||||
|
Quadri=Quadri
|
||||||
|
Rate=Rate
|
||||||
Bytes=Bytes
|
Bytes=Bytes
|
||||||
Cut=Cut
|
Cut=Cut
|
||||||
Copy=Copy
|
Copy=Copy
|
||||||
|
|||||||
@ -28,6 +28,7 @@ ThirdPartyCustomers=Clients
|
|||||||
ThirdPartyCustomersWithIdProf12=Clients avec %s ou %s
|
ThirdPartyCustomersWithIdProf12=Clients avec %s ou %s
|
||||||
ThirdPartySuppliers=Fournisseurs
|
ThirdPartySuppliers=Fournisseurs
|
||||||
ReportByCustomers=Rapport par client
|
ReportByCustomers=Rapport par client
|
||||||
|
ReportByQuarter=Rapport par trimestre
|
||||||
ParentCompany=Maison mère
|
ParentCompany=Maison mère
|
||||||
CivilityCode=Code civilité
|
CivilityCode=Code civilité
|
||||||
RegisteredOffice=Siège sociale
|
RegisteredOffice=Siège sociale
|
||||||
|
|||||||
@ -165,6 +165,8 @@ Seconds=Secondes
|
|||||||
Today=Aujourd'hui
|
Today=Aujourd'hui
|
||||||
Yesterday=Hier
|
Yesterday=Hier
|
||||||
Tomorrow=Demain
|
Tomorrow=Demain
|
||||||
|
Quadri=Trimestre
|
||||||
|
Rate=Taux
|
||||||
Bytes=Octets
|
Bytes=Octets
|
||||||
Cut=Couper
|
Cut=Couper
|
||||||
Copy=Copier
|
Copy=Copier
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user