Alexander Lampret
|
46aeb7068c
|
public holiday in austria
|
2017-12-11 10:51:58 +01:00 |
|
Laurent Destailleur
|
dbd96d1ac7
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/actions_sendmails.inc.php
htdocs/loan/card.php
htdocs/loan/class/loan.class.php
|
2017-12-10 21:46:23 +01:00 |
|
Laurent Destailleur
|
d836d68801
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-12-10 21:29:35 +01:00 |
|
Laurent Destailleur
|
e640831653
|
Merge pull request #7553 from atm-maxime/new_menu_expense_holidays
Add detailed menus in HRM module
|
2017-12-10 21:15:51 +01:00 |
|
Laurent Destailleur
|
c6c248fa28
|
Merge pull request #7930 from aspangaro/7.0-7
Fix : Accountancy some cleaning
|
2017-12-10 21:10:30 +01:00 |
|
Laurent Destailleur
|
d3150ede42
|
Merge pull request #7942 from delcroip/fixDeleteSalaries
fix: unable to remove salaries, plus correct default rights management
|
2017-12-10 21:09:15 +01:00 |
|
Laurent Destailleur
|
f18edd5787
|
Update security.lib.php
|
2017-12-10 21:08:13 +01:00 |
|
Laurent Destailleur
|
7e69a31dd6
|
Merge pull request #7941 from atm-maxime/fix_errmsg_stockneg
Fix display error message when stock not enough on invoice validation #7846
|
2017-12-10 21:05:23 +01:00 |
|
Laurent Destailleur
|
f7b663379a
|
Fix PHP 7.2
|
2017-12-10 21:04:59 +01:00 |
|
Laurent Destailleur
|
3415ce4664
|
Merge pull request #7938 from aspangaro/7.0-b3
FIX : Debug various_payment
|
2017-12-10 20:59:45 +01:00 |
|
Laurent Destailleur
|
e01195f4f1
|
Merge pull request #7935 from aspangaro/7.0-b1
FIX : v7 sql error on init database
|
2017-12-10 20:58:05 +01:00 |
|
Laurent Destailleur
|
7d553f58f5
|
Debug website module
|
2017-12-10 20:34:35 +01:00 |
|
patrick Delcroix
|
033016da7f
|
fix: unable to remove salaries, plus correct default rights management
|
2017-12-10 20:02:26 +01:00 |
|
Maxime Kohlhaas
|
12d0928244
|
Fix display error message when stock not enough on invoice validation
|
2017-12-10 19:59:56 +01:00 |
|
Laurent Destailleur
|
748aee9a54
|
Fix javascript error
|
2017-12-10 19:54:04 +01:00 |
|
Laurent Destailleur
|
d701a7617b
|
Fix province nadorgg into nador
|
2017-12-10 19:04:21 +01:00 |
|
Laurent Destailleur
|
2dae21259e
|
Fix the switch show more/less
|
2017-12-10 19:03:18 +01:00 |
|
Laurent Destailleur
|
e1f0483b23
|
Fix grabber of url when url is on second level dir. More phpunits
|
2017-12-10 17:59:19 +01:00 |
|
Laurent Destailleur
|
02d9e93ed4
|
Fix badge and use of data-html instead of html tag
|
2017-12-10 15:46:35 +01:00 |
|
Laurent Destailleur
|
4443c0f0a0
|
Fix style
|
2017-12-10 15:24:47 +01:00 |
|
Alexandre SPANGARO
|
ac95ccd872
|
FIX : Debug various_payment
|
2017-12-10 14:05:36 +01:00 |
|
Alexandre SPANGARO
|
cc2ea35c9a
|
FIX : data
|
2017-12-10 08:46:50 +01:00 |
|
Alexandre SPANGARO
|
918f25983c
|
FIX : v7 sql data
|
2017-12-10 08:27:13 +01:00 |
|
Alexandre SPANGARO
|
ff9c714f88
|
FIX : v7 sql error on init database
|
2017-12-10 08:02:57 +01:00 |
|
Alexandre SPANGARO
|
60fc500fa8
|
FIX : Edit accountancy account and warning message on loan
|
2017-12-10 07:00:46 +01:00 |
|
Laurent Destailleur
|
472d7b591e
|
Fix hook for formmail and translation
|
2017-12-10 02:01:36 +01:00 |
|
Laurent Destailleur
|
57c7fa6ae9
|
Sync transifex
|
2017-12-10 01:17:32 +01:00 |
|
Laurent Destailleur
|
8d20473ffd
|
Fix date of extrafields
|
2017-12-09 23:19:29 +01:00 |
|
Laurent Destailleur
|
1128b66b30
|
Fix ref of contract
|
2017-12-09 20:58:06 +01:00 |
|
Laurent Destailleur
|
e270295f5c
|
Fix modulebuilder
|
2017-12-09 20:40:11 +01:00 |
|
Laurent Destailleur
|
cc813df2a5
|
Fix modulebuilder
|
2017-12-09 20:17:47 +01:00 |
|
Laurent Destailleur
|
f22e7ee24a
|
Fixes
|
2017-12-09 17:29:19 +01:00 |
|
Laurent Destailleur
|
e3dcff7f5b
|
Fix substition for menus title and urls
|
2017-12-09 15:35:01 +01:00 |
|
Alexandre SPANGARO
|
1269d98df2
|
Merge remote-tracking branch 'uptream/develop' into 7.0-7
# Conflicts:
# htdocs/accountancy/admin/export.php
# htdocs/accountancy/class/accountancyexport.class.php
# htdocs/accountancy/journal/expensereportsjournal.php
|
2017-12-09 06:14:34 +01:00 |
|
Alexandre SPANGARO
|
065ef4e5c2
|
Fix : Accountancy some cleaning
|
2017-12-09 06:00:13 +01:00 |
|
Laurent Destailleur
|
47e9ab5738
|
Fix search on date on blocked logs
|
2017-12-09 00:40:22 +01:00 |
|
Laurent Destailleur
|
701ae7d21b
|
Fix responsive
|
2017-12-08 20:15:28 +01:00 |
|
Laurent Destailleur
|
3ef215c3eb
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-12-08 19:23:41 +01:00 |
|
Laurent Destailleur
|
a5bdadf432
|
Fix menu with smartphone
|
2017-12-08 19:23:13 +01:00 |
|
alexis Algoud
|
9dfe309ef2
|
NEW filter date for blockedlog
|
2017-12-08 17:15:24 +01:00 |
|
Laurent Destailleur
|
3ddc582edd
|
Merge pull request #7913 from atm-ph/fix_6.0_var_name
Fix $boad instead of $board
|
2017-12-08 16:55:28 +01:00 |
|
Laurent Destailleur
|
95cb5025a2
|
Fix length of month too large
More complete template
|
2017-12-08 16:15:41 +01:00 |
|
florian HENRY
|
eb03f8f08e
|
fix MAIN_COPY_FILE_IN_EVENT_AUTO
|
2017-12-08 15:03:42 +01:00 |
|
Laurent Destailleur
|
56b5eab2e4
|
Merge pull request #7911 from atm-alexis/NEW_blockedlog_reset_warning
NEW warning on module blocked log reset if country code is FR
|
2017-12-08 13:47:44 +01:00 |
|
Laurent Destailleur
|
2c62ea5fac
|
Merge pull request #7915 from ATM-Marc/NEW_hook_openelements_dashboard
New hook to extend homepage open elements dashboard
|
2017-12-08 13:39:52 +01:00 |
|
Laurent Destailleur
|
ac56e61cdf
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-12-08 13:14:12 +01:00 |
|
Laurent Destailleur
|
f85e79e250
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/filefunc.inc.php
htdocs/holiday/class/holiday.class.php
|
2017-12-08 13:13:53 +01:00 |
|
Laurent Destailleur
|
c2ad58895f
|
Merge pull request #7919 from atm-maxime/link_create_event
Fix : link to create action is not a button but a top list link
|
2017-12-08 13:02:21 +01:00 |
|
Laurent Destailleur
|
8dc3d7323d
|
Merge pull request #7923 from fmarcet/6.0
FIX #7379: Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable
|
2017-12-08 13:02:07 +01:00 |
|
Laurent Destailleur
|
9b9b5adf66
|
Fix must be compatible with old and new storage location
|
2017-12-08 13:01:45 +01:00 |
|