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

Uniformize status & add price()

Browse Source
This commit is contained in:
aspangaro 2015-03-08 07:21:07 +01:00
parent 80ad1be820
commit f3258d59c6
9 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/compta/hrm.php
View File

@ -196,7 +196,7 @@ if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
{
$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, x.rowid, x.date_debut as date, x.tms as dm, x.total_ttc";
$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, x.rowid, x.date_debut as date, x.tms as dm, x.total_ttc, x.fk_statut as status";
$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as x, ".MAIN_DB_PREFIX."user as u";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE u.rowid = x.fk_user_author";
@ -218,7 +218,7 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("BoxTitleLastModifiedExpenses",min($max,$num)).'</td>';
print '<td align="right">'.$langs->trans("FeesAmount").'</td>';
print '<td align="right">'.$langs->trans("TotalTTC").'</td>';
print '<td align="right">'.$langs->trans("DateModificationShort").'</td>';
print '<td width="16">&nbsp;</td>';
print '</tr>';
@ -239,9 +239,9 @@ if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->lire
print '<tr '.$bc[$var].'>';
print '<td>'.$expensereportstatic->getNomUrl(1).'</td>';
print '<td>'.$userstatic->getNomUrl(1).'</td>';
print '<td align="right">'.$obj->total_ttc.'</td>';
print '<td align="right">'.price($obj->total_ttc).'</td>';
print '<td align="right">'.dol_print_date($db->jdate($obj->dm),'day').'</td>';
//print '<td>'.$expensereportstatic->LibStatut($obj->fk_statut,3).'</td>';
print '<td>'.$expensereportstatic->LibStatut($obj->status,3).'</td>';
print '</tr>';
$var=!$var;
$i++;

44
htdocs/expensereport/card.php
View File

@ -109,7 +109,7 @@ if ($action == 'add' && $user->rights->expensereport->creer)
$object->date_debut = $date_start;
$object->date_fin = $date_end;
$object->fk_c_expensereport_statuts = 1;
$object->fk_statut = 1;
$object->fk_c_paiement = GETPOST('fk_c_paiement','int');
$object->fk_user_validator = GETPOST('fk_user_validator','int');
$object->note_public = GETPOST('note_public');
@ -151,7 +151,7 @@ if ($action == 'update' && $user->rights->expensereport->creer)
$object->date_debut = $date_start;
$object->date_fin = $date_end;
if($object->fk_c_expensereport_statuts < 3)
if($object->fk_statut < 3)
{
$object->fk_user_validator = GETPOST('fk_user_validator','int');
}
@ -1197,7 +1197,7 @@ else
$head = expensereport_prepare_head($object);
if ($action == 'edit' && ($object->fk_c_expensereport_statuts < 3 || $object->fk_c_expensereport_statuts==99))
if ($action == 'edit' && ($object->fk_statut < 3 || $object->fk_statut==99))
{
print "<form name='update' action=\"".$_SERVER['PHP_SELF']."\" method=\"post\">\n";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@ -1205,7 +1205,7 @@ else
dol_fiche_head($head, 'card', $langs->trans("TripCard"), 0, 'trip');
if($object->fk_c_expensereport_statuts==99)
if($object->fk_statut==99)
{
print '<input type="hidden" name="action" value="updateFromRefuse">';
}
@ -1246,7 +1246,7 @@ else
print '</tr>';
}
if($object->fk_c_expensereport_statuts<3)
if($object->fk_statut<3)
{
print '<tr>';
print '<td>'.$langs->trans("VALIDATOR").'</td>'; // Approbator
@ -1275,7 +1275,7 @@ else
$userfee->fetch($object->fk_user_author);
print $userfee->getNomUrl(1);
print '</td></tr>';
if ($object->fk_c_expensereport_statuts==6)
if ($object->fk_statut==6)
{
print '<tr>';
print '<td>'.$langs->trans("AUTHORPAIEMENT").'</td>';
@ -1437,7 +1437,7 @@ else
print '<td>'.$langs->trans("DATE_SAVE").'</td>';
print '<td>'.dol_print_date($object->date_create,'dayhour').'</td></tr>';
print '</tr>';
if($object->fk_c_expensereport_statuts==6)
if($object->fk_statut==6)
{
print '<tr>';
print '<td>'.$langs->trans("AUTHORPAIEMENT").'</td>';
@ -1452,7 +1452,7 @@ else
print '</tr>';
}
if($object->fk_c_expensereport_statuts<3) // informed
if($object->fk_statut<3) // informed
{
print '<tr>';
print '<td>'.$langs->trans("VALIDATOR").'</td>';
@ -1465,7 +1465,7 @@ else
}
print '</td></tr>';
}
elseif($object->fk_c_expensereport_statuts==4)
elseif($object->fk_statut==4)
{
print '<tr>';
print '<td>'.$langs->trans("CANCEL_USER").'</span></td>';
@ -1504,7 +1504,7 @@ else
print '</tr>';
}
if($object->fk_c_expensereport_statuts==99 || !empty($object->detail_refuse))
if($object->fk_statut==99 || !empty($object->detail_refuse))
{
print '<tr>';
print '<td>'.$langs->trans("REFUSEUR").'</td>';
@ -1566,7 +1566,7 @@ else
print '<td style="text-align:right;">'.$langs->trans('AmountTTC').'</td>';
}
// Ajout des boutons de modification/suppression
if ($object->fk_c_expensereport_statuts < 2 || $object->fk_c_expensereport_statuts==99)
if ($object->fk_statut < 2 || $object->fk_statut==99)
{
print '<td style="text-align:right;"></td>';
}
@ -1609,7 +1609,7 @@ else
}
// Ajout des boutons de modification/suppression
if($object->fk_c_expensereport_statuts<2 OR $object->fk_c_expensereport_statuts==99)
if($object->fk_statut<2 OR $object->fk_statut==99)
{
print '<td style="text-align:right;" class="nowrap">';
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;rowid='.$objp->rowid.'#'.$objp->rowid.'">';
@ -1689,7 +1689,7 @@ else
//print '</div>';
// Add a line
if (($object->fk_c_expensereport_statuts==0 || $object->fk_c_expensereport_statuts==99) && $action != 'editline')
if (($object->fk_statut==0 || $object->fk_statut==99) && $action != 'editline')
{
print_fiche_titre($langs->trans("AddLine"),'','');
@ -1799,7 +1799,7 @@ if ($action != 'create' && $action != 'edit')
* ET fk_user_author == user courant
* Afficher : "Enregistrer" / "Modifier" / "Supprimer"
*/
if ($user->rights->expensereport->creer && $object->fk_c_expensereport_statuts==0)
if ($user->rights->expensereport->creer && $object->fk_statut==0)
{
if ($object->fk_user_author == $user->id)
{
@ -1825,7 +1825,7 @@ if ($action != 'create' && $action != 'edit')
* ET fk_user_author == user courant
* Afficher : "Enregistrer" / "Modifier" / "Supprimer"
*/
if($user->rights->expensereport->creer && $object->fk_c_expensereport_statuts==99)
if($user->rights->expensereport->creer && $object->fk_statut==99)
{
if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid)
{
@ -1845,7 +1845,7 @@ if ($action != 'create' && $action != 'edit')
}
}
if ($user->rights->expensereport->to_paid && $object->fk_c_expensereport_statuts==5)
if ($user->rights->expensereport->to_paid && $object->fk_statut==5)
{
if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid)
{
@ -1859,7 +1859,7 @@ if ($action != 'create' && $action != 'edit')
* ET fk_user_validator == user courant
* Afficher : "Valider" / "Refuser" / "Supprimer"
*/
if ($object->fk_c_expensereport_statuts == 2)
if ($object->fk_statut == 2)
{
if ($object->fk_user_author == $user->id)
{
@ -1868,7 +1868,7 @@ if ($action != 'create' && $action != 'edit')
}
}
if ($user->rights->expensereport->approve && $object->fk_c_expensereport_statuts == 2)
if ($user->rights->expensereport->approve && $object->fk_statut == 2)
{
//if($object->fk_user_validator==$user->id)
//{
@ -1895,7 +1895,7 @@ if ($action != 'create' && $action != 'edit')
* ET user à droit de "to_paid"
* Afficher : "Annuler" / "Payer" / "Supprimer"
*/
if ($user->rights->expensereport->to_paid && $object->fk_c_expensereport_statuts == 5)
if ($user->rights->expensereport->to_paid && $object->fk_statut == 5)
{
// Payer
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=paid&id='.$id.'">'.$langs->trans('TO_PAID').'</a>';
@ -1918,7 +1918,7 @@ if ($action != 'create' && $action != 'edit')
* ET user à droit "to_paid"
* Afficher : "Annuler"
*/
if ($user->rights->expensereport->approve && $user->rights->expensereport->to_paid && $object->fk_c_expensereport_statuts==6)
if ($user->rights->expensereport->approve && $user->rights->expensereport->to_paid && $object->fk_statut==6)
{
// Annuler
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&id='.$id.'">'.$langs->trans('Cancel').'</a>';
@ -1933,7 +1933,7 @@ if ($action != 'create' && $action != 'edit')
* ET user à droit "supprimer"
* Afficher : "Supprimer"
*/
if ($user->rights->expensereport->supprimer && $object->fk_c_expensereport_statuts==4)
if ($user->rights->expensereport->supprimer && $object->fk_statut==4)
{
if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid)
@ -1959,7 +1959,7 @@ print '<div style="width:50%">';
/*
* Documents generes
*/
if($user->rights->expensereport->export && $object->fk_c_expensereport_statuts>0 && $action != 'edit')
if($user->rights->expensereport->export && $object->fk_statut>0 && $action != 'edit')
{
$filename = dol_sanitizeFileName($object->ref);
$filedir = $conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref);

54
htdocs/expensereport/class/expensereport.class.php
View File

@ -43,7 +43,7 @@ class ExpenseReport extends CommonObject
var $fk_user_validator;
var $status;
var $fk_c_expensereport_statuts; // -- 1=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=payed, 99=denied
var $fk_statut; // -- 1=draft, 2=validated (attente approb), 4=canceled, 5=approved, 6=payed, 99=denied
var $fk_c_paiement;
var $user_author_infos;
@ -150,7 +150,7 @@ class ExpenseReport extends CommonObject
$sql.= ",date_create";
$sql.= ",fk_user_author";
$sql.= ",fk_user_validator";
$sql.= ",fk_c_expensereport_statuts";
$sql.= ",fk_statut";
$sql.= ",fk_c_paiement";
$sql.= ",note_public";
$sql.= ",note_private";
@ -164,7 +164,7 @@ class ExpenseReport extends CommonObject
$sql.= ", '".$this->db->idate($now)."'";
$sql.= ", ".($user->id > 0 ? $user->id:"null");
$sql.= ", ".($this->fk_user_validator > 0 ? $this->fk_user_validator:"null");
$sql.= ", ".($this->fk_c_expensereport_statuts > 1 ? $this->fk_c_expensereport_statuts:0);
$sql.= ", ".($this->fk_statut > 1 ? $this->fk_statut:0);
$sql.= ", ".($this->fk_c_paiement > 0 ? $this->fk_c_paiement:"null");
$sql.= ", ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null");
$sql.= ", ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null");
@ -248,7 +248,7 @@ class ExpenseReport extends CommonObject
$sql.= " , fk_user_validator = ".($this->fk_user_validator > 0 ? $this->fk_user_validator:"null");
$sql.= " , fk_user_valid = ".($this->fk_user_valid > 0 ? $this->fk_user_valid:"null");
$sql.= " , fk_user_paid = ".($this->fk_user_paid > 0 ? $this->fk_user_paid:"null");
$sql.= " , fk_c_expensereport_statuts = ".($this->fk_c_expensereport_statuts >= 0 ? $this->fk_c_expensereport_statuts:'0');
$sql.= " , fk_statut = ".($this->fk_statut >= 0 ? $this->fk_statut:'0');
$sql.= " , fk_c_paiement = ".($this->fk_c_paiement > 0 ? $this->fk_c_paiement:"null");
$sql.= " , note_public = ".(!empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"''");
$sql.= " , note_private = ".(!empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"''");
@ -284,7 +284,7 @@ class ExpenseReport extends CommonObject
$sql.= " d.date_refuse, d.date_cancel,"; // ACTIONS
$sql.= " d.total_ht, d.total_ttc, d.total_tva,"; // TOTAUX (int)
$sql.= " d.date_debut, d.date_fin, d.date_create, d.date_valid, d.date_approve, d.date_paiement,"; // DATES (datetime)
$sql.= " d.fk_user_author, d.fk_user_validator, d.fk_c_expensereport_statuts as status, d.fk_c_paiement,";
$sql.= " d.fk_user_author, d.fk_user_validator, d.fk_statut as status, d.fk_c_paiement,";
$sql.= " d.fk_user_valid, d.fk_user_approve, d.fk_user_paid,";
$sql.= " dp.libelle as libelle_paiement, dp.code as code_paiement"; // INNER JOIN paiement
$sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element." as d LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as dp ON d.fk_c_paiement = dp.id";
@ -335,18 +335,18 @@ class ExpenseReport extends CommonObject
if ($this->fk_user_validator > 0) $user_approver->fetch($this->fk_user_validator);
$this->user_validator_infos = dolGetFirstLastname($user_approver->firstname, $user_approver->lastname);
$this->fk_c_expensereport_statuts = $obj->status;
$this->fk_statut = $obj->status;
$this->status = $obj->status;
$this->fk_c_paiement = $obj->fk_c_paiement;
if ($this->fk_c_expensereport_statuts==5 || $this->fk_c_expensereport_statuts==6)
if ($this->fk_statut==5 || $this->fk_statut==6)
{
$user_valid = new User($this->db);
if ($this->fk_user_valid > 0) $user_valid->fetch($this->fk_user_valid);
$this->user_valid_infos = dolGetFirstLastname($user_valid->firstname, $user_valid->lastname);
}
if ($this->fk_c_expensereport_statuts==6)
if ($this->fk_statut==6)
{
$user_paid = new User($this->db);
if ($this->fk_user_paid > 0) $user_paid->fetch($this->fk_user_paid);
@ -514,7 +514,7 @@ class ExpenseReport extends CommonObject
$this->date_approve = $now;
$this->status = 5;
$this->fk_c_expensereport_statuts = 5;
$this->fk_statut = 5;
$this->fk_user_author = $user->id;
$this->fk_user_valid = $user->id;
@ -584,7 +584,7 @@ class ExpenseReport extends CommonObject
$objp = $db->fetch_object($result);
$sql2 = "SELECT d.rowid, d.fk_user_author, d.ref, d.fk_c_expensereport_statuts";
$sql2 = "SELECT d.rowid, d.fk_user_author, d.ref, d.fk_statut";
$sql2.= " FROM ".MAIN_DB_PREFIX."expensereport as d";
$sql2.= " WHERE d.rowid = '".$objp->fk_expensereport."'";
@ -593,7 +593,7 @@ class ExpenseReport extends CommonObject
$objp->fk_user_author = $obj->fk_user_author;
$objp->ref = $obj->ref;
$objp->fk_c_expensereport_status = $obj->fk_c_expensereport_statuts;
$objp->fk_c_expensereport_status = $obj->fk_statut;
$objp->rowid = $obj->rowid;
$total_HT = $total_HT + $objp->total_ht;
@ -848,10 +848,10 @@ class ExpenseReport extends CommonObject
$this->ref = strtoupper($user->login).$expld_car.$prefix.$this->ref.$expld_car.dol_print_date($this->date_debut,'%y%m%d');
}
if ($this->fk_c_expensereport_statuts != 2)
if ($this->fk_statut != 2)
{
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
$sql.= " SET ref = '".$this->ref."', fk_c_expensereport_statuts = 2, fk_user_valid = ".$user->id.",";
$sql.= " SET ref = '".$this->ref."', fk_statut = 2, fk_user_valid = ".$user->id.",";
$sql.= " ref_number_int = ".$ref_number_int;
$sql.= ' WHERE rowid = '.$this->id;
@ -894,10 +894,10 @@ class ExpenseReport extends CommonObject
$this->date_debut = $this->db->jdate($objp->date_debut);
if ($this->fk_c_expensereport_statuts != 2)
if ($this->fk_statut != 2)
{
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
$sql.= " SET fk_c_expensereport_statuts = 2";
$sql.= " SET fk_statut = 2";
$sql.= ' WHERE rowid = '.$this->id;
dol_syslog(get_class($this)."::set_save_from_refuse sql=".$sql, LOG_DEBUG);
@ -930,10 +930,10 @@ class ExpenseReport extends CommonObject
// date approval
$this->date_approve = $this->db->idate($now);
if ($this->fk_c_expensereport_statuts != 5)
if ($this->fk_statut != 5)
{
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
$sql.= " SET ref = '".$this->ref."', fk_c_expensereport_statuts = 5, fk_user_approve = ".$user->id.",";
$sql.= " SET ref = '".$this->ref."', fk_statut = 5, fk_user_approve = ".$user->id.",";
$sql.= " date_approve='".$this->date_approve."'";
$sql.= ' WHERE rowid = '.$this->id;
if ($this->db->query($sql))
@ -963,17 +963,17 @@ class ExpenseReport extends CommonObject
$now = dol_now();
// date de refus
if ($this->fk_c_expensereport_statuts != 99)
if ($this->fk_statut != 99)
{
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
$sql.= " SET ref = '".$this->ref."', fk_c_expensereport_statuts = 99, fk_user_refuse = ".$user->id.",";
$sql.= " SET ref = '".$this->ref."', fk_statut = 99, fk_user_refuse = ".$user->id.",";
$sql.= " date_refuse='".$this->db->idate($now)."',";
$sql.= " detail_refuse='".$this->db->escape($details)."'";
$sql.= " fk_user_approve=NULL,";
$sql.= ' WHERE rowid = '.$this->id;
if ($this->db->query($sql))
{
$this->fk_c_expensereport_statuts = 99;
$this->fk_statut = 99;
$this->fk_user_refuse = $user->id;
$this->detail_refuse = $details;
$this->date_refuse = $now;
@ -1002,10 +1002,10 @@ class ExpenseReport extends CommonObject
$now= dol_now();
$this->date_paiement = $this->db->idate($now);
if ($this->fk_c_expensereport_statuts != 6)
if ($this->fk_statut != 6)
{
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
$sql.= " SET fk_c_expensereport_statuts = 6, fk_user_paid = ".$user->id.",";
$sql.= " SET fk_statut = 6, fk_user_paid = ".$user->id.",";
$sql.= " date_paiement='".$this->db->idate($this->date_paiement)."'";
$sql.= ' WHERE rowid = '.$this->id;
@ -1037,7 +1037,7 @@ class ExpenseReport extends CommonObject
if ($this->fk_c_deplacement_statuts != 5)
{
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
$sql.= " SET fk_c_expensereport_statuts = 5";
$sql.= " SET fk_statut = 5";
$sql.= ' WHERE rowid = '.$this->id;
dol_syslog(get_class($this)."::set_unpaid sql=".$sql, LOG_DEBUG);
@ -1065,10 +1065,10 @@ class ExpenseReport extends CommonObject
function set_cancel($user,$detail)
{
$this->date_cancel = $this->db->idate(gmmktime());
if ($this->fk_c_expensereport_statuts != 4)
if ($this->fk_statut != 4)
{
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
$sql.= " SET fk_c_expensereport_statuts = 4, fk_user_cancel = ".$user->id;
$sql.= " SET fk_statut = 4, fk_user_cancel = ".$user->id;
$sql.= ", date_cancel='".$this->date_cancel."'";
$sql.= " ,detail_cancel='".$this->db->escape($detail)."'";
$sql.= ' WHERE rowid = '.$this->id;
@ -1197,7 +1197,7 @@ class ExpenseReport extends CommonObject
function updateline($rowid, $type_fees_id, $projet_id, $c_tva, $comments, $qty, $value_unit, $date, $expensereport_id)
{
if ($this->fk_c_expensereport_statuts==0 || $this->fk_c_expensereport_statuts==99)
if ($this->fk_statut==0 || $this->fk_statut==99)
{
$this->db->begin();
@ -1693,7 +1693,7 @@ class ExpenseReportLine
* @param int $useempty 1=Add empty line
* @return string HTML select with sattus
*/
function select_expensereport_statut($selected='',$htmlname='fk_c_expensereport_statuts',$useempty=1)
function select_expensereport_statut($selected='',$htmlname='fk_statut',$useempty=1)
{
global $db;

2
htdocs/expensereport/class/expensereportstats.class.php
View File

@ -59,7 +59,7 @@ class ExpenseReportStats extends Stats
$this->from = MAIN_DB_PREFIX.$object->table_element;
$this->field='total_ht';
$this->where = " fk_c_expensereport_statuts > 0 and date_valid > '2000-01-01'";
$this->where = " fk_statut > 0 and date_valid > '2000-01-01'";
//$this->where.= " AND entity = ".$conf->entity;
if ($this->socid)
{

6
htdocs/expensereport/index.php
View File

@ -142,7 +142,7 @@ $max=10;
$langs->load("boxes");
$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, d.rowid, d.date_debut as dated, d.date_fin as datef, d.date_create as dm, d.total_ht, d.total_ttc, d.fk_c_expensereport_statuts as fk_status";
$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, d.rowid, d.date_debut as dated, d.date_fin as datef, d.date_create as dm, d.total_ht, d.total_ttc, d.fk_statut as fk_status";
$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d, ".MAIN_DB_PREFIX."user as u";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE u.rowid = d.fk_user_author";
@ -186,8 +186,8 @@ if ($result)
print '<tr '.$bc[$var].'>';
print '<td>'.$expensereportstatic->getNomUrl(1).'</td>';
print '<td>'.$userstatic->getNomUrl(1).'</td>';
print '<td align="right">'.$obj->total_ht.'</td>';
print '<td align="right">'.$obj->total_ttc.'</td>';
print '<td align="right">'.price($obj->total_ht).'</td>';
print '<td align="right">'.price($obj->total_ttc).'</td>';
print '<td align="right">'.dol_print_date($db->jdate($obj->dm),'day').'</td>';
print '<td align="right">';
//print $obj->libelle;

4
htdocs/expensereport/list.php
View File

@ -85,7 +85,7 @@ $offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
$sql = "SELECT d.rowid, d.ref, d.total_ht, d.total_tva, d.total_ttc, d.fk_c_expensereport_statuts as status,";
$sql = "SELECT d.rowid, d.ref, d.total_ht, d.total_tva, d.total_ttc, d.fk_statut as status,";
$sql.= " d.date_debut, d.date_fin,";
$sql.= " u.rowid as id_user, u.firstname, u.lastname";
$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d";
@ -157,7 +157,7 @@ if ($month_start > 0) {
}
}
if (!empty($search_user) && $search_user > 0) $sql.= " AND d.fk_user_author = '".$search_user."'";
if($search_state != '') $sql.= " AND d.fk_c_expensereport_statuts = '$search_state'\n";
if($search_state != '') $sql.= " AND d.fk_statut = '$search_state'\n";
// RESTRICT RIGHTS
if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous))

4
htdocs/expensereport/synchro_compta.php
View File

@ -136,11 +136,11 @@ else:
print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("ViewAccountSynch").'">';
print "</form>";
$sql = "SELECT d.fk_bank_account, d.ref, d.rowid, d.date_valid, d.fk_user_author, d.total_ttc, d.integration_compta, d.fk_c_expensereport_statuts";
$sql = "SELECT d.fk_bank_account, d.ref, d.rowid, d.date_valid, d.fk_user_author, d.total_ttc, d.integration_compta, d.fk_statut";
$sql.= " ,CONCAT(u.firstname,' ',u.lastname) as declarant_NDF";
$sql.= " FROM ".MAIN_DB_PREFIX."expensereport as d";
$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON d.fk_user_author = u.rowid";
$sql.= " WHERE d.fk_c_expensereport_statuts = 6";
$sql.= " WHERE d.fk_statut = 6";
$sql.= " ORDER BY d.date_valid DESC";
$resql=$db->query($sql);

2
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
View File

@ -157,7 +157,7 @@ CREATE TABLE llx_expensereport (
fk_user_refuse integer DEFAULT NULL,
fk_user_cancel integer DEFAULT NULL,
fk_user_paid integer DEFAULT NULL,
fk_c_expensereport_statuts integer NOT NULL, -- 1=brouillon, 2=validé (attente approb), 4=annulé, 5=approuvé, 6=payed, 99=refusé
fk_statut integer NOT NULL, -- 1=brouillon, 2=validé (attente approb), 4=annulé, 5=approuvé, 6=payed, 99=refusé
fk_c_paiement integer DEFAULT NULL,
note_public text,
note_private text,

2
htdocs/install/mysql/tables/llx_expensereport.sql
View File

@ -44,7 +44,7 @@ CREATE TABLE llx_expensereport (
fk_user_refuse integer DEFAULT NULL,
fk_user_cancel integer DEFAULT NULL,
fk_user_paid integer DEFAULT NULL,
fk_c_expensereport_statuts integer NOT NULL, -- 1=brouillon, 2=validé (attente approb), 4=annulé, 5=approuvé, 6=payed, 99=refusé
fk_statut integer NOT NULL, -- 1=brouillon, 2=validé (attente approb), 4=annulé, 5=approuvé, 6=payed, 99=refusé
fk_c_paiement integer DEFAULT NULL,
note_public text,
note_private text,