From a8a2f50d07bf36f3059dbcde89f0f1fb37e1119e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 12 Jan 2010 10:02:02 +0000 Subject: [PATCH] First change to enhance VAT reports --- htdocs/compta/tva/clients.php | 15 ++++++++------- htdocs/compta/tva/quadri_detail.php | 11 +++++++---- htdocs/langs/en_US/compta.lang | 1 + htdocs/langs/fr_FR/compta.lang | 1 + 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 98e9e70b0bd..123e6554854 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -90,7 +90,8 @@ llxHeader(); $company_static=new Societe($db); -$fsearch.='
'; +$fsearch.='
'; +$fsearch.=' '; $fsearch.=' '; $fsearch.=' '.$langs->trans("SalesTurnover").' '.$langs->trans("Minimum").': '; $fsearch.=' '; @@ -99,14 +100,14 @@ $fsearch.=' '; if ($modetax==1) // Calculate on invoice for goods and services { $nom=$langs->trans("VATReportByCustomersInDueDebtMode"); - $nom.='
('.$langs->trans("SeeVATReportInInputOutputMode",'','').')'; - //$period=$year_start; + //$nom.='
('.$langs->trans("SeeVATReportInInputOutputMode",'','').')'; $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1); //$periodlink=($year_start?"".img_previous()." ".img_next()."":""); $description=$langs->trans("RulesVATDue"); //if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='
'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite'); $description.=$fsearch; - $builddate=time(); + $description.='
('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')'; + $builddate=time(); $exportlink=$langs->trans("NotYetAvailable"); $elementcust=$langs->trans("CustomersInvoices"); @@ -123,14 +124,14 @@ if ($modetax==1) // Calculate on invoice for goods and services if ($modetax==0) // Invoice for goods, payment for services { $nom=$langs->trans("VATReportByCustomersInInputOutputMode"); - $nom.='
('.$langs->trans("SeeVATReportInDueDebtMode",'','').')'; - //$period=$year_start; + //$nom.='
('.$langs->trans("SeeVATReportInDueDebtMode",'','').')'; $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1); //$periodlink=($year_start?"".img_previous()." ".img_next()."":""); $description=$langs->trans("RulesVATIn"); if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='
'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite'); $description.=$fsearch; - $builddate=time(); + $description.='
('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')'; + $builddate=time(); $exportlink=$langs->trans("NotYetAvailable"); $elementcust=$langs->trans("CustomersInvoices"); diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index 6a77d26e1de..149044feda1 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -103,7 +103,8 @@ $paymentfourn_static=new PaiementFourn($db); //print_fiche_titre($langs->trans("VAT"),""); -$fsearch.='
'; +//$fsearch.='
'; +$fsearch.=' '; $fsearch.=' '; //$fsearch.=' '.$langs->trans("SalesTurnover").' '.$langs->trans("Minimum").': '; //$fsearch.=' '; @@ -112,7 +113,7 @@ $fsearch.=' '; if ($modetax==1) // Calculate on invoice for goods and services { $nom=$langs->trans("VATReportByQuartersInDueDebtMode"); - $nom.='
('.$langs->trans("SeeVATReportInInputOutputMode",'','').')'; + //$nom.='
('.$langs->trans("SeeVATReportInInputOutputMode",'','').')'; //$period=$year_start.' - '.$langs->trans("Quadri")." $q (".dol_print_date(dol_mktime(12,0,0,(($q-1)*3)+1,1,$year_start),"%b %Y").' - '.dol_print_date(dol_mktime(12,0,0,($q*3),1,$year_start),"%b %Y").")"; $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1); $prevyear=$year_start; $prevquarter=$q; @@ -123,6 +124,7 @@ if ($modetax==1) // Calculate on invoice for goods and services else { $nextquarter=1; $nextyear++; } //$periodlink=($prevyear?"".img_previous()." ".img_next()."":""); $description=$langs->trans("RulesVATDue"); + $description.='
('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')'; //if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='
'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite'); $description.=$fsearch; $builddate=time(); @@ -142,7 +144,7 @@ if ($modetax==1) // Calculate on invoice for goods and services if ($modetax==0) // Invoice for goods, payment for services { $nom=$langs->trans("VATReportByQuartersInInputOutputMode"); - $nom.='
('.$langs->trans("SeeVATReportInDueDebtMode",'','').')'; + //$nom.='
('.$langs->trans("SeeVATReportInDueDebtMode",'','').')'; //$period=$year_start.' - '.$langs->trans("Quadri")." $q (".dol_print_date(dol_mktime(12,0,0,(($q-1)*3)+1,1,$year_start),"%b %Y").' - '.dol_print_date(dol_mktime(12,0,0,($q*3),1,$year_start),"%b %Y").")"; $period=$html->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$html->select_date($date_end,'date_end',0,0,0,'',1,0,1); $prevyear=$year_start; $prevquarter=$q; @@ -155,7 +157,8 @@ if ($modetax==0) // Invoice for goods, payment for services $description=$langs->trans("RulesVATIn"); if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='
'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite'); $description.=$fsearch; - $builddate=time(); + $description.='
('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')'; + $builddate=time(); $exportlink=$langs->trans("NotYetAvailable"); $elementcust=$langs->trans("CustomersInvoices"); diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index c55a7dd32e3..23c3cda0475 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -4,6 +4,7 @@ Accountancy=Accountancy AccountancyCard=Accountancy card Treasury=Treasury MenuFinancial=Financial +TaxModuleSetupToModifyRules=Go to module setup to modify rules for calculation OptionMode=Option for accountancy OptionModeTrue=Option Input-Output OptionModeVirtual=Option Credits-Debits diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang index 2f5a93d0b31..f64a32223b4 100644 --- a/htdocs/langs/fr_FR/compta.lang +++ b/htdocs/langs/fr_FR/compta.lang @@ -4,6 +4,7 @@ Accountancy=Compta AccountancyCard=Fiche Compta Treasury=Tréso MenuFinancial=Compta/Tréso +TaxModuleSetupToModifyRules=Aller dans la configuration du module pour modifier les règles de calcul OptionMode=Option de tenue de comptabilité OptionModeTrue=Option Recettes-Dépenses OptionModeVirtual=Option Créances-Dettes