diff --git a/ChangeLog b/ChangeLog
index 0d3f04d314f..020367a5453 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,40 +2,14 @@
English Dolibarr ChangeLog
--------------------------------------------------------------
-***** 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
-FIX: #12473
-FIX: #12481 : fix ticket creation from thirdparty, mission $socid var
-FIX: #12482
-FIX: #12644
-FIX: #12665 Mass invoice validation with stock management
-FIX: #12688
-FIX: #12745
-FIX: add and modify category translate form with posted values on errors
-FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list
-FIX: CommandeFournisseurLigne update function must not be able to return other value than 1 if success
-FIX: contact card state address selected after filling address
-FIX: dol_string_nohtmltag when there is html with windows EOL "
\r\n"
-FIX: filter language is an array
-FIX: first col at wrong position in Export 2007 (new)
-FIX: getrights() request
-FIX: Invoice Situation integration into Margin
-FIX: missing nl2br conversion
-FIX: not fee in payout list
-FIX: product_fourn_price_id was assigned too late for logPrice() function
-FIX: Reduce number of request for list of products
-FIX: set due date in object in create invoice
-FIX: units traductions for selectUnits() function
-FIX: when we need to bill several orders, order lines unit is not on bill lines
-NEW: 9.0: allow users to use the mysqldump '--quick' option
***** ChangeLog for 11.0.0 compared to 10.0.0 *****
For Users:
-NEW: Module BOM is now stable (Module MO - Manufacturing Order is still in development).
+NEW: Module BOM is now stable.
+NEW: Module MO - Manufacturing Order available with experimental status.
NEW: Can set the Address/Contact by default on third parties.
-NEW: Add a dictionary for list of Social networks
+NEW: Add a dictionary to edit list of Social networks.
NEW: A nicer dashboard for open elements on Home page.
NEW: Add task widget and add task progress bar
NEW: Support of deployment of metapackages
@@ -239,6 +213,53 @@ 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
+FIX: #12473
+FIX: #12481 : fix ticket creation from thirdparty, mission $socid var
+FIX: #12482
+FIX: #12644
+FIX: #12665 Mass invoice validation with stock management
+FIX: #12688
+FIX: #12745
+FIX: add and modify category translate form with posted values on errors
+FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list
+FIX: CommandeFournisseurLigne update function must not be able to return other value than 1 if success
+FIX: contact card state address selected after filling address
+FIX: dol_string_nohtmltag when there is html with windows EOL "
\r\n"
+FIX: filter language is an array
+FIX: first col at wrong position in Export 2007 (new)
+FIX: getrights() request
+FIX: Invoice Situation integration into Margin
+FIX: missing nl2br conversion
+FIX: not fee in payout list
+FIX: product_fourn_price_id was assigned too late for logPrice() function
+FIX: Reduce number of request for list of products
+FIX: set due date in object in create invoice
+FIX: units traductions for selectUnits() function
+FIX: when we need to bill several orders, order lines unit is not on bill lines
+NEW: 9.0: allow users to use the mysqldump '--quick' option
+
***** ChangeLog for 10.0.4 compared to 10.0.3 *****
FIX: The pdf templates were using the large logo making PDF too large (and edition of proposal, order, invoice VERY slow)
FIX: #12258
diff --git a/README-FR.md b/README-FR.md
index 95a42da1127..94af10cb04f 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..085ab808488 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/dev/initdata/purge-data.php b/dev/initdata/purge-data.php
index 62f41ce825f..b1aadd56ed8 100755
--- a/dev/initdata/purge-data.php
+++ b/dev/initdata/purge-data.php
@@ -64,6 +64,10 @@ $sqls=array(
"DELETE FROM ".MAIN_DB_PREFIX."paiement_facture where fk_facture IN (select rowid FROM ".MAIN_DB_PREFIX."facture where datec < '__DATE__')",
"DELETE FROM ".MAIN_DB_PREFIX."paiement where rowid NOT IN (SELECT fk_paiement FROM ".MAIN_DB_PREFIX."paiement_facture)",
),
+ 'supplier_payment'=>array(
+ "DELETE FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn where fk_facturefourn IN (select rowid FROM ".MAIN_DB_PREFIX."facture_fourn where datec < '__DATE__')",
+ "DELETE FROM ".MAIN_DB_PREFIX."paiementfourn where rowid NOT IN (SELECT fk_paiementfourn FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn)",
+ ),
'bank'=>array(
"DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid IN (SELECT rowid FROM ".MAIN_DB_PREFIX."bank WHERE datec < '__DATE__')",
"DELETE FROM ".MAIN_DB_PREFIX."bank_url WHERE fk_bank IN (SELECT rowid FROM ".MAIN_DB_PREFIX."bank WHERE datec < '__DATE__')",
@@ -103,6 +107,7 @@ $sqls=array(
"DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur where date_creation < '__DATE__'",
),
'supplier_invoice'=>array(
+ '@supplier_payment',
"DELETE FROM ".MAIN_DB_PREFIX."facture_fourn_det WHERE fk_facture_fourn IN (select rowid FROM ".MAIN_DB_PREFIX."facture_fourn where datec < '__DATE__')",
"DELETE FROM ".MAIN_DB_PREFIX."facture_fourn where datec < '__DATE__'",
),
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 "";
-
if (in_array($tabtype[$key], array('payment', 'payment_supplier', 'payment_expensereport', 'payment_salary', 'payment_various'))) // Type of payment with subledger
{
$accounttoshowsubledger = length_accounta($k);
@@ -1171,7 +1171,12 @@ if (empty($action) || $action == 'view') {
//print ''.$langs->trans("ThirdpartyAccountNotDefined").'';
if (! empty($tabcompany[$key]['code_compta']))
{
- print ''.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknown", $tabcompany[$key]['code_compta']).'';
+ if (in_array($tabtype[$key], array('payment_various'))) {
+ // For such case, if subledger is not defined, we won't use subledger accounts.
+ print ''.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored").'';
+ } else {
+ print ''.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknown", $tabcompany[$key]['code_compta']).'';
+ }
}
else
{
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 9a530262b6e..5ee4741709c 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -127,6 +127,18 @@ if (GETPOST('target') == 'local')
{
if (dol_is_file($xmlfile))
{
+ // If file is a zip file (.../filelist-x.y.z.xml.zip), we uncompress it before
+ if (preg_match('/\.zip$/i', $xmlfile)) {
+ dol_mkdir($conf->admin->dir_temp);
+ $xmlfilenew = preg_replace('/\.zip$/i', '', $xmlfile);
+ $result = dol_uncompress($xmlfile, $conf->admin->dir_temp);
+ if (empty($result['error'])) {
+ $xmlfile = $conf->admin->dir_temp.'/'.basename($xmlfilenew);
+ } else {
+ print $langs->trans('FailedToUncompressFile').': '.$xmlfile;
+ $error++;
+ }
+ }
$xml = simplexml_load_file($xmlfile);
}
else
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index d19e5d6fe92..56602502715 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -297,10 +297,7 @@ foreach ($dirmodels as $reldir)
}
$htmltooltip .= '
'.$langs->trans("FeaturesSupported").':';
$htmltooltip .= '
'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
- $htmltooltip .= '
'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
- $htmltooltip .= '
'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
$htmltooltip .= '
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
- $htmltooltip .= '
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
print ' | ';
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index 270d7dd6653..43910bedb56 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -34,7 +34,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
// Load translation files required by the page
$langs->loadLangs(array("admin", "members", "users"));
-
if (!$user->admin) accessforbidden();
$extrafields = new ExtraFields($db);
@@ -244,10 +243,7 @@ foreach ($dirmodels as $reldir)
}
$htmltooltip .= '
'.$langs->trans("FeaturesSupported").':';
$htmltooltip .= '
'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
- $htmltooltip .= '
'.$langs->trans("PaymentMode").': '.yn($module->option_modereg, 1, 1);
- $htmltooltip .= '
'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg, 1, 1);
$htmltooltip .= '
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
- $htmltooltip .= '
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark, 1, 1);
print ' | ';
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index 927f0f1a83f..20f189dd99f 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -202,6 +202,7 @@ print '
';
print ' |