';
print '';
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index fcdda5eaaa1..3eeef6916eb 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -553,146 +553,19 @@ else if ($action == 'setstatut' && $user->rights->propal->cloturer && ! GETPOST(
}
}
-// Add file in email form
-if (GETPOST('addfile')) {
- 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';
-
- dol_add_file_process($upload_dir_tmp, 0, 0);
- $action = 'presend';
-}
-
-// Remove file in email form
-if (GETPOST('removedfile')) {
- 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';
-
- // TODO Delete only files that was uploaded from email form
- dol_remove_file_process($_POST['removedfile'], 0);
- $action = 'presend';
-}
/*
* Send mail
*/
-if ($action == 'send' && ! GETPOST('addfile') && ! GETPOST('removedfile') && ! GETPOST('cancel')) {
- $langs->load('mails');
- if ($object->id > 0) {
- 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->thirdparty->email;
- $sendtoid = 0;
- } else // Id du contact
- {
- $sendto = $object->thirdparty->contact_get_property($_POST['receiver'], 'email');
- $sendtoid = $_POST['receiver'];
- }
- }
+// Actions to send emails
+$actiontypecode='AC_PROP';
+$trigger_name='PROPAL_SENTBYMAIL';
+$paramname='id';
+$mode='emailfromproposal';
+include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
- if (dol_strlen($sendto)) {
- $langs->load("commercial");
- $from = $_POST['fromname'] . ' <' . $_POST['frommail'] . '>';
- $replyto = $_POST['replytoname'] . ' <' . $_POST['replytomail'] . '>';
- $message = $_POST['message'];
- $sendtocc = $_POST['sendtocc'];
- $sendtobcc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO);
- $deliveryreceipt = $_POST['deliveryreceipt'];
-
- if (dol_strlen($_POST['subject']))
- $subject = $_POST['subject'];
- else
- $subject = $langs->transnoentities('Propal') . ' ' . $object->ref;
- $actiontypecode = 'AC_PROP';
- $actionmsg = $langs->transnoentities('MailSentBy') . ' ' . $from . ' ' . $langs->transnoentities('To') . ' ' . $sendto;
- if ($message) {
- if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc);
- $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject);
- $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":");
- $actionmsg = dol_concatdesc($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'];
-
- // Envoi de la propal
- require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
- $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, - 1);
- if ($mailfile->error) {
- setEventMessage($mailfile->error, 'errors');
- } else {
- $result = $mailfile->sendfile();
- if ($result) {
- // 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('PROPAL_SENTBYMAIL', $object, $user, $langs, $conf);
- if ($result < 0) {
- $error++;
- $object->errors = $interface->errors;
- }
- // Fin appel triggers
-
- if (! $error) {
- // Redirect here
- // This avoid sending mail twice if going out and then back to page
- $mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($from, 2), $mailfile->getValidAddress($sendto, 2));
- setEventMessage($mesg);
- header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
- exit();
- } else {
- dol_print_error($db);
- }
- } else {
- $langs->load("other");
- if ($mailfile->error) {
- $mesg .= $langs->trans('ErrorFailedToSendMail', $from, $sendto);
- $mesg .= ' ';
$formpropal->selectProposalStatus($viewstatut,1);
print ' ';
- print '';
+ print ' ';
print "'.$options_from.' ';
print ' ';
- print $langs->trans("To").' '.$options_to.' ';
+ print $langs->trans("to").' '.$options_to.' ';
print '';
@@ -378,9 +392,9 @@ if ($resql)
print '';
// Print the search button
- print '';
- print ' ';
+ print '';
print '';
- print ' ';
print '';
- print ' ';
print '';
- print ' ';
- print '';
+ print ' ';
if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ' ';
+ print ' ';
if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ' ';
- print ' ';
- print ' ';
+ print '';
+ print ' ';
+ print '';
+ print ' ';
print dol_print_date($db->jdate($objp->date_commande), 'day');
print ' ';
// Delivery date
- print '';
+ print ' ';
print dol_print_date($db->jdate($objp->date_livraison), 'day');
print ' ';
diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php
index 25b7d91a3ff..1e8196481e6 100644
--- a/htdocs/compta/bank/search.php
+++ b/htdocs/compta/bank/search.php
@@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
$langs->load("banks");
$langs->load("categories");
$langs->load("companies");
+$langs->load("margins");
// Security check
if ($user->societe_id) $socid=$user->societe_id;
@@ -72,6 +73,15 @@ $limit = $conf->liste_limit;
if (! $sortorder) $sortorder='DESC';
if (! $sortfield) $sortfield='b.dateo';
+if (GETPOST("button_removefilter"))
+{
+ $description="";
+ $type="";
+ $debit="";
+ $credit="";
+ $account="";
+ $bid="";
+}
/*
* View
@@ -198,7 +208,7 @@ if ($resql)
print ' ';
print ' ';
print '';
- $form->select_types_paiements(empty($_REQUEST["type"])?'':$_REQUEST["type"], 'type', '', 2, 0, 1, 8);
+ $form->select_types_paiements(empty($type)?'':$type, 'type', '', 2, 0, 1, 8);
print ' ';
print '';
@@ -214,9 +224,9 @@ if ($resql)
print ' ';
print ' ';
- print '';
+ print '";
print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"d.rowid","","&socid=$socid",'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"d.type","","&socid=$socid",'',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"d.dated","","&socid=$socid",'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"d.dated","","&socid=$socid",'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Person"),$_SERVER["PHP_SELF"],"u.lastname","","&socid=$socid",'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&socid=$socid",'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("FeesKilometersOrAmout"),$_SERVER["PHP_SELF"],"d.km","","&socid=$socid",'align="right"',$sortfield,$sortorder);
@@ -107,24 +145,27 @@ if ($resql)
// Filters lines
print ' ';
print '';
- print ' ';
print '';
- //print ' ';
+ print '';
+ if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ' ';
print '';
- //print ' ';
- print '';
- print ' ';
+ print ' ';
+ print ' ';
print '';
- print ' ';
- print ' ';
- print '';
- print ' ';
+ // print ' ';
print ' \n";
$var=true;
@@ -142,9 +183,9 @@ if ($resql)
// Type
print ''.$langs->trans($obj->type).' ';
// Date
- print ''.dol_print_date($db->jdate($obj->dd),'day').' ';
+ print ''.dol_print_date($db->jdate($obj->dd),'day').' ';
// User
- print '';
+ print ' ';
$userstatic->id = $obj->rowid;
$userstatic->lastname = $obj->lastname;
$userstatic->firstname = $obj->firstname;
diff --git a/htdocs/compta/dons/list.php b/htdocs/compta/dons/list.php
index badc71c96e2..174b5357bb2 100644
--- a/htdocs/compta/dons/list.php
+++ b/htdocs/compta/dons/list.php
@@ -43,12 +43,20 @@ if (! $sortfield) $sortfield="d.datedon";
$limit = $conf->liste_limit;
$statut=isset($_GET["statut"])?$_GET["statut"]:"-1";
-$search_ref=GETPOST('search_ref');
-$search_company=GETPOST('search_company');
-$search_name=GETPOST('search_name');
+$search_ref=GETPOST('search_ref','alpha');
+$search_company=GETPOST('search_company','alpha');
+$search_name=GETPOST('search_name','alpha');
+$search_amount = GETPOST('search_amount','alpha');
if (!$user->rights->don->lire) accessforbidden();
+if (GETPOST("button_removefilter"))
+{
+ $search_ref="";
+ $search_company="";
+ $search_name="";
+ $search_amount="";
+}
/*
* View
@@ -82,6 +90,8 @@ if (trim($search_name) != '')
{
$sql .= natural_search(array('d.lastname', 'd.firstname'), $search_name);
}
+if ($search_amount) $sql.=" AND d.amount='".$db->escape(price2num(trim($search_amount)))."'";
+
$sql.= $db->order($sortfield,$sortorder);
$sql.= $db->plimit($limit+1, $offset);
@@ -141,11 +151,10 @@ if ($resql)
print ' ';
print ' ';
}
- print '';
- print ' ';
- print ' ';
+ print '';
print '';
+$max=10;
$sql = "SELECT bc.rowid, bc.date_bordereau as db, bc.amount, bc.number as ref";
$sql.= ", bc.statut, bc.nbcheque";
@@ -98,8 +99,8 @@ $sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc";
$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
$sql.= " WHERE ba.rowid = bc.fk_bank_account";
$sql.= " AND bc.entity = ".$conf->entity;
-$sql.= " ORDER BY bc.rowid";
-$sql.= " DESC LIMIT 10";
+$sql.= " ORDER BY bc.date_bordereau DESC, rowid DESC";
+$sql.= $db->plimit($max);
$resql = $db->query($sql);
@@ -107,7 +108,7 @@ if ($resql)
{
print '
';
print '';
- print ''.$langs->trans("CheckReceiptShort").' ';
+ print ''.$langs->trans("LastCheckReceiptShort",$max).' ';
print ''.$langs->trans("Date")." ";
print ''.$langs->trans("Account").' ';
print ''.$langs->trans("NbOfCheques").' ';
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 1699656acb1..47a6ee8ba74 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -38,6 +38,9 @@ $langs->load("bills");
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'banque', '','');
+$search_ref = GETPOST('search_ref','int');
+$search_account = GETPOST('search_account','int');
+$search_amount = GETPOST('search_amount','alpha');
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
@@ -57,6 +60,16 @@ $formother = new FormOther($db);
$checkdepositstatic=new RemiseCheque($db);
$accountstatic=new Account($db);
+// If click on purge search criteria ?
+if (GETPOST("button_removefilter_x"))
+{
+ $search_ref='';
+ $search_amount='';
+ $search_account='';
+ $year='';
+ $month='';
+}
+
/*
* View
*/
@@ -72,9 +85,9 @@ $sql.= " WHERE bc.fk_bank_account = ba.rowid";
$sql.= " AND bc.entity = ".$conf->entity;
// Search criteria
-if (GETPOST("search_ref")) $sql.=" AND bc.number=".GETPOST("search_ref",'int');
-if (GETPOST("search_account") > 0) $sql.=" AND bc.fk_bank_account=".GETPOST("search_account",'int');
-if (GETPOST("search_amount")) $sql.=" AND bc.amount=".price2num(GETPOST("search_amount"));
+if ($search_ref) $sql.=" AND bc.number=".$search_ref;
+if ($search_account > 0) $sql.=" AND bc.fk_bank_account=".$search_account;
+if ($search_amount) $sql.=" AND bc.amount='".$db->escape(price2num(trim($search_amount)))."'";
if ($month > 0)
{
if ($year > 0 && empty($day))
@@ -103,7 +116,7 @@ if ($resql)
print_barre_liste($langs->trans("MenuChequeDeposits"), $page, $_SERVER["PHP_SELF"], $params, $sortfield, $sortorder, '', $num);
- print '';
}
@@ -229,13 +230,20 @@ if ($id)
if ($action == '')
{
- if ($bon->statut == 2 && $lipre->statut == 2 && $user->rights->prelevement->bons->credit)
+ if ($bon->statut == 2 && $lipre->statut == 2)
{
- print "id\">".$langs->trans("StandingOrderReject")." ";
+ if ($user->rights->prelevement->bons->credit)
+ {
+ print "id\">".$langs->trans("StandingOrderReject")." ";
+ }
+ else
+ {
+ print "trans("NotAllowed")."\">".$langs->trans("StandingOrderReject")." ";
+ }
}
else
{
- print "".$langs->trans("StandingOrderReject")." ";
+ print "trans("NotPossibleForThisStatusOfWithdrawReceiptORLine")."\">".$langs->trans("StandingOrderReject")." ";
}
}
@@ -256,7 +264,7 @@ if ($id)
* Liste des factures
*/
$sql = "SELECT pf.rowid";
- $sql.= " ,f.rowid as facid, f.facnumber as ref, f.total_ttc";
+ $sql.= " ,f.rowid as facid, f.facnumber as ref, f.total_ttc, f.paye, f.fk_statut";
$sql.= " , s.rowid as socid, s.nom as name";
$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
$sql.= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
@@ -287,7 +295,7 @@ if ($id)
print"\n\n";
print '';
print '';
- print ''.$langs->trans("Invoice").' '.$langs->trans("ThirdParty").' '.$langs->trans("Amount").' ';
+ print ''.$langs->trans("Invoice").' '.$langs->trans("ThirdParty").' '.$langs->trans("Amount").' '.$langs->trans("Status").' ';
print ' ';
$var=True;
@@ -312,6 +320,11 @@ if ($id)
print ''.price($obj->total_ttc)." \n";
+ print '';
+ $invoicestatic->fetch($obj->facid);
+ print $invoicestatic->getLibStatut(5);
+ print " \n";
+
print "\n";
$i++;
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 10fb995c023..0a68aa686ae 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -42,10 +42,10 @@ $result = restrictedArea($user, 'prelevement','','','bons');
$page = GETPOST('page','int');
$sortorder = ((GETPOST('sortorder','alpha')=="")) ? "DESC" : GETPOST('sortorder','alpha');
$sortfield = ((GETPOST('sortfield','alpha')=="")) ? "p.datec" : GETPOST('sortfield','alpha');
-$search_line = GETPOST('search_ligne','alpha');
+$search_line = GETPOST('search_line','alpha');
$search_bon = GETPOST('search_bon','alpha');
$search_code = GETPOST('search_code','alpha');
-$search_societe = GETPOST('search_societe','alpha');
+$search_company = GETPOST('search_company','alpha');
$statut = GETPOST('statut','int');
$bon=new BonPrelevement($db,"");
@@ -53,7 +53,14 @@ $ligne=new LignePrelevement($db,$user);
$offset = $conf->liste_limit * $page ;
-
+if (GETPOST("button_removefilter"))
+{
+ $search_line="";
+ $search_bon="";
+ $search_code="";
+ $search_company="";
+ $statut="";
+}
/*
* View
@@ -88,9 +95,9 @@ if ($search_code)
{
$sql.= " AND s.code_client LIKE '%".$db->escape($search_code)."%'";
}
-if ($search_societe)
+if ($search_company)
{
- $sql .= " AND s.nom LIKE '%".$db->escape($search_societe)."%'";
+ $sql .= " AND s.nom LIKE '%".$db->escape($search_company)."%'";
}
$sql.=$db->order($sortfield,$sortorder);
$sql.=$db->plimit($conf->liste_limit+1, $offset);
@@ -122,15 +129,17 @@ if ($result)
print '';
$var=True;
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 1fecc0e1c28..b586241c11e 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -560,7 +560,7 @@ print ' ';
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
- print '';
+ print ' ';
print '';
print $annee;
if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee+1);
@@ -571,7 +571,7 @@ print ''.$langs->trans("Month").
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
print ' '.$langs->trans("Outcome").' ';
- print ''.$langs->trans("Income").' ';
+ print ''.$langs->trans("Income").' ';
}
print ' ";
- print ' ';
+ print ' ';
//if (isset($encaiss_ttc[$case]) && $encaiss_ttc[$case] != 0)
if (isset($encaiss_ttc[$case]))
{
@@ -623,7 +623,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
$nbcols+=2;
print ' '.(isset($totsorties[$annee])?price(price2num($totsorties[$annee],'MT')):' ').' ';
- print ''.(isset($totentrees[$annee])?price(price2num($totentrees[$annee],'MT')):' ').' ';
+ print ''.(isset($totentrees[$annee])?price(price2num($totentrees[$annee],'MT')):' ').' ';
}
print "'.$langs->trans("Profit").' ';
for ($annee = $year_start ; $annee <= $year_end ; $annee++)
{
- print ' ';
+ print ' ';
if (isset($totentrees[$annee]) || isset($totsorties[$annee]))
{
$in=(isset($totentrees[$annee])?price2num($totentrees[$annee], 'MT'):0);
diff --git a/htdocs/compta/salaries/index.php b/htdocs/compta/salaries/index.php
index b2fc3e1b4a3..17c3efdbfaa 100644
--- a/htdocs/compta/salaries/index.php
+++ b/htdocs/compta/salaries/index.php
@@ -33,6 +33,9 @@ $socid = GETPOST("socid","int");
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'salaries', '', '', '');
+$search_ref = GETPOST('search_ref','int');
+$search_label = GETPOST('search_label','alpha');
+$search_amount = GETPOST('search_amount','alpha');
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
$page = GETPOST("page",'int');
@@ -61,6 +64,14 @@ else
$typeid=$_REQUEST['typeid'];
}
+if (GETPOST("button_removefilter"))
+{
+ $search_ref="";
+ $search_label="";
+ $search_amount="";
+ $typeid="";
+}
+
/*
* View
*/
@@ -78,8 +89,11 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON s.fk_typepayment = pst
$sql.= " ".MAIN_DB_PREFIX."user as u";
$sql.= " WHERE u.rowid = s.fk_user";
$sql.= " AND s.entity = ".$conf->entity;
-if (GETPOST("search_label")) $sql.=" AND s.label LIKE '%".$db->escape(GETPOST("search_label"))."%'";
-if (GETPOST("search_amount")) $sql.=" AND s.amount = ".price2num(GETPOST("search_amount"));
+
+// Search criteria
+if ($search_ref) $sql.=" AND s.rowid=".$search_ref;
+if ($search_label) $sql.=" AND s.label LIKE '%".$db->escape($search_label)."%'";
+if ($search_amount) $sql.=" AND s.amount='".$db->escape(price2num(trim($search_amount)))."'";
if ($filtre) {
$filtre=str_replace(":","=",$filtre);
$sql .= " AND ".$filtre;
@@ -118,19 +132,23 @@ if ($result)
print " ';
+ // Ref
+ print '';
+ print ' ';
print ' ';
- print ' ';
- print ' ';
// Type
print '';
$form->select_types_paiements($typeid,'typeid','',0,0,1,16);
print ' ';
- print '';
- print ' ';
- print " \n";
+ // Amount
+ print '