Laurent Destailleur
43b5209192
NEW Clean code into salary module, debug and add indexes
...
NEW Can filter on user list and salary payments on user with naural
search.
2015-05-13 08:57:39 +02:00
Laurent Destailleur
2bc6ac4671
Finished new module to manage expense reports !
...
Fix export to support corectly multicompany
2015-02-22 13:16:49 +01:00
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
Laurent Destailleur
e8b7c9c6bd
Fix: doxygen
2014-09-27 16:00:11 +02:00
aspangaro
4c52a6ee6f
Add admin page into salaries to manage accountancy
2014-09-10 04:53:18 +02:00
aspangaro
bb4fed30a8
Salaries :: Missing key language & typo
2014-06-03 06:45:37 +02:00
Laurent Destailleur
12055aa44a
I did a better fix to have no more dependencies between modules.
2014-05-10 19:04:33 +02:00
Laurent Destailleur
c20a5d7e18
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-05-10 19:02:55 +02:00
Laurent Destailleur
f95c87f1d6
Fix: [ bug #1374 ] Salaries module requires "Special costs" module to
...
work but it does not enable it
2014-05-10 18:57:04 +02:00
Juanjo Menent
4e53b57313
Fix: [ bug #1374 ] Salaries module requires "Special costs" module to
...
work but it does not enable it
2014-05-10 17:54:13 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
2889c3ac70
Qual: Feature to make payment of salaries has been moved into a module
...
(module dedicated to manage salaries and salary payments).
Qual: Also module for employee to declare trip and expenses has been
moved into same place than module for employee to declare holidays
(into HRM top entry). It is not an accountancy module so no reason to
have it into entry "Accountancy".
2014-03-17 14:30:55 +01:00
