Commit Graph

67255 Commits

Author SHA1 Message Date
Laurent Destailleur
8d983717a3
Merge pull request #8068 from atm-quentin/NEW_filter_export_model_by_user
NEW export filter models can be share or not by user
2018-01-29 21:19:50 +01:00
Laurent Destailleur
98c7ac9362
Merge pull request #8100 from ruistrecht-alt/label_for_MAIN_SHOW_REGION_IN_STATE
NEW: Option MAIN_SHOW_REGION_IN_STATE renamed into MAIN_SHOW_REGION_IN_STATE_SELECT and more complete
2018-01-29 21:08:18 +01:00
Laurent Destailleur
bdfbe462df Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-01-29 21:04:49 +01:00
Laurent Destailleur
7bb46e65d7
Merge pull request #8103 from simnandez/7.0
Trad: more understandable extrafield translation to the end user
2018-01-29 20:45:42 +01:00
Laurent Destailleur
8102883356 Fix error when email list contains ', ,'
Fix output dir of notification
2018-01-29 20:36:40 +01:00
Laurent Destailleur
d2b81c23c0
Merge pull request #8105 from kadogo/fichinter-api-cannot-grab-the-good-informations
FIX: Global on $user parameter reset the variable
2018-01-29 19:48:52 +01:00
Laurent Destailleur
8cd54d6630
Merge pull request #8108 from laudeco/hotfix/invoice_book
fix issue on Big book
2018-01-29 19:47:09 +01:00
Laurent Destailleur
1f30f9b179
Update list.php 2018-01-29 19:46:46 +01:00
Laurent Destailleur
491e64db06 Fix various payments 2018-01-29 19:07:42 +01:00
Laurent Destailleur
4eb7d7a332 Debug blockedlog with various payments 2018-01-29 18:22:26 +01:00
Juanjo Menent
3c281ccefa FIX: Bad localtaxes assignment in cashdesk 2018-01-29 17:50:00 +01:00
Laurent Destailleur
8ae25b3c65 Fix the FACTURE_ENABLE_NEGATIVE was useless without
FACTURE_ENABLE_NEGATIVE_LINES
2018-01-29 16:21:54 +01:00
Laurent Destailleur
c67e57836e Code comment 2018-01-29 12:58:33 +01:00
Laurent Destailleur
0a11d52d53 Fix info on email sent 2018-01-29 12:46:07 +01:00
Laurent Destailleur
424e8a3139 Fix price format in payment pages 2018-01-29 12:10:06 +01:00
Laurent Destailleur
3c4ed55179 Fix css 2018-01-29 11:32:56 +01:00
Laurent Destailleur
716d44a610 Fix price in member public form 2018-01-29 11:22:02 +01:00
Laurent Destailleur
97da464343 Fix price in member public form 2018-01-29 11:21:40 +01:00
Laurent Destailleur
c41374220e Fix css 2018-01-29 11:13:18 +01:00
Laurent Destailleur
9825586d41 Fix css 2018-01-29 11:12:56 +01:00
De Coninck Laurent
857c03eeb9 fix issue on Big book 2018-01-28 21:04:13 +01:00
Frédéric FRANCE
def89d30ae
Merge remote-tracking branch 'upstream/develop' into patch-2 2018-01-28 15:36:40 +01:00
Laurent Destailleur
a87ecc14ec Fix install.lock not always saved 2018-01-28 10:58:15 +01:00
Laurent Destailleur
cebda2b141 Prepare 8.0 2018-01-28 10:57:12 +01:00
Laurent Destailleur
97c2828d04 Fix install.lock not always saved 2018-01-28 10:57:01 +01:00
Laurent Destailleur
65c7117240 Fix var serialized twice 2018-01-27 19:40:42 +01:00
Laurent Destailleur
7dcb3bf6fc Fix var not initialized 2018-01-27 19:40:35 +01:00
Laurent Destailleur
a639308601 Fix css 2018-01-27 19:40:16 +01:00
Laurent Destailleur
bee64962fe Fix css 2018-01-27 19:40:11 +01:00
Laurent Destailleur
2f28240ce4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-27 19:37:33 +01:00
Laurent Destailleur
7a2992bc4b Fix var serialized twice 2018-01-27 19:35:30 +01:00
kadogo
ba58578d60 FIX: Global on $user parameter reset the variable
When we use the fichinter API with global, the $user object is reset
If global is not applied on $user we can retrieve the informations from it
2018-01-27 19:31:48 +01:00
Laurent Destailleur
f1cd905bf1 Fix var not initialized 2018-01-27 19:29:57 +01:00
kadogo
b48bcc9ab8 NEW: Add an API for fichinter
We missed an API for fichinter
It add list, create and create line functions
2018-01-27 19:25:18 +01:00
Laurent Destailleur
f2a3c83053 Better error messages 2018-01-27 18:46:52 +01:00
Juanjo Menent
13adf06ae4 Trad: more understandable extrafield translation to the end user
Trad: fix english words
Trad: more accurate accounting translation
2018-01-27 15:48:11 +01:00
Laurent Destailleur
28417a6c24 Fix css 2018-01-26 23:54:45 +01:00
Laurent Destailleur
a61b420759 Fix css 2018-01-26 23:29:49 +01:00
Juanjo Menent
cdb63bada3 FIX: #7974 Contract - Invalid reference on the document 2018-01-26 18:13:55 +01:00
Laurent Destailleur
34140ca3f0
Merge pull request #7983 from AlainRnet/patch-6
NEW Show total number of records by category
2018-01-26 18:04:18 +01:00
Laurent Destailleur
86e501808c
Merge pull request #7975 from dolibarr95/patch-31
Create 7.0.0-8.0.0.sql
2018-01-26 18:03:07 +01:00
Laurent Destailleur
e379b02b81
Merge pull request #8009 from dolibarr95/patch-33
NEW add a hook in dol_print_phone
2018-01-26 18:02:27 +01:00
Laurent Destailleur
ae1641f4b9
Merge pull request #8063 from Alabate/develop
NEW : Add password_hash as hash algorithm
2018-01-26 18:01:13 +01:00
Laurent Destailleur
6cae36cc33 NEW Add key __USER_REMOTE_IP__ into available substitution variables 2018-01-26 17:23:30 +01:00
Laurent Destailleur
ba0a96c882 Missing param limit 2018-01-26 15:37:23 +01:00
Laurent Destailleur
eb3eee9b6a Code comment 2018-01-26 15:25:47 +01:00
Laurent Destailleur
c5307e5cac Fix option MAILING_LIMIT_SENDBYWEB 2018-01-26 15:12:40 +01:00
Laurent Destailleur
f76ed0b317 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-26 13:15:59 +01:00
Laurent Destailleur
3239187f6b Prepare 7.0 2018-01-26 13:14:30 +01:00
Laurent Destailleur
b9d5ed37dd Prepare 8.0 2018-01-26 12:46:44 +01:00