Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 02:11:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
87,753 Commits 36 Branches 191 Tags
45f834cb15122c034e1666a03e920f159183d7dd
Commit Graph

87753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
2f89d526eb Avoid to get a random result. 2020-10-01 16:43:56 +02:00
Laurent Destailleur
aaad3c3b75 Merge pull request #14886 from ptibogxiv/patch-367 
FIX stripe for connect mode
 2020-10-01 16:38:30 +02:00
ptibogxiv
4e16db1e5f Update paymentmodes.php 2020-10-01 12:22:53 +02:00
ptibogxiv
3f78d8fe25 Update stripe.class.php 2020-10-01 12:19:12 +02:00
ptibogxiv
676d70d86d FIX stripe for connect mode 2020-10-01 12:14:50 +02:00
stickler-ci
e558dc3f27 Fixing style errors. 2020-10-01 07:48:24 +00:00
John Botella
c16cd91d8e FIX default accountancy values and posted values 2020-10-01 09:40:11 +02:00
lvessiller
259737f082 FIX set paid on total discount of a product in cash desk 2020-09-30 15:09:45 +02:00
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
a6dcf5f1c1 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-09-29 00:51:02 +02:00
Laurent Destailleur
628978be53 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/adherents/card.php
 2020-09-28 21:16:25 +02:00
Laurent Destailleur
43c167f0c8 Fix init var 2020-09-28 20:47:36 +02:00
Sekan, Tobias
6c1700d84a Fix contratcs are always zero on statistics board 2020-09-28 17:22:11 +02:00
lvessiller
1b5a0ce3bf FIX uses price2numjs 2020-09-28 17:04:20 +02:00
Laurent Destailleur
57b7666bf1 FIX #14326 2020-09-27 22:20:24 +02:00
Laurent Destailleur
e388123a3a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-27 19:32:08 +02:00
Laurent Destailleur
4a7df01339 Fix the MAIN_EXTERNAL_SMTP_SPF_STRING_TO_ADD should be 
MAIN_EXTERNAL_MAIL_SPF_STRING_TO_ADD
 2020-09-27 19:31:54 +02:00
Laurent Destailleur
0b82860582 Merge pull request #14447 from FHenry/11.0_fixmultidiroutput 
fix document.php external module multidiroutput
 2020-09-27 18:55:21 +02:00
Laurent Destailleur
5c9ad3ec9b Update files.lib.php 2020-09-27 18:55:09 +02:00
Florian HENRY
5ff7e37696 review code 2020-09-27 18:05:19 +02:00
Florian HENRY
b6b2553501 Merge branch '11.0' into 11.0_fixmultidiroutput 2020-09-27 18:02:22 +02:00
Laurent Destailleur
10ce4029d7 Merge pull request #14831 from hregis/12.0_ldap 
FIX Can create user but not update user with activedirectory
 2020-09-27 16:58:33 +02:00
Laurent Destailleur
9c49123a1f Merge pull request #14832 from suratica/12.0 
Bug fix last_gen should be date_last_gen
 2020-09-27 16:57:08 +02:00
root
fcbc48fa28 Bug fix last_gen should be date_last_gen 2020-09-25 14:24:26 +02:00
Laurent Destailleur
0dcd85485a Fix migration 2020-09-25 12:36:32 +02:00
Laurent Destailleur
7a9332815c Fix migration 2020-09-25 12:22:24 +02:00
Regis Houssin
f92f8d0fc4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-25 12:11:37 +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
019a825bf4 Merge pull request #14760 from aspangaro/10.0p46 
FIX Yogosha report 4434 (backport)
 2020-09-23 19:55:08 +02:00
Laurent Destailleur
93af72c272 Merge pull request #14805 from hansemschnokeloch/patch-1 
Fix label inversion
 2020-09-23 19:53:35 +02:00
Laurent Destailleur
5a93628611 Merge pull request #14806 from hregis/12_bug 
FIX missing field entity
 2020-09-23 19:45:05 +02:00
Laurent Destailleur
80ec1ad69f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-23 19:29:07 +02:00
Laurent Destailleur
905f676c71 Fix 12.0.3 2020-09-23 19:27:55 +02:00
Laurent Destailleur
dd8b5ce023 Merge pull request #14809 from atm-lena/11.0_FIX_DropColumnRank_MysqlPostgresql 
FIX - Backtick not work with postgresql
 2020-09-23 19:26:08 +02:00
Laurent Destailleur
693a8430a5 Prepare 12.0.4 2020-09-23 19:17:36 +02:00
atm-lena
0fc6e9b84f FIX - Backtick not work with postgresql 2020-09-23 10:54:49 +02:00
Regis Houssin
fcfe5423f4 FIX missing field entity 2020-09-22 16:34:38 +02:00
Pascal Hubrecht
6d7f5ef0a8 Fix label inversion 
Private and public labels where inverted.
 2020-09-22 12:40:26 +02:00
Laurent Destailleur
438e884c01 Fix phpcs 12.0.3 2020-09-21 14:17:05 +02:00
Laurent Destailleur
c4ef21a8f2 Increase timeout delay for install 2020-09-21 14:04:46 +02:00
Laurent Destailleur
3ca379c9e6 FIX Restore multiselect (selection of prospect level) 
Conflicts:
	htdocs/core/class/html.form.class.php
 2020-09-21 12:22:57 +02:00
Laurent Destailleur
83bb3bdb00 12.0.3 2020-09-20 20:03:18 +02:00
Laurent Destailleur
dc562be441 Prepare 12.0.3 2020-09-20 20:02:19 +02:00
Alexandre SPANGARO
f8065eb4ed Merge branch '10.0' into 10.0p46 2020-09-19 03:43:33 +02:00
Alexandre SPANGARO
74c452678a Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0 2020-09-19 03:37:58 +02:00
Laurent Destailleur
4decf20aaa Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-18 14:56:38 +02:00
Laurent Destailleur
5d3168c2a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-09-18 14:55:58 +02:00
Laurent Destailleur
37c9afebd9 Fix regression 2020-09-18 14:55:32 +02:00
Laurent Destailleur
8740778aa8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-18 14:51:26 +02:00
Laurent Destailleur
f09aea90df Fix bad test 2020-09-18 14:51:04 +02:00