Laurent Destailleur f9c1b590d0 Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: build/debian/changelog build/doxygen/dolibarr-doxygen.doxyfile build/exe/doliwamp/doliwamp.iss build/perl/virtualmin/dolibarr.pl build/rpm/dolibarr_fedora.spec build/rpm/dolibarr_generic.spec build/rpm/dolibarr_mandriva.spec build/rpm/dolibarr_opensuse.spec htdocs/compta/facture.php htdocs/core/modules/import/import_csv.modules.php htdocs/filefunc.inc.php		2014-03-19 22:29:18 +01:00
..
admin	Replaced "Jours" with DurationDays translation key	2013-05-06 17:48:20 +02:00
class	Fix: Number of day calculation. Add PHPUnit case.	2014-03-05 20:52:27 +01:00
img
common.inc.php	Fix: dead code	2013-06-09 16:15:12 +02:00
define_holiday.php	Merge remote-tracking branch 'origin/3.4' into develop	2013-07-27 14:21:47 +02:00
fiche.php	Merge remote-tracking branch 'origin/3.5' into develop	2014-03-19 22:29:18 +01:00
index.php	Qual: Feature to make payment of salaries has been moved into a module	2014-03-17 14:30:55 +01:00
month_report.php	Fix: Number of day calculation. Add PHPUnit case.	2014-03-05 20:52:27 +01:00
view_log.php	Missing translations	2013-05-06 17:47:53 +02:00