From 7cc7e8392d8bdf09025724bd7a1336836c6329c4 Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Mon, 17 Jun 2013 11:58:59 +0200 Subject: [PATCH 01/16] Fix ODT to PDF exec scripts path --- htdocs/includes/odtphp/odf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php index 5326af0e116..d4467d7aeb8 100644 --- a/htdocs/includes/odtphp/odf.php +++ b/htdocs/includes/odtphp/odf.php @@ -458,7 +458,7 @@ IMG; $execmethod=(empty($conf->global->MAIN_EXEC_USE_POPEN)?1:2); // 1 or 2 $name=str_replace('.odt', '', $name); - $command = DOL_DOCUMENT_ROOT.'/includes/odtphp/odt2pdf.sh '.$name; + $command = '../../scripts/odt2pdf/odt2pdf.sh '.$name; //$dirname=dirname($name); //$command = DOL_DOCUMENT_ROOT.'/includes/odtphp/odt2pdf.sh '.$name.' '.$dirname; From dc5db0c1379903054e1ebc8462568005acbb2fea Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Tue, 18 Jun 2013 09:07:53 +0200 Subject: [PATCH 02/16] fix ODT to PDF script path --- htdocs/includes/odtphp/odf.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php index d4467d7aeb8..94c69705442 100644 --- a/htdocs/includes/odtphp/odf.php +++ b/htdocs/includes/odtphp/odf.php @@ -458,7 +458,12 @@ IMG; $execmethod=(empty($conf->global->MAIN_EXEC_USE_POPEN)?1:2); // 1 or 2 $name=str_replace('.odt', '', $name); - $command = '../../scripts/odt2pdf/odt2pdf.sh '.$name; + if (!empty($conf->global->MAIN_DOL_SCRIPTS_ROOT)) { + $command = $conf->global->MAIN_DOL_SCRIPTS_ROOT.'/scripts/odt2pdf/odt2pdf.sh '.$name; + }else { + $command = '../../scripts/odt2pdf/odt2pdf.sh '.$name; + } + //$dirname=dirname($name); //$command = DOL_DOCUMENT_ROOT.'/includes/odtphp/odt2pdf.sh '.$name.' '.$dirname; From 835b8e9d7ed738dbcf1619be0a940c3a72bf46ef Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Wed, 19 Jun 2013 11:23:43 +0200 Subject: [PATCH 03/16] Fix trad holidays --- htdocs/langs/fr_FR/holiday.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang index 35a043504eb..876d26c31dc 100644 --- a/htdocs/langs/fr_FR/holiday.lang +++ b/htdocs/langs/fr_FR/holiday.lang @@ -85,8 +85,8 @@ NewSoldeCP=Nouveau Solde alreadyCPexist=Une demande de congés à déjà été effectuée sur cette période. UserName=Nom Prénom Employee=Salarié -FirstDayOfHoliday=Premier jour de congès -LastDayOfHoliday=Dernier jour de congès +FirstDayOfHoliday=Premier jour de congés +LastDayOfHoliday=Dernier jour de congés HolidaysMonthlyUpdate=Mise à jour mensuelle ManualUpdate=Mise à jour manuelle From 035edc12ce48438b4ef5c1847e32ab0a572fc976 Mon Sep 17 00:00:00 2001 From: Florian Henry Date: Wed, 19 Jun 2013 14:41:18 +0200 Subject: [PATCH 04/16] Fix [ bug #945 ] error adding a service --- htdocs/product/class/product.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 7973ab0db57..e9fcde9d67c 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -315,7 +315,7 @@ class Product extends CommonObject $sql.= ", ".$this->status; $sql.= ", ".$this->status_buy; $sql.= ", '".$this->canvas."'"; - $sql.= ", ".((! isset($this->finished) || $this->finished < 0)?'null':$this->finished); + $sql.= ", ".((empty($this->finished) || $this->finished < 0)?'null':$this->finished); $sql.= ")"; dol_syslog(get_class($this)."::Create sql=".$sql); @@ -463,7 +463,7 @@ class Product extends CommonObject $sql.= ",tosell = " . $this->status; $sql.= ",tobuy = " . $this->status_buy; - $sql.= ",finished = " . ((! isset($this->finished) || $this->finished < 0) ? "null" : $this->finished); + $sql.= ",finished = " . ((empty($this->finished) || $this->finished < 0) ? "null" : $this->finished); $sql.= ",weight = " . ($this->weight!='' ? "'".$this->weight."'" : 'null'); $sql.= ",weight_units = " . ($this->weight_units!='' ? "'".$this->weight_units."'": 'null'); $sql.= ",length = " . ($this->length!='' ? "'".$this->length."'" : 'null'); From 9f396718869cc9ce99bfacd5696c50337be4cadb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 19 Jun 2013 19:40:19 +0200 Subject: [PATCH 05/16] Fix: Bad translation --- htdocs/langs/fr_FR/admin.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 4bb7b833596..2d9c4a329b8 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -556,7 +556,7 @@ Permission113= Configurer les comptes financiers (créer, gérer les catégories Permission114= Rapprocher les écritures bancaires Permission115= Exporter transactions et relevés Permission116= Saisir virements entre comptes -Permission117= Gérer les envois de chèques +Permission117= Gérer les dépots en banque de chèques reçus Permission121= Consulter les tiers (sociétés) liés à l'utilisateur Permission122= Créer/modifier les tiers (sociétés) liés à l'utilisateur Permission125= Supprimer les tiers (sociétés) liés à l'utilisateur From aaad4d3474c75bcdf5ec8408e88f462ee6b4d380 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 19 Jun 2013 19:52:20 +0200 Subject: [PATCH 06/16] Fix: Menu cheque depends on bank module and not invoice. --- htdocs/core/menus/init_menu_auguria.sql | 6 +++--- htdocs/core/menus/standard/eldy.lib.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index 8f49ca9eb7e..bdcfc30937f 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -199,9 +199,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2706__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/sellsjournal.php?leftmenu=ca', 'SellsJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2707__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/purchasesjournal.php?leftmenu=ca', 'PurchasesJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__); -- Check deposit -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled && $conf->banque->enabled', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank', 'MenuChequeDeposits', 0, 'bills', '$user->rights->facture->lire', '', 2, 9, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled && $conf->banque->enabled', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->facture->lire', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled && $conf->banque->enabled', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/liste.php?leftmenu=checks', 'List', 1, 'bills', '$user->rights->facture->lire', '', 2, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '(! empty($conf->facture->enabled) && ! empty($conf->banque->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank', 'MenuChequeDeposits', 0, 'bills', '$user->rights->banque->lire', '', 2, 9, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '(! empty($conf->facture->enabled) && ! empty($conf->banque->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->banque->lire', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '(! empty($conf->facture->enabled) && ! empty($conf->banque->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/liste.php?leftmenu=checks', 'List', 1, 'bills', '$user->rights->banque->lire', '', 2, 1, __ENTITY__); -- Withdrawal insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled', __HANDLER__, 'left', 2500__+MAX_llx_menu__, 'accountancy', 'withdraw', 14__+MAX_llx_menu__, '/compta/prelevement/index.php?leftmenu=withdraw&mainmenu=bank', 'StandingOrders', 0, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 9, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2502__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/create.php?leftmenu=withdraw', 'NewStandingOrder', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 0, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 9f3637477bc..9a85f6224f5 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -906,7 +906,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu } // Gestion cheques - if (! empty($conf->facture->enabled) && ! empty($conf->banque->enabled)) + if ((! empty($conf->facture->enabled) && ! empty($conf->banque->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)) { $newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank",$langs->trans("MenuChequeDeposits"),0,$user->rights->banque->cheque, '', $mainmenu, 'checks'); $newmenu->add("/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new&mainmenu=bank",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque); From ec2e4c8a8ba855132ebc9f90858500988332b77c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 19 Jun 2013 22:58:35 +0200 Subject: [PATCH 07/16] Fix: parenthesis at wrong place --- htdocs/core/menus/init_menu_auguria.sql | 6 +++--- htdocs/core/menus/standard/eldy.lib.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index bdcfc30937f..eeeb699a844 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -199,9 +199,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2706__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/sellsjournal.php?leftmenu=ca', 'SellsJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2707__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/journal/purchasesjournal.php?leftmenu=ca', 'PurchasesJournal', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__); -- Check deposit -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '(! empty($conf->facture->enabled) && ! empty($conf->banque->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank', 'MenuChequeDeposits', 0, 'bills', '$user->rights->banque->lire', '', 2, 9, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '(! empty($conf->facture->enabled) && ! empty($conf->banque->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->banque->lire', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '(! empty($conf->facture->enabled) && ! empty($conf->banque->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/liste.php?leftmenu=checks', 'List', 1, 'bills', '$user->rights->banque->lire', '', 2, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank', 'MenuChequeDeposits', 0, 'bills', '$user->rights->banque->lire', '', 2, 9, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->banque->lire', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/liste.php?leftmenu=checks', 'List', 1, 'bills', '$user->rights->banque->lire', '', 2, 1, __ENTITY__); -- Withdrawal insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled', __HANDLER__, 'left', 2500__+MAX_llx_menu__, 'accountancy', 'withdraw', 14__+MAX_llx_menu__, '/compta/prelevement/index.php?leftmenu=withdraw&mainmenu=bank', 'StandingOrders', 0, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 9, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2502__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/create.php?leftmenu=withdraw', 'NewStandingOrder', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 0, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 9a85f6224f5..f8bb5d57f6e 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -906,7 +906,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu } // Gestion cheques - if ((! empty($conf->facture->enabled) && ! empty($conf->banque->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)) + if (! empty($conf->banque->enabled) && (! empty($conf->facture->enabled)) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON)) { $newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank",$langs->trans("MenuChequeDeposits"),0,$user->rights->banque->cheque, '', $mainmenu, 'checks'); $newmenu->add("/compta/paiement/cheque/fiche.php?leftmenu=checks&action=new&mainmenu=bank",$langs->trans("NewChequeDeposit"),1,$user->rights->banque->cheque); From f987fd2245ca132505eb0cce686ffc496c1bb840 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 19 Jun 2013 23:46:18 +0200 Subject: [PATCH 08/16] Fix: Inconsistency arrays into php function --- htdocs/core/class/translate.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index b5f2dfce9c3..ffa06230d20 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -759,6 +759,7 @@ class Translate { $this->load("dict"); $label=array(); + foreach($this->cache_currencies as $key => $val) $label[$key]=$val['label']; $num = $db->num_rows($resql); $i = 0; @@ -772,9 +773,9 @@ class Translate $label[$obj->code_iso] = $this->cache_currencies[$obj->code_iso]['label']; $i++; } - + //print count($label).' '.count($this->cache_currencies); array_multisort($label, SORT_ASC, $this->cache_currencies); - + //var_dump($this->cache_currencies); $this->cache_currencies is now sorted onto label return $num; } else From b599481ef6aee92fb17abebc6b172d4c269bdc61 Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Thu, 20 Jun 2013 09:18:12 +0200 Subject: [PATCH 09/16] standardize code --- htdocs/adherents/card_subscriptions.php | 2 +- htdocs/adherents/cotisations.php | 2 +- htdocs/adherents/index.php | 12 ++++----- htdocs/admin/osc-languages.php | 2 +- htdocs/admin/system/database-tables.php | 4 +-- htdocs/admin/system/dbtable.php | 2 +- htdocs/admin/system/modules.php | 2 +- htdocs/admin/tools/listsessions.php | 2 +- htdocs/bookmarks/liste.php | 2 +- htdocs/boutique/client/fiche.php | 2 +- htdocs/boutique/client/index.php | 2 +- htdocs/boutique/commande/ca.php | 4 +-- htdocs/boutique/commande/fiche.php | 2 +- htdocs/boutique/commande/index.php | 2 +- htdocs/boutique/critiques/bestproduct.php | 2 +- htdocs/boutique/critiques/index.php | 2 +- htdocs/boutique/index.php | 2 +- htdocs/boutique/notification/index.php | 2 +- htdocs/boutique/notification/produits.php | 2 +- htdocs/boutique/produits/index.php | 2 +- htdocs/boutique/produits/osc-liste.php | 2 +- htdocs/boutique/promotion/index.php | 2 +- htdocs/comm/action/contact.php | 2 +- htdocs/comm/action/index.php | 2 +- htdocs/comm/action/listactions.php | 2 +- htdocs/comm/bookmark.php | 2 +- htdocs/comm/contact.php | 2 +- htdocs/comm/fiche.php | 4 +-- htdocs/comm/list.php | 2 +- htdocs/comm/mailing/cibles.php | 2 +- htdocs/comm/mailing/index.php | 2 +- htdocs/comm/mailing/liste.php | 2 +- htdocs/comm/propal/apercu.php | 2 +- htdocs/comm/propal/index.php | 8 +++--- htdocs/comm/remx.php | 6 ++--- htdocs/commande/apercu.php | 4 +-- htdocs/commande/customer.php | 2 +- htdocs/commande/index.php | 8 +++--- htdocs/compta/bank/bilan.php | 8 +++--- htdocs/compta/bank/releve.php | 2 +- htdocs/compta/bank/search.php | 2 +- htdocs/compta/charges/index.php | 4 +-- htdocs/compta/clients.php | 2 +- htdocs/compta/dons/stats.php | 6 ++--- htdocs/compta/facture/apercu.php | 4 +-- htdocs/compta/facture/fiche-rec.php | 4 +-- htdocs/compta/facture/prelevement.php | 2 +- htdocs/compta/index.php | 6 ++--- htdocs/compta/localtax/clients.php | 2 +- htdocs/compta/localtax/index.php | 2 +- htdocs/compta/localtax/reglement.php | 2 +- htdocs/compta/paiement/avalider.php | 2 +- htdocs/compta/paiement/cheque/fiche.php | 2 +- htdocs/compta/paiement/cheque/index.php | 2 +- htdocs/compta/paiement/cheque/liste.php | 2 +- htdocs/compta/paiement/liste.php | 2 +- htdocs/compta/paiement_charge.php | 2 +- htdocs/compta/prelevement/bons.php | 2 +- htdocs/compta/prelevement/create.php | 2 +- htdocs/compta/prelevement/factures.php | 4 +-- htdocs/compta/prelevement/fiche-stat.php | 2 +- htdocs/compta/prelevement/ligne.php | 2 +- htdocs/compta/prelevement/lignes.php | 4 +-- htdocs/compta/prelevement/liste.php | 2 +- htdocs/compta/prelevement/rejets.php | 2 +- htdocs/compta/prelevement/stats.php | 4 +-- htdocs/compta/recap-compta.php | 2 +- htdocs/compta/resultat/clientfourn.php | 26 +++++++++---------- htdocs/compta/sociales/index.php | 2 +- htdocs/compta/stats/index.php | 8 +++--- htdocs/compta/tva/clients.php | 2 +- htdocs/compta/tva/index.php | 2 +- htdocs/compta/tva/quadri.php | 4 +-- htdocs/compta/tva/reglement.php | 2 +- .../compta/ventilation/fournisseur/lignes.php | 2 +- .../compta/ventilation/fournisseur/liste.php | 2 +- htdocs/compta/ventilation/lignes.php | 2 +- htdocs/compta/ventilation/liste.php | 2 +- htdocs/contact/list.php | 2 +- htdocs/contrat/fiche.php | 4 +-- htdocs/core/class/dolprintipp.class.php | 2 +- htdocs/core/lib/company.lib.php | 2 +- htdocs/core/lib/sendings.lib.php | 2 +- htdocs/expedition/index.php | 4 +-- htdocs/expedition/liste.php | 2 +- htdocs/exports/export.php | 4 +-- htdocs/fichinter/apercu.php | 4 +-- htdocs/fichinter/list.php | 2 +- htdocs/fourn/commande/dispatch.php | 2 +- htdocs/fourn/commande/history.php | 2 +- htdocs/fourn/commande/index.php | 10 +++---- htdocs/fourn/commande/liste.php | 2 +- htdocs/fourn/fiche.php | 2 +- htdocs/fourn/index.php | 6 ++--- htdocs/fourn/product/index.php | 2 +- htdocs/fourn/product/liste.php | 2 +- htdocs/fourn/recap-fourn.php | 4 +-- htdocs/livraison/fiche.php | 4 +-- htdocs/margin/agentMargins.php | 2 +- htdocs/margin/customerMargins.php | 2 +- htdocs/margin/tabs/productMargins.php | 2 +- htdocs/margin/tabs/thirdpartyMargins.php | 2 +- htdocs/product/popuprop.php | 2 +- htdocs/product/price.php | 2 +- htdocs/product/stats/commande.php | 2 +- htdocs/product/stats/commande_fournisseur.php | 2 +- htdocs/product/stats/contrat.php | 2 +- htdocs/product/stats/facture.php | 2 +- htdocs/product/stats/facture_fournisseur.php | 2 +- htdocs/product/stock/index.php | 4 +-- htdocs/product/stock/liste.php | 2 +- htdocs/product/stock/mouvement.php | 2 +- htdocs/product/stock/valo.php | 2 +- htdocs/projet/activity/index.php | 8 +++--- htdocs/projet/element.php | 2 +- htdocs/projet/index.php | 4 +-- htdocs/projet/tasks/contact.php | 4 +-- htdocs/public/members/public_list.php | 2 +- htdocs/societe/commerciaux.php | 2 +- htdocs/societe/index.php | 2 +- htdocs/societe/societe.php | 2 +- htdocs/user/group/fiche.php | 2 +- htdocs/user/group/index.php | 2 +- htdocs/user/home.php | 4 +-- htdocs/user/index.php | 2 +- 125 files changed, 190 insertions(+), 190 deletions(-) diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index 524e6c04e7a..81a5227e575 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -700,7 +700,7 @@ if ($rowid) { $objp = $db->fetch_object($result); $var=!$var; - print ""; + print ""; $cotisationstatic->ref=$objp->crowid; $cotisationstatic->id=$objp->crowid; print ''.$cotisationstatic->getNomUrl(1).''; diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php index ad71332eff2..1175f22536c 100644 --- a/htdocs/adherents/cotisations.php +++ b/htdocs/adherents/cotisations.php @@ -136,7 +136,7 @@ if ($result) print "
"; print ''; } - print ""; + print ""; // Ref print ''.$cotisation->getNomUrl(1).''; diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 6c0b0dc4019..59ed0b36e84 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -27,7 +27,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php'; -require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php'; +require_once DOL_DOCUMENT_ROOT.'/adherents/class/cotisation.class.php'; $langs->load("companies"); $langs->load("members"); @@ -135,15 +135,15 @@ print ''; print ''.$langs->trans("SearchAMember").''; print "\n"; $var=false; -print ""; +print ""; print ''; print $langs->trans("Ref").':'; print ''; -print ""; +print ""; print ''; print $langs->trans("Name").':'; print ''; -print ""; +print ""; print ''; print $langs->trans("Other").':'; print ''; @@ -338,7 +338,7 @@ print "\n"; foreach ($AdherentType as $key => $adhtype) { $var=!$var; - print ""; + print ""; print ''.$adhtype->getNomUrl(1, dol_size(32)).''; print ''.(isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0?$MemberToValidate[$key]:'').' '.$staticmember->LibStatut(-1,$adhtype->cotisation,0,3).''; print ''.(isset($MembersValidated[$key]) && ($MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0) > 0) ? $MembersValidated[$key]-(isset($MemberUpToDate[$key])?$MemberUpToDate[$key]:0):'').' '.$staticmember->LibStatut(1,$adhtype->cotisation,0,3).''; @@ -402,7 +402,7 @@ krsort($Total); foreach ($Total as $key=>$value) { $var=!$var; - print ""; + print ""; print "$key"; print "".$Number[$key].""; print "".price($value).""; diff --git a/htdocs/admin/osc-languages.php b/htdocs/admin/osc-languages.php index 0d6df08a8b7..83446034f0d 100644 --- a/htdocs/admin/osc-languages.php +++ b/htdocs/admin/osc-languages.php @@ -72,7 +72,7 @@ if ($resql) while ($i < $num) { $objp = $db->fetch_object($resql); $var=!$var; - print ""; + print ""; print "$objp->languages_id\n"; print "$objp->name\n"; print "$objp->code\n"; diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php index 7e82bab5e3f..eb638b68711 100644 --- a/htdocs/admin/system/database-tables.php +++ b/htdocs/admin/system/database-tables.php @@ -103,7 +103,7 @@ else { $obj = $db->fetch_object($resql); $var=!$var; - print ""; + print ""; print ''.$obj->Name.''; print ''.$obj->Engine.''; @@ -156,7 +156,7 @@ else { $row = $db->fetch_row($resql); $var=!$var; - print ""; + print ""; print ''.$row[0].''; print ''.$row[1].''; print ''.$row[2].''; diff --git a/htdocs/admin/system/dbtable.php b/htdocs/admin/system/dbtable.php index f5eaaaa4ea4..fe182c2e73e 100644 --- a/htdocs/admin/system/dbtable.php +++ b/htdocs/admin/system/dbtable.php @@ -112,7 +112,7 @@ else { $row = $db->fetch_row($resql); $var=!$var; - print ""; + print ""; print "$row[0]"; print "$row[1]"; diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php index 0baed9e53bc..73fd45d9099 100644 --- a/htdocs/admin/system/modules.php +++ b/htdocs/admin/system/modules.php @@ -106,7 +106,7 @@ foreach($sortorder as $numero=>$name) $idperms=""; $var=!$var; // Module - print ""; + print ""; $alt=$name.' - '.$modules_files[$numero]; if (! empty($picto[$numero])) { diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php index 780e4427078..b4ca64c95a5 100644 --- a/htdocs/admin/tools/listsessions.php +++ b/htdocs/admin/tools/listsessions.php @@ -145,7 +145,7 @@ if ($savehandler == 'files') { $var=!$var; - print ""; + print ""; // Login print ''.$sessionentry['login'].''; diff --git a/htdocs/bookmarks/liste.php b/htdocs/bookmarks/liste.php index c3634b6c726..c322360fb4a 100644 --- a/htdocs/bookmarks/liste.php +++ b/htdocs/bookmarks/liste.php @@ -103,7 +103,7 @@ if ($resql) $obj = $db->fetch_object($resql); $var=!$var; - print ""; + print ""; // Id print ''; diff --git a/htdocs/boutique/client/fiche.php b/htdocs/boutique/client/fiche.php index feaf7d2068e..31d7bf3e81e 100644 --- a/htdocs/boutique/client/fiche.php +++ b/htdocs/boutique/client/fiche.php @@ -80,7 +80,7 @@ if ($id > 0) { $objp = $dbosc->fetch_object($resql); $var=!$var; - print ""; + print ""; print 'Fiche '; diff --git a/htdocs/boutique/client/index.php b/htdocs/boutique/client/index.php index 8b67d4311f5..82eb9ef4bb0 100644 --- a/htdocs/boutique/client/index.php +++ b/htdocs/boutique/client/index.php @@ -70,7 +70,7 @@ if ($resql) { $objp = $dbosc->fetch_object($resql); $var=!$var; - print ""; + print ""; print ''.$objp->customers_firstname."\n"; print ''.$objp->customers_lastname."\n"; print "$objp->customers_email_address\n"; diff --git a/htdocs/boutique/commande/ca.php b/htdocs/boutique/commande/ca.php index c8f170af15c..b5f4bab9e1c 100644 --- a/htdocs/boutique/commande/ca.php +++ b/htdocs/boutique/commande/ca.php @@ -66,7 +66,7 @@ if ($resql) { $objp = $dbosc->fetch_object($resql); $var=!$var; - print ""; + print ""; print 'Somme des commandes'; print ''.price($objp->value).''; @@ -94,7 +94,7 @@ if ($resql) { $objp = $dbosc->fetch_object($resql); $var=!$var; - print ""; + print ""; print 'Somme des frais de port'; print ''.price($objp->value).''; $i++; diff --git a/htdocs/boutique/commande/fiche.php b/htdocs/boutique/commande/fiche.php index e7f0e83537f..e00f9007940 100644 --- a/htdocs/boutique/commande/fiche.php +++ b/htdocs/boutique/commande/fiche.php @@ -86,7 +86,7 @@ if ($id > 0) { $objp = $dbosc->fetch_object($resql); $var=!$var; - print ""; + print ""; print ''; print 'Fiche livre'; diff --git a/htdocs/boutique/commande/index.php b/htdocs/boutique/commande/index.php index 382ecba6600..c5d166cf4e4 100644 --- a/htdocs/boutique/commande/index.php +++ b/htdocs/boutique/commande/index.php @@ -69,7 +69,7 @@ if ($resql) { $objp = $dbosc->fetch_object($resql); $var=!$var; - print ""; + print ""; print 'Fiche '; print $objp->orders_id .""; diff --git a/htdocs/boutique/critiques/bestproduct.php b/htdocs/boutique/critiques/bestproduct.php index 45e3fba2a88..556c1926979 100644 --- a/htdocs/boutique/critiques/bestproduct.php +++ b/htdocs/boutique/critiques/bestproduct.php @@ -74,7 +74,7 @@ if ($resql) while ($i < $num) { $objp = $dbosc->fetch_object($resql); $var=!$var; - print ""; + print ""; print ''.$objp->products_model.''; print ''.$objp->rat."\n"; print ''.$objp->products_quantity."\n"; diff --git a/htdocs/boutique/critiques/index.php b/htdocs/boutique/critiques/index.php index fd6bdb528f4..186756f6e42 100644 --- a/htdocs/boutique/critiques/index.php +++ b/htdocs/boutique/critiques/index.php @@ -70,7 +70,7 @@ if ($resql) { while ($i < $num) { $objp = $dbosc->fetch_object($resql); $var=!$var; - print ""; + print ""; print "".substr($objp->products_name, 0, 30)."\n"; print ''.substr($objp->reviews_text, 0, 40)." ...\n"; print "$objp->reviews_rating\n"; diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php index 0e791515f09..91301c69dec 100644 --- a/htdocs/boutique/index.php +++ b/htdocs/boutique/index.php @@ -70,7 +70,7 @@ if ($result) { $objp = $dbosc->fetch_object($result); $var=!$var; - print ""; + print ""; print ''.$objp->mois.''; print ''.price($objp->value).''; diff --git a/htdocs/boutique/notification/index.php b/htdocs/boutique/notification/index.php index 62fbe0ce597..3a27326e1fb 100644 --- a/htdocs/boutique/notification/index.php +++ b/htdocs/boutique/notification/index.php @@ -70,7 +70,7 @@ if ($resql) { $objp = $dbosc->fetch_object($resql); $var=!$var; - print ""; + print ""; print "rowid\">$objp->customers_firstname $objp->customers_lastname\n"; print ''.$objp->products_name.""; print "\n"; diff --git a/htdocs/boutique/notification/produits.php b/htdocs/boutique/notification/produits.php index 18f66b696e7..eb897497540 100644 --- a/htdocs/boutique/notification/produits.php +++ b/htdocs/boutique/notification/produits.php @@ -71,7 +71,7 @@ if ($resql) { $objp = $dbosc->fetch_object($resql); $var=!$var; - print ""; + print ""; print ''.$objp->products_name.""; print ''.$objp->nb.''; diff --git a/htdocs/boutique/produits/index.php b/htdocs/boutique/produits/index.php index 71dd2bd8d53..f8bae975445 100644 --- a/htdocs/boutique/produits/index.php +++ b/htdocs/boutique/produits/index.php @@ -67,7 +67,7 @@ if ($resql) { $objp = $dbosc->fetch_object($resql); $var=!$var; - print ""; + print ""; print ''.$objp->customers_firstname."\n"; print ''.$objp->customers_lastname."\n"; print "$objp->customers_email_address\n"; diff --git a/htdocs/boutique/produits/osc-liste.php b/htdocs/boutique/produits/osc-liste.php index 84084bfde7a..ef1369dd503 100644 --- a/htdocs/boutique/produits/osc-liste.php +++ b/htdocs/boutique/produits/osc-liste.php @@ -81,7 +81,7 @@ if ($resql) { $objp = $dbosc->fetch_object($resql); $var=!$var; - print ""; + print ""; print "$objp->products_id\n"; print "$objp->products_model\n"; print "$objp->products_name\n"; diff --git a/htdocs/boutique/promotion/index.php b/htdocs/boutique/promotion/index.php index f70b793cd64..7cbba5c5014 100644 --- a/htdocs/boutique/promotion/index.php +++ b/htdocs/boutique/promotion/index.php @@ -82,7 +82,7 @@ if ($resql) $objp = $dbosc->fetch_object($i); $var=!$var; - print ""; + print ""; print ''.$objp->products_model.""; print ''.$objp->products_name.""; diff --git a/htdocs/comm/action/contact.php b/htdocs/comm/action/contact.php index 87a13f28c55..6baafcaf036 100644 --- a/htdocs/comm/action/contact.php +++ b/htdocs/comm/action/contact.php @@ -264,7 +264,7 @@ if ($id > 0 || ! empty($ref)) print ''; // Ligne ajout pour contact interne - print ""; + print ""; print ''; print img_object('','user').' '.$langs->trans("Users"); diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 165101e3cfa..7facb9b5459 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -971,7 +971,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa print ''; if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create) { - $newparam.='&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year; + $newparam.='&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year; //$param='month='.$monthshown.'&year='.$year; $hourminsec='100000'; diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 2fdf9315712..ebe68fa3328 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -260,7 +260,7 @@ if ($resql) $var=!$var; - print ""; + print ""; // Action (type) print ''; diff --git a/htdocs/comm/bookmark.php b/htdocs/comm/bookmark.php index dff26cb2618..1b5b1100736 100644 --- a/htdocs/comm/bookmark.php +++ b/htdocs/comm/bookmark.php @@ -122,7 +122,7 @@ if ($resql) $obj = $db->fetch_object($resql); $var=!$var; - print ""; + print ""; //print "" . ($i + 1 + ($limit * $page)) . ""; print "".$obj->bid.""; print "".img_object($langs->trans("ShowUser"),"user").' '.$obj->lastname." ".$obj->firstname."\n"; diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php index e55f88de7aa..4281eab9cb1 100644 --- a/htdocs/comm/contact.php +++ b/htdocs/comm/contact.php @@ -156,7 +156,7 @@ if ($resql) $var=!$var; - print ""; + print ""; print ''.img_object($langs->trans("ShowContact"),"contact"); print ' '.$obj->name.''; print "$obj->firstname"; diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index c785704d456..811e4a8d211 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -626,7 +626,7 @@ if ($id > 0) $objp = $db->fetch_object($resql); $var=!$var; - print ""; + print ""; print ''; $contrat->id=$objp->id; $contrat->ref=$objp->ref?$objp->ref:$objp->id; @@ -748,7 +748,7 @@ if ($id > 0) { $objp = $db->fetch_object($resql); $var=!$var; - print ""; + print ""; print ''; $facturestatic->id=$objp->facid; $facturestatic->ref=$objp->facnumber; diff --git a/htdocs/comm/list.php b/htdocs/comm/list.php index 28696228e45..0c989fa5388 100755 --- a/htdocs/comm/list.php +++ b/htdocs/comm/list.php @@ -233,7 +233,7 @@ if ($result) $var=!$var; - print ""; + print ""; print ''; $thirdpartystatic->id=$obj->rowid; $thirdpartystatic->name=$obj->name; diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 3c7d425feb1..538d4c04fc4 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -450,7 +450,7 @@ if ($object->fetch($id) >= 0) $obj = $db->fetch_object($resql); $var=!$var; - print ""; + print ""; print ''.$obj->email.''; print ''.$obj->lastname.''; print ''.$obj->firstname.''; diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index 088ee43a02a..42944afabef 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -175,7 +175,7 @@ if ($result) $obj = $db->fetch_object($result); $var=!$var; - print ""; + print ""; print ''.img_object($langs->trans("ShowEMail"),"email").' '.$obj->rowid.''; print ''.dol_trunc($obj->titre,38).''; print ''.dol_print_date($db->jdate($obj->date_creat),'day').''; diff --git a/htdocs/comm/mailing/liste.php b/htdocs/comm/mailing/liste.php index b05f859f54e..41a4e57a7ac 100644 --- a/htdocs/comm/mailing/liste.php +++ b/htdocs/comm/mailing/liste.php @@ -136,7 +136,7 @@ if ($result) $var=!$var; - print ""; + print ""; print ''; print img_object($langs->trans("ShowEMail"),"email").' '.stripslashes($obj->rowid).''; print ''.$obj->titre.''; diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php index 78f57e15f14..2fd7c86fb9a 100644 --- a/htdocs/comm/propal/apercu.php +++ b/htdocs/comm/propal/apercu.php @@ -140,7 +140,7 @@ if ($id > 0 || ! empty($ref)) print_titre($langs->trans("Documents")); print ''; - print ""; + print ""; print ''; diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index 2a31d4a48b7..70eb2e49092 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -180,7 +180,7 @@ if (! empty($conf->propal->enabled)) { $var=!$var; $obj = $db->fetch_object($resql); - print ""; + print ""; $propalstatic->id=$obj->rowid; $propalstatic->ref=$obj->ref; @@ -241,7 +241,7 @@ if ($resql) $var=!$var; $obj = $db->fetch_object($resql); - print ""; + print ""; print '"; + print ""; print '"; + print ""; print '"; + print ""; print ''; if ($obj->description == '(CREDIT_NOTE)') { @@ -384,7 +384,7 @@ if ($socid > 0) if ($_GET["action"]=='split' && $_GET['remid'] == $obj->rowid) { - print ""; + print ""; print '"; + print ""; print ''; if ($obj->description == '(CREDIT_NOTE)') { diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php index f92a309a53c..b4b92e760c5 100644 --- a/htdocs/commande/apercu.php +++ b/htdocs/commande/apercu.php @@ -126,7 +126,7 @@ if ($id > 0 || ! empty($ref)) print_titre($langs->trans("Documents")); print '
".$langs->trans("Propal")." PDF
".$langs->trans("Propal")." PDF'.$object->ref.'.pdf
'; $propalstatic->id=$obj->rowid; @@ -402,7 +402,7 @@ if (! empty($conf->propal->enabled)) { $var=!$var; $obj = $db->fetch_object($resql); - print "
'; $propalstatic->id=$obj->rowid; @@ -474,7 +474,7 @@ if (! empty($conf->propal->enabled)) { $var=!$var; $obj = $db->fetch_object($resql); - print "
'; $propalstatic->id=$obj->rowid; diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index 56dec89394d..cfa83e78875 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -338,7 +338,7 @@ if ($socid > 0) { $obj = $db->fetch_object($resql); $var = !$var; - print "
'.dol_print_date($db->jdate($obj->dc),'dayhour').'
'; $amount1=price2num($obj->amount_ttc/2,'MT'); $amount2=($obj->amount_ttc-$amount1); @@ -495,7 +495,7 @@ if ($socid > 0) { $obj = array_shift($tab_sqlobj); $var = !$var; - print "
'.dol_print_date($db->jdate($obj->dc),'dayhour').'
'; - print ""; + print ""; print ''; print ''; @@ -137,7 +137,7 @@ if ($id > 0 || ! empty($ref)) // TODO obsolete ? if (file_exists($filedetail)) { - print ""; + print ""; print ''; print ''; diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php index bc04697f93f..35a5891d604 100755 --- a/htdocs/commande/customer.php +++ b/htdocs/commande/customer.php @@ -154,7 +154,7 @@ if ($resql) $var=!$var; - print ""; + print ""; print '"; + print ""; print '"; print ''; @@ -246,7 +246,7 @@ if ($resql) $var=!$var; $obj = $db->fetch_object($resql); - print ""; + print ""; print '"; + print ""; print '"; + print ""; print '\n"; $var=!$var; $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."paiement"; $paiem = valeur($sql); -print ""; +print ""; $var=!$var; $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount > 0"; $credits = valeur($sql); -print ""; +print ""; $var=!$var; $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank WHERE amount < 0"; $debits = valeur($sql); -print ""; +print ""; $var=!$var; $sql = "SELECT sum(amount) as amount FROM ".MAIN_DB_PREFIX."bank "; $solde = valeur($sql); -print ""; +print ""; print "
".$langs->trans("Order")." PDF
".$langs->trans("Order")." PDF'.$object->ref.'.pdf'.dol_print_size(dol_filesize($file)).'
Commande detaillee
Commande detaillee'.$object->ref.'-detail.pdf'.dol_print_size(dol_filesize($filedetail)).'
'; $result=''; diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index d9f5cca0415..3c69388c8c9 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -194,7 +194,7 @@ if (! empty($conf->commande->enabled)) { $var=!$var; $obj = $db->fetch_object($resql); - print "
'; print "rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref."'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'
'; $commandestatic->id=$obj->rowid; @@ -315,7 +315,7 @@ if (! empty($conf->commande->enabled)) { $var=!$var; $obj = $db->fetch_object($resql); - print "
'; $commandestatic->id=$obj->rowid; @@ -386,7 +386,7 @@ if (! empty($conf->commande->enabled)) { $var=!$var; $obj = $db->fetch_object($resql); - print "
'; $commandestatic->id=$obj->rowid; diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php index a5e6605ad85..e3942381d1e 100644 --- a/htdocs/compta/bank/bilan.php +++ b/htdocs/compta/bank/bilan.php @@ -69,22 +69,22 @@ print "
Somme des paiements (associes a une facture)".price($paiem)."
Somme des paiements (associes a une facture)".price($paiem)."
Somme des credits".price($credits)."
Somme des credits".price($credits)."
Somme des debits".price($debits)."
Somme des debits".price($debits)."
".$langs->trans("BankBalance")."".price($solde)."
".$langs->trans("BankBalance")."".price($solde)."
"; diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index b62ea51118c..c76e35a5ed8 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -295,7 +295,7 @@ else $total = $total + $objp->amount; $var=!$var; - print ""; + print ""; // Date operation print ''.dol_print_date($db->jdate($objp->do),"day").''; diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index ea7d29beb0f..9a3a55bfaf4 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -206,7 +206,7 @@ if ($resql) if ($printline) { $var=!$var; - print ""; + print ""; // Ref print ''; diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index 2c26a5d6361..909417d0e71 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -132,7 +132,7 @@ if ($resql) { $obj = $db->fetch_object($resql); $var = !$var; - print ""; + print ""; // Date $date=$obj->periode; if (empty($date)) $date=$obj->date_ech; @@ -220,7 +220,7 @@ if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly') $total = $total + $obj->amount; $var=!$var; - print ""; + print ""; print ''.dol_print_date($db->jdate($obj->dm),'day').' ? '."\n"; print "".$obj->label."\n"; diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php index 96fd0231efb..f54f893d79c 100644 --- a/htdocs/compta/clients.php +++ b/htdocs/compta/clients.php @@ -185,7 +185,7 @@ if ($resql) $var=!$var; - print ""; + print ""; print ''; $thirdpartystatic->id=$obj->rowid; $thirdpartystatic->nom=$obj->nom; diff --git a/htdocs/compta/dons/stats.php b/htdocs/compta/dons/stats.php index affbab7d56f..b2f71859831 100644 --- a/htdocs/compta/dons/stats.php +++ b/htdocs/compta/dons/stats.php @@ -63,12 +63,12 @@ if ($result) print ''.$langs->trans("Parameter").''.$langs->trans("Value").''; $var=!$var; - print ""; + print ""; print ''.$langs->trans("DonationsNumber").''.$num.''; $var=!$var; - print "".''.$langs->trans("AmountTotal").''.price($total).''; + print "".''.$langs->trans("AmountTotal").''.price($total).''; $var=!$var; - print "".''.$langs->trans("Average").''.price($total / ($num?$num:1)).''; + print "".''.$langs->trans("Average").''.price($total / ($num?$num:1)).''; print ""; print ""; diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index 2adb3941595..ab508e50035 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -316,7 +316,7 @@ if ($id > 0 || ! empty($ref)) print_titre($langs->trans("Documents")); print ''; - print ""; + print ""; print ''; print ''; @@ -326,7 +326,7 @@ if ($id > 0 || ! empty($ref)) // Si fichier detail PDF existe if (file_exists($filedetail)) // facture detaillee supplementaire { - print ""; + print ""; print ''; print ''; diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 67b36fdc586..f098eee307f 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -437,7 +437,7 @@ else if (! empty($objp->date_end)) $type=1; // Show line - print ""; + print ""; if ($object->lines[$i]->fk_product > 0) { print '"; + print ""; print '\n"; diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index 51432a3e4d2..f86c0603cd6 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -546,7 +546,7 @@ if ($object->id > 0) $obj = $db->fetch_object($result); $var=!$var; - print ""; + print ""; print '\n"; diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index e67e4868dcc..f26b9a06089 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -679,7 +679,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) while ($i < $num) { $obj = $db->fetch_object($resql); - print ""; + print ""; $chargestatic->id=$obj->rowid; $chargestatic->ref=$obj->libelle; $chargestatic->lib=$obj->libelle; @@ -762,7 +762,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us { $obj = $db->fetch_object($resql); - print ""; + print ""; print '"; + print ""; print ""; $i++; } diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php index d82e7fabad9..e2eb5ab610c 100644 --- a/htdocs/compta/localtax/clients.php +++ b/htdocs/compta/localtax/clients.php @@ -244,7 +244,7 @@ if (is_array($coll_list)) $intra = ''; } } - print ""; + print ""; print ""; $company_static->id=$coll->socid; $company_static->nom=$coll->nom; diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php index 0d46cd7ae11..3f0cb9828d5 100644 --- a/htdocs/compta/localtax/index.php +++ b/htdocs/compta/localtax/index.php @@ -148,7 +148,7 @@ for ($m = 1 ; $m < 13 ; $m++ ) } $var=!$var; - print ""; + print ""; print ''; $x_coll = 0; diff --git a/htdocs/compta/localtax/reglement.php b/htdocs/compta/localtax/reglement.php index 66c88892325..e750403bf2c 100644 --- a/htdocs/compta/localtax/reglement.php +++ b/htdocs/compta/localtax/reglement.php @@ -66,7 +66,7 @@ if ($result) { $obj = $db->fetch_object($result); $var=!$var; - print ""; + print ""; $localtax_static->id=$obj->rowid; $localtax_static->ref=$obj->rowid; diff --git a/htdocs/compta/paiement/avalider.php b/htdocs/compta/paiement/avalider.php index 03ebf1d40a6..82936395d2a 100644 --- a/htdocs/compta/paiement/avalider.php +++ b/htdocs/compta/paiement/avalider.php @@ -95,7 +95,7 @@ if ($resql) { $objp = $db->fetch_object($resql); $var=!$var; - print ""; + print ""; print ''; print '\n"; print "\n"; diff --git a/htdocs/compta/paiement/cheque/fiche.php b/htdocs/compta/paiement/cheque/fiche.php index 3251b4a1ab6..7cf5d15f3a2 100644 --- a/htdocs/compta/paiement/cheque/fiche.php +++ b/htdocs/compta/paiement/cheque/fiche.php @@ -553,7 +553,7 @@ else $accounts[$objp->bid]=0; $accounts[$objp->bid] += 1; - print ""; + print ""; print ''; print ''; // Date operation print ''; diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php index 80ea9ea6817..2fd7a970d92 100644 --- a/htdocs/compta/paiement/cheque/index.php +++ b/htdocs/compta/paiement/cheque/index.php @@ -126,7 +126,7 @@ if ($resql) $accountstatic->label=$objp->label; $var=!$var; - print "\n"; + print "\n"; print ''; print ''; diff --git a/htdocs/compta/paiement/cheque/liste.php b/htdocs/compta/paiement/cheque/liste.php index 705bc15eb88..1c1cf71b11c 100644 --- a/htdocs/compta/paiement/cheque/liste.php +++ b/htdocs/compta/paiement/cheque/liste.php @@ -111,7 +111,7 @@ if ($resql) { $objp = $db->fetch_object($resql); $var=!$var; - print ""; + print ""; // Num ref cheque print '"; + print ""; print '"; + print ""; //print '\n"; diff --git a/htdocs/compta/prelevement/bons.php b/htdocs/compta/prelevement/bons.php index 8f2d336defe..1ee076cd170 100644 --- a/htdocs/compta/prelevement/bons.php +++ b/htdocs/compta/prelevement/bons.php @@ -99,7 +99,7 @@ if ($result) $obj = $db->fetch_object($result); $var=!$var; - print "'; diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php index 5fcd70b1a9b..2ac44d056fe 100644 --- a/htdocs/compta/prelevement/fiche-stat.php +++ b/htdocs/compta/prelevement/fiche-stat.php @@ -132,7 +132,7 @@ if ($prev_id) { $row = $db->fetch_row($resql); - print "'; diff --git a/htdocs/compta/prelevement/liste.php b/htdocs/compta/prelevement/liste.php index cd09dc6cf25..ddcf485ac4d 100644 --- a/htdocs/compta/prelevement/liste.php +++ b/htdocs/compta/prelevement/liste.php @@ -141,7 +141,7 @@ if ($result) $var=!$var; - print ""; + print ""; print '\n"; print '"; + print ""; print "\n"; if ($modecompta == 'CREANCES-DETTES') @@ -243,7 +243,7 @@ if ($modecompta != 'CREANCES-DETTES') $objp = $db->fetch_object($result); $var=!$var; - print ""; + print ""; print ""; + print ""; print ''; print ''; } @@ -330,7 +330,7 @@ if ($result) { $objp = $db->fetch_object($result); $var=!$var; - print ""; + print ""; print "\n"; if ($modecompta == 'CREANCES-DETTES') @@ -349,7 +349,7 @@ if ($result) { else { $var=!$var; - print ""; + print ""; print ''; print ''; } @@ -416,7 +416,7 @@ if ($result) { $subtotal_ttc += $obj->amount; $var = !$var; - print ""; + print ""; print ''; if ($modecompta == 'CREANCES-DETTES') print ''; print ''; @@ -426,7 +426,7 @@ if ($result) { } else { $var = !$var; - print ""; + print ""; print ''; print ''; } @@ -493,7 +493,7 @@ if ($result) { $subtotal_ttc += $obj->amount; $var = !$var; - print ""; + print ""; print ''; if ($modecompta == 'CREANCES-DETTES') print ''; @@ -504,7 +504,7 @@ if ($result) { } else { $var = !$var; - print ""; + print ""; print ''; print ''; } @@ -581,7 +581,7 @@ if ($modecompta == 'CREANCES-DETTES') } else { dol_print_error($db); } - print ""; + print ""; print "\n"; print "\n"; print "\n"; @@ -624,7 +624,7 @@ if ($modecompta == 'CREANCES-DETTES') } else { dol_print_error($db); } - print ""; + print ""; print "\n"; print "\n"; print "\n"; @@ -666,7 +666,7 @@ else } else { dol_print_error($db); } - print ""; + print ""; print "\n"; if ($modecompta == 'CREANCES-DETTES') print "\n"; @@ -709,7 +709,7 @@ else { dol_print_error($db); } - print ""; + print ""; print "\n"; if ($modecompta == 'CREANCES-DETTES') print "\n"; diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index 2c5f1736d1b..54cb9fc0c42 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -171,7 +171,7 @@ if ($resql) $obj = $db->fetch_object($resql); $var = !$var; - print ""; + print ""; // Ref print '"; + print ""; print ""; for ($annee = $year_start ; $annee <= $year_end ; $annee++) @@ -439,7 +439,7 @@ print "
".$langs->trans("Bill")." PDF
".$langs->trans("Bill")." PDF'.$object->ref.'.pdf'.dol_print_size(dol_filesize($file)). '
Facture detaillee
Facture detaillee'.$object->ref.'-detail.pdf'.dol_print_size(dol_filesize($filedetail)).'
'; @@ -548,7 +548,7 @@ else $objp = $db->fetch_object($result); $var=!$var; - print "
'.img_object($langs->trans("ShowBill"),"bill").' '.$objp->titre; print "
'.dol_print_date($db->jdate($obj->date_demande),'day')."
'; $commandestatic->id=$obj->rowid; @@ -1026,7 +1026,7 @@ if ($resql) $obj = $db->fetch_object($resql); $var=!$var; - print "
".dol_print_date($obj->da,"day")."
".dol_print_date($obj->da,"day")."$obj->libelle $obj->label
".$i."
'.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").'
'.img_object($langs->trans("ShowPayment"),"payment").' '.$objp->rowid.''.dol_print_date($db->jdate($objp->dp),'day')."$objp->paiement_type $objp->num_paiement
'.$i.''.dol_print_date($db->jdate($objp->date),'day').''.($objp->num_chq?$objp->num_chq:' ').'
'.$checkdepositstatic->getNomUrl(1).''.dol_print_date($db->jdate($objp->db),'day').'
'; diff --git a/htdocs/compta/paiement/liste.php b/htdocs/compta/paiement/liste.php index db2b3173a1c..cec77401490 100644 --- a/htdocs/compta/paiement/liste.php +++ b/htdocs/compta/paiement/liste.php @@ -180,7 +180,7 @@ if ($resql) { $objp = $db->fetch_object($resql); $var=!$var; - print "
'; $paymentstatic->id=$objp->rowid; diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index 09d053c47b2..0b2cc3ea709 100755 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -255,7 +255,7 @@ if ($_GET["action"] == 'create') $var=!$var; - print "
'.$charge->getNomUrl(1)."
"; + print "
"; print $bon->LibStatut($obj->statut,2); print " "; diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 0e47fd7c109..115902db228 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -254,7 +254,7 @@ if ($result) $obj = $db->fetch_object($result); $var=!$var; - print "
"; + print "
"; $bprev->id=$obj->rowid; $bprev->ref=$obj->ref; print $bprev->getNomUrl(1); diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php index 115a7829374..74bb3fd12e4 100644 --- a/htdocs/compta/prelevement/factures.php +++ b/htdocs/compta/prelevement/factures.php @@ -157,7 +157,7 @@ if ($result) { $obj = $db->fetch_object($result); - print "
"; + print "
"; print ''; print img_object($langs->trans("ShowBill"),"bill"); @@ -194,7 +194,7 @@ if ($result) if($socid) { - print "
"; + print "
"; print ''.$langs->trans("Total").'
"; + print "
"; print $ligne->LibStatut($row[1],1); diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php index 54aaf02841a..a0e2d498ee0 100644 --- a/htdocs/compta/prelevement/ligne.php +++ b/htdocs/compta/prelevement/ligne.php @@ -299,7 +299,7 @@ if ($id) { $obj = $db->fetch_object($result); - print "
"; + print "
"; print ''; print img_object($langs->trans("ShowBill"),"bill"); diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php index c322142b6a9..dc8b69ea78d 100644 --- a/htdocs/compta/prelevement/lignes.php +++ b/htdocs/compta/prelevement/lignes.php @@ -166,7 +166,7 @@ if ($result) { $obj = $db->fetch_object($result); - print "
"; + print "
"; print $ligne->LibStatut($obj->statut,2); print " "; @@ -199,7 +199,7 @@ if ($result) if($socid) { - print "
"; + print "
"; print 'Total
"; + print "
"; print $ligne->LibStatut($obj->statut_ligne,2); print " "; diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php index 5744ab0eb7b..b307717e4b3 100644 --- a/htdocs/compta/prelevement/rejets.php +++ b/htdocs/compta/prelevement/rejets.php @@ -101,7 +101,7 @@ if ($result) { $obj = $db->fetch_object($result); - print "
"; + print "
"; print $ligne->LibStatut($obj->statut,2).' '; print ''; diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php index 418d733dbd4..3da79a89f0c 100644 --- a/htdocs/compta/prelevement/stats.php +++ b/htdocs/compta/prelevement/stats.php @@ -102,7 +102,7 @@ if ($resql) { $row = $db->fetch_row($resql); - print "
"; + print "
"; print $ligne->LibStatut($row[2],1); //print $st[$row[2]]; @@ -202,7 +202,7 @@ if ($resql) { $row = $db->fetch_row($resql); - print "
"; + print "
"; print $Rejet->motifs[$row[2]]; print ''.$row[1]; diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index 78c81f9ab9c..609a624adce 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -177,7 +177,7 @@ if ($socid > 0) { $objp = $db->fetch_object($resqlp); //$var=!$var; - print "
'.dol_print_date($db->jdate($objp->dp),'day')."'; print '      '; // Decalage diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index d2dd5630843..882554582c1 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -198,7 +198,7 @@ if ($result) { $objp = $db->fetch_object($result); $var=!$var; - print "
 
 ".$langs->trans("Bills").' '.$objp->nom."
 
 ".$langs->trans("Bills")." ".$langs->trans("Other")." (".$langs->trans("PaymentsNotLinkedToInvoice").")\n"; if ($modecompta == 'CREANCES-DETTES') @@ -266,7 +266,7 @@ if ($modecompta != 'CREANCES-DETTES') if ($total_ttc == 0) { $var=!$var; - print "
 
 '.$langs->trans("None").'
 
 ".$langs->trans("Bills")." socid."\">".$objp->nom."
 
 '.$langs->trans("None").'
 
 '.$obj->nom.''.price(-$obj->amount).''.price(-$obj->amount).'
 
 '.$langs->trans("None").'
 
 '.$obj->nom.''.price(-$obj->amount).'
 
 '.$langs->trans("None").'
 
 ".$langs->trans("VATToPay")." ".price($amount)."
 
 ".$langs->trans("VATToCollect")." ".price($amount)."
 
 ".$langs->trans("VATPaid")."".price($amount)."
 
 ".$langs->trans("VATCollected")."".price($amount)."
'; diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php index 2d90767cffb..209cdba9563 100644 --- a/htdocs/compta/stats/index.php +++ b/htdocs/compta/stats/index.php @@ -284,7 +284,7 @@ for ($mois = 1+$nb_mois_decalage ; $mois <= 12+$nb_mois_decalage ; $mois++) for ($mois = 1 ; $mois < 13 ; $mois++) { $var=!$var; - print "
".dol_print_date(dol_mktime(12,0,0,$mois,1,2000),"%B")."
"; $i++; } $var=!$var; - print "Facture a encaisser : ".price($total_ttc_Rac)."<-- bug ici car n'exclut pas le deja r�gl� des factures partiellement r�gl�es"; + print "Facture a encaisser : ".price($total_ttc_Rac)."<-- bug ici car n'exclut pas le deja r�gl� des factures partiellement r�gl�es"; } $db->free($resql); } @@ -489,7 +489,7 @@ print ""; $i++; } $var=!$var; - print "Signe et non facture:".price($total_pr)."<-- bug ici, ca devrait exclure le deja facture"; + print "Signe et non facture:".price($total_pr)."<-- bug ici, ca devrait exclure le deja facture"; } $db->free($resql); } @@ -497,7 +497,7 @@ print ""; { dol_print_error($db); } - print "Total CA previsionnel : ".price($total_CA)."<-- bug ici car bug sur les 2 precedents"; + print "Total CA previsionnel : ".price($total_CA)."<-- bug ici car bug sur les 2 precedents"; } print ""; diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index a5e0e7fdbb9..83f248a39be 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -284,7 +284,7 @@ if (is_array($coll_list)) $intra = ''; } } - print ""; + print ""; print "".$i.""; $company_static->id=$coll->socid; $company_static->nom=$coll->nom; diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index 354d8c86535..7f23b6cfded 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -157,7 +157,7 @@ for ($m = 1 ; $m < 13 ; $m++ ) } $var=!$var; - print ""; + print ""; print ''.dol_print_date(dol_mktime(0,0,0,$m,1,$y),"%b %Y").''; $x_coll = 0; diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php index 393a9ee4efc..d283f877817 100644 --- a/htdocs/compta/tva/quadri.php +++ b/htdocs/compta/tva/quadri.php @@ -261,7 +261,7 @@ if ($conf->global->COMPTA_MODE == "CREANCES-DETTES") $x_paye_ht = 0; foreach($x_both as $rate => $both){ $var=!$var; - print ""; + print ""; print "$rate%"; print "".price($both['coll']['totalht']).""; print "".price($both['coll']['vat']).""; @@ -284,7 +284,7 @@ if ($conf->global->COMPTA_MODE == "CREANCES-DETTES") $subtotal = $subtotal + $diff; $var=!$var; - print ""; + print ""; print ''; print "".price($diff)."\n"; print "\n"; diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php index 85d3fa4736a..4ca5f298514 100644 --- a/htdocs/compta/tva/reglement.php +++ b/htdocs/compta/tva/reglement.php @@ -70,7 +70,7 @@ if ($result) { $obj = $db->fetch_object($result); $var=!$var; - print ""; + print ""; $tva_static->id=$obj->rowid; $tva_static->ref=$obj->rowid; diff --git a/htdocs/compta/ventilation/fournisseur/lignes.php b/htdocs/compta/ventilation/fournisseur/lignes.php index 513736cbe59..0a27fb3ddaa 100644 --- a/htdocs/compta/ventilation/fournisseur/lignes.php +++ b/htdocs/compta/ventilation/fournisseur/lignes.php @@ -89,7 +89,7 @@ if ($result) { $objp = $db->fetch_object($result); $var=!$var; - print ""; + print ""; print ''.$objp->facnumber.''; diff --git a/htdocs/compta/ventilation/fournisseur/liste.php b/htdocs/compta/ventilation/fournisseur/liste.php index a3290dac20f..83256709771 100644 --- a/htdocs/compta/ventilation/fournisseur/liste.php +++ b/htdocs/compta/ventilation/fournisseur/liste.php @@ -74,7 +74,7 @@ if ($result) { $objp = $db->fetch_object($result); $var=!$var; - print ""; + print ""; print ''.$objp->facnumber.''; print ''.stripslashes(nl2br($objp->description)).''; diff --git a/htdocs/compta/ventilation/lignes.php b/htdocs/compta/ventilation/lignes.php index c938e9774c4..e8578e7dcf0 100644 --- a/htdocs/compta/ventilation/lignes.php +++ b/htdocs/compta/ventilation/lignes.php @@ -104,7 +104,7 @@ if ($result) $var=!$var; $codeCompta = $objp->numero.' '.$objp->intitule; - print ""; + print ""; // Ref facture $facture_static->ref=$objp->facnumber; diff --git a/htdocs/compta/ventilation/liste.php b/htdocs/compta/ventilation/liste.php index 81613640541..4cfe167d60c 100644 --- a/htdocs/compta/ventilation/liste.php +++ b/htdocs/compta/ventilation/liste.php @@ -88,7 +88,7 @@ if ($result) { $objp = $db->fetch_object($result); $var=!$var; - print ""; + print ""; // Ref facture $facture_static->ref=$objp->facnumber; diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index aa7923926e0..eefbd4b73c6 100755 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -318,7 +318,7 @@ if ($result) $var=!$var; - print ""; + print ""; // Name print ''; diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index fa9c99a8571..4989fc98440 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -1244,7 +1244,7 @@ else print ''; print ''; // Ligne carac - print ""; + print ""; print ''; if ($objp->fk_product) { @@ -1285,7 +1285,7 @@ else print '
'; print ''; // Ligne dates prevues - print ""; + print ""; print ''; print $langs->trans("DateStartPlanned").' '; $form->select_date($db->jdate($objp->date_debut),"date_start_update",$usehm,$usehm,($db->jdate($objp->date_debut)>0?0:1),"update"); diff --git a/htdocs/core/class/dolprintipp.class.php b/htdocs/core/class/dolprintipp.class.php index c1add1087e2..1ade18a2968 100644 --- a/htdocs/core/class/dolprintipp.class.php +++ b/htdocs/core/class/dolprintipp.class.php @@ -166,7 +166,7 @@ class dolprintIPP foreach ($jobs as $value ) { $var=!$var; - print ""; + print ""; print ''.$value->job_id->_value0.''; print ''.$value->job_originating_user_name->_value0.''; print ''.$value->printer_uri->_value0.''; diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 170d2cb9da2..c009a3bbe31 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -448,7 +448,7 @@ function show_projects($conf,$langs,$db,$object,$backtopage='') if ($user->rights->projet->lire && $userAccess > 0) { $var = !$var; - print ""; + print ""; // Ref print ''.img_object($langs->trans("ShowProject"),($obj->public?'projectpub':'project'))." ".$obj->ref.''; diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php index 10dffc40faa..f8cc1493b4b 100644 --- a/htdocs/core/lib/sendings.lib.php +++ b/htdocs/core/lib/sendings.lib.php @@ -192,7 +192,7 @@ function show_list_sending_receive($origin,$origin_id,$filter='') { $var=!$var; $objp = $db->fetch_object($resql); - print ""; + print ""; // Sending id print ''.img_object($langs->trans("ShowSending"),'sending').' '.$objp->exp_ref.''; diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index 3153a9a9ef2..94dd06c5b73 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -144,7 +144,7 @@ if ($resql) { $var=!$var; $obj = $db->fetch_object($resql); - print ""; + print ""; print ''; $orderstatic->id=$obj->rowid; $orderstatic->ref=$obj->ref; @@ -196,7 +196,7 @@ if ( $resql ) { $var=!$var; $obj = $db->fetch_object($resql); - print ""; + print ""; $orderstatic->id=$obj->rowid; $orderstatic->ref=$obj->ref; print $orderstatic->getNomUrl(1); diff --git a/htdocs/expedition/liste.php b/htdocs/expedition/liste.php index 7f4eedf9f6e..10ff087801e 100644 --- a/htdocs/expedition/liste.php +++ b/htdocs/expedition/liste.php @@ -114,7 +114,7 @@ if ($resql) $objp = $db->fetch_object($resql); $var=!$var; - print ""; + print ""; print ""; $shipment->id=$objp->rowid; $shipment->ref=$objp->ref; diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index 3befa61e692..754ea46aa0b 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -532,7 +532,7 @@ if ($step == 2 && $datatoexport) foreach($fieldsarray as $code=>$label) { $var=!$var; - print ""; + print ""; $i++; @@ -865,7 +865,7 @@ if ($step == 4 && $datatoexport) foreach($array_selected as $code=>$value) { $var=!$var; - print ""; + print ""; $entity=(! empty($objexport->array_export_entities[0][$code])?$objexport->array_export_entities[0][$code]:$objexport->array_export_icon[0]); $entityicon=(! empty($entitytoicon[$entity])?$entitytoicon[$entity]:$entity); diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php index 507a48d2dee..2ba31d41df4 100644 --- a/htdocs/fichinter/apercu.php +++ b/htdocs/fichinter/apercu.php @@ -98,7 +98,7 @@ if ($id > 0 || ! empty($ref)) print_titre($langs->trans("Documents")); print ''; - print ""; + print ""; print ''; print ''; @@ -108,7 +108,7 @@ if ($id > 0 || ! empty($ref)) // Si fichier detail PDF existe if (file_exists($filedetail)) { - print ""; + print ""; print ''; print ''; diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index a96187dc41d..c87d08ebca8 100755 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -129,7 +129,7 @@ if ($result) { $objp = $db->fetch_object($result); $var=!$var; - print ""; + print ""; print ""; + print ""; print '"; + print ""; print '\n"; diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php index 3e1943c9b27..52064cb39eb 100755 --- a/htdocs/fourn/commande/index.php +++ b/htdocs/fourn/commande/index.php @@ -182,7 +182,7 @@ if ($resql) $row = $db->fetch_row($resql); $var=!$var; - print ""; + print ""; print ''; print ''; @@ -230,7 +230,7 @@ if (! empty($conf->fournisseur->enabled)) { $var=!$var; $obj = $db->fetch_object($resql); - print ""; + print ""; print '"; print ''; @@ -273,7 +273,7 @@ if ($resql) $obj = $db->fetch_object($resql); $var=!$var; - print ""; + print ""; print '"; + print ""; print '"; +print ""; print '"; + print ""; // Ref print ''."\n"; diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index 1af03e83a01..5899870b955 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -288,7 +288,7 @@ if ($object->fetch($id)) $obj = $db->fetch_object($resql); $var=!$var; - print ""; + print ""; print ''; print '"; + print ""; print ''; print ''; print ''; @@ -265,7 +265,7 @@ if ($resql) { $var=!$var; - print ""; + print ""; print '\n"; print ''; @@ -301,7 +301,7 @@ if (count($companystatic->SupplierCategories)) foreach ($companystatic->SupplierCategories as $rowid => $label) { $var=!$var; - print "\n"; + print "\n"; print '"; + print ""; print ""; + print ""; print '"; + print ""; print "\n"; print "\n"; @@ -172,7 +172,7 @@ if ($socid > 0) { $objp = $db->fetch_object($resqlp); //$var=!$var; - print ""; + print ""; print '\n"; print '\n"; + print "\n"; if ($line->fk_product > 0) { $product->fetch($line->fk_product); @@ -597,7 +597,7 @@ else { $var=!$var; - print ""; + print ""; if ($delivery->lines[$i]->fk_product > 0) { $product = new Product($db); diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php index 718dea6f6d6..9bf75d0a332 100644 --- a/htdocs/margin/agentMargins.php +++ b/htdocs/margin/agentMargins.php @@ -209,7 +209,7 @@ if ($result) $var=!$var; - print ""; + print ""; if ($agentid > 0) { $companystatic->id=$objp->socid; $companystatic->nom=$objp->nom; diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php index e92192c0d71..9ce32a701cb 100644 --- a/htdocs/margin/customerMargins.php +++ b/htdocs/margin/customerMargins.php @@ -228,7 +228,7 @@ if ($result) $var=!$var; - print ""; + print ""; if ($client) { print '"; + print ""; print '"; + print ""; print '"; + print ""; print '"; + print ""; // Date print ""; diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index 55ba1e506d2..ca337e00b86 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -162,7 +162,7 @@ if ($id > 0 || ! empty($ref)) $objp = $db->fetch_object($result); $var=!$var; - print ""; + print ""; print '\n"; diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php index b8b6d7fed65..d240c256111 100644 --- a/htdocs/product/stats/commande_fournisseur.php +++ b/htdocs/product/stats/commande_fournisseur.php @@ -155,7 +155,7 @@ if ($id > 0 || ! empty($ref)) $objp = $db->fetch_object($result); $var=!$var; - print ""; + print ""; print '\n"; diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index bfa2b65bcdf..8c5a76e1ac9 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -169,7 +169,7 @@ if ($id > 0 || ! empty($ref)) $objp = $db->fetch_object($result); $var=!$var; - print ""; + print ""; print '\n"; diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 932dd22af82..1265ea13962 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -164,7 +164,7 @@ if ($id > 0 || ! empty($ref)) $objp = $db->fetch_object($result); $var=!$var; - print ""; + print ""; print '"; + print ""; print '"; + print ""; print "\n"; print ''; print "\n"; @@ -144,7 +144,7 @@ if ($resql) { $objp = $db->fetch_object($resql); $var=!$var; - print ""; + print ""; print ''; print ""; + print ""; print ''; print ''; print ''; diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index a5de7d9bb3d..89b7f83d576 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -444,7 +444,7 @@ if ($resql) { $objp = $db->fetch_object($resql); $var=!$var; - print ""; + print ""; // Id movement //print ''; // This is primary not movement id // Date diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php index 4b30b01ad69..e7d782ae5e0 100644 --- a/htdocs/product/stock/valo.php +++ b/htdocs/product/stock/valo.php @@ -103,7 +103,7 @@ if ($result) while ($i < min($num,$limit)) { $objp = $db->fetch_object($result); - print ""; + print ""; print ''; print ''; // PMP value diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index f011c39f63c..1a2f6603d1d 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -100,7 +100,7 @@ if ( $resql ) while ($row = $db->fetch_object($resql)) { $var=!$var; - print ""; + print ""; print '"; + print ""; print '"; + print ""; print '"; + print ""; print '"; + print ""; // Ref print '"; + print ""; print '"; + print ""; print ''; print ''; print ''; diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index 5f8fd84c6e4..80ddc0cd178 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -286,7 +286,7 @@ if ($id > 0 || ! empty($ref)) print ''; // Ligne ajout pour contact interne - print ""; + print ""; print '"; + print ""; print '"; + print ""; print ''."\n"; //print "\n"; // est-ce nécessaire ?? print ''."\n"; diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php index a4f1dee5a7b..d638db9d191 100644 --- a/htdocs/societe/commerciaux.php +++ b/htdocs/societe/commerciaux.php @@ -251,7 +251,7 @@ if ($_GET["socid"]) { $obj = $db->fetch_object($resql); $var=!$var; - print ""; + print ""; // Name print '"; + print ""; print '"; + print ""; print '"; + print ""; print '"; + print ""; print '"; + print ""; print '
".$langs->trans("Intervention")." PDF
".$langs->trans("Intervention")." PDF'.$object->ref.'.pdf'.dol_print_size(dol_filesize($file)).'
Fiche d'intervention detaillee
Fiche d'intervention detaillee'.$object->ref.'-detail.pdf'.dol_print_size(dol_filesize($filedetail)).'
"; $interventionstatic->id=$objp->fichid; $interventionstatic->ref=$objp->ref; diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index 4c5dc82bcec..115bd66ae48 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -373,7 +373,7 @@ if ($id > 0 || ! empty($ref)) while ($i < $num) { $objp = $db->fetch_object($resql); - print "
'; print ''.img_object($langs->trans("ShowProduct"),'product').' '.$objp->ref.''; print ' - '.$objp->label; diff --git a/htdocs/fourn/commande/history.php b/htdocs/fourn/commande/history.php index bb823288ac3..4463d8ebbd2 100644 --- a/htdocs/fourn/commande/history.php +++ b/htdocs/fourn/commande/history.php @@ -152,7 +152,7 @@ if ($id > 0 || ! empty($ref)) $var=!$var; $obj = $db->fetch_object($resql); - print "
'.dol_print_date($db->jdate($obj->dl),"dayhour")."
'.$langs->trans($commandestatic->statuts[$row[1]]).''.$row[0].' '.$commandestatic->LibStatut($row[1],3).'
'; print "rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref."'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'
'; $userstatic->id=$obj->rowid; $userstatic->lastname=$obj->lastname; @@ -329,7 +329,7 @@ if ($resql) $var=!$var; $obj = $db->fetch_object($resql); - print "
'; $commandestatic->id=$obj->rowid; @@ -397,7 +397,7 @@ while ($i < $num) { $var=!$var; $obj = $db->fetch_object($resql); -print "
'; $commandestatic->id=$obj->rowid; diff --git a/htdocs/fourn/commande/liste.php b/htdocs/fourn/commande/liste.php index da493a8cd17..bfd2be80cd5 100644 --- a/htdocs/fourn/commande/liste.php +++ b/htdocs/fourn/commande/liste.php @@ -152,7 +152,7 @@ if ($resql) $obj = $db->fetch_object($resql); $var=!$var; - print "
'.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.'
'.img_object($langs->trans("ShowOrder"),"order")." ".$obj->ref.''; if ($obj->dc) diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index b3475db0e43..49b71423b6b 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/index.php @@ -83,7 +83,7 @@ if ($resql) $row = $db->fetch_row($resql); $var=!$var; - print "
'.$langs->trans($commande->statuts[$row[1]]).''.$row[0].''.$commande->LibStatut($row[1],3).'
'.img_object($langs->trans("ShowSupplier"),"company").''; print " socid."\">".$obj->nom."'.$obj->code_fournisseur.' 
'; $categstatic->id=$rowid; $categstatic->ref=$label; diff --git a/htdocs/fourn/product/index.php b/htdocs/fourn/product/index.php index f9f3d0585f3..91560079688 100644 --- a/htdocs/fourn/product/index.php +++ b/htdocs/fourn/product/index.php @@ -124,7 +124,7 @@ if ($resql) { $objp = $db->fetch_object($resql); $var=!$var; - print "
rowid\">"; if ($objp->fk_product_type==1) print img_object($langs->trans("ShowService"),"service"); else print img_object($langs->trans("ShowProduct"),"product"); diff --git a/htdocs/fourn/product/liste.php b/htdocs/fourn/product/liste.php index 3f8b3ed0353..fd9bd404d5a 100644 --- a/htdocs/fourn/product/liste.php +++ b/htdocs/fourn/product/liste.php @@ -216,7 +216,7 @@ if ($resql) { $objp = $db->fetch_object($resql); $var=!$var; - print "
'; $productstatic->id=$objp->rowid; diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php index 63beb01eff4..e0869fede6f 100644 --- a/htdocs/fourn/recap-fourn.php +++ b/htdocs/fourn/recap-fourn.php @@ -136,7 +136,7 @@ if ($socid > 0) $totalpaye = $fac->getSommePaiement(); $var=!$var; - print "
".dol_print_date($fac->date)."id\">".img_object($langs->trans("ShowBill"),"bill")." ".$fac->ref."
'.dol_print_date($db->jdate($objp->dp))."'; print '      '; // Decalage diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php index 2849daa9c67..3012439a697 100644 --- a/htdocs/livraison/fiche.php +++ b/htdocs/livraison/fiche.php @@ -327,7 +327,7 @@ if ($action == 'create') $line = $commande->lines[$i]; $var=!$var; - print "
'; $invoicestatic->id=$objp->facid; diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php index 55a13e83094..052529ac10d 100644 --- a/htdocs/margin/tabs/productMargins.php +++ b/htdocs/margin/tabs/productMargins.php @@ -195,7 +195,7 @@ if ($id > 0 || ! empty($ref)) $marginRate = ($objp->buying_price != 0)?(100 * round($objp->marge / $objp->buying_price, 5)):'' ; $markRate = ($objp->selling_price != 0)?(100 * round($objp->marge / $objp->selling_price, 5)):'' ; - print "
'; $invoicestatic->id=$objp->facid; $invoicestatic->ref=$objp->facnumber; diff --git a/htdocs/margin/tabs/thirdpartyMargins.php b/htdocs/margin/tabs/thirdpartyMargins.php index 04ac4d65d64..1debb94b021 100644 --- a/htdocs/margin/tabs/thirdpartyMargins.php +++ b/htdocs/margin/tabs/thirdpartyMargins.php @@ -190,7 +190,7 @@ if ($socid > 0) $var=!$var; - print "
'; $invoicestatic->id=$objp->facid; $invoicestatic->ref=$objp->facnumber; diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index dd7798a9045..5404dd1848a 100644 --- a/htdocs/product/popuprop.php +++ b/htdocs/product/popuprop.php @@ -140,7 +140,7 @@ if ($result) } $var=!$var; - print "
'; if ($objp->type==1) print img_object($langs->trans("ShowService"),"service"); else print img_object($langs->trans("ShowProduct"),"product"); diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 240844b9f4d..c8e3d262c21 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -723,7 +723,7 @@ if ($result) { $objp = $db->fetch_object($result); $var=!$var; - print "
".dol_print_date($db->jdate($objp->dp),"dayhour")."
'.img_object($langs->trans("ShowOrder"),"order").' '; print $objp->ref; print "
'.img_object($langs->trans("ShowOrder"),"order").' '; print $objp->ref; print "
'.img_object($langs->trans("ShowContract"),"contract").' '; print $objp->rowid; print "
'; $invoicestatic->id=$objp->facid; $invoicestatic->ref=$objp->facnumber; diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php index f4b1cb8620a..4c520bd292d 100644 --- a/htdocs/product/stats/facture_fournisseur.php +++ b/htdocs/product/stats/facture_fournisseur.php @@ -164,7 +164,7 @@ if ($id > 0 || ! empty($ref)) $objp = $db->fetch_object($result); $var=!$var; - print "
'; $supplierinvoicestatic->id=$objp->facid; $supplierinvoicestatic->ref=$objp->facnumber; diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php index a25e1e4357d..7f8e7f0766c 100644 --- a/htdocs/product/stock/index.php +++ b/htdocs/product/stock/index.php @@ -88,7 +88,7 @@ if ($result) { $objp = $db->fetch_object($result); $var=!$var; - print "
rowid\">".img_object($langs->trans("ShowStock"),"stock")." ".$objp->label."'.$entrepot->LibStatut($objp->statut,5).'
'.dol_print_date($db->jdate($objp->datem),'dayhour').'rowid\">"; print img_object($langs->trans("ShowProduct"),"product").' '.$objp->produit; diff --git a/htdocs/product/stock/liste.php b/htdocs/product/stock/liste.php index bde0c3e1858..55e6f858124 100644 --- a/htdocs/product/stock/liste.php +++ b/htdocs/product/stock/liste.php @@ -87,7 +87,7 @@ if ($result) { $objp = $db->fetch_object($result); $var=!$var; - print "
'.img_object($langs->trans("ShowWarehouse"),'stock').' '.$objp->ref.''.$objp->lieu.''.$entrepot->LibStatut($objp->statut,5).'
'.$objp->mid.'
'.img_object($langs->trans("ShowWarehouse"),'stock').' '.$objp->label.''.$objp->lieu.'
'; $projectstatic->id=$row->rowid; $projectstatic->ref=$row->ref; @@ -155,7 +155,7 @@ if ( $resql ) while ($row = $db->fetch_object($resql)) { $var=!$var; - print "
'; $projectstatic->id=$row->rowid; $projectstatic->ref=$row->ref; @@ -267,7 +267,7 @@ if ( $resql ) while ($row = $db->fetch_object($resql)) { - print "
'; $projectstatic->id=$row->rowid; $projectstatic->ref=$row->ref; @@ -310,7 +310,7 @@ if ( $resql ) { while ($row = $db->fetch_object($resql)) { - print "
'; $projectstatic->id=$row->rowid; $projectstatic->ref=$row->ref; diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 51e8c47da7a..33b83b27fae 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -252,7 +252,7 @@ foreach ($listofreferent as $key => $value) //print $classname; $var=!$var; - print "
'; diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 112816c9204..6b1c0e7be9b 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -105,7 +105,7 @@ if ( $resql ) { $obj = $db->fetch_object($resql); $var=!$var; - print "
'; if ($obj->socid) { @@ -182,7 +182,7 @@ if ( $resql ) $username = $userstatic->getNomUrl(0,0); } - print "
'.$username.'projectid.'">'.$obj->title.''.$obj->label.'
'; print img_object('','user').' '.$langs->trans("Users"); @@ -319,7 +319,7 @@ if ($id > 0 || ! empty($ref)) print ''; $var=!$var; - print "
'; print img_object('','contact').' '.$langs->trans("ThirdPartyContacts"); diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php index 971ad3dc449..968b1a30065 100644 --- a/htdocs/public/members/public_list.php +++ b/htdocs/public/members/public_list.php @@ -139,7 +139,7 @@ if ($result) { $objp = $db->fetch_object($result); $var=!$var; - print "
'.dolGetFirstLastname($obj->firstname, $obj->lastname).($objp->societe?' / '.$objp->societe:'').'$objp->birth'.$objp->email.'
"; + print "
"; print ''; print img_object($langs->trans("ShowUser"),"user").' '; print dolGetFirstLastname($obj->firstname, $obj->lastname)."\n"; diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index 66cbb3e2523..0765fe2eacb 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -195,7 +195,7 @@ if ($result) $objp = $db->fetch_object($result); $var=!$var; - print "
'; $thirdparty_static->id=$objp->rowid; diff --git a/htdocs/societe/societe.php b/htdocs/societe/societe.php index bc01bcefd7d..8253c98860d 100644 --- a/htdocs/societe/societe.php +++ b/htdocs/societe/societe.php @@ -385,7 +385,7 @@ if ($resql) { $obj = $db->fetch_object($resql); $var=!$var; - print "
"; + print "
"; $companystatic->id=$obj->rowid; $companystatic->name=$obj->name; $companystatic->canvas=$obj->canvas; diff --git a/htdocs/user/group/fiche.php b/htdocs/user/group/fiche.php index 201922e7a87..ff7028ab2cf 100644 --- a/htdocs/user/group/fiche.php +++ b/htdocs/user/group/fiche.php @@ -420,7 +420,7 @@ else { $var=!$var; - print "
'; print ''.img_object($langs->trans("ShowUser"),"user").' '.$useringroup->login.''; if ($useringroup->admin && ! $useringroup->entity) print img_picto($langs->trans("SuperAdministrator"),'redstar'); diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php index d100c9b3778..82d81b14bee 100644 --- a/htdocs/user/group/index.php +++ b/htdocs/user/group/index.php @@ -100,7 +100,7 @@ if ($resql) $obj = $db->fetch_object($resql); $var=!$var; - print "
'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.''; if (! $obj->entity) { diff --git a/htdocs/user/home.php b/htdocs/user/home.php index 33e80336e95..a8a62df999a 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -128,7 +128,7 @@ if ($resql) $obj = $db->fetch_object($resql); $var=!$var; - print "
'.img_object($langs->trans("ShowUser"),"user").' '.dolGetFirstLastname($obj->firstname,$obj->lastname).''; if (! empty($conf->multicompany->enabled) && $obj->admin && ! $obj->entity) { @@ -225,7 +225,7 @@ if ($canreadperms) $obj = $db->fetch_object($resql); $var=!$var; - print "
'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.''; if (! $obj->entity) { diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 479f156e343..d5b34808b8f 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -112,7 +112,7 @@ if ($result) $obj = $db->fetch_object($result); $var=!$var; - print "
'.img_object($langs->trans("ShowUser"),"user").' '.$obj->login.''; if (! empty($conf->multicompany->enabled) && $obj->admin && ! $obj->entity) { From 66d02240f520b5281a06afaa7b012643097de0b2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 20 Jun 2013 09:36:36 +0200 Subject: [PATCH 10/16] Fix: Missing translation --- htdocs/langs/en_US/opensurvey.lang | 2 ++ htdocs/langs/fr_FR/opensurvey.lang | 2 ++ htdocs/opensurvey/public/index.php | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/opensurvey.lang b/htdocs/langs/en_US/opensurvey.lang index f81dd5bec94..63471882927 100644 --- a/htdocs/langs/en_US/opensurvey.lang +++ b/htdocs/langs/en_US/opensurvey.lang @@ -37,6 +37,8 @@ PollManagement=Polls management BackToHoursSetup=Back to hours setup UrlForSurvey=URL to communicate to get a direct access to survey PollOnChoice=Your are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll: +CreateSurveyDate=Create a date survey +CreateSurveyStandard=Create a standard survey CheckBox=Simple checkbox YesNoList=List (empty/yes/no) PourContreList=List (empty/for/against) diff --git a/htdocs/langs/fr_FR/opensurvey.lang b/htdocs/langs/fr_FR/opensurvey.lang index 12fc74f258d..f4a4df67782 100644 --- a/htdocs/langs/fr_FR/opensurvey.lang +++ b/htdocs/langs/fr_FR/opensurvey.lang @@ -37,6 +37,8 @@ PollManagement=Gestion du sondage BackToHoursSetup=Retour configuration heures UrlForSurvey=URL à communiquer pour accès direct au sondage PollOnChoice=Vous êtes en train de créer un sondage à choix multiples. Renseigner les différents choix possible de votre sondage: +CreateSurveyDate=Créer un sondage de dates +CreateSurveyStandard=Créer un sondage standard CheckBox=Case à cochée YesNoList=Liste (vide/oui/non) PourContreList=Liste (vide/pour/contre) diff --git a/htdocs/opensurvey/public/index.php b/htdocs/opensurvey/public/index.php index 557142d691d..fcbef77a4e0 100755 --- a/htdocs/opensurvey/public/index.php +++ b/htdocs/opensurvey/public/index.php @@ -53,7 +53,8 @@ print '
print $langs->trans("OrganizeYourMeetingEasily").'

-
+
+
'; From 4268ca0de21fa368b423f74fa5812a059d13528a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 20 Jun 2013 09:40:02 +0200 Subject: [PATCH 11/16] Missing space --- htdocs/opensurvey/public/create_survey.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/opensurvey/public/create_survey.php b/htdocs/opensurvey/public/create_survey.php index 2010a6fdd03..d5e6a930357 100755 --- a/htdocs/opensurvey/public/create_survey.php +++ b/htdocs/opensurvey/public/create_survey.php @@ -164,11 +164,11 @@ print '
'."\n"; $cocheplus=''; if ($_SESSION["canedit"]) $cocheplus="checked"; -print ''. $langs->trans("VotersCanModify") .'
'."\n"; +print ' '. $langs->trans("VotersCanModify") .'
'."\n"; if ($_SESSION["mailsonde"]) $cochemail="checked"; -print ''. $langs->trans("ToReceiveEMailForEachVote") .'
'."\n"; +print ' '. $langs->trans("ToReceiveEMailForEachVote") .'
'."\n"; if (GETPOST('choix_sondage')) { From a749e2bfaadfbfdb48d6086761aa9c5455314740 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 20 Jun 2013 16:20:31 +0200 Subject: [PATCH 12/16] Fix: Still working on css debug. bureau2crea and cameleo are too bugged. I disable them with jmobile to have things working correctly. Conflicts: htdocs/theme/bureau2crea/style.css.php --- htdocs/main.inc.php | 8 +++ htdocs/theme/amarok/style.css.php | 25 ++++++++- htdocs/theme/auguria/style.css.php | 12 ++++ htdocs/theme/bureau2crea/style.css.php | 76 ++++++++++++++++++++++---- htdocs/theme/cameleo/style.css.php | 12 ++++ htdocs/theme/eldy/style.css.php | 19 +++++-- 6 files changed, 134 insertions(+), 18 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 310a9a5e2f2..b4691761100 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -679,6 +679,7 @@ if (GETPOST('theme')) $conf->theme=GETPOST('theme','alpha',1); $conf->css = "/theme/".$conf->theme."/style.css.php"; } + // Set javascript option if (! GETPOST('nojs')) // If javascript was not disabled on URL @@ -702,6 +703,13 @@ if (! empty($conf->browser->phone)) $conf->dol_no_mouse_hover=1; } +// Disabled bugged themes +if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo'))) +{ + $conf->theme='eldy'; + $conf->css = "/theme/".$conf->theme."/style.css.php"; +} + if (! defined('NOREQUIRETRAN')) { if (! GETPOST('lang')) // If language was not forced on URL diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index dce3f0bfbed..5e57bcc1bc2 100755 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -2065,6 +2065,9 @@ div.jnotify-background { li.ui-li-divider .ui-link { color: #FFF !important; } +.ui-btn { + margin: 0.1em 2px +} .ui-btn-inner { min-width: .4em; padding-left: 10px; @@ -2074,9 +2077,19 @@ li.ui-li-divider .ui-link { font-size: px; } +.ui-btn-icon-right .ui-btn-inner { + padding-right: 34px; +} +.ui-btn-icon-left .ui-btn-inner { + padding-left: 34px; +} .ui-select .ui-btn-icon-right .ui-btn-inner { padding-right: 36px; } +.ui-select .ui-btn-icon-left .ui-btn-inner { + padding-left: 36px; +} + .fiche .ui-controlgroup { margin: 0px; padding-bottom: 0px; @@ -2091,7 +2104,11 @@ div.ui-controlgroup-controls div.tabsElem a -moz-box-shadow: 0 -3px 6px rgba(0,0,0,.2); -webkit-box-shadow: 0 -3px 6px rgba(0,0,0,.2); box-shadow: 0 -3px 6px rgba(0,0,0,.2); - border: none; +} +div.ui-controlgroup-controls div.tabsElem a#active { + -moz-box-shadow: 0 -3px 6px rgba(0,0,0,.3); + -webkit-box-shadow: 0 -3px 6px rgba(0,0,0,.3); + box-shadow: 0 -3px 6px rgba(0,0,0,.3); } a.tab span.ui-btn-inner, a.tab span.ui-btn-inner span.ui-btn-text @@ -2139,6 +2156,12 @@ div.ui-radio padding-bottom: 10px; margin-bottom: 4px; border-bottom: 1px solid #AAAAAA !important; } +ul.ulmenu { + border-radius: 0; + -webkit-border-radius: 0; +} + + close(); ?> diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 4238327a35b..14685d261b3 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -2254,6 +2254,9 @@ div.ecmjqft { li.ui-li-divider .ui-link { color: #FFF !important; } +.ui-btn { + margin: 0.1em 2px +} a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-inner:hover { text-decoration: none !important; } @@ -2270,6 +2273,10 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i .ui-select .ui-btn-icon-right .ui-btn-inner { padding-right: 36px; } +.ui-select .ui-btn-icon-left .ui-btn-inner { + padding-left: 36px; +} + .fiche .ui-controlgroup { margin: 0px; padding-bottom: 0px; @@ -2332,6 +2339,11 @@ div.ui-radio } +ul.ulmenu { + border-radius: 0; + -webkit-border-radius: 0; +} + close(); ?> diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index cc31da801d0..0ac7c62c074 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -57,6 +57,12 @@ $left=($langs->trans("DIRECTION")=='rtl'?'right':'left'); $fontsize=empty($conf->dol_optimize_smallscreen)?'12':'12'; $fontsizesmaller=empty($conf->dol_optimize_smallscreen)?'11':'11'; + +$path=''; // This value may be used in future for external module to overwrite theme +$theme='bureau2crea'; // Value of theme +if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; } + +// Define image path files $fontlist='arial, sans-serif, verdana, helvetica'; //$fontlist='Verdana,Helvetica,Arial,sans-serif'; @@ -66,9 +72,6 @@ $dol_optimize_smallscreen=$conf->dol_optimize_smallscreen; $dol_no_mouse_hover=$conf->dol_no_mouse_hover; $dol_use_jmobile=$conf->dol_use_jmobile; -$path=''; // This value may be used in future for external module to overwrite theme -$theme='bureau2crea'; // Value of theme -if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; } ?> @@ -301,7 +304,7 @@ div.fichethirdleft { dol_optimize_smallscreen)) { print "width: 35%;\n"; } ?> } div.fichetwothirdright { - dol_optimize_smallscreen)) { print "float: ".$left.";\n"; } ?> + dol_optimize_smallscreen)) { print "float: ".$right.";\n"; } ?> dol_optimize_smallscreen)) { print "width: 65%;\n"; } ?> } div.fichehalfleft { @@ -309,7 +312,7 @@ div.fichehalfleft { dol_optimize_smallscreen)) { print "width: 50%;\n"; } ?> } div.fichehalfright { - dol_optimize_smallscreen)) { print "float: ".$left.";\n"; } ?> + dol_optimize_smallscreen)) { print "float: ".$right.";\n"; } ?> dol_optimize_smallscreen)) { print "width: 50%;\n"; } ?> } div.ficheaddleft { @@ -957,7 +960,7 @@ img.toolbarbutton { * RESIZER-BARS */ .ui-layout-resizer { /* all 'resizer-bars' */ - width: 8px !important; + width: dol_optimize_smallscreen)?'8':'24'); ?>px !important; } .ui-layout-resizer-hover { /* affects both open and closed states */ } @@ -966,7 +969,7 @@ img.toolbarbutton { /*.ui-layout-resizer-open-hover ,*/ /* hover-color to 'resize' */ .ui-layout-resizer-dragging { /* resizer beging 'dragging' */ background: #DDD; - width: 8px; + width: dol_optimize_smallscreen)?'8':'24'); ?>px; } .ui-layout-resizer-dragging { /* CLONED resizer being dragged */ border-left: 1px solid #BBB; @@ -1079,6 +1082,8 @@ img.toolbarbutton { border: 1px solid #BBB; border-width: 0; } +.ecm-layout-resizer-closed { +} .ecm-in-layout-center { border-left: 1px !important; @@ -1731,7 +1736,7 @@ border: 0px; } div.titre { - font-family: "Trebuchet MS",Arial,Helvetica,sans-serif; + font-family: ; font-weight: normal; color: #842F00; font-size: 16px; @@ -1929,9 +1934,30 @@ li.cal_event { border: none; list-style-type: none; } /* Ajax - Liste deroulante de l'autocompletion */ /* ============================================================================== */ -.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 0.9em; } .ui-autocomplete-loading { background: white url() right center no-repeat; } - +.ui-autocomplete { + position:absolute; + width:auto; + font-size: 1.0em; + background-color:white; + border:1px solid #888; + margin:0px; + padding:0px; + } +.ui-autocomplete ul { + list-style-type:none; + margin:0px; + padding:0px; + } +.ui-autocomplete ul li.selected { background-color: #D3E5EC;} +.ui-autocomplete ul li { + list-style-type:none; + display:block; + margin:0; + padding:2px; + height:18px; + cursor:pointer; + } /* ============================================================================== */ /* jQuery - jeditable */ @@ -2106,9 +2132,22 @@ A.none, A.none:active, A.none:visited, A.none:hover { line-height:1.5; zoom:1; font-weight: normal; - font-family:Verdana,Arial,sans-serif; + font-family:; font-size:1em; } +.ui-widget { + font-family:; + font-size:px; +} +.ui-button { margin-left: -1px; } +.ui-button-icon-only .ui-button-text { height: 8px; } +.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: 2px 0px 6px 0px; } +.ui-button-text +{ + line-height: 1em !important; +} +.ui-autocomplete-input { margin: 0; padding: 1px; } + table.noborder { margin-bottom: 10px; @@ -2406,7 +2445,7 @@ div.ecmjqft { /* Core Styles */ .ecmjqft LI.directory { font-weight:normal; background: url() left top no-repeat; } .ecmjqft LI.expanded { font-weight:normal; background: url() left top no-repeat; } -.ecmjqft LI.wait { font-weight:normal; background: url() left top no-repeat; } +.ecmjqft LI.wait { font-weight:normal; background: url() left top no-repeat; } /* ============================================================================== */ @@ -2434,6 +2473,9 @@ div.ecmjqft { li.ui-li-divider .ui-link { color: #FFF !important; } +.ui-btn { + margin: 0.1em 2px +} a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-inner:hover { text-decoration: none !important; } @@ -2446,6 +2488,10 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i .ui-select .ui-btn-icon-right .ui-btn-inner { padding-right: 36px; } +.ui-select .ui-btn-icon-left .ui-btn-inner { + padding-left: 36px; +} + .fiche .ui-controlgroup { margin: 0px; padding-bottom: 0px; @@ -2507,6 +2553,12 @@ div.ui-radio padding-bottom: 10px; margin-bottom: 4px; border-bottom: 1px solid #AAAAAA !important; } +ul.ulmenu { + border-radius: 0; + -webkit-border-radius: 0; +} + + close(); ?> diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index 7b1c9762db0..c2c020bb035 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -2299,6 +2299,9 @@ div.ecmjqft { li.ui-li-divider .ui-link { color: #FFF !important; } +.ui-btn { + margin: 0.1em 2px +} a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-inner:hover { text-decoration: none !important; } @@ -2315,6 +2318,10 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i .ui-select .ui-btn-icon-right .ui-btn-inner { padding-right: 36px; } +.ui-select .ui-btn-icon-left .ui-btn-inner { + padding-left: 36px; +} + .fiche .ui-controlgroup { margin: 0px; padding-bottom: 0px; @@ -2376,6 +2383,11 @@ div.ui-radio padding-bottom: 10px; margin-bottom: 4px; border-bottom: 1px solid #AAAAAA !important; } +ul.ulmenu { + border-radius: 0; + -webkit-border-radius: 0; +} + close(); diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 27c1a2cce90..bb5025b72f4 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1107,9 +1107,6 @@ td.photo { padding: 0 4px 0 4px !important; } -.toolbar { - height: 34px !important; -} a.toolbarbutton { margin-top: 0px; @@ -2623,7 +2620,7 @@ li.ui-li-divider .ui-link { color: #FFF !important; } .ui-btn { - margin: 0.2em 4px + margin: 0.1em 2px } a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-inner:hover { text-decoration: none !important; @@ -2641,9 +2638,15 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i .ui-btn-icon-right .ui-btn-inner { padding-right: 34px; } +.ui-btn-icon-left .ui-btn-inner { + padding-left: 34px; +} .ui-select .ui-btn-icon-right .ui-btn-inner { padding-right: 38px; } +.ui-select .ui-btn-icon-left .ui-btn-inner { + padding-left: 38px; +} .fiche .ui-controlgroup { margin: 0px; padding-bottom: 0px; @@ -2657,8 +2660,13 @@ div.ui-controlgroup-controls div.tabsElem a -moz-box-shadow: 0 -3px 6px rgba(0,0,0,.2); -webkit-box-shadow: 0 -3px 6px rgba(0,0,0,.2); box-shadow: 0 -3px 6px rgba(0,0,0,.2); - border: none; } +div.ui-controlgroup-controls div.tabsElem a#active { + -moz-box-shadow: 0 -3px 6px rgba(0,0,0,.3); + -webkit-box-shadow: 0 -3px 6px rgba(0,0,0,.3); + box-shadow: 0 -3px 6px rgba(0,0,0,.3); +} + a.tab span.ui-btn-inner { border: none; @@ -2710,6 +2718,7 @@ ul.ulmenu { -webkit-border-radius: 0; } + close(); ?> From a1f9b22210d3be81e392557be6f7cff23c9e0809 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 20 Jun 2013 16:21:54 +0200 Subject: [PATCH 13/16] Fix: Missing icon --- htdocs/theme/cameleo/img/menus/holiday.png | Bin 0 -> 1816 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 htdocs/theme/cameleo/img/menus/holiday.png diff --git a/htdocs/theme/cameleo/img/menus/holiday.png b/htdocs/theme/cameleo/img/menus/holiday.png new file mode 100644 index 0000000000000000000000000000000000000000..27b653d93ba448745bf4a7fa9597899efaee5698 GIT binary patch literal 1816 zcmV+z2j}>SP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyr0 z4G9*@T5-Ps00x*zL_t(Y$F)~$a8=b6{?^{-ocq3DxDt|-q>=}LLg7cT1&VDMessne zW&}nVJCy-x?Q5+4)z0V$RB1bHe-x)`wT@zxDILYf=!~OM1@cfT7_k}>asv_|Z<2d+ zZ|*(!oW1wzk4w@}ffAFhU;FG?d+l$1=ljmA1AKw-Jny=53%{(NQf-<_vg^7C27}{k zNkmJSxdK215k&xy);frXmKTDO-VzUYd@|K$X{ra9Ip}%b0|2%Fm<7NBU;_{!0StDL z^`~`)omkFjbJiHz5&V7oO8_wT^IAmqbY8Q*b-h4_?yiv->D``s|Mfj$>DmCa0#UIa zAw;n|I|$i%6iP`6GEp{I!psM9zo`4bDE^tz)C#~K{$Vvrp6t5fJ>vSQMy#i zF5r`3-wwd{JoY^guIs|hyU2}=B75KwWHT0WDNSxxvzIgM7kGu%II1=8PyMJmUh-rY zhPKyCk0CFO3o5S<;8$BW@>rIHWvhWd{LKp34hN*9fMtWyDGp{w2tvSUW>z2&KmZrz z!5aXo1F$slRPu`h>f2OI+c zyuFs94#~hJl?o8ZFv_ZlM*3qjChG2W)u=pp`MYoKXulEQc|wTNzU1j`iKWXPsJinT z-($c(_@>BVb(|q(_tv%&)N)utnc`1=dY@D{s{yQdv0f0k?k3_Xr>A}GPRK1;K0J_NP z0uX@aKxoHjqa#!mpZ&s&*#3X&tgk;}S@!6$W5;>&e&xZ_Xz6Ijs=E5e#`n(lUO-h@ z#q?}{t@!A~$52X<5W>9j@`2B@x$tr}uLkC-4ApFVl$4>R%rx86#@7Z~X{drS+KN^5 zr}u8?o1DLV*;n!ATW?n;lU+m8ZSIPIlJB13TQ)4Z`%5K}p8`+>p$xOKCFq^g>Wwt8 zIl6g2vimnroXO|&UvFzW`RsH7UHO%r`6C{_ZP9BNhSIvbKjoYq7>=A9OwCI6q~q%r z#y0^#cK>EHH#bil$z-xMkN$a2`u_t6z?#)7-zkj;v*%MT^^CYUH<&|rf0q4RM&fHv zRJXOfHh;M9?8@NRyQV%5Wtw&(_RXCW z&ut%n_+sPH=8dO%b4XJsP zL@R)f_$?28Hu;{hmR}>X>cMLR8hdXyA}jAN&OQh4zb~B{-g>e8j(XYoyyI&Fr5T0+ z)*4pDYN-BJI3^3*aWEhjpxQaZwjChb76>>tY|DZ%rXU?>kcb8ai9>AktMTvr_V9!= zJBy|a)o%F@pwSbLA-?P<$agl_=Hj{atkquM^P}B;!%#Qf!RZekC!ZxeUqdMc-dMp62!;#%!zLlI{aguTZ6bTW+TBCH%Vpd8+`I@xW00Dv|F#l#q+W~0>X$ja; zKu8HGEsS2wLZu4`&I!X9Q|wv_Vyyv)=b5>TfINWnY)q>FS^%UbzSPXT6KwiP%Ef?~ z&Bg>lWP?Q578G@)V{yP(LP*;v-x9WC6GdrUg3KBqacK=i6EVc*&H{6B!!UzLfRzGC z5ryXU!MeM0mkGUNZ&5?plTRVKX!|v-nD1(cnu1qu1w&=Z%~e>TNI96xKr|OX0ze6C z6(=DhM){7gY`Qdl_-ss`!5JbNX6Ex?ZYRPk!I~|dQy$Rroec=p-gWi=wB&OZh-?5h z5iBMW#1PEm69^kH875ZHS{bk4MwZ-T03e@iK&a;Pwf_y%ofD5X-OD2Y0000 Date: Thu, 20 Jun 2013 16:39:17 +0200 Subject: [PATCH 14/16] Fix: all forms must react same way with option optimize_small_screen --- htdocs/core/lib/company.lib.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 170d2cb9da2..28bbe1c5767 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -408,7 +408,9 @@ function show_projects($conf,$langs,$db,$object,$backtopage='') if (! empty($conf->projet->enabled) && $user->rights->projet->creer) { //$buttoncreate=''.$langs->trans("AddProject").''; - $buttoncreate=''.$langs->trans("AddProject").' '.img_picto($langs->trans("AddProject"),'filenew').''."\n"; + $buttoncreate=''.$langs->trans("AddProject"); + if (empty($conf->dol_optimize_smallscreen)) $buttoncreate.=' '.img_picto($langs->trans("AddProject"),'filenew'); + $buttoncreate.=''."\n"; } print "\n"; From feef164b0ee4e452989b6932ba6a7b0bfab4e85d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 21 Jun 2013 12:47:35 +0200 Subject: [PATCH 15/16] Fix: Missing currency into email content. Must also use language of target. --- .../contracts/email_expire_services_to_customers.php | 11 +++++++++-- .../email_expire_services_to_representatives.php | 10 ++++++++-- .../invoices/email_unpaid_invoices_to_customers.php | 4 ++-- .../email_unpaid_invoices_to_representatives.php | 4 ++-- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/scripts/contracts/email_expire_services_to_customers.php b/scripts/contracts/email_expire_services_to_customers.php index b503c0eaca2..63d9c1b8733 100755 --- a/scripts/contracts/email_expire_services_to_customers.php +++ b/scripts/contracts/email_expire_services_to_customers.php @@ -124,9 +124,16 @@ if ($resql) if (empty($obj->email)) print "Warning: Customer ".$customer." has no email. Notice disabled.\n"; } + // Define line content + $outputlangs=new Translate('',$conf); + $outputlangs->setDefaultLang(empty($obj->default_lang)?$langs->defaultlang:$obj->default_lang); // By default language of customer + $outputlangs->load("bills"); + $outputlangs->load("main"); + $outputlangs->load("contracts"); + if (dol_strlen($oldemail)) { - $message .= $langs->trans("Contract")." ".$obj->ref.": ".$langs->trans("Service")." ".$obj->label." (".price($obj->total_ttc)."), ".$langs->trans("DateEndPlannedShort")." ".dol_print_date($db->jdate($obj->date_fin_validite),'day')."\n\n"; + $message .= $langs->trans("Contract")." ".$obj->ref.": ".$langs->trans("Service")." ".$obj->label." (".price($obj->total_ttc,0,$outputlangs,0,0,-1,$conf->currency)."), ".$langs->trans("DateEndPlannedShort")." ".dol_print_date($db->jdate($obj->date_fin_validite),'day')."\n\n"; dol_syslog("email_expire_services_to_customers.php: ".$obj->email); $foundtoprocess++; } @@ -222,7 +229,7 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldcustomer,$dura $allmessage.= "Note: This list contains only services to expire.".($usehtml?"
\n":"\n").($usehtml?"
\n":"\n"); } $allmessage.= $message.($usehtml?"
\n":"\n"); - $allmessage.= $langs->trans("Total")." = ".price($total).($usehtml?"
\n":"\n"); + $allmessage.= $langs->trans("Total")." = ".price($total,0,$userlang,0,0,-1,$conf->currency).($usehtml?"
\n":"\n"); if (! empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_FOOTER)) { $allmessage.=$conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_CUSTOMERS_FOOTER; diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php index 1a352f138aa..ace84fa0582 100755 --- a/scripts/contracts/email_expire_services_to_representatives.php +++ b/scripts/contracts/email_expire_services_to_representatives.php @@ -125,9 +125,15 @@ if ($resql) if (empty($obj->email)) print "Warning: Sale representative ".$salerepresentative." has no email. Notice disabled.\n"; } + // Define line content + $outputlangs=new Translate('',$conf); + $outputlangs->setDefaultLang(empty($obj->lang)?$langs->defaultlang:$obj->lang); // By default language of sale representative + $outputlangs->load("bills"); + $outputlangs->load("main"); + if (dol_strlen($obj->email)) { - $message .= $langs->trans("Contract")." ".$obj->ref.": ".$langs->trans("Service")." ".$obj->label." (".price($obj->total_ttc).") ".$obj->nom.", ".$langs->trans("DateEndPlannedShort")." ".dol_print_date($db->jdate($obj->date_fin_validite),'day')."\n\n"; + $message .= $langs->trans("Contract")." ".$obj->ref.": ".$langs->trans("Service")." ".$obj->label." (".price($obj->total_ttc,0,$outputlangs,0,0,-1,$conf->currency).") ".$obj->nom.", ".$langs->trans("DateEndPlannedShort")." ".dol_print_date($db->jdate($obj->date_fin_validite),'day')."\n\n"; dol_syslog("email_expire_services_to_representatives.php: ".$obj->email); $foundtoprocess++; } @@ -221,7 +227,7 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldsalerepresenta $allmessage.= "Note: This list contains only services of contracts for third parties you are linked to as a sale representative.".($usehtml?"
\n":"\n").($usehtml?"
\n":"\n"); } $allmessage.= $message.($usehtml?"
\n":"\n"); - $allmessage.= $langs->trans("Total")." = ".price($total).($usehtml?"
\n":"\n"); + $allmessage.= $langs->trans("Total")." = ".price($total,0,$userlang,0,0,-1,$conf->currency).($usehtml?"
\n":"\n"); if (! empty($conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER)) { $allmessage.=$conf->global->SCRIPT_EMAIL_EXPIRE_SERVICES_SALESREPRESENTATIVES_FOOTER; diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php index 0178d95d0b6..6b476ece186 100755 --- a/scripts/invoices/email_unpaid_invoices_to_customers.php +++ b/scripts/invoices/email_unpaid_invoices_to_customers.php @@ -152,7 +152,7 @@ if ($resql) if (dol_strlen($newemail)) { - $message .= $outputlangs->trans("Invoice")." ".$obj->facnumber." : ".price($obj->total_ttc,0,$outputlangs)."\n"; + $message .= $outputlangs->trans("Invoice")." ".$obj->facnumber." : ".price($obj->total_ttc,0,$outputlangs,0,0,-1,$conf->currency)."\n"; dol_syslog("email_unpaid_invoices_to_customers.php: ".$newemail." ".$message); $foundtoprocess++; } @@ -249,7 +249,7 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldtarget) $allmessage.= "Note: This list contains only unpaid invoices.".($usehtml?"
\n":"\n"); } $allmessage.= $message.($usehtml?"
\n":"\n"); - $allmessage.= $langs->trans("Total")." = ".price($total).($usehtml?"
\n":"\n"); + $allmessage.= $langs->trans("Total")." = ".price($total,0,$userlang,0,0,-1,$conf->currency).($usehtml?"
\n":"\n"); if (! empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER)) { $allmessage.=$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_CUSTOMERS_FOOTER; diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php index ef5935b7946..2eeb92d3c2e 100755 --- a/scripts/invoices/email_unpaid_invoices_to_representatives.php +++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php @@ -135,7 +135,7 @@ if ($resql) if (dol_strlen($obj->email)) { - $message .= $outputlangs->trans("Invoice")." ".$obj->facnumber." : ".price($obj->total_ttc,0,$outputlangs)." : ".$obj->name."\n"; + $message .= $outputlangs->trans("Invoice")." ".$obj->facnumber." : ".price($obj->total_ttc,0,$outputlangs,0,0,-1,$conf->currency)." : ".$obj->name."\n"; dol_syslog("email_unpaid_invoices_to_representatives.php: ".$obj->email); $foundtoprocess++; } @@ -225,7 +225,7 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldsalerepresenta $allmessage.= $newlangs->transnoentities("NoteListOfYourUnpaidInvoices").($usehtml?"
\n":"\n"); } $allmessage.= $message.($usehtml?"
\n":"\n"); - $allmessage.= $langs->trans("Total")." = ".price($total).($usehtml?"
\n":"\n"); + $allmessage.= $langs->trans("Total")." = ".price($total,0,0,-1,$conf->currency).($usehtml?"
\n":"\n"); if (! empty($conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER)) { $allmessage.=$conf->global->SCRIPT_EMAIL_UNPAID_INVOICES_SALESREPRESENTATIVES_FOOTER; From 253ce19bc1165aa586e9e4de7201ee9fe198371c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 21 Jun 2013 15:26:46 +0200 Subject: [PATCH 16/16] Fix: Bad position of field --- htdocs/core/tpl/login.tpl.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index 58710d9f0e4..be66c742cb9 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -72,14 +72,14 @@ $(document).ready(function () { - - + - - +
+
+