Laurent Destailleur 83447243ae Merge remote-tracking branch 'origin/3.6' into develop ...

Conflicts:
	build/debian/get-orig-source.sh
	htdocs/product/class/product.class.php
	htdocs/societe/soc.php

2014-09-15 22:58:39 +02:00

..

admin

Fix: PHPCS

2014-08-06 09:18:44 +02:00

class

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

2014-08-06 09:27:01 +02:00

img

Add table llx_holiday_types to store type of leave.

2014-08-06 03:01:17 +02:00

common.inc.php

Removed closing php tag

2014-05-03 18:18:44 +02:00

define_holiday.php

Fix: Table holiday_user was not initialized anymore.

2014-08-06 09:08:28 +02:00

fiche.php

Fix: Table holiday_user was not initialized anymore.

2014-08-06 09:08:28 +02:00

index.php

Merge remote-tracking branch 'origin/3.5' into 3.6

2014-09-13 19:10:05 +02:00

month_report.php

Merge remote-tracking branch 'origin/3.5' into 3.6

2014-06-28 14:53:28 +02:00

tomergewithdefine_holiday.php

Fix: PHPCS

2014-08-06 09:46:09 +02:00

view_log.php

New: Add navigation on year on page of leaves.

2014-08-06 03:09:59 +02:00