lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

887 Commits

Author SHA1 Message Date
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
0846f4678b User links in log view 2013-05-06 16:53:22 +02:00
Marcos García
d7a7f316d3 Replaced "Jours" with DurationDays translation key 2013-05-06 16:51:08 +02:00
Marcos García
d0635901a6 Fixed bug with holidays log 2013-05-06 16:45:03 +02:00
Marcos García
e2a73839bc Replaced addslashes with $this->db->escape 2013-05-04 20:17:05 +02:00
Marcos García
3eb6d3edb1 Translated some comments 2013-05-04 20:09:39 +02:00
Marcos García
c21390ab83 New: [ task #858 ] Holiday module: note on manual holiday assignation 2013-05-04 20:08:17 +02:00
Laurent Destailleur
f8b4551ef6 Merge pull request #901 from marcosgdf/develop 
Holidays module improvements
 2013-04-29 10:28:47 -07: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
Marcos García
7dd457d2df Added DurationDays string to the table 2013-04-29 18:01:26 +02:00
Marcos García
8837caeb6f Style improvement 2013-04-29 17:57:24 +02:00
Marcos García
b9429fc98e Fixed a bug when showing users to define holidays 2013-04-29 17:24:02 +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
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
Laurent Destailleur
5893fadb58 Look: Minor style enhancement 2013-04-21 17:56:29 +02:00
Marcos García
651b1ae7ce Refactor + es_ES translations improvement + minor stetic change 2013-04-20 12:55:31 +02:00
Laurent Destailleur
8a0e111417 Fix: Bad array type 2013-04-15 12:39:34 +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
421dc07077 Improved es_ES holidays translations 2013-04-15 09:25:41 +02:00
Marcos García
6d896a8558 Improved holidays module translations 2013-04-15 00:53:06 +02:00
Marcos García
deaa63960e Improved es_ES holidays translations 2013-04-15 00:18:08 +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
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
5bc66318c2 New: use dolGetFirstLastname() everywher we should. 2013-03-11 15:54:01 +01:00
Laurent Destailleur
3e5ee3b00a Fix: PHPUnit tests are back. 2013-03-09 18:55:57 +01:00
Laurent Destailleur
f464b7b37c Fix: Avoid using date_format 2013-03-01 23:30:07 +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
Grand Philippe
4f9f32eb3e english language standardization 2013-02-23 16:37:17 +01:00
Laurent Destailleur
e9dc4b9db3 Fix: We must not add month holidays after init of sold. 2013-02-18 15:15:10 +01:00
Laurent Destailleur
d6e907b69b Fix: Nb of holidays was not using correct user 2013-02-17 19:26:33 +01:00
Laurent Destailleur
2bad9c0d9a Fix: Nb of holidays was not using correct user 2013-02-17 19:25:55 +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
9f7a06e04d Fix: Test not complete 2013-02-01 09:56:45 +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
Laurent Destailleur
f345e43dad Fix: date 2012-12-30 22:23:23 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +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
Laurent Destailleur
86e08e87d5 Fix: date format 2012-12-02 18:21:26 +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
Laurent Destailleur
005716af99 Fix: Missing includes 2012-11-20 12:40:57 +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
Laurent Destailleur
8ff506b120 Sec: Sanitize all params page, sortfield and sortorder 2012-10-13 14:47:46 +02: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
Laurent Destailleur
d3ef78df47 Qual: Respect database rules 
Qual: Add indexes
 2012-09-24 00:10:01 +02:00
Regis Houssin
d58c106f66 Fix: convert line delimiters !!! 2012-09-19 17:53:09 +02:00
Laurent Destailleur
cd6a8fa761 New: Uniformize code 2012-09-17 02:07:14 +02:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00
Regis Houssin
be13602c71 Fix: use getDocumentsLink method 2012-09-15 09:02:20 +02:00
Laurent Destailleur
c11c3897ef Qual: Uniformize code 2012-09-12 20:45:01 +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
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
00784ffce5 Fir: go to hell 2012-09-06 09:48:25 +02:00
Regis Houssin
c99e730e0c Fix: last try before asylum 2012-09-06 09:27:23 +02:00
Regis Houssin
7bd18ba840 Fix: phpunit error again ! pfff 2012-09-06 09:17:01 +02:00
Regis Houssin
c9ea50c51f Try another method 2012-09-06 09:09:00 +02:00
Regis Houssin
83dd81110d Fix: bad path the return 2012-09-06 09:01:54 +02:00
Regis Houssin
9e4ff47711 Fix: bad path 2012-09-06 08:52:31 +02:00
Regis Houssin
e0bb5f334d Try to avoid phpunit errors 2012-09-06 08:31:38 +02:00
Regis Houssin
0b057a071a Fix: for avoid phpunit errors 2012-09-06 08:24:29 +02:00
Laurent Destailleur
00cd6a050d Uniformise code 2012-09-05 13:10:13 +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