Commit Graph

7700 Commits

Author SHA1 Message Date
Laurent Destailleur
92ccf5982a Fix responsive 2021-05-19 14:38:39 +02:00
Laurent Destailleur
8f5c898dae CSS 2021-05-19 14:13:42 +02:00
Laurent Destailleur
a8d36a3a55 Debug v14 2021-05-19 13:56:13 +02:00
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
Laurent Destailleur
9e057332f0
Merge pull request #17486 from NextGestion/dolibarr_partnership
Dolibarr partnership
2021-05-06 16:11:13 +02:00
Laurent Destailleur
19f78b2e8f More compact gui 2021-05-05 19:13:40 +02:00
Marc de Lima Lucio
139ae3db00 FIX: pgsql: prevent 'WHERE 1' 2021-05-05 11:49:11 +02:00
stickler-ci
fb3c8e698e Fixing style errors. 2021-05-04 20:59:32 +00:00
daraelmin
b04dfcadc7
Add function to get html online payment link 2021-05-04 21:55:19 +02:00
Laurent Destailleur
bf52b54db6 Add date in error message 2021-05-04 19:43:33 +02:00
lmarcouiller
457a96bc34 Fix #17475 : Add of List-Unsubscribe in mass emailing 2021-05-04 15:11:30 +02:00
Laurent Destailleur
526235d020 Fix substitution of mix html/nohtml
Fix send email reminder for past due date of invoices
More PHPUnit test
2021-05-04 13:33:18 +02:00
NextGestion
6f85cab6c4 Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership 2021-05-04 10:55:19 +01:00
Laurent Destailleur
bb64c330f6
Merge pull request #17441 from fappels/13_tokenonactiondelete
FIX missing token on dolGetButtonAction for action delete
2021-05-04 00:21:55 +02:00
Laurent Destailleur
b2901bfae0 Make code simpler 2021-05-04 00:15:06 +02:00
Laurent Destailleur
6e32efdb40 Fix phpcs 2021-05-03 20:22:36 +02:00
Laurent Destailleur
e4499976e9 Disable empty tabs 2021-05-03 19:56:31 +02:00
Laurent Destailleur
a3431a790a
Merge pull request #17404 from bb2a/doctemplate
New Add option for doctemplate
2021-05-03 19:45:40 +02:00
Laurent Destailleur
9973085613 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/propal/card.php
	htdocs/compta/bank/releve.php
	htdocs/compta/paiement/rapport.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/reception/card.php
	htdocs/societe/societecontact.php
2021-05-03 19:36:49 +02:00
Laurent Destailleur
9dc36d13c3 Enhance error management 2021-05-03 19:25:16 +02:00
Laurent Destailleur
cbc481dc60 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/adherents/list.php
	htdocs/adherents/type.php
	htdocs/core/lib/company.lib.php
2021-05-03 19:01:47 +02:00
Laurent Destailleur
540e4f3d2e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-03 18:58:41 +02:00
Laurent Destailleur
7b706d6fe5 Fix phpunit for crop of image 2021-05-03 15:56:56 +02:00
Laurent Destailleur
c6a9117a00 Graph color 2021-05-03 14:03:50 +02:00
Laurent Destailleur
b22f2dd2c8
Merge pull request #17415 from Hystepik/develo#2
Close #17271 : Replacement of 2 graphes in /compta/index.php
2021-05-03 13:56:44 +02:00
Laurent Destailleur
2a47128e2d Code comment 2021-05-03 11:00:41 +02:00
Laurent Destailleur
2bef447229 Clean code 2021-05-02 16:24:52 +02:00
Laurent Destailleur
efda17657d Fix conversion in webp 2021-05-02 15:29:52 +02:00
Laurent Destailleur
39f7d0bed8 Fix conversion of images 2021-05-02 15:15:27 +02:00
Laurent Destailleur
a54e60d345 Look and feel v14 2021-05-02 13:13:55 +02:00
Laurent Destailleur
99d655b983 Debug generation of webp 2021-05-01 15:38:58 +02:00
Laurent Destailleur
0ee1d4b322 Reduce log verbosity 2021-05-01 13:22:01 +02:00
Laurent Destailleur
e99355a0c2 Clean html 2021-04-30 15:22:17 +02:00
Francis Appels
773b16928d only if no token 2021-04-30 11:15:01 +02:00
Francis Appels
05a96b3ee2 FIX missing token on dolGetButtonAction for action delete 2021-04-30 10:46:05 +02:00
stickler-ci
81b964db45 Fixing style errors. 2021-04-30 08:12:24 +00:00
atm-lena
5e98d99321 FIX SQL Error show_contacts : socialnetworks 2021-04-30 10:04:21 +02:00
Laurent Destailleur
e7e2953a9e Look and feel 2021-04-29 15:49:44 +02:00
Laurent Destailleur
e3767557d8 Fix phpcs 2021-04-29 12:33:49 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Laurent Destailleur
de8e291c7e Debug v14 2021-04-29 10:01:10 +02:00
lmarcouiller
799d1de830 Update incoice.lib.php and index.php match eldy's requests 2021-04-29 09:31:49 +02:00
Laurent Destailleur
6f1f26096e Debug partnership module 2021-04-28 23:25:26 +02:00
Anthony Berton
5d17e26738 add_pdf_template_and_read_if_module_activate 2021-04-28 23:25:03 +02:00
Laurent Destailleur
64374f46da Debug v14 2021-04-28 23:01:20 +02:00
Laurent Destailleur
95ecb95ff1 FIX dol_print_date for %a and %b with some timezone 2021-04-28 20:47:28 +02:00
Laurent Destailleur
18e911a636 FIX dol_print_date for %a and %b with some Timezone 2021-04-28 20:44:22 +02:00
Laurent Destailleur
2dc597f5d0 Make setup easier to understand 2021-04-28 18:04:00 +02:00
lmarcouiller
be22d43c60 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2 2021-04-28 09:24:18 +02:00
Laurent Destailleur
cb72a010cd FIX notifications for expense report has disappeared. 2021-04-27 22:14:19 +02:00
lmarcouiller
52bf0f0359 Close #17271 : Replament of 2 graph in compta/index.php 2021-04-27 16:02:46 +02:00
Laurent Destailleur
3e013ebad0 Fix mass action delete of cron jobs 2021-04-27 03:16:11 +02:00
Anthony Berton
6353084777 init 2021-04-27 00:22:39 +02:00
Laurent Destailleur
062dc28850
Merge pull request #17388 from aspangaro/14a30
NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD
2021-04-26 21:18:48 +02:00
stickler-ci
1a4e1b1ae9 Fixing style errors. 2021-04-26 13:46:37 +00:00
Laurent Destailleur
14baec95dc Clean code 2021-04-26 15:44:24 +02:00
Laurent Destailleur
87393cee98 Clean code 2021-04-26 11:59:47 +02:00
Laurent Destailleur
c9d6bc70e8 Clean code 2021-04-26 10:22:28 +02:00
Laurent Destailleur
c3d3b79315 Fix test on Local url 2021-04-25 22:11:57 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
Laurent Destailleur
2fd2c67139 Clean edit of user card 2021-04-25 15:21:31 +02:00
Laurent Destailleur
9f03054fc4 Fix #yogosha5877 2021-04-24 20:52:48 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Alexandre SPANGARO
f60df8964a NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD 2021-04-24 08:05:00 +02:00
Givriz
a451fee68f Compatibility phpv8 2021-04-23 18:01:11 +02:00
Laurent Destailleur
1bd2bd3237 Fix php8 warning 2021-04-20 12:46:41 +02:00
Laurent Destailleur
14f009f550 Fix CURLOPT_CONNECT_TO 2021-04-20 12:19:46 +02:00
Laurent Destailleur
c966914f67
Merge branch 'develop' into new/check_update_for_module 2021-04-19 21:26:01 +02:00
Laurent Destailleur
3df79dd3c8 Avoid error on PHP 5.6 2021-04-19 20:49:31 +02:00
Laurent Destailleur
a8187af8ef Use MAIN_SECURITY_ANTI_SSRF_SERVER_IP as whitelist for local IP. 2021-04-19 15:16:00 +02:00
Laurent Destailleur
08ded970e2 NEW Add option MAIN_SECURITY_ANTI_SSRF_SERVER_IP 2021-04-19 15:01:36 +02:00
NextGestion
263e110ca3 Enhance module Member 2021-04-19 13:19:32 +01:00
Laurent Destailleur
0537fdd1c6 Add local ip into excluded IP for external URL download.
Fix #yogosha5861
2021-04-19 13:52:12 +02:00
Laurent Destailleur
61df76dd9a Fix pb in date format %a %b when using a negative timezone
Enhance date management and unit tests.
2021-04-19 12:48:08 +02:00
ATM john
781756913b Fix code Stickler 2021-04-18 22:38:18 +02:00
ATM john
7794927a64 New check update for modules 2021-04-18 20:12:24 +02:00
Laurent Destailleur
cad7ea0b92 css 2021-04-18 15:07:22 +02:00
Laurent Destailleur
3502c4c269 Debug sitemap generation 2021-04-18 13:45:46 +02:00
Laurent Destailleur
70abc04bf5
Merge pull request #17103 from Givriz/dev
Fix compatibility phpv8
2021-04-16 20:51:00 +02:00
Laurent Destailleur
c841282a25
Merge pull request #17283 from Givriz/dev_2
Compatibility phpv8 #2
2021-04-16 20:37:31 +02:00
Givriz
86bfcd9510 Easy way to use conf->global 2021-04-16 17:10:11 +02:00
Laurent Destailleur
db5dcd3e52 NEW When a doc file is shared, link is visible from main page of doc. 2021-04-15 17:56:55 +02:00
Laurent Destailleur
f1d55d38ba Show link to shared file if it exists. 2021-04-15 17:09:15 +02:00
Laurent Destailleur
707efa7765 Debug v14 2021-04-15 15:54:54 +02:00
Laurent Destailleur
bf547cf20d Debug v14 2021-04-15 14:33:48 +02:00
Laurent Destailleur
7e4f7f7200 Nicer page of widget setup 2021-04-15 13:31:40 +02:00
Laurent Destailleur
09365c29c9 Nicer page of widget setup 2021-04-15 13:22:03 +02:00
Givriz
47cdfee1d2 Compatibility pvpv8 2021-04-14 22:03:04 +02:00
Laurent Destailleur
a68a5b0c04 Look and feel v14 2021-04-14 15:11:26 +02:00
Laurent Destailleur
7f62b6c49b Look and feel v14 2021-04-13 22:58:37 +02:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
2021-04-13 20:19:05 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
Laurent Destailleur
a7a95cff03 Fix payment link for renewal with a unique secure key 2021-04-12 16:41:40 +02:00
Laurent Destailleur
3d681d96c4
Merge pull request #17205 from DorianVabre/dev_EventOrganizer
new: working on conference or booth object and event type #FoundationFunding
2021-04-12 16:06:13 +02:00
Givriz
7a54e5d346 Using empty instead of isset
I used empty instead of isset, and I fixed some problems of my previous pull request
2021-04-12 16:03:56 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
86328462c7 Enhance getURLContent 2021-04-12 11:20:44 +02:00
Alexandre SPANGARO
8d72448f43 Add right supplier_order 2021-04-12 09:47:16 +02:00
Alexandre SPANGARO
80c6458faa Work on split module fournisseur 2021-04-11 22:25:45 +02:00
Laurent Destailleur
f437e70ac6 Selection of theme is easier 2021-04-11 16:11:05 +02:00
Laurent Destailleur
ac64938266 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-10 15:31:39 +02:00
Laurent Destailleur
8526ca5304
Merge pull request #17121 from 0x00FE/add-friday-holiday
NEW Add support for Friday as a holiday
2021-04-10 15:30:57 +02:00
Laurent Destailleur
be800e07f2 Use urlencode even on security key 2021-04-10 15:27:44 +02:00
Laurent Destailleur
35a64e08bf Fix link 2021-04-10 14:12:51 +02:00
Laurent Destailleur
cb57546d99 NEW Can hide columns "time consumed" on timesheet per week. 2021-04-10 13:53:23 +02:00
Laurent Destailleur
6241ba559b Trans 2021-04-10 12:44:41 +02:00
Laurent Destailleur
11330fd6c2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-10 12:42:55 +02:00
Laurent Destailleur
ce6f8eebf5 Close #17206 Add comment on type of constants 2021-04-10 12:42:43 +02:00
César de la Cal Bretschneider
eadd8defaf Good friday is a holiday 2021-04-10 11:39:48 +02:00
Laurent Destailleur
83e272951f Fix phpcs 2021-04-10 00:31:20 +02:00
Ahmad Hadeed
63f7369adb Fixing 'stickler-ci' complaint, function description not in order 2021-04-09 21:16:24 +03:00
Ahmad Hadeed
20e51016ed fixing function description comment to satisfy 'stickler-ci' 2021-04-09 21:11:37 +03:00
Ahmad Hadeed
937fe333f1 Moving Friday to end of function declaration to maintain backward compatibility 2021-04-09 20:49:39 +03:00
Dorian Vabre
b3415f9031 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer 2021-04-09 16:23:42 +02:00
Laurent Destailleur
42ddb6e5f0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/website2.lib.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/public/ticket/view.php
2021-04-09 14:17:41 +02:00
Laurent Destailleur
a50b0e7441 Debug inventory module 2021-04-09 13:15:27 +02:00
Laurent Destailleur
95d3dabdf6
Update website2.lib.php 2021-04-09 12:48:06 +02:00
Dorian Vabre
60341e8a14 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer 2021-04-08 17:29:16 +02:00
Laurent Destailleur
f8b5bee9eb Add function getListOfPossibleImageExt 2021-04-08 14:20:59 +02:00
Laurent Destailleur
489cff46a3 FIX #yogosha5828 2021-04-08 00:37:17 +02:00
Laurent Destailleur
59c8e70fd2 Fix #yogosha4510 2021-04-07 23:43:10 +02:00
Laurent Destailleur
6c4f5b851d Use all param of getURLContent 2021-04-07 23:31:16 +02:00
Laurent Destailleur
f4d56c710b Fix log levels 2021-04-07 12:43:28 +02:00
Dorian Vabre
f7b6e239e9 nouvelle page attendee_subscription créée, lien ajouté sur la conferenceorbooth_card (non cliquable) 2021-04-07 10:06:38 +02:00
Indelog
17fa9559a3 Fix empty string WEBSITE_OTHERLANG
If post WEBSITE_OTHERLANG with empty value or with value like this
'en,,sv' or 'en,sv,' we can get an otherlang with empty value. This can lead
unexpected behaviour when we use an element of otherlang to set the
subdirectory name to store pages for a sub lang.
2021-04-07 09:29:40 +02:00
Indelog
4d60fe8ff9 Fix empty $sublang dolSavePageAlias
Avoid to loop on `explode(',', $object->otherlang)` if
`$object->otherlang` is empty. Else we loop once on empty string which
is set in `$sublang` and erase the main alias for the page.
2021-04-06 22:21:00 +02:00
Laurent Destailleur
12e847ade1 Fix color of reports. Fix include_once into include. 2021-04-06 22:18:32 +02:00
Laurent Destailleur
7ff74768eb Fix pb with renaming field total 2021-04-06 20:16:14 +02:00
Laurent Destailleur
0377508100 Fix sql 2021-04-06 20:10:29 +02:00
Laurent Destailleur
b7cd3270cb
Merge pull request #17118 from ptibogxiv/patch-424
FIX uniformization of external link
2021-04-06 19:36:26 +02:00
Laurent Destailleur
d1df327284 Add tab for import/export profiles 2021-04-06 18:51:43 +02:00
Laurent Destailleur
38f3693fc7 Look and feel v14 2021-04-06 18:18:07 +02:00
Laurent Destailleur
10fb793fb1 Enhance the security page 2021-04-06 13:56:33 +02:00
Ahmad Hadeed
f2f2aed6cd Fix 3 weekend holiday behavior after adding support to Friday as a holiday. 2021-04-05 22:05:22 +03:00
Laurent Destailleur
a3fb8d3e14 Factorize code 2021-04-05 19:34:56 +02:00
stickler-ci
caa2facd47 Fixing style errors. 2021-04-05 17:09:25 +00:00
Ahmad Hadeed
235725b528 Add support for Friday as a holiday and some comment alignment fixes 2021-04-05 19:57:33 +03:00
Laurent Destailleur
685c880e6c Debug module workstation 2021-04-05 14:56:47 +02:00
ptibogxiv
1b3b2ca023
Update payments.lib.php 2021-04-05 13:52:09 +02:00
Laurent Destailleur
6fc19c626d Try fix for #17094 2021-04-04 17:05:01 +02:00
Laurent Destailleur
1a70aebba6 NEW Can set a target image in dolcropresize function. 2021-04-04 01:12:25 +02:00
Givriz
5ed01f6733 Fix errors phpv8 2021-04-03 17:09:14 +02:00
Laurent Destailleur
17437670b1 Set include of js as async 2021-04-03 13:24:34 +02:00
Laurent Destailleur
5ce9bc5801 FIX #yogosha5748 2021-04-02 23:23:44 +02:00
Laurent Destailleur
39fc2e6e60 NEW Save old page with .old in edition of a website page 2021-04-01 19:49:36 +02:00
Laurent Destailleur
354adbde54 Look and feel v14 2021-04-01 12:27:02 +02:00
Laurent Destailleur
8e14b4d434 FIX #yogosha5775 2021-04-01 11:27:39 +02:00
Alexandre SPANGARO
b5702fcb13 Merge branch '13.0' into 13p31 2021-04-01 04:38:08 +02:00
Alexandre SPANGARO
530b122f1e FIX: Periodicity by default on fiscal year, according to the date, we have plus 1 year added 2021-04-01 04:37:47 +02:00
Florian HENRY
73d7eefdcf Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-31 20:09:44 +02:00
Laurent Destailleur
6aa1229c19 FIX #yogosha5791 2021-03-31 12:44:13 +02:00
Laurent Destailleur
cdd3e385e7 Merge branch 'new-propal-signature-date-and-user' of
https://github.com/OPEN-DSI/dolibarr into
OPEN-DSI-new-propal-signature-date-and-user

# Conflicts:
#	htdocs/install/mysql/migration/13.0.0-14.0.0.sql
2021-03-30 19:34:25 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
lvessiller
85fff685db Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user 2021-03-30 08:19:54 +02:00
lvessiller
d0ce60ff49 Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user 2021-03-30 08:04:19 +02:00
Laurent Destailleur
843e0a2c39 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/html.formother.class.php
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
	htdocs/projet/tasks/time.php
	htdocs/webservices/server_thirdparty.php
2021-03-29 21:47:31 +02:00
Florian HENRY
11dcf656c6 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-29 20:30:31 +02:00
Laurent Destailleur
715490be0b
Merge pull request #16929 from aspangaro/14a28
NEW: Add company info in dropdown login menu
2021-03-29 19:02:12 +02:00
Florian HENRY
e18c010490 fix bug on list 2021-03-29 16:25:34 +02:00
Florian HENRY
f25360cc4c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-29 15:49:43 +02:00
Laurent Destailleur
e03fbda96a Avoid to obfuscate attributes with html tags inside 2021-03-29 14:50:44 +02:00
Laurent Destailleur
4cacca413e FIX #yogosha5757 2021-03-29 14:43:40 +02:00
Laurent Destailleur
e382d49299 Fix bad permission 2021-03-29 13:49:24 +02:00
Florian HENRY
2def98809c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-29 11:55:26 +02:00
Laurent Destailleur
2a431d4951 Protect backtourl from using external urls 2021-03-28 21:39:18 +02:00
Laurent Destailleur
95a7e13e3a Debug establishment 2021-03-27 14:54:09 +01:00
Laurent Destailleur
5b64a517ea Fix label 2021-03-27 14:30:10 +01:00
Laurent Destailleur
1bb07c0eb1 Look and feel v14 2021-03-27 13:59:50 +01:00
Alexandre SPANGARO
c1ceefb70f Update with new functionality 2021-03-27 04:44:20 +01:00
Alexandre SPANGARO
6809dab2c0 Merge remote-tracking branch 'upstream/develop' into 14a28 2021-03-27 04:12:15 +01:00
Florian HENRY
f87711bf2f Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-26 18:30:08 +01:00
lvessiller
05bf3cdab1 FIX stickler-ci errors 2021-03-26 17:59:16 +01:00
Laurent Destailleur
84ec032cc0 Look and feel v14 2021-03-26 17:58:00 +01:00
lvessiller
8a2e49d6e7 NEW date and user signature on proposal (Issue 16062) 2021-03-26 17:44:41 +01:00
Laurent Destailleur
cfd992b930 Add call of rebuild_sequence with pgsql. 2021-03-26 13:10:06 +01:00
Laurent Destailleur
d9108362ba War against $_POST 2021-03-25 16:59:47 +01:00
ksar
ccd6d28f6f
FIX #16843
https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4

fa-mail-forward => fa-share
2021-03-25 14:39:42 +01:00
Laurent Destailleur
5ddd98cd39 Move module intracomm as experimental 2021-03-25 11:24:46 +01:00
Laurent Destailleur
ff52b1ee41
Merge pull request #16620 from altairisfr/pr_batch_masks
Define Masks for Batch Products Equipments
2021-03-25 08:36:36 +01:00
Laurent Destailleur
594c94feb2 Clean code. Allow iframes into the external frame module. 2021-03-25 03:44:38 +01:00
Laurent Destailleur
b011a67698 Fix remove var_dump 2021-03-25 00:03:31 +01:00
Laurent Destailleur
cc54b7fe29 Fix dol_string_onlythesehtmlattributes 2021-03-25 00:03:09 +01:00
Laurent Destailleur
6f01869bcb Enhance the WAF 2021-03-24 23:14:22 +01:00
Laurent Destailleur
d1fa46089f Removed not used page.
Enhance the WAF
2021-03-24 22:54:40 +01:00
Florian HENRY
373a52063d add commit 2021-03-24 20:13:30 +01:00
Laurent Destailleur
a5034d44f7 $_POST war 2021-03-24 19:53:31 +01:00
Laurent Destailleur
86c7ab922a Fix #yogosha5728 2021-03-24 18:57:23 +01:00
Alexandre SPANGARO
34abb53c25 Merge remote-tracking branch 'upstream/develop' into 14a28 2021-03-24 14:09:46 +01:00
Laurent Destailleur
4d1fdd8763 Fix #yogosha5725 2021-03-23 21:45:37 +01:00
Laurent Destailleur
28ca2990f0 CSS 2021-03-23 20:09:26 +01:00
Laurent Destailleur
3857daed94 Fix remove log 2021-03-23 18:08:44 +01:00
Laurent Destailleur
5ff9038e4e Fix permissions on BOMs 2021-03-23 18:02:52 +01:00
Laurent Destailleur
cfa39597c3 FIX #yogosha5707 2021-03-23 17:28:38 +01:00
Laurent Destailleur
7c69b45c68 FIX #yogosha5707 2021-03-23 17:27:43 +01:00
Laurent Destailleur
e3b019f923 Clean code 2021-03-23 01:32:17 +01:00
Laurent Destailleur
cce4ebdb8c Clean code 2021-03-22 18:50:47 +01:00
Laurent Destailleur
5a8d757a30 Add missing data 2021-03-22 18:23:29 +01:00
Laurent Destailleur
5d6fb0cfea Perf: Enhance performance of VAT report 2021-03-22 18:11:44 +01:00
Laurent Destailleur
897d653144 Debug default date for vat reports 2021-03-22 16:09:18 +01:00
Laurent Destailleur
6a0e0f4c06 Fix #ygosha5698 2021-03-22 12:10:51 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00