Alexander Lampret
|
46aeb7068c
|
public holiday in austria
|
2017-12-11 10:51:58 +01:00 |
|
Laurent Destailleur
|
066e04f33d
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
|
2017-12-11 00:22:05 +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
|
4017d09613
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-12-10 21:28:36 +01:00 |
|
Laurent Destailleur
|
f18edd5787
|
Update security.lib.php
|
2017-12-10 21:08:13 +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 |
|
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 |
|
Maxime Kohlhaas
|
3db4d10fc0
|
Fix event late alert on third event list #7912
|
2017-12-10 08:12:49 +01:00 |
|
Laurent Destailleur
|
e3dcff7f5b
|
Fix substition for menus title and urls
|
2017-12-09 15:35:01 +01:00 |
|
Philippe GRAND
|
8fa7b924d5
|
enhance image using awesome icon
|
2017-12-09 12:08:50 +01:00 |
|
Laurent Destailleur
|
95cb5025a2
|
Fix length of month too large
More complete template
|
2017-12-08 16:15:41 +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 |
|
alexis Algoud
|
62cd77d999
|
NEW automatic activation of external module on country set
|
2017-12-08 10:13:03 +01:00 |
|
Laurent Destailleur
|
cf5265d405
|
Minor fix
|
2017-12-07 21:44:12 +01:00 |
|
Laurent Destailleur
|
c6e1087834
|
Fix test on vat amount
|
2017-12-05 19:47:46 +01:00 |
|
Laurent Destailleur
|
78c4b7f912
|
Fix look and feel v7
|
2017-12-04 20:17:07 +01:00 |
|
Laurent Destailleur
|
2458244ee3
|
Fix css
|
2017-12-02 16:24:38 +01:00 |
|
Laurent Destailleur
|
7b47ef3ca1
|
Change order or field
|
2017-12-02 11:34:56 +01:00 |
|
Laurent Destailleur
|
e8327fd9a1
|
Fix the eatby/sellby date was not visible.
|
2017-12-02 10:43:01 +01:00 |
|
Laurent Destailleur
|
46b281f703
|
Fix for #7697
|
2017-12-01 19:29:29 +01:00 |
|
Laurent Destailleur
|
89ef597690
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-12-01 18:12:52 +01:00 |
|
Laurent Destailleur
|
4969ae2abb
|
Fix missing the badge on virtual product tab
|
2017-12-01 17:48:51 +01:00 |
|
Laurent Destailleur
|
e36b62f539
|
Merge pull request #7900 from fappels/7.0_fix_warehouse_label_ref-
Fix dispatch not adapted for label to ref change for warehouse
|
2017-12-01 16:26:21 +01:00 |
|
fappels
|
1c72dc608f
|
Fix travis
|
2017-12-01 16:22:34 +01:00 |
|
Laurent Destailleur
|
1d2b5dbe97
|
Merge pull request #7892 from atm-maxime/fix_contactlist_empty
Fix filters on contact list must always appear
|
2017-12-01 15:54:03 +01:00 |
|
Laurent Destailleur
|
670465fcd8
|
Fix responsive and search
|
2017-12-01 12:01:17 +01:00 |
|
Laurent Destailleur
|
6796c08cb8
|
Debug/rewrite Blockedlog
|
2017-11-30 14:21:55 +01:00 |
|
Maxime Kohlhaas
|
879a0812d7
|
Fix filters on contact list must always appear
|
2017-11-29 20:04:15 +01:00 |
|
Laurent Destailleur
|
9fa6bfd1a5
|
Fix edit external user or not
|
2017-11-29 15:30:41 +01:00 |
|
Laurent Destailleur
|
a15a57317b
|
Debug accountancy module
|
2017-11-28 11:12:13 +01:00 |
|
Laurent Destailleur
|
533a82187a
|
NEW Add a protection so we can't journalize non balanced transactions
|
2017-11-27 17:12:48 +01:00 |
|
Scrutinizer Auto-Fixer
|
aab2799981
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2017-11-27 13:48:36 +00:00 |
|
Laurent Destailleur
|
a0406bc741
|
Standardize view of events for products
|
2017-11-26 20:24:20 +01:00 |
|
Laurent Destailleur
|
7e40ee5e4b
|
Fix substitution key for constant ok with php 5.3
|
2017-11-25 23:16:15 +01:00 |
|
Laurent Destailleur
|
c02528a479
|
NEW Accept substitution key __[ABC]__ replaced with value of const ABC
|
2017-11-25 19:55:31 +01:00 |
|
Laurent Destailleur
|
2fc5d9fefb
|
The form to test email can now use all sending profiles.
|
2017-11-25 18:52:47 +01:00 |
|
Laurent Destailleur
|
0b9a3087ea
|
Fix bug reported by scrutinizer
|
2017-11-25 12:11:02 +01:00 |
|
Laurent Destailleur
|
4cff4c6935
|
Simplify and standardize code for agenda pages
|
2017-11-25 00:12:45 +01:00 |
|
Laurent Destailleur
|
3db52b5f9e
|
Debug responsive of v7
|
2017-11-24 14:23:25 +01:00 |
|
Laurent Destailleur
|
b93e35cdd2
|
Fix a lot of request to use the IN getentity instead of =
Fix a lot of request to use left join on type of payment table
|
2017-11-23 15:06:16 +01:00 |
|
Laurent Destailleur
|
b0cecab22b
|
Removed useless code
|
2017-11-22 21:26:24 +01:00 |
|
Laurent Destailleur
|
240f67d82b
|
Disable tab if not on develop mode
|
2017-11-22 21:23:42 +01:00 |
|
Laurent Destailleur
|
5fa8db1650
|
Work on timesheets
|
2017-11-22 21:19:40 +01:00 |
|
Laurent Destailleur
|
c3d8ef2104
|
Update functions.lib.php
|
2017-11-22 11:14:52 +01:00 |
|
Regis Houssin
|
a9bfe0f48f
|
Fix: some problems with medias in multicompany (backport 6.0 commit 762b4eb876)
|
2017-11-22 10:12:51 +01:00 |
|
Regis Houssin
|
848a27283b
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_member
|
2017-11-22 09:51:57 +01:00 |
|