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

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

parents 4be679a7 8ffa11fe
No related branches found
No related tags found
No related merge requests found
......@@ -32,6 +32,7 @@ Fix: Signature was not added for email sent from thirdparty page.
Fix: Action event SHIPPING_VALIDATE is not implemented
Fix: The customer code was set to uppercase when using numbering module leopard. We
must keep data safe of any change.
Fix: Loading actions extrafields fails.
***** ChangeLog for 3.5 compared to 3.4.* *****
For users:
......
......@@ -3,7 +3,7 @@
* Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2010 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
*
* This program is free software; you can redistribute it and/or modify
......@@ -863,7 +863,7 @@ if ($id > 0)
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action); // Note that $action and $object may have been modified by hook
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print $actioncomm->showOptionals($extrafields,'edit');
print $act->showOptionals($extrafields,'edit');
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment