lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
103,596 Commits 43 Branches 150 Tags 886 MiB
514bcc87ea
Commit Graph

103596 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Laurent Destailleur
6a296bf6c2 Debug setup 2021-09-10 10:18:46 +02:00
Laurent Destailleur
7526cb3b8b Fix VAT rate label and add Mali default vat rate 2021-09-10 09:44:06 +02:00
Laurent Destailleur
d382e8d8c9 Clean setup and translation 2021-09-10 09:21:37 +02:00
Alexandre SPANGARO
2eef38e44a Fix PR 2021-09-10 09:12:11 +02:00
Alexandre SPANGARO
4bb612650b NEW Survey - Add a clickable link in email send 2021-09-10 09:09:39 +02:00
Alexandre SPANGARO
12eb16b8b6 Merge branch '15a12' of https://github.com/aspangaro/dolibarr into 15a12 2021-09-09 22:24:42 +02:00
Alexandre SPANGARO
3ea6314494 Remove $year 2021-09-09 22:24:24 +02:00
stickler-ci
dfe1576b8d Fixing style errors. 2021-09-09 20:18:47 +00:00
Alexandre SPANGARO
f31b7fa3c4 NEW Social Contributions - Add from/to on list 2021-09-09 22:14:26 +02:00
Laurent Destailleur
5a87d94b3c Add missing fields into llx_holiday 2021-09-09 20:38:25 +02:00
Laurent Destailleur
77247ec43a Add date valid/approval 2021-09-09 20:35:57 +02:00
Laurent Destailleur
f4786c8a0a Include ref into label of log history 
Conflicts:
	htdocs/holiday/card.php
 2021-09-09 19:50:39 +02:00
Laurent Destailleur
6465e8aa36 Include ref into label of log history 2021-09-09 19:47:51 +02:00
Laurent Destailleur
b8b5b97d78 Code comment 2021-09-09 19:47:15 +02:00
Laurent Destailleur
22c77e0ff9 Include ref into label of log history 2021-09-09 19:46:40 +02:00
Laurent Destailleur
b7f5b5f7ed
Merge pull request #18509 from aspangaro/15a8 
NEW IHM - Include new options to manage dashboard
 2021-09-09 19:26:24 +02:00
Laurent Destailleur
875b93aff2
Merge branch 'develop' into 15a8 2021-09-09 19:26:01 +02:00
Laurent Destailleur
520ce4c3ac Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-09-09 19:21:45 +02:00
Laurent Destailleur
ffd7f60830 FIX #18589 #18617 2021-09-09 19:21:32 +02:00
Laurent Destailleur
e43d91ee6e
Merge pull request #18665 from FHenry/14_fix_cat_icon_perms 
fix: do not display icon to edit/delete tags if user not authorize
 2021-09-09 19:00:04 +02:00
Laurent Destailleur
647fa49202
Merge pull request #18667 from lainwir3d/fix_order_shipment_list_duplicates 
FIX #18666 Order / Shipment list: Don't SQL JOIN category table when not necessary.
 2021-09-09 18:59:28 +02:00
Laurent Destailleur
fba9567003
Merge pull request #18664 from Fyroeo/develop 
CLOSE|Close #18663 Make "L'Annuaire des Entreprises" the default provider for SIREN verification.
 2021-09-09 18:58:11 +02:00