From b0212fc8e682e803635d4ed755266847675f2504 Mon Sep 17 00:00:00 2001 From: fhenry Date: Sun, 3 Mar 2013 21:23:18 +0100 Subject: [PATCH 1/4] Fix [ bug #742 ] and translation of constant description --- htdocs/core/modules/modCommande.class.php | 4 ++-- htdocs/core/modules/modFacture.class.php | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php index c0eba504153..92104837cd1 100644 --- a/htdocs/core/modules/modCommande.class.php +++ b/htdocs/core/modules/modCommande.class.php @@ -80,14 +80,14 @@ class modCommande extends DolibarrModules $this->const[$r][0] = "COMMANDE_ADDON_PDF"; $this->const[$r][1] = "chaine"; $this->const[$r][2] = "einstein"; - $this->const[$r][3] = 'Nom du gestionnaire de generation des commandes en PDF'; + $this->const[$r][3] = 'Name of PDF model of order'; $this->const[$r][4] = 0; $r++; $this->const[$r][0] = "COMMANDE_ADDON"; $this->const[$r][1] = "chaine"; $this->const[$r][2] = "mod_commande_marbre"; - $this->const[$r][3] = 'Nom du gestionnaire de numerotation des commandes'; + $this->const[$r][3] = 'Name of numbering numerotation rules of order'; $this->const[$r][4] = 0; $r++; diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php index 5abfb38522f..eba26dc5d55 100644 --- a/htdocs/core/modules/modFacture.class.php +++ b/htdocs/core/modules/modFacture.class.php @@ -78,11 +78,15 @@ class modFacture extends DolibarrModules $this->const[$r][0] = "FACTURE_ADDON_PDF"; $this->const[$r][1] = "chaine"; $this->const[$r][2] = "crabe"; + $this->const[$r][3] = 'Name of PDF model of invoice'; + $this->const[$r][4] = 0; $r++; $this->const[$r][0] = "FACTURE_ADDON"; $this->const[$r][1] = "chaine"; - $this->const[$r][2] = "terre"; + $this->const[$r][2] = "mod_facture_terre"; + $this->const[$r][3] = 'Name of numbering numerotation rules of invoice'; + $this->const[$r][4] = 0; $r++; $this->const[$r][0] = "FACTURE_ADDON_PDF_ODT_PATH"; From f793ed83f6c9076bc6d4cbef39a66ab5b7e3cc8b Mon Sep 17 00:00:00 2001 From: fhenry Date: Mon, 4 Mar 2013 15:36:40 +0100 Subject: [PATCH 2/4] Fix [ bug #747 ] --- htdocs/comm/propal.php | 2 +- htdocs/commande/fiche.php | 2 +- htdocs/compta/facture.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 7511c6f2ea4..9b331027159 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -745,7 +745,7 @@ else if ($action == "addline" && $user->rights->propal->creer) if (! empty($prod->customcode) && ! empty($prod->country_code)) $tmptxt.=' - '; if (! empty($prod->country_code)) $tmptxt.=$langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code,0,$db,$langs,0); $tmptxt.=')'; - $desc.= dol_concatdesc($desc, $tmptxt); + $desc= dol_concatdesc($desc, $tmptxt); } } diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 9b6465c64a7..77b8f5956c5 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -660,7 +660,7 @@ else if ($action == 'addline' && $user->rights->commande->creer) if (! empty($prod->customcode) && ! empty($prod->country_code)) $tmptxt.=' - '; if (! empty($prod->country_code)) $tmptxt.=$langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code,0,$db,$langs,0); $tmptxt.=')'; - $desc.= dol_concatdesc($desc, $tmptxt); + $desc= dol_concatdesc($desc, $tmptxt); } } diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 5bc85030f99..8c357894b4a 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1100,7 +1100,7 @@ else if (($action == 'addline' || $action == 'addline_predef') && $user->rights- if (! empty($prod->customcode) && ! empty($prod->country_code)) $tmptxt.=' - '; if (! empty($prod->country_code)) $tmptxt.=$langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code,0,$db,$langs,0); $tmptxt.=')'; - $desc.= dol_concatdesc($desc, $tmptxt); + $desc= dol_concatdesc($desc, $tmptxt); } } From f86cad0580aff52884efdc684064e46ae5e15a35 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 4 Mar 2013 17:36:20 +0100 Subject: [PATCH 3/4] Fix: Try a fix for IE9 (need to be tested with IE 8, 7 and 10) --- htdocs/theme/amarok/style.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index 115a63d7e66..38bf8fc3408 100755 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -327,7 +327,7 @@ div.tmenu { right:0; white-space:nowrap; height:36px; - line-height:36px; + browser->name != 'ie') echo "line-height:36px; /* disabled for ie9 */ \n"; ?> background:#333333; background-image:linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image:-o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); From 555b3a1199c9e61c44eb8005b0687ba7b8fb243e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 4 Mar 2013 21:00:22 +0100 Subject: [PATCH 4/4] Fix:; Removed warning --- htdocs/core/lib/functions.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 300db957b16..adb8f190ef6 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4147,7 +4147,7 @@ function printCommonFooter($zone='private') { $micro_end_time=dol_microtime_float(true); print "\n".'