Commit Graph

106839 Commits

Author SHA1 Message Date
Faustin
cd17fec00e FIX #20444 2022-06-07 10:40:44 +02:00
stickler-ci
ccfc730786 Fixing style errors. 2022-06-05 12:56:26 +00:00
Faustin
88cf8187b8 FIX #20444 2022-06-05 14:32:21 +02:00
Laurent Destailleur
4215237f64 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-03 14:09:00 +02:00
Laurent Destailleur
424d3e60da Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-03 14:08:50 +02:00
Laurent Destailleur
309eccc426 Fix phpcs 2022-06-03 14:08:04 +02:00
Laurent Destailleur
a19b5aafd8
Merge pull request #21114 from rycks/15_fix_collectormail
emailcollector.class.php : can't put a string in an array
2022-06-03 11:33:28 +02:00
Laurent Destailleur
303b6d6e9e Fix object not defined 2022-06-03 11:23:10 +02:00
Laurent Destailleur
b3d5258596
Merge pull request #21115 from rycks/15_fix_collectormail_hookmanager
emailcollector : hookmanager is null
2022-06-03 11:15:18 +02:00
Laurent Destailleur
be0123f8e1
Merge pull request #21119 from rycks/15_fix_emailcollector_scheduler
fix #21118: undefined function getAttachments
2022-06-03 11:14:00 +02:00
Eric Seigne
d950533bdb fix #21118: undefined function getAttachments 2022-06-02 23:55:58 +02:00
Eric Seigne
d15dee282e fix hookmanager is null 2022-06-02 22:24:22 +02:00
Laurent Destailleur
6f6d7d7f48 Fix ODT tags in BOM template
Conflicts:
	htdocs/core/class/commonobjectline.class.php
2022-06-02 20:18:11 +02:00
Laurent Destailleur
f53060fec3 FIX selection of type of invoice 2022-06-02 19:43:41 +02:00
Laurent Destailleur
f9f902f7f4 # WARNING: head commit changed in the meantime
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-02 19:37:47 +02:00
Laurent Destailleur
867168fcf4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-02 19:35:58 +02:00
Laurent Destailleur
10aa1a66bc Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-06-02 19:35:17 +02:00
Laurent Destailleur
12f3c016d3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-06-02 19:35:03 +02:00
Laurent Destailleur
4e033ba576 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-06-02 19:34:32 +02:00
Laurent Destailleur
ed5b8df385 FIX Bank account not set when creating invoice from order 2022-06-02 19:34:16 +02:00
Laurent Destailleur
c1637d9807 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-02 19:30:17 +02:00
Laurent Destailleur
10c101077b Fix auto check 2022-06-02 19:28:18 +02:00
Eric Seigne
d0101fdc90 errors is an array 2022-06-02 18:57:52 +02:00
Laurent Destailleur
6115461b30
Merge pull request #21102 from jyhere/patch-3
FIX errors in getLinesArray()
2022-06-02 14:50:40 +02:00
Laurent Destailleur
2fb5cdbb78
Merge pull request #21099 from aspangaro/14a35
Typo in CSS class
2022-06-02 14:46:16 +02:00
jyhere
f582814c0f
Update bom.class.php 2022-06-02 09:46:26 +02:00
Alexandre SPANGARO
7b55676b56 Merge branch '14.0' into 14a35 2022-06-01 23:12:02 +02:00
Alexandre SPANGARO
1dcd4d0ab6 Typo in CSS class 2022-06-01 23:11:20 +02:00
Laurent Destailleur
958833484f Fix bad var 2022-06-01 22:01:03 +02:00
Laurent Destailleur
169ebdef10 FIX #21051 2022-06-01 21:46:07 +02:00
ptibogxiv
b5197a07c1 Fix API knowledgemanagement 2022-06-01 21:42:18 +02:00
Laurent Destailleur
62ee0ff29c
Merge pull request #21054 from frederic34/patch-1
force refresh css
2022-06-01 21:34:23 +02:00
Laurent Destailleur
8f33d91783
Merge pull request #21073 from fappels/15_fix_update_buyprice_packaging
FIX: sql error when PRODUCT_USE_SUPPLIER_PACKAGING enabled.
2022-06-01 21:01:19 +02:00
Laurent Destailleur
c55c150937
Merge pull request #21082 from manu8170/15.0
Fix a few CSS errors
2022-06-01 19:56:03 +02:00
Laurent Destailleur
c300437e2a
Merge pull request #21084 from Silocan/13.0
fix for issue #16985 on v13
2022-06-01 19:55:08 +02:00
Laurent Destailleur
edc8bebf10
Merge pull request #21090 from Hystepik/develop_v15#1
Fix #21037 : select extrafield in knowledgerecord_list
2022-06-01 19:33:20 +02:00
Laurent Destailleur
32f60e191f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-06-01 15:57:35 +02:00
Laurent Destailleur
c3036d455a FIX #20902 2022-06-01 15:56:44 +02:00
lmarcouiller
67ac6b41f0 Fix #21037 : select extrafield in knowledgerecord_list 2022-06-01 15:07:14 +02:00
Nicolas
4696cd33d5 fix for issue #16985 2022-06-01 10:42:29 +02:00
Manu
008396b3df Fix a few CSS errors 2022-06-01 09:18:54 +02:00
Francis Appels
74346c6480 Fix sql error when PRODUCT_USE_SUPPLIER_PACKAGING enabled. 2022-05-31 16:59:57 +02:00
Laurent Destailleur
64a683c8e7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/projet/tasks/task.php
2022-05-31 14:33:19 +02:00
Laurent Destailleur
72b36b5a69 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-31 14:31:20 +02:00
Laurent Destailleur
c9eda09964 FIX ODT generation of BOM document 2022-05-31 14:30:47 +02:00
Frédéric FRANCE
489aa22e56
force refresh css 2022-05-30 14:14:18 +02:00
Laurent Destailleur
f5da6ebfe2
Merge pull request #21036 from OPEN-DSI/14.0_fix_show_category_on_sellist_extrafields
FIX: Show sellist type of extrafield when none category selected
2022-05-29 11:24:35 +02:00
Laurent Destailleur
3080605139
Merge pull request #21032 from FHenry/14.0_fix_extrafeilds_bad_display_inline
fix: extrafields chkbxlst or checkbox or badly displayed in line object
2022-05-29 11:20:07 +02:00
Laurent Destailleur
94424c7c2f
Merge pull request #21047 from aspangaro/15p2
Merge problem
2022-05-29 10:49:53 +02:00
Alexandre SPANGARO
e315f2d503 Merge branch '15.0' of https://github.com/Dolibarr/dolibarr into 15.0 2022-05-29 03:37:18 +02:00