lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Modif esthtiques mineures

Browse Source
This commit is contained in:
Laurent Destailleur 2006-08-26 00:59:45 +00:00
parent 950d3ad4ec
commit 55d1d176c9
8 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/propal.php
View File

@ -1169,7 +1169,7 @@ if ($conf->expedition->enabled)
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS) if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); 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(); $doleditor->Create();
} }
else else

2
htdocs/compta/bank/account.class.php
View File

@ -685,7 +685,7 @@ class Account
$sql = "SELECT b.rowid,".$this->db->pdate("b.datev")." as datefin"; $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.= " 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.= " 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); $resql=$this->db->query($sql);
if ($resql) if ($resql)
{ {

2
htdocs/compta/facture.php
View File

@ -1902,7 +1902,7 @@ else
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS) if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{ {
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php"); 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(); $doleditor->Create();
} }
else else

1
htdocs/compta/index.php
View File

@ -326,6 +326,7 @@ if ($conf->facture->enabled && $conf->commande->enabled && $user->rights->comman
print '</tr>'; print '</tr>';
$tot_ht += $obj->total_ht; $tot_ht += $obj->total_ht;
$tot_ttc += $obj->total_ttc; $tot_ttc += $obj->total_ttc;
print "x".$tot_ttc."z".$obj->tot_fttc;
$tot_tobill += ($obj->total_ttc-$obj->tot_fttc); $tot_tobill += ($obj->total_ttc-$obj->tot_fttc);
// } // }
$i++; $i++;

5
htdocs/includes/modules/commande/pdf_einstein.modules.php
View File

@ -720,9 +720,10 @@ class pdf_einstein extends ModelePDFCommandes
/* /*
* \brief Affiche en-tête propale * \brief Affiche en-tête propale
* \param pdf objet PDF * \param pdf Objet PDF
* \param fac objet propale * \param com Objet commande
* \param showadress 0=non, 1=oui * \param showadress 0=non, 1=oui
* \param outputlang Objet lang cible
*/ */
function _pagehead(&$pdf, $com, $showadress=1, $outputlangs) function _pagehead(&$pdf, $com, $showadress=1, $outputlangs)
{ {

16
htdocs/includes/modules/modFournisseur.class.php
View File

@ -203,18 +203,18 @@ class modFournisseur extends DolibarrModules
$r++; $r++;
$this->rights[$r][0] = 234; $this->rights[$r][0] = 234;
$this->rights[$r][1] = 'Supprimer une facture fournisseur'; $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][3] = 0;
$this->rights[$r][4] = 'facture'; $this->rights[$r][4] = 'facture';
$this->rights[$r][5] = 'supprimer'; $this->rights[$r][5] = 'supprimer';
$r++; $r++;
$this->rights[$r][0] = 236; $this->rights[$r][0] = 236;
$this->rights[$r][1] = 'Exporter les factures fournisseurs et attributs'; $this->rights[$r][1] = 'Exporter les factures fournisseurs et attributs';
$this->rights[$r][2] = 'r'; $this->rights[$r][2] = 'r';
$this->rights[$r][3] = 0; $this->rights[$r][3] = 0;
$this->rights[$r][4] = 'facture'; $this->rights[$r][4] = 'facture';
$this->rights[$r][5] = 'export'; $this->rights[$r][5] = 'export';
// Exports // Exports

4
htdocs/langs/fr_FR/admin.lang
View File

@ -571,7 +571,7 @@ DeliveryOrderModel=Mod
DeliveriesOrderAbility=Prise en charge des bons de réception client DeliveriesOrderAbility=Prise en charge des bons de réception client
##### FCKeditor ##### ##### FCKeditor #####
ActivateFCKeditor=Activer FCKeditor pour : ActivateFCKeditor=Activer FCKeditor pour :
FCKeditorForCompany=Création/édition WYSIWIG de la description et note des tiers FCKeditorForCompany=Création/édition WYSIWIG des descriptions et notes des tiers
FCKeditorForProductDescription=Création/édition WYSIWIG de la description et note des produits/services 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...) FCKeditorForDetails=Création/édition WYSIWIG des lignes details des entités (commandes, propales, factures, etc...)
FCKeditorForMailing=Création/édition WYSIWIG des mailings FCKeditorForMailing=Création/édition WYSIWIG des mailings

24
htdocs/product/fiche.php
View File

@ -135,14 +135,14 @@ if ($_POST["action"] == 'update' &&
} }
else else
{ {
$_GET["action"] = 're-edit'; $_GET["action"] = 'edit';
$_GET["id"] = $_POST["id"]; $_GET["id"] = $_POST["id"];
$mesg = $product->error; $mesg = $product->error;
} }
} }
else else
{ {
$_GET["action"] = 're-edit'; $_GET["action"] = 'edit';
$_GET["id"] = $_POST["id"]; $_GET["id"] = $_POST["id"];
$mesg = $langs->trans("ErrorProductBadRefOrLabel"); $mesg = $langs->trans("ErrorProductBadRefOrLabel");
} }
@ -434,18 +434,18 @@ if ($_GET["action"] == 'create' && $user->rights->produit->creer)
print '<input name="seuil_stock_alerte" type="hidden" value="0">'; print '<input name="seuil_stock_alerte" type="hidden" value="0">';
} }
// Description // Description (utilisé dans facture, propale...)
print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>'; print '<tr><td valign="top">'.$langs->trans("Description").'</td><td>';
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"); 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(); $doleditor->Create();
} }
else else
{ {
print '<textarea name="desc" rows="4" cols="50">'; print '<textarea name="desc" rows="4" cols="90">';
print '</textarea>'; print '</textarea>';
} }
@ -461,7 +461,7 @@ if ($_GET["action"] == 'create' && $user->rights->produit->creer)
print '</td></tr>'; print '</td></tr>';
} }
// Note // Note (invisible sur facture, propales...)
print '<tr><td valign="top">'.$langs->trans("NoteNotVisibleOnBill").'</td><td>'; print '<tr><td valign="top">'.$langs->trans("NoteNotVisibleOnBill").'</td><td>';
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC) if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC)
{ {
@ -471,7 +471,7 @@ if ($_GET["action"] == 'create' && $user->rights->produit->creer)
} }
else else
{ {
print '<textarea name="note" rows="8" cols="50">'; print '<textarea name="note" rows="8" cols="70">';
print '</textarea>'; print '</textarea>';
} }
print "</td></tr>"; print "</td></tr>";
@ -682,18 +682,18 @@ if ($_GET["id"] || $_GET["ref"])
print '<input name="seuil_stock_alerte" type="hidden" value="0">'; print '<input name="seuil_stock_alerte" type="hidden" value="0">';
} }
// Description // Description (utilisé dans facture, propale...)
print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="2">'; print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="2">';
print "\n"; 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"); 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(); $doleditor->Create();
} }
else else
{ {
print '<textarea name="desc" rows="4" cols="70">'; print '<textarea name="desc" rows="4" cols="90">';
print $product->description; print $product->description;
print "</textarea>"; print "</textarea>";
} }