';
-
+
if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
{
print '| '.($i+1).' | ';
}
// Ref
- if (! empty($arrayfields['d.ref']['checked']))
+ if (! empty($arrayfields['d.ref']['checked']))
{
print "";
print $memberstatic->getNomUrl(-1, 0, 'card', 'ref');
print " | \n";
- }
+ }
// Firstname
- if (! empty($arrayfields['d.firstname']['checked']))
+ if (! empty($arrayfields['d.firstname']['checked']))
{
print "";
print $obj->firstname;
print " | \n";
}
// Lastname
- if (! empty($arrayfields['d.lastname']['checked']))
+ if (! empty($arrayfields['d.lastname']['checked']))
{
print "";
print $obj->lastname;
print " | \n";
}
// Company
- if (! empty($arrayfields['d.company']['checked']))
+ if (! empty($arrayfields['d.company']['checked']))
{
print "";
print $companyname;
print " | \n";
}
// Login
- if (! empty($arrayfields['d.login']['checked']))
+ if (! empty($arrayfields['d.login']['checked']))
{
print "".$obj->login." | \n";
}
// Moral/Physique
- if (! empty($arrayfields['d.morphy']['checked']))
+ if (! empty($arrayfields['d.morphy']['checked']))
{
print "".$memberstatic->getmorphylib($obj->morphy)." | \n";
}
// Type label
- if (! empty($arrayfields['t.libelle']['checked']))
+ if (! empty($arrayfields['t.libelle']['checked']))
{
$membertypestatic->id=$obj->type_id;
$membertypestatic->libelle=$obj->type;
@@ -727,7 +739,7 @@ while ($i < min($num, $limit))
if (! $i) $totalarray['nbfield']++;
}
// Phone pro
- if (! empty($arrayfields['d.phone']['checked']))
+ if (! empty($arrayfields['d.phone']['checked']))
{
print '';
print $obj->phone;
@@ -735,7 +747,7 @@ while ($i < min($num, $limit))
if (! $i) $totalarray['nbfield']++;
}
// Phone perso
- if (! empty($arrayfields['d.phone_perso']['checked']))
+ if (! empty($arrayfields['d.phone_perso']['checked']))
{
print ' | ';
print $obj->phone_perso;
@@ -743,7 +755,7 @@ while ($i < min($num, $limit))
if (! $i) $totalarray['nbfield']++;
}
// Phone mobile
- if (! empty($arrayfields['d.phone_mobile']['checked']))
+ if (! empty($arrayfields['d.phone_mobile']['checked']))
{
print ' | ';
print $obj->phone_mobile;
@@ -756,7 +768,7 @@ while ($i < min($num, $limit))
print " | ".dol_print_email($obj->email,0,0,1)." | \n";
}
// End of subscription date
- $datefin=$db->jdate($obj->datefin);
+ $datefin=$db->jdate($obj->datefin);
if (! empty($arrayfields['d.datefin']['checked']))
{
if ($datefin)
@@ -832,22 +844,15 @@ while ($i < min($num, $limit))
}
// Action column
print '';
- if ($user->rights->adherent->creer)
- {
- print "rowid."&action=edit&backtopage=1\">".img_edit()."";
- }
- print ' ';
- if ($user->rights->adherent->supprimer && $obj->statut == -1)
- {
- print "rowid."&action=delete&backtopage=1\">".img_picto($langs->trans("Delete"),'disable.png')."";
- }
- if ($user->rights->adherent->supprimer && $obj->statut == 1)
- {
- print "rowid."&action=resign&backtopage=1\">".img_picto($langs->trans("Resiliate"),'disable.png')."";
- }
- print " | ";
- if (! $i) $totalarray['nbfield']++;
-
+ if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ {
+ $selected=0;
+ if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+ print '';
+ }
+ print '';
+ if (! $i) $totalarray['nbfield']++;
+
print "
\n";
$i++;
}
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index dbfeafc8f94..2f8810333f0 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -45,7 +45,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
$langs->loadLangs(array("orders",'sendings','deliveries','companies','compta','bills'));
-$action=GETPOST('action','alpha');
+$action=GETPOST('action','aZ09');
$massaction=GETPOST('massaction','alpha');
$show_files=GETPOST('show_files','int');
$confirm=GETPOST('confirm','alpha');
@@ -160,7 +160,7 @@ if (empty($reshook))
{
// Selection of new fields
include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
+
// Purge search criteria
if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
{
@@ -202,51 +202,51 @@ if (empty($reshook))
// TODO Move this into mass action include
if ($massaction == 'confirm_createbills') {
-
+
$orders = GETPOST('toselect');
$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
$validate_invoices = GETPOST('valdate_invoices', 'int');
-
+
$TFact = array();
$TFactThird = array();
-
+
$nb_bills_created = 0;
-
+
$db->begin();
-
+
foreach($orders as $id_order) {
-
+
$cmd = new Commande($db);
if($cmd->fetch($id_order) <= 0) continue;
-
+
$object = new Facture($db);
if(!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) $object = $TFactThird[$cmd->socid]; // If option "one bill per third" is set, we use already created order.
else {
-
+
$object->socid = $cmd->socid;
$object->type = Facture::TYPE_STANDARD;
$object->cond_reglement_id = $cmd->cond_reglement_id;
$object->mode_reglement_id = $cmd->mode_reglement_id;
$object->fk_project = $cmd->fk_project;
-
+
$datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
if (empty($datefacture))
{
$datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
}
-
+
$object->date = $datefacture;
$object->origin = 'commande';
$object->origin_id = $id_order;
-
+
$res = $object->create($user);
-
+
if($res > 0) $nb_bills_created++;
-
+
}
-
+
if($object->id > 0) {
-
+
$db->begin();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
$sql.= "fk_source";
@@ -259,7 +259,7 @@ if (empty($reshook))
$sql.= ", ".$object->id;
$sql.= ", '".$object->element."'";
$sql.= ")";
-
+
if ($db->query($sql))
{
$db->commit();
@@ -268,17 +268,17 @@ if (empty($reshook))
{
$db->rollback();
}
-
+
$lines = $cmd->lines;
if (empty($lines) && method_exists($cmd, 'fetch_lines'))
{
$cmd->fetch_lines();
$lines = $cmd->lines;
}
-
+
$fk_parent_line=0;
$num=count($lines);
-
+
for ($i=0;$i<$num;$i++)
{
$desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle);
@@ -367,43 +367,43 @@ if (empty($reshook))
$fk_parent_line = $result;
}
}
- }
-
+ }
+
}
-
+
$cmd->classifyBilled($user);
-
+
if(!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) $TFactThird[$cmd->socid] = $object;
else $TFact[$object->id] = $object;
}
-
+
// Build doc with all invoices
$TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
$toselect = array();
-
+
if(!empty($validate_invoices)) {
-
+
$massaction = $action = 'builddoc';
-
+
foreach($TAllFact as &$object) {
$object->validate($user);
$toselect[] = $object->id; // For builddoc action
-
+
// Fac builddoc
$upload_dir = $conf->facture->dir_output;
$permissioncreate=$user->rights->facture->creer;
include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
}
-
+
$objectclass='Facture';
$objectlabel='Invoice';
$permtoread = $user->rights->facture->lire;
$permtodelete = $user->rights->facture->supprimer;
$uploaddir = $conf->facture->dir_output;
include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-
+
}
-
+
if (! $error)
{
$db->commit();
@@ -418,7 +418,7 @@ if (empty($reshook))
setEventMessages($object->error, $object->errors, 'errors');
$error++;
}
- }
+ }
}
@@ -596,9 +596,9 @@ if ($resql)
$title.=' - '.$langs->trans('StatusOrderValidated').', '.(empty($conf->expedition->enabled)?'':$langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
$num = $db->num_rows($resql);
-
+
$arrayofselected=is_array($toselect)?$toselect:array();
-
+
$param='';
if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
@@ -629,7 +629,7 @@ if ($resql)
$tmpkey=preg_replace('/search_options_/','',$key);
if ($val != '') $param.='&search_options_'.$tmpkey.'='.urlencode($val);
}
-
+
// List of mass actions available
$arrayofmassactions = array(
'presend'=>$langs->trans("SendByMail"),
@@ -653,12 +653,12 @@ if ($resql)
print '';
@@ -839,27 +839,27 @@ if ($resql)
$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
-
+
print '
';
print '
'."\n";
print '';
// Ref
- if (! empty($arrayfields['c.ref']['checked']))
+ if (! empty($arrayfields['c.ref']['checked']))
{
print '| ';
print '';
print ' | ';
}
// Ref customer
- if (! empty($arrayfields['c.ref_client']['checked']))
+ if (! empty($arrayfields['c.ref_client']['checked']))
{
print '';
print '';
print ' | ';
}
// Thirpdarty
- if (! empty($arrayfields['s.nom']['checked']))
+ if (! empty($arrayfields['s.nom']['checked']))
{
print '';
print '';
@@ -899,7 +899,7 @@ if ($resql)
$formother->select_year($orderyear?$orderyear:-1,'orderyear',1, 20, 5);
print ' | ';
}
- if (! empty($arrayfields['c.date_delivery']['checked']))
+ if (! empty($arrayfields['c.date_delivery']['checked']))
{
print '';
if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '';
@@ -972,10 +972,10 @@ if ($resql)
{
print ' | ';
$liststatus=array(
- Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"),
- Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
- Commande::STATUS_ACCEPTED=>$langs->trans("StatusOrderSentShort"),
- Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"),
+ Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"),
+ Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
+ Commande::STATUS_ACCEPTED=>$langs->trans("StatusOrderSentShort"),
+ Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"),
Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceledShort")
);
print $form->selectarray('viewstatut', $liststatus, $viewstatut, -4);
@@ -993,7 +993,7 @@ if ($resql)
$searchpicto=$form->showFilterButtons();
print $searchpicto;
print ' | ';
-
+
print "
\n";
// Fields title
@@ -1014,9 +1014,9 @@ if ($resql)
// Extra fields
if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
{
- foreach($extrafields->attribute_label as $key => $val)
+ foreach($extrafields->attribute_label as $key => $val)
{
- if (! empty($arrayfields["ef.".$key]['checked']))
+ if (! empty($arrayfields["ef.".$key]['checked']))
{
$align=$extrafields->getAlignFlag($key);
print_liste_field_titre($langs->trans($extralabels[$key]),$_SERVER["PHP_SELF"],"ef.".$key,"",$param,($align?'align="'.$align.'"':''),$sortfield,$sortorder);
@@ -1033,20 +1033,20 @@ if ($resql)
if (! empty($arrayfields['c.facture']['checked'])) print_liste_field_titre($arrayfields['c.facture']['label'],$_SERVER["PHP_SELF"],'c.facture','',$param,'align="center"',$sortfield,$sortorder,'');
print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,'maxwidthsearch ');
print ''."\n";
-
+
$total=0;
$subtotal=0;
$productstat_cache=array();
-
+
$generic_commande = new Commande($db);
$generic_product = new Product($db);
-
+
$i=0;
$totalarray=array();
while ($i < min($num,$limit))
{
$obj = $db->fetch_object($resql);
-
+
print '';
$notshippable=0;
@@ -1054,7 +1054,7 @@ if ($resql)
$text_info='';
$text_warning='';
$nbprod=0;
-
+
// Ref
if (! empty($arrayfields['c.ref']['checked']))
{
@@ -1070,12 +1070,12 @@ if ($resql)
$generic_commande->total_ttc = $obj->total_ttc;
$generic_commande->lines=array();
$generic_commande->getLinesArray();
-
+
print '';
print '| ';
print $generic_commande->getNomUrl(1,($viewstatut != 2?0:$obj->fk_statut));
print ' | ';
-
+
// Show shippable Icon (create subloop, so may be slow)
if ($conf->stock->enabled)
{
@@ -1083,7 +1083,7 @@ if ($resql)
if (($obj->fk_statut > 0) && ($obj->fk_statut < 3))
{
$numlines = count($generic_commande->lines); // Loop on each line of order
- for ($lig=0; $lig < $numlines; $lig++)
+ for ($lig=0; $lig < $numlines; $lig++)
{
if ($generic_commande->lines[$lig]->product_type == 0 && $generic_commande->lines[$lig]->fk_product > 0) // If line is a product and not a service
{
@@ -1107,8 +1107,8 @@ if ($resql)
$text_info .= ' - '.$langs->trans("Stock").': '.$generic_product->stock_reel;
$text_info .= ' - '.$langs->trans("VirtualStock").': '.$generic_product->stock_theorique;
$text_info .= '
';
-
- if ($generic_commande->lines[$lig]->qty > $generic_product->stock_reel)
+
+ if ($generic_commande->lines[$lig]->qty > $generic_product->stock_reel)
{
$notshippable++;
}
@@ -1168,7 +1168,7 @@ if ($resql)
$text_info = $langs->trans('NonShippable').'
'.$text_info;
}
}
-
+
print '';
if ($nbprod)
{
@@ -1179,7 +1179,7 @@ if ($resql)
}
print ' | ';
}
-
+
// Warning late icon and note
print '';
if ($generic_commande->hasDelay()) {
@@ -1192,7 +1192,7 @@ if ($resql)
print '';
}
print ' | ';
-
+
print '';
$filename=dol_sanitizeFileName($obj->ref);
$filedir=$conf->commande->dir_output . '/' . dol_sanitizeFileName($obj->ref);
@@ -1200,11 +1200,11 @@ if ($resql)
print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
print ' | ';
print '
';
-
+
print '';
if (! $i) $totalarray['nbfield']++;
}
-
+
// Ref customer
if (! empty($arrayfields['c.ref_client']['checked']))
{
@@ -1222,7 +1222,7 @@ if ($resql)
{
print '';
print $companystatic->getNomUrl(1,'customer');
-
+
// If module invoices enabled and user with invoice creation permissions
if (! empty($conf->facture->enabled) && ! empty($conf->global->ORDER_BILLING_ALL_CUSTOMER))
{
@@ -1278,7 +1278,7 @@ if ($resql)
print ' | ';
if (! $i) $totalarray['nbfield']++;
}
-
+
// Order date
if (! empty($arrayfields['c.date_commande']['checked']))
{
@@ -1319,7 +1319,7 @@ if ($resql)
if (! $i) $totalarray['totalttcfield']=$totalarray['nbfield'];
$totalarray['totalttc'] += $obj->total_ttc;
}
-
+
// Extra fields
if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
{
@@ -1370,7 +1370,7 @@ if ($resql)
print ''.yn($obj->billed).' | ';
if (! $i) $totalarray['nbfield']++;
}
-
+
// Action column
print '';
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
@@ -1381,9 +1381,9 @@ if ($resql)
}
print ' | ';
if (! $i) $totalarray['nbfield']++;
-
+
print "
\n";
-
+
$total+=$obj->total_ht;
$subtotal+=$obj->total_ht;
$i++;
@@ -1416,14 +1416,14 @@ if ($resql)
}
$db->free($resql);
-
+
$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
$reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
-
+
print '
'."\n";
print '
';
-
+
print ''."\n";
if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
@@ -1433,18 +1433,18 @@ if ($resql)
*/
$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
$urlsource.=str_replace('&','&',$param);
-
+
$filedir=$diroutputmassaction;
$genallowed=$user->rights->commande->lire;
$delallowed=$user->rights->commande->supprimer;
-
+
print $formfile->showdocuments('massfilesarea_orders','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
}
else
{
print '
'.$langs->trans("ShowTempMassFilesArea").'';
}
-
+
}
else
{
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index fde828fd6d4..20b3d155a27 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -536,7 +536,7 @@ if (! $error && $massaction == 'delete' && $permtodelete)
$result=$objecttmp->fetch($toselectid);
if ($result > 0)
{
- if ($objecttmp->element == 'societe') $result = $objecttmp->delete($objecttmp->id, $user, 1);
+ if (in_array($objecttmp->element, array('societe','member'))) $result = $objecttmp->delete($objecttmp->id, $user, 1);
else $result = $objecttmp->delete($user);
if ($result <= 0)
{