Laurent Destailleur 51d11ff190 Merge remote-tracking branch 'origin/3.4' into develop ...

Conflicts:
	htdocs/compta/facture/stats/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/includes/tcpdf/tcpdf.php
	htdocs/langs/el_GR/other.lang
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/es_ES/products.lang
	htdocs/main.inc.php
	test/phpunit/NumberingModulesTest.php

2013-06-09 16:49:47 +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

…

common.inc.php

Fix: dead code

2013-06-09 16:15:12 +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