diff --git a/ChangeLog b/ChangeLog
index 5b4f986fbb1..766efb9c02a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,9 @@ Following changes may create regression for some external modules, but were nece
exists, but if an external module need action on it, it must provides itself its trigger file.
* Use $conf->global->MULTICOMPANY_TRANSVERSE_MODE instead $conf->multicompany->transverse_mode
* Use getEntity('xxx') instead getEntity('xxx', 1) and use getEntity('xxx', 0) instead getEntity('xxx')
+* The hook formObjectOptions was not implemented correctly in previous version. Sometimes, you had to return output
+content by doing a print into function, sometimes by returning content into "resprint". This has been fixed to follow
+hook specifications so you must return output into "resprint".
***** ChangeLog for 5.0.3 compared to 5.0.2 *****
FIX: #6677 Expired contracts dashboard box does not show the name of the thirdparty
diff --git a/README-FR.md b/README-FR.md
index 1c097e7914e..4129e2b7452 100644
--- a/README-FR.md
+++ b/README-FR.md
@@ -103,25 +103,24 @@ Voir fichier ChangeLog.
### Divers:
-- Application multi-utilisateurs avec différents niveaux de permissions par module.
+- Multi-langue.
+- Multi-utilisateurs avec différents niveaux de permissions par module.
+- Multi-devise.
- Peux être multi-société par ajout du module externe multi-société.
-- Peux-être multi-devise par ajout du module externe multi-devise.
-- Plusieurs gestionnaires de menus (possibilité de différencier les menus pour les utilisateurs internes ou externes comme les clients ou fournisseurs).
-- Application simple à utiliser.
- Plusieurs thèmes visuels.
-- Code simple et facilement personnalisable.
-- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur http://wiki.dolibarr.org/index.php/Prérequis).
+- Application simple à utiliser.
+- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur https://wiki.dolibarr.org/index.php/Prérequis).
- Compatible avec toutes les offres Cloud du marché respectant les prérequis de base de données et PHP.
-- Export PDF de tous les éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
+- Code simple et facilement personnalisable (pas de framework lourd; mécanisme de hook et triggers).
+- APIs.
+- Génération PDF et ODT des éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
## CE QUE DOLIBARR NE PEUT PAS FAIRE (TACHES A FAIRE)
Voici un liste de fonctionnalites pas encore gérées par Dolibarr:
-- Pas encore de compta analytique double-partie (uniquement gestion de trésorerie).
-- Dolibarr ne gère qu'une seule monnaie à la fois (mono-devise).
- Dolibarr ne contient pas de module de Gestion de la paie.
-- Les tâches du module de gestion de projets n'ont pas de dépendance entre elle.
+- Les tâches du module de gestion de projets n'ont pas de dépendances entre elle.
- Dolibarr ne contient pas de Webmail.
- Dolibarr ne fait pas le café (pas encore).
diff --git a/README.md b/README.md
index eda6b8b642e..29a7d4f9545 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
## FEATURES
-### Main modules (all optional)
+### Main application/modules (all optional)
- Customers, Prospects and/or Suppliers directory
- Products and/or Services catalog
@@ -107,7 +107,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
- Point of Sale
- …
-### Other modules
+### Other application/modules
- Bookmarks management
- Donations management
@@ -124,33 +124,35 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
- …
### Other general features
-- Multi-Users and groups with finely grained rights
-- Localization in most major languages
-- Can manage several companies by adding external module multi-company.
-- Can manage several currencies by adding external module multi-currency.
-- Very user friendly and easy to use
+
+- Localization in most major languages.
+- Multi-Users and groups with finely grained rights.
+- Multi-currency.
+- Multi-company by adding of an external module.
+- Very user friendly and easy to use.
- Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
-- Works with PHP 5.3+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](http://wiki.dolibarr.org/index.php/Prerequisite))
+- Works with PHP 5.3+ and MariaDB 5.0.3+, MySQL 5.0.3+ or PostgreSQL 8.1.4+ (See requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite))
- Compatible with all Cloud solutions that match MySQL, PHP or PostgreSQL prerequisites.
-- An easy to understand, maintain and code interfaces with your own information system (PHP with no heavy framework; trigger and hook architecture)
+- APIs.
+- An easy to understand, maintain and develop code (PHP with no heavy framework; trigger and hook architecture)
- Support for country specific features:
- Spanish Tax RE and ISPF
- French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM)
- Canadian double taxes (federal/province) and other countries using cumulative VAT
- Tunisian tax stamp
+ - Argentina invoice numbering using A,B,C...
- Compatible with [European directives](http://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
- PDF or ODT generation for invoice, proposals, orders...
- …
### Extending
-Dolibarr can be extended with a lot of other external modules from third party developers available at the [DoliStore](https://www.dolistore.com).
+Dolibarr can be extended with a lot of other external application or modules from third party developers available at the [DoliStore](https://www.dolistore.com).
## FUTURE
These are features that Dolibarr does **not** yet fully support:
-- Double-entry bookkeeping yet (only bank and treasury management)
- Tasks dependencies in projects
- Payroll module
- Webmail
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 147040fbf67..78969a8df14 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -943,6 +943,7 @@ else
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print $object->showOptionals($extrafields,'edit');
@@ -1185,6 +1186,7 @@ else
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print $object->showOptionals($extrafields,'edit',$parameters);
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 50c464596fd..f54c89ffeba 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -278,6 +278,7 @@ if ($action == 'create')
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print $object->showOptionals($extrafields,'edit');
@@ -668,6 +669,7 @@ if ($rowid > 0)
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index ed497cbbb7f..55bf400ea3a 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -268,7 +268,8 @@ if ($user->rights->categorie->creer)
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
- if (empty($reshook))
+ print $hookmanager->resPrint;
+ if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print $object->showOptionals($extrafields,'edit');
}
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index c2f93c17ccd..59bee88b75b 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -175,6 +175,7 @@ print '';
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 1bb35fe7fe8..60486ac6f01 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -833,7 +833,8 @@ if ($action == 'create')
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
- if (empty($reshook) && ! empty($extrafields->attribute_label))
+ print $hookmanager->resPrint;
+ if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print $object->showOptionals($extrafields,'edit');
}
@@ -1164,7 +1165,8 @@ if ($id > 0)
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
- if (empty($reshook) && ! empty($extrafields->attribute_label))
+ print $hookmanager->resPrint;
+ if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print $object->showOptionals($extrafields,'edit');
}
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index 832cefa5774..81c29f687ce 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -777,8 +777,9 @@ if ($object->fetch($id) >= 0) {
if (! empty($advTarget->id)) {
$parameters = array('array_query' => $advTarget->filtervalue);
}
- // Module extrafield feature
+ // Other attributes
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $std_soc, $action_search);
+ print $hookmanager->resPrint;
}
// State Contact
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 353117f5fa3..17d4d066569 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -718,6 +718,7 @@ if ($action == 'create')
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print $object->showOptionals($extrafields,'edit');
@@ -1153,6 +1154,7 @@ else
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index d58f2223adb..3e8580d5350 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1527,6 +1527,7 @@ if ($action == 'create')
// Other attributes
$parameters = array();
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label)) {
print $object->showOptionals($extrafields, 'edit');
}
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index eeea825c1e5..e2db47a6c9d 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1609,6 +1609,7 @@ if ($action == 'create' && $user->rights->commande->creer)
// Other attributes
$parameters = array('objectsrc' => $objectsrc, 'socid'=>$socid);
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label)) {
print $object->showOptionals($extrafields, 'edit');
}
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index e76adb2a67c..fa9f810b036 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -471,6 +471,7 @@ if ($action == 'create' && !$error)
// Other attributes
$parameters=array('objectsrc' => $objectsrc, 'idsrc' => $listoforders);
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
$object=new Facture($db);
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 7267769379e..06918ff2846 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -409,6 +409,7 @@ if ($action == 'create')
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print $object->showOptionals($extrafields,'edit',$parameters);
@@ -946,6 +947,7 @@ else
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 9444c0585f7..e19deca91c9 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -284,6 +284,7 @@ if ($action == 'create')
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
print '';
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 555ea52b4e0..979ef5960e0 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -300,6 +300,7 @@ if ($action == 'create')
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
print '';
@@ -396,6 +397,7 @@ else if ($id)
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
print '';
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index a3981cac27c..3f9c7b9319b 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2594,6 +2594,7 @@ if ($action == 'create')
// Other attributes
$parameters = array('objectsrc' => $objectsrc,'colspan' => ' colspan="2"', 'cols'=>2);
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label)) {
print $object->showOptionals($extrafields, 'edit');
}
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index bd1f83d7f43..317d3ae813d 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -202,6 +202,7 @@ if ($action == 'create')
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
print '';
@@ -271,6 +272,7 @@ if ($id)
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$vatpayment,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
print '';
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 20079ad18ee..45bde4bcd32 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -302,6 +302,7 @@ if ($action == 'create')
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
print '';
@@ -389,6 +390,7 @@ if ($id)
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
print '';
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index ea26d2c55a8..6f7e250f4f5 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -284,6 +284,7 @@ if ($action == 'create')
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
print '';
@@ -351,6 +352,7 @@ if ($id)
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
print '';
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index ae13bb44a3a..fbd27b0d841 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -666,6 +666,7 @@ else
// Other attributes
$parameters=array('colspan' => ' colspan="3"','cols'=>3);
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print $object->showOptionals($extrafields,'edit');
@@ -934,6 +935,7 @@ else
// Other attributes
$parameters=array('colspan' => ' colspan="3"', 'cols'=>3);
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 4e19d6109b8..58b1608f44b 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1211,6 +1211,7 @@ if ($action == 'create')
// Other attributes
$parameters=array('objectsrc' => $objectsrc,'colspan' => ' colspan="3"', 'cols'=>3);
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
// Other attributes
if (empty($reshook) && ! empty($extrafields->attribute_label)) {
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index 9c9813e18ca..0f1d581c99f 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -34,6 +34,7 @@ if (! empty($cols)) $parameters['cols'] = $cols;
if (! empty($object->fk_soc)) $parameters['socid'] = $object->fk_soc;
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
+print $hookmanager->resPrint;
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
if (empty($reshook) && ! empty($extrafields->attributes[$object->table_element]['label']))
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 07b0cc43bcd..6425cebb2c9 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -373,6 +373,7 @@ if ($action == 'create')
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print $object->showOptionals($extrafields,'edit',$parameters);
@@ -498,6 +499,7 @@ if (! empty($id) && $action == 'edit')
// Other attributes
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index e3a1b0bc3fa..72044d68fcf 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -774,6 +774,7 @@ if ($action == 'create')
// Other attributes
$parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'socid'=>$socid);
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$expe,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label)) {
print $expe->showOptionals($extrafields, 'edit');
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index bbe7a3651e9..d2244856399 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1376,7 +1376,7 @@ if ($action == 'create')
// Other attributes
$parameters = array('colspan' => ' colspan="3"');
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by
- // hook
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label)) {
print $object->showOptionals($extrafields, 'edit');
}
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 9e463eb8ac4..c084806c4a6 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -581,7 +581,7 @@ if (empty($reshook))
setEventMessages($object->error, $object->errors, 'errors');
}
}
-
+
/*
* Mise a jour d'une ligne d'intervention
*/
@@ -997,7 +997,8 @@ if ($action == 'create')
// Other attributes
$parameters=array('colspan' => ' colspan="2"');
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
- if (empty($reshook) && ! empty($extrafields->attribute_label))
+ print $hookmanager->resPrint;
+ if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print $object->showOptionals($extrafields,'edit');
}
@@ -1147,11 +1148,11 @@ else if ($id > 0 || ! empty($ref))
// Print form confirm
print $formconfirm;
-
+
// Intervention card
$linkback = ''.$langs->trans("BackToList").'';
-
-
+
+
$morehtmlref='
';
@@ -1698,7 +1699,7 @@ else if ($id > 0 || ! empty($ref))
// Show links to link elements
$linktoelem = $form->showLinkToObjectBlock($object, null, array('fichinter'));
$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-
+
print '
';
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 2137e7ca747..dda4a0d7254 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1572,6 +1572,7 @@ if ($action=='create')
// Other options
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
index a503776b653..86c177c4313 100644
--- a/htdocs/fourn/commande/orderstoinvoice.php
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -370,6 +370,7 @@ if ($action == 'create' && !$error) {
'cols'=>2
);
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 54bc2e98e00..b915af93199 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -1824,6 +1824,7 @@ if ($action == 'create')
// Other options
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
// Bouton "Create Draft"
print "
\n";
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index d42dc87b4b9..dc75ee54bb5 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1047,6 +1047,7 @@ else
// Other attributes
$parameters=array('cols' => 3);
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print $object->showOptionals($extrafields,'edit',$parameters);
@@ -1366,6 +1367,7 @@ else
// Other attributes
$parameters=array('colspan' => ' colspan="3"', 'cols'=>3);
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
print $object->showOptionals($extrafields,'edit');
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 2b76fb0a111..a7c7b4f22be 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -193,6 +193,7 @@ if ($object->id)
$parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
// Construit liste des fichiers
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 84532ad219e..46db7f69b91 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -98,7 +98,7 @@ if (empty($reshook))
if ($id)
{
$result=$object->fetch($id);
- $object->cost_price = price2num($cost_price);
+ $object->cost_price = price2num($cost_price);
$result=$object->update($object->id, $user);
if ($result > 0)
{
@@ -112,7 +112,7 @@ if (empty($reshook))
}
}
}
-
+
if ($action == 'confirm_remove_pf')
{
if ($rowid) // id of product supplier price to remove
@@ -299,21 +299,21 @@ if ($id > 0 || $ref)
$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $id . '&rowid=' . $rowid, $langs->trans('DeleteProductBuyPrice'), $langs->trans('ConfirmDeleteProductBuyPrice'), 'confirm_remove_pf', '', 0, 1);
echo $formconfirm;
}
-
+
if ($action <> 'edit' && $action <> 're-edit')
{
$head=product_prepare_head($object);
$titre=$langs->trans("CardProduct".$object->type);
$picto=($object->type== Product::TYPE_SERVICE?'service':'product');
-
+
dol_fiche_head($head, 'suppliers', $titre, -1, $picto);
-
+
$linkback = ''.$langs->trans("BackToList").'';
- $object->next_prev_filter=" fk_product_type = ".$object->type;
+ $object->next_prev_filter=" fk_product_type = ".$object->type;
dol_banner_tab($object, 'ref', $linkback, ($user->societe_id?0:1), 'ref');
-
+
print '