lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce checkbox for extended customers VAT report

Browse Source
This commit is contained in:
Yannick Warnier 2015-06-30 15:50:35 -05:00
parent 066a7acbaa
commit c9e3cf9fa9
1 changed files with 168 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
htdocs/compta/tva/clients.php
View File

@ -118,6 +118,11 @@ foreach($listofparams as $param) {
} }
} }
$special_report = false;
if (isset($_REQUEST['extra_report']) && $_REQUEST['extra_report'] == 1) {
$special_report = true;
}
llxHeader('','','','',0,0,'','',$morequerystring); llxHeader('','','','',0,0,'','',$morequerystring);
$fsearch.='<br>'; $fsearch.='<br>';
@ -145,6 +150,15 @@ if ($modetax==1) { // Calculate on invoice for goods and services
$description.='<br>'.$langs->trans("DepositsAreIncluded"); $description.='<br>'.$langs->trans("DepositsAreIncluded");
} }
$description.=$fsearch; $description.=$fsearch;
$description.='<br>'
. '<input type="radio" name="extra_report" value="0" '.($special_report?'':'checked="checked"').'> '
. $langs->trans('SimpleReport')
. '</input>'
. '<br>'
. '<input type="radio" name="extra_report" value="1" '.($special_report?'checked="checked"':'').'> '
. $langs->trans('AddExtraReport')
. '</input>'
. '<br>';
$builddate=time(); $builddate=time();
//$exportlink=$langs->trans("NotYetAvailable"); //$exportlink=$langs->trans("NotYetAvailable");
@ -180,6 +194,15 @@ if ($modetax==0) { // Invoice for goods, payment for services
//if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='<br>'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite'); //if ($conf->global->MAIN_MODULE_COMPTABILITE || $conf->global->MAIN_MODULE_ACCOUNTING) $description.='<br>'.img_warning().' '.$langs->trans('OptionVatInfoModuleComptabilite');
//if (! empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded"); //if (! empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description.='<br>'.$langs->trans("WarningDepositsNotIncluded");
$description.=$fsearch; $description.=$fsearch;
$description.='<br>'
. '<input type="radio" name="extra_report" value="0" '.($special_report?'':'checked="checked"').'> '
. $langs->trans('SimpleReport')
. '</input>'
. '<br>'
. '<input type="radio" name="extra_report" value="1" '.($special_report?'checked="checked"':'').'> '
. $langs->trans('AddExtraReport')
. '</input>'
. '<br>';
$builddate=time(); $builddate=time();
//$exportlink=$langs->trans("NotYetAvailable"); //$exportlink=$langs->trans("NotYetAvailable");
@ -365,6 +388,7 @@ if (is_array($coll_list)) {
print '</table>'; print '</table>';
if ($special_report) {
// Get country 2-letters code // Get country 2-letters code
global $mysoc; global $mysoc;
$country_id = $mysoc->country_id; $country_id = $mysoc->country_id;
@ -373,9 +397,10 @@ $country->fetch($country_id);
// Print listing of other-country customers as additional report // Print listing of other-country customers as additional report
// This matches tax requirements to list all same-country customers (only) // This matches tax requirements to list all same-country customers (only)
print '<h3>Other countries customers</h3>'; print '<h3>'.$langs->trans('OtherCountriesCustomersReport').'</h3>';
print 'Based on 2 first letters of VAT number being different from your company\'s country'; print $langs->trans('BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry');
$coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'sell'); $coll_list = vat_by_thirdparty($db, 0, $date_start, $date_end, $modetax,
'sell');
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
@ -412,7 +437,8 @@ if (is_array($coll_list)) {
$company_static->id = $coll->socid; $company_static->id = $coll->socid;
$company_static->name = $coll->name; $company_static->name = $coll->name;
$company_static->client = 1; $company_static->client = 1;
print '<td class="nowrap">'.$company_static->getNomUrl(1,'customer').'</td>'; print '<td class="nowrap">' . $company_static->getNomUrl(1,
'customer') . '</td>';
$find = array(' ', '.'); $find = array(' ', '.');
$replace = array('', ''); $replace = array('', '');
print '<td class="nowrap">' . $intra . "</td>"; print '<td class="nowrap">' . $intra . "</td>";
@ -434,19 +460,22 @@ if (is_array($coll_list)) {
$langs->load("errors"); $langs->load("errors");
if ($coll_list == -1) { if ($coll_list == -1) {
print '<tr><td colspan="5">' . $langs->trans("ErrorNoAccountancyModuleLoaded") . '</td></tr>'; print '<tr><td colspan="5">' . $langs->trans("ErrorNoAccountancyModuleLoaded") . '</td></tr>';
} else if ($coll_list == -2) { } else {
if ($coll_list == -2) {
print '<tr><td colspan="5">' . $langs->trans("FeatureNotYetAvailable") . '</td></tr>'; print '<tr><td colspan="5">' . $langs->trans("FeatureNotYetAvailable") . '</td></tr>';
} else { } else {
print '<tr><td colspan="5">' . $langs->trans("Error") . '</td></tr>'; print '<tr><td colspan="5">' . $langs->trans("Error") . '</td></tr>';
} }
} }
}
print '</table>'; print '</table>';
// Print listing of same-country customers as additional report // Print listing of same-country customers as additional report
// This matches tax requirements to list all same-country customers (only) // This matches tax requirements to list all same-country customers (only)
print '<h3>Same country customers with VAT</h3>'; print '<h3>'.$langs->trans('SameCountryCustomersWithVAT').'</h3>';
print 'Based on 2 first letters of VAT number being the same as your company\'s country'; print $langs->trans('BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry');
$coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'sell'); $coll_list = vat_by_thirdparty($db, 0, $date_start, $date_end, $modetax,
'sell');
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
@ -459,7 +488,8 @@ print "</tr>\n";
if (is_array($coll_list)) { if (is_array($coll_list)) {
$var = true; $var = true;
$total = 0; $totalamount = 0; $total = 0;
$totalamount = 0;
$i = 1; $i = 1;
foreach ($coll_list as $coll) { foreach ($coll_list as $coll) {
if (substr($coll->tva_intra, 0, 2) != $country->code) { if (substr($coll->tva_intra, 0, 2) != $country->code) {
@ -482,7 +512,8 @@ if (is_array($coll_list)) {
$company_static->id = $coll->socid; $company_static->id = $coll->socid;
$company_static->name = $coll->name; $company_static->name = $coll->name;
$company_static->client = 1; $company_static->client = 1;
print '<td class="nowrap">'.$company_static->getNomUrl(1, 'customer').'</td>'; print '<td class="nowrap">' . $company_static->getNomUrl(1,
'customer') . '</td>';
$find = array(' ', '.'); $find = array(' ', '.');
$replace = array('', ''); $replace = array('', '');
print '<td class="nowrap">' . $intra . "</td>"; print '<td class="nowrap">' . $intra . "</td>";
@ -504,13 +535,16 @@ if (is_array($coll_list)) {
$langs->load("errors"); $langs->load("errors");
if ($coll_list == -1) { if ($coll_list == -1) {
print '<tr><td colspan="5">' . $langs->trans("ErrorNoAccountancyModuleLoaded") . '</td></tr>'; print '<tr><td colspan="5">' . $langs->trans("ErrorNoAccountancyModuleLoaded") . '</td></tr>';
} else if ($coll_list == -2) { } else {
if ($coll_list == -2) {
print '<tr><td colspan="5">' . $langs->trans("FeatureNotYetAvailable") . '</td></tr>'; print '<tr><td colspan="5">' . $langs->trans("FeatureNotYetAvailable") . '</td></tr>';
} else { } else {
print '<tr><td colspan="5">' . $langs->trans("Error") . '</td></tr>'; print '<tr><td colspan="5">' . $langs->trans("Error") . '</td></tr>';
} }
} }
}
print '</table>';
}
llxFooter(); llxFooter();