Commit Graph

96128 Commits

Author SHA1 Message Date
Laurent Destailleur
69cd6f0a25 Remove hardcodes list of migration files 2022-01-23 23:37:59 +01:00
Laurent Destailleur
0a996f44be Merge pull request #19819 from OPEN-DSI/new-invoice-propagate-extrafields-on-credit-note
NEW pre-filled extra fields with slected credit note
2022-01-23 20:58:45 +01:00
stickler-ci
bc37e75e7f Fixing style errors. 2022-01-23 18:49:28 +00:00
Laurent Destailleur
7a8d0b698a Merge branch 'develop' into packbuyprice 2022-01-23 19:46:26 +01:00
Laurent Destailleur
dee020f286 Update getSupplierPrices.php 2022-01-23 19:40:23 +01:00
Laurent Destailleur
d41f3f1797 Merge pull request #19832 from aspangaro/15a14
NEW Create contract from invoice
2022-01-23 19:29:09 +01:00
Laurent Destailleur
45ffd68e92 Simplify code 2022-01-23 19:26:29 +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
78c7ed5b9f Merge pull request #19839 from dolibit-ut/patch-368
Update card.php
2022-01-23 18:21:32 +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
BB2A Anthony Berton
0552381e39 1 2022-01-23 16:36:47 +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
51521f2ff9 Merge branch 'develop' into patch-3 2022-01-23 13:42:05 +01:00
Laurent Destailleur
20ac994d0d Update emailcollector.class.php 2022-01-23 13:41:26 +01:00
Laurent Destailleur
e2a1662027 Merge pull request #19844 from nervo/patch-2
NEW: Add "addMoreActionsButtons" hook to subscription form
2022-01-23 13:08:58 +01:00
Laurent Destailleur
74a74829d3 Merge pull request #19851 from ptibogxiv/patch-460
NEW support user_modif in order
2022-01-23 13:06:55 +01:00
Laurent Destailleur
3f33f20fb1 Merge pull request #19840 from dolibit-ut/patch-369
add CANCEL Button
2022-01-23 13:06:23 +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
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
Laurent Destailleur
ba404493a2 Merge pull request #19865 from hregis/fix_avoid_warning
FIX avoid warning
2022-01-23 12:33:52 +01:00
Laurent Destailleur
9dd3d970bf Update commonobject.class.php 2022-01-23 12:31:30 +01:00
Laurent Destailleur
92b198d564 Merge pull request #19893 from atm-kevin/NEW_Stock_Columns_On_BOM
NEW : Display physical and virtual stock of the products when creating OF from a BOM
2022-01-23 12:29:26 +01:00
Laurent Destailleur
5abe6c0eb5 Merge pull request #19878 from bb2a/patch-1
NEW - Add substitutions "user numbers"
2022-01-23 12:23:28 +01:00
Laurent Destailleur
3bea78726a Merge pull request #19888 from bb2a/patch-2
Update formated substitution
2022-01-23 12:22:32 +01:00
Philippe GRAND
fefbaa739a fix : bad path 2022-01-23 12:21:15 +01:00
Laurent Destailleur
9924333df8 Merge pull request #19883 from grandoc/new_branch_19_01_2022
fix : bad path
2022-01-23 12:20:40 +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
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