Commit Graph

105886 Commits

Author SHA1 Message Date
Laurent Destailleur
8ceec043e8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-24 12:50:10 +01:00
Laurent Destailleur
00eabded6d Fix phpunit 2022-01-24 12:43:42 +01:00
Laurent Destailleur
053b402202 Fix for notes standardization #19835 2022-01-23 19:20:13 +01:00
Laurent Destailleur
2985c03f9f Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-23 18:53:50 +01:00
Laurent Destailleur
daca510fa6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	build/docker/docker-compose.yml
2022-01-23 18:52:47 +01:00
Laurent Destailleur
307338e3f4
Merge pull request #19836 from atm-john/15.0_fix_validate_lang_and_test
FIX :  lang load in validate class and fix test for numeric values
2022-01-23 18:24:11 +01:00
Laurent Destailleur
67fa80cf18
Merge pull request #19841 from fappels/15_fix_dolibarr_export
Fix view after generate database export
2022-01-23 18:20:36 +01:00
Laurent Destailleur
909c974bad
Merge pull request #19897 from smil2k/bug/19896
fix docker build setup
2022-01-23 17:53:44 +01:00
Cserveny, Tamás
adf7492575 migrate missing properties 2022-01-23 16:26:14 +01:00
Laurent Destailleur
acafc69baa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-23 16:13:20 +01:00
Laurent Destailleur
07ef603c2c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-01-23 16:12:37 +01:00
Laurent Destailleur
251609eb26 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-01-23 16:12:27 +01:00
Laurent Destailleur
e392d98beb Fix hook 2022-01-23 13:43:48 +01:00
Laurent Destailleur
a0154503f4
Merge pull request #19838 from OPEN-DSI/v12-fix-supplier-order-print-error
FIX replace print error with event message when error on update line …
2022-01-23 13:37:09 +01:00
Laurent Destailleur
8b826949f5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-23 13:04:48 +01:00
Laurent Destailleur
0ee0bfed85 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	htdocs/fourn/commande/card.php
	test/phpunit/testvirus.txt
2022-01-23 13:04:37 +01:00
Laurent Destailleur
b5a287875c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-23 12:59:44 +01:00
Laurent Destailleur
4888d127e0 Make virus file no more detected. 2022-01-23 12:59:15 +01:00
Laurent Destailleur
8dc9489c31
Merge pull request #19880 from atm-lena/14.0_FIX_CreateEventFromContract
14.0 fix create event from contract
2022-01-23 12:55:59 +01:00
Laurent Destailleur
6c78ba5c71
Merge pull request #19884 from smil2k/bug/17058
Check if the lines in create is type object (like supplier invoice)
2022-01-23 12:54:17 +01:00
Laurent Destailleur
698e7f4b54
Merge pull request #19889 from Hystepik/develop_v15#1
Fix : remove false positive on carriage return on inventory scan
2022-01-23 12:35:54 +01:00
Philippe GRAND
fefbaa739a fix : bad path 2022-01-23 12:21:15 +01:00
Laurent Destailleur
ef0a08ad1c
Merge pull request #19570 from Easya-Solutions/12.0
FIX: Update swiftmailer librairies
2022-01-23 12:15:43 +01:00
Laurent Destailleur
9be8c0b474
Merge pull request #19885 from alsoft10/develop
PR REQUEST #19679
2022-01-23 12:12:53 +01:00
Laurent Destailleur
dfcaeea9d1
Merge pull request #19900 from thomas-Ngr/develop_new_ticket_check_notify_tier_at_create
NEW option to default check "notify tier at creation" in ticket module
2022-01-23 12:11:10 +01:00
Laurent Destailleur
255ac69a0d
Update card.php 2022-01-23 12:10:52 +01:00
Laurent Destailleur
9424cebf0c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-23 12:07:19 +01:00
Laurent Destailleur
9049134556 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-23 12:07:11 +01:00
Laurent Destailleur
a16d47c78e Close #19890 2022-01-23 12:06:40 +01:00
Laurent Destailleur
0e75d024a6
Merge pull request #19901 from thomas-Ngr/develop_new_auto_read_ticket
NEW allow a ticket to be automatically marked as read
2022-01-23 12:05:24 +01:00
Laurent Destailleur
bb6f571633 Doc 2022-01-23 12:01:50 +01:00
Cserveny, Tamás
ca588852df fix code review errors 2022-01-23 12:00:33 +01:00
stickler-ci
bd6fdbd3be Fixing style errors. 2022-01-23 12:00:24 +01:00
Cserveny, Tamás
93edbf1cda missing supplierorder api 2022-01-23 12:00:16 +01:00
Laurent Destailleur
8f6f1c93aa
Merge pull request #19898 from smil2k/feature/18411
Missing supplierorder api
2022-01-23 11:59:08 +01:00
Laurent Destailleur
4981f418e8
Merge pull request #19899 from atm-jpb/fix_15.0_modelMailWidth
FIX : 15.0 add minwidth to selectArray mail model
2022-01-23 11:58:09 +01:00
Laurent Destailleur
66d7271c94
Merge pull request #19904 from hregis/fix_use_new_function_prefix
NEW add modifications for new function "$db->prefix()"
2022-01-23 11:57:42 +01:00
Laurent Destailleur
e06ca2ea08 css 2022-01-23 02:38:34 +01:00
Laurent Destailleur
0c8cdad1e9 css 2022-01-23 02:22:12 +01:00
Laurent Destailleur
e3cf5fecbe css 2022-01-23 02:06:47 +01:00
Laurent Destailleur
a16293f9b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-22 17:27:57 +01:00
Laurent Destailleur
2f1805beb8 Fix #yogosha8532 2022-01-22 17:14:45 +01:00
Laurent Destailleur
e0956c1765 Fix missing token, missing reposition, missing modulepart 2022-01-22 15:33:47 +01:00
Laurent Destailleur
14af64d143 NEW Can removed doc templates from setup page of thirdparty 2022-01-22 15:09:14 +01:00
Laurent Destailleur
caf7e7d7d5 FIX action must be protected with a permission check 2022-01-22 15:07:53 +01:00
Laurent Destailleur
1790ba2820 NEW Can removed doc templates from setup page of thirdparty 2022-01-22 15:06:05 +01:00
Laurent Destailleur
4750f6bbc6 FIX action must be protected with a permission check 2022-01-22 15:05:41 +01:00
Laurent Destailleur
6baa0939ce NEW Can add a tooltip after the combo list of doc templates 2022-01-22 14:03:39 +01:00
Laurent Destailleur
284fcf3ad5 FIX Company logo not found in some cases on some templates 2022-01-22 13:19:29 +01:00
Laurent Destailleur
65e58943b3 FIX exclude the pdf png preview files from backup 2022-01-21 20:57:45 +01:00