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

Merge branch '10.0' of https://github.com/dolibarr/dolibarr into 10.0

Browse Source
This commit is contained in:
Laurent Destailleur 2019-10-30 02:40:05 +01:00
commit e716e9cba6
3 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ChangeLog
View File

@ -22,7 +22,6 @@ FIX: Clean the + of categories on the product view only in POS module
FIX: access to public interface when origin email has an alias. FIX: access to public interface when origin email has an alias.
FIX: Alias name is not into the email recipient label. FIX: Alias name is not into the email recipient label.
FIX: allow standalone credit note even if no invoice FIX: allow standalone credit note even if no invoice
FIX: an admin can not access his own permissions after enabling advanced
FIX: an admin can not access his own permissions after enabling advanced permissions FIX: an admin can not access his own permissions after enabling advanced permissions
FIX: Attachement of linked files on ticket when sending a message FIX: Attachement of linked files on ticket when sending a message
FIX: avoid non numeric warning FIX: avoid non numeric warning
@ -91,17 +90,17 @@ FIX: #11752
FIX: #11789 FIX: #11790 FIX: #11789 FIX: #11790
FIX: #11804 list of tickets from a customer card display ALL tickets FIX: #11804 list of tickets from a customer card display ALL tickets
FIX: #11834 FIX: #11834
FIX: Add char $ and ; in sanitizing of filenames. FIX: add char $ and ; in sanitizing of filenames
FIX: Add comment before protected functions FIX: add comment before protected functions
FIX: Add log and type of content in dolWebsiteOutput and FIX: add log and type of content in dolWebsiteOutput and
FIX: Add repair.php option 'restore' to restore user picture after v10 FIX: add repair.php option 'restore' to restore user picture after v10
FIX: amount opened on thirdparty card dont care of credit note not converted FIX: amount opened on thirdparty card dont care of credit note not converted
FIX: Api of documents work with value 'thirdparty' FIX: API of documents work with value 'thirdparty'
FIX: author in message / ticket API FIX: author in message / ticket API
FIX: avoid sql error if fk_project is empty during update FIX: avoid SQL error if fk_project is empty during update
FIX: avoid Warning: A non-numeric value encountered FIX: avoid Warning: A non-numeric value encountered
FIX: bad consistency in list of invoice for direct debit order. FIX: bad consistency in list of invoice for direct debit order
FIX: Bad error management in zip compress and web site export FIX: bad error management in zip compress and web site export
FIX: bad substitution for extrafields type checkbox FIX: bad substitution for extrafields type checkbox
FIX: better help message with multicompany FIX: better help message with multicompany
FIX: calculation of $products_dispatched FIX: calculation of $products_dispatched
@ -110,11 +109,11 @@ FIX: Can't delete a draft leave even if it should
FIX: Can't save setup of mailman module FIX: Can't save setup of mailman module
FIX: column jabberid missing FIX: column jabberid missing
FIX: Confirmation of deletion FIX: Confirmation of deletion
FIX: Consistency in direct debit order lists. FIX: Consistency in direct debit order lists
FIX: Content send before header warning FIX: Content send before header warning
FIX: credit note can be split FIX: credit note can be split
FIX: credit note used on list FIX: credit note used on list
FIX: Css was saved on wrong website. FIX: CSS was saved on wrong website
FIX: delivery extrafields FIX: delivery extrafields
FIX: Disabling a website does not put it offline FIX: Disabling a website does not put it offline
FIX: display only stripe sources for customer FIX: display only stripe sources for customer
@ -131,13 +130,13 @@ FIX: Fatal situation if payment removed on expense report. Action
FIX: filepath of generated documents doesn't handle products with special characters FIX: filepath of generated documents doesn't handle products with special characters
FIX: for MAIN_MAXTABS_IN_CARD = $i card FIX: for MAIN_MAXTABS_IN_CARD = $i card
FIX: gzip and bzip2 must use option -f FIX: gzip and bzip2 must use option -f
FIX: It was possible to create cashfence without entering data. FIX: it was possible to create cashfence without entering data
FIX: javascript error when using dol_use_jmobile=1 FIX: javascript error when using dol_use_jmobile=1
FIX: logout redirect to takepos.php FIX: logout redirect to takepos.php
FIX: Look and feel v10 FIX: Look and feel v10
FIX: Make protected all pfd models functions FIX: Make protected all pfd models functions
FIX: management of extrafields in modulebuilder FIX: management of extrafields in modulebuilder
FIX: Missing div for buttons in tax, loan, various payment modules FIX: missing div for buttons in tax, loan, various payment modules
FIX: missing include (dol_convert_file not found) FIX: missing include (dol_convert_file not found)
FIX: Missing some replacements in website module FIX: Missing some replacements in website module
FIX: missing test on permission on button to delete ledger record FIX: missing test on permission on button to delete ledger record
@ -161,13 +160,13 @@ FIX: Return code of pdf_einstein.modules.php and proformat
FIX: round for application fee in stripe FIX: round for application fee in stripe
FIX: Sens of the balance (Debit - Credit in accountancy not contrary) FIX: Sens of the balance (Debit - Credit in accountancy not contrary)
FIX: Several pb in export of documents FIX: Several pb in export of documents
FIX: SQL syntax error and CSRF check on vat reports FIX: SQL syntax error and CSRF check on VAT reports
FIX: takepos layout clear or focus search FIX: takepos layout clear or focus search
FIX: too many record in sql request. Whena criteria is a filter, we must FIX: too many record in sql request. When a criteria is a filter, we must
FIX: Translation of month FIX: Translation of month
FIX: USEDOLIBARREDITOR not always set FIX: USEDOLIBARREDITOR not always set
FIX: VAT number for Monaco (it uses FR) FIX: VAT number for Monaco (it uses FR)
FIX: vulenrability in uploading file found by 美创科技安全实验室 FIX: vulnerability in uploading file found by 美创科技安全实验室
FIX: wrong display (and hidden input) for already dispatched quantity FIX: wrong display (and hidden input) for already dispatched quantity
FIX: wrong parameters (same error in branch 9, 10, develop) FIX: wrong parameters (same error in branch 9, 10, develop)
FIX: Wrong variable. Must be PROJECT_HIDE_UNSELECTABLES FIX: Wrong variable. Must be PROJECT_HIDE_UNSELECTABLES

10
htdocs/compta/resultat/clientfourn.php
View File

@ -1132,11 +1132,11 @@ else
while ($i < $num) { while ($i < $num) {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$amount += $obj->amount; $amount += -$obj->amount;
$total_ht += $obj->amount; $total_ht += -$obj->amount;
$total_ttc += $obj->amount; $total_ttc += -$obj->amount;
$subtotal_ht += $obj->amount; $subtotal_ht += -$obj->amount;
$subtotal_ttc += $obj->amount; $subtotal_ttc += -$obj->amount;
$i++; $i++;
} }

4
htdocs/compta/resultat/index.php
View File

@ -480,10 +480,10 @@ if (! empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modeco
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
if (! isset($encaiss[$obj->dm])) $encaiss[$obj->dm]=0; if (! isset($encaiss[$obj->dm])) $encaiss[$obj->dm]=0;
$encaiss[$obj->dm] += $obj->amount; $encaiss[$obj->dm] += -$obj->amount;
if (! isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm]=0; if (! isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm]=0;
$encaiss_ttc[$obj->dm] += $obj->amount; $encaiss_ttc[$obj->dm] += -$obj->amount;
$i++; $i++;
} }