kaos
f55bdc64bd
fixes #1300
2014-03-15 11:10:20 +01:00
kaos
1cb71674d7
fixes #1300
2014-03-15 11:06:50 +01:00
Laurent Destailleur
3378855694
New: Can cancel holidays that were previously validated
2013-09-24 18:06:07 +02:00
Laurent Destailleur
c151ef7b87
Qual: Remove duplicate form instanciation.
2013-09-06 12:10:09 +02:00
Raphaël Doursenaud
8e6860ac72
Fixed developer intent
2013-09-05 17:01:15 +02:00
Laurent Destailleur
ee890a87a3
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/prelevement/ligne.php
htdocs/langs/en_US/admin.lang
2013-05-14 01:15:05 +02:00
Marcos García
c61f48a98f
Added missing translation in holidays module
2013-05-12 11:36:49 +02:00
Laurent Destailleur
6c4e47514d
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
htdocs/holiday/fiche.php
2013-05-11 15:26:24 +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
bd9849c1aa
Fixed bug with holidays log
2013-05-06 17:15:49 +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
d0635901a6
Fixed bug with holidays log
2013-05-06 16:45:03 +02:00
Laurent Destailleur
cd6ceaf3f4
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/holiday/fiche.php
2013-04-29 19:04:15 +02:00
simnandez
fd85755461
Fix: [ bug #855 ] Holiday approval email in French
2013-04-29 12:55:14 +02:00
simnandez
00adb1b9ab
Fix: [ bug #855 ] Holiday approval email in French
2013-04-29 12:46:07 +02:00
Marcos García
54fc731df7
Fix: [bug #856 ] Mail error if destination user doesn't have an email
2013-04-28 01:58:57 +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
simnandez
d982148b7b
Fix: [ bug #855 ] Holiday approval email in French
2013-04-27 17:20:02 +02:00
Marcos García
bd2b363e40
Modified traslation keys to reflect expected translation
2013-04-27 14:50:14 +02:00
Marcos García
0ac7696bc0
Improved holidays module translations
...
Conflicts:
htdocs/holiday/fiche.php
htdocs/langs/fr_FR/holiday.lang
2013-04-15 09:29:26 +02:00
Marcos García
6d896a8558
Improved holidays module translations
2013-04-15 00:53:06 +02:00
Laurent Destailleur
2f5709e3cb
Fix: Some fix into holiday module
2013-04-14 01:21:54 +02:00
Laurent Destailleur
bda39f25bf
New: Default aprrover for holidays i sby default hierchical parent.
2013-04-14 01:04:11 +02:00
Laurent Destailleur
5bc66318c2
New: use dolGetFirstLastname() everywher we should.
2013-03-11 15:54:01 +01:00
Grand Philippe
4f9f32eb3e
english language standardization
2013-02-23 16:37:17 +01:00
Laurent Destailleur
d11cee399a
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
COPYRIGHT
htdocs/core/tpl/freeproductline_create.tpl.php
htdocs/core/tpl/predefinedproductline_create.tpl.php
htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0
Prepare move to other licence. For the moment all answers for licence
...
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Regis Houssin
9812c91aff
Fix: wrong EOL !!!!!!!
2013-01-10 08:27:12 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694
Fix: change for a neutral email
2012-12-30 15:11:07 +01:00
Laurent Destailleur
5dfefa1313
Fix: doxygen
2012-12-20 20:16:10 +01:00
Laurent Destailleur
e39ec132e5
Fix: Checkstyle
2012-12-19 20:59:08 +01:00
Laurent Destailleur
4cc44292e7
Fix: Maxi debug of holiday module
2012-12-18 13:12:11 +01:00
Regis Houssin
00aa22e1d7
Fix: wrong EOL
2012-12-02 11:03:23 +01:00
Laurent Destailleur
4136c27516
RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50
...
commits !
2012-12-01 15:45:05 +01:00
Laurent Destailleur
ddb3cf6f42
Fix: Debug holiday module
2012-11-20 13:14:16 +01:00
Regis Houssin
2d5368e135
Fix: converting line delimiters
2012-11-20 12:11:19 +01:00
Laurent Destailleur
19b7cc66d5
Qual: Remove hidden option so is not efficient and not used files.
...
Qual: Uniformize code
2012-11-17 11:48:51 +01:00
Laurent Destailleur
7c78e1c0f6
Doxygen and normalize code.
...
New: add more PHPUnit
2012-11-15 14:52:19 +01:00
Regis Houssin
474b68b3e4
Fix: strict mode mother
2012-11-14 11:29:22 +01:00
Regis Houssin
bcf46d00f0
Fix: convert line delimiters !!
2012-09-30 21:26:58 +02:00
Laurent Destailleur
7d83fdce5b
Fix: Several fixes into date functions
...
Qual: Add PHPUnit tests
2012-09-24 21:37:19 +02:00
Regis Houssin
ee1cf819f7
Fix: mass convert line delimiters
2012-09-07 17:23:16 +02:00
Laurent Destailleur
055bb7a9b8
Fix: Restore correct includes.
...
All entry pages must start with a require main.inc.php, except command
line script that start with master.inc.php.
To avoid errors into jenkins, we must exclude file common.inc.php.
All files ending *.inc.php must be excluded from jenkins because such
files are not "start/entry pages". That's the difference with
standard files *.php.
*.php
2012-09-06 10:39:25 +02:00
Regis Houssin
c99e730e0c
Fix: last try before asylum
2012-09-06 09:27:23 +02:00
Regis Houssin
9e4ff47711
Fix: bad path
2012-09-06 08:52:31 +02:00
Regis Houssin
0b057a071a
Fix: for avoid phpunit errors
2012-09-06 08:24:29 +02:00
Laurent Destailleur
84438d82f4
Qual: Clean module
2012-09-05 12:59:33 +02:00
Laurent Destailleur
e441b246a8
Debug of holiday module
2012-09-05 03:57:26 +02:00
Laurent Destailleur
246f3b5bb8
New: Add the holiday module (provided by teclib with permission to add
...
it by default).
2012-09-05 03:26:57 +02:00
