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

..

admin

Replaced "Jours" with DurationDays translation key

2013-05-06 17:48:20 +02:00

class

Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into holidays-improvements

2013-05-06 17:22:31 +02:00

img

New: Add the holiday module (provided by teclib with permission to add

2012-09-05 03:26:57 +02:00

common.inc.php

New: Default aprrover for holidays i sby default hierchical parent.

2013-04-14 01:04:11 +02:00

define_holiday.php

Style improvements and fixed a "bug" that showed "()" when no note was entered

2013-05-12 12:06:45 +02:00

fiche.php

Merge remote-tracking branch 'origin/3.4' into develop

2013-05-14 01:15:05 +02:00

index.php

Improvement to holidays module

2013-05-12 11:38:17 +02:00

month_report.php

Missing translations

2013-05-06 17:47:53 +02:00

view_log.php

Missing translations

2013-05-06 17:47:53 +02:00