Commit Graph

331 Commits

Author SHA1 Message Date
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
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
Laurent Destailleur
8c1f271356 Maxi debug of module leave requests. 2015-12-24 12:37:38 +01:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Laurent Destailleur
55cb103ab0 Maxi debug of new module leave requests 2015-06-27 13:01:44 +02:00
Laurent Destailleur
b6efa5ed11 NEW Can upload files on leave requests. Use more standard permissions. 2015-06-27 11:45:23 +02:00
Laurent Destailleur
5975536fcf Support type of leave. 2015-06-21 23:25:01 +02:00
Laurent Destailleur
4f1538f502 Introduce table llx_c_holiday_type 2015-06-21 03:19:15 +02:00
Laurent Destailleur
e0d1cbeb16 Introduce table llx_c_holiday_type 2015-06-21 00:07:03 +02:00
Raphaël Doursenaud
3f9270ea78 Qual: added deprecation hinting
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Raphaël Doursenaud
5d2f081152 [Qual] Fixed HTML select form selected attribute
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9 [Qual] Fixed HTML input form checked attribute
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
2015-05-07 14:21:14 +02:00
aspangaro
d69f066735 QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
frederic34
f4161b457b Add dol_escape_htmltag and start to adapt boxes 2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3 Add tooltip in getNomUrl link 2015-01-20 21:40:33 +01:00
frederic34
60661ae948 Add some "classfortooltip" 2015-01-09 00:07:54 +01:00
Andrelec1
a9a8e9a73c Fix : more than 1000 holidays
Si il y a plus de 1000 jours de congés, le délimiteur des millier fais
bugger les calcule ...
2014-11-17 14:55:22 +01:00
Laurent Destailleur
445f696d28 Fix: Pb of object with wrong type. 2014-11-15 18:24:38 +01:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name"
everywhere.
2014-10-04 17:20:17 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
Laurent Destailleur
82921232f5 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/holiday/class/holiday.class.php
2014-08-06 09:27:01 +02:00
Laurent Destailleur
c781bb4d08 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/holiday/fiche.php
2014-08-06 09:12:29 +02:00
Laurent Destailleur
85748711b5 Fix: Table holiday_user was not initialized anymore.
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
2014-08-06 09:08:28 +02:00
Laurent Destailleur
4bd257f007 New: Work on type of leave. 2014-08-06 03:23:16 +02:00
Laurent Destailleur
83564b2b04 Fix: Table holiday_user was not initialized anymore. 2014-08-06 02:43:50 +02:00
Laurent Destailleur
75f01cbead Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/holiday/class/holiday.class.php
2014-08-06 01:50:22 +02:00
Laurent Destailleur
8f73c7a82a Fix: Remove debug 2014-08-06 01:49:22 +02:00
Laurent Destailleur
9b9e51d50f Fix: removed debug 2014-08-06 01:48:51 +02:00
Laurent Destailleur
277bfc8012 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-06 01:46:57 +02:00
Laurent Destailleur
168f71ac18 Fix: Log of leaves was broken on some mysql versions. 2014-08-06 01:45:58 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
fmarcet
ab57c236be New: Can have half day holiday
New: Add Spanish holidays
Fix: Holiday log shows nothing
2014-07-10 12:06:09 +02:00
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
88cd5dec40 More substitutions 2014-06-13 01:42:00 +02:00
Marcos García de La Fuente
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
774017672f Fix: Number of day calculation. Add PHPUnit case. 2014-03-05 20:52:27 +01:00
Laurent Destailleur
5501809844 Fix: sql compare on int must not contains quotes. 2014-02-12 18:47:16 +01:00
Alexis Algoud
d8e5fd20d2 In certain case, holiday_users won't be update (1 delete, 1 add for ex)
Add a fonction for count the real number of user without CP
2014-02-10 09:39:26 +01:00
Laurent Destailleur
3378855694 New: Can cancel holidays that were previously validated 2013-09-24 18:06:07 +02:00
Marcos García
896a60296c Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into holidays-improvements
Conflicts:
	htdocs/holiday/fiche.php
2013-05-06 17:22:31 +02:00
Marcos García
bbe1db0e9f Replaced addslashes with $this->db->escape 2013-05-06 17:13:43 +02:00
Marcos García
9935dad500 Wrong indentation 2013-05-06 17:04:15 +02:00
Marcos García
b830c1dd8c Removed "event" word from event description and changed ActionTypeCP to Description 2013-05-06 17:04:04 +02:00
Marcos García
b9429fc98e Fixed a bug when showing users to define holidays 2013-04-29 17:24:02 +02:00
Laurent Destailleur
80e470a4ce Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/fourn/facture/impayees.php
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
2013-04-28 01:24:58 +02:00