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 |
|
Marcos García
|
0672d10a3f
|
Fixed typos
|
2013-04-27 14:54:03 +02:00 |
|
Marcos García
|
bd2b363e40
|
Modified traslation keys to reflect expected translation
|
2013-04-27 14:50:14 +02:00 |
|
Marcos García
|
652e0c1b5f
|
Corrected translation key
|
2013-04-26 17:19: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 |
|
fhenry
|
275bf67bb7
|
[ task #811 ] Uniformanize note field
|
2013-04-09 17:18:07 +02:00 |
|
Laurent Destailleur
|
89365786a8
|
New: enhance tool fixdosfiles.sh
Convert DOS files to unix
|
2013-03-30 14:27:13 +01:00 |
|
Maxime Kohlhaas
|
2309a4b81b
|
Fix : on holiday list on a specific user, user and validator were not displayed
|
2013-03-29 18:56:01 +01:00 |
|
Laurent Destailleur
|
3e5ee3b00a
|
Fix: PHPUnit tests are back.
|
2013-03-09 18:55:57 +01:00 |
|
Laurent Destailleur
|
5fb4ec7891
|
Fix: bad field name
|
2013-03-01 23:14:28 +01:00 |
|
Grand Philippe
|
6adc9eb7f2
|
english language standardization
|
2013-02-23 17:40:28 +01:00 |
|
Laurent Destailleur
|
6bbac00c22
|
Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/user/fiche.php
|
2013-02-12 15:17:22 +01:00 |
|
Laurent Destailleur
|
72c5652a4a
|
Fix: Holiday module update always done
|
2013-02-01 10:13:42 +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
|
4cc44292e7
|
Fix: Maxi debug of holiday module
|
2012-12-18 13:12:11 +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
|
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 |
|
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
|
28e7b73d21
|
Enhancement of holiday module
|
2012-09-06 23:58:09 +02:00 |
|
Laurent Destailleur
|
84438d82f4
|
Qual: Clean module
|
2012-09-05 12:59:33 +02:00 |
|
Regis Houssin
|
f056ca3a41
|
FIXME: class commonagenda not exist
|
2012-09-05 08:07:15 +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 |
|