lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
88,004 Commits 43 Branches 150 Tags 886 MiB
8ad5dc81de
Commit Graph

88004 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Laurent Destailleur
56a9f5c48b Fix 2020-09-18 14:49:20 +02:00
Laurent Destailleur
0b2aa2b01d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2020-09-18 14:48:40 +02:00
Laurent Destailleur
07556e061d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contact/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/document.php
 2020-09-18 14:46:23 +02:00
Alexandre SPANGARO
19c0738b14 Merge branch '10.0' into 10.0p46 2020-09-18 01:41:25 +02:00
Alexandre SPANGARO
f453e43cca FIX Yogosha report 4425 (backport) 2020-09-18 01:37:15 +02:00
Alexandre SPANGARO
142a27d472 Merge branch '10.0' of https://github.com/Dolibarr/dolibarr into 10.0 2020-09-18 01:22:21 +02:00
Laurent Destailleur
5d8b9056b4
Merge pull request #14755 from atm-lena/10.0_FIX_SendMailFromAContact 
FIX - Send mail from contact : select mail model
 2020-09-17 11:15:58 +02:00
Laurent Destailleur
ca52b5755f
Merge pull request #14756 from aspangaro/10.0_p42 
FIX Yogosha report 4425 (backport)
 2020-09-17 11:10:56 +02:00
Alexandre SPANGARO
55e3f8365e FIX Yogosha report 4434 (backport) 2020-09-16 21:36:55 +02:00
Alexandre SPANGARO
6928b6543c Revert "FIX Yogosha report 4425 (backport)" 
This reverts commit 23c4cfe913.
 2020-09-16 21:24:24 +02:00
Alexandre SPANGARO
bc457ebb66 Stickler 2020-09-16 21:22:59 +02:00
Alexandre SPANGARO
23c4cfe913 FIX Yogosha report 4425 (backport) 2020-09-16 20:55:28 +02:00
atm-lena
3182537566 FIX - Send mail from contact : select mail model 2020-09-16 17:19:25 +02:00
Laurent Destailleur
09558d0ce9 Fix MAIN_OPTIMIZEFORTEXTBROWSER 2020-09-16 13:15:57 +02:00
Laurent Destailleur
40acd8a386 Fix missing field canvas 2020-09-16 12:17:33 +02:00
Laurent Destailleur
907a1b56e6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-16 02:55:35 +02:00
Laurent Destailleur
33d7e766b6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-09-16 02:55:25 +02:00
Laurent Destailleur
1344874e43 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-09-16 02:54:47 +02:00
Laurent Destailleur
e1d117b52d
Merge pull request #14735 from atm-florianm/10.0_FIX_prelevement_top5_multicompany 
FIX: missing entity check
 2020-09-16 01:21:39 +02:00
Laurent Destailleur
06a73539fe
Merge pull request #14731 from ATM-Consulting/12.0_FIX_round_virtual_stock_value_on_reassort_list 
FIX 12.0 - round value of virtual stock on product stock reassort list
 2020-09-16 01:12:34 +02:00