lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14ab409ca9
dolibarr/htdocs/holiday
History
Laurent Destailleur 14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
2014-09-28 02:14:32 +02:00
..
admin Fix: PHPCS 2014-08-06 09:18:44 +02:00
class Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
img Add table llx_holiday_types to store type of leave. 2014-08-06 03:01:17 +02:00
card.php Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
common.inc.php Removed closing php tag 2014-05-03 18:18:44 +02:00
define_holiday.php Merge remote-tracking branch 'origin/3.6' into develop 2014-09-28 02:14:32 +02:00
index.php Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +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