';
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index 7970911d84d..d8f96ce7f6e 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -313,7 +313,7 @@ if (($id || $ref) && $action == 'edit')
print dol_get_fiche_end();
- print '
';
+ print '
';
diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index bcb00aed5a2..89c4d98729f 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -135,7 +135,7 @@ print '';
$coldisplay += $colspan;
print '
';
$coldisplay += $colspan;
-print ' ';
diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index 5f7687a3d26..f67f32fb599 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -299,7 +299,7 @@ if ($id > 0 && !preg_match('/^add/i', $action))
if ($action == 'edit')
{
- print '
';
+ print '
';
print '';
}
diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php
index 93d287ac501..5f0e9baddf5 100644
--- a/htdocs/cashdesk/admin/cashdesk.php
+++ b/htdocs/cashdesk/admin/cashdesk.php
@@ -184,7 +184,7 @@ if (!empty($conf->receiptprinter->enabled))
print '';
print '
';
-print '
';
+print '
';
print "\n";
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index 660dbf9317d..cef04e7915e 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -285,7 +285,7 @@ if ($action == 'edit')
print '
';
print '
';
- print '
';
@@ -346,7 +346,7 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
print '';
print '
';
- print '
';
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 6d51a16ddc2..c11f49d43ad 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1773,7 +1773,7 @@ if ($id > 0)
print dol_get_fiche_end();
print '
';
- print '
';
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 8697d9dffb2..97e072fcdd6 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -1292,7 +1292,7 @@ if ($action == 'create')
print dol_get_fiche_end();
print '
';
- print '
';
diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php
index bd4c16f89ca..c8a674773a2 100644
--- a/htdocs/comm/multiprix.php
+++ b/htdocs/comm/multiprix.php
@@ -107,7 +107,7 @@ if ($_socid > 0)
print dol_get_fiche_end();
- print '
';
+ print '
';
print "";
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 71ff0ef147a..0828971eaa5 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -59,10 +59,10 @@ $search_datecloture_start = GETPOST('search_datecloture_start', 'int');
if (empty($search_datecloture_start)) $search_datecloture_start = dol_mktime(0, 0, 0, GETPOST('search_datecloture_startmonth', 'int'), GETPOST('search_datecloture_startday', 'int'), GETPOST('search_datecloture_startyear', 'int'));
$search_datecloture_end = GETPOST('search_datecloture_end', 'int');
if (empty($search_datecloture_end)) $search_datecloture_end = dol_mktime(23, 59, 59, GETPOST('search_datecloture_endmonth', 'int'), GETPOST('search_datecloture_endday', 'int'), GETPOST('search_datecloture_endyear', 'int'));
-$search_dateorder_start = dol_mktime(0, 0, 0, GETPOST('search_dateorder_startmonth', 'int'), GETPOST('search_dateorder_startday', 'int'), GETPOST('search_dateorder_startyear', 'int'));
-$search_dateorder_end = dol_mktime(23, 59, 59, GETPOST('search_dateorder_endmonth', 'int'), GETPOST('search_dateorder_endday', 'int'), GETPOST('search_dateorder_endyear', 'int'));
-$search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_startmonth', 'int'), GETPOST('search_datedelivery_startday', 'int'), GETPOST('search_datedelivery_startyear', 'int'));
-$search_datedelivery_end = dol_mktime(23, 59, 59, GETPOST('search_datedelivery_endmonth', 'int'), GETPOST('search_datedelivery_endday', 'int'), GETPOST('search_datedelivery_endyear', 'int'));
+$search_dateorder_start = dol_mktime(0, 0, 0, GETPOST('search_dateorder_start_month', 'int'), GETPOST('search_dateorder_start_day', 'int'), GETPOST('search_dateorder_start_year', 'int'));
+$search_dateorder_end = dol_mktime(23, 59, 59, GETPOST('search_dateorder_end_month', 'int'), GETPOST('search_dateorder_end_day', 'int'), GETPOST('search_dateorder_end_year', 'int'));
+$search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_start_month', 'int'), GETPOST('search_datedelivery_start_day', 'int'), GETPOST('search_datedelivery_start_year', 'int'));
+$search_datedelivery_end = dol_mktime(23, 59, 59, GETPOST('search_datedelivery_end_month', 'int'), GETPOST('search_datedelivery_end_day', 'int'), GETPOST('search_datedelivery_end_year', 'int'));
$search_product_category = GETPOST('search_product_category', 'int');
$search_ref = GETPOST('search_ref', 'alpha') != '' ?GETPOST('search_ref', 'alpha') : GETPOST('sref', 'alpha');
$search_ref_customer = GETPOST('search_ref_customer', 'alpha');
@@ -448,10 +448,10 @@ if ($resql)
if ($search_status != '') $param .= '&search_status='.urlencode($search_status);
if ($search_datecloture_start) $param .= '&search_datecloture_start='.urlencode($search_datecloture_start);
if ($search_datecloture_end) $param .= '&search_datecloture_end='.urlencode($search_datecloture_end);
- if ($search_dateorder_start) $param .= '&search_dateorder_start='.urlencode($search_dateorder_start);
- if ($search_dateorder_end) $param .= '&search_dateorder_end='.urlencode($search_dateorder_end);
- if ($search_datedelivery_start) $param .= '&search_datedelivery_start='.urlencode($search_datedelivery_start);
- if ($search_datedelivery_end) $param .= '&search_datedelivery_end='.urlencode($search_datedelivery_end);
+ if ($search_dateorder_start) $param .= '&search_dateorder_start_day=' . dol_print_date($search_dateorder_start, '%d') . '&search_dateorder_start_month=' . dol_print_date($search_dateorder_start, '%m') . '&search_dateorder_start_year=' . dol_print_date($search_dateorder_start, '%Y');
+ if ($search_dateorder_end) $param .= '&search_dateorder_end_day=' . dol_print_date($search_dateorder_end, '%d') . '&search_dateorder_end_month=' . dol_print_date($search_dateorder_end, '%m') . '&search_dateorder_end_year=' . dol_print_date($search_dateorder_end, '%Y');
+ if ($search_datedelivery_start) $param .= '&search_datedelivery_start_day=' . dol_print_date($search_datedelivery_start, '%d') . '&search_datedelivery_start_month=' . dol_print_date($search_datedelivery_start, '%m') . '&search_datedelivery_start_year=' . dol_print_date($search_datedelivery_start, '%Y');
+ if ($search_datedelivery_end) $param .= '&search_datedelivery_end_day=' . dol_print_date($search_datedelivery_end, '%d') . '&search_datedelivery_end_month=' . dol_print_date($search_datedelivery_end, '%m') . '&search_datedelivery_end_year=' . dol_print_date($search_datedelivery_end, '%Y');
if ($search_ref) $param .= '&search_ref='.urlencode($search_ref);
if ($search_company) $param .= '&search_company='.urlencode($search_company);
if ($search_ref_customer) $param .= '&search_ref_customer='.urlencode($search_ref_customer);
@@ -708,10 +708,10 @@ if ($resql)
{
print '
';
print '';
- print $form->selectDate($search_dateorder_start ? $search_dateorder_start : -1, 'search_dateorder_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+ print $form->selectDate($search_dateorder_start ? $search_dateorder_start : -1, 'search_dateorder_start_', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
print '
';
print '';
- print $form->selectDate($search_dateorder_end ? $search_dateorder_end : -1, 'search_dateorder_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+ print $form->selectDate($search_dateorder_end ? $search_dateorder_end : -1, 'search_dateorder_end_', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
print '
';
print ' ';
}
@@ -719,10 +719,10 @@ if ($resql)
{
print '
';
print '';
- print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+ print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start_', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
print '
';
print '';
- print $form->selectDate($search_datedelivery_end ? $search_datedelivery_end : -1, 'search_datedelivery_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+ print $form->selectDate($search_datedelivery_end ? $search_datedelivery_end : -1, 'search_datedelivery_end_', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
print '
';
print ' ';
}
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index c1b5b1a06b0..62d94dd4aa6 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -463,7 +463,7 @@ if ($action == 'create')
print dol_get_fiche_end();
print '
';
- print '
';
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index 546805e3aaa..c396765f07a 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -568,7 +568,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
// Save
print '
';
print ' ';
print '';
@@ -854,7 +854,7 @@ if (empty($action) || $action == "view" || $action == "close")
// Save
print '
';
print ' ';
print '';
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 00b5c3dc025..29c22be11a2 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -278,7 +278,7 @@ if ($action == 'create')
print '';
print '
';
- print '
';
@@ -374,7 +374,7 @@ if ($action == 'create')
print '';
print '
';
- print '
';
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 078625ca1a1..8c0b388b456 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -201,7 +201,7 @@ if ($action == 'create')
print dol_get_fiche_end();
print '
';
- print '
';
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index a4c27855a30..49189ce2067 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -681,7 +681,7 @@ if ($id > 0)
if ($action == 'edit')
{
print '
';
- print '
';
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 52543e9953d..ee96d32af1e 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -296,7 +296,7 @@ if ($action == 'create')
print dol_get_fiche_end();
print '
';
- print '
';
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
index eba58a52f02..4823b801f26 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
@@ -152,7 +152,7 @@ if (!empty($this->control->tpl['contact_element'])) {
-
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index ad646af15b0..7a649ca2596 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1239,7 +1239,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
print dol_get_fiche_end();
print '
';
- print '
';
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index d8d7b709736..579edd9adfc 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -207,7 +207,7 @@ if ($action == 'edit')
print dol_get_fiche_end();
print '
';
- print '
';
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 380b7a1ad17..f7a24c56c8e 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1362,7 +1362,7 @@ class FormFile
} else {
print '
';
print ' ';
if (empty($disablemove)) print '
';
diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index 0e3f04fa0f5..9c03475453f 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -85,10 +85,19 @@ function dol_quoted_printable_encode($input, $line_max = 76)
*/
class vCard
{
+ /**
+ * @var array array of properties
+ */
public $properties;
+
+ /**
+ * @var string filename
+ */
public $filename;
- //var $encoding="UTF-8";
+ /**
+ * @var string encoding
+ */
public $encoding = "ISO-8859-1;ENCODING=QUOTED-PRINTABLE";
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 367faa630ba..a4533681b16 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -213,7 +213,7 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php
Contact:con
-
">
+
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 5c1680d9ecb..364ebbf45d8 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -302,7 +302,7 @@ if (in_array($type, array_keys($typewecanchangeinto)))
-
">
+
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index b7f0b8d5da1..fc6ef24bd59 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -255,7 +255,7 @@ $coldisplay++;
-
diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php
index b0431f40dee..ea4209ae91d 100644
--- a/htdocs/cron/admin/cron.php
+++ b/htdocs/cron/admin/cron.php
@@ -110,7 +110,7 @@ print '';
print dol_get_fiche_end();
print '
';
-print '
';
print '';
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index a67b7633044..2e6281cbcf4 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -515,7 +515,7 @@ if (($action == "create") || ($action == "edit"))
print dol_get_fiche_end();
print '
';
- print '
";
diff --git a/htdocs/datapolicy/admin/setup.php b/htdocs/datapolicy/admin/setup.php
index 0e84aa63723..d50f544449d 100644
--- a/htdocs/datapolicy/admin/setup.php
+++ b/htdocs/datapolicy/admin/setup.php
@@ -135,7 +135,7 @@ if ($action == 'edit')
print '';
print '
';
- print '
';
print '';
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index cec185e757e..b5c58001d09 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -141,28 +141,27 @@ if ($action == 'update')
{
$object->fetch($id);
- $object->firstname = GETPOST("firstname", 'alpha');
- $object->lastname = GETPOST("lastname", 'alpha');
- $object->societe = GETPOST("societe", 'alpha');
- $object->address = GETPOST("address", 'alpha');
+ $object->firstname = (string) GETPOST("firstname", 'alpha');
+ $object->lastname = (string) GETPOST("lastname", 'alpha');
+ $object->societe = (string) GETPOST("societe", 'alpha');
+ $object->address = (string) GETPOST("address", 'alpha');
$object->amount = price2num(GETPOST("amount", 'alpha'));
- $object->town = GETPOST("town", 'alpha');
- $object->zip = GETPOST("zipcode", 'alpha');
- $object->country_id = GETPOST('country_id', 'int');
- $object->email = GETPOST("email", 'alpha');
+ $object->town = (string) GETPOST("town", 'alpha');
+ $object->zip = (string) GETPOST("zipcode", 'alpha');
+ $object->country_id = (int) GETPOST('country_id', 'int');
+ $object->email = (string) GETPOST("email", 'alpha');
$object->date = $donation_date;
- $object->public = GETPOST("public", 'alpha');
+ $object->public = (string) GETPOST("public", 'alpha');
$object->fk_project = GETPOST("fk_project", 'alpha');
- $object->note_private = GETPOST("note_private", 'restricthtml');
- $object->note_public = GETPOST("note_public", 'restricthtml');
- $object->modepaymentid = GETPOST('modepayment', 'int');
+ $object->note_private = (string) GETPOST("note_private", 'restricthtml');
+ $object->note_public = (string) GETPOST("note_public", 'restricthtml');
+ $object->modepaymentid = (int) GETPOST('modepayment', 'int');
// Fill array 'array_options' with data from add form
$ret = $extrafields->setOptionalsFromPost(null, $object);
if ($ret < 0) $error++;
- if ($object->update($user) > 0)
- {
+ if ($object->update($user) > 0) {
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
}
@@ -195,30 +194,29 @@ if ($action == 'add')
if (!$error)
{
- $object->socid = GETPOST("socid", 'int');
- $object->firstname = GETPOST("firstname", 'alpha');
- $object->lastname = GETPOST("lastname", 'alpha');
- $object->societe = GETPOST("societe", 'alpha');
- $object->address = GETPOST("address", 'alpha');
+ $object->socid = (int) GETPOST("socid", 'int');
+ $object->firstname = (string) GETPOST("firstname", 'alpha');
+ $object->lastname = (string) GETPOST("lastname", 'alpha');
+ $object->societe = (string) GETPOST("societe", 'alpha');
+ $object->address = (string) GETPOST("address", 'alpha');
$object->amount = price2num(GETPOST("amount", 'alpha'));
- $object->zip = GETPOST("zipcode", 'alpha');
- $object->town = GETPOST("town", 'alpha');
- $object->country_id = GETPOST('country_id', 'int');
- $object->email = GETPOST('email', 'alpha');
+ $object->zip = (string) GETPOST("zipcode", 'alpha');
+ $object->town = (string) GETPOST("town", 'alpha');
+ $object->country_id = (int) GETPOST('country_id', 'int');
+ $object->email = (string) GETPOST('email', 'alpha');
$object->date = $donation_date;
- $object->note_private = GETPOST("note_private", 'restricthtml');
- $object->note_public = GETPOST("note_public", 'restricthtml');
- $object->public = GETPOST("public", 'alpha');
- $object->fk_project = GETPOST("fk_project", 'alpha');
- $object->modepaymentid = GETPOST('modepayment', 'int');
+ $object->note_private = (string) GETPOST("note_private", 'restricthtml');
+ $object->note_public = (string) GETPOST("note_public", 'restricthtml');
+ $object->public = (string) GETPOST("public", 'alpha');
+ $object->fk_project = (string) GETPOST("fk_project", 'alpha');
+ $object->modepaymentid = (int) GETPOST('modepayment', 'int');
// Fill array 'array_options' with data from add form
$ret = $extrafields->setOptionalsFromPost(null, $object);
if ($ret < 0) $error++;
$res = $object->create($user);
- if ($res > 0)
- {
+ if ($res > 0) {
header("Location: ".$_SERVER['PHP_SELF'].'?id='.$res);
exit;
} else {
@@ -230,8 +228,7 @@ if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights-
{
$object->fetch($id);
$result = $object->delete($user);
- if ($result > 0)
- {
+ if ($result > 0) {
header("Location: index.php");
exit;
} else {
@@ -494,7 +491,7 @@ if ($action == 'create')
print dol_get_fiche_end();
print '
';
- print '
';
@@ -546,8 +543,7 @@ if (!empty($id) && $action == 'edit')
print '';
// Amount
- if ($object->statut == 0)
- {
+ if ($object->statut == 0) {
print "
".''.$langs->trans("Amount").' ';
} else {
print '
'.$langs->trans("Amount").' ';
@@ -624,7 +620,7 @@ if (!empty($id) && $action == 'edit')
print dol_get_fiche_end();
- print '
';
+ print '
';
print "\n";
}
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index 7cb21033b2d..0046a658707 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -299,7 +299,7 @@ if ($action == 'create')
print "";
print '';
- print '
';
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index 8c1c0162692..078eee7699c 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -436,7 +436,7 @@ print '';
if ($action == 'edit')
{
print '';
- print '
';
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index cecc62e3fde..7e2df52ed62 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -393,7 +393,7 @@ print dol_get_fiche_end();
if ($action == 'edit')
{
print '';
- print '
';
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 2cef2c39320..af1c06d8214 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -2360,7 +2360,7 @@ if ($action == 'create')
if ($action == 'editline' && $lines[$i]->id == $line_id)
{
print ' ';
- print ' ';
} elseif ($object->statut == Expedition::STATUS_DRAFT)
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index a36e3fa5ed2..440fc4524a6 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -366,7 +366,7 @@ if ($resql)
print '';
} else {
print '';
- print '
';
- print '
';
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 2889e383817..d352aec5005 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -1054,7 +1054,7 @@ if ($step == 4 && $datatoexport)
print '';
print '';
- print ' ';
// List of existing export profils
diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php
index cb73403356b..66c6d265dec 100644
--- a/htdocs/externalsite/admin/externalsite.php
+++ b/htdocs/externalsite/admin/externalsite.php
@@ -113,7 +113,7 @@ print "";
print '
';
-print '
';
print "\n";
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 51cc56b408d..fa5259a4f8e 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1478,7 +1478,7 @@ if ($action == 'create')
print '';
print '
';
- print ' ';
print ''."\n";
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index abd1f3baab9..60d87cc7759 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -559,7 +559,7 @@ class ProductFournisseur extends Product
$this->fourn_multicurrency_code = $obj->multicurrency_code;
if ($conf->barcode->enabled) {
$this->fourn_barcode = $obj->barcode; // deprecated
- $this->fourn_fk_barcode_type = $obj->barcode; // deprecated
+ $this->fourn_fk_barcode_type = $obj->fk_barcode_type; // deprecated
$this->supplier_barcode = $obj->barcode;
$this->supplier_fk_barcode_type = $obj->fk_barcode_type;
}
@@ -674,8 +674,8 @@ class ProductFournisseur extends Product
}
if ($conf->barcode->enabled) {
- $prodfourn->barcode = $record["barcode"];
- $prodfourn->fk_barcode_type = $record["fk_barcode_type"];
+ $prodfourn->supplier_barcode = $record["barcode"];
+ $prodfourn->supplier_fk_barcode_type = $record["fk_barcode_type"];
}
if (!empty($conf->dynamicprices->enabled) && !empty($prodfourn->fk_supplier_price_expression)) {
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index a924ca03270..2b79a234a69 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -1306,7 +1306,7 @@ if ($id > 0 || !empty($ref)) {
}
else {
print '
';
- print ' ';
print '
';
print ' ';
@@ -1444,7 +1444,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
print '
';
if ($cancreate && $object->statut == Holiday::STATUS_DRAFT)
{
- print '
';
}
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index 20d61334579..9f62fe96c70 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -244,7 +244,7 @@ if ($action == 'create')
print dol_get_fiche_end();
print '
';
- print '
';
@@ -327,7 +327,7 @@ if (($id || $ref) && $action == 'edit')
print dol_get_fiche_end();
print '
';
- print '
';
diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php
index 25099a9bd54..181cfac0cf6 100644
--- a/htdocs/intracommreport/card.php
+++ b/htdocs/intracommreport/card.php
@@ -159,7 +159,7 @@ if ($action == 'create')
print dol_get_fiche_end();
- print '
';
+ print '
';
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 789c26140f9..d8e2e3471df 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -721,7 +721,7 @@ if ($id > 0)
if ($action == 'edit')
{
print '
';
- print '
';
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 2638d336eb0..753e58d7ae5 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -395,7 +395,7 @@ if ($action == 'create')
print '';
print '
';
- print '
';
diff --git a/htdocs/modulebuilder/admin/setup.php b/htdocs/modulebuilder/admin/setup.php
index 220ecd1b5b1..c5b41ac9390 100644
--- a/htdocs/modulebuilder/admin/setup.php
+++ b/htdocs/modulebuilder/admin/setup.php
@@ -191,7 +191,7 @@ print '';
print '';
-print '
';
+print '
';
if (GETPOST('withtab', 'alpha')) {
print dol_get_fiche_end();
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 051a2d1a42d..61f97ff6e2a 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -2013,7 +2013,7 @@ if ($module == 'initmodule')
print dol_get_fiche_end();
print '
';
- print ' ';
@@ -2078,7 +2078,7 @@ if ($module == 'initmodule')
print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'text'));
print '
';
print '
';
- print ' ';
@@ -2211,7 +2211,7 @@ if ($module == 'initmodule')
print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
print '
';
print '
';
- print ' ';
@@ -2758,7 +2758,7 @@ if ($module == 'initmodule')
print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
print '
';
print '
';
- print ' ';
@@ -2802,7 +2802,7 @@ if ($module == 'initmodule')
print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
print '
';
print '
';
- print ' ';
@@ -2941,7 +2941,7 @@ if ($module == 'initmodule')
print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
print '
';
print '
';
- print ' ';
@@ -3037,7 +3037,7 @@ if ($module == 'initmodule')
print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
print '
';
print '
';
- print ' ';
@@ -3094,7 +3094,7 @@ if ($module == 'initmodule')
print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
print '
';
print '
';
- print ' ';
@@ -3162,7 +3162,7 @@ if ($module == 'initmodule')
print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
print '
';
print '
';
- print ' ';
@@ -3210,7 +3210,7 @@ if ($module == 'initmodule')
print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
print '
';
print '
';
- print ' ';
@@ -3258,7 +3258,7 @@ if ($module == 'initmodule')
print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
print '
';
print '
';
- print ' ';
@@ -3313,7 +3313,7 @@ if ($module == 'initmodule')
print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
print '
';
print '
';
- print ' ';
@@ -3395,7 +3395,7 @@ if ($module == 'initmodule')
print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
print '
';
print '
';
- print ' ';
@@ -3512,7 +3512,7 @@ if ($module == 'initmodule')
print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
print '
';
print '
';
- print ' ';
@@ -3572,7 +3572,7 @@ if ($module == 'initmodule')
print $doleditor->Create(1, '', false, $langs->trans("File").' : '.$file, (GETPOST('format', 'aZ09') ?GETPOST('format', 'aZ09') : 'html'));
print '
';
print '
';
- print ' ';
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index ef64d46f502..74e965740d2 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -218,7 +218,7 @@ if ($action == 'edit')
print '';
print '
';
- print '
';
print '';
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 83d84451d0e..de76d482be2 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -271,7 +271,7 @@ if (($id || $ref) && $action == 'edit')
print dol_get_fiche_end();
- print '
';
+ print '
';
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index ea0dd4c2181..4db2db6c9c1 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -339,7 +339,7 @@ if (($id || $ref) && $action == 'edit')
print dol_get_fiche_end();
- print '
';
+ print '
';
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 15c52a52539..757713e67c3 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -335,7 +335,7 @@ print dol_get_fiche_end();
if ($action == 'edit')
{
print '
';
- print '
';
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index dbc38b7b197..f4f316122fb 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -349,7 +349,7 @@ while ($i < min($num, $limit))
$obj = $db->fetch_object($resql);
if (empty($obj)) break; // Should not happen
- $sql2 = 'select COUNT(*) as nb from '.MAIN_DB_PREFIX."opensurvey_user_studs where id_sondage='".$db->escape($obj->id_sondage)."'";
+ $sql2 = 'select COUNT(*) as nb from '.MAIN_DB_PREFIX."opensurvey_user_studs where id_sondage='".$db->escape($obj->rowid)."'";
$resql2 = $db->query($sql2);
if ($resql2)
{
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index 2592be1fc9c..be3c747a02f 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -913,7 +913,7 @@ while ($compteur < $num)
{
print '
';
print ' '."\n";
}
}
diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
index bdd86169466..d54ca3e6d3c 100644
--- a/htdocs/product/admin/dynamic_prices.php
+++ b/htdocs/product/admin/dynamic_prices.php
@@ -229,7 +229,7 @@ if ($action == 'create_variable' || $action == 'edit_variable') {
//Form Buttons
print '
';
- print '
';
print '';
@@ -351,7 +351,7 @@ if ($action == 'create_updater' || $action == 'edit_updater') {
//Form Buttons
print '
';
- print '
';
print '';
diff --git a/htdocs/product/canvas/product/tpl/card_edit.tpl.php b/htdocs/product/canvas/product/tpl/card_edit.tpl.php
index 6658ea94658..6fe8fc379d6 100644
--- a/htdocs/product/canvas/product/tpl/card_edit.tpl.php
+++ b/htdocs/product/canvas/product/tpl/card_edit.tpl.php
@@ -107,7 +107,7 @@ dol_htmloutput_errors($object->error, $object->errors);
-
">
+
diff --git a/htdocs/product/canvas/service/tpl/card_edit.tpl.php b/htdocs/product/canvas/service/tpl/card_edit.tpl.php
index aa353f55164..ed5c43dc3a7 100644
--- a/htdocs/product/canvas/service/tpl/card_edit.tpl.php
+++ b/htdocs/product/canvas/service/tpl/card_edit.tpl.php
@@ -79,7 +79,7 @@ dol_htmloutput_errors($object->error, $object->errors);
-
">
+
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 33a30a00f47..c93eea62c93 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1775,7 +1775,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
print dol_get_fiche_end();
print '
';
- print '
';
diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php
index 8aa79c3d6bf..24f4856698f 100644
--- a/htdocs/product/dynamic_price/editor.php
+++ b/htdocs/product/dynamic_price/editor.php
@@ -200,7 +200,7 @@ print dol_get_fiche_end();
//Buttons
print '
';
-print '
';
+print '
';
print '
'.$langs->trans("Back").' ';
if ($eid == 0)
{
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 5cb12b100f1..db1e19114a9 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -725,7 +725,7 @@ END;
// Option to define a transport cost on supplier price
print '
';
print ''.$langs->trans('BarcodeValue').' ';
- print ' ';
$formbarcode = new FormBarCode($db);
@@ -733,7 +733,7 @@ END;
print '
';
print ''.$langs->trans('BarcodeType').' ';
print '';
- print $formbarcode->selectBarcodeType(($rowid ? $object->fourn_fk_barcode_type : $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE), 'fk_barcode_type', 1);
+ print $formbarcode->selectBarcodeType(($rowid ? $object->supplier_fk_barcode_type : $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE), 'fk_barcode_type', 1);
print ' ';
print ' ';
}
@@ -824,7 +824,7 @@ END;
print dol_get_fiche_end();
print '
';
- print '
';
@@ -1071,16 +1071,16 @@ END;
// Barcode
if (!empty($arrayfields['pfp.barcode']['checked'])) {
print '
';
- print $productfourn->barcode;
+ print $productfourn->supplier_barcode;
print ' ';
}
// Barcode type
if (!empty($arrayfields['pfp.fk_barcode_type']['checked'])) {
print '
';
- $productfourn->barcode_type = !empty($productfourn->fk_barcode_type) ? $productfourn->fk_barcode_type : 0;
+ $productfourn->barcode_type = !empty($productfourn->supplier_fk_barcode_type) ? $productfourn->supplier_fk_barcode_type : 0;
$productfourn->fetch_barcode();
- print $productfourn->barcode_type_label ? $productfourn->barcode_type_label : ($productfourn->barcode ? ''.$langs->trans("SetDefaultBarcodeType").'
' : '');
+ print $productfourn->barcode_type_label ? $productfourn->barcode_type_label : ($productfourn->supplier_barcode ? '
'.$langs->trans("SetDefaultBarcodeType").'
' : '');
print '
';
}
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index d13e1a79801..7d1d032a77d 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -243,7 +243,7 @@ if (($id || $ref) && $action == 'edit')
print dol_get_fiche_end();
- print '
';
+ print '
';
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index dab4f6d1fa7..4e886763ed7 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -313,7 +313,7 @@ if ($object->id > 0)
print '
';
print ''.$langs->trans("InventoryDesc").'
';
@@ -528,7 +528,7 @@ if ($object->id > 0)
// Save
if ($object->status == $object::STATUS_VALIDATED) {
print '
';
- print '
';
}
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 1dac893807f..928437ce946 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1163,7 +1163,7 @@ if ($action == 'edit_vat' && ($user->rights->produit->creer || $user->rights->se
print dol_get_fiche_end();
print '
';
- print '
';
@@ -1276,7 +1276,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
print dol_get_fiche_end();
print '
';
- print '
';
@@ -1396,7 +1396,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
//print dol_get_fiche_end();
print '
';
- print '
';
print '';
@@ -1713,7 +1713,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
print $langs->trans('ForceUpdateChildPriceSoc');
print '
';
- print '
';
+ print '
';
print ' ';
print '
';
print '
';
@@ -1806,7 +1806,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
print $langs->trans('ForceUpdateChildPriceSoc');
print "
";
- print '
';
+ print '
';
print ' ';
print '
';
print '
';
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 258e90e875e..6b7b598de39 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -776,7 +776,7 @@ if ($action == 'create')
print dol_get_fiche_end();
print '
';
- print '
';
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index abe0e7f1e2b..bb306aaf9dc 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -911,7 +911,7 @@ if (!$variants) {
print '';
}
print '
'.$pdluo->qty.($pdluo->qty < 0 ? ' '.img_warning() : '').' ';
- print '
';
print '';
print '';
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index f6c316cbded..475cc413243 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -259,7 +259,7 @@ if ($action == 'edit')
print '
';
print '
';
- print '
';
@@ -331,7 +331,7 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
print dol_get_fiche_end();
print '
';
- print '
';
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index cb16f4685bf..76724dfd80f 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -756,7 +756,7 @@ print '
';
print '
'."\n";
print '
';
-print '
';
print '';
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index bbbf3827fc9..4904e2379f0 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -607,7 +607,7 @@ print '
'."\n";
print '
';
-print '
';
print ''."\n\n";
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 1f808304991..8b49aa2e0c2 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -833,7 +833,7 @@ print '
';
print '
'."\n";
print '
';
-print '
';
print ''."\n\n";
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 7329c18cdd8..81243ac735d 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1450,7 +1450,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0)
if (($action == 'editline' || $action == 'splitline') && $_GET['lineid'] == $task_time->rowid)
{
print '
';
- print '
';
+ print '
';
print '
';
print '
';
} elseif ($user->rights->projet->lire || $user->rights->projet->all->creer) // Read project and enter time consumed on assigned tasks
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index c818603f644..5ba3ce65ebd 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -551,7 +551,7 @@ while ($compteur < $num)
{
print '
';
print ' '."\n";
}
}
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 169ffd327ad..6a54be849f7 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -1902,7 +1902,7 @@ if ($action == 'create')
if ($action == 'editline' && $lines[$i]->id == $line_id)
{
print '
';
- print '';
- print '
';
print '';
diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
index 78b6130bd5e..b829f27eb82 100644
--- a/htdocs/recruitment/admin/setup_candidatures.php
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -219,7 +219,7 @@ if ($action == 'edit')
print '';
print '';
- print '
';
print '';
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index 1fbd64208f4..ab5a2b229ff 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -370,7 +370,7 @@ if (($id || $ref) && $action == 'edit')
print dol_get_fiche_end();
- print '';
+ print '
';
diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php
index 7de9883ebca..74e16c37319 100644
--- a/htdocs/recruitment/recruitmentjobposition_card.php
+++ b/htdocs/recruitment/recruitmentjobposition_card.php
@@ -281,7 +281,7 @@ if (($id || $ref) && $action == 'edit')
print dol_get_fiche_end();
- print '
';
+ print '
';
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 1e4376811a2..32c2cca810d 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -354,7 +354,7 @@ if ($action == 'create')
print dol_get_fiche_end();
print '
';
- print '
';
+ print '
';
print ' ';
print '
';
print ' ';
diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
index 0b3c951d51f..13f17feee94 100644
--- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
@@ -215,7 +215,7 @@ if (!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax'
-
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index ab5b9a4f4ef..575499e7f48 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -179,7 +179,7 @@ if ($this->control->tpl['fournisseur']) {
-
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index cf973a0f196..0f596a8764c 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2185,7 +2185,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
print dol_get_fiche_end();
print '
';
- print '
';
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index cbca9c52ebc..ca876da7a22 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -343,7 +343,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print '';
print '
';
- print '
';
@@ -422,7 +422,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print '';
print '
';
- print '
';
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 6bf8bcb0fa1..26d540e4093 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -464,7 +464,7 @@ print '';
print dol_get_fiche_end();
-print '
';
+print '
';
print '';
diff --git a/htdocs/takepos/admin/appearance.php b/htdocs/takepos/admin/appearance.php
index 25eb8486d1e..baceed47f3e 100644
--- a/htdocs/takepos/admin/appearance.php
+++ b/htdocs/takepos/admin/appearance.php
@@ -120,7 +120,7 @@ print '';
print '
';
-print '
';
+print '
';
print "\n";
diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index 481394c626f..f5f678ec900 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -65,6 +65,10 @@ if (GETPOST('action', 'alpha') == 'set')
}
}
+if ($conf->global->TAKEPOS_ORDER_NOTES == 1) {
+ $extrafields = new ExtraFields($db);
+ $extrafields->addExtraField('order_notes', 'Order notes', 'varchar', 0, 255, 'facturedet', 0, 0, '', '', 0, '', 0, 1);
+}
/*
* View
@@ -179,7 +183,7 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
print '
';
- print '
';
+ print '
';
}
if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php
index 3104f907eb2..9ec59fb388b 100644
--- a/htdocs/takepos/admin/orderprinters.php
+++ b/htdocs/takepos/admin/orderprinters.php
@@ -188,7 +188,7 @@ if ($nbofentries > 0)
print '';
}
print "";
-print '
';
+print '
';
//Printer2
print '
';
@@ -216,7 +216,7 @@ if ($nbofentries > 0)
print '';
}
print "
";
-print '
';
+print '
';
//Printer3
print '
';
@@ -245,7 +245,7 @@ if ($nbofentries > 0)
}
print "
";
-print '
';
+print '
';
print '
';
diff --git a/htdocs/takepos/admin/other.php b/htdocs/takepos/admin/other.php
index 2f8368ee957..6874665ace7 100644
--- a/htdocs/takepos/admin/other.php
+++ b/htdocs/takepos/admin/other.php
@@ -83,10 +83,6 @@ if (GETPOST('action', 'alpha') == 'set') {
$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_AFFILIATE", GETPOST('TAKEPOS_SUMUP_AFFILIATE', 'alpha'), 'chaine', 0, '', $conf->entity);
$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_APPID", GETPOST('TAKEPOS_SUMUP_APPID', 'alpha'), 'chaine', 0, '', $conf->entity);
}
- if ($conf->global->TAKEPOS_ORDER_NOTES == 1) {
- $extrafields = new ExtraFields($db);
- $extrafields->addExtraField('order_notes', 'Order notes', 'varchar', 0, 255, 'facturedet', 0, 0, '', '', 0, '', 0, 1);
- }
dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 00086bef5ca..30a9d45ad5a 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -246,7 +246,7 @@ print '
';
print '
';
-print '
';
+print '
';
print "\n";
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 804a189de00..fd5f5a1cbc2 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -82,11 +82,6 @@ if ($action == 'set')
$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_AFFILIATE", GETPOST('TAKEPOS_SUMUP_AFFILIATE', 'alpha'), 'chaine', 0, '', $conf->entity);
$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_APPID", GETPOST('TAKEPOS_SUMUP_APPID', 'alpha'), 'chaine', 0, '', $conf->entity);
}
- if ($conf->global->TAKEPOS_ORDER_NOTES == 1)
- {
- $extrafields = new ExtraFields($db);
- $extrafields->addExtraField('order_notes', 'Order notes', 'varchar', 0, 255, 'facturedet', 0, 0, '', '', 0, '', 0, 1);
- }
dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
@@ -460,7 +455,7 @@ if ($conf->global->TAKEPOS_ENABLE_SUMUP) {
print '
';
-print '
';
+print '
';
print "\n";
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index 870feb71778..d8ad03a057c 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -393,7 +393,7 @@ if ($atleastonefound == 0 && !empty($conf->banque->enabled))
print '
';
-print '
';
+print '
';
print "\n";
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index b6aad8fb6db..8d320a839ef 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -215,7 +215,7 @@ print '
';
-print "
";
print dol_get_fiche_end();
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index cd6eb0991d9..54bd59d4576 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -2743,7 +2743,7 @@ if ($action == 'create' || $action == 'adduserldap')
print dol_get_fiche_end();
print '';
- print '
';
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index a97d011a2e2..dee2c325063 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -184,7 +184,7 @@ if ($id > 0)
if ($action == 'edit')
{
print '';
+ print '
';
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 068d218c797..5edc9e6df51 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -548,7 +548,7 @@ else {
print dol_get_fiche_end();
- print '
';
+ print '
';
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index cb38fd3c4ac..fbb9a6e1756 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -135,7 +135,7 @@ if ($id)
if ($action == 'edit')
{
print '
';
- print '
';
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 67c1755f2da..6ef0c4bd317 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -320,7 +320,7 @@ if ($action == 'edit')
print '
';
- print '
';
diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php
index e0960e2baad..015551693bd 100644
--- a/htdocs/webservices/admin/index.php
+++ b/htdocs/webservices/admin/index.php
@@ -90,7 +90,7 @@ print '';
print '';
print '
';
-print '
';
print '';
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 9478c5f6206..39f451df174 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2487,8 +2487,8 @@ if (!GETPOST('hide_websitemenu'))
if (in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesite', 'replacesiteconfirm')))
{
if ($action == 'editcss') print '
';
- if (preg_match('/^create/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') print '
';
- if (preg_match('/^edit/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') print '
';
+ if (preg_match('/^create/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') print '
';
+ if (preg_match('/^edit/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') print '
';
if ($action != 'preview') print '
';
}
@@ -2803,8 +2803,8 @@ if (!GETPOST('hide_websitemenu'))
if (!in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesite', 'replacesiteconfirm', 'createsite', 'createcontainer', 'createfromclone', 'createpagefromclone', 'deletesite')))
{
if ($action == 'editsource' || $action == 'editmeta') print '
';
- if (preg_match('/^create/', $action)) print '
';
- if (preg_match('/^edit/', $action)) print '
';
+ if (preg_match('/^create/', $action)) print '
';
+ if (preg_match('/^edit/', $action)) print '
';
if ($action != 'preview') print '
';
}
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index 332ef81e9af..e2535ab374f 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -186,7 +186,7 @@ if (($id || $ref) && $action == 'edit')
print dol_get_fiche_end();
- print '