Commit Graph

78652 Commits

Author SHA1 Message Date
Laurent Destailleur
cd21d9f339 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-14 17:14:35 +02:00
Laurent Destailleur
4a815da993
Merge pull request #11854 from OPEN-DSI/new-formproduct-loadWarehouses-stockmin-order
NEW add minimum stock filter in load warehoues for product form
2019-09-14 17:09:27 +02:00
Laurent Destailleur
54f0532073 Work on #4432 2019-09-14 16:51:57 +02:00
Laurent Destailleur
1d865a250e
Merge pull request #11866 from bafbes/abb100076
fix: repetition in error message
2019-09-14 16:39:24 +02:00
Laurent Destailleur
c015bbda14
Update ldap.class.php 2019-09-14 16:39:08 +02:00
Laurent Destailleur
4d1d689fc8
Merge pull request #11868 from bafbes/abb100077
New : Use of posixAccount and posixGroup objectclass for users and groups in LDAP
2019-09-14 16:37:16 +02:00
Laurent Destailleur
d380ef1812
Update usergroup.class.php 2019-09-14 16:37:07 +02:00
Laurent Destailleur
9934f73574
Update ldap_groups.php 2019-09-14 16:36:04 +02:00
Laurent Destailleur
7965804a34
Update ldap_groups.php 2019-09-14 16:35:00 +02:00
Laurent Destailleur
618874a670
Merge pull request #11886 from frederic34/patch-13
Update .editorconfig
2019-09-14 16:32:50 +02:00
Laurent Destailleur
afce060a20
Merge pull request #11889 from OPEN-DSI/new-product-list-tags-multiselect
NEW multiselect with checkbox in categories/tags search for product list
2019-09-14 16:31:48 +02:00
Laurent Destailleur
6d890800e8
Merge pull request #11893 from frederic34/patch-15
Delete interface_50_modIFTTT_IFTTT.class.php
2019-09-14 16:30:47 +02:00
Laurent Destailleur
76f478dc44 Fix look and feel 2019-09-14 14:25:47 +02:00
Frédéric FRANCE
08f056a0f4
Delete interface_50_modIFTTT_IFTTT.class.php
IFTTT has been removed
2019-09-14 09:09:41 +02:00
Laurent Destailleur
aad6b003fb Add cache in fetch_optionnals() to avoid duplicate call to
fetch_name_optionals_label
2019-09-14 00:02:48 +02:00
Laurent Destailleur
4e4172dd1b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/public/payment/newpayment.php
2019-09-13 18:56:19 +02:00
Laurent Destailleur
8e83615533 Add method getSetupIntent 2019-09-13 18:52:35 +02:00
Laurent Destailleur
7e923f6c1f Fix remove test code and chen paymentintent is not null 2019-09-13 18:51:03 +02:00
Laurent Destailleur
b4831f9670 Code comment 2019-09-13 17:26:07 +02:00
Laurent Destailleur
70ffd6270f More details in log for CSRF error. 2019-09-13 13:51:26 +02:00
Laurent Destailleur
84544b6bdc More details in log for CSRF error. 2019-09-13 13:50:17 +02:00
VESSILLER
44fa2e4cd1 NEW multiselect with checkbox in categories/tags search for product list 2019-09-13 12:23:34 +02:00
Laurent Destailleur
36963423c3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-13 11:59:39 +02:00
Laurent Destailleur
9df4f0601d Clean address line to be on 1 line 2019-09-13 11:18:08 +02:00
Laurent Destailleur
9e851eaa78 Removed function dol_micro_time. Use native PHP microtime instead. 2019-09-13 11:16:03 +02:00
Laurent Destailleur
166d56f7a3 Removed function dol_micro_time. Use native PHP microtime instead. 2019-09-13 11:15:49 +02:00
Laurent Destailleur
7b73e2d57a FIX label of thirdparty is wrong on open project list 2019-09-13 11:05:50 +02:00
Laurent Destailleur
9eb736b110 FIX stripe payment when there is a quote into address 2019-09-13 10:12:43 +02:00
Laurent Destailleur
5137104b92 Fix responsive 2019-09-13 01:46:18 +02:00
Laurent Destailleur
48e03e1ab5 Fix responsive 2019-09-13 01:38:41 +02:00
Frédéric FRANCE
165ee28823
Update .editorconfig
editorconfig control the github online editor
2019-09-12 21:48:00 +02:00
Laurent Destailleur
1439310a15 Fix margin 2019-09-12 21:08:46 +02:00
Laurent Destailleur
a12bd6aec8 better translation 2019-09-12 18:55:07 +02:00
Abbes Bahfir
4098ecfe17 Merge branch 'abb100077' of github.com:bafbes/dolibarr into abb100077 2019-09-12 11:30:14 +01:00
Abbes Bahfir
195ac8e8f6 fix : Tests for attributes exsitence in Use of posixAccount and posixGroup objectclass for users and groups in LDAP 2019-09-12 11:24:30 +01:00
Laurent Destailleur
ca997a4172 Comment 2019-09-12 11:56:42 +02:00
Laurent Destailleur
decddd2157 Doc 2019-09-12 11:23:10 +02:00
Laurent Destailleur
56a99f6e6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-12 11:22:13 +02:00
Laurent Destailleur
84e197e48a Clean code 2019-09-12 00:09:49 +02:00
Laurent Destailleur
5fd88f438f Clean code 2019-09-12 00:03:51 +02:00
Laurent Destailleur
d7d764e5f9 Fix var not defined 2019-09-11 23:56:53 +02:00
stickler-ci
e5878c105a Fixing style errors. 2019-09-11 21:48:17 +00:00
Abbes Bahfir
5183a1ec7a New : Use of posixAccount and posixGroup objectclass for users and groups in LDAP 2019-09-11 22:45:52 +01:00
Laurent Destailleur
ee11da1075 Update ChangeLog 2019-09-11 21:08:49 +02:00
Abbes Bahfir
797bab4741 fix: repetition 2019-09-11 18:44:12 +01:00
Laurent Destailleur
6d20a656bb FIX CSRF check when using stripe old payment methods 2019-09-11 18:44:10 +02:00
Laurent Destailleur
db900cb5ea FIX EDB-ID:47370 2019-09-11 17:51:50 +02:00
Laurent Destailleur
eeaeefe20c FIX Add repair.php option 'restore' to restore user picture after v10 2019-09-11 15:46:37 +02:00
Laurent Destailleur
3f3282400a FIX SQL syntax error and CSRF check on vat reports 2019-09-11 13:57:15 +02:00
Laurent Destailleur
5f236fda2e More complete error message with hour/min/sec 2019-09-11 00:28:09 +02:00