Skip to content
Snippets Groups Projects
Commit 3c24c1b1 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

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

parents b1c4d32f 7ad15538
No related branches found
No related tags found
No related merge requests found
...@@ -18,6 +18,7 @@ Fix: Paypal link were broken dur to SSL v3 closed. ...@@ -18,6 +18,7 @@ Fix: Paypal link were broken dur to SSL v3 closed.
- Fix: [ bug #1595 ] Selected boolean extrafield in intervention creation page, does not save state - Fix: [ bug #1595 ] Selected boolean extrafield in intervention creation page, does not save state
- Fix: Show sender Country on PDF docs when sender Country <> receiver Country - Fix: Show sender Country on PDF docs when sender Country <> receiver Country
- Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS - Fix: [ bug #1624 ] Use lowest buying price for margin when selling with POS
- Fix: [ bug #1749 ] Undefined $mailchimp
***** ChangeLog for 3.6.1 compared to 3.6.* ***** ***** ChangeLog for 3.6.1 compared to 3.6.* *****
For users: For users:
......
...@@ -212,7 +212,7 @@ if ($action=="addelement") ...@@ -212,7 +212,7 @@ if ($action=="addelement")
$elementselectid = GETPOST("elementselect"); $elementselectid = GETPOST("elementselect");
$result=$project->update_element($tablename, $elementselectid); $result=$project->update_element($tablename, $elementselectid);
if ($result<0) { if ($result<0) {
setEventMessage($mailchimp->error,'errors'); setEventMessage($project->error,'errors');
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment