';
print '';
print '| '.$langs->trans("Num").' | ';
print ''.$langs->trans("Customer").' | ';
@@ -199,7 +201,9 @@
if ($coll->assuj == '1')
{
$intra = $langs->trans('Unknown');
- } else {
+ }
+ else
+ {
$intra = '';
}
}
@@ -213,30 +217,34 @@
print ''.$intra.' | ';
print ''.price($coll->amount).' | ';
print ''.price($local == 1 ? $coll->localtax1 : $coll->localtax2).' | ';
- $totalamount = $totalamount + $coll->amount;
+ $totalamount = $totalamount + $coll->amount;
$total = $total + ($local == 1 ? $coll->localtax1 : $coll->localtax2);
print "
\n";
$i++;
}
}
- $x_coll_sum = $total;
+ $x_coll_sum = $total;
print '| '.$langs->trans("Total").': | ';
- print ''.price($totalamount).' | ';
+ print ''.price($totalamount).' | ';
print ''.price($total).' | ';
print '
';
- } else {
+ }
+ else
+ {
$langs->load("errors");
if ($coll_list == -1)
print '| '.$langs->trans("ErrorNoAccountancyModuleLoaded").' |
';
elseif ($coll_list == -2)
print '| '.$langs->trans("FeatureNotYetAvailable").' |
';
- else print '| '.$langs->trans("Error").' |
';
+ else
+ print '| '.$langs->trans("Error").' |
';
}
}
// IRPF I retained my supplier
if ($calc == 0 || $calc == 1) {
+ print '';
print '';
print '| '.$langs->trans("Num")." | ";
print ''.$langs->trans("Supplier")." | ";
@@ -266,7 +274,9 @@
if ($coll->assuj == '1')
{
$intra = $langs->trans('Unknown');
- } else {
+ }
+ else
+ {
$intra = '';
}
}
@@ -280,42 +290,44 @@
print ''.$intra." | ";
print ''.price($coll->amount).' | ';
print ''.price($local == 1 ? $coll->localtax1 : $coll->localtax2).' | ';
- $totalamount = $totalamount + $coll->amount;
+ $totalamount = $totalamount + $coll->amount;
$total = $total + ($local == 1 ? $coll->localtax1 : $coll->localtax2);
print "
\n";
$i++;
}
}
- $x_paye_sum = $total;
+ $x_paye_sum = $total;
print '| '.$langs->trans("Total").': | ';
- print ''.price($totalamount).' | ';
+ print ''.price($totalamount).' | ';
print ''.price($total).' | ';
print '
';
- } else {
+
+ print '
';
+ }
+ else
+ {
$langs->load("errors");
if ($coll_list == -1)
print '| '.$langs->trans("ErrorNoAccountancyModuleLoaded").' |
';
elseif ($coll_list == -2)
print '| '.$langs->trans("FeatureNotYetAvailable").' |
';
- else print '| '.$langs->trans("Error").' |
';
+ else
+ print '| '.$langs->trans("Error").' |
';
}
}
if ($calc == 0) {
// Total to pay
- print ' |
';
-
+ print '
';
+ print '';
$diff = $x_coll_sum - $x_paye_sum;
print '';
print '| '.$langs->trans("TotalToPay").($q ? ', '.$langs->trans("Quadri").' '.$q : '').' | ';
print ''.price(price2num($diff, 'MT'))." | \n";
print "
\n";
}
-
print '
';
-print '';
-
// End of page
llxFooter();
--- /tmp/dsg/dolibarr/htdocs/compta/localtax/github_index.php
+++ /tmp/dsg/dolibarr/htdocs/compta/localtax/client_index.php
@@ -52,11 +52,15 @@
$q = GETPOST("q", "int");
if (empty($q))
{
- if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); } else {
+ if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); }
+ else
+ {
$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
}
- } else {
+ }
+ else
+ {
if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -86,99 +90,102 @@
*/
function pt($db, $sql, $date)
{
- global $conf, $bc, $langs;
-
- $result = $db->query($sql);
- if ($result) {
- $num = $db->num_rows($result);
- $i = 0;
- $total = 0;
- print '';
-
- print '';
- print '| '.$date.' | ';
- print ''.$langs->trans("ClaimedForThisPeriod").' | ';
- print ''.$langs->trans("PaidDuringThisPeriod").' | ';
- print "
\n";
-
- $totalclaimed = 0;
- $totalpaid = 0;
- $amountclaimed = 0;
- $amountpaid = 0;
- $previousmonth = '';
- $previousmode = '';
- $mode = '';
-
- while ($i < $num) {
- $obj = $db->fetch_object($result);
- $mode = $obj->mode;
-
- //print $obj->dm.' '.$obj->mode.' '.$previousmonth.' '.$previousmode;
- if ($obj->mode == 'claimed' && !empty($previousmode))
- {
- print '';
- print '| '.$previousmonth." | \n";
- print ''.price($amountclaimed)." | \n";
- print ''.price($amountpaid)." | \n";
- print "
\n";
-
- $amountclaimed = 0;
- $amountpaid = 0;
- }
-
- if ($obj->mode == 'claimed')
- {
- $amountclaimed = $obj->mm;
- $totalclaimed = $totalclaimed + $amountclaimed;
- }
- if ($obj->mode == 'paid')
- {
- $amountpaid = $obj->mm;
- $totalpaid = $totalpaid + $amountpaid;
- }
-
- if ($obj->mode == 'paid')
- {
- print '';
- print '| '.$obj->dm." | \n";
- print ''.price($amountclaimed)." | \n";
- print ''.price($amountpaid)." | \n";
- print "
\n";
- $amountclaimed = 0;
- $amountpaid = 0;
- $previousmode = '';
- $previousmonth = '';
- } else {
- $previousmode = $obj->mode;
- $previousmonth = $obj->dm;
- }
-
- $i++;
- }
-
- if ($mode == 'claimed' && !empty($previousmode))
- {
- print '';
- print '| '.$previousmonth." | \n";
- print ''.price($amountclaimed)." | \n";
- print ''.price($amountpaid)." | \n";
- print "
\n";
-
- $amountclaimed = 0;
- $amountpaid = 0;
- }
-
- print '';
- print '| '.$langs->trans("Total").' | ';
- print ''.price($totalclaimed).' | ';
- print ''.price($totalpaid).' | ';
- print "
";
-
- print "
";
- $db->free($result);
- } else {
- dol_print_error($db);
- }
+ global $conf, $bc, $langs;
+
+ $result = $db->query($sql);
+ if ($result) {
+ $num = $db->num_rows($result);
+ $i = 0;
+ $total = 0;
+ print '';
+
+ print '';
+ print '| '.$date.' | ';
+ print ''.$langs->trans("ClaimedForThisPeriod").' | ';
+ print ''.$langs->trans("PaidDuringThisPeriod").' | ';
+ print "
\n";
+
+ $totalclaimed = 0;
+ $totalpaid = 0;
+ $amountclaimed = 0;
+ $amountpaid = 0;
+ $previousmonth = '';
+ $previousmode = '';
+ $mode = '';
+
+ while ($i < $num) {
+ $obj = $db->fetch_object($result);
+ $mode = $obj->mode;
+
+ //print $obj->dm.' '.$obj->mode.' '.$previousmonth.' '.$previousmode;
+ if ($obj->mode == 'claimed' && !empty($previousmode))
+ {
+ print '';
+ print '| '.$previousmonth." | \n";
+ print ''.price($amountclaimed)." | \n";
+ print ''.price($amountpaid)." | \n";
+ print "
\n";
+
+ $amountclaimed = 0;
+ $amountpaid = 0;
+ }
+
+ if ($obj->mode == 'claimed')
+ {
+ $amountclaimed = $obj->mm;
+ $totalclaimed = $totalclaimed + $amountclaimed;
+ }
+ if ($obj->mode == 'paid')
+ {
+ $amountpaid = $obj->mm;
+ $totalpaid = $totalpaid + $amountpaid;
+ }
+
+ if ($obj->mode == 'paid')
+ {
+ print '';
+ print '| '.$obj->dm." | \n";
+ print ''.price($amountclaimed)." | \n";
+ print ''.price($amountpaid)." | \n";
+ print "
\n";
+ $amountclaimed = 0;
+ $amountpaid = 0;
+ $previousmode = '';
+ $previousmonth = '';
+ }
+ else
+ {
+ $previousmode = $obj->mode;
+ $previousmonth = $obj->dm;
+ }
+
+ $i++;
+ }
+
+ if ($mode == 'claimed' && !empty($previousmode))
+ {
+ print '';
+ print '| '.$previousmonth." | \n";
+ print ''.price($amountclaimed)." | \n";
+ print ''.price($amountpaid)." | \n";
+ print "
\n";
+
+ $amountclaimed = 0;
+ $amountpaid = 0;
+ }
+
+ print '';
+ print '| '.$langs->trans("Total").' | ';
+ print ''.price($totalclaimed).' | ';
+ print ''.price($totalpaid).' | ';
+ print "
";
+
+ print "
";
+ $db->free($result);
+ }
+ else {
+ dol_print_error($db);
+ }
}
if (empty($localTaxType))
@@ -227,10 +234,10 @@
$description = $fsearch;
// Show report header
-$name = $langs->transcountry($localTaxType == 1 ? "LT1ReportByMonth" : "LT2ReportByMonth", $mysoc->country_code);
+$name = $langs->trans("ReportByMonth");
$description .= $langs->trans($LT);
$calcmode = $langs->trans("LTReportBuildWithOptionDefinedInModule").' ';
-$calcmode .= ' ('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')';
+$calcmode .= '('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')
';
//if (! empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description.='
'.$langs->trans("ThisIsAnEstimatedValue");
@@ -259,14 +266,14 @@
print '';
print '| '.$langs->trans("Year")." ".$y." | ";
if ($CalcLT == 0) {
- print ''.$langs->transcountry($LTCustomer, $mysoc->country_code).' | ';
- print ''.$langs->transcountry($LTSupplier, $mysoc->country_code).' | ';
+ print ''.$langs->transcountry($LTCustomer, $mysoc->country_code).' | ';
+ print ''.$langs->transcountry($LTSupplier, $mysoc->country_code).' | ';
}
if ($CalcLT == 1) {
- print ''.$langs->transcountry($LTSupplier, $mysoc->country_code).' | | ';
+ print ''.$langs->transcountry($LTSupplier, $mysoc->country_code).' | | ';
}
if ($CalcLT == 2) {
- print ''.$langs->transcountry($LTCustomer, $mysoc->country_code).' | | ';
+ print ''.$langs->transcountry($LTCustomer, $mysoc->country_code).' | | ';
}
print ''.$langs->trans("TotalToPay").' | ';
print " | \n";
@@ -381,7 +388,9 @@
'localtax2' =>$x_paye[$my_paye_rate]['localtax2_list'][$id],
//'link' =>$expensereport->getNomUrl(1)
);
- } else {
+ }
+ else
+ {
//$invoice_supplier->id=$x_paye[$my_paye_rate]['facid'][$id];
//$invoice_supplier->ref=$x_paye[$my_paye_rate]['facnum'][$id];
//$invoice_supplier->type=$x_paye[$my_paye_rate]['type'][$id];
@@ -414,144 +423,144 @@
}
//now we have an array (x_both) indexed by rates for coll and paye
- $action = "tva";
- $object = array(&$x_coll, &$x_paye, &$x_both);
- $parameters["mode"] = $modetax;
- $parameters["year"] = $y;
- $parameters["month"] = $m;
- $parameters["type"] = 'localtax'.$localTaxType;
-
- // Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
- $hookmanager->initHooks(array('externalbalance'));
- $reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-
- if (!is_array($x_coll) && $coll_listbuy == -1)
- {
- $langs->load("errors");
- print '
| '.$langs->trans("ErrorNoAccountancyModuleLoaded").' |
';
- break;
- }
- if (!is_array($x_paye) && $coll_listbuy == -2)
- {
- print '| '.$langs->trans("FeatureNotYetAvailable").' |
';
- break;
- }
-
-
- print '';
- print '| '.dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y").' | ';
-
- $x_coll_sum = 0;
- foreach (array_keys($x_coll) as $rate)
- {
- $subtot_coll_total_ht = 0;
- $subtot_coll_vat = 0;
-
- foreach ($x_both[$rate]['coll']['detail'] as $index => $fields)
- {
- // Payment
- $ratiopaymentinvoice = 1;
- if ($modetax != 1)
- {
- // Define type
- // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
- $type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
- // Try to enhance type detection using date_start and date_end for free lines where type
- // was not saved.
- if (!empty($fields['ddate_start'])) {
- $type = 1;
- }
- if (!empty($fields['ddate_end'])) {
- $type = 1;
- }
-
- if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
- || ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
- {
- //print $langs->trans("NA");
- } else {
- if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
- $ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
- }
- }
- }
- //var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
- $temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
- $temp_vat = $fields['localtax'.$localTaxType] * $ratiopaymentinvoice;
- $subtot_coll_total_ht += $temp_ht;
- $subtot_coll_vat += $temp_vat;
- $x_coll_sum += $temp_vat;
- }
- }
- print ''.price(price2num($x_coll_sum, 'MT')).' | ';
-
- $x_paye_sum = 0;
- foreach (array_keys($x_paye) as $rate)
- {
- $subtot_paye_total_ht = 0;
- $subtot_paye_vat = 0;
-
- foreach ($x_both[$rate]['paye']['detail'] as $index => $fields)
- {
- // Payment
- $ratiopaymentinvoice = 1;
- if ($modetax != 1)
- {
- // Define type
- // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
- $type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
- // Try to enhance type detection using date_start and date_end for free lines where type
- // was not saved.
- if (!empty($fields['ddate_start'])) {
- $type = 1;
- }
- if (!empty($fields['ddate_end'])) {
- $type = 1;
- }
-
- if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
- || ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
- {
- //print $langs->trans("NA");
- } else {
- if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
- $ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
- }
- }
- }
- //var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
- $temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
- $temp_vat = $fields['localtax'.$localTaxType] * $ratiopaymentinvoice;
- $subtot_paye_total_ht += $temp_ht;
- $subtot_paye_vat += $temp_vat;
- $x_paye_sum += $temp_vat;
- }
- }
- print ''.price(price2num($x_paye_sum, 'MT')).' | ';
-
- $subtotalcoll = $subtotalcoll + $x_coll_sum;
- $subtotalpaye = $subtotalpaye + $x_paye_sum;
-
- $diff = $x_coll_sum - $x_paye_sum;
- $total = $total + $diff;
- $subtotal = price2num($subtotal + $diff, 'MT');
-
- print ''.price(price2num($diff, 'MT')).' | '."\n";
- print " | \n";
- print "
\n";
-
- $i++; $m++;
- if ($i > 2)
- {
- print '';
- print '| '.$langs->trans("SubTotal").': | ';
- print ''.price(price2num($subtotalcoll, 'MT')).' | ';
- print ''.price(price2num($subtotalpaye, 'MT')).' | ';
- print ''.price(price2num($subtotal, 'MT')).' | ';
- print ' |
';
- $i = 0;
- $subtotalcoll = 0; $subtotalpaye = 0; $subtotal = 0;
- }
+ $action = "tva";
+ $object = array(&$x_coll, &$x_paye, &$x_both);
+ $parameters["mode"] = $modetax;
+ $parameters["year"] = $y;
+ $parameters["month"] = $m;
+ $parameters["type"] = 'localtax'.$localTaxType;
+
+ // Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
+ $hookmanager->initHooks(array('externalbalance'));
+ $reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+
+ if (!is_array($x_coll) && $coll_listbuy == -1)
+ {
+ $langs->load("errors");
+ print '| '.$langs->trans("ErrorNoAccountancyModuleLoaded").' |
';
+ break;
+ }
+ if (!is_array($x_paye) && $coll_listbuy == -2)
+ {
+ print '| '.$langs->trans("FeatureNotYetAvailable").' |
';
+ break;
+ }
+
+
+ print '';
+ print '| '.dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y").' | ';
+
+ $x_coll_sum = 0;
+ foreach (array_keys($x_coll) as $rate)
+ {
+ $subtot_coll_total_ht = 0;
+ $subtot_coll_vat = 0;
+
+ foreach ($x_both[$rate]['coll']['detail'] as $index => $fields)
+ {
+ // Payment
+ $ratiopaymentinvoice = 1;
+ if ($modetax != 1)
+ {
+ // Define type
+ // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+ $type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+ // Try to enhance type detection using date_start and date_end for free lines where type
+ // was not saved.
+ if (!empty($fields['ddate_start'])) {
+ $type = 1;
+ }
+ if (!empty($fields['ddate_end'])) {
+ $type = 1;
+ }
+
+ if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+ || ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+ {
+ //print $langs->trans("NA");
+ } else {
+ if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+ $ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+ }
+ }
+ }
+ //var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+ $temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+ $temp_vat = $fields['localtax'.$localTaxType] * $ratiopaymentinvoice;
+ $subtot_coll_total_ht += $temp_ht;
+ $subtot_coll_vat += $temp_vat;
+ $x_coll_sum += $temp_vat;
+ }
+ }
+ print ''.price(price2num($x_coll_sum, 'MT')).' | ';
+
+ $x_paye_sum = 0;
+ foreach (array_keys($x_paye) as $rate)
+ {
+ $subtot_paye_total_ht = 0;
+ $subtot_paye_vat = 0;
+
+ foreach ($x_both[$rate]['paye']['detail'] as $index => $fields)
+ {
+ // Payment
+ $ratiopaymentinvoice = 1;
+ if ($modetax != 1)
+ {
+ // Define type
+ // We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+ $type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+ // Try to enhance type detection using date_start and date_end for free lines where type
+ // was not saved.
+ if (!empty($fields['ddate_start'])) {
+ $type = 1;
+ }
+ if (!empty($fields['ddate_end'])) {
+ $type = 1;
+ }
+
+ if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+ || ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
+ {
+ //print $langs->trans("NA");
+ } else {
+ if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+ $ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+ }
+ }
+ }
+ //var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+ $temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+ $temp_vat = $fields['localtax'.$localTaxType] * $ratiopaymentinvoice;
+ $subtot_paye_total_ht += $temp_ht;
+ $subtot_paye_vat += $temp_vat;
+ $x_paye_sum += $temp_vat;
+ }
+ }
+ print ''.price(price2num($x_paye_sum, 'MT')).' | ';
+
+ $subtotalcoll = $subtotalcoll + $x_coll_sum;
+ $subtotalpaye = $subtotalpaye + $x_paye_sum;
+
+ $diff = $x_coll_sum - $x_paye_sum;
+ $total = $total + $diff;
+ $subtotal = price2num($subtotal + $diff, 'MT');
+
+ print ''.price(price2num($diff, 'MT')).' | '."\n";
+ print " | \n";
+ print "
\n";
+
+ $i++; $m++;
+ if ($i > 2)
+ {
+ print '';
+ print '| '.$langs->trans("SubTotal").': | ';
+ print ''.price(price2num($subtotalcoll, 'MT')).' | ';
+ print ''.price(price2num($subtotalpaye, 'MT')).' | ';
+ print ''.price(price2num($subtotal, 'MT')).' | ';
+ print ' |
';
+ $i = 0;
+ $subtotalcoll = 0; $subtotalpaye = 0; $subtotal = 0;
+ }
}
print '| '.$langs->trans("TotalToPay").': | '.price(price2num($total, 'MT')).' | ';
print " | \n";
@@ -565,7 +574,7 @@
/*
- * Paid
+ * Payed
*/
print load_fiche_titre($langs->transcountry($LTPaid, $mysoc->country_code), '', '');
--- /tmp/dsg/dolibarr/htdocs/compta/localtax/github_list.php
+++ /tmp/dsg/dolibarr/htdocs/compta/localtax/client_list.php
@@ -31,7 +31,7 @@
$socid = GETPOST('socid', 'int');
if ($user->socid) $socid = $user->socid;
$result = restrictedArea($user, 'tax', '', '', 'charges');
-$ltt = GETPOST("localTaxType", 'int');
+$ltt = GETPOST("localTaxType");
/*
@@ -42,59 +42,63 @@
$localtax_static = new Localtax($db);
-$url = DOL_URL_ROOT.'/compta/localtax/card.php?action=create&localTaxType='.$ltt;
-if (!empty($socid)) $url .= '&socid='.$socid;
-$newcardbutton = dolGetButtonTitle($langs->trans('NewLocalTaxPayment', ($ltt + 1)), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer);
+$newcardbutton = '';
+if ($user->rights->tax->charges->creer)
+{
+ $newcardbutton .= dolGetButtonTitle($langs->trans('NewLocalTaxPayment', ($ltt + 1)), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/localtax/card.php?action=create&localTaxType='.$ltt);
+}
print load_fiche_titre($langs->transcountry($ltt == 2 ? "LT2Payments" : "LT1Payments", $mysoc->country_code), $newcardbutton, 'title_accountancy');
$sql = "SELECT rowid, amount, label, f.datev, f.datep";
$sql .= " FROM ".MAIN_DB_PREFIX."localtax as f ";
-$sql .= " WHERE f.entity = ".$conf->entity." AND localtaxtype = ".$db->escape($ltt);
+$sql .= " WHERE f.entity = ".$conf->entity." AND localtaxtype=".$db->escape($ltt);
$sql .= " ORDER BY datev DESC";
$result = $db->query($sql);
if ($result)
{
- $num = $db->num_rows($result);
- $i = 0;
- $total = 0;
+ $num = $db->num_rows($result);
+ $i = 0;
+ $total = 0;
- print '';
- print '';
- print '| '.$langs->trans("Ref").' | ';
- print "".$langs->trans("Label")." | ";
- print "".$langs->trans("PeriodEndDate")." | ";
- print ''.$langs->trans("DatePayment").' | ';
- print "".$langs->trans("PayedByThisPayment")." | ";
- print "
\n";
- $var = 1;
- while ($i < $num)
- {
- $obj = $db->fetch_object($result);
+ print '';
+ print '';
+ print '| '.$langs->trans("Ref").' | ';
+ print "".$langs->trans("Label")." | ";
+ print "".$langs->trans("PeriodEndDate")." | ";
+ print ''.$langs->trans("DatePayment").' | ';
+ print "".$langs->trans("PayedByThisPayment")." | ";
+ print "
\n";
+ $var = 1;
+ while ($i < $num)
+ {
+ $obj = $db->fetch_object($result);
- print '';
+ print '
';
$localtax_static->id = $obj->rowid;
$localtax_static->ref = $obj->rowid;
print "| ".$localtax_static->getNomUrl(1)." | \n";
- print "".dol_trunc($obj->label, 40)." | \n";
- print ''.dol_print_date($db->jdate($obj->datev), 'day')." | \n";
- print ''.dol_print_date($db->jdate($obj->datep), 'day')." | \n";
- $total = $total + $obj->amount;
+ print "".dol_trunc($obj->label, 40)." | \n";
+ print ''.dol_print_date($db->jdate($obj->datev), 'day')." | \n";
+ print ''.dol_print_date($db->jdate($obj->datep), 'day')." | \n";
+ $total = $total + $obj->amount;
- print "".price($obj->amount)." | ";
- print "
\n";
+ print "".price($obj->amount)." | ";
+ print "\n";
- $i++;
- }
- print '| '.$langs->trans("Total").' | ';
- print ''.price($total).' |
';
+ $i++;
+ }
+ print '| '.$langs->trans("Total").' | ';
+ print ''.price($total).' |
';
- print "
";
- $db->free($result);
-} else {
- dol_print_error($db);
+ print "
";
+ $db->free($result);
+}
+else
+{
+ dol_print_error($db);
}
// End of page
--- /tmp/dsg/dolibarr/htdocs/compta/localtax/github_quadri_detail.php
+++ /tmp/dsg/dolibarr/htdocs/compta/localtax/client_quadri_detail.php
@@ -63,13 +63,17 @@
$q = GETPOST("q", "int");
if (empty($q))
{
- if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); } else {
+ if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); }
+ else
+ {
$date_start = dol_get_first_day($year_start, empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START, false);
if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) $date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) $date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) $date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
}
- } else {
+ }
+ else
+ {
if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
@@ -134,7 +138,7 @@
if ($modetax == 0) $calcmode = $langs->trans('OptionVATDefault');
if ($modetax == 1) $calcmode = $langs->trans('OptionVATDebitOption');
if ($modetax == 2) $calcmode = $langs->trans('OptionPaymentForProductAndServices');
-$calcmode .= ' ('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')';
+$calcmode .= '
('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')';
// Set period
$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
$prevyear = $year_start;
@@ -142,16 +146,16 @@
if ($prevquarter > 1) {
$prevquarter--;
} else {
- $prevquarter = 4;
- $prevyear--;
+ $prevquarter = 4;
+ $prevyear--;
}
$nextyear = $year_start;
$nextquarter = $q;
if ($nextquarter < 4) {
$nextquarter++;
} else {
- $nextquarter = 1;
- $nextyear++;
+ $nextquarter = 1;
+ $nextyear++;
}
$description .= $fsearch;
$builddate = dol_now();
@@ -200,13 +204,12 @@
}
// VAT Received and paid
-print '';
echo '
';
$y = $year_current;
$total = 0;
$i = 0;
-$columns = 4;
+$columns = 5;
// Load arrays of datas
$x_coll = tax_by_rate('localtax'.$local, $db, 0, 0, $date_start, $date_end, $modetax, 'sell');
@@ -219,8 +222,11 @@
print '| '.$langs->trans("ErrorNoAccountancyModuleLoaded").' |
';
elseif ($x_coll == -2)
print '| '.$langs->trans("FeatureNotYetAvailable").' |
';
- else print '| '.$langs->trans("Error").' |
';
-} else {
+ else
+ print '| '.$langs->trans("Error").' |
';
+}
+else
+{
$x_both = array();
//now, from these two arrays, get another array with one rate per line
@@ -311,9 +317,8 @@
$x_paye_sum = 0;
$x_paye_ht = 0;
- $span = $columns - 1;
- if ($modetax != 2) $span += 1;
- if ($modetax != 1) $span += 1;
+ $span = $columns;
+ if ($modetax != 1) $span += 2;
// Customers invoices
print '';
@@ -367,15 +372,17 @@
$product_static->type = $fields['ptype'];
print $product_static->getNomUrl(1);
if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
- } else {
+ }
+ else
+ {
if ($type) $text = img_object($langs->trans('Service'), 'service');
else $text = img_object($langs->trans('Product'), 'product');
- if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg))
- {
- if ($reg[1] == 'DEPOSIT') $fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
- elseif ($reg[1] == 'CREDIT_NOTE') $fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
- else $fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
- }
+ if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg))
+ {
+ if ($reg[1] == 'DEPOSIT') $fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
+ elseif ($reg[1] == 'CREDIT_NOTE') $fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
+ else $fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
+ }
print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
// Show range
@@ -409,7 +416,8 @@
if ($type == 0)
{
print $langs->trans("NotUsedForGoods");
- } else {
+ }
+ else {
print price($fields['payment_amount']);
if (isset($fields['payment_amount'])) print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
}
@@ -438,41 +446,41 @@
}
}
- // Total customers for this vat rate
- print '
';
- print ' | ';
- print ''.$langs->trans("Total").': | ';
- if ($modetax != 1)
- {
- print ' | ';
- print ' | ';
- }
- print ''.price(price2num($subtot_coll_total_ht, 'MT')).' | ';
- print ''.price(price2num($subtot_coll_vat, 'MT')).' | ';
- print '
';
- }
-
- if (count($x_coll) == 0) // Show a total ine if nothing shown
- {
- print '';
- print '| | ';
- print ''.$langs->trans("Total").': | ';
- if ($modetax == 0)
- {
- print ' | ';
- print ' | ';
- }
- print ''.price(price2num(0, 'MT')).' | ';
- print ''.price(price2num(0, 'MT')).' | ';
- print '
';
- }
-
- // Blank line
+ // Total customers for this vat rate
+ print '';
+ print ' | ';
+ print ''.$langs->trans("Total").': | ';
+ if ($modetax != 1)
+ {
+ print ' | ';
+ print ' | ';
+ }
+ print ''.price(price2num($subtot_coll_total_ht, 'MT')).' | ';
+ print ''.price(price2num($subtot_coll_vat, 'MT')).' | ';
+ print '
';
+ }
+
+ if (count($x_coll) == 0) // Show a total ine if nothing shown
+ {
+ print '';
+ print '| | ';
+ print ''.$langs->trans("Total").': | ';
+ if ($modetax == 0)
+ {
+ print ' | ';
+ print ' | ';
+ }
+ print ''.price(price2num(0, 'MT')).' | ';
+ print ''.price(price2num(0, 'MT')).' | ';
+ print '
';
+ }
+
+ // Blank line
print '| |
';
- //print '
';
+ print '
';
$diff = $x_coll_sum;
- //echo '