lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
99,154 Commits 43 Branches 150 Tags 886 MiB
659f24efa9
Commit Graph

99154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
659f24efa9
Update files.lib.php 2021-08-17 20:10:47 +02:00
stickler-ci
b8a3485c4c Fixing style errors. 2021-05-11 19:33:23 +00:00
kastoras
0ff941f00d Merge branch 'create_share_on_file_upload_with_other_setup' into HEAD 2021-05-11 22:32:27 +03:00
kastoras
cd9ea9566b Change parameter name to MAIN_FORCE_SHARING_ON_ANY_UPLOADED_FILE 2021-05-11 22:31:38 +03:00
kastoras
76c10f053a Change parameter name to MAIN_FORCE_SHARING_ON_ANY_UPLOADED_FILE 2021-05-11 22:29:07 +03:00
kastoras
55caff1dd9 Merge remote-tracking branch 'origin/create_share_on_file_upload_with_other_setup' into develop 2021-05-11 22:23:12 +03:00
Anthimidis Nikos
ecc2f25ccb
Merge pull request #6 from Dolibarr/develop 
Merge latest changes to fork
 2021-05-11 22:20:22 +03:00
Laurent Destailleur
91312f0411 Fix url for emailing unsubscribe 2021-05-11 21:13:52 +02:00
Laurent Destailleur
207aa8550a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-11 21:02:38 +02:00
Laurent Destailleur
dc2c5aa0a8 Add substitution __UNSUBSCRIBE_URL__ for link to unsubscribe 
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop

Conflicts:
	htdocs/theme/eldy/global.inc.php
	htdocs/theme/eldy/info-box.inc.php
 2021-05-11 21:02:27 +02:00
Laurent Destailleur
5a81395ffa
Merge pull request #17474 from dolibit-ut/patch-318 
Update llx_20_c_departements.sql
 2021-05-11 20:51:35 +02:00
Laurent Destailleur
d576e56129
Merge pull request #17526 from daraelmin/daraelmin-V13-DarkMode-1 
Fix #17114 dark display for enabled module in dark mode
 2021-05-11 20:44:24 +02:00
Laurent Destailleur
8cf99448e1
Merge pull request #17523 from bb2a/warhouse_mod_stock_activ 
Warehouse filter if stock activate and not sending
 2021-05-11 20:43:28 +02:00
Laurent Destailleur
a0d41bf3c5
Merge pull request #17580 from frederic34/patch-3 
remove debug
 2021-05-11 20:35:19 +02:00
Laurent Destailleur
aa05788d62 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/compta/bank/class/account.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/security.lib.php
	htdocs/core/modules/societe/mod_codeclient_elephant.php
	htdocs/filefunc.inc.php
	test/phpunit/CodingPhpTest.php
 2021-05-11 20:34:46 +02:00
Laurent Destailleur
c0689b3884 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-11 20:18:43 +02:00
Laurent Destailleur
c3b5491805 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-11 20:18:36 +02:00
Laurent Destailleur
8dc1e1cb33 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-11 20:17:24 +02:00
Laurent Destailleur
3683461c40 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	.travis.yml
	htdocs/societe/consumption.php
 2021-05-11 20:17:15 +02:00
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