Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
103,106 Commits 36 Branches 189 Tags
901bab2ca2608559d8865800e8768fc24c29fde4
Commit Graph

7747 Commits

Author SHA1 Message Date
Laurent Destailleur
58ffee193f Debug v14 2021-05-19 13:07:25 +02:00
Laurent Destailleur
78cf2b59c8 Debug feature copy-paste on smarpthone 2021-05-19 11:47:58 +02:00
Laurent Destailleur
271ba884db css 2021-05-18 17:24:17 +02:00
Laurent Destailleur
a00ae6c918 css 2021-05-18 17:00:20 +02:00
Laurent Destailleur
c2cb055b0a Fix look and feel v14 2021-05-18 14:00:29 +02:00
Laurent Destailleur
b6dbe45242 Fix permissions on page to move position of file 2021-05-18 01:58:54 +02:00
Laurent Destailleur
ba0e95a4ff FIX huntr CWE-79 2021-05-17 23:47:16 +02:00
Laurent Destailleur
d888e4b3bf Merge pull request #17385 from Givriz/dev_1 
Compatibility phpv8
 2021-05-17 16:29:49 +02:00
Laurent Destailleur
f25c57b1f6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 11:26:43 +02:00
Laurent Destailleur
6402ef9496 Fix colors 2021-05-17 11:26:31 +02:00
Laurent Destailleur
d0c634a99c Merge pull request #17489 from Hystepik/develop#1 
Fix  #17475 : Add of List-Unsubscribe in mass emailing
 2021-05-17 10:23:21 +02:00
Laurent Destailleur
17b08cc22f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 07:27:13 +02:00
Laurent Destailleur
6bf66adff0 Fix remove some $_REQUEST 2021-05-17 07:27:02 +02:00
Laurent Destailleur
428ab1b67a Merge pull request #17626 from atm-maxime/fix/ticket 
Fix ticket when module societe not enabled
 2021-05-17 06:59:32 +02:00
Laurent Destailleur
78b38f75a1 Minor fixes 2021-05-17 06:39:18 +02:00
Laurent Destailleur
d1ff2e3590 Add comment 2021-05-17 06:18:47 +02:00
Laurent Destailleur
9a8bd2c24b Add missing field 
Fix duplicate / in url
 2021-05-17 06:13:26 +02:00
Maxime Kohlhaas
d3ff549b21 Fix ticket when module societe not enabled 2021-05-16 18:48:18 +02:00
Laurent Destailleur
a665ff5bda Copy-Paste works also for hidden fields 2021-05-12 11:51:39 +02:00
lmarcouiller
cd4583a841 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-12 09:08:19 +02:00
stickler-ci
b8a3485c4c Fixing style errors. 2021-05-11 19:33:23 +00:00
Laurent Destailleur
b5a43c8d1d FIX #17502 2021-05-11 21:31:43 +02:00
kastoras
cd9ea9566b Change parameter name to MAIN_FORCE_SHARING_ON_ANY_UPLOADED_FILE 2021-05-11 22:31:38 +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
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
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
eab3ac0615 Merge pull request #17558 from aspangaro/14b6 
Fix Title supplier proposal
 2021-05-11 18:18:35 +02:00
Laurent Destailleur
c37ccc10b1 Debug v14 2021-05-11 14:50:04 +02:00
Alexandre SPANGARO
427221c8d3 Merge remote-tracking branch 'upstream/develop' into 14b6 2021-05-11 07:02:04 +02:00
Laurent Destailleur
6499270619 v14 2021-05-10 15:29:23 +02:00
Laurent Destailleur
2dd3148e3f Fix look and feel v14 2021-05-10 15:24:07 +02:00
Laurent Destailleur
a2cd181435 FIX Debug reception module 2021-05-10 11:53:19 +02:00
Alexandre SPANGARO
100b0f297e Fix Title supplier proposal contact card 2021-05-10 06:32:28 +02:00
Alexandre SPANGARO
c0062e2d41 Move title to v14 ergonomy 2021-05-10 06:26:58 +02:00
Laurent Destailleur
19bae333c9 Add option MAIN_SHOW_PASSWORD_INTO_LOG 2021-05-09 22:07:08 +02:00
Alexis LAURIER
d04c741a3b add payment_fourn delete proper check into security.lib 2021-05-08 09:12:17 +02:00
stickler-ci
fc26e5eecf Fixing style errors. 2021-05-07 20:42:53 +00:00
kastoras
1a385052f6 New Create share link on file upload 
Create MAIN_CREATE_SHARE_ON_FILE_UPLOAD, when this set to 1 and a file is uploaded a shared link will be created
 2021-05-07 23:39:14 +03:00
lmarcouiller
bf64bde571 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-07 15:22:10 +02:00
lmarcouiller
b41a87ff70 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-07 12:06:46 +02:00
lmarcouiller
f4291dc985 commit missing file 2021-05-07 09:20:18 +02:00
lmarcouiller
0f2ce8687d Fix #17475 : Update of previous fix 2021-05-07 09:19:44 +02:00
Frédéric FRANCE
a56dc4ff65 fix mulitple module using completeTabsHead 
complete $template['head'] in module and return 0 to not replace instead return $head and replace
 2021-05-06 22:28:03 +02:00
Laurent Destailleur
6159321bed NEW Show picto of module into the list of dictionaries 2021-05-06 18:31:36 +02:00
Laurent Destailleur
6b825cbc3b Clean code 2021-05-06 18:06:19 +02:00
Laurent Destailleur
bd5e141d26 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
	htdocs/societe/consumption.php
 2021-05-06 17:07:44 +02:00
Laurent Destailleur
8410f4a9c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/societe/consumption.php
	htdocs/user/class/user.class.php
 2021-05-06 16:57:49 +02:00
Laurent Destailleur
f6f4968af6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/societe/consumption.php
 2021-05-06 16:52:36 +02:00
Laurent Destailleur
7515de456f Merge pull request #17495 from daraelmin/daraelmin-patch-2 
New 5 substitutions keys "online payment link" in mailing
 2021-05-06 16:36:10 +02:00
lmarcouiller
7d649dd90e Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1 2021-05-06 16:26:30 +02:00