Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

112767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
fd696f8c28 Prepare 14.0.2 2021-09-10 20:59:07 +02:00
Laurent Destailleur
f8b1e4d482 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-10 20:56:15 +02:00
Laurent Destailleur
edb1f31a19 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/accountancy/supplier/index.php
 2021-09-10 20:55:52 +02:00
Laurent Destailleur
9dcf3e49d0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2021-09-10 20:50:34 +02:00
Laurent Destailleur
2f4463c983 FIX Collapsing of extrafields has disappeared. 2021-09-10 20:49:22 +02:00
Laurent Destailleur
93fe2c5514
Merge pull request #18672 from aspangaro/15a14 
NEW Survey - Add a clickable link in email send
 2021-09-10 20:05:27 +02:00
Laurent Destailleur
5d512243b8
Merge pull request #18683 from FHenry/14_fix_search_evt_tab 
fix: on Event tabs, if no evt type use in filter, filter on label and state not apply
 2021-09-10 19:57:12 +02:00
Laurent Destailleur
4bbda0115c
Merge pull request #18682 from vincentjdc/product-price-in-product-select 
Add product-id and price-id in dataset of product select
 2021-09-10 19:51:24 +02:00
Laurent Destailleur
3980e4a32b
Merge pull request #18681 from FHenry/14_fix_extrafield_separator_type 
fix: show display/hide icon on extrafield type separator
 2021-09-10 19:49:26 +02:00
Laurent Destailleur
d50c518b70
Merge pull request #18676 from FHenry/14_fix_ajax_company_ambious_column 
fix: when COMPANY_SHOW_ADDRESS_SELECTLIST is 1 ajax call to company.php is broken
 2021-09-10 19:49:12 +02:00
Laurent Destailleur
78ec200c73
Merge pull request #18679 from FHenry/14_fix_cat_icon_perms 
fix: do not display icon to edit/delete tags if user not authorize
 2021-09-10 19:45:23 +02:00
Laurent Destailleur
7eb3725862
Merge pull request #18680 from Hystepik/develop#2 
Fix  #18604 : fix percentage on variant product
 2021-09-10 19:44:04 +02:00
Laurent Destailleur
3850542733 Fix security file 2021-09-10 19:20:19 +02:00
Laurent Destailleur
fcffcf3858 Remove useless css 2021-09-10 18:54:42 +02:00
Laurent Destailleur
649c618370 CSS 2021-09-10 17:58:41 +02:00
Laurent Destailleur
fe92c2605d Fix look and feel v14 2021-09-10 17:45:27 +02:00
Laurent Destailleur
75cd63a29b Fix css and missing test 2021-09-10 17:39:58 +02:00
Laurent Destailleur
32da715a6c Fix css and missing test 2021-09-10 17:39:08 +02:00
Laurent Destailleur
ae5b5defd5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-10 17:17:07 +02:00
Laurent Destailleur
a1e51e212e Array of fields accept 'tdcss' property 2021-09-10 17:16:42 +02:00
Alexandre SPANGARO
d32ab42654 Merge remote-tracking branch 'upstream/develop' into 15a14 2021-09-10 16:59:31 +02:00
Alexandre SPANGARO
26d5ccee61 NEW Survey - Add a clickable link in email send 2021-09-10 16:58:29 +02:00
Florian HENRY
e7eb17177d merge 2021-09-10 15:52:54 +02:00
Florian HENRY
865c5d19bf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_splitcalc_suggestd_code_compta 2021-09-10 15:51:36 +02:00
Florian HENRY
257686c2fe fix: on Event tabs, if no evt type use in filter, filter on label and state not apply 2021-09-10 15:45:03 +02:00
Vincent Dieltiens
b3984798ba Add product-id and price-id in dataset of product select 2021-09-10 15:32:16 +02:00
Florian HENRY
f3a555ec69 fix: show display/hide icon on extrafield type separator 2021-09-10 15:17:09 +02:00
lmarcouiller
3a1a688ab2 Fix #18604 : fix percentage on variant product 2021-09-10 15:03:08 +02:00
Florian HENRY
962bda810c Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_fix_cat_icon_perms 2021-09-10 15:00:54 +02:00
Laurent Destailleur
6810bbf3bb css 2021-09-10 14:28:38 +02:00
Christian Foellmann
29820f446d fix import of product desc without wrong linebreaks 2021-09-10 13:37:42 +02:00
Laurent Destailleur
6f3170494f
Merge pull request #18673 from cfoellmann/PR/input-desc 
fix import of product desc without wrong linebreaks
 2021-09-10 13:36:45 +02:00
Laurent Destailleur
c983e889b6
Merge pull request #18675 from Hystepik/develop#1 
Fix : Sql error on movement_list
 2021-09-10 13:35:58 +02:00
Laurent Destailleur
51d23250de
Update movement_list.php 2021-09-10 13:35:47 +02:00
Laurent Destailleur
43684f26c9
Merge pull request #18628 from lainwir3d/fix_rest_api_fix_self_user_info_read 
FIX #18627 REST API: Allow users with self read / modify rights to get own info
 2021-09-10 13:34:56 +02:00
Laurent Destailleur
b1c23b9a93
Update api_users.class.php 2021-09-10 13:31:17 +02:00
Laurent Destailleur
d4bfbc69a4
Update api_users.class.php 2021-09-10 13:30:28 +02:00
Laurent Destailleur
999ad7629f
Update api_users.class.php 2021-09-10 13:29:19 +02:00
Florian HENRY
ef888d5fca Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_fix_ajax_company_ambious_column 2021-09-10 13:26:05 +02:00
Florian HENRY
c66181a00e fix: when COMPANY_SHOW_ADDRESS_SELECTLIST is 1 ajax call to company.php is broken 2021-09-10 13:25:40 +02:00
Laurent Destailleur
17b9957197
Update api_users.class.php 2021-09-10 13:20:49 +02:00
lmarcouiller
b98f239739 Fix : Sql error on movement_list 2021-09-10 12:10:08 +02:00
Juanjo Menent
1eb4975a76 fix: Bad date creation for project clone 2021-09-10 11:44:58 +02:00
Laurent Destailleur
1504ff2d6e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-10 11:40:59 +02:00
Laurent Destailleur
11b6259130 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/langs/en_US/admin.lang
 2021-09-10 11:40:45 +02:00
Christian Foellmann
e5192de9f2 fix import of product desc without wrong linebreaks 2021-09-10 11:36:08 +02:00
Laurent Destailleur
1ddcd2e709
Merge pull request #18668 from aspangaro/15a12 
NEW Social Contributions - Add from/to on list
 2021-09-10 11:26:28 +02:00
Laurent Destailleur
4939cc9911 Fix trans 2021-09-10 11:04:59 +02:00
Laurent Destailleur
071a2959ab Fix trans 2021-09-10 11:04:49 +02:00
Alexandre SPANGARO
0aa0328313 Merge remote-tracking branch 'upstream/develop' into 15a14 2021-09-10 10:19:27 +02:00