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

Merge branch 'NEW_user_date_employment' of github.com:atm-arnaud/dolibarr into HEAD

Browse Source 
Conflicts:
	htdocs/langs/en_US/users.lang
This commit is contained in:
arnaud 2016-09-27 15:25:29 +02:00
commit c904b8030c
6 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
View File

@ -33,6 +33,7 @@ DELETE FROM llx_menu where module='expensereport';
ALTER TABLE llx_user DROP COLUMN phenix_login;
ALTER TABLE llx_user DROP COLUMN phenix_pass;
ALTER TABLE llx_user ADD COLUMN dateemployment datetime;
ALTER TABLE llx_societe ADD COLUMN fk_account integer;

1
htdocs/install/mysql/tables/llx_user.sql
View File

@ -80,5 +80,6 @@ create table llx_user
tjm double(24,8),
salary double(24,8),
salaryextra double(24,8),
dateemployment datetime,
weeklyhours double(16,8)
)ENGINE=innodb;

3
htdocs/langs/en_US/users.lang
View File

@ -101,4 +101,5 @@ ColorUser=Color of the user
DisabledInMonoUserMode=Disabled in maintenance mode
UserAccountancyCode=User accountancy code
UserLogoff=User logout
UserLogged=User logged
UserLogged=User logged
DateEmployment=Date of Employment

1
htdocs/langs/fr_FR/users.lang
View File

@ -100,3 +100,4 @@ WeeklyHours=Heures de travail hebdomadaires
ColorUser=Couleur de l'utilisateur
DisabledInMonoUserMode=Désactivé en mode maintenance
UserAccountancyCode=Code comptable utilisateur
DateEmployment=Date d'embauche

25
htdocs/user/card.php
View File

@ -215,7 +215,9 @@ if (empty($reshook)) {
$object->salaryextra = GETPOST("salaryextra") != '' ? GETPOST("salaryextra") : '';
$object->weeklyhours = GETPOST("weeklyhours") != '' ? GETPOST("weeklyhours") : '';
$date = dol_mktime(0, 0, 0, GETPOST('dateemploymentmonth'), GETPOST('dateemploymentday'), GETPOST('dateemploymentyear'));
$object->color = GETPOST("color") != '' ? GETPOST("color") : '';
$object->dateemployment = $date != '' ? $date : '';
// Fill array 'array_options' with data from add form
$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
@ -357,6 +359,8 @@ if (empty($reshook)) {
$object->weeklyhours = GETPOST("weeklyhours") != '' ? GETPOST("weeklyhours") : '';
$object->color = GETPOST("color") != '' ? GETPOST("color") : '';
$date = dol_mktime(0, 0, 0, GETPOST('dateemploymentmonth'), GETPOST('dateemploymentday'), GETPOST('dateemploymentyear'));
$object->dateemployment = $date != '' ? $date : '';
if (! empty($conf->multicompany->enabled))
{
@ -1057,6 +1061,13 @@ if (($action == 'create') || ($action == 'adduserldap'))
print '<input size="8" type="text" name="weeklyhours" value="'.GETPOST('weeklyhours').'">';
print '</td>';
print "</tr>\n";
// Date employment
print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
print '<td>';
echo $form->select_date(GETPOST('dateemployment'),'dateemployment',0,0,1,'form'.'dateemployment',1,0,1);
print '</td>';
print "</tr>\n";
// Accountancy code
if ($conf->accounting->enabled)
@ -1412,6 +1423,13 @@ else
print '<td>'.$object->accountancy_code.'</td>';
}
// Date employment
print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
print '<td>';
print $object->dateemployment;
print '</td>';
print "</tr>\n";
print '</table>';
print '</div>';
@ -2186,6 +2204,13 @@ else
print '</td>';
print "</tr>\n";
// Date employment
print '<tr><td>'.$langs->trans("DateEmployment").'</td>';
print '<td>';
echo $form->select_date(GETPOST('dateemployment')?GETPOST('dateemployment'):$object->dateemployment,'dateemployment',0,0,1,'form'.'dateemployment',1,0,1);
print '</td>';
print "</tr>\n";
// Accountancy code
if ($conf->accounting->enabled)
{

12
htdocs/user/class/user.class.php
View File

@ -122,6 +122,8 @@ class User extends CommonObject
var $weeklyhours; // Weekly hours
var $color; // Define background color for user in agenda
var $dateemployment; // Define date of employment by company
/**
* Constructor de la classe
@ -187,6 +189,7 @@ class User extends CommonObject
$sql.= " u.salaryextra,";
$sql.= " u.weeklyhours,";
$sql.= " u.color,";
$sql.= " u.dateemployment,";
$sql.= " u.ref_int, u.ref_ext,";
$sql.= " c.code as country_code, c.label as country,";
$sql.= " d.code_departement as state_code, d.nom as state";
@ -286,6 +289,7 @@ class User extends CommonObject
$this->salaryextra = $obj->salaryextra;
$this->weeklyhours = $obj->weeklyhours;
$this->color = $obj->color;
$this->dateemployment = $obj->dateemployment;
$this->datec = $this->db->jdate($obj->datec);
$this->datem = $this->db->jdate($obj->datem);
@ -1260,6 +1264,7 @@ class User extends CommonObject
$this->town = empty($this->town)?'':$this->town;
$this->accountancy_code = trim($this->accountancy_code);
$this->color = empty($this->color)?'':$this->color;
$this->dateemployment = empty($this->dateemployment)?'':$this->dateemployment;
// Check parameters
if (! empty($conf->global->USER_MAIL_REQUIRED) && ! isValidEMail($this->email))
@ -1300,6 +1305,11 @@ class User extends CommonObject
$sql.= ", signature = '".$this->db->escape($this->signature)."'";
$sql.= ", accountancy_code = '".$this->db->escape($this->accountancy_code)."'";
$sql.= ", color = '".$this->db->escape($this->color)."'";
if (!empty($this->dateemployment)) {
$sql.= ", dateemployment = '".$this->db->idate($this->dateemployment)."'";
} else {
$sql.= ", dateemployment = NULL";
}
$sql.= ", note = '".$this->db->escape($this->note)."'";
$sql.= ", photo = ".($this->photo?"'".$this->db->escape($this->photo)."'":"null");
$sql.= ", openid = ".($this->openid?"'".$this->db->escape($this->openid)."'":"null");
@ -1311,7 +1321,7 @@ class User extends CommonObject
$sql.= ", weeklyhours= ".($this->weeklyhours != ''?"'".$this->db->escape($this->weeklyhours)."'":"null");
$sql.= ", entity = '".$this->db->escape($this->entity)."'";
$sql.= " WHERE rowid = ".$this->id;
dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql)