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

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2021-06-19 14:16:39 +02:00
commit 7046791377
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -225,6 +225,8 @@ FIX: #17060
FIX: #17192 - With tz < 0, event is show in bad day on calendar views FIX: #17192 - With tz < 0, event is show in bad day on calendar views
FIX: #17363 FIX: #17363
FIX: #17476 releve.php: Fix SQL statement FIX: #17476 releve.php: Fix SQL statement
FIX: #17967
Fix: #17906 : fix access denied
FIX: Accountancy - Import in general ledger FIX: Accountancy - Import in general ledger
FIX: Accountancy - Quadra export - wrong data on credit FIX: Accountancy - Quadra export - wrong data on credit
FIX: Accountancy - Warning on the pages of the preparatory statements of accounting entries FIX: Accountancy - Warning on the pages of the preparatory statements of accounting entries

2
htdocs/compta/facture/class/facture-rec.class.php
View File

@ -613,7 +613,7 @@ class FactureRec extends CommonInvoice
} }
return 1; return 1;
} else { } else {
$this->error = 'Bill with id '.$rowid.' or ref '.$ref.' not found sql='.$sql; $this->error = 'Bill with id '.$rowid.' or ref '.$ref.' not found';
dol_syslog('Facture::Fetch Error '.$this->error, LOG_ERR); dol_syslog('Facture::Fetch Error '.$this->error, LOG_ERR);
return -2; return -2;
} }

2
htdocs/societe/admin/societe.php
View File

@ -675,7 +675,7 @@ foreach ($profid as $key => $val) {
print img_picto($langs->trans("Activated"), 'switch_on'); print img_picto($langs->trans("Activated"), 'switch_on');
print '</a></td>'; print '</a></td>';
} else { } else {
print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandator&token='.newToken().'&value='.$key.'&status=1">'; print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&token='.newToken().'&value='.$key.'&status=1">';
print img_picto($langs->trans("Disabled"), 'switch_off'); print img_picto($langs->trans("Disabled"), 'switch_off');
print '</a></td>'; print '</a></td>';
} }