From 5820a23c1cbb294618250718b64306afdf3b6922 Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Thu, 19 Nov 2020 14:04:21 +0100 Subject: [PATCH 01/11] Update README.md --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ac8f1d06382..139bdc00b6a 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ You can freely use, study, modify or distribute it according to its licence. You can use it as a standalone application or as a web application to access it from the Internet or a LAN. -Dolibarr has a large community ready to help you, free forums and [oficially preferred partners ready to offer commercial support should you need it](https://partners.dolibarr.org) +Dolibarr has a large community ready to help you, free forums and [officially preferred partners ready to offer commercial support should you need it](https://partners.dolibarr.org) ![ScreenShot](https://www.dolibarr.org/medias/dolibarr_screenshot1_1920x1080.jpg) @@ -45,7 +45,7 @@ On GNU/Linux, first check if your distribution has already packaged Dolibarr. #### Generic install steps: -- Check that your installed PHP version is supported [see PHP support](https://wiki.dolibarr.org/index.php/Versions). +- Check that your installed PHP version is supported [see PHP support](https://wiki.dolibarr.org/index.php/Releases). - Uncompress the downloaded .zip archive to copy the "dolibarr/htdocs" directory and all its files inside your web server root or get the files directly from GitHub (recommanded if you know git as it makes it easier if you want to upgrade later): @@ -90,6 +90,7 @@ Dolibarr supports upgrading usually wihtout the need for any (commercial) suppor See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file. + ## FEATURES ### Main application/modules (all optional) @@ -162,8 +163,8 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) ### System Environment / Requirements -- Works with PHP 5.5+ 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. +- Works with PHP 5.6+ 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 PHP & MySQL or PostgreSQL prerequisites. ### Extending From c48129e2799d8e320337d17269c9d2ea71682575 Mon Sep 17 00:00:00 2001 From: Givriz Date: Thu, 19 Nov 2020 20:23:38 +0100 Subject: [PATCH 02/11] Ajout de la class "button-save" Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature) --- htdocs/accountancy/admin/card.php | 4 +-- htdocs/accountancy/admin/fiscalyear_card.php | 4 +-- htdocs/accountancy/admin/productaccount.php | 2 +- htdocs/accountancy/customer/card.php | 2 +- htdocs/accountancy/expensereport/card.php | 2 +- htdocs/accountancy/supplier/card.php | 2 +- .../default/tpl/adherentcard_edit.tpl.php | 2 +- htdocs/adherents/card.php | 2 +- htdocs/adherents/subscription/card.php | 2 +- htdocs/adherents/type.php | 2 +- htdocs/adherents/type_translation.php | 4 +-- htdocs/admin/accountant.php | 2 +- htdocs/admin/agenda.php | 2 +- htdocs/admin/agenda_extsites.php | 2 +- htdocs/admin/agenda_other.php | 2 +- htdocs/admin/agenda_reminder.php | 2 +- htdocs/admin/agenda_xcal.php | 2 +- htdocs/admin/bank.php | 2 +- htdocs/admin/barcode.php | 2 +- htdocs/admin/boxes.php | 2 +- htdocs/admin/company.php | 2 +- htdocs/admin/contract.php | 2 +- htdocs/admin/dav.php | 4 +-- htdocs/admin/delais.php | 2 +- htdocs/admin/emailcollector_card.php | 5 ++-- htdocs/admin/events.php | 2 +- htdocs/admin/expensereport.php | 2 +- htdocs/admin/facture_situation.php | 2 +- htdocs/admin/fckeditor.php | 2 +- htdocs/admin/holiday.php | 2 +- htdocs/admin/ihm.php | 4 +-- htdocs/admin/limits.php | 2 +- htdocs/admin/mails.php | 2 +- htdocs/admin/mails_emailing.php | 2 +- htdocs/admin/mails_senderprofile_list.php | 4 +-- htdocs/admin/mails_ticket.php | 2 +- htdocs/admin/menus.php | 2 +- htdocs/admin/menus/edit.php | 4 +-- htdocs/admin/notification.php | 6 ++-- htdocs/admin/openinghours.php | 2 +- htdocs/admin/paymentbybanktransfer.php | 2 +- htdocs/admin/pdf.php | 2 +- htdocs/admin/prelevement.php | 2 +- htdocs/admin/receiptprinter.php | 4 +-- htdocs/admin/security.php | 2 +- htdocs/admin/sms.php | 2 +- htdocs/admin/ticket.php | 2 +- htdocs/admin/ticket_public.php | 4 +-- htdocs/admin/translation.php | 2 +- htdocs/admin/website_options.php | 2 +- htdocs/api/admin/index.php | 2 +- htdocs/asset/admin/setup.php | 2 +- htdocs/asset/card.php | 2 +- htdocs/asset/type.php | 2 +- htdocs/bom/bom_card.php | 2 +- htdocs/bom/tpl/objectline_edit.tpl.php | 2 +- htdocs/bookmarks/card.php | 2 +- htdocs/cashdesk/admin/cashdesk.php | 2 +- htdocs/categories/traduction.php | 4 +-- htdocs/comm/action/card.php | 2 +- htdocs/comm/mailing/card.php | 2 +- htdocs/comm/multiprix.php | 2 +- htdocs/compta/bank/various_payment/card.php | 2 +- .../compta/cashcontrol/cashcontrol_card.php | 4 +-- htdocs/compta/deplacement/card.php | 4 +-- htdocs/compta/localtax/card.php | 2 +- htdocs/compta/sociales/card.php | 2 +- htdocs/compta/tva/card.php | 2 +- .../default/tpl/contactcard_edit.tpl.php | 2 +- htdocs/contact/card.php | 2 +- htdocs/contact/perso.php | 2 +- htdocs/core/class/html.formfile.class.php | 2 +- htdocs/core/tpl/admin_extrafields_add.tpl.php | 2 +- .../core/tpl/admin_extrafields_edit.tpl.php | 2 +- htdocs/core/tpl/objectline_edit.tpl.php | 2 +- htdocs/cron/admin/cron.php | 2 +- htdocs/cron/card.php | 2 +- htdocs/datapolicy/admin/setup.php | 2 +- htdocs/don/card.php | 4 +-- htdocs/don/payment/payment.php | 2 +- htdocs/ecm/dir_card.php | 2 +- htdocs/ecm/file_card.php | 2 +- htdocs/expedition/card.php | 2 +- htdocs/expensereport/list.php | 2 +- htdocs/expensereport/payment/payment.php | 2 +- htdocs/exports/export.php | 2 +- htdocs/externalsite/admin/externalsite.php | 2 +- htdocs/fichinter/card.php | 2 +- htdocs/fourn/commande/dispatch.php | 2 +- htdocs/holiday/card.php | 4 +-- htdocs/hrm/establishment/card.php | 4 +-- htdocs/intracommreport/card.php | 2 +- htdocs/loan/card.php | 2 +- htdocs/loan/payment/payment.php | 2 +- htdocs/modulebuilder/admin/setup.php | 2 +- htdocs/modulebuilder/index.php | 30 +++++++++---------- htdocs/modulebuilder/template/admin/setup.php | 2 +- .../modulebuilder/template/myobject_card.php | 2 +- htdocs/mrp/mo_card.php | 2 +- htdocs/opensurvey/card.php | 2 +- htdocs/opensurvey/results.php | 2 +- htdocs/product/admin/dynamic_prices.php | 4 +-- .../canvas/product/tpl/card_edit.tpl.php | 2 +- .../canvas/service/tpl/card_edit.tpl.php | 2 +- htdocs/product/card.php | 2 +- htdocs/product/dynamic_price/editor.php | 2 +- htdocs/product/fournisseurs.php | 2 +- htdocs/product/inventory/card.php | 2 +- htdocs/product/inventory/inventory.php | 4 +-- htdocs/product/price.php | 10 +++---- htdocs/product/stock/card.php | 2 +- htdocs/product/stock/product.php | 2 +- htdocs/product/traduction.php | 4 +-- htdocs/projet/activity/perday.php | 2 +- htdocs/projet/activity/permonth.php | 2 +- htdocs/projet/activity/perweek.php | 2 +- htdocs/projet/tasks/time.php | 2 +- htdocs/public/opensurvey/studs.php | 2 +- htdocs/reception/card.php | 2 +- htdocs/recruitment/admin/setup.php | 2 +- .../recruitment/admin/setup_candidatures.php | 2 +- .../recruitmentcandidature_card.php | 2 +- .../recruitmentjobposition_card.php | 2 +- htdocs/salaries/card.php | 2 +- .../canvas/company/tpl/card_edit.tpl.php | 2 +- .../canvas/individual/tpl/card_edit.tpl.php | 2 +- htdocs/societe/card.php | 2 +- htdocs/societe/price.php | 4 +-- htdocs/stripe/admin/stripe.php | 2 +- htdocs/takepos/admin/appearance.php | 2 +- htdocs/takepos/admin/bar.php | 2 +- htdocs/takepos/admin/orderprinters.php | 6 ++-- htdocs/takepos/admin/receipt.php | 2 +- htdocs/takepos/admin/setup.php | 2 +- htdocs/takepos/admin/terminal.php | 2 +- htdocs/user/agenda_extsites.php | 2 +- htdocs/user/card.php | 2 +- htdocs/user/clicktodial.php | 2 +- htdocs/user/group/card.php | 2 +- htdocs/user/note.php | 2 +- htdocs/user/param_ihm.php | 2 +- htdocs/webservices/admin/index.php | 2 +- htdocs/website/index.php | 8 ++--- htdocs/website/websiteaccount_card.php | 2 +- htdocs/zapier/admin/setup.php | 2 +- htdocs/zapier/hook_card.php | 2 +- 146 files changed, 192 insertions(+), 191 deletions(-) diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php index b4f90f19675..e2142f4fee8 100644 --- a/htdocs/accountancy/admin/card.php +++ b/htdocs/accountancy/admin/card.php @@ -255,7 +255,7 @@ if ($action == 'create') { print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '     '; print ''; print '
'; @@ -317,7 +317,7 @@ if ($action == 'create') { print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '     '; print ''; print '
'; diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php index aa10c0101c1..7f2038b57de 100644 --- a/htdocs/accountancy/admin/fiscalyear_card.php +++ b/htdocs/accountancy/admin/fiscalyear_card.php @@ -190,7 +190,7 @@ if ($action == 'create') print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '     '; print ''; print '
'; @@ -241,7 +241,7 @@ if ($action == 'create') print ''; print '
'; - print ''; + print ''; print '     '; print ''; print '
'; diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php index e09f6ec14cf..2f92cd5842e 100644 --- a/htdocs/accountancy/admin/productaccount.php +++ b/htdocs/accountancy/admin/productaccount.php @@ -405,7 +405,7 @@ if ($result) $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields - $buttonsave = ''; + $buttonsave = ''; //print '
'.$buttonsave.'
'; $texte = $langs->trans("ListOfProductsServices"); diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php index 90f3d4c04ef..a14203916f9 100644 --- a/htdocs/accountancy/customer/card.php +++ b/htdocs/accountancy/customer/card.php @@ -140,7 +140,7 @@ if (!empty($id)) { print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '     '; print ''; print '
'; diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php index 67c790a9c36..4ccb2617dd6 100644 --- a/htdocs/accountancy/expensereport/card.php +++ b/htdocs/accountancy/expensereport/card.php @@ -149,7 +149,7 @@ if (!empty($id)) { print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '     '; print ''; print '
'; diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php index cf13302d866..12e0c7796c4 100644 --- a/htdocs/accountancy/supplier/card.php +++ b/htdocs/accountancy/supplier/card.php @@ -144,7 +144,7 @@ if (!empty($id)) { print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '     '; print ''; print '
'; diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php index 92a4fbddd38..b3c7f59e67e 100644 --- a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php +++ b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php @@ -134,7 +134,7 @@ echo $this->control->tpl['ajax_selectcountry']; - ">  + ">  "> diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index fe6f27ef8b6..9a122ee6c09 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -1235,7 +1235,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '     '; print ''; print '
'; diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php index c97c502abaf..09c9d3c752c 100644 --- a/htdocs/adherents/subscription/card.php +++ b/htdocs/adherents/subscription/card.php @@ -236,7 +236,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') { print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '       '; print ''; print '
'; diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index fc1d7ecb1d9..6607d952dd0 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -765,7 +765,7 @@ if ($rowid > 0) { print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '     '; print ''; print '
'; diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php index 3aafef6f216..c425fefdb4a 100644 --- a/htdocs/adherents/type_translation.php +++ b/htdocs/adherents/type_translation.php @@ -218,7 +218,7 @@ if ($action == 'edit') { print '
'; print '
'; - print ''; + print ''; print '     '; print ''; print '
'; @@ -275,7 +275,7 @@ if ($action == 'add' && $user->rights->adherent->configurer) { print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '     '; print ''; print '
'; diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php index cbf9fdbaa50..38d4eff2d3e 100644 --- a/htdocs/admin/accountant.php +++ b/htdocs/admin/accountant.php @@ -170,7 +170,7 @@ print ''; print ''; print '
'; -print ''; +print ''; //print '     '; //print ''; print '
'; diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php index 1f4236df666..b1cc1d7619b 100644 --- a/htdocs/admin/agenda.php +++ b/htdocs/admin/agenda.php @@ -200,7 +200,7 @@ print ''; print dol_get_fiche_end(); print '
'; -print ''; +print ''; print "
"; print "\n"; diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php index 3cf0d49b960..7fbd139072d 100644 --- a/htdocs/admin/agenda_extsites.php +++ b/htdocs/admin/agenda_extsites.php @@ -227,7 +227,7 @@ print ''; print dol_get_fiche_end(); print '
'; -print ''; +print ''; print '
'; print "\n"; diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php index c390796a55b..2ffbf15d7ce 100644 --- a/htdocs/admin/agenda_other.php +++ b/htdocs/admin/agenda_other.php @@ -378,7 +378,7 @@ print ''; print dol_get_fiche_end(); -print '
'; +print '
'; print ''; diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php index e34536e648a..37d0ac5e9bd 100644 --- a/htdocs/admin/agenda_reminder.php +++ b/htdocs/admin/agenda_reminder.php @@ -231,7 +231,7 @@ print ''; print dol_get_fiche_end(); -//print '
'; +//print '
'; print ''; diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php index 61116a0f18f..6d77b9f4416 100644 --- a/htdocs/admin/agenda_xcal.php +++ b/htdocs/admin/agenda_xcal.php @@ -138,7 +138,7 @@ print ''; print dol_get_fiche_end(); print '
'; -print "trans("Save")."\">"; +print ''; print "
"; print "\n"; diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php index c8157a40d81..88babe27385 100644 --- a/htdocs/admin/bank.php +++ b/htdocs/admin/bank.php @@ -498,7 +498,7 @@ print ''; print dol_get_fiche_end(); print '
'; -print ''; +print ''; print '
'; print "\n"; diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index 0e7a23ae679..6ff8a988899 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -282,7 +282,7 @@ print "\n"; if (empty($conf->use_javascript_ajax)) { - print '
'; + print '
'; print ''; } diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 31723888e44..19450905c23 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -474,7 +474,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL == 2 || !empty($conf->global->MAIN_ACTIVA print ''; print '
'; -print '
'; +print '
'; print '
'; print ''; diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 2705ede5540..8b900f552c8 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -834,7 +834,7 @@ print ""; print '
'; -print ''; +print ''; print '
'; print ''; diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index d70a9740232..bfdff79cc1f 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -483,7 +483,7 @@ print ''; print ''; print '
'; -print ''; +print ''; print '
'; print ''; diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php index c47306f975b..8f005c0f0d7 100644 --- a/htdocs/admin/dav.php +++ b/htdocs/admin/dav.php @@ -108,7 +108,7 @@ if ($action == 'edit') print ''; print '
'; - print ''; + print ''; print '
'; print ''; @@ -151,7 +151,7 @@ if ($action == 'edit') print dol_get_fiche_end(); /*print '
'; -print "trans("Save")."\">"; +print ''; print "
"; */ print "\n"; diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php index 673cc16a02e..5ff7f022ba4 100644 --- a/htdocs/admin/delais.php +++ b/htdocs/admin/delais.php @@ -432,7 +432,7 @@ if ($conf->global->MAIN_DISABLE_METEO != 1) { if ($action == 'edit') { - print '
'; + print '
'; print '
'; } else { print '
'; diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php index f0544e1e914..35c24a15dac 100644 --- a/htdocs/admin/emailcollector_card.php +++ b/htdocs/admin/emailcollector_card.php @@ -297,7 +297,7 @@ if (($id || $ref) && $action == 'edit') print dol_get_fiche_end(); - print '
'; + print '
'; print '   '; print '
'; @@ -614,7 +614,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea { print '
'; print '
'; - print ' '; + print ''; + print ''; } else { print $ruleaction['actionparam']; } diff --git a/htdocs/admin/events.php b/htdocs/admin/events.php index 7af8d547a0c..66099eb3a30 100644 --- a/htdocs/admin/events.php +++ b/htdocs/admin/events.php @@ -128,7 +128,7 @@ print ''; print dol_get_fiche_end(); print '
'; -print "trans("Save")."\">"; +print ''; print '
'; print "\n"; diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php index 3de7ff55c5f..f572226c379 100644 --- a/htdocs/admin/expensereport.php +++ b/htdocs/admin/expensereport.php @@ -475,7 +475,7 @@ print ''."\n"; print ''; print '
'; -print ''; +print ''; print '
'; print ''; diff --git a/htdocs/admin/facture_situation.php b/htdocs/admin/facture_situation.php index 31966cdb585..364297712e7 100644 --- a/htdocs/admin/facture_situation.php +++ b/htdocs/admin/facture_situation.php @@ -155,7 +155,7 @@ function _updateBtn() { global $langs; print '
'; - print ''; + print ''; print '
'; } diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php index 8f4ea7ec9c4..bc6b0dc33ac 100644 --- a/htdocs/admin/fckeditor.php +++ b/htdocs/admin/fckeditor.php @@ -211,7 +211,7 @@ if (empty($conf->use_javascript_ajax)) print $conf->global->FCKEDITOR_TEST; print '
'; } - print '
'."\n"; + print '
'."\n"; print '
'; print ''."\n"; diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php index 44b7034064b..be09a062703 100644 --- a/htdocs/admin/holiday.php +++ b/htdocs/admin/holiday.php @@ -494,7 +494,7 @@ print '
'; print '
'; -print ''; +print ''; print '
'; print ''; diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 4fd8963344d..42da694b2e6 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -249,7 +249,7 @@ print ''; // Default language print ''.$langs->trans("DefaultLanguage").''; print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'MAIN_LANG_DEFAULT', 1, null, '', 0, 0, 'minwidth300', 2); -print ''; +print ''; print ''; print ' '; print ''; @@ -443,7 +443,7 @@ print ''; print '
'; print '
'; -print ''; +print ''; print '
'; print ''; diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index ce918583d96..43c4cc84776 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -165,7 +165,7 @@ if ($action == 'edit') print '
'; print '
'; - print ''; + print ''; print '
'; print '
'; diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 9292f387673..524d7249963 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -509,7 +509,7 @@ if ($action == 'edit') print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '     '; print ''; print '
'; diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php index 6a42e14bff6..353ce632e91 100644 --- a/htdocs/admin/mails_emailing.php +++ b/htdocs/admin/mails_emailing.php @@ -387,7 +387,7 @@ if ($action == 'edit') print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '     '; print ''; print '
'; diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php index d9540d30995..ccaf48f3227 100644 --- a/htdocs/admin/mails_senderprofile_list.php +++ b/htdocs/admin/mails_senderprofile_list.php @@ -381,7 +381,7 @@ if ($action != 'create') { print ''; print '
'; print '
'; - print ''; + print ''; print '   '; print ''; print '
'; @@ -414,7 +414,7 @@ if ($action != 'create') { print ''; print '
'; print '
'; - print ''; + print ''; print '   '; print ''; print '
'; diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php index dda9d0c01a8..b24bfa2c565 100644 --- a/htdocs/admin/mails_ticket.php +++ b/htdocs/admin/mails_ticket.php @@ -364,7 +364,7 @@ if ($action == 'edit') print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '     '; print ''; print '
'; diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php index 9bdc497c776..707cc776c6d 100644 --- a/htdocs/admin/menus.php +++ b/htdocs/admin/menus.php @@ -209,7 +209,7 @@ print ''; print dol_get_fiche_end(); print '
'; -print ''; +print ''; print '
'; print ''; diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index 70d2f4bcda6..42130485594 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -401,7 +401,7 @@ if ($action == 'create') print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '     '; print ''; print '
'; @@ -511,7 +511,7 @@ if ($action == 'create') // Bouton print '
'; - print ''; + print ''; print '     '; print ''; print '
'; diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php index 13b1b4b3e55..bb13aa9d37a 100644 --- a/htdocs/admin/notification.php +++ b/htdocs/admin/notification.php @@ -203,7 +203,7 @@ print ''; print ''; print ''; -print '
'; +print '
'; print ''; @@ -292,7 +292,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { print ''; } -print '
'; +print '
'; print ''; @@ -389,7 +389,7 @@ print ''; print '
'; -print '
'; +print '
'; print ''; diff --git a/htdocs/admin/openinghours.php b/htdocs/admin/openinghours.php index 7cd803d5e69..c3cbcb3d0ae 100644 --- a/htdocs/admin/openinghours.php +++ b/htdocs/admin/openinghours.php @@ -130,7 +130,7 @@ if (empty($action) || $action == 'edit' || $action == 'updateedit') print ''; print '
'; - print ''; + print ''; print '
'; print '
'; diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php index 6a419d39e53..0ea8db95aec 100644 --- a/htdocs/admin/paymentbybanktransfer.php +++ b/htdocs/admin/paymentbybanktransfer.php @@ -192,7 +192,7 @@ print ''; print ''; print '
'; -print '
'; +print '
'; print ''; diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php index 4008fad141d..44f0672a832 100644 --- a/htdocs/admin/pdf.php +++ b/htdocs/admin/pdf.php @@ -336,7 +336,7 @@ print ''; print ''; print '
'; -print ''; +print ''; print '
'; print ''; diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index c16b5c30c47..97a45c77a42 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -199,7 +199,7 @@ print ''; print ''; print '
'; -print '
'; +print '
'; print ''; diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php index 3f66d04ca01..73db1bfa040 100644 --- a/htdocs/admin/receiptprinter.php +++ b/htdocs/admin/receiptprinter.php @@ -327,7 +327,7 @@ if ($mode == 'config' && $user->admin) { print ''.$printer->profileresprint.''; print ''; print ''; - print '
'; + print '
'; print ''; print ''; } else { @@ -456,7 +456,7 @@ if ($mode == 'template' && $user->admin) { print ''; print '
'; } else { - print '
'; + print '
'; } print ''; diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php index d9eae8f064e..fc479522a8b 100644 --- a/htdocs/admin/security.php +++ b/htdocs/admin/security.php @@ -323,7 +323,7 @@ if ($conf->global->USER_PASSWORD_GENERATED == "Perso") { print '
'; print '
'; - print ''.$langs->trans("Save").''; + print ''.$langs->trans("Save").''; print '
'; print '

'; diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php index e34d2ab9b7a..09faea88772 100644 --- a/htdocs/admin/sms.php +++ b/htdocs/admin/sms.php @@ -196,7 +196,7 @@ if ($action == 'edit') print ''; print '
'; - print ''; + print ''; print '     '; print ''; print '
'; diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php index e8da4a8d736..0614df0dd61 100644 --- a/htdocs/admin/ticket.php +++ b/htdocs/admin/ticket.php @@ -410,7 +410,7 @@ print ''; print ''; print '
'; -print ''; +print ''; print '
'; print ''; diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php index 121ded4f578..80f458a2b5c 100644 --- a/htdocs/admin/ticket_public.php +++ b/htdocs/admin/ticket_public.php @@ -280,7 +280,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) } if (!$conf->use_javascript_ajax) { - print ''; + print ''; print ''; } @@ -410,7 +410,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) print ''; print ''; - print '
'; + print '
'; print ''; } diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index edd5ca95026..b94d5b940c7 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -344,7 +344,7 @@ if ($mode == 'overwrite') if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int')) { print ''; - print ''; + print ''; print '   '; print ''; } else { diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php index 738fd5bc998..8c803defb37 100644 --- a/htdocs/admin/website_options.php +++ b/htdocs/admin/website_options.php @@ -116,7 +116,7 @@ if ($action == 'edit') print ''; print '
'; - print ''; + print ''; print '
'; print ''; diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php index 18cbff2ca61..b4ebb6cb30e 100644 --- a/htdocs/api/admin/index.php +++ b/htdocs/api/admin/index.php @@ -129,7 +129,7 @@ print ' '.$langs->trans("Example").': '.$langs->trans("IPListExample"); print ''; print ''; print ''; -print ''; +print ''; print ''; print ''; diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php index 6fec16ef0a0..42a5888c537 100644 --- a/htdocs/asset/admin/setup.php +++ b/htdocs/asset/admin/setup.php @@ -82,7 +82,7 @@ if ($action == 'edit') print ''; print '
'; - print ''; + print ''; print '
'; print ''; diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php index 0fa78edf9ce..f4bc63f730d 100644 --- a/htdocs/asset/card.php +++ b/htdocs/asset/card.php @@ -220,7 +220,7 @@ if (($id || $ref) && $action == 'edit') print dol_get_fiche_end(); - print '
'; + print '
'; print '   '; print '
'; diff --git a/htdocs/asset/type.php b/htdocs/asset/type.php index 28f2ce59df0..90fcefd5626 100644 --- a/htdocs/asset/type.php +++ b/htdocs/asset/type.php @@ -597,7 +597,7 @@ if ($rowid > 0) print dol_get_fiche_end(); - print '
'; + print '
'; print '   '; print '
'; 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 '
'; 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 ''; +print ''; print '
'; print ''; 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 ''; + print ''; print '     '; print ''; print '
'; @@ -346,7 +346,7 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service print ''; print '
'; - print ''; + print ''; print '     '; print ''; print '
'; diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 0b1eba637d4..558e4e190dc 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -1785,7 +1785,7 @@ if ($id > 0) print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '     '; 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 ''; + print ''; print '     '; 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/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 ''; + print ''; print '   '; 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 ''; - if ($action == 'start') print ''; + if ($action == 'start') print ''; elseif ($action == 'close') print ''; print ''; print ''; @@ -854,7 +854,7 @@ if (empty($action) || $action == "view" || $action == "close") // Save print ''; print ''; - if ($action == 'start') print ''; + if ($action == 'start') print ''; elseif ($action == 'close') 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 ''; + print ''; print '     '; print ''; print '
'; @@ -374,7 +374,7 @@ if ($action == 'create') print ''; print '
'; - print ''; + print ''; 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 ''; + print ''; print '     '; 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 ''; + print ''; print '   '; 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 ''; + print ''; print '     '; 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 ''; + print ''; print '     '; 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 ''; + print ''; print '     '; 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 ''; - print ''; + print ''; print ''; print ''; if (empty($disablemove)) print ''; 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 fc3ca7c63b6..37c75e63a68 100644 --- a/htdocs/cron/admin/cron.php +++ b/htdocs/cron/admin/cron.php @@ -108,7 +108,7 @@ print ''; print dol_get_fiche_end(); print '
'; -print ''; +print ''; print '
'; print ''; diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php index 9c3a2b38f02..a87ac2af64c 100644 --- a/htdocs/cron/card.php +++ b/htdocs/cron/card.php @@ -513,7 +513,7 @@ if (($action == "create") || ($action == "edit")) print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '     '; 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 ''; print '
'; print ''; diff --git a/htdocs/don/card.php b/htdocs/don/card.php index cec185e757e..e75ed70b0c6 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -494,7 +494,7 @@ if ($action == 'create') print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '     '; print ''; print '
'; @@ -624,7 +624,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 ''; + print ''; 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 ''; + print ''; print '     '; 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 ''; + print ''; print '     '; 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 '
'; + print '
'; 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 ''; print '

'; } } else { diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php index fd327a0fcb1..4da5eef07be 100644 --- a/htdocs/expensereport/payment/payment.php +++ b/htdocs/expensereport/payment/payment.php @@ -346,7 +346,7 @@ if ($action == 'create' || empty($action)) print ""; print '
'; - print ''; + print ''; 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 ''; + 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 ''; print '
'; print "\n"; diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index da1de06cc16..9d0b156d12d 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1482,7 +1482,7 @@ if ($action == 'create') print ''; print ''; - print ''; + print ''; print ''; print ''."\n"; 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 ''; print ''; print ''; diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index 53a22f83eee..02a4ba89e2b 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -1356,7 +1356,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') } if ($action == 'editvalidator') { - 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 ''; + print ''; } 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 ''; + print ''; print '     '; print ''; print '
'; @@ -327,7 +327,7 @@ if (($id || $ref) && $action == 'edit') print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '     '; 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 '
'; 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 ''; + print ''; print '     '; 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 ''; + print ''; 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 ''; + print ''; print '   '; 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 ''; + print ''; 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 ''; + print ''; 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 ''; + print ''; 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 ''; + print ''; 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 ''; + print ''; 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 ''; + print ''; 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 ''; + print ''; 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 ''; + print ''; 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 ''; + print ''; 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 ''; + print ''; 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 ''; + print ''; 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 ''; + print ''; 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 ''; + print ''; 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 ''; + print ''; 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 ''; 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 '
'; 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 '
'; 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 ''; + print ''; print '   '; print ''; print '
'; 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 ''; - print ''; + 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 '  '; print ''; print '
'; print ''; @@ -351,7 +351,7 @@ if ($action == 'create_updater' || $action == 'edit_updater') { //Form Buttons print '
'; - print '  '; + print '  '; 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 ''; + print ''; print '     '; 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..5e44d20db84 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -824,7 +824,7 @@ END; print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '     '; print ''; 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 '
'; 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").'
'; - print ''; + print ''; print '   '; print ''; print '
'; @@ -528,7 +528,7 @@ if ($object->id > 0) // Save if ($object->status == $object::STATUS_VALIDATED) { print '
'; - print ''; + print ''; print '
'; } diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 9c9fa653a60..eb30c107b46 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -1162,7 +1162,7 @@ if ($action == 'edit_vat' && ($user->rights->produit->creer || $user->rights->se print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '     '; print ''; print '
'; @@ -1275,7 +1275,7 @@ if ($action == 'edit_price' && $object->getRights()->creer) print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '     '; print ''; print '
'; @@ -1395,7 +1395,7 @@ if ($action == 'edit_price' && $object->getRights()->creer) //print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '   '; print '
'; print ''; @@ -1712,7 +1712,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print $langs->trans('ForceUpdateChildPriceSoc'); print '
'; - print ''; + print ''; print '     '; print ''; print '
'; @@ -1805,7 +1805,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 d2f9494e857..cd2ac1ebfe3 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 ''; + print ''; print '     '; 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 ''; 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 ''; + print ''; print '     '; print ''; print '
'; @@ -331,7 +331,7 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service print dol_get_fiche_end(); print '
'; - print ''; + print ''; print '     '; 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 ''; 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 ''; 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 ''; 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 ''; - print ''; + 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 '
'; } elseif ($object->statut == Reception::STATUS_DRAFT) { diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php index e0443398c77..702fa4852f5 100644 --- a/htdocs/recruitment/admin/setup.php +++ b/htdocs/recruitment/admin/setup.php @@ -219,7 +219,7 @@ if ($action == 'edit') print ''; print '
'; - 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 ''; 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 '
'; 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 '
'; 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 ''; + print ''; print '     '; 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 ''; + print ''; print '     '; print ''; print '
'; @@ -422,7 +422,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { print ''; print '
'; - print ''; + print ''; 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..144f46d6527 100644 --- a/htdocs/takepos/admin/bar.php +++ b/htdocs/takepos/admin/bar.php @@ -179,7 +179,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/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..55106a8f90a 100644 --- a/htdocs/takepos/admin/setup.php +++ b/htdocs/takepos/admin/setup.php @@ -460,7 +460,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 "trans("Save")."\">"; +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 ''; + print ''; print '     '; 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 '
'; + print '
'; print '     '; 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 '
'; 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 ''; + print ''; print '     '; 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 ''; + print ''; print '     '; 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 ''; 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 '
'; + print '
'; print '   '; print '
'; diff --git a/htdocs/zapier/admin/setup.php b/htdocs/zapier/admin/setup.php index c63dbcc49f1..0d10ac95231 100644 --- a/htdocs/zapier/admin/setup.php +++ b/htdocs/zapier/admin/setup.php @@ -89,7 +89,7 @@ if ($action == 'edit') { print ''; print '
'; - print ''; + print ''; print '
'; print ''; diff --git a/htdocs/zapier/hook_card.php b/htdocs/zapier/hook_card.php index 548b79de866..e701c03455e 100644 --- a/htdocs/zapier/hook_card.php +++ b/htdocs/zapier/hook_card.php @@ -189,7 +189,7 @@ if (($id || $ref) && $action == 'edit') { print dol_get_fiche_end(); - print '
'; + print '
'; print '   '; print '
'; From 29dae5d9f0feec1a47a2a71f7bde10e9dae89421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 19 Nov 2020 21:09:29 +0100 Subject: [PATCH 03/11] remove warnings --- htdocs/don/card.php | 64 +++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 34 deletions(-) diff --git a/htdocs/don/card.php b/htdocs/don/card.php index cec185e757e..ca15a88383e 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 { @@ -546,8 +543,7 @@ if (!empty($id) && $action == 'edit') print ''; // Amount - if ($object->statut == 0) - { + if ($object->statut == 0) { print "".''.$langs->trans("Amount").' '.$langs->trans("Currency".$conf->currency).''; } else { print ''.$langs->trans("Amount").''; From b4a5134a7f25be2f8d1baea083723d2c7e5cf6f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 19 Nov 2020 22:25:02 +0100 Subject: [PATCH 04/11] doxygen --- htdocs/core/class/vcard.class.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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"; From 09cb47212199f6eec956a916c61c3a7e1c2bb492 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 20 Nov 2020 13:34:40 +0100 Subject: [PATCH 05/11] Update card.php --- htdocs/don/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/don/card.php b/htdocs/don/card.php index ca15a88383e..8a5736c50cd 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -148,7 +148,7 @@ if ($action == 'update') $object->amount = price2num(GETPOST("amount", 'alpha')); $object->town = (string) GETPOST("town", 'alpha'); $object->zip = (string) GETPOST("zipcode", 'alpha'); - $object->country_id = (int GETPOST('country_id', 'int'); + $object->country_id = (int) GETPOST('country_id', 'int'); $object->email = (string) GETPOST("email", 'alpha'); $object->date = $donation_date; $object->public = (string) GETPOST("public", 'alpha'); From 4fef8d80a5eb5571a1f804726d5a53e2044dab21 Mon Sep 17 00:00:00 2001 From: lvessiller Date: Fri, 20 Nov 2020 16:01:51 +0100 Subject: [PATCH 06/11] FIX keep dates filters parameters on order list --- htdocs/commande/list.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 71ff0ef147a..cee3b5537af 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_datedelivery_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_datedelivery_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 ''; } From e87bdd02bdc5ea486ea87df67dfb0f4f133228d2 Mon Sep 17 00:00:00 2001 From: lvessiller Date: Fri, 20 Nov 2020 16:10:11 +0100 Subject: [PATCH 07/11] FIX date order param not empty --- htdocs/commande/list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index cee3b5537af..0828971eaa5 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -448,8 +448,8 @@ 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_datedelivery_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_datedelivery_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_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); From 064b5acff5c6c8888eefbea6ab5763162bfbe844 Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Fri, 20 Nov 2020 17:16:49 +0100 Subject: [PATCH 08/11] List supplier barcode --- htdocs/fourn/class/fournisseur.product.class.php | 4 ++-- htdocs/product/fournisseurs.php | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index abd1f3baab9..fbeeda9ba60 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -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/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 5cb12b100f1..f3ac7afbd58 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 ''; + print ''; 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 ''; } @@ -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 ''; } From d24ac5109d919c113ca2db6cf3c926b6e478f2b6 Mon Sep 17 00:00:00 2001 From: andreubisquerra Date: Fri, 20 Nov 2020 18:40:04 +0100 Subject: [PATCH 09/11] FIX TakePOS order_notes extrafield --- htdocs/takepos/admin/bar.php | 4 ++++ htdocs/takepos/admin/other.php | 4 ---- htdocs/takepos/admin/setup.php | 5 ----- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php index 481394c626f..fc727b66578 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 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/setup.php b/htdocs/takepos/admin/setup.php index 804a189de00..7fe0e39062b 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')); From 84b2d7e9746307e56a8c75fd5dba51c5efc62674 Mon Sep 17 00:00:00 2001 From: Valcoop <74793548+Valcoop@users.noreply.github.com> Date: Fri, 20 Nov 2020 22:19:17 +0100 Subject: [PATCH 10/11] FIX Bug where amount of voters was always 0 FIX Bug where amount of voters was always 0. Due to erroneous sql query build fetching the wrong column name. --- htdocs/opensurvey/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { From 89e101e0b6c839429f879f53d5d877ab988718ea Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Sat, 21 Nov 2020 11:38:07 +0100 Subject: [PATCH 11/11] Fix wrong value for deprecated --- htdocs/fourn/class/fournisseur.product.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index fbeeda9ba60..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; }