Laurent Destailleur
|
29414251f5
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/lib/files.lib.php
|
2020-09-29 13:19:03 +02:00 |
|
Laurent Destailleur
|
1f8f2c0cc3
|
NEW Add 2 rules for emailcollector: Message send/not sent from Dolibarr
|
2020-09-29 13:13:47 +02:00 |
|
bahfir abbes
|
9662c4110a
|
new:bankline_prepare_head for bank lines
|
2020-09-29 01:28:39 +01:00 |
|
Laurent Destailleur
|
43c167f0c8
|
Fix init var
|
2020-09-28 20:47:36 +02:00 |
|
Laurent Destailleur
|
bd11154bfc
|
NEW Can filter on accounting system ref in export of chart of account
|
2020-09-28 18:56:53 +02:00 |
|
Laurent Destailleur
|
4cf6e483ca
|
Fix export of various payments.
|
2020-09-28 18:49:20 +02:00 |
|
Laurent Destailleur
|
0093671a04
|
Merge pull request #14846 from aspangaro/13a19
NEW Add export for various payment
|
2020-09-28 17:40:18 +02:00 |
|
lvessiller
|
1b5a0ce3bf
|
FIX uses price2numjs
|
2020-09-28 17:04:20 +02:00 |
|
Laurent Destailleur
|
1a28d7f641
|
Fix missing token
|
2020-09-28 16:33:27 +02:00 |
|
Laurent Destailleur
|
2e79064098
|
Clean code
|
2020-09-28 11:07:53 +02:00 |
|
Alexandre SPANGARO
|
88772726d7
|
New Add export for various payment
|
2020-09-28 09:32:49 +02:00 |
|
Laurent Destailleur
|
e7c044cc05
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-09-27 21:20:51 +02:00 |
|
Laurent Destailleur
|
1aaf1fe357
|
Try catch on eval
|
2020-09-27 21:10:27 +02:00 |
|
Laurent Destailleur
|
5c9ad3ec9b
|
Update files.lib.php
|
2020-09-27 18:55:09 +02:00 |
|
Laurent Destailleur
|
44549bbb3b
|
Merge pull request #14802 from FHenry/fix_eventcreation
fix event creation bad redirection from thirdparty/event tab if on first attempt you badly fill the form
|
2020-09-27 18:36:32 +02:00 |
|
Laurent Destailleur
|
8e59d0528e
|
Update html.formactions.class.php
|
2020-09-27 18:33:13 +02:00 |
|
Laurent Destailleur
|
4ca481335b
|
Merge pull request #14812 from atm-john/13.0_new_pdf_storm_for_delivery
NEW PDF model storm for delivery
|
2020-09-27 18:28:22 +02:00 |
|
Florian HENRY
|
5ff7e37696
|
review code
|
2020-09-27 18:05:19 +02:00 |
|
Laurent Destailleur
|
96ae9c11f6
|
Revert "NEW Better currency rate editor"
|
2020-09-27 18:03:56 +02:00 |
|
Florian HENRY
|
b6b2553501
|
Merge branch '11.0' into 11.0_fixmultidiroutput
|
2020-09-27 18:02:22 +02:00 |
|
Florian HENRY
|
f9d4a4d2ba
|
Merge branch 'develop' into fix_eventcreation
|
2020-09-27 17:58:05 +02:00 |
|
Laurent Destailleur
|
cdc54a9f4a
|
Merge pull request #14820 from ATM-Consulting/new/develop/currency_rate_editor
NEW Better currency rate editor
|
2020-09-27 17:57:16 +02:00 |
|
Laurent Destailleur
|
c659379307
|
Try a more complete fix than #14821
|
2020-09-27 17:21:49 +02:00 |
|
Laurent Destailleur
|
3ee2459dc7
|
Enhancement for #14835: Can filter on expiration date, add list of
members without subscriptions
|
2020-09-27 16:03:20 +02:00 |
|
Laurent Destailleur
|
ba311e2cfd
|
Fix phpcs
|
2020-09-26 21:24:28 +02:00 |
|
Laurent Destailleur
|
da4362c492
|
Make notification by browser popup working.
|
2020-09-26 21:18:09 +02:00 |
|
Laurent Destailleur
|
3a6b8ae202
|
Work on browser notification
|
2020-09-26 20:29:01 +02:00 |
|
Laurent Destailleur
|
68a6239322
|
Clean code
|
2020-09-26 04:25:14 +02:00 |
|
Laurent Destailleur
|
33d578a660
|
Fix bad management of default value in database on create form
|
2020-09-26 04:25:06 +02:00 |
|
Laurent Destailleur
|
611684a9a7
|
FIX Substitution for member subscription was not done
|
2020-09-26 02:39:19 +02:00 |
|
Laurent Destailleur
|
d3e9815cfa
|
Fix phpunit
|
2020-09-25 17:48:04 +02:00 |
|
Laurent Destailleur
|
48632bbb3f
|
Clean code
|
2020-09-25 17:23:42 +02:00 |
|
Laurent Destailleur
|
1b83b55995
|
Fix to exclude possible sql injection
|
2020-09-25 17:11:54 +02:00 |
|
Laurent Destailleur
|
0d797a793a
|
On technical error, return http code 500
|
2020-09-25 15:01:15 +02:00 |
|
Laurent Destailleur
|
88b4c1e766
|
Fix calculation of nb of top menu in CSS files.
|
2020-09-25 14:09:51 +02:00 |
|
Regis Houssin
|
d38c557fba
|
FIX Can create user but not update user with activedirectory
|
2020-09-25 12:11:13 +02:00 |
|
Laurent Destailleur
|
83bdd530cd
|
Fix sql error in menu edition, column too short
|
2020-09-25 10:13:45 +02:00 |
|
Laurent Destailleur
|
d6ce6bb47f
|
Standardize code
|
2020-09-25 10:05:59 +02:00 |
|
Laurent Destailleur
|
ed2dd3f55f
|
Clean code
|
2020-09-24 22:02:10 +02:00 |
|
Laurent Destailleur
|
6e2a9dc0c9
|
Fix error management in Stripe
|
2020-09-24 21:54:21 +02:00 |
|
Laurent Destailleur
|
f066da1811
|
Minor security fixes
|
2020-09-24 16:19:24 +02:00 |
|
Laurent Destailleur
|
becf91904f
|
css
|
2020-09-24 08:55:33 +02:00 |
|
Laurent Destailleur
|
ece46511f2
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-09-23 23:02:52 +02:00 |
|
Laurent Destailleur
|
95cf3d2f51
|
NEW Can use desired stock of a given warehouse for replenishment
|
2020-09-23 23:02:31 +02:00 |
|
Laurent Destailleur
|
28d25f596b
|
Merge pull request #14671 from Tim-Otte/feature-add-incoterms-to-odt
NEW: Added incoterms to substitution array
|
2020-09-23 20:10:22 +02:00 |
|
Laurent Destailleur
|
bb10379768
|
NEW Can change a product in line of recurring invoice or contract
|
2020-09-23 18:45:19 +02:00 |
|
Laurent Destailleur
|
09c6761dae
|
NEW Include the tag editor of page as a popup into website editor
|
2020-09-23 16:36:19 +02:00 |
|
Florian Mortgat
|
70a0b6b90f
|
Merge branch 'new/11.0_multicurrency_rate_editor' into new/develop/currency_rate_editor
|
2020-09-23 16:03:10 +02:00 |
|
stickler-ci
|
f6513b898d
|
Fixing style errors.
|
2020-09-23 13:37:35 +00:00 |
|
John Botella
|
a374ffd03a
|
Merge branch '13.0_new_pdf_storm_for_delivery' of github.com:atm-john/dolibarr into 13.0_new_pdf_storm_for_delivery
|
2020-09-23 15:35:37 +02:00 |
|