lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
107,112 Commits 43 Branches 150 Tags 886 MiB
643f4c8bdc
Commit Graph

107112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Francis Appels
8da6d4b637 Fix modulebuilder for object sharing. 2022-06-15 14:53:44 +02:00
NASDAMI Quatadah
c2213d6b1d set -e to set +e 2022-06-15 14:51:03 +02:00
Laurent Destailleur
d2970f7b5e
Merge pull request #21230 from badre-agtaib/import2 
FIX #21138
 2022-06-14 16:18:25 +02:00
Laurent Destailleur
601b830f6e
Merge pull request #21270 from Dolibarr/revert-21240-15.0_FIX_MissingTimeSpentListMenu 
Revert "15.0 fix missing time spent list menu"
 2022-06-14 14:41:47 +02:00
Laurent Destailleur
e62abce78c
Revert "15.0 fix missing time spent list menu" 2022-06-14 14:41:16 +02:00
Laurent Destailleur
507e23c154
Merge pull request #21240 from atm-lena/15.0_FIX_MissingTimeSpentListMenu 
15.0 fix missing time spent list menu
 2022-06-14 14:39:21 +02:00
Laurent Destailleur
a2c2ca2074 Fix phpcs 2022-06-13 15:10:35 +02:00
stickler-ci
fb0690d6ef Fixing style errors. 2022-06-13 12:38:14 +00:00
atm-lena
41db1c5359 Clean code 2022-06-13 14:31:19 +02:00
atm-lena
b230497e4b FIX : missins time spent list menu 2022-06-13 14:29:18 +02:00
Laurent Destailleur
d48477ab05 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-13 13:32:27 +02:00
Laurent Destailleur
12ee8eb40b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2022-06-13 13:32:11 +02:00
Laurent Destailleur
d44df3a440 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-13 13:27:50 +02:00
Laurent Destailleur
cedf6f8057 # WARNING: head commit changed in the meantime 
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
 2022-06-13 13:26:59 +02:00
Laurent Destailleur
2d9a9ddd22
Merge pull request #21235 from Silocan/payment-duplicate-bank-transaction 
fix: remove duplication bank transaction
 2022-06-13 12:42:42 +02:00
Nicolas F
5decd00149
fix: remove duplication bank transaction 
do not duplicate previous bank transaction when value is 0
 2022-06-13 10:40:41 +00:00
bagtaib
683cc5594f FIX #21138 2022-06-13 01:58:48 +02:00
Laurent Destailleur
fd92cfac07
Merge pull request #21223 from fboitel/fix#20444 
Fix#20444
 2022-06-12 19:02:55 +02:00
fboitel
7cc9dbe5d4
Merge branch 'Dolibarr:15.0' into 15.0 2022-06-12 14:48:39 +02:00
Laurent Destailleur
88fc3a4d21
Merge pull request #21186 from Quatadah/fix18704 
FIX #18704
 2022-06-12 12:25:34 +02:00
Laurent Destailleur
8d2ae444ad
Merge pull request #21193 from aspangaro/14p35 
FIX #20527 Accountancy - Unbalanced entry proposed when an employee are declared on a social contribution
 2022-06-12 11:57:50 +02:00
Laurent Destailleur
89e3a344ac
Merge pull request #21201 from fappels/15_reception_list_search_date 
Fix reception list for search date extrafield
 2022-06-12 11:54:19 +02:00
Laurent Destailleur
3a1c8206f1
Merge pull request #21203 from fboitel/fix#21093 
FIX#21093
 2022-06-12 11:48:14 +02:00
Faustin
71ef074987 FIX#21093 2022-06-11 00:41:15 +02:00
Faustin
ef959ecddd FIX#21093 2022-06-11 00:18:38 +02:00
Francis Appels
eb7fcb2f9b Fix reception list for search date extrafield 2022-06-10 13:24:39 +02:00
Quatadah Nasdami
b63b7b242d
Delete .phpunit.result.cache 2022-06-09 19:32:38 +02:00
Alexandre SPANGARO
82d1cb4682 FIX #20527 Accountancy Unbalanced entry proposed when an employee are declared on social contribution 2022-06-09 17:30:16 +02:00
NASDAMI Quatadah
793e95d88c fixing bug (colspan should be int) 2022-06-09 14:04:32 +02:00
NASDAMI Quatadah
3d0a8dd595 running phpcs one last time 2022-06-09 13:29:49 +02:00
NASDAMI Quatadah
ef8b041ac6 resolving phpcs errors 2022-06-09 13:29:02 +02:00
stickler-ci
7b3fe948a0 Fixing style errors. 2022-06-09 11:20:59 +00:00
NASDAMI Quatadah
e729d76833 removing some spaces 2022-06-09 13:19:26 +02:00
NASDAMI Quatadah
ea720e25e5 Fixing bug 20500 2022-06-09 13:17:32 +02:00
NASDAMI Quatadah
7f86c53b3e fixing bug 20500 2022-06-09 13:15:40 +02:00
NASDAMI Quatadah
1dcc701251 Fixing bug 20500 2022-06-09 13:10:46 +02:00
Laurent Destailleur
62d2084237 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-09 12:49:49 +02:00
Laurent Destailleur
974a1c2c6d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-09 12:48:51 +02:00
Laurent Destailleur
a4ca81d4ce FIX #21174 2022-06-09 12:46:13 +02:00
Laurent Destailleur
aeb4287d25
Merge pull request #21143 from fboitel/14.0 
FIX #20696
 2022-06-09 03:11:23 +02:00
Laurent Destailleur
8280447f3e # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-06-09 03:09:37 +02:00
Laurent Destailleur
900c71b5d6 Fix can add an empty line in tmp edit mode of transation 2022-06-09 03:07:11 +02:00
Laurent Destailleur
e10d89dd36 Fix regression 2022-06-09 03:00:51 +02:00
Laurent Destailleur
9c71ae5f0c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-09 02:59:10 +02:00
Laurent Destailleur
5fec04e3ae Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/societe/class/societe.class.php
 2022-06-09 02:58:44 +02:00
bagtaib
7a20b3dcec FIX #21140 
Conflicts:
	htdocs/societe/class/societe.class.php
 2022-06-09 02:52:54 +02:00
Faustin
f0a8765ee6 FIX #20696 2022-06-08 16:05:44 +02:00
Laurent Destailleur
79d3a35789
Merge pull request #21146 from FHenry/15_fix_filter_status_peruser 
fix: filter status(Todo,Done,Imcomplete,...) do not work on peruser.php actioncomm view
 2022-06-08 15:04:01 +02:00
Laurent Destailleur
fca92131b2
Merge pull request #21148 from ibuiv/15.0 
Fix: rollback on success create_individual
 2022-06-08 15:02:27 +02:00
Laurent Destailleur
871077d426
Merge pull request #21152 from daraelmin/patch-2 
Fix #21150 - Regression Can't insert manual lines
 2022-06-08 15:01:08 +02:00