Commit Graph

100555 Commits

Author SHA1 Message Date
Laurent Destailleur
b5c88d5817 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2021-05-11 20:15:32 +02:00
Laurent Destailleur
c2fa19a0b4 fix phpcs 2021-05-11 20:15:20 +02:00
Laurent Destailleur
971d611eb6 Fix phpcs 2021-05-11 20:12:25 +02:00
Frédéric FRANCE
92c6a616a4
remove debug 2021-05-11 20:03:12 +02:00
Laurent Destailleur
63db00486d Fix setup 2021-05-11 19:57:20 +02:00
Laurent Destailleur
b090516a73
Merge pull request #17527 from daraelmin/daraelmin-setup-newmembermorphy
Fix missing FORCEMORPHY in new member form setup
2021-05-11 19:52:35 +02:00
Laurent Destailleur
780254bfd4
Merge pull request #17533 from daraelmin/daraelmin-mailing-subskey
New substitution key for member new form url in mailing
2021-05-11 19:41:12 +02:00
Laurent Destailleur
6591c3f50e
Merge pull request #17538 from AlexisLaurier/fix/restrictedAreaPaymentFournDelete
bug fix - deletion of invoice supplier payment
2021-05-11 19:27:05 +02:00
Laurent Destailleur
52d4e7e2a8
Merge pull request #17535 from frederic34/uniformizecode
uniformize supplier cards
2021-05-11 19:25:26 +02:00
Laurent Destailleur
6bec5d7e3c
Update document.php 2021-05-11 19:23:46 +02:00
Laurent Destailleur
70451050ae
Update contact.php 2021-05-11 19:22:46 +02:00
Laurent Destailleur
1c477d2131
Update card.php 2021-05-11 19:21:38 +02:00
Laurent Destailleur
bccd1b9a41
Update prelevement.php 2021-05-11 19:21:08 +02:00
Laurent Destailleur
74de4edc42
Merge pull request #17531 from daraelmin/daraelmin-patch-1
Fix vulnerability - Wrong permission in adherent card
2021-05-11 19:17:33 +02:00
Laurent Destailleur
0ff473aba7
Update card.php 2021-05-11 19:15:30 +02:00
Laurent Destailleur
fe21c318d4
Merge pull request #17534 from ibuiv/patch-8
Fix bug PMP per entity
2021-05-11 19:13:53 +02:00
Laurent Destailleur
8336f56b40
Merge pull request #17539 from AlexisLaurier/fix/elephantClientCodeVerifDispoMultiEntity
add entity check on verif_dispo mod_codeclient_elephant
2021-05-11 19:13:17 +02:00
Laurent Destailleur
e3cb04e235
Merge pull request #17540 from ibuiv/ibuiv-supplierorder-hooks
New Hooks for Supplier Order Card tabs
2021-05-11 19:12:24 +02:00
Laurent Destailleur
a4f9025843
Merge pull request #17541 from fappels/14_debug_dispatch
Fix edit-delete from dispatch card when reception activated.
2021-05-11 19:03:18 +02:00
Laurent Destailleur
8024e769fd
Merge pull request #17552 from aspangaro/14b2
Fix Title customer proposal
2021-05-11 18:55:02 +02:00
Laurent Destailleur
fe4227d04d
Merge pull request #17546 from kastoras/fix_get_documents_response_problem
Fix #17545 /get /documents response data problem
2021-05-11 18:53:02 +02:00
Laurent Destailleur
3aac68d65b
Update ecmfiles.class.php 2021-05-11 18:52:49 +02:00
Laurent Destailleur
3cce99d706
Merge pull request #17548 from aspangaro/14b1
FIX Migration script
2021-05-11 18:50:43 +02:00
Laurent Destailleur
c37588025f
Update 13.0.0-14.0.0.sql 2021-05-11 18:50:02 +02:00
Laurent Destailleur
dce5ce66eb
Merge pull request #17563 from frederic34/filecheck
align filecheck code
2021-05-11 18:46:09 +02:00
Laurent Destailleur
e4aff1a97e
Merge pull request #17578 from frederic34/patch-4
fix php8 warning
2021-05-11 18:45:27 +02:00
Laurent Destailleur
fe9b6c0799
Merge pull request #17579 from frederic34/patch-5
fix $db in class
2021-05-11 18:45:01 +02:00
Laurent Destailleur
d4616ff0ac
Merge pull request #17549 from frederic34/patch-3
Delete files not needed
2021-05-11 18:44:34 +02:00
Laurent Destailleur
82400ca2a5
Merge pull request #17542 from atm-john/patch-2
FIX : var case
2021-05-11 18:43:57 +02:00
Laurent Destailleur
f5909be16f
Merge pull request #17551 from grandoc/new_branch_09_05_2021
comment translation
2021-05-11 18:43:31 +02:00
Frédéric FRANCE
dc90103526
Update document.php 2021-05-11 18:36:27 +02:00
Frédéric FRANCE
e0cc6a4981
fix $db in class 2021-05-11 18:34:43 +02:00
Frédéric FRANCE
23858f0ab1
fix php8 warning 2021-05-11 18:25:20 +02:00
Laurent Destailleur
5943f17b94
Merge pull request #17553 from aspangaro/14b3
Fix Title company card
2021-05-11 18:19:58 +02:00
Laurent Destailleur
f87f80b004
Merge pull request #17554 from aspangaro/14b4
Fix Title customer order
2021-05-11 18:19:11 +02:00
Laurent Destailleur
eab3ac0615
Merge pull request #17558 from aspangaro/14b6
Fix Title supplier proposal
2021-05-11 18:18:35 +02:00
Laurent Destailleur
22b1d87973
Merge pull request #17555 from andreubisquerra/develop
NEW DOL_VALUE_PLACE tag in TakePOS template
2021-05-11 18:17:01 +02:00
Laurent Destailleur
709efc23db
Merge pull request #17557 from aspangaro/14b5
Fix Travis
2021-05-11 18:15:41 +02:00
Laurent Destailleur
2dce969612
Merge branch 'develop' into 14b5 2021-05-11 18:15:31 +02:00
Laurent Destailleur
88ca25903d
Merge pull request #17559 from aspangaro/14b7
Fix Title supplier order
2021-05-11 18:15:02 +02:00
Laurent Destailleur
8a2a996595
Merge pull request #17562 from oscim/patch-42
Update card.php
2021-05-11 18:10:07 +02:00
Laurent Destailleur
ce8d6c77ed
Merge pull request #17565 from ksar-ksar/patch-4
FIX #13955
2021-05-11 18:09:14 +02:00
Frédéric FRANCE
680092cb8a
Merge remote-tracking branch 'upstream/develop' into uniformizecode 2021-05-11 18:09:05 +02:00
Laurent Destailleur
3869a54422
Merge pull request #17568 from mafzalzadeh/develop
Fix Integration Testing Error
2021-05-11 18:07:41 +02:00
Laurent Destailleur
722d7aa3e6
Merge branch 'develop' into develop 2021-05-11 18:07:20 +02:00
Frédéric FRANCE
0c997e4260
Merge remote-tracking branch 'upstream/develop' into filecheck 2021-05-11 18:06:17 +02:00
Frédéric FRANCE
4c77e07a1b
Merge remote-tracking branch 'upstream/develop' into filecheck 2021-05-11 18:04:04 +02:00
Laurent Destailleur
d98e046fbd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-11 18:02:37 +02:00
Laurent Destailleur
56b0b5a1f1
Merge pull request #17575 from frederic34/patch-12
fix php8 warning
2021-05-11 18:00:29 +02:00
Laurent Destailleur
1900e1cc54
Merge pull request #17567 from frederic34/patch-4
fix $mysoc not defined (php8 warning)
2021-05-11 17:59:50 +02:00