diff --git a/ChangeLog b/ChangeLog index 95e1ec18bd7..2d2a432c9ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -228,6 +228,25 @@ Following changes may create regressions for some external modules, but were nec * The jquery plugin/dependency multiselect has been removed. It was not used by Dolibarr core. +***** ChangeLog for 10.0.6 compared to 10.0.5 ***** +FIX Regression of 10.0.5 to create/edit proposals and orders. +FIX: #12760 #12763 #12755 #12765 #12751 +FIX: add product qty in shipment already sent (fix for option STOCK_CALCULATE_ON_SHIPMENT_NEW) +FIX: an issue that shows all entities stock +FIX: class Facture undefined in displaying margin information +FIX: error 500 when getting margin info for objects other than invoices +FIX: Loan card - Wrong language key used +FIX: Missing language key for MAIN_MAXTABS_IN_CARD +FIX: product with empty stock were not visible +FIX: remove backward compatibility projectid and uses object id instead +FIX: Some issues on salary payment +FIX: Some problems on conciliation with others modules +FIX: typo on language key +FIX: url new for task time spent in project element tab +FIX: uses GETPOSTISSET instead of GETPOST for projectfield +FIX: var transkey not defined in input hidden +FIX: wrong var name and avoid warning + ***** ChangeLog for 10.0.5 compared to 10.0.4 ***** FIX: 10.0: add URL param "restore_last_search_values=1" to all backlinks pointing to lists FIX: 10.0: do not display single-letter values (indicating duration unit without value) in product list diff --git a/README-FR.md b/README-FR.md index 95a42da1127..fe0064e4d1a 100644 --- a/README-FR.md +++ b/README-FR.md @@ -6,7 +6,7 @@ Dolibarr ERP & CRM est un logiciel moderne pour gérer votre activité (société, association, auto-entrepreneurs, artisans). Il est simple d'utilisation et modulaire, vous permettant de n'activez que les fonctions dont vous avez besoin (contacts, fournisseurs, factures, commandes, stocks, agenda, ...). - + ## LICENCE diff --git a/README.md b/README.md index a0c4dfd59ad..e4ef703f039 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ You can freely use, study, modify or distribute it according to its Free Softwar You can use it as a standalone application or as a web application to be able to access it from the Internet or a LAN. - + ## LICENSE diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index 836dedc0dc2..bab853c35b2 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -1155,9 +1155,9 @@ if (empty($action) || $action == 'view') { } else print $accounttoshow; print ""; + // Subledger account print "