Laurent Destailleur
67820774bb
Merge remote-tracking branch 'origin/3.4' into develop
...
Conflicts:
ChangeLog
htdocs/commande/fiche.php
htdocs/core/class/extrafields.class.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
2013-07-27 14:21:47 +02:00
Laurent Destailleur
3c6b1f17d1
Fix: print of a function that already contains the print.
2013-07-27 14:10:57 +02:00
Marcos García
62475866e3
Style improvements and fixed a "bug" that showed "()" when no note was entered
2013-05-12 12:06:45 +02:00
Marcos García
da61a24831
Missing translations
2013-05-06 17:47:53 +02:00
Marcos García
7e11f7466a
Missing translations
2013-05-06 17:07:12 +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
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
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
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
Laurent Destailleur
89365786a8
New: enhance tool fixdosfiles.sh
...
Convert DOS files to unix
2013-03-30 14:27:13 +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
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
Laurent Destailleur
5dfefa1313
Fix: doxygen
2012-12-20 20:16:10 +01: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
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
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
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
