diff --git a/ChangeLog b/ChangeLog
index f72e2830106..40b4b40eb4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ English Dolibarr ChangeLog
--------------------------------------------------------------
+
***** ChangeLog for 7.0.0 compared to 6.0.* *****
For developers:
@@ -22,6 +23,39 @@ Following changes may create regressions for some external modules, but were nec
* The trigger ORDER_SUPPLIER_STATUS_RECEIVED_ALL was renamed ORDER_SUPPLIER_STATUS_RECEIVED_COMPLETELY
+***** ChangeLog for 6.0.2 compared to 6.0.1 *****
+FIX: #7148
+FIX: #7288
+FIX: #7366 renaming table with pgsql
+FIX: #7435 Can't add payment term
+FIX: #7461
+FIX: #7464
+FIX: #7471
+FIX: #7473 Mass update of vat rates and other bugs on localtax
+FIX: #7475
+FIX: #7486 Empty value for multicurrency rate must be forbidden
+FIX: #7490
+FIX: #7505
+FIX: #7510 Bug: extrafield content disappear when generate pdf within intervention
+FIX: #7514
+FIX: #7531 #7537
+FIX: #7541
+FIX: #7546
+FIX: #7550
+FIX: #7554
+FIX: #7567
+FIX: Accountancy export model for Agiris Isacompta
+FIX: Allow create shipping if STOCK_SUPPORTS_SERVICES option is enabled
+FIX: Bad preview on scroping when special file names
+FIX: Generation of invoice from bulk action "Bill Orders"
+FIX: Implementation of a Luracast recommandation for the REST api server (#7370)
+FIX: Missing space in request
+FIX: Only modified values must be modified
+FIX: replenish if line test GETPOST on line 0
+FIX: Stripe not working on live mode
+FIX: wrong basePath in the swagger view
+FIX: Implementation of a Luracast recommandation for the REST api server
+
***** ChangeLog for 6.0.1 compared to 6.0.* *****
FIX: #7000 Dashboard link for late pending payment supplier invoices do not work
FIX: #7325 Default VAT rate when editing template invoices is 0%
diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php
index 497d3c54f54..9252ae5ec3a 100644
--- a/htdocs/core/modules/mailings/advthirdparties.modules.php
+++ b/htdocs/core/modules/mailings/advthirdparties.modules.php
@@ -116,7 +116,7 @@ class mailing_advthirdparties extends MailingTargets
}
}
- if (($type_of_target==1) || ($type_of_target==2)) {
+ if (($type_of_target==1) || ($type_of_target==2) || ($type_of_target==4)) {
// Select the third parties from category
if (count($socid)>0 || count($contactid)>0)
{
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index 4e3272a88c9..9e3b19abe26 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -26,6 +26,12 @@
+-- VMYSQLUTF8UNICODECI ALTER TABLE llx_accounting_journal MODIFY code VARCHAR(20) CHARACTER SET utf8;
+-- VMYSQLUTF8UNICODECI ALTER TABLE llx_accounting_journal MODIFY code VARCHAR(20) COLLATE utf8_unicode_ci;
+-- VMYSQLUTF8UNICODECI ALTER TABLE llx_bank_account MODIFY accountancy_journal VARCHAR(20) CHARACTER SET utf8;
+-- VMYSQLUTF8UNICODECI ALTER TABLE llx_bank_account MODIFY accountancy_journal VARCHAR(20) COLLATE utf8_unicode_ci;
+
+
ALTER TABLE llx_holiday_config MODIFY COLUMN name varchar(128);
ALTER TABLE llx_supplier_proposaldet CHANGE COLUMN fk_askpricesupplier fk_supplier_proposal integer NOT NULL;
diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang
index b151565f3a3..15415a7fcd5 100644
--- a/htdocs/langs/en_US/interventions.lang
+++ b/htdocs/langs/en_US/interventions.lang
@@ -53,6 +53,7 @@ UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for int
InterventionStatistics=Statistics of interventions
NbOfinterventions=Nb of intervention cards
NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
##### Exports #####
InterId=Intervention id
InterRef=Intervention ref.
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index ba703f6128c..061c522918a 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -509,7 +509,7 @@ if (count($tasksarray) > 0)
}
else
{
- print '| '.$langs->trans("NoTasks").' |
';
+ print '| '.$langs->trans("NoTasks").' |
';
}
print "";
print '';
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index a12d53cf60a..1d71608e634 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -284,9 +284,18 @@ if ($action == 'addtime' && $user->rights->projet->lire)
{
setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
- // Redirect to avoid submit twice on back
- header('Location: '.$_SERVER["PHP_SELF"].'?'.($projectid?'id='.$projectid:'').($search_usertoprocessid?'&search_usertoprocessid='.$search_usertoprocessid:'').($mode?'&mode='.$mode:'').($day?'&day='.$day:'').($month?'&month='.$month:'').($year?'&year='.$year:''));
- exit;
+ $param='';
+ $param.=($mode?'&mode='.$mode:'');
+ $param.=($projectid?'id='.$projectid:'').($search_usertoprocessid?'&search_usertoprocessid='.$search_usertoprocessid:'').($day?'&day='.$day:'').($month?'&month='.$month:'').($year?'&year='.$year:'');
+ $param.=($search_project_ref?'&search_project_ref='.$search_project_ref:'');
+ $param.=($search_usertoprocessid > 0?'&search_usertoprocessid='.$search_usertoprocessid:'');
+ $param.=($search_thirdparty?'&search_thirdparty='.$search_thirdparty:'');
+ $param.=($search_task_ref?'&search_task_ref='.$search_task_ref:'');
+ $param.=($search_task_label?'&search_task_label='.$search_task_label:'');
+
+ // Redirect to avoid submit twice on back
+ header('Location: '.$_SERVER["PHP_SELF"].'?'.$param);
+ exit;
}
}
}
@@ -527,7 +536,7 @@ if (count($tasksarray) > 0)
}
else
{
- print '| '.$langs->trans("NoTasks").' |
';
+ print '| '.$langs->trans("NoTasks").' |
';
}
print "";
print '';
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 8dd7f6bbed5..710ccb37500 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -624,23 +624,31 @@ foreach ($listofreferent as $key => $value)
if ($qualifiedfortotal) $total_ttc = $total_ttc + $total_ttc_by_line;
}
- // Calculate margin
- if ($margin=="add")
- {
- $balance_ht+= $total_ht;
- $balance_ttc+= $total_ttc;
- }
- else
- {
- $balance_ht-= $total_ht;
- $balance_ttc-= $total_ttc;
- }
+ // Each element with at least one line is output
+ $qualifiedforfinalprofit=true;
+ if ($key == 'intervention' && empty($conf->global->PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT)) $qualifiedforfinalprofit=false;
+ //var_dump($key);
- // Show $total_ht & $total_ttc -- add a minus when necessary
- if ($margin!="add")
+ // Calculate margin
+ if ($qualifiedforfinalprofit)
{
- $total_ht = -$total_ht;
- $total_ttc = -$total_ttc;
+ if ($margin=="add")
+ {
+ $balance_ht+= $total_ht;
+ $balance_ttc+= $total_ttc;
+ }
+ else
+ {
+ $balance_ht-= $total_ht;
+ $balance_ttc-= $total_ttc;
+ }
+
+ // Show $total_ht & $total_ttc -- add a minus when necessary
+ if ($margin!="add")
+ {
+ $total_ht = -$total_ht;
+ $total_ttc = -$total_ttc;
+ }
}
print '';
@@ -649,9 +657,15 @@ foreach ($listofreferent as $key => $value)
// Nb
print '| '.$i.' | ';
// Amount HT
- print ''.price($total_ht).' | ';
+ print '';
+ if (! $qualifiedforfinalprofit) print ''.$form->textwithpicto($langs->trans("NA"), $langs->trans("AmountOfInteventionNotIncludedByDefault")).'';
+ else print price($total_ht);
+ print ' | ';
// Amount TTC
- print ''.price($total_ttc).' | ';
+ print '';
+ if (! $qualifiedforfinalprofit) print ''.$form->textwithpicto($langs->trans("NA"), $langs->trans("AmountOfInteventionNotIncludedByDefault")).'';
+ else print price($total_ttc);
+ print ' | ';
print '
';
}
}