Commit Graph

109362 Commits

Author SHA1 Message Date
Laurent Destailleur
0bb7defa88 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/langs/en_US/errors.lang
	htdocs/projet/card.php
2022-06-01 16:04:11 +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
Laurent Destailleur
65913cdd15 Fix list of event empty. 2022-06-01 13:11:36 +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
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
Laurent Destailleur
571110f60a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2022-05-25 23:04:58 +02:00
Laurent Destailleur
639b6de8d4
Merge pull request #21023 from atm-orian/NEW_OF_Child_Orian
OF child Creation : redirection
2022-05-25 19:16:30 +02:00
Laurent Destailleur
6b476af7d7
Merge pull request #21017 from atm-john/small_css_fix
fix css
2022-05-25 19:11:04 +02:00
Laurent Destailleur
ddf3d0219c
Merge pull request #21022 from defrance/patch-193
fix PHP V8 warning
2022-05-25 19:10:48 +02:00
Laurent Destailleur
745987cffc
Merge pull request #21019 from defrance/patch-190
PHP V8 warning
2022-05-25 19:10:37 +02:00
Laurent Destailleur
4cca69706a
Merge pull request #20968 from Hystepik/develop#2
New : function dol_move_dir in htdocs/core/lib/files.lib.php
2022-05-25 19:06:57 +02:00
Laurent Destailleur
0bce06f5e0
Merge pull request #21020 from defrance/patch-191
php V8 Warning
2022-05-25 19:05:53 +02:00
Laurent Destailleur
bf88d64d5b Look and feel v16 2022-05-25 18:55:03 +02:00
Laurent Destailleur
068112bccd Fix trans 2022-05-25 18:19:46 +02:00
kamel
f1914ff66f FIX: Show sellist type of extrafield when none category selected 2022-05-25 18:02:18 +02:00
Laurent Destailleur
a8ca233712 css 2022-05-25 17:55:23 +02:00
Laurent Destailleur
ce395d6890
Merge pull request #20993 from atm-gauthier/fix_unidentified_lines_array_on_reception_card
FIX : Unidentified lines array on reception card
2022-05-25 17:02:29 +02:00
Laurent Destailleur
ab6a826459
Merge pull request #21018 from defrance/patch-189
php V8 warning
2022-05-25 17:01:34 +02:00
Florian HENRY
4e289741f9 fix: extrafields chkbxlst or checkbox or badly displayed in line object 2022-05-25 16:59:23 +02:00
Laurent Destailleur
3801884e3c
Merge pull request #21021 from defrance/patch-192
PHP V8 Warning
2022-05-25 16:58:43 +02:00
Laurent Destailleur
60dd526973
Merge pull request #21030 from Hystepik/develop#1
Fix : socialnetworks import in db and import model in import
2022-05-25 16:57:27 +02:00
Laurent Destailleur
1dd2ce0399
Merge pull request #21024 from atm-john/15.0_fix_btn_confirm_url
Fix btn confirm url
2022-05-25 16:56:54 +02:00
Laurent Destailleur
04d5dc4042
Merge pull request #21028 from dolibit-ut/patch-400
Update ChangeLog
2022-05-25 16:56:03 +02:00
Laurent Destailleur
d0b6daaf4c Fix length of field 2022-05-25 16:50:09 +02:00
lmarcouiller
1632b37045 fix : error of import model in import 2022-05-25 16:35:42 +02:00
lmarcouiller
b1481d8495 Fix : socialnetworks import in db 2022-05-25 16:05:02 +02:00
UT from dolibit
31b99e5f34
Update ChangeLog
- Sorting order  
- typing error
- one deletion:
NEW: MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER const in email collector   -- deleted because duplication of:   NEW: add MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER const to remove header stored by email collector
2022-05-25 12:43:04 +02:00
John BOTELLA
e07827a0be Fix btn confirm url 2022-05-25 10:03:08 +02:00
John BOTELLA
9d31d6448c Fix btn confirm url 2022-05-25 09:59:45 +02:00
BENKE Charlene
27e97b68ce
fix PHP V8 warning 2022-05-25 09:56:13 +02:00
Laurent Destailleur
9a7c28d61d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-05-25 09:12:59 +02:00
Laurent Destailleur
baae99fbb4 Support ZATCA 2022-05-25 09:06:59 +02:00
BENKE Charlene
17c5337312
PHP V8 Warning 2022-05-24 22:53:26 +02:00
stickler-ci
82cf96fb78 Fixing style errors. 2022-05-24 20:47:24 +00:00
BENKE Charlene
f17ae94206
php V8 Warning 2022-05-24 22:46:43 +02:00
BENKE Charlene
9ebfd30dcc
PHP V8 warning 2022-05-24 22:42:32 +02:00
BENKE Charlene
959278e315
php V8 warning 2022-05-24 22:36:16 +02:00
Laurent Destailleur
0e3d7c4e2e
Merge pull request #19099 from johnvan7/develop
New: receipt beep alternative and current date/time
2022-05-24 22:13:59 +02:00
Laurent Destailleur
8385ca604f
Merge pull request #20098 from atm-lena/NEW_OF_Child
Create MO Child
2022-05-24 22:00:19 +02:00
Laurent Destailleur
4c10c04f9f
Merge pull request #20495 from atm-john/new_fix_regression_select_extrafield_search
FIX : regression select extrafield search + fix function name
2022-05-24 21:55:33 +02:00
Laurent Destailleur
daccf603e5
Merge pull request #21003 from defrance/patch-185
FIX : bad object name
2022-05-24 21:52:24 +02:00
Laurent Destailleur
2cfb4c1fb9
Merge pull request #20990 from rycks/fix_modResource_depends_on_modResource
fix #20989 : modResource depends on modResource
2022-05-24 21:48:52 +02:00
Laurent Destailleur
bb758978ed
Merge pull request #21005 from defrance/patch-187
FIX V8 : warning if $objectsrc not defined
2022-05-24 21:47:51 +02:00
Laurent Destailleur
352df9254b
Merge branch 'develop' into fix_unidentified_lines_array_on_reception_card 2022-05-24 21:45:06 +02:00