Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,329 Commits 36 Branches 189 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

258 Commits

Author SHA1 Message Date
Laurent Destailleur
10f2d7cd67 Fix Debug and minor fixes 2016-06-20 10:54:02 +02:00
Laurent Destailleur
9c3b9a8494 NEW: Link on user in leave context reach to leave tab. 2016-05-19 13:25:16 +02:00
Laurent Destailleur
e7072185ab Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/comm/propal.php
 2016-05-18 20:47:57 +02:00
Juanjo Menent
21b639ef16 Fix issues with entity control 2016-05-14 00:47:46 +02:00
Laurent Destailleur
1a883d870b Uniformize style 2016-04-23 17:35:33 +02:00
Scrutinizer Auto-Fixer
051ccf30a1 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-04-09 17:32:05 +00:00
Laurent Destailleur
c2fc9ecf68 Fix scrutinizer warning 2016-04-09 16:12:53 +02:00
Laurent Destailleur
e1bec46a34 FIX The include file for action on files should not be a template file 
but an action include file.
 2016-04-02 14:16:16 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function" 
This reverts commit 87cd6e1e40.
 2016-03-25 15:34:37 +01:00
Marcos García de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00
Laurent Destailleur
77ae5c668a Can see rest of available leaves request in read only mode if we don't 
have permission to edit.
 2016-03-14 21:31:22 +01:00
Laurent Destailleur
d4c6c4c140 NEW Holiday is a RH module. All RH module provides by default visilibity 
on users of its hierarchy.
 2016-03-14 21:22:49 +01:00
Laurent Destailleur
09a29322c3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/orderstoinvoice.php
	htdocs/public/demo/index.php
	htdocs/societe/commerciaux.php
 2016-03-08 17:40:21 +01:00
Regis Houssin
25686e82c9 Fix: best compatibility with multicompany and others security issue 2016-03-03 08:49:24 +01:00
Laurent Destailleur
9da0164d90 Uniformize code for lists 2016-02-07 15:50:48 +01:00
Laurent Destailleur
dbaa43f3be Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/holiday/card.php
	htdocs/holiday/list.php
	htdocs/user/card.php
 2016-01-23 11:45:39 +01:00
Laurent Destailleur
3903ced5b4 Fix: link to add at wrong place 2016-01-23 11:30:06 +01:00
Laurent Destailleur
627f606c4d Fix list of leave request was not showing label correctly. 2016-01-23 11:17:20 +01:00
Laurent Destailleur
2b96c8f205 FIX Noway to validate a leave request for some uer even if they have 
permission for.
 2016-01-23 11:05:06 +01:00
Laurent Destailleur
bf09800540 Fix function signature 2016-01-10 18:52:26 +01:00
Laurent Destailleur
aa0b002119 Fix #4354 2016-01-10 11:35:06 +01:00
Laurent Destailleur
fddd02eecc Complete fix #4354 2016-01-10 11:31:22 +01:00
Laurent Destailleur
a8758fa5b7 Bug war week-end: Fix a duplicate page on holiday, fix missing badge on 
some documents tabs.
 2016-01-09 01:54:46 +01:00
Laurent Destailleur
0d8788e552 FIX It was not possible to define if leave type need to be followed by a 
counter or not. Added also a message to ask user to finish setup if no
leave with counter was setup.
 2016-01-09 01:18:53 +01:00
Laurent Destailleur
2259cf2340 Merge remote-tracking branch 'origin/3.8' into develop 2016-01-08 14:49:00 +01:00
Laurent Destailleur
844e8bff83 Better fix for #4354 2016-01-08 14:22:21 +01:00
Laurent Destailleur
6a058edc23 Revert "Debug of module leave requests " 2016-01-08 14:15:22 +01:00
TBAI
f28ebefe93 Debug of module leave requests 
Cancel leave isn't possible if it has been validated
 2016-01-07 19:53:59 +01:00
TBAI
b2aa1f2115 Debug of module leave requests 
Cancel leave isn't possible if it has been validated
 2016-01-07 19:32:25 +01:00
Laurent Destailleur
b4d9f1bece Merge pull request #4338 from frederic34/patch-10 
FIX: Missing leave request type when calling function
 2016-01-07 00:07:29 +01:00
Frédéric FRANCE
4dacf462db Update card.php 2016-01-05 17:36:48 +01:00
Frédéric FRANCE
a0b3cdbd21 Update list.php 2016-01-05 17:33:54 +01:00
Laurent Destailleur
52cd5d505e Fix several bugs on css, translation or look 2016-01-01 23:44:23 +01:00
Laurent Destailleur
a4d5e022cf Fix pagination on limit failed when limit was forced on url 2015-12-24 12:52:11 +01:00
Laurent Destailleur
8c1f271356 Maxi debug of module leave requests. 2015-12-24 12:37:38 +01:00
philippe grand
8ccafc6e36 [Qual] Uniformize code 2015-12-11 09:54:30 +01:00
Laurent Destailleur
f73c059bc4 Merge pull request #4159 from belyas/develop 
addLogCP and updateSoledCP methodes throwing warnings when assigning leave for a user
 2015-12-06 14:44:46 +01:00
Laurent Destailleur
374480043e Add maxwidth300 on combo list for users and sale representatives 2015-12-06 00:37:58 +01:00
yassine belkaid
8c22274300 Fixed assigning exceptional leave for a user 2015-12-05 00:41:00 +00:00
Laurent Destailleur
480a398f36 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/holiday/card.php
	htdocs/resource/list.php
 2015-12-03 13:06:20 +01:00
Laurent Destailleur
88e76dcf64 Fix utf8 encoded twice 2015-11-28 14:40:23 +01:00
Laurent Destailleur
a6d8f943df Fix several bugs into leave requets module 2015-11-26 02:12:37 +01:00
aspangaro
258ac45519 Remove obsolete code 2015-11-17 22:14:39 +01:00
aspangaro
c7df6c15a2 Different display if employee mode 2015-11-17 21:22:45 +01:00
aspangaro
bedba7ffb7 HRM: add a mode 'employee' for development to show tab 2015-11-12 07:26:51 +01:00
Laurent Destailleur
f15425be52 Include the link "Back to list" on banner of all user tabs. 2015-11-04 15:45:35 +01:00
philippe grand
1762b3aaa7 [Qual] Uniformize code 2015-10-17 17:09:34 +02:00