"; - } - /* * Affichage onglets */ @@ -821,6 +816,7 @@ else dol_print_error($db,'Bad value for socid parameter'); } +dol_htmloutput_mesg('',$mesgs); // End of page llxFooter(); diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php index 7f070c07df5..e7ed17f5e04 100644 --- a/htdocs/comm/mailing/fiche.php +++ b/htdocs/comm/mailing/fiche.php @@ -41,13 +41,6 @@ $action=GETPOST('action','alpha'); $confirm=GETPOST('confirm','alpha'); $urlfrom=GETPOST('urlfrom'); -$mesg=''; -if (isset($_SESSION['DolMessage'])) -{ - $mesg=$_SESSION['DolMessage']; - unset($_SESSION['DolMessage']); -} - $object=new Mailing($db); $result=$object->fetch($id); @@ -79,7 +72,7 @@ if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE) $object->substitutionarray, array( '__CHECK_READ__' => 'CheckMail', - '__UNSUSCRIBE__' => 'Unsubscribe' + '__UNSUBSCRIBE__' => 'Unsubscribe' ) ); } @@ -104,7 +97,7 @@ if ($conf->global->MAILING_EMAIL_UNSUBSCRIBE) $object->substitutionarrayfortest, array( '__CHECK_READ__' => 'TESTCheckMail', - '__UNSUSCRIBE__' => 'TESTUnsubscribe' + '__UNSUBSCRIBE__' => 'TESTUnsubscribe' ) ); } @@ -231,7 +224,7 @@ if ($action == 'sendallconfirmed' && $confirm == 'yes') '__ID__' => $obj->source_id, '__EMAIL__' => $obj->email, '__CHECK_READ__' => '
'.$langs->trans("MailingSuccessfullyValidated").'
';
+ $_SESSION['dol_message']=''.$langs->trans("MailingSuccessfullyValidated").'
';
Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
@@ -928,7 +921,7 @@ else
print ''; } - if (! empty($mesgembedded)) dol_htmloutput_mesg($mesgembedded,'','warning',1); + if (! empty($mesgembedded)) dol_htmloutput_mesg($mesgembedded,'','warning',1); // Affichage formulaire de TEST if ($action == 'test') diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 01943653763..b8f03a32b38 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -63,6 +63,7 @@ $search_montant_ht=GETPOST('search_montant_ht','alpha'); $sall=GETPOST("sall"); $mesg=(GETPOST("msg") ? GETPOST("msg") : GETPOST("mesg")); +$mesgs=array(); $year=GETPOST("year"); $month=GETPOST("month"); @@ -824,8 +825,8 @@ else if ($action == "addline" && $user->rights->propale->creer) -1, 0, $_POST['fk_parent_line'], - $fk_fournprice, - $pa_ht + $fk_fournprice, + $pa_ht ); if ($result > 0) @@ -863,7 +864,7 @@ else if ($action == "addline" && $user->rights->propale->creer) } // Mise a jour d'une ligne dans la propale -else if ($action == 'updateligne' && $user->rights->propale->creer && $_POST["save"] == $langs->trans("Save")) +else if ($action == 'updateligne' && $user->rights->propale->creer && GETPOST('save') == $langs->trans("Save")) { if (! $object->fetch($_POST["id"]) > 0) { @@ -922,9 +923,9 @@ else if ($action == 'updateligne' && $user->rights->propale->creer && $_POST["sa $info_bits, $special_code, $_POST['fk_parent_line'], - 0, - $fk_fournprice, - $pa_ht + 0, + $fk_fournprice, + $pa_ht ); // Define output language @@ -1266,7 +1267,7 @@ print $formconfirm; print '
| '.$langs->trans('Ref').' | '; @@ -1278,7 +1279,7 @@ print ' | |||||||||||||||
';
print '
| '; if ($user->rights->propale->creer && $action == 'refclient') @@ -1337,10 +1338,10 @@ print ' | ';
print '
| '; -if ($object->brouillon && $action == 'editdate') +if (! empty($object->brouillon) && $action == 'editdate') { print ' | |||||||||||||
'.$langs->trans("FileWasRemoved",GETPOST('urlfile')).'
';
+ $_SESSION['dol_message'] = ''.$langs->trans("FileWasRemoved",GETPOST('urlfile')).'
';
Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
exit;
}
@@ -149,11 +143,11 @@ $form = new Form($db);
if ($object->id > 0)
{
$upload_dir = $conf->propal->dir_output.'/'.dol_sanitizeFileName($object->ref);
-
+
$head = propal_prepare_head($object);
dol_fiche_head($head, 'document', $langs->trans('Proposal'), 0, 'propal');
-
-
+
+
// Construit liste des fichiers
$filearray=dol_dir_list($upload_dir,"files",0,'','\.meta$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1);
$totalsize=0;
@@ -161,17 +155,17 @@ if ($object->id > 0)
{
$totalsize+=$file['size'];
}
-
-
+
+
print '| '.$langs->trans('Ref').' | '; print $form->showrefnav($object,'ref',$linkback,1,'ref','ref',''); print ' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
';
print '
'; } - + // Affiche formulaire upload $formfile=new FormFile($db); - $formfile->form_attach_new_file(DOL_URL_ROOT.'/comm/propal/document.php?id='.$object->id,'',0,0,$user->rights->propale->creer,50,$object); - - + $formfile->form_attach_new_file($_SERVER['PHP_SELF'].'?id='.$object->id,'',0,0,$user->rights->propale->creer,50,$object); + + // List of document $param='&id='.$object->id; $formfile->list_of_documents($filearray,$object,'propal',$param); @@ -219,7 +213,6 @@ else print $langs->trans("UnkownError"); } -$db->close(); - llxFooter(); +$db->close(); ?> diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php index e158495b0c2..ded13509385 100644 --- a/htdocs/commande/document.php +++ b/htdocs/commande/document.php @@ -2,7 +2,7 @@ /* Copyright (C) 2003-2007 Rodolphe Quiedeville '.$langs->trans("FileWasRemoved",GETPOST('urlfile')).' ';
+ $_SESSION['dol_message'] = ''.$langs->trans("FileWasRemoved",GETPOST('urlfile')).' ';
Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
exit;
}
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 5c00f9c6cdd..a4d41a23227 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -1,32 +1,32 @@
* Copyright (C) 2004-2012 Laurent Destailleur '.$langs->trans("NoCloneOptionsSpecified").' ';
- }
- else
- {
- if ($object->id > 0)
- {
- $result=$object->createFromClone($socid, $hookmanager);
- if ($result > 0)
- {
- header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
- exit;
- }
- else
- {
- $mesg=''.$object->error.' ';
- $action='';
- }
- }
- }
+ if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
+ {
+ $mesg=''.$langs->trans("NoCloneOptionsSpecified").' ';
+ }
+ else
+ {
+ if ($object->id > 0)
+ {
+ $result=$object->createFromClone($socid, $hookmanager);
+ if ($result > 0)
+ {
+ header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
+ exit;
+ }
+ else
+ {
+ $mesg=''.$object->error.' ';
+ $action='';
+ }
+ }
+ }
}
// Reopen a closed order
else if ($action == 'reopen' && $user->rights->commande->creer)
{
- if ($object->statut == 3)
- {
- $result = $object->set_reopen($user);
- if ($result > 0)
- {
- Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
- exit;
- }
- else
- {
- $mesg=''.$object->error.' ';
- }
- }
+ if ($object->statut == 3)
+ {
+ $result = $object->set_reopen($user);
+ if ($result > 0)
+ {
+ Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+ exit;
+ }
+ else
+ {
+ $mesg=''.$object->error.' ';
+ }
+ }
}
// Suppression de la commande
@@ -159,7 +162,7 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->
// Define output language
$outputlangs = $langs;
$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 (! empty($newlang))
{
@@ -168,11 +171,11 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->
}
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);
}
- Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
+ Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
exit;
}
else
@@ -184,313 +187,317 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->
// Categorisation dans projet
else if ($action == 'classin' && $user->rights->commande->creer)
{
- $object->setProject($_POST['projectid']);
+ $object->setProject(GETPOST('projectid'));
}
// Add order
else if ($action == 'add' && $user->rights->commande->creer)
{
- $datecommande = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
- $datelivraison = dol_mktime(12, 0, 0, $_POST['liv_month'],$_POST['liv_day'],$_POST['liv_year']);
+ $datecommande = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
+ $datelivraison = dol_mktime(12, 0, 0, GETPOST('liv_month'),GETPOST('liv_day'),GETPOST('liv_year'));
- $object->socid=$socid;
- $object->fetch_thirdparty();
+ $object->socid=$socid;
+ $object->fetch_thirdparty();
- $db->begin();
+ $db->begin();
- $object->date_commande = $datecommande;
- $object->note = $_POST['note'];
- $object->note_public = $_POST['note_public'];
- $object->source = $_POST['source_id'];
- $object->fk_project = $_POST['projectid'];
- $object->ref_client = $_POST['ref_client'];
- $object->modelpdf = $_POST['model'];
- $object->cond_reglement_id = $_POST['cond_reglement_id'];
- $object->mode_reglement_id = $_POST['mode_reglement_id'];
- $object->availability_id = $_POST['availability_id'];
- $object->demand_reason_id = $_POST['demand_reason_id'];
- $object->date_livraison = $datelivraison;
- $object->fk_delivery_address = $_POST['fk_address'];
- $object->contactid = $_POST['contactidp'];
+ $object->date_commande = $datecommande;
+ $object->note = GETPOST('note');
+ $object->note_public = GETPOST('note_public');
+ $object->source = GETPOST('source_id');
+ $object->fk_project = GETPOST('projectid');
+ $object->ref_client = GETPOST('ref_client');
+ $object->modelpdf = GETPOST('model');
+ $object->cond_reglement_id = GETPOST('cond_reglement_id');
+ $object->mode_reglement_id = GETPOST('mode_reglement_id');
+ $object->availability_id = GETPOST('availability_id');
+ $object->demand_reason_id = GETPOST('demand_reason_id');
+ $object->date_livraison = $datelivraison;
+ $object->fk_delivery_address = GETPOST('fk_address');
+ $object->contactid = GETPOST('contactidp');
- // If creation from another object of another module (Example: origin=propal, originid=1)
- if ($_POST['origin'] && $_POST['originid'])
- {
- // Parse element/subelement (ex: project_task)
- $element = $subelement = $_POST['origin'];
- if (preg_match('/^([^_]+)_([^_]+)/i',$_POST['origin'],$regs))
- {
- $element = $regs[1];
- $subelement = $regs[2];
- }
+ // If creation from another object of another module (Example: origin=propal, originid=1)
+ if ($origin && $originid)
+ {
+ // Parse element/subelement (ex: project_task)
+ $element = $subelement = $origin;
+ if (preg_match('/^([^_]+)_([^_]+)/i',$origin,$regs))
+ {
+ $element = $regs[1];
+ $subelement = $regs[2];
+ }
- // For compatibility
- if ($element == 'order') { $element = $subelement = 'commande'; }
- if ($element == 'propal') { $element = 'comm/propal'; $subelement = 'propal'; }
- if ($element == 'contract') { $element = $subelement = 'contrat'; }
+ // For compatibility
+ if ($element == 'order') {
+ $element = $subelement = 'commande';
+ }
+ if ($element == 'propal') {
+ $element = 'comm/propal'; $subelement = 'propal';
+ }
+ if ($element == 'contract') {
+ $element = $subelement = 'contrat';
+ }
- $object->origin = $_POST['origin'];
- $object->origin_id = $_POST['originid'];
+ $object->origin = $origin;
+ $object->origin_id = $originid;
- // Possibility to add external linked objects with hooks
- $object->linked_objects[$object->origin] = $object->origin_id;
- if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects']))
- {
- $object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']);
- }
+ // Possibility to add external linked objects with hooks
+ $object->linked_objects[$object->origin] = $object->origin_id;
+ $other_linked_objects=GETPOST('other_linked_objects','array');
+ if (! empty($other_linked_objects))
+ {
+ $object->linked_objects = array_merge($object->linked_objects, $other_linked_objects);
+ }
- $object_id = $object->create($user);
+ $object_id = $object->create($user);
- if ($object_id > 0)
- {
- dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
+ if ($object_id > 0)
+ {
+ dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
- $classname = ucfirst($subelement);
- $srcobject = new $classname($db);
+ $classname = ucfirst($subelement);
+ $srcobject = new $classname($db);
- dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
- $result=$srcobject->fetch($object->origin_id);
- if ($result > 0)
- {
- $lines = $srcobject->lines;
- if (empty($lines) && method_exists($srcobject,'fetch_lines')) $lines = $srcobject->fetch_lines();
+ dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
+ $result=$srcobject->fetch($object->origin_id);
+ if ($result > 0)
+ {
+ $lines = $srcobject->lines;
+ if (empty($lines) && method_exists($srcobject,'fetch_lines')) $lines = $srcobject->fetch_lines();
- $fk_parent_line=0;
- $num=count($lines);
+ $fk_parent_line=0;
+ $num=count($lines);
- for ($i=0;$i<$num;$i++)
- {
- $desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
- $product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
+ for ($i=0;$i<$num;$i++)
+ {
+ $desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
+ $product_type=($lines[$i]->product_type?$lines[$i]->product_type:0);
- // Dates
- // TODO mutualiser
- $date_start=$lines[$i]->date_debut_prevue;
- if ($lines[$i]->date_debut_reel) $date_start=$lines[$i]->date_debut_reel;
- if ($lines[$i]->date_start) $date_start=$lines[$i]->date_start;
- $date_end=$lines[$i]->date_fin_prevue;
- if ($lines[$i]->date_fin_reel) $date_end=$lines[$i]->date_fin_reel;
- if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end;
+ // Dates
+ // TODO mutualiser
+ $date_start=$lines[$i]->date_debut_prevue;
+ if ($lines[$i]->date_debut_reel) $date_start=$lines[$i]->date_debut_reel;
+ if ($lines[$i]->date_start) $date_start=$lines[$i]->date_start;
+ $date_end=$lines[$i]->date_fin_prevue;
+ if ($lines[$i]->date_fin_reel) $date_end=$lines[$i]->date_fin_reel;
+ if ($lines[$i]->date_end) $date_end=$lines[$i]->date_end;
- // Reset fk_parent_line for no child products and special product
- if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) {
- $fk_parent_line = 0;
- }
+ // Reset fk_parent_line for no child products and special product
+ if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) {
+ $fk_parent_line = 0;
+ }
- $result = $object->addline(
- $object_id,
- $desc,
- $lines[$i]->subprice,
- $lines[$i]->qty,
- $lines[$i]->tva_tx,
- $lines[$i]->localtax1_tx,
- $lines[$i]->localtax2_tx,
- $lines[$i]->fk_product,
- $lines[$i]->remise_percent,
- $lines[$i]->info_bits,
- $lines[$i]->fk_remise_except,
- 'HT',
- 0,
- $datestart,
- $dateend,
- $product_type,
- $lines[$i]->rang,
- $lines[$i]->special_code,
- $fk_parent_line,
- $lines[$i]->fk_fournprice,
- $lines[$i]->pa_ht
- );
+ $result = $object->addline(
+ $object_id,
+ $desc,
+ $lines[$i]->subprice,
+ $lines[$i]->qty,
+ $lines[$i]->tva_tx,
+ $lines[$i]->localtax1_tx,
+ $lines[$i]->localtax2_tx,
+ $lines[$i]->fk_product,
+ $lines[$i]->remise_percent,
+ $lines[$i]->info_bits,
+ $lines[$i]->fk_remise_except,
+ 'HT',
+ 0,
+ $datestart,
+ $dateend,
+ $product_type,
+ $lines[$i]->rang,
+ $lines[$i]->special_code,
+ $fk_parent_line,
+ $lines[$i]->fk_fournprice,
+ $lines[$i]->pa_ht
+ );
- if ($result < 0)
- {
- $error++;
- break;
- }
+ if ($result < 0)
+ {
+ $error++;
+ break;
+ }
- // Defined the new fk_parent_line
- if ($result > 0 && $lines[$i]->product_type == 9) {
- $fk_parent_line = $result;
- }
- }
+ // Defined the new fk_parent_line
+ if ($result > 0 && $lines[$i]->product_type == 9) {
+ $fk_parent_line = $result;
+ }
+ }
- // Hooks
- $parameters=array('objFrom'=>$srcobject);
- $reshook=$hookmanager->executeHooks('createFrom',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
- if ($reshook < 0) $error++;
- }
- else
- {
- $mesg=$srcobject->error;
- $error++;
- }
- }
- else
- {
- $mesg=$object->error;
- $error++;
- }
- }
- else
- {
- $object_id = $object->create($user);
+ // Hooks
+ $parameters=array('objFrom'=>$srcobject);
+ $reshook=$hookmanager->executeHooks('createFrom',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ if ($reshook < 0) $error++;
+ }
+ else
+ {
+ $mesg=$srcobject->error;
+ $error++;
+ }
+ }
+ else
+ {
+ $mesg=$object->error;
+ $error++;
+ }
+ }
+ else
+ {
+ $object_id = $object->create($user);
- // If some invoice's lines already known
- $NBLINES=8;
- for ($i = 1 ; $i <= $NBLINES ; $i++)
- {
- if ($_POST['idprod'.$i])
- {
- $xid = 'idprod'.$i;
- $xqty = 'qty'.$i;
- $xremise = 'remise_percent'.$i;
- $object->add_product($_POST[$xid],$_POST[$xqty],$_POST[$xremise]);
- }
- }
- }
+ // If some invoice's lines already known
+ $NBLINES=8;
+ for ($i = 1 ; $i <= $NBLINES ; $i++)
+ {
+ if ($_POST['idprod'.$i])
+ {
+ $xid = 'idprod'.$i;
+ $xqty = 'qty'.$i;
+ $xremise = 'remise_percent'.$i;
+ $object->add_product($_POST[$xid],$_POST[$xqty],$_POST[$xremise]);
+ }
+ }
+ }
- // Insert default contacts if defined
- if ($object_id > 0)
- {
- if ($_POST["contactidp"])
- {
- $result=$object->add_contact($_POST["contactidp"],'CUSTOMER','external');
+ // Insert default contacts if defined
+ if ($object_id > 0)
+ {
+ if (GETPOST('contactidp'))
+ {
+ $result=$object->add_contact(GETPOST('contactidp'),'CUSTOMER','external');
+ if ($result < 0)
+ {
+ $mesg = ''.$langs->trans("ErrorFailedToAddContact").' ';
+ $error++;
+ }
+ }
- if ($result < 0)
- {
- $mesg = ''.$langs->trans("ErrorFailedToAddContact").' ';
- $error++;
- }
- }
-
- $id = $object_id;
- $action = '';
- }
-
- // End of object creation, we show it
- if ($object_id > 0 && ! $error)
- {
- $db->commit();
- Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object_id);
- exit;
- }
- else
- {
- $db->rollback();
- $action='create';
- $socid=$_POST['socid'];
- if (! $mesg) $mesg=''.$object->error.' ';
- }
+ $id = $object_id;
+ $action = '';
+ }
+ // End of object creation, we show it
+ if ($object_id > 0 && ! $error)
+ {
+ $db->commit();
+ Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object_id);
+ exit;
+ }
+ else
+ {
+ $db->rollback();
+ $action='create';
+ if (! $mesg) $mesg=''.$object->error.' ';
+ }
}
else if ($action == 'classifybilled' && $user->rights->commande->creer)
{
- $ret=$object->classifyBilled();
+ $ret=$object->classifyBilled();
}
// Positionne ref commande client
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)
{
- $object->set_remise($user, $_POST['remise']);
+ $object->set_remise($user, GETPOST('remise'));
}
else if ($action == 'setabsolutediscount' && $user->rights->commande->creer)
{
- if ($_POST["remise_id"])
- {
- if ($object->id > 0)
- {
- $object->insert_discount($_POST["remise_id"]);
- }
- else
- {
- dol_print_error($db,$object->error);
- }
- }
+ if (GETPOST('remise_id'))
+ {
+ if ($object->id > 0)
+ {
+ $object->insert_discount(GETPOST('remise_id'));
+ }
+ else
+ {
+ dol_print_error($db,$object->error);
+ }
+ }
}
else if ($action == 'setdate' && $user->rights->commande->creer)
{
- //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']);
+ //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
+ $date=dol_mktime(0, 0, 0, GETPOST('order_month'), GETPOST('order_day'), GETPOST('order_year'));
- $result=$object->set_date($user,$date);
- if ($result < 0)
- {
- $mesg=''.$object->error.' ';
- }
+ $result=$object->set_date($user,$date);
+ if ($result < 0)
+ {
+ $mesg=''.$object->error.' ';
+ }
}
else if ($action == 'setdate_livraison' && $user->rights->commande->creer)
{
- //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']);
+ //print "x ".$_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);
- if ($result < 0)
- {
- $mesg=''.$object->error.' ';
- }
+ $result=$object->set_date_livraison($user,$datelivraison);
+ if ($result < 0)
+ {
+ $mesg=''.$object->error.' ';
+ }
}
else if ($action == 'setmode' && $user->rights->commande->creer)
{
- $result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
- if ($result < 0) dol_print_error($db,$object->error);
+ $result = $object->setPaymentMethods(GETPOST('mode_reglement_id','int'));
+ if ($result < 0) dol_print_error($db,$object->error);
}
else if ($action == 'setavailability' && $user->rights->commande->creer)
{
- $result=$object->availability($_POST['availability_id']);
- if ($result < 0) dol_print_error($db,$object->error);
+ $result=$object->availability(GETPOST('availability_id'));
+ if ($result < 0) dol_print_error($db,$object->error);
}
else if ($action == 'setdemandreason' && $user->rights->commande->creer)
{
- $result=$object->demand_reason($_POST['demand_reason_id']);
- if ($result < 0) dol_print_error($db,$object->error);
+ $result=$object->demand_reason(GETPOST('demand_reason_id'));
+ if ($result < 0) dol_print_error($db,$object->error);
}
else if ($action == 'setconditions' && $user->rights->commande->creer)
{
- $result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int'));
- if ($result < 0)
- {
- dol_print_error($db,$object->error);
- }
- else
+ $result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int'));
+ if ($result < 0)
+ {
+ dol_print_error($db,$object->error);
+ }
+ else
{
if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
- {
- // Define output language
- $outputlangs = $langs;
- $newlang=GETPOST('lang_id','alpha');
- if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
- if (! empty($newlang))
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($newlang);
- }
+ {
+ // Define output language
+ $outputlangs = $langs;
+ $newlang=GETPOST('lang_id','alpha');
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+ if (! empty($newlang))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($newlang);
+ }
- $ret=$object->fetch($id); // Reload to get new records
- commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
- }
- }
+ $ret=$object->fetch($object->id); // Reload to get new records
+ commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+ }
+ }
}
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)
{
- $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)
@@ -507,72 +514,72 @@ else if ($action == 'setnote' && $user->rights->commande->creer)
/*
* Ajout d'une ligne produit dans la commande
- */
+*/
else if ($action == 'addline' && $user->rights->commande->creer)
{
- $result=0;
+ $result=0;
- if (empty($_POST['idprod']) && $_POST["type"] < 0)
- {
- $mesg = ''.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).' ';
- $result = -1 ;
- }
- if (empty($_POST['idprod']) && (! isset($_POST["np_price"]) || $_POST["np_price"]=='')) // Unit price can be 0 but not ''
- {
- $mesg = ''.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("UnitPriceHT")).' ';
- $result = -1 ;
- }
+ if (! GETPOST('idprod') && GETPOST('type') < 0)
+ {
+ $mesg = ''.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).' ';
+ $result = -1 ;
+ }
+ if (! GETPOST('idprod') && GETPOST('np_price')=='') // Unit price can be 0 but not ''
+ {
+ $mesg = ''.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("UnitPriceHT")).' ';
+ $result = -1 ;
+ }
- if ($result >= 0 && $_POST['qty'] && (($_POST['np_price'] != '' && ($_POST['np_desc'] || $_POST['dp_desc'])) || $_POST['idprod']))
- {
- // Clean parameters
- $suffixe = $_POST['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_end=dol_mktime(0, 0, 0, $_POST['date_end'.$suffixe.'month'], $_POST['date_end'.$suffixe.'day'], $_POST['date_end'.$suffixe.'year']);
- $price_base_type = 'HT';
+ if ($result >= 0 && GETPOST('qty') && ((GETPOST('np_price') != '' && (GETPOST('np_desc') || GETPOST('dp_desc'))) || GETPOST('idprod')))
+ {
+ // Clean parameters
+ $suffixe = GETPOST('idprod') ? '_predef' : '';
+ $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, GETPOST('date_end'.$suffixe.'month'), GETPOST('date_end'.$suffixe.'day'), GETPOST('date_end'.$suffixe.'year'));
+ $price_base_type = 'HT';
- // Ecrase $pu par celui du produit
- // Ecrase $desc par celui du produit
- // Ecrase $txtva par celui du produit
- // Ecrase $base_price_type par celui du produit
- if ($_POST['idprod'])
- {
- $prod = new Product($db);
- $prod->fetch($_POST['idprod']);
+ // Ecrase $pu par celui du produit
+ // Ecrase $desc par celui du produit
+ // Ecrase $txtva par celui du produit
+ // Ecrase $base_price_type par celui du produit
+ if (GETPOST('idprod'))
+ {
+ $prod = new Product($db);
+ $prod->fetch(GETPOST('idprod'));
- $tva_tx = get_default_tva($mysoc,$object->client,$prod->id);
+ $tva_tx = get_default_tva($mysoc,$object->client,$prod->id);
- // multiprix
- if ($conf->global->PRODUIT_MULTIPRICES && $object->client->price_level)
- {
- $pu_ht = $prod->multiprices[$object->client->price_level];
- $pu_ttc = $prod->multiprices_ttc[$object->client->price_level];
- $price_min = $prod->multiprices_min[$object->client->price_level];
- $price_base_type = $prod->multiprices_base_type[$object->client->price_level];
- }
- else
- {
- $pu_ht = $prod->price;
- $pu_ttc = $prod->price_ttc;
- $price_min = $prod->price_min;
- $price_base_type = $prod->price_base_type;
- }
+ // multiprix
+ if ($conf->global->PRODUIT_MULTIPRICES && $object->client->price_level)
+ {
+ $pu_ht = $prod->multiprices[$object->client->price_level];
+ $pu_ttc = $prod->multiprices_ttc[$object->client->price_level];
+ $price_min = $prod->multiprices_min[$object->client->price_level];
+ $price_base_type = $prod->multiprices_base_type[$object->client->price_level];
+ }
+ else
+ {
+ $pu_ht = $prod->price;
+ $pu_ttc = $prod->price_ttc;
+ $price_min = $prod->price_min;
+ $price_base_type = $prod->price_base_type;
+ }
- // On reevalue prix selon taux tva car taux tva transaction peut etre different
- // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
- if ($tva_tx != $prod->tva_tx)
- {
- if ($price_base_type != 'HT')
- {
- $pu_ht = price2num($pu_ttc / (1 + ($tva_tx/100)), 'MU');
- }
- else
- {
- $pu_ttc = price2num($pu_ht * (1 + ($tva_tx/100)), 'MU');
- }
- }
+ // On reevalue prix selon taux tva car taux tva transaction peut etre different
+ // de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
+ if ($tva_tx != $prod->tva_tx)
+ {
+ if ($price_base_type != 'HT')
+ {
+ $pu_ht = price2num($pu_ttc / (1 + ($tva_tx/100)), 'MU');
+ }
+ else
+ {
+ $pu_ttc = price2num($pu_ht * (1 + ($tva_tx/100)), 'MU');
+ }
+ }
- // Define output language
+ // Define output language
if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
{
$outputlangs = $langs;
@@ -592,1737 +599,1739 @@ else if ($action == 'addline' && $user->rights->commande->creer)
$desc = $prod->description;
}
- $desc.= ($desc && $_POST['np_desc']) ? ((dol_textishtml($desc) || dol_textishtml($_POST['np_desc']))?"\n":"\n") : ""; - $desc.= $_POST['np_desc']; - $type = $prod->type; - } - else - { - $pu_ht=$_POST['np_price']; - $tva_tx=str_replace('*','',$_POST['np_tva_tx']); - $tva_npr=preg_match('/\*/',$_POST['np_tva_tx'])?1:0; - $desc=$_POST['dp_desc']; - $type=$_POST["type"]; - } + $desc.= ($desc && GETPOST('np_desc')) ? ((dol_textishtml($desc) || dol_textishtml(GETPOST('np_desc')))?" \n":"\n") : ""; + $desc.= GETPOST('np_desc'); + $type = $prod->type; + } + else + { + $pu_ht=GETPOST('np_price'); + $tva_tx=str_replace('*','',GETPOST('np_tva_tx')); + $tva_npr=preg_match('/\*/',GETPOST('np_tva_tx'))?1:0; + $desc=GETPOST('dp_desc'); + $type=GETPOST('type'); + } - // Local Taxes - $localtax1_tx= get_localtax($tva_tx, 1, $object->client); - $localtax2_tx= get_localtax($tva_tx, 2, $object->client); + // Local Taxes + $localtax1_tx= get_localtax($tva_tx, 1, $object->client); + $localtax2_tx= get_localtax($tva_tx, 2, $object->client); - $desc=dol_htmlcleanlastbr($desc); + $desc=dol_htmlcleanlastbr($desc); - // ajout prix achat - $fk_fournprice = $_POST['np_fournprice']; - if ( ! empty($_POST['np_buying_price']) ) - $pa_ht = $_POST['np_buying_price']; - else - $pa_ht = null; - - $info_bits=0; - if ($tva_npr) $info_bits |= 0x01; + // ajout prix achat + $fk_fournprice = GETPOST('np_fournprice'); + if (GETPOST('np_buying_price')) + $pa_ht = GETPOST('np_buying_price'); + else + $pa_ht = null; - if ($result >= 0) - { - if($price_min && (price2num($pu_ht)*(1-price2num($_POST['remise_percent'])/100) < price2num($price_min))) - { - //print "CantBeLessThanMinPrice ".$up_ht." - ".GETPOST('remise_percent')." - ".$product->price_min; - $mesg = ' '.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->currency)).' ' ;
- }
- else
- {
- // Insert line
- $result = $object->addline(
- $id,
- $desc,
- $pu_ht,
- $_POST['qty'],
- $tva_tx,
- $localtax1_tx,
- $localtax2_tx,
- $_POST['idprod'],
- $_POST['remise_percent'],
- $info_bits,
- 0,
- $price_base_type,
- $pu_ttc,
- $date_start,
- $date_end,
- $type,
- -1,
- '',
- $_POST['fk_parent_line'],
- $fk_fournprice,
- $pa_ht
- );
+ $info_bits=0;
+ if ($tva_npr) $info_bits |= 0x01;
- if ($result > 0)
- {
- if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
- {
- // Define output language
- $outputlangs = $langs;
- $newlang=GETPOST('lang_id','alpha');
- if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
- if (! empty($newlang))
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($newlang);
- }
+ if ($result >= 0)
+ {
+ 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;
+ $mesg = ''.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->currency)).' ' ;
+ }
+ else
+ {
+ // Insert line
+ $result = $object->addline(
+ $object->id,
+ $desc,
+ $pu_ht,
+ GETPOST('qty'),
+ $tva_tx,
+ $localtax1_tx,
+ $localtax2_tx,
+ GETPOST('idprod'),
+ GETPOST('remise_percent'),
+ $info_bits,
+ 0,
+ $price_base_type,
+ $pu_ttc,
+ $date_start,
+ $date_end,
+ $type,
+ -1,
+ '',
+ GETPOST('fk_parent_line'),
+ $fk_fournprice,
+ $pa_ht
+ );
- $ret=$object->fetch($id); // Reload to get new records
- commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
- }
+ if ($result > 0)
+ {
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+ {
+ // Define output language
+ $outputlangs = $langs;
+ $newlang=GETPOST('lang_id','alpha');
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+ if (! empty($newlang))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($newlang);
+ }
- unset($_POST['qty']);
- unset($_POST['type']);
- unset($_POST['idprod']);
- unset($_POST['remise_percent']);
- unset($_POST['dp_desc']);
- unset($_POST['np_desc']);
- unset($_POST['np_price']);
- unset($_POST['np_tva_tx']);
- unset($_POST['np_buying_price']);
- }
- else
- {
- $mesg=''.$object->error.' ';
- }
- }
- }
- }
+ $ret=$object->fetch($object->id); // Reload to get new records
+ commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+ }
+
+ unset($_POST['qty']);
+ unset($_POST['type']);
+ unset($_POST['idprod']);
+ unset($_POST['remise_percent']);
+ unset($_POST['dp_desc']);
+ unset($_POST['np_desc']);
+ unset($_POST['np_price']);
+ unset($_POST['np_tva_tx']);
+ unset($_POST['np_buying_price']);
+ }
+ else
+ {
+ $mesg=''.$object->error.' ';
+ }
+ }
+ }
+ }
}
/*
* 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
- $date_start='';
- $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_end=dol_mktime(0, 0, 0, $_POST['date_end'.$suffixe.'month'], $_POST['date_end'.$suffixe.'day'], $_POST['date_end'.$suffixe.'year']);
- $description=dol_htmlcleanlastbr($_POST['desc']);
- $up_ht=GETPOST('pu')?GETPOST('pu'):GETPOST('subprice');
+ // Clean parameters
+ $date_start='';
+ $date_end='';
+ $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, GETPOST('date_end'.$suffixe.'month'), GETPOST('date_end'.$suffixe.'day'), GETPOST('date_end'.$suffixe.'year'));
+ $description=dol_htmlcleanlastbr(GETPOST('desc'));
+ $up_ht=GETPOST('pu')?GETPOST('pu'):GETPOST('subprice');
- // Define info_bits
- $info_bits=0;
- if (preg_match('/\*/',$_POST['tva_tx'])) $info_bits |= 0x01;
+ // Define info_bits
+ $info_bits=0;
+ if (preg_match('/\*/',GETPOST('tva_tx'))) $info_bits |= 0x01;
- // Define vat_rate
- $vat_rate=$_POST['tva_tx'];
- $vat_rate=str_replace('*','',$vat_rate);
- $localtax1_rate=get_localtax($vat_rate,1,$object->client);
- $localtax2_rate=get_localtax($vat_rate,2,$object->client);
+ // Define vat_rate
+ $vat_rate=GETPOST('tva_tx');
+ $vat_rate=str_replace('*','',$vat_rate);
+ $localtax1_rate=get_localtax($vat_rate,1,$object->client);
+ $localtax2_rate=get_localtax($vat_rate,2,$object->client);
- // ajout prix d'achat
- $fk_fournprice = $_POST['fournprice'];
- if ( ! empty($_POST['buying_price']) )
- $pa_ht = $_POST['buying_price'];
- else
- $pa_ht = null;
-
- // Check parameters
- if (empty($_POST['productid']) && $_POST["type"] < 0)
- {
- $mesg = ''.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).' ';
- $result = -1 ;
- }
- // Check minimum price
- if(! empty($_POST['productid']))
- {
- $productid = $_POST['productid'];
- $product = new Product($db);
- $product->fetch($productid);
- $type=$product->type;
- $price_min = $product->price_min;
- 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)))
- {
- $mesg = ''.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->currency)).' ' ;
- $result=-1;
- }
+ // ajout prix d'achat
+ $fk_fournprice = GETPOST('fournprice');
+ if (GETPOST('buying_price'))
+ $pa_ht = GETPOST('buying_price');
+ else
+ $pa_ht = null;
- // Define params
- if (! empty($_POST['productid']))
- {
- $type=$product->type;
- }
- else
- {
- $type=$_POST["type"];
- }
+ // Check minimum price
+ if (GETPOST('productid'))
+ {
+ $productid = GETPOST('productid');
+ $product = new Product($db);
+ $product->fetch($productid);
+ $type=$product->type;
+ $price_min = $product->price_min;
+ if ($conf->global->PRODUIT_MULTIPRICES && $object->client->price_level) $price_min = $product->multiprices_min[$object->client->price_level];
- if ($result >= 0)
- {
- $result = $object->updateline(
- $_POST['lineid'],
- $description,
- $up_ht,
- $_POST['qty'],
- $_POST['remise_percent'],
- $vat_rate,
- $localtax1_rate,
- $localtax2_rate,
- 'HT',
- $info_bits,
- $date_start,
- $date_end,
- $type,
- $_POST['fk_parent_line'],
- 0,
- $fk_fournprice,
- $pa_ht
- );
+ if ($price_min && (price2num($up_ht)*(1-price2num(GETPOST('remise_percent'))/100) < price2num($price_min)))
+ {
+ $mesg = ''.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->currency)).' ' ;
+ $error++;
+ }
+ }
+ else
+ {
+ $type=GETPOST('type');
- if ($result >= 0)
- {
- // Define output language
- $outputlangs = $langs;
- $newlang='';
- if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
- if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
- if (! empty($newlang))
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($newlang);
- }
- if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
- {
- $ret=$object->fetch($object->id); // Reload to get new records
- commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
- unset($_POST['qty']);
- unset($_POST['type']);
- unset($_POST['np_price']);
- unset($_POST['dp_desc']);
- unset($_POST['np_tva_tx']);
- unset($_POST['np_buying_price']);
- }
- }
- else
- {
- dol_print_error($db,$object->error);
- exit;
- }
- }
+ // Check parameters
+ if (GETPOST('type') < 0) {
+ $mesg = ''.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).' ';
+ $error++;
+ }
+ }
+
+ if (! $error)
+ {
+ $result = $object->updateline(
+ GETPOST('lineid'),
+ $description,
+ $up_ht,
+ GETPOST('qty'),
+ GETPOST('remise_percent'),
+ $vat_rate,
+ $localtax1_rate,
+ $localtax2_rate,
+ 'HT',
+ $info_bits,
+ $date_start,
+ $date_end,
+ $type,
+ GETPOST('fk_parent_line'),
+ 0,
+ $fk_fournprice,
+ $pa_ht
+ );
+
+ if ($result >= 0)
+ {
+ // Define output language
+ $outputlangs = $langs;
+ $newlang='';
+ 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 (! empty($newlang))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($newlang);
+ }
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+ {
+ $ret=$object->fetch($object->id); // Reload to get new records
+ commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+ unset($_POST['qty']);
+ unset($_POST['type']);
+ unset($_POST['np_price']);
+ unset($_POST['dp_desc']);
+ unset($_POST['np_tva_tx']);
+ unset($_POST['np_buying_price']);
+ }
+ }
+ else
+ {
+ dol_print_error($db,$object->error);
+ exit;
+ }
+ }
}
-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
- exit;
+ Header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
+ exit;
}
else if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->commande->valider)
{
- $idwarehouse=GETPOST('idwarehouse');
+ $idwarehouse=GETPOST('idwarehouse');
- // Check parameters
- if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $object->hasProductsOrServices(1))
- {
- if (! $idwarehouse || $idwarehouse == -1)
- {
- $error++;
- $errors[]=$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse"));
- $action='';
- }
- }
+ // Check parameters
+ if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $object->hasProductsOrServices(1))
+ {
+ if (! $idwarehouse || $idwarehouse == -1)
+ {
+ $error++;
+ $mesgs[]=''.$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")).' ';
+ $action='';
+ }
+ }
- if (! $error)
- {
- $result=$object->valid($user,$idwarehouse);
- if ($result >= 0)
- {
- // Define output language
- $outputlangs = $langs;
- $newlang='';
- if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
- if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
- if (! empty($newlang))
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($newlang);
- }
- if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
- }
- }
+ if (! $error)
+ {
+ $result=$object->valid($user,$idwarehouse);
+ if ($result >= 0)
+ {
+ // Define output language
+ $outputlangs = $langs;
+ $newlang='';
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+ if (! empty($newlang))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($newlang);
+ }
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+ }
+ }
}
// Go back to draft status
else if ($action == 'confirm_modif' && $user->rights->commande->creer)
{
- $idwarehouse=GETPOST('idwarehouse');
+ $idwarehouse=GETPOST('idwarehouse');
- // Check parameters
- if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $object->hasProductsOrServices(1))
- {
- if (! $idwarehouse || $idwarehouse == -1)
- {
- $error++;
- $errors[]=$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse"));
- $action='';
- }
- }
+ // Check parameters
+ if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $object->hasProductsOrServices(1))
+ {
+ if (! $idwarehouse || $idwarehouse == -1)
+ {
+ $error++;
+ $mesgs[]=''.$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")).' ';
+ $action='';
+ }
+ }
if (! $error)
{
- $result = $object->set_draft($user,$idwarehouse);
- if ($result >= 0)
- {
- // Define output language
- $outputlangs = $langs;
- $newlang='';
- if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
- if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
- if (! empty($newlang))
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($newlang);
- }
- if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
- {
- $ret=$object->fetch($object->id); // Reload to get new records
- commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
- }
- }
+ $result = $object->set_draft($user,$idwarehouse);
+ if ($result >= 0)
+ {
+ // Define output language
+ $outputlangs = $langs;
+ $newlang='';
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+ if (! empty($newlang))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($newlang);
+ }
+ if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+ {
+ $ret=$object->fetch($object->id); // Reload to get new records
+ commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+ }
+ }
}
}
else if ($action == 'confirm_shipped' && $confirm == 'yes' && $user->rights->commande->cloturer)
{
- $result = $object->cloture($user);
- if ($result < 0) $mesgs=$object->errors;
+ $result = $object->cloture($user);
+ if ($result < 0) $mesgs=$object->errors;
}
else if ($action == 'confirm_cancel' && $confirm == 'yes' && $user->rights->commande->valider)
{
- $idwarehouse=GETPOST('idwarehouse');
+ $idwarehouse=GETPOST('idwarehouse');
- // Check parameters
- if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $object->hasProductsOrServices(1))
- {
- if (! $idwarehouse || $idwarehouse == -1)
- {
- $error++;
- $errors[]=$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse"));
- $action='';
- }
- }
+ // Check parameters
+ if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $object->hasProductsOrServices(1))
+ {
+ if (! $idwarehouse || $idwarehouse == -1)
+ {
+ $error++;
+ $mesgs[]=''.$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse")).' ';
+ $action='';
+ }
+ }
if (! $error)
{
- $result = $object->cancel($idwarehouse);
+ $result = $object->cancel($idwarehouse);
}
}
/*
* Ordonnancement des lignes
- */
+*/
else if ($action == 'up' && $user->rights->commande->creer)
{
- $object->line_up($_GET['rowid']);
+ $object->line_up(GETPOST('rowid'));
- // Define output language
- $outputlangs = $langs;
- $newlang='';
- if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
- if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
- if (! empty($newlang))
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($newlang);
- }
+ // Define output language
+ $outputlangs = $langs;
+ $newlang='';
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+ if (! empty($newlang))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($newlang);
+ }
- 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']);
- exit;
+ Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.GETPOST('rowid'));
+ exit;
}
else if ($action == 'down' && $user->rights->commande->creer)
{
- $object->line_down($_GET['rowid']);
+ $object->line_down(GETPOST('rowid'));
- // Define output language
- $outputlangs = $langs;
- $newlang='';
- if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
- if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
- if (! empty($newlang))
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($newlang);
- }
- if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+ // Define output language
+ $outputlangs = $langs;
+ $newlang='';
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+ if (! empty($newlang))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($newlang);
+ }
+ 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']);
- exit;
+ Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.GETPOST('rowid'));
+ exit;
}
else if ($action == 'builddoc') // In get or post
{
- /*
- * Generate order document
- * define into /core/modules/commande/modules_commande.php
- */
+ /*
+ * Generate order document
+ * define into /core/modules/commande/modules_commande.php
+ */
- // Sauvegarde le dernier modele choisi pour generer un document
- if ($_REQUEST['model'])
- {
- $object->setDocModel($user, $_REQUEST['model']);
- }
+ // Sauvegarde le dernier modele choisi pour generer un document
+ if ($_REQUEST['model'])
+ {
+ $object->setDocModel($user, $_REQUEST['model']);
+ }
- // Define output language
- $outputlangs = $langs;
- $newlang='';
- if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
- if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
- if (! empty($newlang))
- {
- $outputlangs = new Translate("",$conf);
- $outputlangs->setDefaultLang($newlang);
- }
- $result=commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
- if ($result <= 0)
- {
- dol_print_error($db,$result);
- exit;
- }
- else
- {
- Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc'));
- exit;
- }
+ // Define output language
+ $outputlangs = $langs;
+ $newlang='';
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
+ if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
+ if (! empty($newlang))
+ {
+ $outputlangs = new Translate("",$conf);
+ $outputlangs->setDefaultLang($newlang);
+ }
+ $result=commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager);
+ if ($result <= 0)
+ {
+ dol_print_error($db,$result);
+ exit;
+ }
+ else
+ {
+ Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.(empty($conf->global->MAIN_JUMP_TAG)?'':'#builddoc'));
+ exit;
+ }
}
// Remove file in doc form
else if ($action == 'remove_file')
{
- if ($object->id > 0)
- {
- require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
+ if ($object->id > 0)
+ {
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
- $langs->load("other");
- $upload_dir = $conf->commande->dir_output;
- $file = $upload_dir . '/' . GETPOST('file');
- dol_delete_file($file,0,0,0,$object);
- $mesg = ''.$langs->trans("FileWasRemoved",GETPOST('file')).' ';
- }
+ $langs->load("other");
+ $upload_dir = $conf->commande->dir_output;
+ $file = $upload_dir . '/' . GETPOST('file');
+ dol_delete_file($file,0,0,0,$object);
+ $mesg = ''.$langs->trans("FileWasRemoved",GETPOST('file')).' ';
+ }
}
/*
* Add file in email form
- */
-if ($_POST['addfile'])
+*/
+if (GETPOST('addfile'))
{
- require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
+ require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
- // Set tmp user directory TODO Use a dedicated directory for temp mails files
- $vardir=$conf->user->dir_output."/".$user->id;
- $upload_dir_tmp = $vardir.'/temp';
+ // Set tmp user directory TODO Use a dedicated directory for temp mails files
+ $vardir=$conf->user->dir_output."/".$user->id;
+ $upload_dir_tmp = $vardir.'/temp';
- $mesg=dol_add_file_process($upload_dir_tmp,0,0);
+ $mesg=dol_add_file_process($upload_dir_tmp,0,0);
- $action ='presend';
+ $action ='presend';
}
/*
* 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");
- // Set tmp user directory
- $vardir=$conf->user->dir_output."/".$user->id;
- $upload_dir_tmp = $vardir.'/temp';
+ // Set tmp user directory
+ $vardir=$conf->user->dir_output."/".$user->id;
+ $upload_dir_tmp = $vardir.'/temp';
// 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';
}
/*
* 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');
- if ($object->id > 0)
- {
-// $ref = dol_sanitizeFileName($object->ref);
-// $file = $conf->commande->dir_output . '/' . $ref . '/' . $ref . '.pdf';
-
-// if (is_readable($file))
-// {
- if ($_POST['sendto'])
- {
- // Le destinataire a ete fourni via le champ libre
- $sendto = $_POST['sendto'];
- $sendtoid = 0;
- }
- elseif ($_POST['receiver'] != '-1')
- {
- // Recipient was provided from combo list
- if ($_POST['receiver'] == 'thirdparty') // Id of third party
- {
- $sendto = $object->client->email;
- $sendtoid = 0;
- }
- else // Id du contact
- {
- $sendto = $object->client->contact_get_property($_POST['receiver'],'email');
- $sendtoid = $_POST['receiver'];
- }
- }
-
- if (dol_strlen($sendto))
- {
- $langs->load("commercial");
-
- $from = $_POST['fromname'] . ' <' . $_POST['frommail'] .'>';
- $replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>';
- $message = $_POST['message'];
- $sendtocc = $_POST['sendtocc'];
- $deliveryreceipt = $_POST['deliveryreceipt'];
-
- if ($_POST['action'] == 'send')
- {
- if (dol_strlen($_POST['subject'])) $subject=$_POST['subject'];
- else $subject = $langs->transnoentities('Order').' '.$object->ref;
- $actiontypecode='AC_COM';
- $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
- if ($message)
- {
- $actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n";
- $actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n";
- $actionmsg.=$message;
- }
- $actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
- }
-
- // Create form object
- include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php');
- $formmail = new FormMail($db);
-
- $attachedfiles=$formmail->get_attached_files();
- $filepath = $attachedfiles['paths'];
- $filename = $attachedfiles['names'];
- $mimetype = $attachedfiles['mimes'];
-
- // Send mail
- require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php');
- $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt);
- if ($mailfile->error)
- {
- $mesg=''.$mailfile->error.' ';
- }
- else
- {
- $result=$mailfile->sendfile();
- if ($result)
- {
- $mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2)); // Must not contains "
-
- $error=0;
-
- // Initialisation donnees
- $object->sendtoid = $sendtoid;
- $object->actiontypecode = $actiontypecode;
- $object->actionmsg = $actionmsg;
- $object->actionmsg2 = $actionmsg2;
- $object->fk_element = $object->id;
- $object->elementtype = $object->element;
-
- // Appel des triggers
- include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
- $interface=new Interfaces($db);
- $result=$interface->run_triggers('ORDER_SENTBYMAIL',$object,$user,$langs,$conf);
- if ($result < 0) { $error++; $this->errors=$interface->errors; }
- // Fin appel triggers
-
- if ($error)
- {
- dol_print_error($db);
- }
- else
- {
- // Redirect here
- // This avoid sending mail twice if going out and then back to page
- Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&mesg='.urlencode($mesg));
- exit;
- }
- }
- else
- {
- $langs->load("other");
- $mesg='';
- if ($mailfile->error)
- {
- $mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
- $mesg.=' ';
- }
- }
-/* }
- else
- {
- $langs->load("other");
- $mesg=''.$mailfile->error; - } - else - { - $mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS'; - } - $mesg.=' '.$langs->trans('ErrorMailRecipientIsEmpty').' ! ';
- $action='presend';
- dol_syslog('Recipient email is empty');
- }*/
- }
- else
- {
- $langs->load("errors");
- $mesg=''.$langs->trans('ErrorCantReadFile',$file).' ';
- dol_syslog('Failed to read file: '.$file);
- }
- }
- else
- {
- $langs->load("other");
- $mesg=''.$langs->trans('ErrorFailedToReadEntity',$langs->trans("Order")).' ';
- dol_syslog($langs->trans('ErrorFailedToReadEntity', $langs->trans("Order")));
- }
-}
-
-if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-{
- if ($action == 'addcontact' && $user->rights->commande->creer)
+ if ($object->id > 0)
{
- if ($object->id > 0)
+ // $ref = dol_sanitizeFileName($object->ref);
+ // $file = $conf->commande->dir_output . '/' . $ref . '/' . $ref . '.pdf';
+
+ // if (is_readable($file))
+ // {
+ if (GETPOST('sendto'))
{
- $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
- $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]);
+ // Le destinataire a ete fourni via le champ libre
+ $sendto = GETPOST('sendto');
+ $sendtoid = 0;
+ }
+ elseif (GETPOST('receiver') != '-1')
+ {
+ // Recipient was provided from combo list
+ if (GETPOST('receiver') == 'thirdparty') // Id of third party
+ {
+ $sendto = $object->client->email;
+ $sendtoid = 0;
+ }
+ else // Id du contact
+ {
+ $sendto = $object->client->contact_get_property(GETPOST('receiver'),'email');
+ $sendtoid = GETPOST('receiver');
+ }
}
- if ($result >= 0)
+ if (dol_strlen($sendto))
{
- Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
- exit;
- }
- else
- {
- if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+ $langs->load("commercial");
+
+ $from = GETPOST('fromname') . ' <' . GETPOST('frommail') .'>';
+ $replyto = GETPOST('replytoname'). ' <' . GETPOST('replytomail').'>';
+ $message = GETPOST('message');
+ $sendtocc = GETPOST('sendtocc');
+ $deliveryreceipt = GETPOST('deliveryreceipt');
+
+ if ($action == 'send')
{
- $langs->load("errors");
- $mesg = ''.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").' ';
+ if (dol_strlen(GETPOST('subject'))) $subject=GETPOST('subject');
+ else $subject = $langs->transnoentities('Order').' '.$object->ref;
+ $actiontypecode='AC_COM';
+ $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto.".\n";
+ if ($message)
+ {
+ $actionmsg.=$langs->transnoentities('MailTopic').": ".$subject."\n";
+ $actionmsg.=$langs->transnoentities('TextUsedInTheMessageBody').":\n";
+ $actionmsg.=$message;
+ }
+ $actionmsg2=$langs->transnoentities('Action'.$actiontypecode);
+ }
+
+ // Create form object
+ include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php');
+ $formmail = new FormMail($db);
+
+ $attachedfiles=$formmail->get_attached_files();
+ $filepath = $attachedfiles['paths'];
+ $filename = $attachedfiles['names'];
+ $mimetype = $attachedfiles['mimes'];
+
+ // Send mail
+ require_once(DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php');
+ $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt);
+ if ($mailfile->error)
+ {
+ $mesg=''.$mailfile->error.' ';
}
else
{
- $mesg = ''.$object->error.' ';
+ $result=$mailfile->sendfile();
+ if ($result)
+ {
+ $mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2)); // Must not contains "
+
+ $error=0;
+
+ // Initialisation donnees
+ $object->sendtoid = $sendtoid;
+ $object->actiontypecode = $actiontypecode;
+ $object->actionmsg = $actionmsg;
+ $object->actionmsg2 = $actionmsg2;
+ $object->fk_element = $object->id;
+ $object->elementtype = $object->element;
+
+ // Appel des triggers
+ include_once(DOL_DOCUMENT_ROOT . "/core/class/interfaces.class.php");
+ $interface=new Interfaces($db);
+ $result=$interface->run_triggers('ORDER_SENTBYMAIL',$object,$user,$langs,$conf);
+ if ($result < 0) {
+ $error++; $this->errors=$interface->errors;
+ }
+ // Fin appel triggers
+
+ if ($error)
+ {
+ dol_print_error($db);
+ }
+ else
+ {
+ // Redirect here
+ // This avoid sending mail twice if going out and then back to page
+ Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'&mesg='.urlencode($mesg));
+ exit;
+ }
+ }
+ else
+ {
+ $langs->load("other");
+ $mesg='';
+ if ($mailfile->error)
+ {
+ $mesg.=$langs->trans('ErrorFailedToSendMail',$from,$sendto);
+ $mesg.=' ';
+ }
+ }
+ /* }
+ else
+ {
+ $langs->load("other");
+ $mesg=''.$mailfile->error; + } + else + { + $mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS'; + } + $mesg.=' '.$langs->trans('ErrorMailRecipientIsEmpty').' ! ';
+ $action='presend';
+ dol_syslog('Recipient email is empty');
+ }*/
+ }
+ else
+ {
+ $langs->load("errors");
+ $mesg=''.$langs->trans('ErrorCantReadFile',$file).' ';
+ dol_syslog('Failed to read file: '.$file);
+ }
+ }
+ else
+ {
+ $langs->load("other");
+ $mesg=''.$langs->trans('ErrorFailedToReadEntity',$langs->trans("Order")).' ';
+ dol_syslog($langs->trans('ErrorFailedToReadEntity', $langs->trans("Order")));
+ }
+ }
+
+ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+ {
+ if ($action == 'addcontact' && $user->rights->commande->creer)
+ {
+ if ($object->id > 0)
+ {
+ $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
+ $result = $object->add_contact($contactid, GETPOST('type'), GETPOST('source'));
+ }
+
+ if ($result >= 0)
+ {
+ Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+ exit;
+ }
+ else
+ {
+ if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+ {
+ $langs->load("errors");
+ $mesg = ''.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").' ';
+ }
+ else
+ {
+ $mesg = ''.$object->error.' ';
+ }
+ }
+ }
+
+ // bascule du statut d'un contact
+ else if ($action == 'swapstatut' && $user->rights->commande->creer)
+ {
+ if ($object->id > 0)
+ {
+ $result=$object->swapContactStatus(GETPOST('ligne'));
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+ }
+
+ // Efface un contact
+ else if ($action == 'deletecontact' && $user->rights->commande->creer)
+ {
+ $result = $object->delete_contact($lineid);
+
+ if ($result >= 0)
+ {
+ Header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+ exit;
+ }
+ else {
+ dol_print_error($db);
}
}
}
- // bascule du statut d'un contact
- else if ($action == 'swapstatut' && $user->rights->commande->creer)
+
+ /*
+ * View
+ */
+
+ llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes');
+
+ $form = new Form($db);
+ $formfile = new FormFile($db);
+ $formorder = new FormOrder($db);
+
+
+ /*********************************************************************
+ *
+ * Mode creation
+ *
+ *********************************************************************/
+ if ($action == 'create' && $user->rights->commande->creer)
{
- if ($object->id > 0)
+ print_fiche_titre($langs->trans('CreateOrder'));
+
+ dol_htmloutput_mesg($mesg,$mesgs,'error');
+
+ $soc = new Societe($db);
+ if ($socid) $res=$soc->fetch($socid);
+
+ if ($origin && $originid)
{
- $result=$object->swapContactStatus(GETPOST('ligne'));
+ // Parse element/subelement (ex: project_task)
+ $element = $subelement = $origin;
+ if (preg_match('/^([^_]+)_([^_]+)/i',$origin,$regs))
+ {
+ $element = $regs[1];
+ $subelement = $regs[2];
+ }
+
+ if ($element == 'project')
+ {
+ $projectid=$originid;
+ }
+ else
+ {
+ // For compatibility
+ if ($element == 'order' || $element == 'commande') {
+ $element = $subelement = 'commande';
+ }
+ if ($element == 'propal') {
+ $element = 'comm/propal'; $subelement = 'propal';
+ }
+ if ($element == 'contract') {
+ $element = $subelement = 'contrat';
+ }
+
+ dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
+
+ $classname = ucfirst($subelement);
+ $objectsrc = new $classname($db);
+ $objectsrc->fetch($originid);
+ if (empty($objectsrc->lines) && method_exists($objectsrc,'fetch_lines')) $objectsrc->fetch_lines();
+ $objectsrc->fetch_thirdparty();
+
+ $projectid = (!empty($objectsrc->fk_project)?$object->fk_project:'');
+ $ref_client = (!empty($objectsrc->ref_client)?$object->ref_client:'');
+
+ $soc = $objectsrc->client;
+ $cond_reglement_id = (!empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(!empty($soc->cond_reglement_id)?$soc->cond_reglement_id:1));
+ $mode_reglement_id = (!empty($objectsrc->mode_reglement_id)?$objectsrc->mode_reglement_id:(!empty($soc->mode_reglement_id)?$soc->mode_reglement_id:0));
+ $availability_id = (!empty($objectsrc->availability_id)?$objectsrc->availability_id:(!empty($soc->availability_id)?$soc->availability_id:0));
+ $demand_reason_id = (!empty($objectsrc->demand_reason_id)?$objectsrc->demand_reason_id:(!empty($soc->demand_reason_id)?$soc->demand_reason_id:0));
+ $remise_percent = (!empty($objectsrc->remise_percent)?$objectsrc->remise_percent:(!empty($soc->remise_percent)?$soc->remise_percent:0));
+ $remise_absolue = (!empty($objectsrc->remise_absolue)?$objectsrc->remise_absolue:(!empty($soc->remise_absolue)?$soc->remise_absolue:0));
+ $dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0;
+
+ $note_private = (! empty($objectsrc->note) ? $objectsrc->note : (! empty($objectsrc->note_private) ? $objectsrc->note_private : ''));
+ $note_public = (! empty($objectsrc->note_public) ? $objectsrc->note_public : '');
+
+ // Object source contacts list
+ $srccontactslist = $objectsrc->liste_contact(-1,'external',1);
+ }
}
else
{
- dol_print_error($db);
+ $cond_reglement_id = $soc->cond_reglement_id;
+ $mode_reglement_id = $soc->mode_reglement_id;
+ $availability_id = $soc->availability_id;
+ $demand_reason_id = $soc->demand_reason_id;
+ $remise_percent = $soc->remise_percent;
+ $remise_absolue = 0;
+ $dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0;
}
- }
+ $absolute_discount=$soc->getAvailableDiscounts();
- // Efface un contact
- else if ($action == 'deletecontact' && $user->rights->commande->creer)
- {
- $result = $object->delete_contact($lineid);
- if ($result >= 0)
+
+ $nbrow=10;
+
+ print '';
+
+
+ // Show origin lines
+ if (is_object($objectsrc))
+ {
+ $title=$langs->trans('ProductsAndServices');
+ print_titre($title);
+
+ print ''; + $text.=$notify->confirmMessage('NOTIFY_VAL_ORDER',$object->socid); + } + $formquestion=array(); + if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $object->hasProductsOrServices(1)) + { + $langs->load("stocks"); + require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); + $formproduct=new FormProduct($db); + $formquestion=array( + //'text' => $langs->trans("ConfirmClone"), + //array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1), + //array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1), + array('type' => 'other', 'name' => 'idwarehouse', 'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1))); + } + + $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateOrder'), $text, 'confirm_validate', $formquestion, 0, 1, 220); + } + + // Confirm back to draft status + if ($action == 'modif') + { + $text=$langs->trans('ConfirmUnvalidateOrder',$object->ref); + $formquestion=array(); + if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $object->hasProductsOrServices(1)) + { + $langs->load("stocks"); + require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); + $formproduct=new FormProduct($db); + $formquestion=array( + //'text' => $langs->trans("ConfirmClone"), + //array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1), + //array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1), + array('type' => 'other', 'name' => 'idwarehouse', 'label' => $langs->trans("SelectWarehouseForStockIncrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1))); + } + + $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('UnvalidateOrder'), $text, 'confirm_modif', $formquestion, "yes", 1, 220); + } + + + /* + * Confirmation de la cloture + */ + if ($action == 'shipped') + { + $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('CloseOrder'), $langs->trans('ConfirmCloseOrder'), 'confirm_shipped', '', 0, 1); + } + + /* + * Confirmation de l'annulation + */ + if ($action == 'cancel') + { + $text=$langs->trans('ConfirmCancelOrder',$object->ref); + $formquestion=array(); + if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $object->hasProductsOrServices(1)) + { + $langs->load("stocks"); + require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); + $formproduct=new FormProduct($db); + $formquestion=array( + //'text' => $langs->trans("ConfirmClone"), + //array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1), + //array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1), + array('type' => 'other', 'name' => 'idwarehouse', 'label' => $langs->trans("SelectWarehouseForStockIncrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1))); + } + + $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Cancel'), $text, 'confirm_cancel', $formquestion, 0, 1); + } + + /* + * Confirmation de la suppression d'une ligne produit + */ + if ($action == 'ask_deleteline') + { + $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1); + } + + // Clone confirmation + if ($action == 'clone') + { + // Create an array for form + $formquestion=array( + //'text' => $langs->trans("ConfirmClone"), + //array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1), + //array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1), + array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid','int'),'socid','(s.client=1 OR s.client=3)')) + ); + // Paiement incomplet. On demande si motif = escompte ou autre + $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneOrder'),$langs->trans('ConfirmCloneOrder',$object->ref),'confirm_clone',$formquestion,'yes',1); + } + + if (! $formconfirm) + { + $parameters=array('lineid'=>$lineid); + $formconfirm=$hookmanager->executeHooks('formConfirm',$parameters,$object,$action); // Note that $action and $object may have been modified by hook + } + + // Print form confirm + print $formconfirm; + + /* + * Commande + */ + $nbrow=9; + if ($conf->projet->enabled) $nbrow++; + + //Local taxes + if ($mysoc->country_code=='ES') + { + if($mysoc->localtax1_assuj=="1") $nbrow++; + if($mysoc->localtax2_assuj=="1") $nbrow++; + } + + print '
'; + print "\n"; + + if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) + { + require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); + $formcompany= new FormCompany($db); + + $blocname = 'contacts'; + $title = $langs->trans('ContactsAddresses'); + include(DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'); + } + + if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB)) + { + $blocname = 'notes'; + $title = $langs->trans('Notes'); + include(DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'); + } + + /* + * Lines + */ + $result = $object->getLinesArray(); + + $numlines = count($object->lines); + + if ($conf->use_javascript_ajax && $object->statut == 0) + { + include(DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'); + } + + print ' ';
+
+ // Valid
+ if ($object->statut == 0 && $object->total_ttc >= 0 && $numlines > 0 && $user->rights->commande->valider)
+ {
+ print ''.$langs->trans('Validate').'';
+ }
+
+ // Edit
+ if ($object->statut == 1 && $user->rights->commande->creer)
+ {
+ print ''.$langs->trans('Modify').'';
+ }
+
+ // Send
+ if ($object->statut > 0)
+ {
+ if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send))
+ {
+ print ''.$langs->trans('SendByMail').'';
+ }
+ else print ''.$langs->trans('SendByMail').'';
+ }
+
+ // Ship
+ $numshipping=0;
+ if ($conf->expedition->enabled)
+ {
+ $numshipping = $object->nb_expedition();
+
+ if ($object->statut > 0 && $object->statut < 3 && $object->getNbOfProductsLines() > 0)
+ {
+ if (($conf->expedition_bon->enabled && $user->rights->expedition->creer)
+ || ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->creer))
+ {
+ if ($user->rights->expedition->creer)
+ {
+ print ''.$langs->trans('ShipProduct').'';
+ }
+ else
+ {
+ print ''.$langs->trans('ShipProduct').'';
+ }
+ }
+ else
+ {
+ $langs->load("errors");
+ print ''.$langs->trans('ShipProduct').'';
+ }
+ }
+ }
+
+ // Reopen a closed order
+ if ($object->statut == 3)
+ {
+ print ''.$langs->trans('ReOpen').'';
+ }
+
+
+ // Create bill and Classify billed
+ if ($conf->facture->enabled && $object->statut > 0 && ! $object->billed)
+ {
+ if ($user->rights->facture->creer && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER))
+ {
+ print ''.$langs->trans("CreateBill").'';
+ }
+ if ($user->rights->commande->creer && $object->statut > 2 && empty($conf->global->WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER) && empty($conf->global->WORsKFLOW_BILL_ON_SHIPMENT))
+ {
+ print ''.$langs->trans("ClassifyBilled").'';
+ }
+ }
+
+ // Set to shipped
+ if (($object->statut == 1 || $object->statut == 2) && $user->rights->commande->cloturer)
+ {
+ print ''.$langs->trans('ClassifyShipped').'';
+ }
+
+ // Clone
+ if ($user->rights->commande->creer)
+ {
+ print ''.$langs->trans("ToClone").'';
+ }
+
+ // Cancel order
+ if ($object->statut == 1 && $user->rights->commande->annuler)
+ {
+ print ''.$langs->trans('Cancel').'';
+ }
+
+ // Delete order
+ if ($user->rights->commande->supprimer)
+ {
+ if ($numshipping == 0)
+ {
+ print ''.$langs->trans('Delete').'';
+ }
+ else
+ {
+ print ''.$langs->trans("Delete").'';
+ }
+ }
+
+ print ' ';
+ }
+ print ''; + } + + + if ($action != 'presend') + { + print ' '; + print_titre($langs->trans('SendOrderByMail')); + + // Cree l'objet formulaire mail + include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); + $formmail = new FormMail($db); + $formmail->fromtype = 'user'; + $formmail->fromid = $user->id; + $formmail->fromname = $user->getFullName($langs); + $formmail->frommail = $user->email; + $formmail->withfrom=1; + $formmail->withto=GETPOST('sendto')?GETPOST('sendto'):1; + $formmail->withtosocid=$soc->id; + $formmail->withtocc=1; + $formmail->withtoccsocid=0; + $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC; + $formmail->withtocccsocid=0; + $formmail->withtopic=$langs->trans('SendOrderRef','__ORDERREF__'); + $formmail->withfile=2; + $formmail->withbody=1; + $formmail->withdeliveryreceipt=1; + $formmail->withcancel=1; + // Tableau des substitutions + $formmail->substit['__ORDERREF__']=$object->ref; + $formmail->substit['__SIGNATURE__']=$user->signature; + $formmail->substit['__PERSONALIZED__']=''; + // Tableau des parametres complementaires + $formmail->param['action']='send'; + $formmail->param['models']='order_send'; + $formmail->param['orderid']=$object->id; + $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id; + + // Init list of files + if (GETPOST("mode")=='init') + { + $formmail->clear_attached_files(); + $formmail->add_attached_files($file,basename($file),dol_mimetype($file)); + } + + // Show form + $formmail->show_form(); + + print ' '; + } } } -} -/* - * View - */ - -llxHeader('',$langs->trans('Order'),'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes'); - -$form = new Form($db); -$formfile = new FormFile($db); -$formorder = new FormOrder($db); - - -/********************************************************************* - * - * Mode creation - * - *********************************************************************/ -if ($action == 'create' && $user->rights->commande->creer) -{ - print_fiche_titre($langs->trans('CreateOrder')); - - dol_htmloutput_mesg($mesg,$mesgs,'error'); - - $soc = new Societe($db); - if ($socid) $res=$soc->fetch($socid); - - if (GETPOST('origin') && GETPOST('originid')) - { - // Parse element/subelement (ex: project_task) - $element = $subelement = GETPOST('origin'); - if (preg_match('/^([^_]+)_([^_]+)/i',GETPOST('origin'),$regs)) - { - $element = $regs[1]; - $subelement = $regs[2]; - } - - if ($element == 'project') - { - $projectid=GETPOST('originid'); - } - else - { - // For compatibility - if ($element == 'order' || $element == 'commande') { $element = $subelement = 'commande'; } - if ($element == 'propal') { $element = 'comm/propal'; $subelement = 'propal'; } - if ($element == 'contract') { $element = $subelement = 'contrat'; } - - dol_include_once('/'.$element.'/class/'.$subelement.'.class.php'); - - $classname = ucfirst($subelement); - $objectsrc = new $classname($db); - $objectsrc->fetch(GETPOST('originid')); - if (empty($objectsrc->lines) && method_exists($objectsrc,'fetch_lines')) $objectsrc->fetch_lines(); - $objectsrc->fetch_thirdparty(); - - $projectid = (!empty($objectsrc->fk_project)?$object->fk_project:''); - $ref_client = (!empty($objectsrc->ref_client)?$object->ref_client:''); - - $soc = $objectsrc->client; - $cond_reglement_id = (!empty($objectsrc->cond_reglement_id)?$objectsrc->cond_reglement_id:(!empty($soc->cond_reglement_id)?$soc->cond_reglement_id:1)); - $mode_reglement_id = (!empty($objectsrc->mode_reglement_id)?$objectsrc->mode_reglement_id:(!empty($soc->mode_reglement_id)?$soc->mode_reglement_id:0)); - $availability_id = (!empty($objectsrc->availability_id)?$objectsrc->availability_id:(!empty($soc->availability_id)?$soc->availability_id:0)); - $demand_reason_id = (!empty($objectsrc->demand_reason_id)?$objectsrc->demand_reason_id:(!empty($soc->demand_reason_id)?$soc->demand_reason_id:0)); - $remise_percent = (!empty($objectsrc->remise_percent)?$objectsrc->remise_percent:(!empty($soc->remise_percent)?$soc->remise_percent:0)); - $remise_absolue = (!empty($objectsrc->remise_absolue)?$objectsrc->remise_absolue:(!empty($soc->remise_absolue)?$soc->remise_absolue:0)); - $dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0; - - $note_private = (! empty($objectsrc->note) ? $objectsrc->note : (! empty($objectsrc->note_private) ? $objectsrc->note_private : '')); - $note_public = (! empty($objectsrc->note_public) ? $objectsrc->note_public : ''); - - // Object source contacts list - $srccontactslist = $objectsrc->liste_contact(-1,'external',1); - } - } - else - { - $cond_reglement_id = $soc->cond_reglement_id; - $mode_reglement_id = $soc->mode_reglement_id; - $availability_id = $soc->availability_id; - $demand_reason_id = $soc->demand_reason_id; - $remise_percent = $soc->remise_percent; - $remise_absolue = 0; - $dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE)?-1:0; - } - $absolute_discount=$soc->getAvailableDiscounts(); - - - - $nbrow=10; - - print ''; - - - // Show origin lines - if (is_object($objectsrc)) - { - $title=$langs->trans('ProductsAndServices'); - print_titre($title); - - print ' '; - $text.=$notify->confirmMessage('NOTIFY_VAL_ORDER',$object->socid); - } - $formquestion=array(); - if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $object->hasProductsOrServices(1)) - { - $langs->load("stocks"); - require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); - $formproduct=new FormProduct($db); - $formquestion=array( - //'text' => $langs->trans("ConfirmClone"), - //array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1), - //array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1), - array('type' => 'other', 'name' => 'idwarehouse', 'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1))); - } - - $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateOrder'), $text, 'confirm_validate', $formquestion, 0, 1, 220); - } - - // Confirm back to draft status - if ($action == 'modif') - { - $text=$langs->trans('ConfirmUnvalidateOrder',$object->ref); - $formquestion=array(); - if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $object->hasProductsOrServices(1)) - { - $langs->load("stocks"); - require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); - $formproduct=new FormProduct($db); - $formquestion=array( - //'text' => $langs->trans("ConfirmClone"), - //array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1), - //array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1), - array('type' => 'other', 'name' => 'idwarehouse', 'label' => $langs->trans("SelectWarehouseForStockIncrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1))); - } - - $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('UnvalidateOrder'), $text, 'confirm_modif', $formquestion, "yes", 1, 220); - } - - - /* - * Confirmation de la cloture - */ - if ($action == 'shipped') - { - $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('CloseOrder'), $langs->trans('ConfirmCloseOrder'), 'confirm_shipped', '', 0, 1); - } - - /* - * Confirmation de l'annulation - */ - if ($action == 'cancel') - { - $text=$langs->trans('ConfirmCancelOrder',$object->ref); - $formquestion=array(); - if (! empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $object->hasProductsOrServices(1)) - { - $langs->load("stocks"); - require_once(DOL_DOCUMENT_ROOT."/product/class/html.formproduct.class.php"); - $formproduct=new FormProduct($db); - $formquestion=array( - //'text' => $langs->trans("ConfirmClone"), - //array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1), - //array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1), - array('type' => 'other', 'name' => 'idwarehouse', 'label' => $langs->trans("SelectWarehouseForStockIncrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1))); - } - - $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Cancel'), $text, 'confirm_cancel', $formquestion, 0, 1); - } - - /* - * Confirmation de la suppression d'une ligne produit - */ - if ($action == 'ask_deleteline') - { - $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1); - } - - // Clone confirmation - if ($action == 'clone') - { - // Create an array for form - $formquestion=array( - //'text' => $langs->trans("ConfirmClone"), - //array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1), - //array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1), - array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid','int'),'socid','(s.client=1 OR s.client=3)')) - ); - // Paiement incomplet. On demande si motif = escompte ou autre - $formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneOrder'),$langs->trans('ConfirmCloneOrder',$object->ref),'confirm_clone',$formquestion,'yes',1); - } - - if (! $formconfirm) - { - $parameters=array('lineid'=>$lineid); - $formconfirm=$hookmanager->executeHooks('formConfirm',$parameters,$object,$action); // Note that $action and $object may have been modified by hook - } - - // Print form confirm - print $formconfirm; - - /* - * Commande - */ - $nbrow=9; - if ($conf->projet->enabled) $nbrow++; - - //Local taxes - if ($mysoc->country_code=='ES') - { - if($mysoc->localtax1_assuj=="1") $nbrow++; - if($mysoc->localtax2_assuj=="1") $nbrow++; - } - - print '
'; - print "\n"; - - if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) - { - require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'); - $formcompany= new FormCompany($db); - - $blocname = 'contacts'; - $title = $langs->trans('ContactsAddresses'); - include(DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'); - } - - if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB)) - { - $blocname = 'notes'; - $title = $langs->trans('Notes'); - include(DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php'); - } - - /* - * Lines - */ - $result = $object->getLinesArray(); - - $numlines = count($object->lines); - - if ($conf->use_javascript_ajax && $object->statut == 0) - { - include(DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'); - } - - print ' ';
-
- // Valid
- if ($object->statut == 0 && $object->total_ttc >= 0 && $numlines > 0 && $user->rights->commande->valider)
- {
- print ''.$langs->trans('Validate').'';
- }
-
- // Edit
- if ($object->statut == 1 && $user->rights->commande->creer)
- {
- print ''.$langs->trans('Modify').'';
- }
-
- // Send
- if ($object->statut > 0)
- {
- if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send))
- {
- print ''.$langs->trans('SendByMail').'';
- }
- else print ''.$langs->trans('SendByMail').'';
- }
-
- // Ship
- $numshipping=0;
- if ($conf->expedition->enabled)
- {
- $numshipping = $object->nb_expedition();
-
- if ($object->statut > 0 && $object->statut < 3 && $object->getNbOfProductsLines() > 0)
- {
- if (($conf->expedition_bon->enabled && $user->rights->expedition->creer)
- || ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->creer))
- {
- if ($user->rights->expedition->creer)
- {
- print ''.$langs->trans('ShipProduct').'';
- }
- else
- {
- print ''.$langs->trans('ShipProduct').'';
- }
- }
- else
- {
- $langs->load("errors");
- print ''.$langs->trans('ShipProduct').'';
- }
- }
- }
-
- // Reopen a closed order
- if ($object->statut == 3)
- {
- print ''.$langs->trans('ReOpen').'';
- }
-
-
- // Create bill and Classify billed
- if ($conf->facture->enabled && $object->statut > 0 && ! $object->billed)
- {
- if ($user->rights->facture->creer && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER))
- {
- print ''.$langs->trans("CreateBill").'';
- }
- if ($user->rights->commande->creer && $object->statut > 2 && empty($conf->global->WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER) && empty($conf->global->WORsKFLOW_BILL_ON_SHIPMENT))
- {
- print ''.$langs->trans("ClassifyBilled").'';
- }
- }
-
- // Set to shipped
- if (($object->statut == 1 || $object->statut == 2) && $user->rights->commande->cloturer)
- {
- print ''.$langs->trans('ClassifyShipped').'';
- }
-
- // Clone
- if ($user->rights->commande->creer)
- {
- print ''.$langs->trans("ToClone").'';
- }
-
- // Cancel order
- if ($object->statut == 1 && $user->rights->commande->annuler)
- {
- print ''.$langs->trans('Cancel').'';
- }
-
- // Delete order
- if ($user->rights->commande->supprimer)
- {
- if ($numshipping == 0)
- {
- print ''.$langs->trans('Delete').'';
- }
- else
- {
- print ''.$langs->trans("Delete").'';
- }
- }
-
- print ' ';
- }
- print ''; - } - - - if ($action != 'presend') - { - print ' '; - print_titre($langs->trans('SendOrderByMail')); - - // Cree l'objet formulaire mail - include_once(DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'); - $formmail = new FormMail($db); - $formmail->fromtype = 'user'; - $formmail->fromid = $user->id; - $formmail->fromname = $user->getFullName($langs); - $formmail->frommail = $user->email; - $formmail->withfrom=1; - $formmail->withto=empty($_POST["sendto"])?1:$_POST["sendto"]; - $formmail->withtosocid=$soc->id; - $formmail->withtocc=1; - $formmail->withtoccsocid=0; - $formmail->withtoccc=$conf->global->MAIN_EMAIL_USECCC; - $formmail->withtocccsocid=0; - $formmail->withtopic=$langs->trans('SendOrderRef','__ORDERREF__'); - $formmail->withfile=2; - $formmail->withbody=1; - $formmail->withdeliveryreceipt=1; - $formmail->withcancel=1; - // Tableau des substitutions - $formmail->substit['__ORDERREF__']=$object->ref; - $formmail->substit['__SIGNATURE__']=$user->signature; - $formmail->substit['__PERSONALIZED__']=''; - // Tableau des parametres complementaires - $formmail->param['action']='send'; - $formmail->param['models']='order_send'; - $formmail->param['orderid']=$object->id; - $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id; - - // Init list of files - if (GETPOST("mode")=='init') - { - $formmail->clear_attached_files(); - $formmail->add_attached_files($file,basename($file),dol_mimetype($file)); - } - - // Show form - $formmail->show_form(); - - print ' '; - } - } -} - - -llxFooter(); -$db->close(); -?> + llxFooter(); + $db->close(); + ?> diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index a521f766574..cae2461a780 100755 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -62,7 +62,7 @@ if ($action == 'create') { if (! is_array($selected)) { - $mesg=' '.$langs->trans('Error_OrderNotChecked').' ';
+ $mesgs[]=''.$langs->trans('Error_OrderNotChecked').' ';
}
else
{
@@ -80,9 +80,9 @@ $htmlother = new FormOther($db);
/*
* Actions
-*/
+ */
-if (($action == 'create' || $action == 'add') && ! $mesg )
+if (($action == 'create' || $action == 'add') && empty($mesgs))
{
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php");
@@ -92,8 +92,10 @@ if (($action == 'create' || $action == 'add') && ! $mesg )
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php');
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
- if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
- if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php');
+ if (! empty($conf->projet->enabled)) {
+ require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
+ require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php');
+ }
$langs->load('bills');
$langs->load('products');
$langs->load('main');
@@ -117,7 +119,6 @@ if (($action == 'create' || $action == 'add') && ! $mesg )
$_POST['originid']=$orders_id[0];
}
- if (GETPOST('mesg','int',1) && isset($_SESSION['message'])) $mesg=$_SESSION['message'];
$sall=isset($_GET['sall'])?trim($_GET['sall']):trim($_POST['sall']);
$projectid=isset($_GET['projectid'])?$_GET['projectid']:0;
$id =(GETPOST('id')?GETPOST("id"):GETPOST("facid")); // For backward compatibility
@@ -242,7 +243,7 @@ if (($action == 'create' || $action == 'add') && ! $mesg )
}
else
{
- $mesg=$discount->error;
+ $mesgs[]=$discount->error;
$error++;
break;
}
@@ -310,7 +311,7 @@ if (($action == 'create' || $action == 'add') && ! $mesg )
}
else
{
- $mesg=$srcobject->error;
+ $mesgs[]=$srcobject->error;
$error++;
}
$ii++;
@@ -318,7 +319,7 @@ if (($action == 'create' || $action == 'add') && ! $mesg )
}
else
{
- $mesg=$object->error;
+ $mesgs[]=$object->error;
$error++;
}
}
@@ -338,7 +339,7 @@ if (($action == 'create' || $action == 'add') && ! $mesg )
$action='create';
$_GET["origin"]=$_POST["origin"];
$_GET["originid"]=$_POST["originid"];
- if (! $mesg) $mesg=''.$object->error.' ';
+ $mesgs[]=''.$object->error.' ';
}
}
@@ -354,9 +355,10 @@ if (($action == 'create' || $action == 'add') && ! $mesg )
if ($action == 'create')
{
$facturestatic=new Facture($db);
+
llxHeader();
print_fiche_titre($langs->trans('NewBill'));
- dol_htmloutput_mesg($mesg);
+
$soc = new Societe($db);
if ($socid) $res=$soc->fetch($socid);
if ($res)
@@ -474,7 +476,6 @@ if (($action == 'create' || $action == 'add') && ! $mesg )
print "\n";
}
-
//Mode liste
else
{
@@ -669,8 +670,8 @@ else
}
-$db->close();
-dol_htmloutput_mesg($mesg);
-llxFooter();
+dol_htmloutput_mesg($mesg,$mesgs);
+llxFooter();
+$db->close();
?>
\ No newline at end of file
diff --git a/htdocs/admin/commissions.php b/htdocs/commissions/admin/commissions.php
similarity index 65%
rename from htdocs/admin/commissions.php
rename to htdocs/commissions/admin/commissions.php
index 64e618633ac..a48f6ead1ca 100644
--- a/htdocs/admin/commissions.php
+++ b/htdocs/commissions/admin/commissions.php
@@ -1,5 +1,5 @@
+/* Copyright (C) 2012 Christophe Battarel '.$langs->trans('StartDate').' | ';
print '';
$form->select_date($startdate,'startdate','','',1,"sel",1,1);
@@ -106,22 +108,22 @@ print ' | | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '.$langs->trans("IncludeUnpayedInvoices").' | '; print ''; print ' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '.$langs->trans("TotalMargin").' | '; - print ''; // set by jquery (see below) - print ' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '.$langs->trans("TotalMargin").' | '; + print ''; // set by jquery (see below) + print ' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '.$langs->trans("CATotal").' | '; - print ''; // set by jquery (see below) - print ' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| '.$langs->trans("TurnoverTotal").' | '; + print ''; // set by jquery (see below) + print ' | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| ".$companystatic->getNomUrl(1,'customer')." | \n"; - } - else { - $userstatic->id=$objp->agent; - $userstatic->login=$objp->login; - print "".$userstatic->getLoginUrl(1)." | \n"; - } - // product commission - $productCommission = $conf->global->PRODUCT_COMMISSION_RATE * $objp->productBase / 100; - print "".price($objp->productBase)." | \n"; - print "".price($conf->global->PRODUCT_COMMISSION_RATE)." | \n"; + $companystatic->id=$objp->socid; + $companystatic->nom=$objp->nom; + $companystatic->client=$objp->client; + print "".$companystatic->getNomUrl(1,'customer')." | \n"; + } + else { + $userstatic->id=$objp->agent; + $userstatic->login=$objp->login; + print "".$userstatic->getLoginUrl(1)." | \n"; + } + + // product commission + $productCommissionRate=(! empty($conf->global->PRODUCT_COMMISSION_RATE)?$conf->global->PRODUCT_COMMISSION_RATE:0); + $productBase=(! empty($objp->productBase)?$objp->productBase:0); + $productCommission = (! empty($productBase)?($productCommissionRate * $productBase / 100):0); + print "".price($productBase)." | \n"; + print "".price($productCommissionRate)." | \n"; print "".price($productCommission)." | \n"; - // service commission - $serviceCommission = $conf->global->SERVICE_COMMISSION_RATE * $objp->serviceBase / 100; - print "".price($objp->serviceBase)." | \n"; - print "".price($conf->global->SERVICE_COMMISSION_RATE)." | \n"; + + // service commission + $serviceCommissionRate=(! empty($conf->global->SERVICE_COMMISSION_RATE)?$conf->global->SERVICE_COMMISSION_RATE:0); + $serviceBase=(! empty($objp->serviceBase)?$objp->serviceBase:0); + $serviceCommission = (! empty($serviceBase)?($serviceCommissionRate * $serviceBase / 100):0); + print "".price($serviceBase)." | \n"; + print "".price($serviceCommissionRate)." | \n"; print "".price($serviceCommission)." | \n"; + // total commission print "".price($productCommission + $serviceCommission)." | \n"; print "
| '; - else - print ' | '; - print $langs->trans('TotalCommission')." | "; - // product commission + if (! empty($client)) + print ''; + else + print ' | '; + print $langs->trans('TotalCommission')." | "; + // product commission print "".price($cumul_base_produit)." | \n"; - print "".price($conf->global->PRODUCT_COMMISSION_RATE)." | \n"; + print "".price((! empty($conf->global->PRODUCT_COMMISSION_RATE)?$conf->global->PRODUCT_COMMISSION_RATE:0))." | \n"; print "".price($cumul_commission_produit)." | \n"; - // service commission + // service commission print "".price($cumul_base_service)." | \n"; - print "".price($conf->global->SERVICE_COMMISSION_RATE)." | \n"; + print "".price((! empty($conf->global->SERVICE_COMMISSION_RATE)?$conf->global->SERVICE_COMMISSION_RATE:0))." | \n"; print "".price($cumul_commission_service)." | \n"; // total commission print "".price($cumul_commission_produit + $cumul_commission_service)." | \n"; print "||
'.$langs->trans("NoCloneOptionsSpecified").'
';
+ $mesgs[]=''.$langs->trans("NoCloneOptionsSpecified").'
';
}
else
{
@@ -130,7 +125,7 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->facture->c
}
else
{
- $mesg=$object->error;
+ $mesgs[]=$object->error;
$action='';
}
}
@@ -152,7 +147,7 @@ else if ($action == 'reopen' && $user->rights->facture->creer)
}
else
{
- $mesg=''.$object->error.'
';
+ $mesgs[]=''.$object->error.'
';
}
}
}
@@ -170,7 +165,7 @@ else if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fact
}
else
{
- $mesg=''.$object->error.'
';
+ $mesgs[]=''.$object->error.'
';
}
}
@@ -206,7 +201,7 @@ else if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->
}
else
{
- $mesg=''.$object->error.'
';
+ $mesgs[]=''.$object->error.'
';
$action='';
}
}
@@ -230,7 +225,7 @@ else if ($action == 'valid' && $user->rights->facture->creer)
// Si avoir, le signe doit etre negatif
if ($object->total_ht >= 0)
{
- $mesg=''.$langs->trans("ErrorInvoiceAvoirMustBeNegative").'
';
+ $mesgs[]=''.$langs->trans("ErrorInvoiceAvoirMustBeNegative").'
';
$action='';
}
}
@@ -239,7 +234,7 @@ else if ($action == 'valid' && $user->rights->facture->creer)
// Si non avoir, le signe doit etre positif
if (empty($conf->global->FACTURE_ENABLE_NEGATIVE) && $object->total_ht < 0)
{
- $mesg=''.$langs->trans("ErrorInvoiceOfThisTypeMustBePositive").'
';
+ $mesgs[]=''.$langs->trans("ErrorInvoiceOfThisTypeMustBePositive").'
';
$action='';
}
}
@@ -306,7 +301,7 @@ else if ($action == "setabsolutediscount" && $user->rights->facture->creer)
$result=$object->insert_discount($_POST["remise_id"]);
if ($result < 0)
{
- $mesg=''.$object->error.'
';
+ $mesgs[]=''.$object->error.'
';
}
}
else
@@ -323,7 +318,7 @@ else if ($action == "setabsolutediscount" && $user->rights->facture->creer)
$result=$discount->link_to_invoice(0,$id);
if ($result < 0)
{
- $mesg=''.$discount->error.'
';
+ $mesgs[]=''.$discount->error.'
';
}
}
}
@@ -362,7 +357,7 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->factu
if (! $idwarehouse || $idwarehouse == -1)
{
$error++;
- $errors[]=$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse"));
+ $mesgs[]=$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse"));
$action='';
}
}
@@ -390,7 +385,7 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->factu
}
else
{
- $mesg=''.$object->error.'
';
+ $mesgs[]=''.$object->error.'
';
}
}
}
@@ -409,7 +404,7 @@ else if ($action == 'confirm_modif' && ((empty($conf->global->MAIN_USE_ADVANCED_
if (! $idwarehouse || $idwarehouse == -1)
{
$error++;
- $errors[]=$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse"));
+ $mesgs[]=$langs->trans('ErrorFieldRequired',$langs->transnoentitiesnoconv("Warehouse"));
$action='';
}
}
@@ -486,7 +481,7 @@ else if ($action == 'confirm_paid_partially' && $confirm == 'yes' && $user->righ
}
else
{
- $mesg=''.$langs->trans("ErrorFieldRequired",$langs->trans("Reason")).'
';
+ $mesgs[]=''.$langs->trans("ErrorFieldRequired",$langs->trans("Reason")).'
';
}
}
// Classify "abandoned"
@@ -501,7 +496,7 @@ else if ($action == 'confirm_canceled' && $confirm == 'yes')
}
else
{
- $mesg=''.$langs->trans("ErrorFieldRequired",$langs->trans("Reason")).'
';
+ $mesgs[]=''.$langs->trans("ErrorFieldRequired",$langs->trans("Reason")).'
';
}
}
@@ -560,18 +555,18 @@ else if ($action == 'confirm_converttoreduc' && $confirm == 'yes' && $user->righ
$result=$object->set_paid($user);
if ($result > 0)
{
- //$mesg='OK'.$discount->id;
+ //$mesgs[]='OK'.$discount->id;
$db->commit();
}
else
{
- $mesg=''.$object->error.'
';
+ $mesgs[]=''.$object->error.'
';
$db->rollback();
}
}
else
{
- $mesg=''.$discount->error.'
';
+ $mesgs[]=''.$discount->error.'
';
$db->rollback();
}
}
@@ -595,13 +590,13 @@ else if ($action == 'add' && $user->rights->facture->creer)
if (empty($datefacture))
{
$error++;
- $mesg=''.$langs->trans("ErrorFieldRequired",$langs->trans("Date")).'
';
+ $mesgs[]=''.$langs->trans("ErrorFieldRequired",$langs->trans("Date")).'
';
}
if (! ($_POST['fac_replacement'] > 0))
{
$error++;
- $mesg=''.$langs->trans("ErrorFieldRequired",$langs->trans("ReplaceInvoice")).'
';
+ $mesgs[]=''.$langs->trans("ErrorFieldRequired",$langs->trans("ReplaceInvoice")).'
';
}
if (! $error)
@@ -627,7 +622,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
$object->type = 1;
$id=$object->createFromCurrent($user);
- if ($id <= 0) $mesg=$object->error;
+ if ($id <= 0) $mesgs[]=$object->error;
}
}
@@ -637,14 +632,14 @@ else if ($action == 'add' && $user->rights->facture->creer)
if (! $_POST['fac_avoir'] > 0)
{
$error++;
- $mesg=''.$langs->trans("ErrorFieldRequired",$langs->trans("CorrectInvoice")).'
';
+ $mesgs[]=''.$langs->trans("ErrorFieldRequired",$langs->trans("CorrectInvoice")).'
';
}
$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
if (empty($datefacture))
{
$error++;
- $mesg=''.$langs->trans("ErrorFieldRequired",$langs->trans("Date")).'
';
+ $mesgs[]=''.$langs->trans("ErrorFieldRequired",$langs->trans("Date")).'
';
}
if (! $error)
@@ -696,7 +691,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
if (empty($datefacture))
{
$error++;
- $mesg=''.$langs->trans("ErrorFieldRequired",$langs->trans("Date")).'
';
+ $mesgs[]=''.$langs->trans("ErrorFieldRequired",$langs->trans("Date")).'
';
}
if (! $error)
@@ -725,7 +720,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
if (empty($datefacture))
{
$error++;
- $mesg=''.$langs->trans("ErrorFieldRequired",$langs->trans("Date")).'
';
+ $mesgs[]=''.$langs->trans("ErrorFieldRequired",$langs->trans("Date")).'
';
}
if (! $error)
@@ -816,7 +811,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
}
else
{
- $mesg=$discount->error;
+ $mesgs[]=$discount->error;
$error++;
break;
}
@@ -866,8 +861,8 @@ else if ($action == 'add' && $user->rights->facture->creer)
$object->origin,
$lines[$i]->rowid,
$fk_parent_line,
- $lines[$i]->fk_fournprice,
- $lines[$i]->pa_ht
+ $lines[$i]->fk_fournprice,
+ $lines[$i]->pa_ht
);
if ($result > 0)
@@ -895,13 +890,13 @@ else if ($action == 'add' && $user->rights->facture->creer)
}
else
{
- $mesg=$srcobject->error;
+ $mesgs[]=$srcobject->error;
$error++;
}
}
else
{
- $mesg=$object->error;
+ $mesgs[]=$object->error;
$error++;
}
}
@@ -938,7 +933,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
$action='create';
$_GET["origin"]=$_POST["origin"];
$_GET["originid"]=$_POST["originid"];
- if (! $mesg) $mesg=''.$object->error.'
';
+ $mesgs[]=''.$object->error.'
';
}
}
@@ -950,27 +945,27 @@ else if (($action == 'addline' || $action == 'addline_predef') && $user->rights-
if ($_POST['np_price'] < 0 && $_POST["qty"] < 0)
{
$langs->load("errors");
- $mesg=''.$langs->trans("ErrorBothFieldCantBeNegative",$langs->transnoentitiesnoconv("UnitPriceHT"),$langs->transnoentitiesnoconv("Qty")).'
';
+ $mesgs[]=''.$langs->trans("ErrorBothFieldCantBeNegative",$langs->transnoentitiesnoconv("UnitPriceHT"),$langs->transnoentitiesnoconv("Qty")).'
';
$result = -1 ;
}
if (empty($_POST['idprod']) && $_POST["type"] < 0)
{
- $mesg=''.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).'
';
+ $mesgs[]=''.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).'
';
$result = -1 ;
}
if (empty($_POST['idprod']) && (! isset($_POST["np_price"]) || $_POST["np_price"]=='')) // Unit price can be 0 but not ''
{
- $mesg=''.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("UnitPriceHT")).'
';
+ $mesgs[]=''.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("UnitPriceHT")).'
';
$result = -1 ;
}
if (empty($_POST['idprod']) && empty($_POST["np_desc"]) && empty($_POST["dp_desc"]))
{
- $mesg=''.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Description")).'
';
+ $mesgs[]=''.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Description")).'
';
$result = -1 ;
}
if (! isset($_POST['qty']) || $_POST['qty']=='')
{
- $mesg=''.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv('Qty')).'
';
+ $mesgs[]=''.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv('Qty')).'
';
$result = -1 ;
}
if ($result >= 0 && ( ($_POST['np_price']!='' && ($_POST['np_desc'] || $_POST['dp_desc'])) || $_POST['idprod'] ) )
@@ -1082,7 +1077,7 @@ else if (($action == 'addline' || $action == 'addline_predef') && $user->rights-
$pa_ht = $_POST['np_buying_price'];
else
$pa_ht = null;
-
+
$info_bits=0;
if ($tva_npr) $info_bits |= 0x01;
@@ -1119,8 +1114,8 @@ else if (($action == 'addline' || $action == 'addline_predef') && $user->rights-
'',
0,
GETPOST('fk_parent_line'),
- $fk_fournprice,
- $pa_ht
+ $fk_fournprice,
+ $pa_ht
);
}
}
@@ -1155,7 +1150,7 @@ else if (($action == 'addline' || $action == 'addline_predef') && $user->rights-
}
else
{
- if (empty($mesg)) $mesg=''.$object->error.'
';
+ $mesgs[]=''.$object->error.'
';
}
$action='';
@@ -1194,7 +1189,7 @@ else if ($action == 'updateligne' && $user->rights->facture->creer && $_POST['sa
// Check parameters
if (! GETPOST('productid') && GETPOST("type") < 0)
{
- $mesg = ''.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).'
';
+ $mesgs[] = ''.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("Type")).'
';
$result = -1 ;
}
// Check minimum price
@@ -1210,7 +1205,7 @@ else if ($action == 'updateligne' && $user->rights->facture->creer && $_POST['sa
if ($object->type!=2 && $price_min && GETPOST('productid') && (price2num($up_ht)*(1-price2num(GETPOST('remise_percent'))/100) < price2num($price_min)))
{
//print "CantBeLessThanMinPrice ".$up_ht." - ".GETPOST('remise_percent')." - ".$product->price_min;
- $mesg = ''.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->currency)).'
';
+ $mesgs[] = ''.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->currency)).'
';
$result=-1;
}
@@ -1236,9 +1231,9 @@ else if ($action == 'updateligne' && $user->rights->facture->creer && $_POST['sa
$info_bits,
$type,
GETPOST('fk_parent_line'),
- 0,
- $fk_fournprice,
- $pa_ht
+ 0,
+ $fk_fournprice,
+ $pa_ht
);
// Define output language
@@ -1328,7 +1323,7 @@ if (GETPOST('addfile'))
$vardir=$conf->user->dir_output."/".$user->id;
$upload_dir_tmp = $vardir.'/temp';
- $mesg=dol_add_file_process($upload_dir_tmp,0,0);
+ $mesgs[]=dol_add_file_process($upload_dir_tmp,0,0);
$action='presend';
}
@@ -1345,7 +1340,7 @@ if (! empty($_POST['removedfile']))
$upload_dir_tmp = $vardir.'/temp';
// TODO Delete only files that was uploaded from email form
- $mesg=dol_remove_file_process($_POST['removedfile'],0);
+ $mesgs[]=dol_remove_file_process($_POST['removedfile'],0);
$action='presend';
}
@@ -1476,8 +1471,8 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
{
// Redirect here
// This avoid sending mail twice if going out and then back to page
- $_SESSION['message'] = $mesg;
- Header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&mesg=1');
+ $_SESSION['dol_message'] = $mesg;
+ Header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$object->id);
exit;
}
}
@@ -1495,27 +1490,28 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO
$mesg.='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
}
$mesg.='';
+ $mesgs[]=$mesg;
}
}
/* }
else
{
$langs->load("other");
- $mesg=''.$langs->trans('ErrorMailRecipientIsEmpty').'
';
+ $mesgs[]=''.$langs->trans('ErrorMailRecipientIsEmpty').'
';
dol_syslog('Recipient email is empty');
}*/
}
else
{
$langs->load("errors");
- $mesg=''.$langs->trans('ErrorCantReadFile',$file).'
';
+ $mesgs[]=''.$langs->trans('ErrorCantReadFile',$file).'
';
dol_syslog('Failed to read file: '.$file);
}
}
else
{
$langs->load("other");
- $mesg=''.$langs->trans('ErrorFailedToReadEntity',$langs->trans("Invoice")).'
';
+ $mesgs[]=''.$langs->trans('ErrorFailedToReadEntity',$langs->trans("Invoice")).'
';
dol_syslog('Impossible de lire les donnees de la facture. Le fichier facture n\'a peut-etre pas ete genere.');
}
@@ -1571,7 +1567,7 @@ else if ($action == 'remove_file')
$upload_dir = $conf->facture->dir_output;
$file = $upload_dir . '/' . GETPOST('file');
dol_delete_file($file,0,0,0,$object);
- $mesg = ''.$langs->trans("FileWasRemoved",GETPOST('file')).'
';
+ $mesgs[] = ''.$langs->trans("FileWasRemoved",GETPOST('file')).'
';
}
}
@@ -1597,11 +1593,11 @@ if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{
$langs->load("errors");
- $mesg = ''.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'
';
+ $mesgs[] = ''.$langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType").'
';
}
else
{
- $mesg = ''.$object->error.'
';
+ $mesgs[] = ''.$object->error.'
';
}
}
}
@@ -1661,9 +1657,6 @@ if ($action == 'create')
print_fiche_titre($langs->trans('NewBill'));
- dol_htmloutput_mesg($mesg);
- dol_htmloutput_errors('',$errors);
-
$soc = new Societe($db);
if ($socid) $res=$soc->fetch($socid);
@@ -2109,8 +2102,6 @@ else if ($id > 0 || ! empty($ref))
/*
* Show object in view mode
*/
- dol_htmloutput_mesg($mesg);
- dol_htmloutput_errors('',$errors);
$result=$object->fetch($id,$ref);
if ($result > 0)
@@ -3332,7 +3323,8 @@ else if ($id > 0 || ! empty($ref))
}
}
+dol_htmloutput_mesg('',$mesgs);
llxFooter();
$db->close();
-?>
+?>
\ No newline at end of file
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 7a789c32c4f..e023a0dd242 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -43,13 +43,6 @@ $confirm = GETPOST('confirm');
$id = GETPOST('facid','int');
$ref = GETPOST('ref');
-$mesg='';
-if (isset($_SESSION['DolMessage']))
-{
- $mesg=$_SESSION['DolMessage'];
- unset($_SESSION['DolMessage']);
-}
-
// Security check
if ($user->societe_id)
{
@@ -132,7 +125,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
$upload_dir = $conf->facture->dir_output . "/" . dol_sanitizeFileName($object->ref);
$file = $upload_dir . '/' . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
dol_delete_file($file,0,0,0,$object);
- $_SESSION['DolMessage'] = ''.$langs->trans("FileWasRemoved",GETPOST('urlfile')).'
';
+ $_SESSION['dol_message'] = ''.$langs->trans("FileWasRemoved",GETPOST('urlfile')).'
';
Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
exit;
}
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 6c356015ab1..86a70f28e28 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -38,22 +38,18 @@ require_once(DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php');
require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
require_once(DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php');
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
-if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php');
-if ($conf->projet->enabled)
+if (! empty($conf->commande->enabled)) require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php');
+if (! empty($conf->projet->enabled))
{
require_once(DOL_DOCUMENT_ROOT.'/projet/class/project.class.php');
require_once(DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php');
}
$langs->load('bills');
-//print 'ee'.$langs->trans('BillsCustomer');exit;
-
$langs->load('companies');
$langs->load('products');
$langs->load('main');
-if (GETPOST('mesg','int',1) && isset($_SESSION['message'])) $mesg=$_SESSION['message'];
-
$sall=trim(GETPOST('sall'));
$projectid=(GETPOST('projectid')?GETPOST('projectid','int'):0);
@@ -84,16 +80,19 @@ $pageprev = $page - 1;
$pagenext = $page + 1;
$search_user = GETPOST('search_user','int');
+$search_sale = GETPOST('search_sale','int');
$day = GETPOST('day','int');
$month = GETPOST('month','int');
$year = GETPOST('year','int');
+$filtre = GETPOST('filtre');
// Security check
$fieldid = (! empty($ref)?'facnumber':'rowid');
-if ($user->societe_id) $socid=$user->societe_id;
+if (! empty($user->societe_id)) $socid=$user->societe_id;
$result = restrictedArea($user, 'facture', $id,'','','fk_soc',$fieldid);
-$usehm=$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE;
+// FIXME $usehm not used ?
+$usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:false);
$object=new Facture($db);
@@ -166,12 +165,12 @@ if ($userid)
if ($userid == -1) $sql.=' AND f.fk_user_author IS NULL';
else $sql.=' AND f.fk_user_author = '.$userid;
}
-if ($_GET['filtre'])
+if ($filtre)
{
- $filtrearr = explode(',', $_GET['filtre']);
- foreach ($filtrearr as $fil)
+ $aFilter = explode(',', $filtre);
+ foreach ($aFilter as $filter)
{
- $filt = explode(':', $fil);
+ $filt = explode(':', $filter);
$sql .= ' AND ' . trim($filt[0]) . ' = ' . trim($filt[1]);
}
}
@@ -254,6 +253,7 @@ if ($resql)
print '| '.$langs->trans('Margins').' | '; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 3ecca91bfab..1837ea7c306 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -2184,7 +2184,7 @@ class Form $more.=''.$langs->trans("Poste").''.$langs->trans("Tel").' | '; print ''.$langs->trans("Fax").' | '.$langs->trans("EMail").' | '; print ""; - if ($conf->agenda->enabled && $user->rights->agenda->myactions->create) + if (! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) { print ' | '; } print " | '.$obj->poste.' | '; + $country_code = getCountry($obj->fk_pays, 2); + // Lien click to dial print ''; - print dol_print_phone($obj->phone,$obj->pays_code,$obj->rowid,$object->id,'AC_TEL'); + print dol_print_phone($obj->phone,$country_code,$obj->rowid,$object->id,'AC_TEL'); print ' | '; print ''; - print dol_print_phone($obj->fax,$obj->pays_code,$obj->rowid,$object->id,'AC_FAX'); + print dol_print_phone($obj->fax,$country_code,$obj->rowid,$object->id,'AC_FAX'); print ' | '; print '';
print dol_print_email($obj->email,$obj->rowid,$object->id,'AC_EMAIL');
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index f067ae7a5dc..30423c65940 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2008-2011 Regis Houssin | '.$langs->trans('Date').' | ';
print ''.dol_print_date($commande->date,'daytext').' | ';
- print ''.$langs->trans('Source').' : '.$commande->getLabelSource();
- if ($commande->source == 0 && $conf->propal->enabled && $commande->propale_id)
- {
- // Si source = propal
- $propal = new Propal($db);
- $propal->fetch($commande->propale_id);
- print ' -> '.$propal->ref.'';
- }
- print ' | ';
+ print ''.$langs->trans('Source').' : '.$commande->getLabelSource().' | ';
print ' | ';
- if ($action != 'editconditions' && $commande->brouillon) print 'id.'">'.img_edit($langs->trans('SetConditions'),1).' | '; + if ($action != 'editconditions' && ! empty($commande->brouillon)) print 'id.'">'.img_edit($langs->trans('SetConditions'),1).' | '; print '
| '; print $langs->trans('PaymentMode'); print ' | '; - if ($actionº != 'editmode' && $commande->brouillon) print 'id.'">'.img_edit($langs->trans('SetMode'),1).' | '; + if ($action != 'editmode' && ! empty($commande->brouillon)) print 'id.'">'.img_edit($langs->trans('SetMode'),1).' | '; print '