Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-27 03:41:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
107,540 Commits 36 Branches 191 Tags
4e9c7afc01acfc68c74ca7c7f4707e95076d1137
Commit Graph

7457 Commits

Author SHA1 Message Date
Laurent Destailleur
a80a831ea3 Partnership module swtich from status development to experimental 2022-03-26 12:04:31 +01:00
Laurent Destailleur
6177e914e2 Merge pull request #20293 from atm-quentin/NEW_Availibility_dictionary_field 
NEW Availibility dictionnary new column unit and number
 2022-03-24 20:28:38 +01:00
atm-greg
07b0a4e516 Merge branch 'FIX_develop_missing_hooks_for_dictionaryadmin' of github.com:atm-greg/dolibarr into FIX_develop_missing_hooks_for_dictionaryadmin 2022-03-24 09:42:50 +01:00
atm-greg
7fb343b3ef add context 2022-03-24 09:42:02 +01:00
stickler-ci
efbaf030ec Fixing style errors. 2022-03-24 08:41:13 +00:00
atm-greg
f70ceb9398 add more specific context and doAction hook 2022-03-24 09:34:11 +01:00
Laurent Destailleur
ee611e8517 Hide not important options 2022-03-23 16:56:07 +01:00
Laurent Destailleur
94224e9275 Merge pull request #20255 from Easya-Solutions/new-proposal-clone-update-prices 
NEW option update prices on proposal cloning
 2022-03-23 16:49:12 +01:00
Laurent Destailleur
60d9db248f NEW The backup tools has an "lowmemory" for mysqldump on large database 2022-03-18 13:38:07 +01:00
Laurent Destailleur
5709f168a8 NEW: MAIN_MAIL_AUTOCOPY_TO can accept several email and special keys 2022-03-17 12:55:12 +01:00
lvessiller
a4508e656c NEW pull develop 2022-03-17 12:20:15 +01:00
Quentin VIAL-GOUTEYRON
4aa87f3f85 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_Availibility_dictionary_field 2022-03-17 11:37:19 +01:00
Laurent Destailleur
079fcacf13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/products.lang
 2022-03-17 00:16:14 +01:00
Laurent Destailleur
38a8f52e8b Missing init of model 2022-03-16 22:21:04 +01:00
Laurent Destailleur
983bfc4ca9 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
 2022-03-16 22:02:40 +01:00
Laurent Destailleur
f0161d1939 Fix revert a change was not a bug fix but a new feature 2022-03-16 21:59:58 +01:00
Laurent Destailleur
b0525c7a7f Merge pull request #20358 from atm-greg/FIX_missing_hooks_for_dictionaryadmin 
add more specific context and doAction hook
 2022-03-16 21:52:25 +01:00
Laurent Destailleur
ac22b1ce81 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-16 21:31:08 +01:00
Laurent Destailleur
fe5bf529db # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-03-16 20:34:30 +01:00
Alexandre SPANGARO
536bae97e8 FIX Update icon of module reception 2022-03-16 15:49:49 +01:00
Laurent Destailleur
cf13eb7ac7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-15 18:22:37 +01:00
Laurent Destailleur
69654b2b43 Fix sort not working on security page to test file upload 2022-03-15 12:14:46 +01:00
stickler-ci
43ab784be2 Fixing style errors. 2022-03-15 10:26:47 +00:00
atm-greg
0be989dceb add more specific context and doAction hook 2022-03-15 11:18:11 +01:00
Laurent Destailleur
06804c3547 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/template/myobject_list.php
 2022-03-11 17:04:23 +01:00
Laurent Destailleur
994ea81ce0 Fix test send email feature 2022-03-10 17:24:54 +01:00
Laurent Destailleur
88ffe1827e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/ajax/row.php
	htdocs/filefunc.inc.php
 2022-03-10 15:59:09 +01:00
Laurent Destailleur
0ec5595504 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/admin/tools/export_files.php
 2022-03-10 14:12:57 +01:00
Laurent Destailleur
f6cfe0557b FIX exclusion of other backup files into backup file 
Conflicts:
	htdocs/admin/tools/export_files.php
 2022-03-10 14:04:16 +01:00
Laurent Destailleur
eadd8da3d5 FIX exclusion of other backup files into backup file 2022-03-09 23:32:59 +01:00
Quentin VIAL-GOUTEYRON
7ae96b9839 convert number into qty 2022-03-09 10:34:23 +01:00
lvessiller
bbe3cfffb1 FIX stickler-ci 2022-03-08 10:17:47 +01:00
lvessiller
2561fcbb85 FIX translate update prices and add const in proposal setup 2022-03-08 10:06:57 +01:00
Quentin VIAL-GOUTEYRON
771fa0b6ed Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_Availibility_dictionary_field 2022-03-08 08:50:22 +01:00
Laurent Destailleur
9dfb7b4328 Revert "CSS" 
This reverts commit 7847e04925.
 2022-03-07 19:46:24 +01:00
Laurent Destailleur
7847e04925 CSS 2022-03-07 19:45:00 +01:00
Laurent Destailleur
1d9a79e980 css 2022-03-07 19:42:57 +01:00
Laurent Destailleur
0020f4e48a Merge pull request #20222 from thomas-Ngr/develop_new_ticket_notify_at_closing 
New - Ticket: notify contacts at closing
 2022-03-07 16:23:27 +01:00
Laurent Destailleur
1ce8ecb43d Clean setup page 2022-03-07 16:21:37 +01:00
Quentin VIAL-GOUTEYRON
af8ecd1a38 NEW Availibility dictionnary column unit and number 2022-03-07 16:02:49 +01:00
Alexandre SPANGARO
13b69bcf93 NEW Dictionaries - add possibility to manage countries in EEC 2022-03-04 07:00:02 +01:00
Laurent Destailleur
9bda7ba8c7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/doleditor.class.php
 2022-03-03 00:16:55 +01:00
Laurent Destailleur
8051128665 Split section experimental and stable 2022-03-02 11:37:19 +01:00
Laurent Destailleur
12b2a10865 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-03-01 18:15:13 +01:00
Laurent Destailleur
237b6fc922 Fix value recommended 2022-03-01 17:07:28 +01:00
Laurent Destailleur
358f21f06e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/core/customreports.php
 2022-03-01 16:48:29 +01:00
Laurent Destailleur
2a48dd349e Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5 2022-03-01 16:38:06 +01:00
Laurent Destailleur
d76e002822 Fix explanation on setup page 2022-03-01 15:17:03 +01:00
Laurent Destailleur
67881a7932 Merge branch 'develop' into 16a12_assets_code 2022-02-28 22:03:26 +01:00
Thomas Negre
e1e643efba Ticket : add option TICKET_NOTIFY_AT_CLOSING to ticket config panel 2022-02-28 17:10:45 +01:00