From 55d1d176c9d36edf25191396c8c4c0c734239625 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 26 Aug 2006 00:59:45 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20Modif=20esth=E9tiques=20mineures?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/comm/propal.php | 2 +- htdocs/compta/bank/account.class.php | 2 +- htdocs/compta/facture.php | 2 +- htdocs/compta/index.php | 1 + .../modules/commande/pdf_einstein.modules.php | 5 ++-- .../includes/modules/modFournisseur.class.php | 16 ++++++------- htdocs/langs/fr_FR/admin.lang | 4 ++-- htdocs/product/fiche.php | 24 +++++++++---------- 8 files changed, 29 insertions(+), 27 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index b552d85d1fe..a170249aa77 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1169,7 +1169,7 @@ if ($conf->expedition->enabled) if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS) { require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); - $doleditor=new DolEditor('desc',$objp->description,200,'dolibarr_details'); + $doleditor=new DolEditor('desc',$objp->description,164,'dolibarr_details'); $doleditor->Create(); } else diff --git a/htdocs/compta/bank/account.class.php b/htdocs/compta/bank/account.class.php index 41ae5cb575f..aecb1e064d6 100644 --- a/htdocs/compta/bank/account.class.php +++ b/htdocs/compta/bank/account.class.php @@ -685,7 +685,7 @@ class Account $sql = "SELECT b.rowid,".$this->db->pdate("b.datev")." as datefin"; $sql.= " FROM ".MAIN_DB_PREFIX."bank as b, ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.rappro=0 AND b.fk_account = ba.rowid"; - $sql.= " AND ba.rappro = 1"; + $sql.= " AND ba.rappro = 1"; // Compte rapprochable $resql=$this->db->query($sql); if ($resql) { diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index ab79e96522b..0884fbe1504 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1902,7 +1902,7 @@ else if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS) { require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); - $doleditor=new DolEditor('desc',$objp->description,200,'dolibarr_details'); + $doleditor=new DolEditor('desc',$objp->description,164,'dolibarr_details'); $doleditor->Create(); } else diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index a68f3ac0176..731e09d7d2f 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -326,6 +326,7 @@ if ($conf->facture->enabled && $conf->commande->enabled && $user->rights->comman print ''; $tot_ht += $obj->total_ht; $tot_ttc += $obj->total_ttc; + print "x".$tot_ttc."z".$obj->tot_fttc; $tot_tobill += ($obj->total_ttc-$obj->tot_fttc); // } $i++; diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index 0993bbc2e04..235135759e0 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -720,9 +720,10 @@ class pdf_einstein extends ModelePDFCommandes /* * \brief Affiche en-tête propale - * \param pdf objet PDF - * \param fac objet propale + * \param pdf Objet PDF + * \param com Objet commande * \param showadress 0=non, 1=oui + * \param outputlang Objet lang cible */ function _pagehead(&$pdf, $com, $showadress=1, $outputlangs) { diff --git a/htdocs/includes/modules/modFournisseur.class.php b/htdocs/includes/modules/modFournisseur.class.php index 1c49b1be0eb..1d1eb33f465 100644 --- a/htdocs/includes/modules/modFournisseur.class.php +++ b/htdocs/includes/modules/modFournisseur.class.php @@ -203,18 +203,18 @@ class modFournisseur extends DolibarrModules $r++; $this->rights[$r][0] = 234; $this->rights[$r][1] = 'Supprimer une facture fournisseur'; - $this->rights[$r][2] = 's'; + $this->rights[$r][2] = 'd'; $this->rights[$r][3] = 0; $this->rights[$r][4] = 'facture'; $this->rights[$r][5] = 'supprimer'; - $r++; - $this->rights[$r][0] = 236; - $this->rights[$r][1] = 'Exporter les factures fournisseurs et attributs'; - $this->rights[$r][2] = 'r'; - $this->rights[$r][3] = 0; - $this->rights[$r][4] = 'facture'; - $this->rights[$r][5] = 'export'; + $r++; + $this->rights[$r][0] = 236; + $this->rights[$r][1] = 'Exporter les factures fournisseurs et attributs'; + $this->rights[$r][2] = 'r'; + $this->rights[$r][3] = 0; + $this->rights[$r][4] = 'facture'; + $this->rights[$r][5] = 'export'; // Exports diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 4ff0ee1a62f..f699c0a7c7b 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -571,7 +571,7 @@ DeliveryOrderModel=Mod DeliveriesOrderAbility=Prise en charge des bons de réception client ##### FCKeditor ##### ActivateFCKeditor=Activer FCKeditor pour : -FCKeditorForCompany=Création/édition WYSIWIG de la description et note des tiers -FCKeditorForProductDescription=Création/édition WYSIWIG de la description et note des produits/services +FCKeditorForCompany=Création/édition WYSIWIG des descriptions et notes des tiers +FCKeditorForProductDescription=Création/édition WYSIWIG des notes des produits/services FCKeditorForDetails=Création/édition WYSIWIG des lignes details des entités (commandes, propales, factures, etc...) FCKeditorForMailing=Création/édition WYSIWIG des mailings diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index ad4eb568acf..b73e1f5769f 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -135,14 +135,14 @@ if ($_POST["action"] == 'update' && } else { - $_GET["action"] = 're-edit'; + $_GET["action"] = 'edit'; $_GET["id"] = $_POST["id"]; $mesg = $product->error; } } else { - $_GET["action"] = 're-edit'; + $_GET["action"] = 'edit'; $_GET["id"] = $_POST["id"]; $mesg = $langs->trans("ErrorProductBadRefOrLabel"); } @@ -434,18 +434,18 @@ if ($_GET["action"] == 'create' && $user->rights->produit->creer) print ''; } - // Description + // Description (utilisé dans facture, propale...) print ''.$langs->trans("Description").''; - if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC) + if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS) { require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); - $doleditor=new DolEditor('desc','',180,'dolibarr_notes','',false); + $doleditor=new DolEditor('desc','',160,'dolibarr_notes','',false); $doleditor->Create(); } else { - print ''; } @@ -461,7 +461,7 @@ if ($_GET["action"] == 'create' && $user->rights->produit->creer) print ''; } - // Note + // Note (invisible sur facture, propales...) print ''.$langs->trans("NoteNotVisibleOnBill").''; if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC) { @@ -471,7 +471,7 @@ if ($_GET["action"] == 'create' && $user->rights->produit->creer) } else { - print ''; } print ""; @@ -682,18 +682,18 @@ if ($_GET["id"] || $_GET["ref"]) print ''; } - // Description + // Description (utilisé dans facture, propale...) print ''.$langs->trans("Description").''; print "\n"; - if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC) + if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS) { require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); - $doleditor=new DolEditor('desc',$product->description,180,'dolibarr_notes','',false); + $doleditor=new DolEditor('desc',$product->description,160,'dolibarr_notes','',false); $doleditor->Create(); } else { - print '"; }