Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: When product type is missing, description is not lost when adding new product lines.

Browse Source
This commit is contained in:
Laurent Destailleur 2009-05-15 11:02:54 +00:00
parent fb4119ae7d
commit 33df2649ef
8 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -12,6 +12,8 @@ For users:
- Fix: Customer code was not correct on PDF it if contains special
characters.
- Fix: Can update price even with "NPR" VAT rates.
- Fix: When product type is missing, description is not lost when adding
new product lines.
For translators:
- Update some language files.

8
htdocs/comm/propal.php
View File

@ -1608,12 +1608,12 @@ if ($id > 0 || ! empty($ref))
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
$doleditor=new DolEditor('dp_desc','',100,'dolibarr_details');
$doleditor=new DolEditor('dp_desc',$_POST["dp_desc"],100,'dolibarr_details');
$doleditor->Create();
}
else
{
print '<textarea class="flat" cols="70" name="dp_desc" rows="'.ROWS_2.'"></textarea>';
print '<textarea class="flat" cols="70" name="dp_desc" rows="'.ROWS_2.'">'.$_POST["dp_desc"].'</textarea>';
}
print '</td>';
print '<td align="right">';
@ -1680,12 +1680,12 @@ if ($id > 0 || ! empty($ref))
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
$doleditor=new DolEditor('np_desc','',100,'dolibarr_details');
$doleditor=new DolEditor('np_desc',$_POST["np_desc"],100,'dolibarr_details');
$doleditor->Create();
}
else
{
print '<textarea cols="70" name="np_desc" rows="'.ROWS_2.'" class="flat"></textarea>';
print '<textarea cols="70" name="np_desc" rows="'.ROWS_2.'" class="flat">'.$_POST["np_desc"].'</textarea>';
}
print '</td>';

8
htdocs/commande/fiche.php
View File

@ -1793,12 +1793,12 @@ else
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
$doleditor=new DolEditor('dp_desc','',100,'dolibarr_details');
$doleditor=new DolEditor('dp_desc',$_POST["dp_desc"],100,'dolibarr_details');
$doleditor->Create();
}
else
{
print '<textarea class="flat" cols="70" name="dp_desc" rows="'.ROWS_2.'"></textarea>';
print '<textarea class="flat" cols="70" name="dp_desc" rows="'.ROWS_2.'">'.$_POST["dp_desc"].'</textarea>';
}
print '</td>';
print '<td align="right">';
@ -1870,12 +1870,12 @@ else
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
$doleditor=new DolEditor('np_desc','',100,'dolibarr_details');
$doleditor=new DolEditor('np_desc',$_POST["np_desc"],100,'dolibarr_details');
$doleditor->Create();
}
else
{
print '<textarea cols="70" name="np_desc" rows="'.ROWS_2.'" class="flat"></textarea>';
print '<textarea cols="70" name="np_desc" rows="'.ROWS_2.'" class="flat">'.$_POST["np_desc"].'</textarea>';
}
print '</td>';

12
htdocs/compta/facture.php
View File

@ -3018,12 +3018,12 @@ else
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
$doleditor=new DolEditor('dp_desc','',100,'dolibarr_details');
$doleditor=new DolEditor('dp_desc',$_POST["dp_desc"],100,'dolibarr_details');
$doleditor->Create();
}
else
{
print '<textarea class="flat" cols="70" name="dp_desc" rows="'.ROWS_2.'"></textarea>';
print '<textarea class="flat" cols="70" name="dp_desc" rows="'.ROWS_2.'">'.$_POST["dp_desc"].'</textarea>';
}
print '</td>';
print '<td align="right">';
@ -3080,11 +3080,11 @@ else
// multiprix
if($conf->global->PRODUIT_MULTIPRICES)
{
$html->select_produits('','idprod','',$conf->produit->limit_size,$soc->price_level);
$html->select_produits((! empty($_POST['idprod'])?$_POST['idprod']:''),'idprod','',$conf->produit->limit_size,$soc->price_level);
}
else
{
$html->select_produits('','idprod','',$conf->produit->limit_size);
$html->select_produits((! empty($_POST['idprod'])?$_POST['idprod']:''),'idprod','',$conf->produit->limit_size);
}
if (! $conf->global->PRODUIT_USE_SEARCH_TO_SELECT) print '<br>';
@ -3093,12 +3093,12 @@ else
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
$doleditor=new DolEditor('np_desc','',100,'dolibarr_details');
$doleditor=new DolEditor('np_desc',$_POST["np_desc"],100,'dolibarr_details');
$doleditor->Create();
}
else
{
print '<textarea cols="70" name="np_desc" rows="'.ROWS_2.'" class="flat"></textarea>';
print '<textarea cols="70" name="np_desc" rows="'.ROWS_2.'" class="flat">'.$_POST["np_desc"].'</textarea>';
}
print '</td>';

4
htdocs/fichinter/fiche.php
View File

@ -751,12 +751,12 @@ elseif ($_GET["id"] > 0)
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
$doleditor=new DolEditor('np_desc','',100,'dolibarr_details');
$doleditor=new DolEditor('np_desc',$_POST["np_desc"],100,'dolibarr_details');
$doleditor->Create();
}
else
{
print '<textarea class="flat" cols="70" name="np_desc" rows="'.ROWS_2.'"></textarea>';
print '<textarea class="flat" cols="70" name="np_desc" rows="'.ROWS_2.'">'.$_POST["np_desc"].'</textarea>';
}
print '</td>';

8
htdocs/fourn/commande/fiche.php
View File

@ -856,12 +856,12 @@ if ($id > 0 || ! empty($ref))
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
$doleditor=new DolEditor('dp_desc','',100,'dolibarr_details');
$doleditor=new DolEditor('dp_desc',$_POST["dp_desc"],100,'dolibarr_details');
$doleditor->Create();
}
else
{
print '<textarea class="flat" cols="70" name="dp_desc" rows="'.ROWS_2.'"></textarea>';
print '<textarea class="flat" cols="70" name="dp_desc" rows="'.ROWS_2.'">'.$_POST["dp_desc"].'</textarea>';
}
print '</td>';
print '<td align="center">';
@ -913,12 +913,12 @@ if ($id > 0 || ! empty($ref))
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
$doleditor=new DolEditor('np_desc','',100,'dolibarr_details');
$doleditor=new DolEditor('np_desc',$_POST["np_desc"],100,'dolibarr_details');
$doleditor->Create();
}
else
{
print '<textarea cols="70" name="np_desc" rows="'.ROWS_2.'" class="flat"></textarea>';
print '<textarea cols="70" name="np_desc" rows="'.ROWS_2.'" class="flat">'.$_POST["np_desc"].'</textarea>';
}
print '</td>';

4
htdocs/fourn/facture/fiche.php
View File

@ -969,12 +969,12 @@ else
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_DETAILS)
{
require_once(DOL_DOCUMENT_ROOT."/lib/doleditor.class.php");
$doleditor=new DolEditor('label','',100,'dolibarr_details');
$doleditor=new DolEditor('label',$_POST["label"],100,'dolibarr_details');
$doleditor->Create();
}
else
{
print '<textarea class="flat" cols="60" name="label" rows="'.ROWS_2.'"></textarea>';
print '<textarea class="flat" cols="60" name="label" rows="'.ROWS_2.'">'.$_POST["label"].'</textarea>';
}
print '</td>';
print '<td align="right">';

4
htdocs/html.form.class.php
View File

@ -864,7 +864,9 @@ class Form
if ( $resultd ) $objtp = $this->db->fetch_object($resultd); // on charge la traduction suivante
}
}
$opt = '<option value="'.$objp->rowid.'">'.$objp->ref.' - ';
$opt = '<option value="'.$objp->rowid.'"';
$opt.= ($objp->rowid == $selected)?' selected="true"':'';
$opt.= '>'.$objp->ref.' - ';
$opt.= dol_trunc($objp->label,32).' - ';
// Multiprice