';
+ print '
';
+ print ' '.$langs->trans("ClosePaidVATAutomatically").'';
+ print '';
print '
';
print ' ';
print '
';
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index 7ec5ad5b4f1..1640daeb1c6 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -43,71 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.
// Load translation files required by the page
$langs->loadLangs(array("other", "compta", "banks", "bills", "companies", "product", "trips", "admin"));
-
-$now = dol_now();
-$current_date = dol_getdate($now);
-if (empty($conf->global->SOCIETE_FISCAL_MONTH_START)) {
- $conf->global->SOCIETE_FISCAL_MONTH_START = 1;
-}
-
-// Date range
-$year = GETPOST("year", "int");
-if (empty($year)) {
- $year_current = $current_date['year'];
- $year_start = $year_current;
-} else {
- $year_current = $year;
- $year_start = $year;
-}
-$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
-$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
-// Set default period if not defined
-if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
- $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 (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
- $date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
- $date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
- } elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
- if ($current_date['mon'] < $conf->global->SOCIETE_FISCAL_MONTH_START) {
- if (($conf->global->SOCIETE_FISCAL_MONTH_START - $current_date['mon']) > 6) { // If period started from less than 6 years, we show past year
- $year_start--;
- }
- } else {
- if (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) < 6) { // If perdio started from less than 6 years, we show past year
- $year_start--;
- }
- }
- $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;
- } elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) { // monthly vat, we take last past complete month
- $date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -1, 'm');
- $date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
- }
- }
- } 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);
- }
- if ($q == 4) {
- $date_start = dol_get_first_day($year_start, 10, false);
- $date_end = dol_get_last_day($year_start, 12, false);
- }
- }
-}
+include DOL_DOCUMENT_ROOT.'/compta/tva/initdatesforvat.inc.php';
$min = price2num(GETPOST("min", "alpha"));
if (empty($min)) {
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index ba2669077c9..63b834d7821 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -37,99 +37,15 @@ require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
// Load translation files required by the page
$langs->loadLangs(array("other", "compta", "banks", "bills", "companies", "product", "trips", "admin"));
-$form = new Form($db);
-$now = dol_now();
-$current_date = dol_getdate($now);
-if (empty($conf->global->SOCIETE_FISCAL_MONTH_START)) {
- $conf->global->SOCIETE_FISCAL_MONTH_START = 1;
-}
-
$refresh = GETPOSTISSET('submit') ? true : false;
+$year_current = GETPOSTISSET('year') ? GETPOST('year', 'int') : dol_print_date($now, '%Y', 'tzserver');
+$year_start = $year_current;
+$month_current = GETPOSTISSET('month') ? GETPOST('month', 'int') : dol_print_date($now, '%m', 'tzserver');
+$month_start = $month_current;
-if ($refresh === false) {
- $year_current = dol_print_date('%Y', $now);
- $month_current = dol_print_date('%m', $now);
+$refresh = true;
- // 1 : Monthly (by default)
- // 2 : Quarterly
- // 3 : Annual
- if ($conf->global->MAIN_INFO_VAT_RETURN == 2) {
- // quarterly
- $year = $year_current;
- if ($month_current >= 7 && $month_current <= 9) {
- $month_start = 4;
- $month_end = 6;
- } elseif ($month_current >= 10 && $month_current <= 12) {
- $month_start = 7;
- $month_end = 9;
- } elseif ($month_current >= 1 && $month_current <= 3) {
- $month_start = 10;
- $month_end = 12;
- $year--;
- } else {
- $month_start = 1;
- $month_end = 3;
- }
- $date_start = dol_get_first_day($year, $month_start);
- $date_end = dol_get_last_day($year, $month_end);
- } elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) {
- // annual
- $date_start = dol_get_first_day($year_current, 1);
- $date_end = dol_get_last_day($year_current, 12);
- } else {
- // monthly by default
- $year = $year_current;
- $month_last = $month_current - 1;
- if ($month_last <= 0) {
- $month_last = $month_last + 12;
- $year--;
- }
- $date_start = dol_get_first_day($year, $month_last);
- $date_end = dol_get_last_day($year, $month_last);
- }
-} else {
- // Date range
- $year = GETPOST("year", "int");
- if (empty($year)) {
- $year_current = dol_print_date(dol_now(), "%Y");
- if ($conf->global->SOCIETE_FISCAL_MONTH_START > dol_print_date(dol_now(), "%m")) $year_current--;
- $year_start = $year_current;
- } else {
- $year_current = $year;
- $year_start = $year;
- }
- $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
- $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
- if (empty($date_start) || empty($date_end)) {// We define date_start and date_end
- $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 {
- $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 {
- 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);
- }
- if ($q == 4) {
- $date_start = dol_get_first_day($year_start, 10, false);
- $date_end = dol_get_last_day($year_start, 12, false);
- }
- }
- }
-}
+include DOL_DOCUMENT_ROOT.'/compta/tva/initdatesforvat.inc.php';
// Define modetax (0 or 1)
// 0=normal, 1=option vat for services is on debit, 2=option on payments for products
@@ -255,6 +171,7 @@ function pt($db, $sql, $date)
* View
*/
+$form = new Form($db);
$company_static = new Societe($db);
$tva = new Tva($db);
diff --git a/htdocs/compta/tva/initdatesforvat.inc.php b/htdocs/compta/tva/initdatesforvat.inc.php
new file mode 100644
index 00000000000..8039fce728f
--- /dev/null
+++ b/htdocs/compta/tva/initdatesforvat.inc.php
@@ -0,0 +1,98 @@
+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ * \file htdocs/compta/tva/initdatesforvat.inc.php
+ * \brief Set value for date_start and date_end
+ */
+
+$now = dol_now();
+$current_date = dol_getdate($now);
+if (empty($conf->global->SOCIETE_FISCAL_MONTH_START)) {
+ $conf->global->SOCIETE_FISCAL_MONTH_START = 1;
+}
+
+// Date range
+$year = GETPOST("year", "int");
+if (empty($year)) {
+ $year_current = $current_date['year'];
+ $year_start = $year_current;
+} else {
+ $year_current = $year;
+ $year_start = $year;
+}
+$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver');
+$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver');
+// Set default period if not defined
+if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
+ $q = GETPOST("q", "int");
+ if (empty($q)) {
+ if (GETPOST("month", 'int')) {
+ $date_start = dol_get_first_day($year_start, GETPOST("month", 'int'), 'tzserver');
+ $date_end = dol_get_last_day($year_start, GETPOST("month", 'int'), 'tzserver');
+ } else {
+ if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
+ $date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
+ $date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
+ } elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
+ if ($current_date['mon'] < $conf->global->SOCIETE_FISCAL_MONTH_START) {
+ if (($conf->global->SOCIETE_FISCAL_MONTH_START - $current_date['mon']) > 6) { // If period started from less than 6 years, we show past year
+ $year_start--;
+ }
+ } else {
+ if (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) < 6) { // If perdio started from less than 6 years, we show past year
+ $year_start--;
+ }
+ }
+ $date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, 'tzserver');
+ $date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
+ } elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) { // monthly vat, we take last past complete month
+ $date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -1, 'm');
+ $date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
+ }
+ }
+ } else {
+ if ($q == 1) {
+ $date_start = dol_get_first_day($year_start, 1, 'tzserver');
+ $date_end = dol_get_last_day($year_start, 3, 'tzserver');
+ }
+ if ($q == 2) {
+ $date_start = dol_get_first_day($year_start, 4, 'tzserver');
+ $date_end = dol_get_last_day($year_start, 6, 'tzserver');
+ }
+ if ($q == 3) {
+ $date_start = dol_get_first_day($year_start, 7, 'tzserver');
+ $date_end = dol_get_last_day($year_start, 9, 'tzserver');
+ }
+ if ($q == 4) {
+ $date_start = dol_get_first_day($year_start, 10, 'tzserver');
+ $date_end = dol_get_last_day($year_start, 12, 'tzserver');
+ }
+ }
+}
+
+//print dol_print_date($date_start, 'day').' '.dol_print_date($date_end, 'day');
+
+$tmp = dol_getdate($date_start);
+$date_start_day = $tmp['mday'];
+$date_start_month = $tmp['mon'];
+$date_start_year = $tmp['year'];
+$tmp = dol_getdate($date_end);
+$date_end_day = $tmp['mday'];
+$date_end_month = $tmp['mon'];
+$date_end_year = $tmp['year'];
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index 590999c7b31..07071b250e5 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -45,68 +45,11 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.
// Load translation files required by the page
$langs->loadLangs(array("other", "compta", "banks", "bills", "companies", "product", "trips", "admin"));
-$now = dol_now();
-$refresh = GETPOSTISSET('submit') ? true : false;
+$refresh = (GETPOSTISSET('submit') || GETPOSTISSET('vat_rate_show') || GETPOSTISSET('invoice_type')) ? true : false;
$invoice_type = GETPOSTISSET('invoice_type') ? GETPOST('invoice_type', 'alpha') : '';
$vat_rate_show = GETPOSTISSET('vat_rate_show') ? GETPOST('vat_rate_show', 'int') : -1;
-$year_current = GETPOSTISSET('year') ? GETPOST('year', 'int') : intval(strftime('%Y', $now));
-$year_start = $year_current;
-$month_current = GETPOSTISSET('month') ? GETPOST('month', 'int') : intval(strftime('%m', $now));
-$month_start = $month_current;
-if ($refresh === false) {
- $date_start = dol_get_first_day($year_start, $month_start);
- $date_end = dol_get_last_day($year_start, $month_start);
-} else {
- // Date range
- //$year=GETPOST("year", "int");
- //if (empty($year))
- //{
- // $year_current = strftime("%Y", dol_now());
- // $year_start = $year_current;
- //} else {
- // $year_current = $year;
- // $year_start = $year;
- //}
-
- $date_start=dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
- $date_end=dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
- // Quarter
- if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
- $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 {
- $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 {
- 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);
- }
- if ($q == 4) {
- $date_start=dol_get_first_day($year_start, 10, false); $date_end=dol_get_last_day($year_start, 12, false);
- }
- }
- }
-}
-
-$month_start = strftime('%m', $date_start);
-$year_start = strftime('%Y', $date_start);
+include DOL_DOCUMENT_ROOT.'/compta/tva/initdatesforvat.inc.php';
$min = price2num(GETPOST("min", "alpha"));
if (empty($min)) {
@@ -131,7 +74,6 @@ if ($user->socid) {
$result = restrictedArea($user, 'tax', '', '', 'charges');
-
/*
* View
*/
@@ -154,7 +96,7 @@ foreach ($listofparams as $param) {
}
}
-$title = $langs->trans("VATReport")." ".dol_print_date($date_start)." -> ".dol_print_date($date_end);
+$title = $langs->trans("VATReport")." ".dol_print_date($date_start, '', 'tzserver')." -> ".dol_print_date($date_end, '', 'tzserver');
llxHeader('', $title, '', '', 0, 0, '', '', $morequerystring);
@@ -182,8 +124,10 @@ if ($modetax == 2) {
}
$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;
+$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0, 0, '', '', '', '', 1, '', '', 'tzserver');
+$period .= ' - ';
+$period .= $form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0, 0, '', '', '', '', 1, '', '', 'tzserver');
+$prevyear = $date_start_year;
$prevquarter = $q;
if ($prevquarter > 1) {
$prevquarter--;
@@ -191,7 +135,7 @@ if ($prevquarter > 1) {
$prevquarter = 4;
$prevyear--;
}
-$nextyear = $year_start;
+$nextyear = $date_start_year;
$nextquarter = $q;
if ($nextquarter < 4) {
$nextquarter++;
@@ -256,9 +200,13 @@ print '
';
print '
';
$y = $year_current;
-$total = 0;
$i = 0;
-$columns = 5;
+
+$columns = 7;
+$span = $columns;
+if ($modetax != 1) {
+ $span += 2;
+}
// Load arrays of datas
$x_coll = tax_by_rate('vat', $db, 0, 0, $date_start, $date_end, $modetax, 'sell');
@@ -383,11 +331,6 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
$x_paye_sum = 0;
$x_paye_ht = 0;
- $span = $columns;
- if ($modetax != 1) {
- $span += 2;
- }
-
//print '| '..') |
';
// Customers invoices
@@ -429,7 +372,11 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
print "";
print '| ';
print $langs->trans('Rate') . ' : ' . vatrate($rate) . '%';
- print ' - ' . img_picto('', 'chevron-down', 'class="paddingrightonly"') . $langs->trans('VATReportShowByRateDetails') . '';
+ print ' - ' . img_picto('', 'chevron-down', 'class="paddingrightonly"') . $langs->trans('VATReportShowByRateDetails') . '';
print ' | ';
print '
'."\n";
@@ -642,7 +589,11 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
print "";
print '| ';
print $langs->trans('Rate') . ' : ' . vatrate($rate) . '%';
- print ' - ' . img_picto('', 'chevron-down', 'class="paddingrightonly"') . $langs->trans('VATReportShowByRateDetails') . '';
+ print ' - ' . img_picto('', 'chevron-down', 'class="paddingrightonly"') . $langs->trans('VATReportShowByRateDetails') . '';
print ' | ';
print '
'."\n";
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index c66d16b6736..0d8cc2f8d52 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -167,7 +167,8 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
}
if ($q) {
- $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+ $sql .= " AND f.datef > '".$db->idate(dol_get_first_day($y, (($q - 1) * 3) + 1, false))."'";
+ $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, ($q * 3), false))."'";
}
if ($date_start && $date_end) {
$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
@@ -212,7 +213,8 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
}
if ($q) {
- $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+ $sql .= " AND pa.datep > '".$db->idate(dol_get_first_day($y, (($q - 1) * 3) + 1, false))."'";
+ $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, ($q * 3), false))."'";
}
if ($date_start && $date_end) {
$sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
@@ -330,7 +332,8 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
}
if ($q) {
- $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+ $sql .= " AND f.datef > '".$db->idate(dol_get_first_day($y, (($q - 1) * 3) + 1, false))."'";
+ $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, ($q * 3), false))."'";
}
if ($date_start && $date_end) {
$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
@@ -375,7 +378,8 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
}
if ($q) {
- $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+ $sql .= " AND pa.datep > '".$db->idate(dol_get_first_day($y, (($q - 1) * 3) + 1, false))."'";
+ $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, ($q * 3), false))."'";
}
if ($date_start && $date_end) {
$sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
@@ -484,7 +488,8 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
}
if ($q) {
- $sql .= " AND (date_format(p.datep,'%m') > ".(($q - 1) * 3)." AND date_format(p.datep,'%m') <= ".($q * 3).")";
+ $sql .= " AND p.datep > '".$db->idate(dol_get_first_day($y, (($q - 1) * 3) + 1, false))."'";
+ $sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, ($q * 3), false))."'";
}
if ($date_start && $date_end) {
$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
@@ -662,7 +667,8 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
}
if ($q) {
- $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+ $sql .= " AND f.datef > '".$db->idate(dol_get_first_day($y, (($q - 1) * 3) + 1, false))."'";
+ $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, ($q * 3), false))."'";
}
if ($date_start && $date_end) {
$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
@@ -703,7 +709,8 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
}
if ($q) {
- $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+ $sql .= " AND pa.datep > '".$db->idate(dol_get_first_day($y, (($q - 1) * 3) + 1, false))."'";
+ $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, ($q * 3), false))."'";
}
if ($date_start && $date_end) {
$sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
@@ -715,6 +722,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
}
$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
}
+ //print $sql;
if (!$sql) {
return -1;
@@ -819,7 +827,8 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
}
if ($q) {
- $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+ $sql .= " AND f.datef > '".$db->idate(dol_get_first_day($y, (($q - 1) * 3) + 1, false))."'";
+ $sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, ($q * 3), false))."'";
}
if ($date_start && $date_end) {
$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
@@ -860,7 +869,8 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
}
if ($q) {
- $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+ $sql .= " AND pa.datep > '".$db->idate(dol_get_first_day($y, (($q - 1) * 3) + 1, false))."'";
+ $sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, ($q * 3), false))."'";
}
if ($date_start && $date_end) {
$sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
@@ -969,7 +979,8 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
}
if ($q) {
- $sql .= " AND (date_format(p.datep,'%m') > ".(($q - 1) * 3)." AND date_format(p.datep,'%m') <= ".($q * 3).")";
+ $sql .= " AND p.datep > '".$db->idate(dol_get_first_day($y, (($q - 1) * 3) + 1, false))."'";
+ $sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, ($q * 3), false))."'";
}
if ($date_start && $date_end) {
$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 3f892e3b29c..d42d8845aeb 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -86,7 +86,7 @@ PaymentCustomerInvoice=Customer invoice payment
PaymentSupplierInvoice=vendor invoice payment
PaymentSocialContribution=Social/fiscal tax payment
PaymentVat=VAT payment
-AutomaticCreationPayment=Automatically record the payment of the salary
+AutomaticCreationPayment=Automatically record the payment
ListPayment=List of payments
ListOfCustomerPayments=List of customer payments
ListOfSupplierPayments=List of vendor payments