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

Fix: avoid warning and strict mode story

Browse Source
This commit is contained in:
Regis Houssin 2012-07-25 09:09:56 +02:00
parent 8e953a6858
commit e12604cb71
2 changed files with 313 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

288
htdocs/commande/fiche.php
View File

@ -36,11 +36,11 @@ require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php');
require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'); require_once(DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php');
require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/order.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'); if (! empty($conf->projet->enabled)) {
if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'); require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php');
require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php');
if (!$user->rights->commande->lire) accessforbidden(); }
$langs->load('orders'); $langs->load('orders');
$langs->load('sendings'); $langs->load('sendings');
@ -52,12 +52,15 @@ $langs->load('products');
if (! empty($conf->margin->enabled)) if (! empty($conf->margin->enabled))
$langs->load('margins'); $langs->load('margins');
$id = (GETPOST('id','int')?GETPOST('id','int'):GETPOST("orderid")); $id=(GETPOST('id','int')?GETPOST('id','int'):GETPOST('orderid','int'));
$ref = GETPOST('ref'); $ref=GETPOST('ref','alpha');
$socid = GETPOST('socid','int'); $socid=GETPOST('socid','int');
$action = GETPOST('action'); $action=GETPOST('action','alpha');
$confirm = GETPOST('confirm'); $confirm=GETPOST('confirm','alpha');
$lineid = GETPOST('lineid'); $lineid=GETPOST('lineid','int');
$origin=GETPOST('origin','alpha');
$originid=GETPOST('origin_id','int');
$mesg = GETPOST('mesg'); $mesg = GETPOST('mesg');
//PDF //PDF
@ -66,8 +69,8 @@ $hidedesc = (GETPOST('hidedesc','int') ? GETPOST('hidedesc','int') : (! empty(
$hideref = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0)); $hideref = (GETPOST('hideref','int') ? GETPOST('hideref','int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
// Security check // Security check
if ($user->societe_id) $socid=$user->societe_id; if (! empty($user->societe_id)) $socid=$user->societe_id;
$result=restrictedArea($user,'commande',$id,''); $result=restrictedArea($user,'commande',$id);
$object = new Commande($db); $object = new Commande($db);
@ -125,7 +128,7 @@ else if ($action == 'reopen' && $user->rights->commande->creer)
$result = $object->set_reopen($user); $result = $object->set_reopen($user);
if ($result > 0) if ($result > 0)
{ {
Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id); Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
exit; exit;
} }
else else
@ -159,7 +162,7 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->
// Define output language // Define output language
$outputlangs = $langs; $outputlangs = $langs;
$newlang=''; $newlang='';
if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id']; if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang; if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
if (! empty($newlang)) if (! empty($newlang))
{ {
@ -168,11 +171,11 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->
} }
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
{ {
$ret=$object->fetch($id); // Reload to get new records $ret=$object->fetch($object->id); // Reload to get new records
commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
} }
Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id); Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
exit; exit;
} }
else else
@ -184,14 +187,14 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->
// Categorisation dans projet // Categorisation dans projet
else if ($action == 'classin' && $user->rights->commande->creer) else if ($action == 'classin' && $user->rights->commande->creer)
{ {
$object->setProject($_POST['projectid']); $object->setProject(GETPOST('projectid'));
} }
// Add order // Add order
else if ($action == 'add' && $user->rights->commande->creer) else if ($action == 'add' && $user->rights->commande->creer)
{ {
$datecommande = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']); $datecommande = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
$datelivraison = dol_mktime(12, 0, 0, $_POST['liv_month'],$_POST['liv_day'],$_POST['liv_year']); $datelivraison = dol_mktime(12, 0, 0, GETPOST('liv_month'),GETPOST('liv_day'),GETPOST('liv_year'));
$object->socid=$socid; $object->socid=$socid;
$object->fetch_thirdparty(); $object->fetch_thirdparty();
@ -199,26 +202,26 @@ else if ($action == 'add' && $user->rights->commande->creer)
$db->begin(); $db->begin();
$object->date_commande = $datecommande; $object->date_commande = $datecommande;
$object->note = $_POST['note']; $object->note = GETPOST('note');
$object->note_public = $_POST['note_public']; $object->note_public = GETPOST('note_public');
$object->source = $_POST['source_id']; $object->source = GETPOST('source_id');
$object->fk_project = $_POST['projectid']; $object->fk_project = GETPOST('projectid');
$object->ref_client = $_POST['ref_client']; $object->ref_client = GETPOST('ref_client');
$object->modelpdf = $_POST['model']; $object->modelpdf = GETPOST('model');
$object->cond_reglement_id = $_POST['cond_reglement_id']; $object->cond_reglement_id = GETPOST('cond_reglement_id');
$object->mode_reglement_id = $_POST['mode_reglement_id']; $object->mode_reglement_id = GETPOST('mode_reglement_id');
$object->availability_id = $_POST['availability_id']; $object->availability_id = GETPOST('availability_id');
$object->demand_reason_id = $_POST['demand_reason_id']; $object->demand_reason_id = GETPOST('demand_reason_id');
$object->date_livraison = $datelivraison; $object->date_livraison = $datelivraison;
$object->fk_delivery_address = $_POST['fk_address']; $object->fk_delivery_address = GETPOST('fk_address');
$object->contactid = $_POST['contactidp']; $object->contactid = GETPOST('contactidp');
// If creation from another object of another module (Example: origin=propal, originid=1) // If creation from another object of another module (Example: origin=propal, originid=1)
if ($_POST['origin'] && $_POST['originid']) if ($origin && $originid)
{ {
// Parse element/subelement (ex: project_task) // Parse element/subelement (ex: project_task)
$element = $subelement = $_POST['origin']; $element = $subelement = $origin;
if (preg_match('/^([^_]+)_([^_]+)/i',$_POST['origin'],$regs)) if (preg_match('/^([^_]+)_([^_]+)/i',$origin,$regs))
{ {
$element = $regs[1]; $element = $regs[1];
$subelement = $regs[2]; $subelement = $regs[2];
@ -229,14 +232,15 @@ else if ($action == 'add' && $user->rights->commande->creer)
if ($element == 'propal') { $element = 'comm/propal'; $subelement = 'propal'; } if ($element == 'propal') { $element = 'comm/propal'; $subelement = 'propal'; }
if ($element == 'contract') { $element = $subelement = 'contrat'; } if ($element == 'contract') { $element = $subelement = 'contrat'; }
$object->origin = $_POST['origin']; $object->origin = $origin;
$object->origin_id = $_POST['originid']; $object->origin_id = $originid;
// Possibility to add external linked objects with hooks // Possibility to add external linked objects with hooks
$object->linked_objects[$object->origin] = $object->origin_id; $object->linked_objects[$object->origin] = $object->origin_id;
if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects'])) $other_linked_objects=GETPOST('other_linked_objects','array');
if (! empty($other_linked_objects))
{ {
$object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']); $object->linked_objects = array_merge($object->linked_objects, $other_linked_objects);
} }
$object_id = $object->create($user); $object_id = $object->create($user);
@ -351,10 +355,9 @@ else if ($action == 'add' && $user->rights->commande->creer)
// Insert default contacts if defined // Insert default contacts if defined
if ($object_id > 0) if ($object_id > 0)
{ {
if ($_POST["contactidp"]) if (GETPOST('contactidp'))
{ {
$result=$object->add_contact($_POST["contactidp"],'CUSTOMER','external'); $result=$object->add_contact(GETPOST('contactidp'),'CUSTOMER','external');
if ($result < 0) if ($result < 0)
{ {
$mesg = '<div class="error">'.$langs->trans("ErrorFailedToAddContact").'</div>'; $mesg = '<div class="error">'.$langs->trans("ErrorFailedToAddContact").'</div>';
@ -377,10 +380,8 @@ else if ($action == 'add' && $user->rights->commande->creer)
{ {
$db->rollback(); $db->rollback();
$action='create'; $action='create';
$socid=$_POST['socid'];
if (! $mesg) $mesg='<div class="error">'.$object->error.'</div>'; if (! $mesg) $mesg='<div class="error">'.$object->error.'</div>';
} }
} }
else if ($action == 'classifybilled' && $user->rights->commande->creer) else if ($action == 'classifybilled' && $user->rights->commande->creer)
@ -391,21 +392,21 @@ else if ($action == 'classifybilled' && $user->rights->commande->creer)
// Positionne ref commande client // Positionne ref commande client
else if ($action == 'set_ref_client' && $user->rights->commande->creer) else if ($action == 'set_ref_client' && $user->rights->commande->creer)
{ {
$object->set_ref_client($user, $_POST['ref_client']); $object->set_ref_client($user, GETPOST('ref_client'));
} }
else if ($action == 'setremise' && $user->rights->commande->creer) else if ($action == 'setremise' && $user->rights->commande->creer)
{ {
$object->set_remise($user, $_POST['remise']); $object->set_remise($user, GETPOST('remise'));
} }
else if ($action == 'setabsolutediscount' && $user->rights->commande->creer) else if ($action == 'setabsolutediscount' && $user->rights->commande->creer)
{ {
if ($_POST["remise_id"]) if (GETPOST('remise_id'))
{ {
if ($object->id > 0) if ($object->id > 0)
{ {
$object->insert_discount($_POST["remise_id"]); $object->insert_discount(GETPOST('remise_id'));
} }
else else
{ {
@ -417,7 +418,7 @@ else if ($action == 'setabsolutediscount' && $user->rights->commande->creer)
else if ($action == 'setdate' && $user->rights->commande->creer) else if ($action == 'setdate' && $user->rights->commande->creer)
{ {
//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year']; //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
$date=dol_mktime(0, 0, 0, $_POST['order_month'], $_POST['order_day'], $_POST['order_year']); $date=dol_mktime(0, 0, 0, GETPOST('order_month'), GETPOST('order_day'), GETPOST('order_year'));
$result=$object->set_date($user,$date); $result=$object->set_date($user,$date);
if ($result < 0) if ($result < 0)
@ -429,7 +430,7 @@ else if ($action == 'setdate' && $user->rights->commande->creer)
else if ($action == 'setdate_livraison' && $user->rights->commande->creer) else if ($action == 'setdate_livraison' && $user->rights->commande->creer)
{ {
//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year']; //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
$datelivraison=dol_mktime(0, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']); $datelivraison=dol_mktime(0, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
$result=$object->set_date_livraison($user,$datelivraison); $result=$object->set_date_livraison($user,$datelivraison);
if ($result < 0) if ($result < 0)
@ -446,13 +447,13 @@ else if ($action == 'setmode' && $user->rights->commande->creer)
else if ($action == 'setavailability' && $user->rights->commande->creer) else if ($action == 'setavailability' && $user->rights->commande->creer)
{ {
$result=$object->availability($_POST['availability_id']); $result=$object->availability(GETPOST('availability_id'));
if ($result < 0) dol_print_error($db,$object->error); if ($result < 0) dol_print_error($db,$object->error);
} }
else if ($action == 'setdemandreason' && $user->rights->commande->creer) else if ($action == 'setdemandreason' && $user->rights->commande->creer)
{ {
$result=$object->demand_reason($_POST['demand_reason_id']); $result=$object->demand_reason(GETPOST('demand_reason_id'));
if ($result < 0) dol_print_error($db,$object->error); if ($result < 0) dol_print_error($db,$object->error);
} }
@ -477,7 +478,7 @@ else if ($action == 'setconditions' && $user->rights->commande->creer)
$outputlangs->setDefaultLang($newlang); $outputlangs->setDefaultLang($newlang);
} }
$ret=$object->fetch($id); // Reload to get new records $ret=$object->fetch($object->id); // Reload to get new records
commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
} }
} }
@ -485,12 +486,12 @@ else if ($action == 'setconditions' && $user->rights->commande->creer)
else if ($action == 'setremisepercent' && $user->rights->commande->creer) else if ($action == 'setremisepercent' && $user->rights->commande->creer)
{ {
$result = $object->set_remise($user, $_POST['remise_percent']); $result = $object->set_remise($user, GETPOST('remise_percent'));
} }
else if ($action == 'setremiseabsolue' && $user->rights->commande->creer) else if ($action == 'setremiseabsolue' && $user->rights->commande->creer)
{ {
$result = $object->set_remise_absolue($user, $_POST['remise_absolue']); $result = $object->set_remise_absolue($user, GETPOST('remise_absolue'));
} }
else if ($action == 'setnote_public' && $user->rights->commande->creer) else if ($action == 'setnote_public' && $user->rights->commande->creer)
@ -512,33 +513,33 @@ else if ($action == 'addline' && $user->rights->commande->creer)
{ {
$result=0; $result=0;
if (empty($_POST['idprod']) && $_POST["type"] < 0) if (! GETPOST('idprod') && GETPOST('type') < 0)
{ {
$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["np_price"]) || $_POST["np_price"]=='')) // Unit price can be 0 but not '' if (! GETPOST('idprod') && GETPOST('np_price')=='') // 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 ($result >= 0 && $_POST['qty'] && (($_POST['np_price'] != '' && ($_POST['np_desc'] || $_POST['dp_desc'])) || $_POST['idprod'])) if ($result >= 0 && GETPOST('qty') && ((GETPOST('np_price') != '' && (GETPOST('np_desc') || GETPOST('dp_desc'))) || GETPOST('idprod')))
{ {
// Clean parameters // Clean parameters
$suffixe = $_POST['idprod'] ? '_predef' : ''; $suffixe = GETPOST('idprod') ? '_predef' : '';
$date_start=dol_mktime(0, 0, 0, $_POST['date_start'.$suffixe.'month'], $_POST['date_start'.$suffixe.'day'], $_POST['date_start'.$suffixe.'year']); $date_start=dol_mktime(0, 0, 0, GETPOST('date_start'.$suffixe.'month'), GETPOST('date_start'.$suffixe.'day'), GETPOST('date_start'.$suffixe.'year'));
$date_end=dol_mktime(0, 0, 0, $_POST['date_end'.$suffixe.'month'], $_POST['date_end'.$suffixe.'day'], $_POST['date_end'.$suffixe.'year']); $date_end=dol_mktime(0, 0, 0, GETPOST('date_end'.$suffixe.'month'), GETPOST('date_end'.$suffixe.'day'), GETPOST('date_end'.$suffixe.'year'));
$price_base_type = 'HT'; $price_base_type = 'HT';
// Ecrase $pu par celui du produit // Ecrase $pu par celui du produit
// Ecrase $desc par celui du produit // Ecrase $desc par celui du produit
// Ecrase $txtva par celui du produit // Ecrase $txtva par celui du produit
// Ecrase $base_price_type par celui du produit // Ecrase $base_price_type par celui du produit
if ($_POST['idprod']) if (GETPOST('idprod'))
{ {
$prod = new Product($db); $prod = new Product($db);
$prod->fetch($_POST['idprod']); $prod->fetch(GETPOST('idprod'));
$tva_tx = get_default_tva($mysoc,$object->client,$prod->id); $tva_tx = get_default_tva($mysoc,$object->client,$prod->id);
@ -592,17 +593,17 @@ else if ($action == 'addline' && $user->rights->commande->creer)
$desc = $prod->description; $desc = $prod->description;
} }
$desc.= ($desc && $_POST['np_desc']) ? ((dol_textishtml($desc) || dol_textishtml($_POST['np_desc']))?"<br />\n":"\n") : ""; $desc.= ($desc && GETPOST('np_desc')) ? ((dol_textishtml($desc) || dol_textishtml(GETPOST('np_desc')))?"<br />\n":"\n") : "";
$desc.= $_POST['np_desc']; $desc.= GETPOST('np_desc');
$type = $prod->type; $type = $prod->type;
} }
else else
{ {
$pu_ht=$_POST['np_price']; $pu_ht=GETPOST('np_price');
$tva_tx=str_replace('*','',$_POST['np_tva_tx']); $tva_tx=str_replace('*','',GETPOST('np_tva_tx'));
$tva_npr=preg_match('/\*/',$_POST['np_tva_tx'])?1:0; $tva_npr=preg_match('/\*/',GETPOST('np_tva_tx'))?1:0;
$desc=$_POST['dp_desc']; $desc=GETPOST('dp_desc');
$type=$_POST["type"]; $type=GETPOST('type');
} }
// Local Taxes // Local Taxes
@ -612,9 +613,9 @@ else if ($action == 'addline' && $user->rights->commande->creer)
$desc=dol_htmlcleanlastbr($desc); $desc=dol_htmlcleanlastbr($desc);
// ajout prix achat // ajout prix achat
$fk_fournprice = $_POST['np_fournprice']; $fk_fournprice = GETPOST('np_fournprice');
if ( ! empty($_POST['np_buying_price']) ) if (GETPOST('np_buying_price'))
$pa_ht = $_POST['np_buying_price']; $pa_ht = GETPOST('np_buying_price');
else else
$pa_ht = null; $pa_ht = null;
@ -623,7 +624,7 @@ else if ($action == 'addline' && $user->rights->commande->creer)
if ($result >= 0) if ($result >= 0)
{ {
if($price_min && (price2num($pu_ht)*(1-price2num($_POST['remise_percent'])/100) < price2num($price_min))) if($price_min && (price2num($pu_ht)*(1-price2num(GETPOST('remise_percent'))/100) < price2num($price_min)))
{ {
//print "CantBeLessThanMinPrice ".$up_ht." - ".GETPOST('remise_percent')." - ".$product->price_min; //print "CantBeLessThanMinPrice ".$up_ht." - ".GETPOST('remise_percent')." - ".$product->price_min;
$mesg = '<div class="error">'.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->currency)).'</div>' ; $mesg = '<div class="error">'.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->currency)).'</div>' ;
@ -632,15 +633,15 @@ else if ($action == 'addline' && $user->rights->commande->creer)
{ {
// Insert line // Insert line
$result = $object->addline( $result = $object->addline(
$id, $object->id,
$desc, $desc,
$pu_ht, $pu_ht,
$_POST['qty'], GETPOST('qty'),
$tva_tx, $tva_tx,
$localtax1_tx, $localtax1_tx,
$localtax2_tx, $localtax2_tx,
$_POST['idprod'], GETPOST('idprod'),
$_POST['remise_percent'], GETPOST('remise_percent'),
$info_bits, $info_bits,
0, 0,
$price_base_type, $price_base_type,
@ -650,7 +651,7 @@ else if ($action == 'addline' && $user->rights->commande->creer)
$type, $type,
-1, -1,
'', '',
$_POST['fk_parent_line'], GETPOST('fk_parent_line'),
$fk_fournprice, $fk_fournprice,
$pa_ht $pa_ht
); );
@ -669,7 +670,7 @@ else if ($action == 'addline' && $user->rights->commande->creer)
$outputlangs->setDefaultLang($newlang); $outputlangs->setDefaultLang($newlang);
} }
$ret=$object->fetch($id); // Reload to get new records $ret=$object->fetch($object->id); // Reload to get new records
commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
} }
@ -695,74 +696,69 @@ else if ($action == 'addline' && $user->rights->commande->creer)
/* /*
* Mise a jour d'une ligne dans la commande * Mise a jour d'une ligne dans la commande
*/ */
else if ($action == 'updateligne' && $user->rights->commande->creer && $_POST['save'] == $langs->trans('Save')) else if ($action == 'updateligne' && $user->rights->commande->creer && GETPOST('save') == $langs->trans('Save'))
{ {
// Clean parameters // Clean parameters
$date_start=''; $date_start='';
$date_end=''; $date_end='';
$date_start=dol_mktime(0, 0, 0, $_POST['date_start'.$suffixe.'month'], $_POST['date_start'.$suffixe.'day'], $_POST['date_start'.$suffixe.'year']); $date_start=dol_mktime(0, 0, 0, GETPOST('date_start'.$suffixe.'month'), GETPOST('date_start'.$suffixe.'day'), GETPOST('date_start'.$suffixe.'year'));
$date_end=dol_mktime(0, 0, 0, $_POST['date_end'.$suffixe.'month'], $_POST['date_end'.$suffixe.'day'], $_POST['date_end'.$suffixe.'year']); $date_end=dol_mktime(0, 0, 0, GETPOST('date_end'.$suffixe.'month'), GETPOST('date_end'.$suffixe.'day'), GETPOST('date_end'.$suffixe.'year'));
$description=dol_htmlcleanlastbr($_POST['desc']); $description=dol_htmlcleanlastbr(GETPOST('desc'));
$up_ht=GETPOST('pu')?GETPOST('pu'):GETPOST('subprice'); $up_ht=GETPOST('pu')?GETPOST('pu'):GETPOST('subprice');
// Define info_bits // Define info_bits
$info_bits=0; $info_bits=0;
if (preg_match('/\*/',$_POST['tva_tx'])) $info_bits |= 0x01; if (preg_match('/\*/',GETPOST('tva_tx'))) $info_bits |= 0x01;
// Define vat_rate // Define vat_rate
$vat_rate=$_POST['tva_tx']; $vat_rate=GETPOST('tva_tx');
$vat_rate=str_replace('*','',$vat_rate); $vat_rate=str_replace('*','',$vat_rate);
$localtax1_rate=get_localtax($vat_rate,1,$object->client); $localtax1_rate=get_localtax($vat_rate,1,$object->client);
$localtax2_rate=get_localtax($vat_rate,2,$object->client); $localtax2_rate=get_localtax($vat_rate,2,$object->client);
// ajout prix d'achat // ajout prix d'achat
$fk_fournprice = $_POST['fournprice']; $fk_fournprice = GETPOST('fournprice');
if ( ! empty($_POST['buying_price']) ) if (GETPOST('buying_price'))
$pa_ht = $_POST['buying_price']; $pa_ht = GETPOST('buying_price');
else else
$pa_ht = null; $pa_ht = null;
// Check parameters
if (empty($_POST['productid']) && $_POST["type"] < 0)
{
$mesg = '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).'</div>';
$result = -1 ;
}
// Check minimum price // Check minimum price
if(! empty($_POST['productid'])) if (GETPOST('productid'))
{ {
$productid = $_POST['productid']; $productid = GETPOST('productid');
$product = new Product($db); $product = new Product($db);
$product->fetch($productid); $product->fetch($productid);
$type=$product->type; $type=$product->type;
$price_min = $product->price_min; $price_min = $product->price_min;
if ($conf->global->PRODUIT_MULTIPRICES && $object->client->price_level) $price_min = $product->multiprices_min[$object->client->price_level]; if ($conf->global->PRODUIT_MULTIPRICES && $object->client->price_level) $price_min = $product->multiprices_min[$object->client->price_level];
}
if ($price_min && GETPOST('productid') && (price2num($up_ht)*(1-price2num($_POST['remise_percent'])/100) < price2num($price_min))) if ($price_min && (price2num($up_ht)*(1-price2num(GETPOST('remise_percent'))/100) < price2num($price_min)))
{ {
$mesg = '<div class="error">'.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->currency)).'</div>' ; $mesg = '<div class="error">'.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->currency)).'</div>' ;
$result=-1; $error++;
} }
// Define params
if (! empty($_POST['productid']))
{
$type=$product->type;
} }
else else
{ {
$type=$_POST["type"]; $type=GETPOST('type');
// Check parameters
if (GETPOST('type') < 0) {
$mesg = '<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).'</div>';
$error++;
}
} }
if ($result >= 0) if (! $error)
{ {
$result = $object->updateline( $result = $object->updateline(
$_POST['lineid'], GETPOST('lineid'),
$description, $description,
$up_ht, $up_ht,
$_POST['qty'], GETPOST('qty'),
$_POST['remise_percent'], GETPOST('remise_percent'),
$vat_rate, $vat_rate,
$localtax1_rate, $localtax1_rate,
$localtax2_rate, $localtax2_rate,
@ -771,7 +767,7 @@ else if ($action == 'updateligne' && $user->rights->commande->creer && $_POST['s
$date_start, $date_start,
$date_end, $date_end,
$type, $type,
$_POST['fk_parent_line'], GETPOST('fk_parent_line'),
0, 0,
$fk_fournprice, $fk_fournprice,
$pa_ht $pa_ht
@ -782,7 +778,7 @@ else if ($action == 'updateligne' && $user->rights->commande->creer && $_POST['s
// Define output language // Define output language
$outputlangs = $langs; $outputlangs = $langs;
$newlang=''; $newlang='';
if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id']; if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id')) $newlang=GETPOST('lang_id');
if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang; if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
if (! empty($newlang)) if (! empty($newlang))
{ {
@ -809,7 +805,7 @@ else if ($action == 'updateligne' && $user->rights->commande->creer && $_POST['s
} }
} }
else if ($action == 'updateligne' && $user->rights->commande->creer && $_POST['cancel'] == $langs->trans('Cancel')) else if ($action == 'updateligne' && $user->rights->commande->creer && GETPOST('cancel') == $langs->trans('Cancel'))
{ {
Header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition Header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
exit; exit;
@ -924,7 +920,7 @@ else if ($action == 'confirm_cancel' && $confirm == 'yes' && $user->rights->comm
else if ($action == 'up' && $user->rights->commande->creer) else if ($action == 'up' && $user->rights->commande->creer)
{ {
$object->line_up($_GET['rowid']); $object->line_up(GETPOST('rowid'));
// Define output language // Define output language
$outputlangs = $langs; $outputlangs = $langs;
@ -939,13 +935,13 @@ else if ($action == 'up' && $user->rights->commande->creer)
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.$_GET['rowid']); Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.GETPOST('rowid'));
exit; exit;
} }
else if ($action == 'down' && $user->rights->commande->creer) else if ($action == 'down' && $user->rights->commande->creer)
{ {
$object->line_down($_GET['rowid']); $object->line_down(GETPOST('rowid'));
// Define output language // Define output language
$outputlangs = $langs; $outputlangs = $langs;
@ -959,7 +955,7 @@ else if ($action == 'down' && $user->rights->commande->creer)
} }
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.$_GET['rowid']); Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.GETPOST('rowid'));
exit; exit;
} }
@ -1033,7 +1029,7 @@ if (GETPOST('addfile'))
/* /*
* Remove file in email form * Remove file in email form
*/ */
if (! empty($_POST['removedfile'])) if (GETPOST('removedfile'))
{ {
require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
@ -1042,7 +1038,7 @@ if (! empty($_POST['removedfile']))
$upload_dir_tmp = $vardir.'/temp'; $upload_dir_tmp = $vardir.'/temp';
// TODO Delete only files that was uploaded from email form // TODO Delete only files that was uploaded from email form
$mesg=dol_remove_file_process($_POST['removedfile'],0); $mesg=dol_remove_file_process(GETPOST('removedfile'),0);
$action ='presend'; $action ='presend';
} }
@ -1050,7 +1046,7 @@ if (! empty($_POST['removedfile']))
/* /*
* Send mail * Send mail
*/ */
if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_POST['cancel']) if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! GETPOST('cancel'))
{ {
$langs->load('mails'); $langs->load('mails');
@ -1061,24 +1057,24 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P
// if (is_readable($file)) // if (is_readable($file))
// { // {
if ($_POST['sendto']) if (GETPOST('sendto'))
{ {
// Le destinataire a ete fourni via le champ libre // Le destinataire a ete fourni via le champ libre
$sendto = $_POST['sendto']; $sendto = GETPOST('sendto');
$sendtoid = 0; $sendtoid = 0;
} }
elseif ($_POST['receiver'] != '-1') elseif (GETPOST('receiver') != '-1')
{ {
// Recipient was provided from combo list // Recipient was provided from combo list
if ($_POST['receiver'] == 'thirdparty') // Id of third party if (GETPOST('receiver') == 'thirdparty') // Id of third party
{ {
$sendto = $object->client->email; $sendto = $object->client->email;
$sendtoid = 0; $sendtoid = 0;
} }
else // Id du contact else // Id du contact
{ {
$sendto = $object->client->contact_get_property($_POST['receiver'],'email'); $sendto = $object->client->contact_get_property(GETPOST('receiver'),'email');
$sendtoid = $_POST['receiver']; $sendtoid = GETPOST('receiver');
} }
} }
@ -1086,15 +1082,15 @@ if ($action == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile'] && ! $_P
{ {
$langs->load("commercial"); $langs->load("commercial");
$from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>'; $from = GETPOST('fromname') . ' <' . GETPOST('frommail') .'>';
$replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>'; $replyto = GETPOST('replytoname'). ' <' . GETPOST('replytomail').'>';
$message = $_POST['message']; $message = GETPOST('message');
$sendtocc = $_POST['sendtocc']; $sendtocc = GETPOST('sendtocc');
$deliveryreceipt = $_POST['deliveryreceipt']; $deliveryreceipt = GETPOST('deliveryreceipt');
if ($_POST['action'] == 'send') if ($action == 'send')
{ {
if (dol_strlen($_POST['subject'])) $subject=$_POST['subject']; if (dol_strlen(GETPOST('subject'))) $subject=GETPOST('subject');
else $subject = $langs->transnoentities('Order').' '.$object->ref; else $subject = $langs->transnoentities('Order').' '.$object->ref;
$actiontypecode='AC_COM'; $actiontypecode='AC_COM';
$actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n"; $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
@ -1206,7 +1202,7 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
if ($object->id > 0) if ($object->id > 0)
{ {
$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid')); $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
$result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]); $result = $object->add_contact($contactid, GETPOST('type'), GETPOST('source'));
} }
if ($result >= 0) if ($result >= 0)
@ -1283,11 +1279,11 @@ if ($action == 'create' && $user->rights->commande->creer)
$soc = new Societe($db); $soc = new Societe($db);
if ($socid) $res=$soc->fetch($socid); if ($socid) $res=$soc->fetch($socid);
if (GETPOST('origin') && GETPOST('originid')) if ($origin && $originid)
{ {
// Parse element/subelement (ex: project_task) // Parse element/subelement (ex: project_task)
$element = $subelement = GETPOST('origin'); $element = $subelement = $origin;
if (preg_match('/^([^_]+)_([^_]+)/i',GETPOST('origin'),$regs)) if (preg_match('/^([^_]+)_([^_]+)/i',$origin,$regs))
{ {
$element = $regs[1]; $element = $regs[1];
$subelement = $regs[2]; $subelement = $regs[2];
@ -1295,7 +1291,7 @@ if ($action == 'create' && $user->rights->commande->creer)
if ($element == 'project') if ($element == 'project')
{ {
$projectid=GETPOST('originid'); $projectid=$originid;
} }
else else
{ {
@ -1308,7 +1304,7 @@ if ($action == 'create' && $user->rights->commande->creer)
$classname = ucfirst($subelement); $classname = ucfirst($subelement);
$objectsrc = new $classname($db); $objectsrc = new $classname($db);
$objectsrc->fetch(GETPOST('originid')); $objectsrc->fetch($originid);
if (empty($objectsrc->lines) && method_exists($objectsrc,'fetch_lines')) $objectsrc->fetch_lines(); if (empty($objectsrc->lines) && method_exists($objectsrc,'fetch_lines')) $objectsrc->fetch_lines();
$objectsrc->fetch_thirdparty(); $objectsrc->fetch_thirdparty();
@ -1353,8 +1349,8 @@ if ($action == 'create' && $user->rights->commande->creer)
print '<input type="hidden" name="socid" value="'.$soc->id.'">' ."\n"; print '<input type="hidden" name="socid" value="'.$soc->id.'">' ."\n";
print '<input type="hidden" name="remise_percent" value="'.$soc->remise_client.'">'; print '<input type="hidden" name="remise_percent" value="'.$soc->remise_client.'">';
print '<input name="facnumber" type="hidden" value="provisoire">'; print '<input name="facnumber" type="hidden" value="provisoire">';
print '<input type="hidden" name="origin" value="'.GETPOST('origin').'">'; print '<input type="hidden" name="origin" value="'.$origin.'">';
print '<input type="hidden" name="originid" value="'.GETPOST('originid').'">'; print '<input type="hidden" name="originid" value="'.$originid.'">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
@ -1422,14 +1418,14 @@ if ($action == 'create' && $user->rights->commande->creer)
// What trigger creation // What trigger creation
print '<tr><td>'.$langs->trans('Source').'</td><td colspan="2">'; print '<tr><td>'.$langs->trans('Source').'</td><td colspan="2">';
$form->select_demand_reason((GETPOST("origin")=='propal'?'SRC_COMM':''),'demand_reason_id','',1); $form->select_demand_reason(($origin=='propal'?'SRC_COMM':''),'demand_reason_id','',1);
print '</td></tr>'; print '</td></tr>';
// Project // Project
if ($conf->projet->enabled) if (! empty($conf->projet->enabled))
{ {
$projectid = 0; $projectid = 0;
if (isset($_GET["origin"]) && $_GET["origin"] == 'project') $projectid = ($_GET["originid"]?$_GET["originid"]:0); if ($origin == 'project') $projectid = ($originid?$originid:0);
print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">'; print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">';
$numprojet=select_projects($soc->id,$projectid); $numprojet=select_projects($soc->id,$projectid);
@ -1489,7 +1485,7 @@ if ($action == 'create' && $user->rights->commande->creer)
if (is_object($objectsrc)) if (is_object($objectsrc))
{ {
// TODO for compatibility // TODO for compatibility
if ($_GET['origin'] == 'contrat') if ($origin == 'contrat')
{ {
// Calcul contrat->price (HT), contrat->total (TTC), contrat->tva // Calcul contrat->price (HT), contrat->total (TTC), contrat->tva
$objectsrc->remise_absolue=$remise_absolue; $objectsrc->remise_absolue=$remise_absolue;
@ -2285,7 +2281,7 @@ else
$formmail->fromname = $user->getFullName($langs); $formmail->fromname = $user->getFullName($langs);
$formmail->frommail = $user->email; $formmail->frommail = $user->email;
$formmail->withfrom=1; $formmail->withfrom=1;
$formmail->withto=empty($_POST["sendto"])?1:$_POST["sendto"]; $formmail->withto=GETPOST('sendto')?GETPOST('sendto'):1;
$formmail->withtosocid=$soc->id; $formmail->withtosocid=$soc->id;
$formmail->withtocc=1; $formmail->withtocc=1;
$formmail->withtoccsocid=0; $formmail->withtoccsocid=0;

22
htdocs/core/lib/functions2.lib.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2008-2011 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2008-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2008-2011 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2008-2012 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr> * Copyright (C) 2008 Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -27,32 +27,32 @@
/** /**
* Same function than javascript unescape() function but in PHP. * Same function than javascript unescape() function but in PHP.
* *
* @param string $sourcetodecode String to decode * @param string $source String to decode
* @return * @return String decoded
*/ */
function jsUnEscape($source) function jsUnEscape($source)
{ {
$decodedStr = ""; $decodedStr = "";
$pos = 0; $pos = 0;
$len = strlen ($source); $len = strlen($source);
while ($pos < $len) { while ($pos < $len) {
$charAt = substr ($source, $pos, 1); $charAt = substr($source, $pos, 1);
if ($charAt == '%') { if ($charAt == '%') {
$pos++; $pos++;
$charAt = substr ($source, $pos, 1); $charAt = substr($source, $pos, 1);
if ($charAt == 'u') { if ($charAt == 'u') {
// we got a unicode character // we got a unicode character
$pos++; $pos++;
$unicodeHexVal = substr ($source, $pos, 4); $unicodeHexVal = substr($source, $pos, 4);
$unicode = hexdec ($unicodeHexVal); $unicode = hexdec($unicodeHexVal);
$entity = "&#". $unicode . ';'; $entity = "&#". $unicode . ';';
$decodedStr .= utf8_encode ($entity); $decodedStr .= utf8_encode($entity);
$pos += 4; $pos += 4;
} }
else { else {
// we have an escaped ascii character // we have an escaped ascii character
$hexVal = substr ($source, $pos, 2); $hexVal = substr($source, $pos, 2);
$decodedStr .= chr (hexdec ($hexVal)); $decodedStr .= chr(hexdec ($hexVal));
$pos += 2; $pos += 2;
} }
} else { } else {