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
106,821 Commits 35 Branches 179 Tags 1.7 GiB
6447c1e394
Commit Graph

26624 Commits

Author SHA1 Message Date
Laurent Destailleur
6447c1e394
Merge pull request #20076 from vincentjdc/html-field-moreparam-morecss 
Allow to add more CSS and more params on html fields
 2022-02-28 21:50:40 +01:00
Laurent Destailleur
835b0f5f19
Update doleditor.class.php 2022-02-28 21:45:04 +01:00
Laurent Destailleur
6a81ae1099
Merge pull request #20220 from hregis/fix_remove_duplicate_code 
FIX remove duplicated code
 2022-02-28 20:58:24 +01:00
Laurent Destailleur
c2fb5d577c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/14.0.0-15.0.0.sql
	htdocs/langs/en_US/banks.lang
	htdocs/projet/list.php
 2022-02-28 20:12:28 +01:00
Regis Houssin
e63e53e081 FIX remove duplicated code 2022-02-28 14:10:35 +01:00
Laurent Destailleur
b598671484 NEW ACE Editor is restored at same cursor position after a save 2022-02-27 14:46:40 +01:00
Laurent Destailleur
fb0e2f9c6c FIX #yogosha9095 2022-02-26 01:00:22 +01:00
Laurent Destailleur
eba20957f3 Fix CSS 
Conflicts:
	htdocs/projet/list.php
 2022-02-25 21:47:25 +01:00
Laurent Destailleur
acf6d19500 Fix CSS 2022-02-25 21:45:29 +01:00
Laurent Destailleur
488049c6a6 FIX bad position of extrafields for interventions 2022-02-25 20:36:40 +01:00
Laurent Destailleur
409da7f091 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-25 19:17:41 +01:00
Laurent Destailleur
f8a5749fc4 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-02-25 19:00:10 +01:00
Laurent Destailleur
ac67a5a2bb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-02-25 14:34:25 +01:00
Sylvain Legrand
cb86224613 new : allow to show all logos on a table 2022-02-25 13:17:05 +01:00
Laurent Destailleur
c097ee5331 FIX #yogosha9089 2022-02-25 01:49:38 +01:00
Laurent Destailleur
98da84f9b2 FIX #yogosha9086 2022-02-24 18:15:04 +01:00
Laurent Destailleur
ba3856f9e9 Fix regression 2022-02-24 14:21:28 +01:00
Laurent Destailleur
a6e7a41e98 FIX Reduce flash effect on collapse extrafield 
FIX Reduce flash effect on edit inline feature.
 2022-02-24 12:54:33 +01:00
Laurent Destailleur
118b211807 Fix error on null 2022-02-24 12:37:20 +01:00
Laurent Destailleur
2f0040e9c1 Fix phpunit 2022-02-23 19:24:17 +01:00
Laurent Destailleur
64ce13e273 Clean setup page 2022-02-23 13:20:14 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
77e2969411 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-22 22:27:32 +01:00
Laurent Destailleur
209ab708d4 FIX #hunterb812ea22-0c02-46fe-b89f-04519dfb1ebd 2022-02-22 21:24:34 +01:00
Laurent Destailleur
c63e2c2981 Website tables are created only if module enabled. 2022-02-22 19:15:37 +01:00
Laurent Destailleur
8cc0f3bb58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-02-22 18:47:26 +01:00
Laurent Destailleur
8a99bc3b04 Try a more complete sanitization 2022-02-22 18:41:14 +01:00
Marc de Lima Lucio
0e0dd1ec6c FIX: invoice pdf: lines originating from deposits were not detailed anymore 2022-02-22 17:42:11 +01:00
Laurent Destailleur
f544219d92 FIX permission to download files of expense report with readall. 2022-02-22 16:44:17 +01:00
Laurent Destailleur
ff0c4ef635
Merge pull request #19952 from thomas-Ngr/develop_new_ticket_display_statut_warning 
NEW : optional display warning icons on ticket list
 2022-02-22 01:35:33 +01:00
Laurent Destailleur
741fabb983
Merge pull request #20133 from atm-lena/NEW_InventoryExtrafields 
New inventory extrafields
 2022-02-22 00:58:42 +01:00
Laurent Destailleur
eede3aaf17 Fix #yogosha9033 2022-02-21 22:50:32 +01:00
Laurent Destailleur
82250fae62 Fix #yogosha8963 2022-02-21 21:45:28 +01:00
Laurent Destailleur
28ac6a7b55 NEW on redirect of page in website module, GET parameters are kept. 2022-02-21 19:46:11 +01:00
Laurent Destailleur
9dfdce03aa Work on generic reporting tool. 2022-02-21 19:09:26 +01:00
Laurent Destailleur
97ed94fbda NEW Support html content for multiselect component. 2022-02-21 16:54:07 +01:00
atm-lena
8bbbc843eb Ajout onglet paramètres "Inventaire extrafields" 2022-02-21 15:20:22 +01:00
Laurent Destailleur
00e6d2786d Do not use dol_hash anymore for the name of cookies. 2022-02-21 12:21:43 +01:00
Thomas Negre
ad3f7b531e add constants declarations in the module class 2022-02-21 11:50:28 +01:00
Thomas Negre
e8c48a06c0 Correct typos in ticket.lib 2022-02-21 11:42:09 +01:00
Laurent Destailleur
9e6f782907 Clean code 2022-02-21 11:26:10 +01:00
Laurent Destailleur
9a3d8022f3 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 21:53:38 +01:00
Laurent Destailleur
b0f538387e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/core/modules/import/import_xlsx.modules.php
 2022-02-18 21:50:08 +01:00
Laurent Destailleur
19f51347ea
Merge pull request #20111 from atm-greg/Fix_14.0_price_extrafields_rounding_and_currency 
fix rounding for price and display currency
 2022-02-18 20:19:02 +01:00
lvessiller
1107a60b58 FIX compute rule in FEC import 2022-02-18 16:53:55 +01:00
Laurent Destailleur
3b6f7bff66 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-18 16:32:51 +01:00
Laurent Destailleur
3d9cdbf136 FIX Debug v15 2022-02-18 16:24:11 +01:00
Laurent Destailleur
f4f03d03f2 Fix link 2022-02-18 15:23:13 +01:00
Laurent Destailleur
e41e0f069a Fix creator in PDF. Add log to help to find strange bug 2022-02-18 15:09:52 +01:00
Laurent Destailleur
61e91656e0 FIX setup of member module 
FIX generation of business cards
 2022-02-18 14:14:34 +01:00