From d2d84c3e486db42c22a84f2764a1af47c55ba73a Mon Sep 17 00:00:00 2001 From: philippe Date: Sun, 12 Jan 2014 21:26:44 +0100 Subject: [PATCH 01/19] Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1. --- htdocs/fourn/liste.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/liste.php b/htdocs/fourn/liste.php index f59e692fb87fc..5ce488939b3b2 100644 --- a/htdocs/fourn/liste.php +++ b/htdocs/fourn/liste.php @@ -183,7 +183,7 @@ print ''; print ''; - print ''; + print ''; $parameters=array(); $formconfirm=$hookmanager->executeHooks('printFieldListOption',$parameters); // Note that $action and $object may have been modified by hook From 938f31f383fee3ce8690db7baece739ae8a1f252 Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Sun, 12 Jan 2014 21:45:52 +0100 Subject: [PATCH 02/19] Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1. --- htdocs/contact/list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 2b1c5e982df68..1c735d787b423 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -343,9 +343,9 @@ print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status); print ''; print ''; - print ''; + print ''; print '  '; - print ''; + print ''; print ''; print ''; From 795dcad59f4ce808abf183bf9b18dfc02d0b0d81 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 12 Jan 2014 22:26:48 +0100 Subject: [PATCH 03/19] Fix: The login page should have same code than standard page using common footer. --- htdocs/core/tpl/login.tpl.php | 37 +++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index fa3d21b92015a..b2aa1877823a5 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -205,7 +205,38 @@ } ?> + + + + + + +global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER; ?> + google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AN_ID)) +{ + if (empty($conf->dol_use_jmobile)) + { + print "\n"; + print ''."\n"; + } +} +?> + +google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT)) { if (empty($conf->dol_use_jmobile)) @@ -228,12 +259,6 @@ } ?> - - - - -global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER; ?> - From e7f7dd49a5e128bdf6964152e49f86333e64eb37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Salvador?= Date: Fri, 10 Jan 2014 10:41:19 +0100 Subject: [PATCH 04/19] add a method to check for the presence of an object in a category --- htdocs/categories/class/categorie.class.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 9f4be55eb407d..1a68fc939994b 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -571,6 +571,27 @@ function get_type($field,$classname,$category_table='',$object_table='') } } + /** + * check for the presence of an object in a category + * @param string $field table field + * @param string $category_table category table name + * @param int $object_id id of the object to search + * @return int nb number of occurrences + */ + function object_exists($field, $category_table, $object_id) + { + $sql = "SELECT COUNT(*) as nb FROM " . MAIN_DB_PREFIX . "categorie_" . $category_table; + $sql .= " WHERE fk_categorie = " . $this->id . " AND fk_" . $field . " = " . $object_id; + dol_syslog(get_class($this)."::product_exists sql=".$sql); + $resql = $this->db->query($sql); + if ($resql) { + return $this->db->fetch_object($resql)->nb; + } else { + $this->error=$this->db->error().' sql='.$sql; + dol_syslog(get_class($this)."::get_type ".$this->error, LOG_ERR); + return -1; + } + } /** * Return childs of a category From abe76708de0d8610b6ff14e14c69756981c2466e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Salvador?= Date: Fri, 10 Jan 2014 11:06:16 +0100 Subject: [PATCH 05/19] renamed object_exists --- htdocs/categories/class/categorie.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 1a68fc939994b..3040ed3176c87 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -578,7 +578,7 @@ function get_type($field,$classname,$category_table='',$object_table='') * @param int $object_id id of the object to search * @return int nb number of occurrences */ - function object_exists($field, $category_table, $object_id) + function is_in_cat($field, $category_table, $object_id) { $sql = "SELECT COUNT(*) as nb FROM " . MAIN_DB_PREFIX . "categorie_" . $category_table; $sql .= " WHERE fk_categorie = " . $this->id . " AND fk_" . $field . " = " . $object_id; From ecfff5636baeb86086ab7b24fb884c8d6a4cf269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Salvador?= Date: Mon, 13 Jan 2014 09:27:10 +0100 Subject: [PATCH 06/19] rename is_in_cat to containsObject --- htdocs/categories/class/categorie.class.php | 31 +++++++++++++++++---- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 3040ed3176c87..7e990e602c97e 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -573,22 +573,43 @@ function get_type($field,$classname,$category_table='',$object_table='') /** * check for the presence of an object in a category - * @param string $field table field - * @param string $category_table category table name + * @param string $type object type * @param int $object_id id of the object to search * @return int nb number of occurrences */ - function is_in_cat($field, $category_table, $object_id) + function containsObject($type, $object_id) { + $field = ''; $classname = ''; $category_table = ''; $object_table = ''; + if ($type == 'product') { + $field = 'product'; + } + if ($type == 'customer') { + $field = 'societe'; + } + if ($type == 'supplier') { + $field = 'societe'; + $category_table = 'fournisseur'; + } + if ($type == 'member') { + $field = 'member'; + $category_table = ''; + } + if ($type == 'contact') { + $field = 'socpeople'; + $category_table = 'contact'; + } + if (empty($category_table)) { + $category_table = $field; + } $sql = "SELECT COUNT(*) as nb FROM " . MAIN_DB_PREFIX . "categorie_" . $category_table; $sql .= " WHERE fk_categorie = " . $this->id . " AND fk_" . $field . " = " . $object_id; - dol_syslog(get_class($this)."::product_exists sql=".$sql); + dol_syslog(get_class($this)."::containsObject sql=".$sql); $resql = $this->db->query($sql); if ($resql) { return $this->db->fetch_object($resql)->nb; } else { $this->error=$this->db->error().' sql='.$sql; - dol_syslog(get_class($this)."::get_type ".$this->error, LOG_ERR); + dol_syslog(get_class($this)."::containsObject ".$this->error, LOG_ERR); return -1; } } From c5689b86b46fbd6d8d1edcd5f21331c7edb8409a Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Mon, 13 Jan 2014 09:43:21 +0100 Subject: [PATCH 07/19] Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 --- htdocs/adherents/liste.php | 4 ++-- htdocs/admin/tools/listevents.php | 2 +- htdocs/comm/contact.php | 2 +- htdocs/comm/list.php | 4 ++-- htdocs/comm/mailing/cibles.php | 4 ++-- htdocs/comm/mailing/liste.php | 2 +- htdocs/comm/propal/list.php | 2 +- htdocs/comm/prospect/list.php | 2 +- htdocs/commande/customer.php | 2 +- htdocs/commande/liste.php | 2 +- htdocs/commande/orderstoinvoice.php | 2 +- htdocs/compta/bank/account.php | 2 +- htdocs/compta/bank/search.php | 2 +- htdocs/compta/deplacement/list.php | 2 +- htdocs/compta/dons/liste.php | 2 +- htdocs/compta/facture/impayees.php | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php index d4beb3ecdd97f..a4b9bdb7a5a2f 100644 --- a/htdocs/adherents/liste.php +++ b/htdocs/adherents/liste.php @@ -256,9 +256,9 @@ print ' '; print ''; - print ''; + print ''; print '  '; - print ''; + print ''; print ''; print "\n"; diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index ac5b825b4217a..d733182f054cd 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -188,7 +188,7 @@ print ''; print ''; - print ''; + print ''; print ''; print "\n"; diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index 5c85f745def0e..7f9d7ede4409b 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -141,7 +141,7 @@ print ''; print ''; print ' '; - print ''; + print ''; print "\n"; print ''; diff --git a/htdocs/comm/list.php b/htdocs/comm/list.php index ed12edd032a02..4e6ac38c81010 100644 --- a/htdocs/comm/list.php +++ b/htdocs/comm/list.php @@ -233,9 +233,9 @@ print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'),'1'=>$langs->trans('InActivity')),$search_status); print ''; - print ''; + print ''; print '  '; - print ''; + print ''; print ''; $parameters=array(); diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 5b3ec5bfc1d9a..916a616366872 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -434,9 +434,9 @@ print ''; // Source print ''; - print ''; + print ''; print '  '; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/comm/mailing/liste.php b/htdocs/comm/mailing/liste.php index 41a4e57a7ac9e..81af4f4f6e680 100644 --- a/htdocs/comm/mailing/liste.php +++ b/htdocs/comm/mailing/liste.php @@ -121,7 +121,7 @@ print ' '; if (! $filteremail) print ' '; print ' '; - print ''; + print ''; print ""; print "\n"; print ''; diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 262ccbfe91e53..7a652631d676f 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -309,7 +309,7 @@ print ''; $formpropal->select_propal_statut($viewstatut,1); print ''; - print ''; + print ''; print ''; print "\n"; diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php index 18038d3ed44f3..767a29f0b88ad 100644 --- a/htdocs/comm/prospect/list.php +++ b/htdocs/comm/prospect/list.php @@ -378,7 +378,7 @@ // Print the search button print ''; - print ''; + print ''; print ''; $parameters=array(); diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php index 35a5891d60489..373775a0da09a 100644 --- a/htdocs/commande/customer.php +++ b/htdocs/commande/customer.php @@ -142,7 +142,7 @@ print ''; print ''; - print ''; + print ''; print ''; print "\n"; diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index aaf6b5312ae19..c4a416f1898a9 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -301,7 +301,7 @@ print ' '; print ' '; print ''; - print ''; + print ''; print ''; $var=true; diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index 806fd95a95795..aa2883ccb96a3 100644 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -603,7 +603,7 @@ //SEARCH BUTTON print ''; - print ''; + print ''; //ALL/NONE print ''; diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 319ba7ab9d9ab..d85d6ff3b271b 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -422,7 +422,7 @@ print ''; print ''; print ' '; - print ''; + print ''; print "\n"; diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index 650733dbb9c59..a94e2fc5cd021 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -184,7 +184,7 @@ print ''; print ''; if (! empty($_REQUEST['bid'])) print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php index 330f493e6bab1..94a3a26a0f312 100644 --- a/htdocs/compta/deplacement/list.php +++ b/htdocs/compta/deplacement/list.php @@ -119,7 +119,7 @@ print ''; print ' '; print ''; - print ''; + print ''; print "\n"; $var=true; diff --git a/htdocs/compta/dons/liste.php b/htdocs/compta/dons/liste.php index 56c66d4fdce83..f045e82be71ac 100644 --- a/htdocs/compta/dons/liste.php +++ b/htdocs/compta/dons/liste.php @@ -144,7 +144,7 @@ print ''; print ' '; print ''; - print ''; + print ''; print "\n"; $var=True; diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index 3d792e343f0d5..d17507558351c 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -299,7 +299,7 @@ print ' '; print ' '; print ''; - print ''; + print ''; print ''; print ''; if ($conf->use_javascript_ajax) print ''.$langs->trans("All").' / '.$langs->trans("None").''; From 462f65614d134bdc1e6039f098ad5aaa1fb544d5 Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Mon, 13 Jan 2014 10:10:17 +0100 Subject: [PATCH 08/19] Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 --- htdocs/comm/mailing/fiche.php | 2 +- htdocs/compta/clients.php | 2 +- htdocs/compta/facture/list.php | 2 +- htdocs/compta/paiement/cheque/liste.php | 2 +- htdocs/compta/paiement/liste.php | 2 +- htdocs/compta/prelevement/bons.php | 2 +- htdocs/compta/prelevement/demandes.php | 2 +- htdocs/compta/prelevement/liste.php | 2 +- htdocs/compta/sociales/index.php | 2 +- htdocs/compta/stats/cabyprodserv.php | 2 +- htdocs/compta/stats/casoc.php | 2 +- htdocs/compta/ventilation/lignes.php | 2 +- htdocs/contrat/liste.php | 2 +- htdocs/contrat/services.php | 2 +- htdocs/core/lib/company.lib.php | 2 +- htdocs/cron/list.php | 4 ++-- htdocs/fichinter/list.php | 2 +- htdocs/fourn/commande/liste.php | 2 +- htdocs/fourn/facture/list.php | 2 +- htdocs/fourn/facture/paiement.php | 2 +- htdocs/fourn/product/liste.php | 4 ++-- htdocs/holiday/index.php | 2 +- htdocs/product/stock/mouvement.php | 4 ++-- htdocs/product/stock/replenish.php | 6 ++---- 24 files changed, 28 insertions(+), 30 deletions(-) diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 3510df7339eef..8d7f3ea988ada 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -1080,7 +1080,7 @@ { $out.= '
'; $out.= img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name']; - $out.= ' '; + $out.= ' '; $out.= '
'; } } diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index f54f893d79c0b..4f6719adb145e 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -173,7 +173,7 @@ print ''; print ''; - print ''; + print ''; print ''; print "\n"; diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 83b9fd309458e..42d08c3b02cb3 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -317,7 +317,7 @@ print ' '; print ''; print ' '; - print ''; + print ''; print "\n"; if ($num > 0) diff --git a/htdocs/compta/paiement/cheque/liste.php b/htdocs/compta/paiement/cheque/liste.php index 1c1cf71b11c99..7f656a75c7998 100644 --- a/htdocs/compta/paiement/cheque/liste.php +++ b/htdocs/compta/paiement/cheque/liste.php @@ -102,7 +102,7 @@ print ''; print ''; print ''; - print ''; + print ''; print ''; print "\n"; diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php index 5e1653b3ec351..16a6c1410e689 100644 --- a/htdocs/compta/paiement/liste.php +++ b/htdocs/compta/paiement/liste.php @@ -167,7 +167,7 @@ print ''; print ''; print ''; - print ''; + print ''; print ''; if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) { diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index d5c140be91e57..cd460f1aac22c 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -88,7 +88,7 @@ print '
'; print ''; print ' '; - print ''; + print ''; print '
'; print ''; diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php index 3ae2b850aac7b..e48896458693f 100644 --- a/htdocs/compta/prelevement/demandes.php +++ b/htdocs/compta/prelevement/demandes.php @@ -114,7 +114,7 @@ print '
'; print ''; print ''; - print ''; + print ''; print ''; print '
'; diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php index 5ed627dee587d..2cd859969a911 100644 --- a/htdocs/compta/prelevement/liste.php +++ b/htdocs/compta/prelevement/liste.php @@ -129,7 +129,7 @@ print ''; print ' '; print ' '; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index 54cb9fc0c42d1..e96c53895299b 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -162,7 +162,7 @@ print ' '; print ' '; print ''; - print ''; + print ''; print ''; print "\n"; diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php index e24ca5dd56b83..ac82e2e342ac8 100644 --- a/htdocs/compta/stats/cabyprodserv.php +++ b/htdocs/compta/stats/cabyprodserv.php @@ -252,7 +252,7 @@ } print '>'; print ''; - print ''; + print ''; print ''; // Array header print ""; diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php index 97333f1758cc3..9745ef1629086 100644 --- a/htdocs/compta/stats/casoc.php +++ b/htdocs/compta/stats/casoc.php @@ -322,7 +322,7 @@ } print'>'; print ''; -print ''; +print ''; print ''; print ''; // Array titles diff --git a/htdocs/compta/ventilation/lignes.php b/htdocs/compta/ventilation/lignes.php index e8578e7dcf096..fbc8655717811 100644 --- a/htdocs/compta/ventilation/lignes.php +++ b/htdocs/compta/ventilation/lignes.php @@ -90,7 +90,7 @@ print ' '; print ' '; print ''; - print ''; + print ''; print ''; print "\n"; diff --git a/htdocs/contrat/liste.php b/htdocs/contrat/liste.php index 40a6811e41b9a..38576f7e764c7 100644 --- a/htdocs/contrat/liste.php +++ b/htdocs/contrat/liste.php @@ -129,7 +129,7 @@ print ''; print ' '; //print ' '; - print ''; + print ''; print ""; print "\n"; print ''; diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php index ea42df9e01dd9..2f42fc39c77ff 100644 --- a/htdocs/contrat/services.php +++ b/htdocs/contrat/services.php @@ -184,7 +184,7 @@ $filter_date2=dol_mktime(0,0,0,$op2month,$op2day,$op2year); print $form->select_date($filter_date2,'op2',0,0,1); print ''; - print ''; + print ''; print ""; print "\n"; print ''; diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index bcd6c53d48989..a81eff0e5c3b4 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -630,7 +630,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') // Edit print ''; - print ''; + print ''; print ''; print ""; diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index 8d27450eaf8d9..19a0d5cc3b18d 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -182,9 +182,9 @@ print $form->selectarray('status', array('0'=>$langs->trans("No"),'1'=>$langs->trans("Yes")), $status, 1); print ''; print ' '; -print ''; +print ''; print '  '; -print ''; +print ''; print ''; print ''; diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 93142ed2dc3cf..2a037a07563e0 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -124,7 +124,7 @@ print ' '; print ' '; print ' '; - print ''; + print ''; print "\n"; $companystatic=new Societe($db); diff --git a/htdocs/fourn/commande/liste.php b/htdocs/fourn/commande/liste.php index bc4004e4fc114..d6c4bb9427dde 100644 --- a/htdocs/fourn/commande/liste.php +++ b/htdocs/fourn/commande/liste.php @@ -152,7 +152,7 @@ print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index bc7632350c168..dd8d778d63a8d 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -235,7 +235,7 @@ print ''; print ''; print ''; - print ''; + print ''; print ''; print "\n"; diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index f625cead27cfa..8f3f29098326a 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -463,7 +463,7 @@ print ''; print ''; print ''; - print ''; + print ''; print ''; print "\n"; diff --git a/htdocs/fourn/product/liste.php b/htdocs/fourn/product/liste.php index 7806fdab1bd2d..76c34be703413 100644 --- a/htdocs/fourn/product/liste.php +++ b/htdocs/fourn/product/liste.php @@ -200,9 +200,9 @@ print ''; print ''; print ''; - print ''; + print ''; print '  '; - print ''; + print ''; print ''; print ''; print ''; diff --git a/htdocs/holiday/index.php b/htdocs/holiday/index.php index 34443bfaa988d..e7c4b0a3d50c8 100644 --- a/htdocs/holiday/index.php +++ b/htdocs/holiday/index.php @@ -326,7 +326,7 @@ // ACTION print ''; -print ''; +print ''; print ''; print "\n"; diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index eb9391c869825..f8135b69566e3 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -452,9 +452,9 @@ print ''; print ''; print ''; - print ''; + print ''; print '  '; - print ''; + print ''; print ''; print "\n"; print ''; diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index 788bd8fee092a..45c3b3bf7b37c 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -412,10 +412,8 @@ ' '. ' '. ''. - ''. - ''. + ''. + ''. ''. ''; From b61ccb823477f7003912e9e1c6581d6fbbda5e12 Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Mon, 13 Jan 2014 10:15:07 +0100 Subject: [PATCH 09/19] Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 --- htdocs/product/liste.php | 4 ++-- htdocs/product/reassort.php | 4 ++-- htdocs/projet/liste.php | 2 +- htdocs/projet/tasks/index.php | 2 +- htdocs/societe/consumption.php | 4 ++-- htdocs/societe/societe.php | 4 ++-- htdocs/user/index.php | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index e9fe0b60a03af..283305860705d 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -370,8 +370,8 @@ print ''; print ''; - print ''; - print ''; + print ''; + print ''; print ''; print ''; diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index 00793b2ff8a9c..fcbcd780fb6eb 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -274,8 +274,8 @@ print ' '; print ' '; print ''; - print ''; - print ''; + print ''; + print ''; print ''; print ''; diff --git a/htdocs/projet/liste.php b/htdocs/projet/liste.php index a81a21c6c9b4a..974f7f5ef00ab 100644 --- a/htdocs/projet/liste.php +++ b/htdocs/projet/liste.php @@ -142,7 +142,7 @@ print ''; print ''; print ' '; - print ''; + print ''; print "\n"; while ($i < $num) diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php index 8795cf98486dc..8c626175d3dd5 100644 --- a/htdocs/projet/tasks/index.php +++ b/htdocs/projet/tasks/index.php @@ -116,7 +116,7 @@ print ''; print ' '; print ''; -print ''; +print ''; print "\n"; // Show all lines in taskarray (recursive function to go down on tree) diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php index 03036f36a047c..d7c8616a2733b 100644 --- a/htdocs/societe/consumption.php +++ b/htdocs/societe/consumption.php @@ -269,8 +269,8 @@ print ''; print ''; print ''; -print ''; -print ''; +print ''; +print ''; print ''; print ''; diff --git a/htdocs/societe/societe.php b/htdocs/societe/societe.php index bf21bfecfa7ae..7d3e2e1a78d43 100644 --- a/htdocs/societe/societe.php +++ b/htdocs/societe/societe.php @@ -389,9 +389,9 @@ print ''; // Status print ''; - print ''; + print ''; print '  '; - print ''; + print ''; print ''; print "\n"; diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 62ead1935eb35..baa704509cc76 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -126,7 +126,7 @@ print ''; print ''; - print ''; + print ''; print ''; print "\n"; From 6d4a9833e2e6175517264bdae796fe2a33157e31 Mon Sep 17 00:00:00 2001 From: Cedric GROSS Date: Mon, 13 Jan 2014 19:46:23 +0100 Subject: [PATCH 10/19] Fix bug on stock calculation for replenishment: wrong order in ifsql. --- htdocs/product/stock/replenish.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index 788bd8fee092a..27bab21d2e858 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -176,7 +176,7 @@ $sql.= ' p.price_ttc, p.price_base_type,p.fk_product_type,'; $sql.= ' p.tms as datem, p.duration, p.tobuy, p.seuil_stock_alerte,'; $sql.= ' p.desiredstock,'; -$sql.= ' SUM('.$db->ifsql("s.reel IS NULL", "s.reel", "0").') as stock_physique'; +$sql.= ' SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").') as stock_physique'; $sql.= ' FROM ' . MAIN_DB_PREFIX . 'product as p'; $sql.= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product_stock as s'; $sql.= ' ON p.rowid = s.fk_product'; @@ -219,7 +219,7 @@ $sql.= ' AND p.desiredstock > 0'; if ($salert == 'on') // Option to see when stock is lower than alert { - $sql .= ' AND SUM('.$db->ifsql("s.reel IS NULL", "s.reel", "0").') < p.seuil_stock_alerte AND p.seuil_stock_alerte is not NULL'; + $sql .= ' AND SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").') < p.seuil_stock_alerte AND p.seuil_stock_alerte is not NULL'; $alertchecked = 'checked="checked"'; } $sql.= $db->order($sortfield,$sortorder); From 4f1df33e51f2a41dfa2731ca73e06b9137e20409 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 14 Jan 2014 22:18:44 +0100 Subject: [PATCH 11/19] Fix: thumb image was not up to date compared to new skin. --- htdocs/theme/eldy/thumb.png | Bin 4444 -> 3967 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/htdocs/theme/eldy/thumb.png b/htdocs/theme/eldy/thumb.png index 208299ad19764a130622c56a07cfae1b8d7d3cb7..e17e09121473686849b33e203d492ed8d9760697 100644 GIT binary patch literal 3967 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 iW&XuVR7v8+y8i=56+ziQ<^1~q0000 Date: Wed, 15 Jan 2014 02:04:44 +0100 Subject: [PATCH 12/19] Fix: Showing version is wrong when replace by external module --- htdocs/main.inc.php | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 9e48cb258124a..c52186b5511c3 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1423,11 +1423,20 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a if (! empty($_SESSION["disablemodules"])) $loginhtmltext.='
'.$langs->trans("DisabledModules").':
'.join(', ',explode(',',$_SESSION["disablemodules"])); $appli='Dolibarr'; - if (! empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE; + if (! empty($conf->global->MAIN_APPLICATION_TITLE)) + { + $appli=$conf->global->MAIN_APPLICATION_TITLE; + if (preg_match('/\d\.\d/', $appli)) + { + if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")"; // If new title contains a version that is different than core + } + else $appli.=" ".DOL_VERSION; + } + else $appli.=" ".DOL_VERSION; // Link info $logouttext=''; - $logouthtmltext=$appli.' '.DOL_VERSION.'
'; + $logouthtmltext=$appli.'
'; $logouthtmltext.=$langs->trans("Logout").'
'; //$logouthtmltext.="
"; if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http') @@ -1621,10 +1630,16 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me if (preg_match('/es/i',$langs->defaultlang)) $doliurl='http://www.dolibarr.es'; $appli='Dolibarr'; - if (! empty($conf->global->MAIN_APPLICATION_TITLE)) { + if (! empty($conf->global->MAIN_APPLICATION_TITLE)) + { $appli=$conf->global->MAIN_APPLICATION_TITLE; $doliurl=''; + if (preg_match('/\d\.\d/', $appli)) + { + if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")"; // If new title contains a version that is different than core + } + else $appli.=" ".DOL_VERSION; } - $appli.=" ".DOL_VERSION; + else $appli.=" ".DOL_VERSION; print '
'; if ($doliurl) print ''; print $appli; From 0725fea9233b13ee32947bee77f3d60b16ac783d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 15 Jan 2014 03:08:11 +0100 Subject: [PATCH 13/19] Fix: doxygen --- htdocs/categories/class/categorie.class.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 7e990e602c97e..81ea914e481aa 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -499,7 +499,7 @@ function del_type($obj,$type) $column_name=$type; if ($type=='contact') $column_name='socpeople'; if ($type=='fournisseur') $column_name='societe'; - + $sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_".$type; $sql .= " WHERE fk_categorie = ".$this->id; $sql .= " AND fk_".$column_name." = ".$obj->id; @@ -573,9 +573,10 @@ function get_type($field,$classname,$category_table='',$object_table='') /** * check for the presence of an object in a category - * @param string $type object type - * @param int $object_id id of the object to search - * @return int nb number of occurrences + * + * @param string $type Type of category ('member', 'customer', 'supplier', 'product', 'contact') + * @param int $object_id id of the object to search + * @return int number of occurrences */ function containsObject($type, $object_id) { From 9aacb0e7ed43e6ea46f4e1151f008280072810ff Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 15 Jan 2014 03:15:31 +0100 Subject: [PATCH 14/19] Fix: bad permissions on files --- build/doxygen/dolibarr-doxygen-build.pl | 0 build/doxygen/dolibarr-doxygen-filter.pl | 0 build/doxygen/dolibarr-doxygen-getversion.pl | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 build/doxygen/dolibarr-doxygen-build.pl mode change 100644 => 100755 build/doxygen/dolibarr-doxygen-filter.pl mode change 100644 => 100755 build/doxygen/dolibarr-doxygen-getversion.pl diff --git a/build/doxygen/dolibarr-doxygen-build.pl b/build/doxygen/dolibarr-doxygen-build.pl old mode 100644 new mode 100755 diff --git a/build/doxygen/dolibarr-doxygen-filter.pl b/build/doxygen/dolibarr-doxygen-filter.pl old mode 100644 new mode 100755 diff --git a/build/doxygen/dolibarr-doxygen-getversion.pl b/build/doxygen/dolibarr-doxygen-getversion.pl old mode 100644 new mode 100755 From af4d48aec02c17318883a9b850f547d494e27fd7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 15 Jan 2014 15:42:14 +0100 Subject: [PATCH 15/19] Fix: If end date is not defined, we can't say it is too late. --- htdocs/fourn/class/fournisseur.facture.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index a237ef49a5fd0..060d2d51a83c2 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -1378,7 +1378,7 @@ function load_board($user) while ($obj=$this->db->fetch_object($resql)) { $this->nbtodo++; - if ($this->db->jdate($obj->datefin) < ($now - $conf->facture->fournisseur->warning_delay)) $this->nbtodolate++; + if (! empty($obj->datefin) && $this->db->jdate($obj->datefin) < ($now - $conf->facture->fournisseur->warning_delay)) $this->nbtodolate++; } $this->db->free($resql); return 1; From 6a95f7303654ba788ec6446736f79dd42684b6c5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 15 Jan 2014 16:14:34 +0100 Subject: [PATCH 16/19] Fix: Missing translation key --- htdocs/langs/en_US/banks.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang index e4de38e621e43..88ac8d90d5ee1 100644 --- a/htdocs/langs/en_US/banks.lang +++ b/htdocs/langs/en_US/banks.lang @@ -28,6 +28,7 @@ EndBankBalance=End balance CurrentBalance=Current balance FutureBalance=Future balance ShowAllTimeBalance=Show balance from start +AllTime=From start Reconciliation=Reconciliation RIB=Bank Account Number IBAN=IBAN number From d72167d5435af5c69378c322e00be6174061da9a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 15 Jan 2014 19:12:55 +0100 Subject: [PATCH 17/19] Code comments --- htdocs/install/upgrade.php | 14 +++++++++++--- htdocs/install/upgrade2.php | 8 ++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index 904144cad66c4..05defaed9eb5a 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -15,6 +15,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * + * Upgrade scripts can be ran from command line with syntax: + * + * cd htdocs/install + * php upgrade.php 3.4.0 3.5.0 + * php upgrade2.php 3.4.0 3.5.0 + * + * Return code is 0 if OK, >0 if error */ /** @@ -260,6 +268,7 @@ } } + /* * Remove deprecated indexes and constraints for Mysql */ @@ -343,12 +352,12 @@ { while (($file = readdir($handle))!==false) { - if (preg_match('/\.sql$/i',$file)) $filesindir[]=$file; + if (preg_match('/\.sql$/i',$file)) $filesindir[]=$file; } sort($filesindir); } else - { + { print '
'.$langs->trans("ErrorCanNotReadDir",$dir).'
'; } @@ -413,7 +422,6 @@ if ($db->connected) $db->close(); } - if (empty($actiondone)) { print '
'.$langs->trans("ErrorWrongParameters").'
'; diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 78c223a98072b..593ae33ebcc22 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -16,6 +16,14 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . + * + * Upgrade scripts can be ran from command line with syntax: + * + * cd htdocs/install + * php upgrade.php 3.4.0 3.5.0 + * php upgrade2.php 3.4.0 3.5.0 + * + * Return code is 0 if OK, >0 if error */ /** From 031fd2f8b8b3b045b76ec2f56344dd6ab6312c95 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 17 Jan 2014 03:25:31 +0100 Subject: [PATCH 18/19] Fix: No set focus --- htdocs/core/tpl/login.tpl.php | 2 ++ htdocs/core/tpl/passwordforgotten.tpl.php | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index b2aa1877823a5..357c2b2eba6ad 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -33,12 +33,14 @@ +dol_use_jmobile)) { ?> +
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php index 428001e7141fc..414c12bb46232 100644 --- a/htdocs/core/tpl/passwordforgotten.tpl.php +++ b/htdocs/core/tpl/passwordforgotten.tpl.php @@ -31,13 +31,14 @@ - +dol_use_jmobile)) { ?> +
From 4074547589f9442c37267cb69cee7579ca45c200 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 18 Jan 2014 00:50:21 +0100 Subject: [PATCH 19/19] Fix;: Pb of caching static resource (js and css). Add a workaround to avoid any problems. --- htdocs/main.inc.php | 116 ++++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 57 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index c52186b5511c3..0db8df3e45893 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -972,41 +972,44 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs else print "".$appli.""; print "\n"; + $ext=''; + if (! empty($conf->dol_use_jmobile)) $ext='version='.urlencode(DOL_VERSION); + if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax) { print ''."\n"; $jquerytheme = 'smoothness'; if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME; - if (constant('JS_JQUERY_UI')) print ''."\n"; // JQuery - else print ''."\n"; // JQuery - print ''."\n"; // Tooltip - print ''."\n"; // JNotify + if (constant('JS_JQUERY_UI')) print ''."\n"; // JQuery + else print ''."\n"; // JQuery + print ''."\n"; // Tooltip + print ''."\n"; // JNotify /*if (! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) || (defined('REQUIRE_JQUERY_FILEUPLOAD') && constant('REQUIRE_JQUERY_FILEUPLOAD'))) // jQuery fileupload { - print ''."\n"; + print ''."\n"; }*/ if (! empty($conf->global->MAIN_USE_JQUERY_DATATABLES) || (defined('REQUIRE_JQUERY_DATATABLES') && constant('REQUIRE_JQUERY_DATATABLES'))) // jQuery datatables { - //print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; - //print ''."\n"; - print ''."\n"; + //print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + //print ''."\n"; + print ''."\n"; } if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || (defined('REQUIRE_JQUERY_MULTISELECT') && constant('REQUIRE_JQUERY_MULTISELECT'))) // jQuery multiselect { - print ''."\n"; + print ''."\n"; } // jQuery Timepicker if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER')) { - print ''."\n"; + print ''."\n"; } // jQuery jMobile if (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || ! empty($conf->dol_use_jmobile)) { - print ''."\n"; + print ''."\n"; } } @@ -1029,6 +1032,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs } } $themeparam='?lang='.$langs->defaultlang.'&theme='.$conf->theme.(GETPOST('optioncss')?'&optioncss='.GETPOST('optioncss','alpha',1):'').'&userid='.$user->id.'&entity='.$conf->entity; + $themeparam.=($ext?'&'.$ext:''); if (! empty($_SESSION['dol_resetcache'])) $themeparam.='&dol_resetcache='.$_SESSION['dol_resetcache']; if (GETPOST('dol_hide_topmenu')) { $themeparam.='&dol_hide_topmenu='.GETPOST('dol_hide_topmenu'); } if (GETPOST('dol_hide_leftmenu')) { $themeparam.='&dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu'); } @@ -1068,63 +1072,61 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs } } - $ext='.js'; - // Output standard javascript links if (! defined('DISABLE_JQUERY') && ! $disablejs && ! empty($conf->use_javascript_ajax)) { // JQuery. Must be before other includes print ''."\n"; - if (constant('JS_JQUERY')) print ''."\n"; - else print ''."\n"; - if (constant('JS_JQUERY_UI')) print ''."\n"; - else print ''."\n"; - print ''."\n"; - print ''."\n"; + if (constant('JS_JQUERY')) print ''."\n"; + else print ''."\n"; + if (constant('JS_JQUERY_UI')) print ''."\n"; + else print ''."\n"; + print ''."\n"; + print ''."\n"; // jQuery Layout if (! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT) || defined('REQUIRE_JQUERY_LAYOUT')) { - print ''."\n"; + print ''."\n"; } // jQuery jnotify if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && ! defined('DISABLE_JQUERY_JNOTIFY')) { - print ''."\n"; - print ''."\n"; + print ''."\n"; + print ''."\n"; } // jQuery blockUI if (! empty($conf->global->MAIN_USE_JQUERY_BLOCKUI) || defined('REQUIRE_JQUERY_BLOCKUI')) { - print ''."\n"; + print ''."\n"; print ''."\n"; - print ''."\n"; + print ''."\n"; } // Flot if (empty($conf->global->MAIN_DISABLE_JQUERY_FLOT)) { if (constant('JS_JQUERY_FLOT')) { - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; } else { - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; } } // jQuery jeditable if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) { - print ''."\n"; - print ''."\n"; - print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; print ''."\n"; - print ''."\n"; - print ''."\n"; + print ''."\n"; + print ''."\n"; } // jQuery File Upload /* if (! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) || (defined('REQUIRE_JQUERY_FILEUPLOAD') && constant('REQUIRE_JQUERY_FILEUPLOAD'))) { - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; print ''."\n"; - print ''."\n"; + print ''."\n"; }*/ // jQuery DataTables if (! empty($conf->global->MAIN_USE_JQUERY_DATATABLES) || (defined('REQUIRE_JQUERY_DATATABLES') && constant('REQUIRE_JQUERY_DATATABLES'))) { - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; + print ''."\n"; } // jQuery Multiselect if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || (defined('REQUIRE_JQUERY_MULTISELECT') && constant('REQUIRE_JQUERY_MULTISELECT'))) { - print ''."\n"; + print ''."\n"; } // jQuery Timepicker if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER')) { - print ''."\n"; - print ''."\n"; + print ''."\n"; + print ''."\n"; } // jQuery jMobile if (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || (! empty($conf->dol_use_jmobile) && $conf->dol_use_jmobile > 0)) @@ -1189,7 +1191,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs }); '; } - if (empty($conf->dol_use_jmobile) || $conf->dol_use_jmobile != 3) print ''."\n"; + if (empty($conf->dol_use_jmobile) || $conf->dol_use_jmobile != 3) print ''."\n"; } } @@ -1212,10 +1214,10 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs // Global js function print ''."\n"; - print ''."\n"; + print ''."\n"; // Add datepicker default options - print ''."\n"; + print ''."\n"; // JS forced by modules (relative url starting with /) if (! empty($conf->modules_parts['js'])) // $conf->modules_parts['js'] is array('module'=>array('file1','file2'))