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

Can input payment conditions on several lines

Browse Source
This commit is contained in:
Laurent Destailleur 2010-08-24 09:39:17 +00:00
parent f8bd212b06
commit a2de97e221
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -7,11 +7,15 @@ For users:
- New: Upgrade process works with Postgresql.
- New: Task #10538: Add filter on expiration date of subscription for
foundation module email selector.
- New: Can input payment conditions on several lines.
- New: Add hidden option MAIN_LOGOUT_GOTO_URL to set the exit url after
a logout.
- Fix: Better Postgresql compatibility.
- Fix: Box order is saved when moved.
- Fix: Database name can contains "-" characters.
For developers:
- New: Add jquery by default
- New: Add jquery by default.
- New: Add first Selenium GUI tests.
- Qual: Renamed some fields into database to be more internationnal.

24
htdocs/admin/dict.php
View File

@ -266,10 +266,16 @@ if ($_POST["actionadd"] || $_POST["actionmodify"])
{
if (in_array('region_id',$listfield)) { continue; } // For region page, we do not require the country input
}
if (! isset($_POST[$value]) || $_POST[$value]=='')
if ((! isset($_POST[$value]) || $_POST[$value]=='')
&& $listfield[$f] != 'decalage') // Fields that are not mandatory
{
$ok=0;
$msg.=$langs->trans("ErrorFieldRequired",$listfield[$f]).'<br>';
$fieldnamekey=$listfield[$f];
// We take translate key of field
if ($fieldnamekey == 'libelle') $fieldnamekey='Label';
if ($fieldnamekey == 'nbjour') $fieldnamekey='NbOfDays';
if ($fieldnamekey == 'decalage') $fieldnamekey='Offset';
$msg.=$langs->trans("ErrorFieldRequired",$langs->transnoentities($fieldnamekey)).'<br>';
}
}
// Autres verif
@ -317,7 +323,8 @@ if ($_POST["actionadd"] || $_POST["actionmodify"])
{
if ($value == 'price') { $_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU'); }
if ($i) $sql.=",";
$sql.="'".addslashes($_POST[$listfieldvalue[$i]])."'";
if ($_POST[$listfieldvalue[$i]] == '') $sql.="null";
else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
$i++;
}
$sql.=",1)";
@ -361,7 +368,8 @@ if ($_POST["actionadd"] || $_POST["actionmodify"])
if ($field == 'price') { $_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]],'MU'); }
if ($i) $sql.=",";
$sql.= $field."=";
$sql.= "'".addslashes($_POST[$listfieldvalue[$i]])."'";
if ($_POST[$listfieldvalue[$i]] == '') $sql.="null";
else $sql.="'".$db->escape($_POST[$listfieldvalue[$i]])."'";
$i++;
}
$sql.= " WHERE ".$rowidcol." = '".$_POST["rowid"]."'";
@ -641,7 +649,7 @@ if ($_GET["id"])
print '<td colspan="2" class="liste_titre">&nbsp;</td>';
print '</tr>';
// Lignes de valeurs
// Lines with values
while ($i < $num)
{
$obj = $db->fetch_object($resql);
@ -687,6 +695,9 @@ if ($_GET["id"])
else if ($fieldlist[$field]=='price') {
$valuetoshow=price($valuetoshow);
}
else if ($fieldlist[$field]=='libelle_facture') {
$valuetoshow=nl2br($valuetoshow);
}
else if ($fieldlist[$field]=='libelle' && $tabname[$_GET["id"]]=='llx_c_pays') {
$key=$langs->trans("Country".strtoupper($obj->code));
$valuetoshow=($obj->code && $key != "Country".strtoupper($obj->code))?$key:$obj->$fieldlist[$field];
@ -882,6 +893,9 @@ function fieldList($fieldlist,$obj='')
elseif ($fieldlist[$field] == 'nbjour' || $fieldlist[$field] == 'decalage' || $fieldlist[$field] == 'taux') {
print '<td><input type="text" class="flat" value="'.$obj->$fieldlist[$field].'" size="3" name="'.$fieldlist[$field].'"></td>';
}
elseif ($fieldlist[$field] == 'libelle_facture') {
print '<td><textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.$obj->$fieldlist[$field].'</textarea></td>';
}
elseif ($fieldlist[$field] == 'price') {
print '<td><input type="text" class="flat" value="'.price($obj->$fieldlist[$field]).'" size="8" name="'.$fieldlist[$field].'"></td>';
}