diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 393629ae505..46e6832dba2 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -300,7 +300,10 @@ if ($action == 'validatehistory') {
$db->rollback();
} else {
$db->commit();
- setEventMessages($langs->trans('AutomaticBindingDone', $nbbinddone, $notpossible), null, 'mesgs');
+ setEventMessages($langs->trans('AutomaticBindingDone', $nbbinddone, $notpossible), null, ($notpossible ? 'warnings' : 'mesgs'));
+ if ($notpossible) {
+ setEventMessages($langs->trans('DoManualBindingForFailedRecord', $notpossible), null, 'warnings');
+ }
}
}
@@ -324,7 +327,7 @@ print '
';
$y = $year_current;
-$buttonbind = ''.$langs->trans("ValidateHistory").'';
+$buttonbind = ''.img_picto($langs->trans("ValidateHistory"), 'link', 'class="pictofixedwidth fa-color-unset"').$langs->trans("ValidateHistory").'';
print_barre_liste(img_picto('', 'unlink', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
//print load_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
@@ -420,6 +423,12 @@ if ($resql) {
print '
';
print price($row[$i]);
+ // Add link to make binding
+ if (!empty(price2num($row[$i]))) {
+ print '';
+ print img_picto($langs->trans("ValidateHistory").' ('.$langs->trans('Month'.str_pad($cursormonth, 2, '0', STR_PAD_LEFT)).' '.$cursoryear.')', 'link', 'class="marginleft2"');
+ print '';
+ }
print ' | ';
}
print ''.price($row[14]).' | ';
@@ -558,7 +567,7 @@ print "\n";
print '';
-if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange. Why showing a report that should rely on result of this step ?
+if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This part of code looks strange. Why showing a report that should rely on result of this step ?
print '
';
print '
';
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index 5064003c7ff..df226ce115d 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -162,7 +162,10 @@ if ($action == 'validatehistory') {
$db->rollback();
} else {
$db->commit();
- setEventMessages($langs->trans('AutomaticBindingDone', $nbbinddone, $notpossible), null, 'mesgs');
+ setEventMessages($langs->trans('AutomaticBindingDone', $nbbinddone, $notpossible), null, ($notpossible ? 'warnings' : 'mesgs'));
+ if ($notpossible) {
+ setEventMessages($langs->trans('DoManualBindingForFailedRecord', $notpossible), null, 'warnings');
+ }
}
}
@@ -185,7 +188,7 @@ print '
';
$y = $year_current;
-$buttonbind = ''.$langs->trans("ValidateHistory").'';
+$buttonbind = ''.img_picto('', 'link', 'class="paddingright fa-color-unset"').$langs->trans("ValidateHistory").'';
print_barre_liste(img_picto('', 'unlink', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
@@ -269,8 +272,21 @@ if ($resql) {
}
print '';
for ($i = 2; $i <= 13; $i++) {
+ $cursormonth = (($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) + $i - 2);
+ if ($cursormonth > 12) {
+ $cursormonth -= 12;
+ }
+ $cursoryear = ($cursormonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+ $tmp = dol_getdate(dol_get_last_day($cursoryear, $cursormonth, 'gmt'), false, 'gmt');
+
print '';
print price($row[$i]);
+ // Add link to make binding
+ if (!empty(price2num($row[$i]))) {
+ print '';
+ print img_picto($langs->trans("ValidateHistory").' ('.$langs->trans('Month'.str_pad($cursormonth, 2, '0', STR_PAD_LEFT)).' '.$cursoryear.')', 'link', 'class="marginleft2"');
+ print '';
+ }
print ' | ';
}
print ''.price($row[14]).' | ';
@@ -367,7 +383,7 @@ print '';
-if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange. Why showing a report where results depends on next step (so not yet available) ?
+if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This part of code looks strange. Why showing a report that should rely on result of this step ?
print '
';
print '
';
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index b214b89734c..b66b791f7b1 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -298,7 +298,10 @@ if ($action == 'validatehistory') {
$db->rollback();
} else {
$db->commit();
- setEventMessages($langs->trans('AutomaticBindingDone', $nbbinddone, $notpossible), null, 'mesgs');
+ setEventMessages($langs->trans('AutomaticBindingDone', $nbbinddone, $notpossible), null, ($notpossible ? 'warnings' : 'mesgs'));
+ if ($notpossible) {
+ setEventMessages($langs->trans('DoManualBindingForFailedRecord', $notpossible), null, 'warnings');
+ }
}
}
@@ -320,7 +323,7 @@ print '
';
$y = $year_current;
-$buttonbind = ''.$langs->trans("ValidateHistory").'';
+$buttonbind = ''.img_picto('', 'link', 'class="paddingright fa-color-unset"').$langs->trans("ValidateHistory").'';
print_barre_liste(img_picto('', 'unlink', 'class="paddingright fa-color-unset"').$langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
@@ -408,8 +411,21 @@ if ($resql) {
}
print '';
for ($i = 2; $i <= 13; $i++) {
+ $cursormonth = (($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) + $i - 2);
+ if ($cursormonth > 12) {
+ $cursormonth -= 12;
+ }
+ $cursoryear = ($cursormonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1)) ? $y + 1 : $y;
+ $tmp = dol_getdate(dol_get_last_day($cursoryear, $cursormonth, 'gmt'), false, 'gmt');
+
print '';
print price($row[$i]);
+ // Add link to make binding
+ if (!empty(price2num($row[$i]))) {
+ print '';
+ print img_picto($langs->trans("ValidateHistory").' ('.$langs->trans('Month'.str_pad($cursormonth, 2, '0', STR_PAD_LEFT)).' '.$cursoryear.')', 'link', 'class="marginleft2"');
+ print '';
+ }
print ' | ';
}
print ''.price($row[14]).' | ';
@@ -541,7 +557,7 @@ print "\n";
print '';
-if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange. Why showing a report that should rely on result of this step ?
+if (getDolGlobalString('SHOW_TOTAL_OF_PREVIOUS_LISTS_IN_LIN_PAGE')) { // This part of code looks strange. Why showing a report that should rely on result of this step ?
print '
';
print '
';
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 419b69a3f90..554087ad5c4 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -297,6 +297,7 @@ DescValidateMovements=Any modification or deletion of writing, lettering and del
ValidateHistory=Bind Automatically
AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+DoManualBindingForFailedRecord=You have to do a manual link for the rows not linked %s automatically.
ErrorAccountancyCodeIsAlreadyUse=Error, you cannot remove or disable this account of chart of account because it is used
MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s