Commit Graph

105984 Commits

Author SHA1 Message Date
Laurent Destailleur
13f66df975 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-25 15:43:57 +01:00
Laurent Destailleur
c3a58ae303 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-25 15:43:42 +01:00
Laurent Destailleur
34d3fdad02
Merge pull request #19699 from atm-john/new_convert_setup_to_new_setup
NEW : convert situation setup to new setup system
2022-01-25 15:17:14 +01:00
Laurent Destailleur
5d176c75db
Merge pull request #19780 from aspangaro/16a7
NEW Thirdparty - Add rules customer accountancy code is mandatory to validate invoice
2022-01-25 15:00:47 +01:00
Laurent Destailleur
bb49dd195e
Merge pull request #19722 from bjoern86/patch-2
Adds possibility to add senders name to $formmail->fromname
2022-01-25 14:58:27 +01:00
Laurent Destailleur
b7b88865e6
Update card_presend.tpl.php 2022-01-25 14:58:00 +01:00
Laurent Destailleur
0d54f8df5f
Merge pull request #19847 from andreubisquerra/develop
Create new line when add ordered product in TakePOS
2022-01-25 14:29:07 +01:00
Laurent Destailleur
80e2c1c449
Merge pull request #19857 from cfoellmann/PR/tasks-fetch_optionals
getTasksArray() fetch_optionals to populate ExtraFields
2022-01-25 14:28:16 +01:00
Laurent Destailleur
4b00ddb0b5
Merge pull request #19866 from atm-gauthier/FIX_hrm_divers
FIX : rankorder + vacant positions
2022-01-25 14:02:44 +01:00
Laurent Destailleur
037a01aa79
Merge pull request #19918 from Je2fb/patch-3
Add new expression in Dynamic Price
2022-01-25 13:55:57 +01:00
Thomas Negre
bab35fd97d Fix ticket module : security check would prevent automatic fill of thirdparty fields when creating a ticket from thirdparty card. 2022-01-25 13:42:03 +01:00
Laurent Destailleur
54e5b5d369 Fix reponsive 2022-01-25 13:40:22 +01:00
Laurent Destailleur
8f0d42c378
Merge pull request #19920 from thomas-Ngr/develop_fix_ticket_remove_null_socid
Fix ticket module : security check breaks automatic.
2022-01-25 13:40:01 +01:00
Laurent Destailleur
e61340dad4
Merge pull request #19917 from bb2a/patch-1
FIX - Trigger
2022-01-25 13:34:06 +01:00
Thomas Negre
76b0dee58a Fix ticket module : security check would prevent automatic fill of thirdparty fields when creating a ticket from thirdparty card. 2022-01-25 12:20:12 +01:00
Christian Foellmann
15346d1c4a getTasksArray() fetch_optionals to populate ExtraFields 2022-01-25 09:17:30 +01:00
stickler-ci
d1dd70f9cc Fixing style errors. 2022-01-25 08:10:58 +00:00
Je2fb
a1f676eb8c
Add new expression in Dynamic Price
Add the expression supplier_min_price_with_discount for select the buy price.
2022-01-25 09:07:53 +01:00
Anthony Berton
13dbadf770
Update 15.0.0-16.0.0.sql 2022-01-25 00:19:41 +01:00
Anthony Berton
1d265d801a
Update 14.0.0-15.0.0.sql 2022-01-25 00:19:09 +01:00
Anthony Berton
1bd86e4bae
Update 14.0.0-15.0.0.sql 2022-01-25 00:11:04 +01:00
Anthony Berton
b64856807b
Update llx_c_action_trigger.sql 2022-01-25 00:09:41 +01:00
Laurent Destailleur
66287d645e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-24 23:59:02 +01:00
Laurent Destailleur
19dcc95d6f Fix tooltip for payment 2022-01-24 23:58:31 +01:00
Laurent Destailleur
9f377b7fe4 Better responsive on small screen 2022-01-24 23:58:16 +01:00
Laurent Destailleur
d560483875 Fix permission from group not found 2022-01-24 18:32:29 +01:00
Laurent Destailleur
bb11ab992b Trans 2022-01-24 17:50:35 +01:00
Laurent Destailleur
0e8b7ef656 Clean code 2022-01-24 16:38:25 +01:00
Laurent Destailleur
be01e3b1ac Migration 2022-01-24 14:48:18 +01:00
Laurent Destailleur
38dbaa3d07 Doc 2022-01-24 14:12:27 +01:00
Laurent Destailleur
8dbadc0aa8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-24 14:12:06 +01:00
Laurent Destailleur
6b5c0769b8 FIX #19786 2022-01-24 14:09:53 +01:00
Laurent Destailleur
1eb4d76253 Clean code 2022-01-24 13:15:32 +01:00
Laurent Destailleur
0e5907e220 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-24 12:50:35 +01:00
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
4d2832e8a0
Merge pull request #19764 from FHenry/dev_BDD_19763
NEW: #19763 DB change only - Can invoice task time per different services
2022-01-24 12:28:11 +01:00
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
Laurent Destailleur
da4f139f48
Merge pull request #10997 from altairis-tof/packbuyprice
NEW : use subproducts costprice and pmp if empty on father
2022-01-23 19:54:06 +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