lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
101,292 Commits 43 Branches 150 Tags 886 MiB
3ca1e1c4c0
Commit Graph

89409 Commits

Author SHA1 Message Date
Christophe Battarel
a15d895b4b fix badge status bgcolor 2021-07-12 17:00:42 +02:00
Laurent Destailleur
d3f324c2d4 Try a better fix for #18105 2021-07-12 16:55:16 +02:00
stickler-ci
5b1525e77c Fixing style errors. 2021-07-12 14:15:28 +00:00
lmarcouiller
cfb03f065c Fix #18110 : update of formticket.class.php 2021-07-12 16:12:28 +02:00
Théo David
12e327d6b4 fix: remove phpcs:enable tag 2021-07-12 14:37:07 +02:00
Théo David
b59c1f1a34 fix: rename select_tickets into selectTickets 2021-07-12 14:17:30 +02:00
Théo David
d8db447112 fix: rename select_tickets into selectTickets 2021-07-12 14:12:20 +02:00
Christophe Battarel
91d27a556c fix badge status bgcolor 2021-07-12 14:09:16 +02:00
Laurent Destailleur
6f4090f567
Merge pull request #18127 from evarisk-theo/add-ticket-categories-data-model 
add: ticket categories data model
 2021-07-12 13:19:47 +02:00
John BOTELLA
deb9a374f3 Fix ui event badge status 2021-07-12 12:28:21 +02:00
Laurent Destailleur
7533c9e3a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/interventions.lang
 2021-07-12 12:01:53 +02:00
Laurent Destailleur
0cde1cfc38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-12 11:56:13 +02:00
Laurent Destailleur
977600e3a5 v15 2021-07-12 11:55:30 +02:00
Laurent Destailleur
ac1999f59d FIX #18130 2021-07-12 11:08:32 +02:00
Laurent Destailleur
5319e1d266 Fix help 2021-07-12 10:56:01 +02:00
Laurent Destailleur
e989284f14 Fix setup help 2021-07-12 10:50:37 +02:00
Laurent Destailleur
aa8fc6ba83 css 2021-07-12 10:45:18 +02:00
Laurent Destailleur
aece3844c6 Fix better error message if password is empty 2021-07-12 10:35:25 +02:00
David
642d84a844 fix: code syntax 2021-07-12 09:26:18 +02:00
stickler-ci
ce9bd51cb2 Fixing style errors. 2021-07-12 07:17:08 +00:00
evarisk-theo
3bc2dec696
Merge branch 'Dolibarr:develop' into add-ticket-categories-views 2021-07-12 09:10:25 +02:00
evarisk-theo
41b0735150
Merge branch 'Dolibarr:develop' into add-ticket-categories-functions 2021-07-12 09:10:15 +02:00
evarisk-theo
8496c9e57f
Merge branch 'Dolibarr:develop' into add-ticket-categories-data-model 2021-07-12 09:09:53 +02:00
Laurent Destailleur
4b2bbd0364 Sync transifex 2021-07-11 20:27:03 +02:00
Laurent Destailleur
d91051488c
Merge pull request #18125 from fr69400/develop 
NEW add hookmanager on note pages
 2021-07-11 20:25:16 +02:00
Laurent Destailleur
c9242d83ab Clean code 2021-07-11 20:16:47 +02:00
Laurent Destailleur
fb13746644
Merge pull request #18019 from ATM-Consulting/NEW_develop_addFileIntoDatabaseIndex_facilitate_setting_description_and_keyword 
NEW: make it easier to set the `keyword`, `keywords` and `description` attributes of an ecm file object
 2021-07-11 20:15:29 +02:00
Laurent Destailleur
aeeb480f26 Fix v14 2021-07-11 20:04:16 +02:00
Laurent Destailleur
41016039b6 Fix missing very old table 2021-07-11 19:39:18 +02:00
Laurent Destailleur
ab030936c3 Fix missing commit on tables 2021-07-11 19:15:16 +02:00
Laurent Destailleur
032b44996c Debug v14 2021-07-11 19:09:51 +02:00
Laurent Destailleur
802ac58f9a Clean v14 2021-07-11 18:56:15 +02:00
stickler-ci
986e86e6ae Fixing style errors. 2021-07-11 07:57:19 +00:00
fr69400
4d12c6eff6
Update recruitmentjobposition_note.php 2021-07-11 09:57:04 +02:00
stickler-ci
9ec1e7d50e Fixing style errors. 2021-07-11 07:55:48 +00:00
fr69400
e43da11ac8
Update workstation_note.php 2021-07-11 09:55:33 +02:00
fr69400
931d939d74
Update note.php 2021-07-11 09:55:18 +02:00
stickler-ci
8d75d37cad Fixing style errors. 2021-07-11 07:54:50 +00:00
fr69400
d5c8243a12
Update note.php 2021-07-11 09:54:35 +02:00
stickler-ci
b5606e3181 Fixing style errors. 2021-07-11 07:54:28 +00:00
fr69400
7e4cf44ed3
Update note.php 2021-07-11 09:54:13 +02:00
stickler-ci
8bf504d7f3 Fixing style errors. 2021-07-11 07:54:10 +00:00
fr69400
d35719b939
Update recruitmentcandidature_note.php 2021-07-11 09:53:57 +02:00
stickler-ci
e617f9ca38 Fixing style errors. 2021-07-11 07:53:53 +00:00
fr69400
f3ebbbbbc0
Update note.php 2021-07-11 09:53:38 +02:00
stickler-ci
b227a85d31 Fixing style errors. 2021-07-11 07:53:28 +00:00
fr69400
209fe70da0
Update note.php 2021-07-11 09:53:13 +02:00
stickler-ci
2d6efd2d4c Fixing style errors. 2021-07-11 07:53:01 +00:00
fr69400
eb6284e152
Update mo_note.php 2021-07-11 09:52:46 +02:00
stickler-ci
21e5d067e2 Fixing style errors. 2021-07-11 07:52:16 +00:00
fr69400
9a6cafb3c5
Update note.php 2021-07-11 09:52:01 +02:00
stickler-ci
2a1eb97b7d Fixing style errors. 2021-07-11 07:50:57 +00:00
fr69400
2e4b45488f
Update note.php 2021-07-11 09:50:42 +02:00
stickler-ci
c6fb975d51 Fixing style errors. 2021-07-11 07:50:38 +00:00
fr69400
1b2f0fc155
Update note.php 2021-07-11 09:50:24 +02:00
stickler-ci
6810391a6a Fixing style errors. 2021-07-11 07:50:20 +00:00
fr69400
aeba1dd2b2
Update partnership_note.php 2021-07-11 09:50:06 +02:00
stickler-ci
21e213507f Fixing style errors. 2021-07-11 07:49:56 +00:00
fr69400
35c0008fa0
Update myobject_note.php 2021-07-11 09:49:42 +02:00
stickler-ci
efbf9db105 Fixing style errors. 2021-07-11 07:49:39 +00:00
fr69400
29e0ce787f
Update note.php 2021-07-11 09:49:24 +02:00
stickler-ci
789cea9a85 Fixing style errors. 2021-07-11 07:49:05 +00:00
fr69400
7f18bdf85b
Update knowledgerecord_note.php 2021-07-11 09:48:50 +02:00
fr69400
ce4cab04d4
Update note.php 2021-07-11 09:48:33 +02:00
stickler-ci
48846888cc Fixing style errors. 2021-07-11 07:48:30 +00:00
fr69400
beaee09c98
Update note.php 2021-07-11 09:48:15 +02:00
fr69400
b91f5ad500
Update note.php 2021-07-11 09:47:58 +02:00
stickler-ci
d22ed4be82 Fixing style errors. 2021-07-11 07:47:50 +00:00
fr69400
ce9cf63c36
Update note.php 2021-07-11 09:47:36 +02:00
stickler-ci
84493fb55d Fixing style errors. 2021-07-11 07:47:32 +00:00
fr69400
cd55445905
Update note.php 2021-07-11 09:47:17 +02:00
stickler-ci
fdaf29fd65 Fixing style errors. 2021-07-11 07:47:08 +00:00
fr69400
2eb10c40b2
Update conferenceorboothattendee_note.php 2021-07-11 09:46:52 +02:00
stickler-ci
a8752bf097 Fixing style errors. 2021-07-11 07:46:34 +00:00
fr69400
556c2c7e5a
Update note.php 2021-07-11 09:46:15 +02:00
fr69400
d485d9d2fd
Update note.php 2021-07-11 09:45:59 +02:00
fr69400
c7ad0a59c9
Update note.php 2021-07-11 09:45:38 +02:00
fr69400
a27b0cd797
Update note.php 2021-07-11 09:45:22 +02:00
stickler-ci
cc4defd212 Fixing style errors. 2021-07-11 07:44:41 +00:00
fr69400
bf03a30a9f
Update note.php 2021-07-11 09:44:18 +02:00
fr69400
dafd0fb4b0
Update bom_note.php 2021-07-11 09:44:01 +02:00
stickler-ci
698f6db72e Fixing style errors. 2021-07-11 07:43:34 +00:00
fr69400
b8fd4394a1
Update note.php 2021-07-11 09:43:08 +02:00
stickler-ci
c7e6f66823 Fixing style errors. 2021-07-11 07:43:02 +00:00
fr69400
5ec903723d
Update note.php 2021-07-11 09:42:35 +02:00
Laurent Destailleur
e1e410ce91 Fix error message if file corrupted 2021-07-11 03:04:06 +02:00
Laurent Destailleur
93083e39c7 Fix using zip for integrity file 2021-07-11 02:58:18 +02:00
Laurent Destailleur
25d6f1a7c8 More complete exemple. 2021-07-11 01:58:37 +02:00
Laurent Destailleur
f18269bee1 Comment 2021-07-11 01:42:07 +02:00
Laurent Destailleur
bffbf4ae63
Merge pull request #18123 from OPEN-DSI/fix_00011 
FIX get categories linked to another object type
 2021-07-11 01:37:37 +02:00
Laurent Destailleur
070a23f455
Merge pull request #18121 from OPEN-DSI/fix_00010 
Fix hook constructCategory when several new categories is added by several modules
 2021-07-11 01:22:14 +02:00
Laurent Destailleur
e7b3280c17 Debug v14 with nojs 2021-07-11 01:12:52 +02:00
Laurent Destailleur
2091120d77 FIX #18122 2021-07-11 00:50:57 +02:00
Laurent Destailleur
97ac547fe2 Fix/debug the numbering module to autocalculate a new lot. 2021-07-11 00:44:36 +02:00
Laurent Destailleur
64bd4ef784 Fix component to select ticket groups 2021-07-10 20:09:51 +02:00
Laurent Destailleur
339fa6fbe3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-10 09:44:22 +02:00
Laurent Destailleur
f65aa6024f Add replace into forbidden sql in read-only mode 2021-07-10 09:42:20 +02:00
Laurent Destailleur
3fadd5cda5 NEW Add $dolibarr_main_db_readonly in conf.php for readonly access. 2021-07-09 19:37:12 +02:00
Laurent Destailleur
9e9af8548d Responsive 2021-07-09 18:47:34 +02:00
stickler-ci
4272f93aa4 Fixing style errors. 2021-07-09 16:41:41 +00:00
fr69400
e45d5c1d0d NEW add hookmanager on note pages 2021-07-09 18:36:21 +02:00
kamel
073ace3a9e FIX get categories linked to another object type 2021-07-09 16:23:46 +02:00
kamel
ec6fadf196 Fix hook constructCategory when several new categories is added by several modules 2021-07-09 15:29:39 +02:00
Laurent Destailleur
af8c973050 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-09 13:35:08 +02:00
Laurent Destailleur
b7c42c70ef Fix date for planned entries 2021-07-09 13:33:37 +02:00
Laurent Destailleur
2bef8a27c8 Trans 2021-07-09 12:34:51 +02:00
Laurent Destailleur
823d360202 Fix reposition 2021-07-09 12:15:43 +02:00
Laurent Destailleur
e51e31dc11
Merge pull request #18087 from atm-john/new_modal_btn_option 
New :  Add js confirm modal option to BTN created with dolGetButtonAction
 2021-07-09 10:09:08 +02:00
Florian Mortgat
924cff44f3 FIX PR feedback: in addFileIntoDatabaseIndex, return error if $object is set with an ID but without a table_element 2021-07-09 09:16:27 +02:00
Florian Mortgat
407f314498 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_develop_addFileIntoDatabaseIndex_facilitate_setting_description_and_keyword 2021-07-09 09:11:11 +02:00
Laurent Destailleur
d9475b8b2b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 23:46:35 +02:00
Laurent Destailleur
05953d61e4 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-08 23:45:50 +02:00
Laurent Destailleur
463fadb776 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-07-08 23:45:26 +02:00
Laurent Destailleur
5b6358d938 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-08 23:43:19 +02:00
Laurent Destailleur
fb9d16a84a
Merge pull request #18109 from altairisfr/lot_sn_masks 
FIX : don't display custom masks if they are not used
 2021-07-08 23:42:48 +02:00
Laurent Destailleur
2314c5dda2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-08 23:41:16 +02:00
Laurent Destailleur
aa9d98a336 Clean code of lib_notification. Now use cache like other js. 2021-07-08 23:20:55 +02:00
Laurent Destailleur
1306ff4c0b Clean code of lib_notification. Now use cache like other js. 2021-07-08 23:19:43 +02:00
ATM john
c2ce8e3c9d Fix comment 2021-07-08 22:29:41 +02:00
Laurent Destailleur
7d6b70f679 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 22:26:58 +02:00
Laurent Destailleur
4e69afb253
Merge pull request #18119 from aspangaro/14p4 
Update product/card.php
 2021-07-08 22:26:18 +02:00
Alexandre SPANGARO
f4005cd7a7 Update product/card.php 2021-07-08 22:24:20 +02:00
Laurent Destailleur
9512865896 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 22:18:11 +02:00
Laurent Destailleur
a916f668f9 Fix param of include js 2021-07-08 22:16:47 +02:00
Alexandre SPANGARO
be62c2f7f4 FIX Problem of z-index with popup and top menu 2021-07-08 22:11:41 +02:00
Laurent Destailleur
8f534b2c20 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 22:01:25 +02:00
Laurent Destailleur
6539961d58 Update card.php 2021-07-08 21:59:20 +02:00
Laurent Destailleur
5c8ac0cb9d Update card.php 2021-07-08 21:59:12 +02:00
Alexandre SPANGARO
d6be380816 FIX Accountancy - constant ACCOUNTANCY_USE_PRODUCT_ACCOUNT_ON_THIRDPARTY 2021-07-08 21:58:54 +02:00
Alexandre SPANGARO
cd215cda17 FIX Accountancy - if we define a date start, automatic binding try to solve old binding 2021-07-08 21:49:53 +02:00
Laurent Destailleur
12b1f5b23b Fix sql 2021-07-08 21:05:56 +02:00
Laurent Destailleur
797797d38b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 20:59:48 +02:00
Laurent Destailleur
ddc37ef38c Fix missing lang param 2021-07-08 20:58:19 +02:00
Laurent Destailleur
ec4533142a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-08 18:16:02 +02:00
Laurent Destailleur
1209253d57 Sanitize data 2021-07-08 18:12:15 +02:00
Laurent Destailleur
c3bf4f4b7f
Merge pull request #18113 from aspangaro/13p10 
Fix: formconfim if type radio must be :checked to get correct value
 2021-07-08 17:35:27 +02:00
Laurent Destailleur
b01468e47a
Merge pull request #18115 from ATM-Consulting/FIX_14.0_version_checker 
FIX: in kanban view, Dolibarr says "no updates available" even if upd…
 2021-07-08 17:34:47 +02:00
Laurent Destailleur
a44d646946 Fix to allow html content 2021-07-08 17:31:41 +02:00
Laurent Destailleur
e83df92359 Trans 2021-07-08 17:25:14 +02:00
Laurent Destailleur
ec09d95dc6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 17:24:39 +02:00
Laurent Destailleur
08adb73c6e Trans 2021-07-08 17:24:05 +02:00
altairis-noe
9983163e7a a few more getDolGlobalString 2021-07-08 17:21:36 +02:00
Florian Mortgat
38fac48c30 FIX: in kanban view, Dolibarr says "no updates available" even if updates are available 2021-07-08 17:18:47 +02:00
Alexandre SPANGARO
eaa6987e8b Fix: formconfim if type radio must be :checked to get correct value 2021-07-08 17:15:03 +02:00
altairis-noe
66590ba810 getDolGlobalString instead of $conf->global 2021-07-08 17:10:03 +02:00
Laurent Destailleur
310ebfbe2e
Merge pull request #18089 from atm-jpb/NEW_CMD_LIST_Add_Filter 
add filter
 2021-07-08 16:55:04 +02:00
altairis-noe
68442a2d13 stickler corrections 2021-07-08 16:49:13 +02:00
stickler-ci
327481dc78 Fixing style errors. 2021-07-08 14:47:38 +00:00
jpb
4df29292ab update comment 2021-07-08 16:44:24 +02:00
jpb
2e44acbc81 update comment 2021-07-08 16:43:05 +02:00
altairis-noe
cbd8fa3572 better element id 2021-07-08 16:42:54 +02:00
Laurent Destailleur
2e33d85b29
Merge pull request #18106 from EpixFr/develop 
NEW : Adding accounting export model for iSuite Expert
 2021-07-08 16:37:11 +02:00
Laurent Destailleur
fe20217bfe
Update accountancyexport.class.php 2021-07-08 16:36:53 +02:00
Laurent Destailleur
856d6eab4a
Merge pull request #18102 from altairisfr/expe_extra 
FIX display of extrafields on shipping lines
 2021-07-08 16:35:38 +02:00
Laurent Destailleur
b84fc94324
Merge pull request #18104 from fappels/14_fix_php8_warning_part4 
14 fix php8 warning on user page
 2021-07-08 16:31:25 +02:00
Laurent Destailleur
7870336f2a
Update card.php 2021-07-08 16:31:01 +02:00
Laurent Destailleur
a521a61f6b
Merge pull request #18108 from fappels/14_patch_product_class 
Remove duplicate code in product class
 2021-07-08 16:29:21 +02:00
altairis-noe
4e77a0d16a don't display custom masks if they are not used 2021-07-08 15:55:07 +02:00
Laurent Destailleur
752b55ac98 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 14:04:07 +02:00
Laurent Destailleur
ad11f7b66d Fix type of param 
Fix test of ckeditor for html doc
Fix when MAIN_RESTRICTHTML_ONLY_VALID_HTML is on
 2021-07-08 13:59:04 +02:00
Francis Appels
d6c327ed85 Remove duplicate code 2021-07-08 13:17:07 +02:00
Laurent Destailleur
1380344fdb Fix PHP 8 2021-07-08 12:17:32 +02:00
Laurent Destailleur
16ee47b12c Fix warning. 
Reduce memory need for getmin/max on large graphs.
 2021-07-08 11:13:15 +02:00
Laurent Destailleur
470f683d41 Clean code 2021-07-08 10:38:36 +02:00
Laurent Destailleur
34c7295cbc Make code more jquery compliant 2021-07-07 21:01:30 +02:00
Laurent Destailleur
4ada220083 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
 2021-07-07 19:18:32 +02:00
Laurent Destailleur
2acbdc2c80 Fix avoid error message 2021-07-07 18:51:00 +02:00
Laurent Destailleur
9308fab7ca Fix css for field pos/position in dictionary. 
Conflicts:
	htdocs/admin/dict.php
 2021-07-07 18:46:11 +02:00
Laurent Destailleur
6cfb3c0e16 Fix css for field pos/position in dictionary. 2021-07-07 18:41:37 +02:00
Laurent Destailleur
9d3f7c5cdd Support fk_parent into dictionary of ticket categories 2021-07-07 18:30:10 +02:00
stickler-ci
335c3029dc Fixing style errors. 2021-07-07 15:55:07 +00:00
EpixFr
edfd40719b Gestion des longueurs des comptes variables 2021-07-07 17:53:10 +02:00
EpixFr
45d36d9134 Ajout export compta iSuite Expert 2021-07-07 17:32:48 +02:00
Francis Appels
a942183127 better fix for optioncss 2021-07-07 15:02:00 +02:00
Francis Appels
0e2c57fe65 Fix php 8 warning on user page 2021-07-07 14:50:10 +02:00
Laurent Destailleur
01e272fb8c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-07 14:40:55 +02:00
Laurent Destailleur
2f25079981 Fix CSRF token generation must be fast, can have low entropy. 2021-07-07 14:40:47 +02:00
Laurent Destailleur
d97a95aa2a Fix CSRF token generation must be fast, can have low entropy. 2021-07-07 14:38:52 +02:00
Christophe Battarel
7e174412b7 FIX display of extrafields on shipping lines 2021-07-07 10:30:01 +02:00
stickler-ci
89ffa85290 Fixing style errors. 2021-07-07 06:40:12 +00:00
jpb
73bfeee4e7 fix comment 2021-07-07 08:37:49 +02:00
jpb
1a919c9f2b change comment 2021-07-07 08:35:31 +02:00
Laurent Destailleur
34f1cfe575 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/index.php
 2021-07-07 02:09:53 +02:00
Laurent Destailleur
3bc896be57 Debug v14 2021-07-07 02:07:35 +02:00
Laurent Destailleur
48435eb911 Fix navigation links 2021-07-07 01:58:06 +02:00
Laurent Destailleur
ff94c60cc7 Fix GETPOST with restricthtml 2021-07-07 01:45:31 +02:00
Laurent Destailleur
9d010f6d10 Look and feel v14 2021-07-07 01:24:40 +02:00
Laurent Destailleur
f050a38c6b Fix migration 2021-07-07 01:18:28 +02:00
Laurent Destailleur
f286017cab Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-06 19:03:55 +02:00
Laurent Destailleur
f761a2d3b8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-06 19:02:49 +02:00
Laurent Destailleur
9fc2d9fc03 Fix phpcs 2021-07-06 19:02:03 +02:00
Laurent Destailleur
82e96016cd
Merge pull request #18092 from fappels/14_fix_php8_part3 
Fix php8 warning
 2021-07-06 18:52:05 +02:00
Laurent Destailleur
70fa742939 Fix upgrade 2021-07-06 18:40:54 +02:00
Florian Mortgat
9f7be989c2 FIX 13.0 - fatal - missing inclusion of ajax.lib.php for calling ajax_autocompleter() 2021-07-06 17:38:37 +02:00
Francis Appels
874bf8ed44 backtopageforcancel can be set but empty 2021-07-06 16:39:58 +02:00
Laurent Destailleur
5444d45e68 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-06 16:13:40 +02:00
Laurent Destailleur
e1a45df0d8 Fix phpunit 2021-07-06 16:12:11 +02:00
Laurent Destailleur
ced4ea1314 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/tpl/objectline_view.tpl.php
 2021-07-06 15:59:59 +02:00
Laurent Destailleur
3c0e841877 Fix function not found 2021-07-06 15:55:43 +02:00
Laurent Destailleur
c23f46af9b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-06 15:35:39 +02:00
Laurent Destailleur
37801184c0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/holiday/class/holiday.class.php

Fix case of newByMonth
 2021-07-06 15:35:17 +02:00
Laurent Destailleur
4dd29af555 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-06 15:24:37 +02:00
Laurent Destailleur
a345d38320 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-07-06 15:24:01 +02:00
Laurent Destailleur
ed71888501
Merge pull request #18093 from FHenry/14_deveventorg 
new: working on conference or booth object and event type #FoundationFunding
 2021-07-06 15:05:09 +02:00
Lenin Rivas
a2288b9039 Update unicode and name of currency 2021-07-06 15:00:19 +02:00
damien clochard
4c5bb786ba FIX #18085: Migration 13 to 14 : Explicit cast when changing the type of llx_c_ticket_category.pos 2021-07-06 14:51:53 +02:00
Laurent Destailleur
1cfa43c085
Merge pull request #18088 from aspangaro/14p1 
FIX Accountancy - Link from admin
 2021-07-06 14:48:26 +02:00
Laurent Destailleur
ab14a07064 Trans 2021-07-06 11:58:05 +02:00
Laurent Destailleur
b4b939e1a9 Fix add migration of export/import profile when field name changes 2021-07-06 11:54:32 +02:00
Laurent Destailleur
7dab4ef571 Debug v14 2021-07-06 11:18:09 +02:00
Laurent Destailleur
9a3d2f13a6 Fix graph per type of expense report 2021-07-06 10:55:23 +02:00
Laurent Destailleur
555f1c719b Debug v14 2021-07-06 04:29:25 +02:00
Laurent Destailleur
61ed899608 Fix set discount on line in TakePos 2021-07-06 03:53:42 +02:00
Laurent Destailleur
407ad4d84d Fix bad value 2021-07-06 02:15:52 +02:00
Laurent Destailleur
c901e518a7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-06 02:11:28 +02:00
Laurent Destailleur
6e24ee48d4 Debug security page 2021-07-06 02:07:58 +02:00
Laurent Destailleur
3dff7e29cc Fix #yogosha6567 2021-07-06 01:44:05 +02:00
Laurent Destailleur
0dfa7bdbcc Add option MAIN_RESTRICTHTML_ONLY_VALID_HTML 2021-07-06 00:47:43 +02:00
Laurent Destailleur
0b7b9aae79 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-05 23:07:56 +02:00
Laurent Destailleur
2a5699a9a2 Merge 2021-07-05 23:07:40 +02:00
Laurent Destailleur
185ed5ceeb Code comment 2021-07-05 22:52:37 +02:00
Laurent Destailleur
f8eadf6fe1 Fix #yogosha6561 2021-07-05 22:42:48 +02:00
Laurent Destailleur
db95339085 Code comment 2021-07-05 20:32:05 +02:00
Laurent Destailleur
6a6216898e Fix unit price of expense report 2021-07-05 19:57:11 +02:00
Laurent Destailleur
8e7508dd9f Clean code 2021-07-05 19:50:16 +02:00
Laurent Destailleur
a04ed363c7 Look and feel v14 2021-07-05 19:28:50 +02:00
Laurent Destailleur
e2d7de3146 css 2021-07-05 18:56:24 +02:00
Laurent Destailleur
adec77e449 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-05 18:47:24 +02:00
Laurent Destailleur
abb1ad6bf0 Fix sql injection 2021-07-05 18:46:27 +02:00
Laurent Destailleur
3ac72fe73c Fix 2021-07-05 18:19:02 +02:00
Laurent Destailleur
38d272e31a Better position of fields 2021-07-05 18:16:52 +02:00
Laurent Destailleur
a14c68e996 Fix Hide sensitive key on info page 2021-07-05 18:14:52 +02:00
Laurent Destailleur
65adb16191 Fix increase entrophy of default password generation. 2021-07-05 17:55:17 +02:00
Laurent Destailleur
f648185839 Fix phpcs 2021-07-05 17:34:25 +02:00
Laurent Destailleur
87f9530272 Fix report by Ahsan Aziz (can reset the password of another user that 
did not request password reset).
 2021-07-05 17:29:10 +02:00
Laurent Destailleur
c0118c7de2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-07-05 17:08:27 +02:00
Laurent Destailleur
d414bcb572 Fix phpcs 2021-07-05 17:08:10 +02:00
Laurent Destailleur
fe5c4f4a0e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-05 17:04:38 +02:00
Marc de Lima Lucio
eea90cef56 FIX: holiday: balances not updated correctly with pgsql because of case sensitivity 2021-07-05 16:31:33 +02:00
Laurent Destailleur
8b07e99e05 Fix for ' inserted by CKEditor instead of ' 2021-07-05 16:08:47 +02:00
Laurent Destailleur
22c45fe7cc Trans 2021-07-05 15:44:11 +02:00
Florian HENRY
03f8557aaf fix template email 2021-07-05 15:36:41 +02:00
Florian HENRY
ca53abcef2 fix email template type 2021-07-05 15:35:05 +02:00
Florian HENRY
dd3c0ac5ab Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_deveventorg 2021-07-05 15:17:43 +02:00
Florian HENRY
cb2c10551b on goign 2021-07-05 15:17:21 +02:00
Francis Appels
1333ca3660 Fix php 8 warning on not set field keys 2021-07-05 14:51:34 +02:00
Francis Appels
df5878b3d6 Fix php 8 warning in inventory module 2021-07-05 14:45:00 +02:00
Laurent Destailleur
87241c94a3 Code comment 2021-07-05 14:41:40 +02:00
Laurent Destailleur
383c678200 Trans 2021-07-05 14:09:01 +02:00
Francis Appels
5d824899e5 Fix php 8 warning on home page 2021-07-05 13:44:05 +02:00