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

New: Can now use 0 as amount.

Browse Source 
Qual: Uniformise labels
This commit is contained in:
Laurent Destailleur 2009-06-04 00:59:06 +00:00
parent bbb3b8125d
commit bb6cfc1ee4
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/comm/propal.php
View File

@ -603,10 +603,23 @@ if ($_POST['action'] == "setabsolutediscount" && $user->rights->propale->creer)
* Ajout d'une ligne produit dans la propale * Ajout d'une ligne produit dans la propale
*/ */
if ($_POST['action'] == "addline" && $user->rights->propale->creer) if ($_POST['action'] == "addline" && $user->rights->propale->creer)
{
if (isset($_POST['qty']) && (($_POST['np_price']!='' && ($_POST['np_desc'] || $_POST['dp_desc'])) || $_POST['idprod']))
{ {
$propal = new Propal($db); $propal = new Propal($db);
$result=0;
if (empty($_POST['idprod']) && $_POST["type"] < 0)
{
$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).'</div>';
$result = -1 ;
}
if (empty($_POST['idprod']) && (! isset($_POST["np_price"]) || $_POST["np_price"]=='')) // Unit price can be 0 but not ''
{
$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("UnitPriceHT")).'</div>';
$result = -1 ;
}
if ($result >= 0 && isset($_POST['qty']) && (($_POST['np_price']!='' && ($_POST['np_desc'] || $_POST['dp_desc'])) || $_POST['idprod']))
{
$ret=$propal->fetch($_POST['propalid']); $ret=$propal->fetch($_POST['propalid']);
if ($ret < 0) if ($ret < 0)
{ {

4
htdocs/commande/fiche.php
View File

@ -320,13 +320,13 @@ if ($_POST['action'] == 'addline' && $user->rights->commande->creer)
$mesg = '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).'</div>'; $mesg = '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).'</div>';
$result = -1 ; $result = -1 ;
} }
if (empty($_POST['idprod']) && ! isset($_POST["pu"])) // Field pu can be 0 if (empty($_POST['idprod']) && (! isset($_POST["pu"]) || $_POST["pu"]=='')) // Unit price can be 0 but not ''
{ {
$mesg = '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("UnitPriceHT")).'</div>'; $mesg = '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("UnitPriceHT")).'</div>';
$result = -1 ; $result = -1 ;
} }
if ($_POST['qty'] && (($_POST['pu'] != '' && ($_POST['np_desc'] || $_POST['dp_desc'])) || $_POST['idprod'])) if ($result >= 0 && $_POST['qty'] && (($_POST['pu'] != '' && ($_POST['np_desc'] || $_POST['dp_desc'])) || $_POST['idprod']))
{ {
$ret=$commande->fetch($_POST['id']); $ret=$commande->fetch($_POST['id']);
if ($ret < 0) if ($ret < 0)

11
htdocs/compta/facture.php
View File

@ -841,22 +841,23 @@ if ($_POST['action'] == 'add' && $user->rights->facture->creer)
*/ */
if (($_POST['action'] == 'addline' || $_POST['action'] == 'addline_predef') && $user->rights->facture->creer) if (($_POST['action'] == 'addline' || $_POST['action'] == 'addline_predef') && $user->rights->facture->creer)
{ {
$fac = new Facture($db);
$result=0; $result=0;
if (empty($_POST['idprod']) && $_POST["type"] < 0) if (empty($_POST['idprod']) && $_POST["type"] < 0)
{ {
$fac->error = $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")) ; $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).'</div>';
$result = -1 ; $result = -1 ;
} }
if (empty($_POST['idprod']) && empty($_POST["pu"])) if (empty($_POST['idprod']) && (! isset($_POST["pu"]) || $_POST["pu"]=='')) // Unit price can be 0 but not ''
{ {
$fac->error = $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("UnitPriceHT")) ; $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("UnitPriceHT")).'</div>';
$result = -1 ; $result = -1 ;
} }
// qty can't be null for invoice (no option)
if ($result >= 0 && $_POST['qty'] && (($_POST['pu']!='' && ($_POST['np_desc'] || $_POST['dp_desc'])) || $_POST['idprod'])) if ($result >= 0 && $_POST['qty'] && (($_POST['pu']!='' && ($_POST['np_desc'] || $_POST['dp_desc'])) || $_POST['idprod']))
{ {
$fac = new Facture($db);
$ret=$fac->fetch($_POST['facid']); $ret=$fac->fetch($_POST['facid']);
if ($ret < 0) if ($ret < 0)
{ {
@ -980,7 +981,7 @@ if (($_POST['action'] == 'addline' || $_POST['action'] == 'addline_predef') && $
} }
else else
{ {
$mesg='<div class="error">'.$fac->error.'</div>'; if (empty($mesg)) $mesg='<div class="error">'.$fac->error.'</div>';
} }
$_GET['facid']=$_POST['facid']; // Pour réaffichage de la fiche en cours d'édition $_GET['facid']=$_POST['facid']; // Pour réaffichage de la fiche en cours d'édition