Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

7743 Commits

Author SHA1 Message Date
Laurent Destailleur
c4ca0bdc28
Merge pull request #18879 from frederic34/patch-5 
doxygen
 2021-10-02 20:44:09 +02:00
Laurent Destailleur
dfb1b1636f
Merge pull request #18881 from frederic34/patch-6 
doxygen
 2021-10-02 20:38:55 +02:00
Laurent Destailleur
902fed1f0d Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ecm/index.php
 2021-10-02 20:09:06 +02:00
Laurent Destailleur
2fe1b548ef Show label of permission as tooltip on list of modules/app 2021-10-02 19:45:58 +02:00
Frédéric FRANCE
10aa6106d2
doxygen 2021-10-02 13:34:08 +02:00
Frédéric FRANCE
5d181810da
doxygen 2021-10-02 13:31:54 +02:00
Frédéric FRANCE
c5871ac765
doxygen 
/home/dolibarr/htdocs/admin/eventorganization_confboothattendee_extrafields.php:23: warning: the name 'admin/conferenceorboothattendee_extrafields.php' supplied as the argument in the \file statement is not an input file
 2021-10-02 13:29:33 +02:00
Frédéric FRANCE
254fbb862b
doxygen 2021-10-02 13:27:25 +02:00
Laurent Destailleur
d064ab2b17 Add more action to GET action to check 2021-10-02 12:58:15 +02:00
Laurent Destailleur
d68719226b Fix can install module with name module_abc-x.y.z (w).zip 2021-10-01 14:10:50 +02:00
Laurent Destailleur
eada0f468f Set MAIN_SECURITY_CSRF_WITH_TOKEN recommended value to 1 2021-10-01 12:39:15 +02:00
Laurent Destailleur
166d3b08d6 Add LIBXML_NONET to simplexml_load_string 2021-09-30 20:12:01 +02:00
Marc de Lima Lucio
2a85a32659 FIX: postgresql compatibility with camelcase fields 2021-09-30 18:30:22 +02:00
Marc de Lima Lucio
5f826f78a1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_block_leave_if_negative_balance 2021-09-30 17:41:38 +02:00
Marc de Lima Lucio
d3e90e8f76 NEW: expense reports: conf to force amounts to be entered only including taxes 2021-09-30 17:24:57 +02:00
Marc de Lima Lucio
0dae918b76 NEW: expense reports: make project field required on lines 2021-09-30 17:09:49 +02:00
Marc de Lima Lucio
c2c7d88520 NEW: NEW: expense reports: conf to pre-fill start/end dates with bounds of current month 2021-09-30 16:40:34 +02:00
Laurent Destailleur
673a2982a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/card.php
 2021-09-30 16:32:40 +02:00
Laurent Destailleur
ed264182c6 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
	htdocs/takepos/receipt.php
 2021-09-30 16:28:42 +02:00
Laurent Destailleur
bb6399e12a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/product/card.php
 2021-09-30 16:21:36 +02:00
Laurent Destailleur
608b6f5fa3 Clean code 2021-09-30 15:24:57 +02:00
Laurent Destailleur
620d7109b5
Update dict.php 2021-09-30 14:04:56 +02:00
Florian HENRY
332fa77d90 fix: search code on tva dict 2021-09-30 13:49:02 +02:00
Laurent Destailleur
3d239e7528 Trans 2021-09-29 17:28:06 +02:00
Laurent Destailleur
a395ff5ee3 Css 2021-09-29 16:19:47 +02:00
Marc de Lima Lucio
ef624ec5bc NEW: deposit payment terms: add field into dictionary admin page 2021-09-29 11:34:30 +02:00
Laurent Destailleur
e15277bb6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-28 17:23:07 +02:00
Laurent Destailleur
43637c936c
Merge pull request #18825 from grandoc/new_branch_25_09_2021 
fix : warning: Undefined property: stdClass:: in C:\wamp64\www\doliba…
 2021-09-28 12:56:43 +02:00
Laurent Destailleur
e6e224f33c Better translation 2021-09-28 11:53:00 +02:00
Laurent Destailleur
d4cc60640b Clean code 2021-09-27 15:41:58 +02:00
Laurent Destailleur
5c8b893877 Doc 2021-09-27 12:50:51 +02:00
Laurent Destailleur
72be24a835 Doc 2021-09-27 12:37:10 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
6d92591358 Fix look and feel v15 2021-09-27 11:28:34 +02:00
Gauthier PC portable 024
fde0f1ac25 NEW : HRM integration, source code 2021-09-27 11:20:38 +02:00
Laurent Destailleur
4a85304572 Fix security 2021-09-26 21:01:34 +02:00
Laurent Destailleur
1436f0de7d Fix newToken 2021-09-26 20:26:20 +02:00
Laurent Destailleur
5497d7d730 Fix look and feel v15 2021-09-26 20:23:15 +02:00
Philippe Grand
a29ed0229b
Update barcode.php 2021-09-25 19:00:47 +02:00
Philippe GRAND
661f13adb3 fix :Warning: Undefined property: stdClass:: in C:\wamp64\www\dolibarr-dev\htdocs\admin\barcode.php on line 376 2021-09-25 18:58:06 +02:00
Christian Foellmann
08b395e127 another set of cleanup for action buttons 2021-09-22 08:43:30 +02:00
Laurent Destailleur
1d597e8a72 Fix add unset* action as sensible GET actions 2021-09-19 18:03:38 +02:00
Laurent Destailleur
5631e8cc15 css 2021-09-19 15:01:57 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
8bdc53f469 Fix Add action classify as sensitive actions 2021-09-18 20:49:24 +02:00
Laurent Destailleur
62b721a904 Add deletecontact as sentitive action 
Replace dol_buildpath with DOL_URL_ROOT
 2021-09-18 19:34:46 +02:00
Laurent Destailleur
6c37836b3e Show value of MAIN_SECURITY_CSRF_WITH_TOKEN in setup page 2021-09-18 18:28:02 +02:00
Gauthier PC portable 024
e6c9627195 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-09-17 15:47:23 +02:00
Laurent Destailleur
1a705adf6e
Merge pull request #18726 from cfoellmann/PR/button-classes 
add missing css classes to buttons
 2021-09-17 10:52:13 +02:00
Laurent Destailleur
fd3418d91d NEW Can edit the translation key of an overwrote translation key. 2021-09-16 15:13:15 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
 2021-09-16 13:40:05 +02:00
Christian Foellmann
fd1d4d9073 add missing css classes to buttons 2021-09-16 11:33:42 +02:00
Laurent Destailleur
b18e25db87 Code comment 2021-09-16 03:13:44 +02:00
Laurent Destailleur
f859967c24 Fix look and feel v14 2021-09-15 20:28:47 +02:00
Laurent Destailleur
21462d0b82 Fix can reset filter in setup 2021-09-14 17:24:53 +02:00
Laurent Destailleur
aeead15a62 css 2021-09-14 17:07:29 +02:00
Laurent Destailleur
f3fcb7a48a Fix insertion of email templates 2021-09-14 16:59:49 +02:00
Laurent Destailleur
ce9a10bd90 Fix description of some options 2021-09-13 03:43:25 +02:00
Laurent Destailleur
5869975ed1 Fix phpcs 2021-09-13 02:59:09 +02:00
Laurent Destailleur
bbacb4e740 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-13 02:45:00 +02:00
Laurent Destailleur
7efd810d57 Clean code 2021-09-13 01:18:24 +02:00
Frédéric FRANCE
88cba08475
doxygen 2021-09-11 09:52:21 +02:00
Laurent Destailleur
c005a20cc0 Fix ldap with ssl 2021-09-11 03:27:59 +02:00
Laurent Destailleur
6a296bf6c2 Debug setup 2021-09-10 10:18:46 +02:00
Laurent Destailleur
d382e8d8c9 Clean setup and translation 2021-09-10 09:21:37 +02:00
Laurent Destailleur
875b93aff2
Merge branch 'develop' into 15a8 2021-09-09 19:26:01 +02:00
Laurent Destailleur
fa28621709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/list.php
 2021-09-09 16:11:29 +02:00
Anthony Berton
6ea3daf9f3
Update pdf.php 2021-09-09 08:31:16 +02:00
Anthony Berton
657c325868
Merge branch 'develop' into add_option_pdf_global_thirdparty_alias 2021-09-09 08:24:08 +02:00
Laurent Destailleur
e5b71a1a89
Merge pull request #18598 from henrynopo/patch-2 
Increase the width of column for General Set-ups - Update dolibarr.php
 2021-09-09 05:12:06 +02:00
Laurent Destailleur
de97b248f2
Update dolibarr.php 2021-09-09 05:11:56 +02:00
Laurent Destailleur
ea9a07fb3d
Update dolibarr.php 2021-09-09 05:11:31 +02:00
Laurent Destailleur
32a09e9494 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/salaries/paiement_salary.php
 2021-09-07 17:47:00 +02:00
Laurent Destailleur
02f21d478a Fix trans 2021-09-06 19:06:46 +02:00
Laurent Destailleur
f5f0b9debc Fix label for selection 2021-09-06 18:41:04 +02:00
Gauthier PC portable 024
d121544810 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-09-06 16:08:39 +02:00
Laurent Destailleur
ed3919da13 Look and feel 2021-09-05 02:25:32 +02:00
Laurent Destailleur
2928c3dc9b NEW Add a PDF document template for Manufacturing Orders 2021-09-05 02:18:53 +02:00
Laurent Destailleur
138af805b3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-09-04 14:11:38 +02:00
Henry
b13fc30a0a
Update dolibarr.php 2021-09-04 12:25:40 +08:00
Laurent Destailleur
87b33c09e0
Merge pull request #18595 from FHenry/14_eventorg 
NEW : Can register an attendees on project global (and also on conférence)
 2021-09-03 20:50:21 +02:00
Florian HENRY
628c715878 ok for prod 2021-09-03 16:39:10 +02:00
Laurent Destailleur
e965d6d6f2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/pdf.php
	htdocs/api/class/api_access.class.php
 2021-09-03 11:02:21 +02:00
Laurent Destailleur
77e9f15360 Work on #18448 2021-09-02 22:52:17 +02:00
ksar
260049c917
FIX #18565 2021-09-02 17:15:57 +02:00
Laurent Destailleur
076bfd82a3 FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:38:47 +02:00
Laurent Destailleur
c762840dec FIX option "Default value for field 'Refuse bulk emailings'" 2021-09-01 22:37:15 +02:00
Alexandre SPANGARO
dbe6861f79 Merge remote-tracking branch 'upstream/develop' into 15a8 2021-09-01 14:09:02 +02:00
Laurent Destailleur
239599d1b1
Merge pull request #18564 from OPEN-DSI/new-agenda-ext-enable-default 
NEW can enable/disable external calendar by default
 2021-09-01 13:44:12 +02:00
Laurent Destailleur
9da82af74f
Merge pull request #18566 from Dolibarr/scrutinizer-patch-2 
Scrutinizer Auto-Fixes
 2021-09-01 13:36:20 +02:00
Laurent Destailleur
19f0db23df Fix scrutinizer bugs 2021-08-31 20:31:05 +02:00
Scrutinizer Auto-Fixer
312ca95feb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-08-31 18:18:28 +00:00
lvessiller
d64bc49d10 FIX stickler-ci 2021-08-31 18:35:56 +02:00
lvessiller
c367c1009b FIX stickler-ci 2021-08-31 18:34:26 +02:00
lvessiller
4781dca2c2 FIX stickler-ci 2021-08-31 18:30:11 +02:00
lvessiller
6c2cf4377a NEW can enable/disable external calendar by default 2021-08-31 18:14:16 +02:00
Laurent Destailleur
0aa4868c34 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-31 13:14:01 +02:00
Laurent Destailleur
cceba665a2 NEW Option "Add a link on the PDF to make the online payment" 2021-08-31 12:29:14 +02:00
Laurent Destailleur
74ad0586a9 Fix disabled 2021-08-29 20:42:14 +02:00
Laurent Destailleur
47b96e07b7 Fix init 2021-08-29 20:36:54 +02:00
Laurent Destailleur
daf32e9f14 Fix modules disabled in demo must remains disabled 2021-08-29 20:36:08 +02:00
Laurent Destailleur
20e681d025
Revert "[NEW] PDF Document ref in title option" 2021-08-28 20:59:12 +02:00
Laurent Destailleur
f2f3c5daf5
Merge pull request #18373 from bb2a/PDF_Ref_In_Title 
[NEW] PDF Document ref in title option
 2021-08-28 20:41:55 +02:00
Laurent Destailleur
bd67b46138
Fix duplicate code 2021-08-28 20:18:26 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
stickler-ci
b48566eed8 Fixing style errors. 2021-08-27 08:27:04 +00:00
Christian Foellmann
9914ebe90b add missing actions to admin page 2021-08-27 10:21:02 +02:00
Anthony Berton
afccd0b565 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into add_option_pdf_global_with_picture 2021-08-26 17:09:08 +02:00
Alexandre SPANGARO
006481cdff Update dashboard tab 2021-08-26 06:01:51 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Christian Foellmann
227f61a711 replace remaining SubmitCancel buttons 2021-08-24 16:10:20 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function 
improve forms - buttonsSaveCreate()
 2021-08-24 15:26:03 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +02:00
Laurent Destailleur
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
4460206709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-23 16:04:16 +02:00
Laurent Destailleur
0325b68bfb Fix missing autoselect 2021-08-23 10:17:36 +02:00
Alexandre SPANGARO
a1d3e21e77 NEW IHM - Include new options to manage dashboard 2021-08-22 05:25:13 +02:00
Laurent Destailleur
58fa0740c3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/errors.lang
 2021-08-22 01:41:18 +02:00
Laurent Destailleur
4cd5a53b63 FIX Recommended session.cookie_samesite must be 'Lax' not 'Strict'. 2021-08-22 00:44:51 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Anthony Berton
f50842cdef cop 2021-08-19 18:16:58 +02:00
Anthony Berton
1e0373ed50 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into add_option_pdf_global_width_picture 2021-08-19 15:22:23 +02:00
Laurent Destailleur
cec94b5f33
Merge pull request #18433 from aspangaro/15a2 
NEW Ihm admin - Add tabs
 2021-08-18 21:30:41 +02:00
Gauthier PC portable 024
c56c74bbdd Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-08-18 18:31:11 +02:00
Anthony Berton
fcdb4bfafb
Merge branch 'develop' into PDF_Ref_In_Title 2021-08-18 08:43:20 +02:00
stickler-ci
062e665874 Fixing style errors. 2021-08-18 02:45:29 +00:00
Alexandre SPANGARO
73dc98ed82 NEW Ihm admin - Add tabs 2021-08-18 04:36:37 +02:00
Alexandre SPANGARO
a7cb9b2143 NEW Ihm admin - Add tabs 2021-08-17 21:29:15 +02:00
Laurent Destailleur
ec2df3b282
Update pdf.php 2021-08-17 18:33:10 +02:00
Laurent Destailleur
e8646c7919
Merge branch 'develop' into PDF_Propal_frame_option 2021-08-17 18:30:37 +02:00
Laurent Destailleur
d09c2de6a8 Better position of options 2021-08-17 18:18:08 +02:00
Laurent Destailleur
d4c35edef4
Update pdf.php 2021-08-17 16:55:56 +02:00
Laurent Destailleur
8eba57f722
Merge branch 'develop' into PDF_Option_show_code_client 2021-08-17 16:51:01 +02:00
Laurent Destailleur
9c78f8f647
Merge branch 'develop' into PDF_Ref_In_Title 2021-08-17 16:46:06 +02:00
Laurent Destailleur
27a580dc95
Merge branch 'develop' into PDF_show_sender_name 2021-08-17 16:41:19 +02:00
Laurent Destailleur
f18f970b08 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 13:52:36 +02:00
Laurent Destailleur
30c40afeb3 Debug notification setup 2021-08-17 04:28:16 +02:00
Laurent Destailleur
a3d04163b6 Debug notification setup 2021-08-17 04:14:28 +02:00
Laurent Destailleur
f51bcf0038 Debug notification module 2021-08-17 03:20:57 +02:00
stickler-ci
73998ac927 Fixing style errors. 2021-08-12 08:36:38 +00:00
Anthony Berton
7d143c5575 Merge branch 'add_option_pdf_global_with_picture' of https://github.com/bb2a/dolibarr into add_option_pdf_global_width_picture 2021-08-12 10:33:55 +02:00
Anthony Berton
fdd85845ce erreur save const 2021-08-12 10:27:19 +02:00
Anthony Berton
67bc64d687 save no ajax 2021-08-12 10:19:55 +02:00
stickler-ci
14ad317acc Fixing style errors. 2021-08-12 08:18:44 +00:00
Anthony Berton
9c811f9051
Merge branch 'develop' into add_option_pdf_global_with_picture 2021-08-12 10:16:26 +02:00
Anthony Berton
52a255e0cb move at bottom of pdf_other.php page 2021-08-12 10:10:57 +02:00
Laurent Destailleur
bfedd4a04c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-11 20:47:51 +02:00
Laurent Destailleur
23713d1deb
Merge pull request #18328 from lainwir3d/shipment_close_order_on_close 
NEW #18326 Workflow: Close order on shipment closing.
 2021-08-11 20:47:06 +02:00
Laurent Destailleur
34b53592b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2021-08-11 19:44:33 +02:00
Anthony Berton
d421d3d8e3
Merge branch 'develop' into PDF_Ref_In_Title 2021-08-11 18:39:32 +02:00
Anthony Berton
32e5b531ba
Merge branch 'develop' into PDF_show_sender_name 2021-08-11 18:38:30 +02:00
Anthony Berton
956bd00c13 CHANGE_CONST_ADD_DOC 2021-08-11 18:37:13 +02:00
Anthony Berton
652cd3afa5
Merge branch 'develop' into PDF_Option_show_code_client 2021-08-11 18:17:58 +02:00
Anthony Berton
0bab31e973
Merge branch 'develop' into PDF_Propal_frame_option 2021-08-11 18:12:02 +02:00
Anthony Berton
5938f131c8 erreur cut past logo height mouve 2021-08-11 16:24:11 +02:00
Anthony Berton
3b356fc366 params is duplicate 2021-08-11 16:20:41 +02:00
Anthony Berton
c5e8302ba2 Const 2021-08-11 16:18:16 +02:00
Laurent Destailleur
065d7a781e
Merge branch 'develop' into PDF_Add_propal_option_paiment 2021-08-11 15:24:10 +02:00
stickler-ci
775164f84a Fixing style errors. 2021-08-11 15:21:14 +02:00
Anthony Berton
c12905f0f3 ok 2021-08-11 15:21:08 +02:00
Laurent Destailleur
094a11fae6
Merge pull request #18390 from bb2a/save__pdf_option_other 
[FIX] PDF other options save Yes/No
 2021-08-11 15:19:38 +02:00
Anthony Berton
b45a57060f const_and_other_doc 2021-08-11 12:36:16 +02:00
stickler-ci
120ac51495 Fixing style errors. 2021-08-11 06:52:10 +00:00
stickler-ci
8f8ff50d35 Fixing style errors. 2021-08-11 06:50:50 +00:00
Laurent Destailleur
21df418468 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-10 19:28:44 +02:00
Anthony Berton
69e31e1655 ok 2021-08-10 18:04:59 +02:00
Anthony Berton
005e25375a ok 2021-08-10 17:51:39 +02:00
Laurent Destailleur
2860c5e3ab Fix missing dir 2021-08-10 16:36:54 +02:00
Anthony Berton
fb81db9426 yes/no save 2021-08-10 13:34:12 +02:00
Anthony Berton
21d6b9834a yes/no save 2021-08-10 13:31:25 +02:00
Anthony Berton
133bb0e699 yes/no save 2021-08-10 13:28:36 +02:00
Anthony Berton
a5accb8c3c yes/no 2021-08-10 13:18:07 +02:00
Anthony Berton
6a41edd3c2 ok 2021-08-10 13:02:37 +02:00
Laurent Destailleur
93fb6bce71 css 2021-08-10 12:26:41 +02:00
Laurent Destailleur
3b73abed7c css 2021-08-10 11:40:25 +02:00
Anthony Berton
366625f300 const 2021-08-10 09:50:14 +02:00
stickler-ci
fcd174f3ad Fixing style errors. 2021-08-10 07:45:47 +00:00
Anthony Berton
f8df845442 Const and Com 2021-08-10 09:45:15 +02:00
Anthony Berton
3b04c28c4f const 2021-08-10 09:41:40 +02:00
Anthony Berton
284b40f152 CONST 2021-08-10 09:38:07 +02:00
Anthony Berton
0bead55836 ok 2021-08-09 18:11:36 +02:00
Anthony Berton
6b3b6fd508 ok 2021-08-09 18:01:43 +02:00
Laurent Destailleur
b5b53e382e Fix missing template 2021-08-09 18:01:41 +02:00
Laurent Destailleur
0876cb4cd9 Fix button cancel 2021-08-09 17:46:36 +02:00
Anthony Berton
41457d2adb ok 2021-08-09 17:16:48 +02:00
Laurent Destailleur
7365d61dfc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-08 12:05:45 +02:00
Laurent Destailleur
948663deb4 Fix deprecated var 2021-08-07 13:59:07 +02:00
Laurent Destailleur
1435172405 Better help 2021-08-06 18:55:41 +02:00
Laurent Destailleur
354d88df23 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-06 18:50:39 +02:00
Laurent Destailleur
d437d382d8 Fix trans 2021-08-06 18:48:05 +02:00
Laurent Destailleur
a7fa238b71 Position of option 2021-08-06 18:35:16 +02:00
Laurent Destailleur
e26eda3f5f Position of option 2021-08-06 18:34:35 +02:00
Laurent Destailleur
458f773baf Fix security options 2021-08-06 18:32:40 +02:00
Laurent Destailleur
470eec7f50 Remove (hide) not used field "deductible" on social contributions. 2021-08-06 11:32:39 +02:00
Laurent Destailleur
c603dfb5ea Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-05 15:16:04 +02:00
Laurent Destailleur
047bbbb298 NEW Can set/unset the usual working day of the week 2021-08-05 14:42:28 +02:00
Laurent Destailleur
0a31f3dc1a FIX #18341 lang not loaded 2021-08-04 23:11:59 +02:00
Laurent Destailleur
f6abeca246 Fix example 2021-08-04 20:18:14 +02:00
Laurent Destailleur
a5d11a1ccf Fix warning 2021-08-04 15:46:00 +02:00
Laurent Destailleur
0de10cea39 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 15:21:31 +02:00
Laurent Destailleur
ba403dd33f Add missing security info 2021-08-04 15:21:01 +02:00
Laurent Destailleur
c60927da61 Add missing security info 2021-08-04 15:16:51 +02:00
Laurent Destailleur
6a31d4657b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 13:12:46 +02:00
Laurent Destailleur
2f3105d884 Add CSRF protection 2021-08-04 13:05:07 +02:00
Laurent Destailleur
d1af127c81 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 12:29:11 +02:00
Laurent Destailleur
4958015e93 Fix token 2021-08-04 12:26:38 +02:00
Laurent Destailleur
6c19524fd7 code comment 2021-08-04 00:12:49 +02:00
Laurent Destailleur
7245fcec11 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-04 00:09:51 +02:00
Laurent Destailleur
5f5734e9af css 2021-08-04 00:09:33 +02:00
Laurent Destailleur
ede571dcfe Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2021-08-03 17:08:49 +02:00
Laurent Destailleur
1c981ccb9d Fix look and feel v14 2021-08-03 17:03:34 +02:00
lainwir3d
4873a91afc CLOSE #18326 Workflow: Close order on shipment closing. 
Allow an order to be closed automatically when all linked shipment have been closed and all products / items have been shipped.
 2021-08-03 17:55:28 +04:00
Laurent Destailleur
0058e32207 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-02 19:03:38 +02:00
atm-florian
fc33d46c77 FIX: using Tulip, deposit mask doesn't get saved 2021-08-02 18:56:45 +02:00
Laurent Destailleur
04fc2c0ce7 css 2021-08-02 17:49:27 +02:00
Gauthier PC portable 024
b83b77beb5 NEW : stock transfer sheet proforma + default model system like cmd invoice, etc... 2021-08-02 17:28:41 +02:00
Gauthier PC portable 024
a45bab10bd Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers 2021-08-02 10:09:18 +02:00
Laurent Destailleur
6f449cfd6c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-31 16:33:38 +02:00
Gauthier PC portable 024
256c3863b8 FIX : travis feedbacks + debug conf page 2021-07-30 17:01:54 +02:00
Gauthier PC portable 024
846f0366d3 FIX : travis feedbacks 2021-07-30 14:17:36 +02:00
atm-florian
63898426d2 FIX: on admin/pdf.php (with javascript enabled) if you set some boolean confs then click on "save", all boolean values are reset 2021-07-30 13:36:54 +02:00
Laurent Destailleur
f02dee2e21 Fix test on missing install.lock 2021-07-29 23:47:59 +02:00
stickler-ci
9805281733 Fixing style errors. 2021-07-29 14:20:50 +00:00
Gauthier PC portable 024
3f42689633 FIX : name 2021-07-29 16:17:12 +02:00
Gauthier PC portable 024
6d460d78ca NEW : Stocks transfers objects management 2021-07-29 16:09:07 +02:00
Laurent Destailleur
1e93a3f8f4 More log on imap card 2021-07-15 22:32:29 +02:00
Laurent Destailleur
0aeeb62628 More log on imap card 2021-07-15 22:29:03 +02:00
Laurent Destailleur
7533c9e3a5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/fr_FR/interventions.lang
 2021-07-12 12:01:53 +02:00
Laurent Destailleur
5319e1d266 Fix help 2021-07-12 10:56:01 +02:00
Laurent Destailleur
e989284f14 Fix setup help 2021-07-12 10:50:37 +02:00
Laurent Destailleur
aa8fc6ba83 css 2021-07-12 10:45:18 +02:00
Laurent Destailleur
aeeb480f26 Fix v14 2021-07-11 20:04:16 +02:00
Laurent Destailleur
802ac58f9a Clean v14 2021-07-11 18:56:15 +02:00
Laurent Destailleur
e1e410ce91 Fix error message if file corrupted 2021-07-11 03:04:06 +02:00
Laurent Destailleur
93083e39c7 Fix using zip for integrity file 2021-07-11 02:58:18 +02:00
Laurent Destailleur
e7b3280c17 Debug v14 with nojs 2021-07-11 01:12:52 +02:00
Laurent Destailleur
339fa6fbe3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-10 09:44:22 +02:00
Laurent Destailleur
3fadd5cda5 NEW Add $dolibarr_main_db_readonly in conf.php for readonly access. 2021-07-09 19:37:12 +02:00
Laurent Destailleur
9e9af8548d Responsive 2021-07-09 18:47:34 +02:00
Laurent Destailleur
af8c973050 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-09 13:35:08 +02:00
Laurent Destailleur
823d360202 Fix reposition 2021-07-09 12:15:43 +02:00
Laurent Destailleur
797797d38b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 20:59:48 +02:00
Laurent Destailleur
a44d646946 Fix to allow html content 2021-07-08 17:31:41 +02:00
Florian Mortgat
38fac48c30 FIX: in kanban view, Dolibarr says "no updates available" even if updates are available 2021-07-08 17:18:47 +02:00
Laurent Destailleur
752b55ac98 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-08 14:04:07 +02:00
Laurent Destailleur
ad11f7b66d Fix type of param 
Fix test of ckeditor for html doc
Fix when MAIN_RESTRICTHTML_ONLY_VALID_HTML is on
 2021-07-08 13:59:04 +02:00
Laurent Destailleur
1380344fdb Fix PHP 8 2021-07-08 12:17:32 +02:00
Laurent Destailleur
4ada220083 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
 2021-07-07 19:18:32 +02:00
Laurent Destailleur
2acbdc2c80 Fix avoid error message 2021-07-07 18:51:00 +02:00
Laurent Destailleur
9308fab7ca Fix css for field pos/position in dictionary. 
Conflicts:
	htdocs/admin/dict.php
 2021-07-07 18:46:11 +02:00
Laurent Destailleur
6cfb3c0e16 Fix css for field pos/position in dictionary. 2021-07-07 18:41:37 +02:00
Laurent Destailleur
9d3f7c5cdd Support fk_parent into dictionary of ticket categories 2021-07-07 18:30:10 +02:00
Laurent Destailleur
ced4ea1314 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/tpl/objectline_view.tpl.php
 2021-07-06 15:59:59 +02:00
Laurent Destailleur
3c0e841877 Fix function not found 2021-07-06 15:55:43 +02:00
Laurent Destailleur
c23f46af9b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-07-06 15:35:39 +02:00
Laurent Destailleur
37801184c0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/holiday/class/holiday.class.php

Fix case of newByMonth
 2021-07-06 15:35:17 +02:00
Laurent Destailleur
ed71888501
Merge pull request #18093 from FHenry/14_deveventorg 
new: working on conference or booth object and event type #FoundationFunding
 2021-07-06 15:05:09 +02:00
Laurent Destailleur
1cfa43c085
Merge pull request #18088 from aspangaro/14p1 
FIX Accountancy - Link from admin
 2021-07-06 14:48:26 +02:00
Laurent Destailleur
407ad4d84d Fix bad value 2021-07-06 02:15:52 +02:00
Laurent Destailleur
c901e518a7 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-06 02:11:28 +02:00
Laurent Destailleur
6e24ee48d4 Debug security page 2021-07-06 02:07:58 +02:00
Laurent Destailleur
adec77e449 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-05 18:47:24 +02:00
Laurent Destailleur
3ac72fe73c Fix 2021-07-05 18:19:02 +02:00
Laurent Destailleur
38d272e31a Better position of fields 2021-07-05 18:16:52 +02:00
Laurent Destailleur
a14c68e996 Fix Hide sensitive key on info page 2021-07-05 18:14:52 +02:00
Florian HENRY
03f8557aaf fix template email 2021-07-05 15:36:41 +02:00
Alexandre SPANGARO
8bde61c2c6 FIX Accountancy - Link from admin 2021-07-05 06:58:10 +02:00
Laurent Destailleur
5779a56ae0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-07-04 21:23:53 +02:00
Laurent Destailleur
0cccfb1cee Fix phpcs v14 2021-07-04 19:23:04 +02:00
Laurent Destailleur
744a95ce7e Fix var init 2021-07-04 18:30:20 +02:00
Laurent Destailleur
4cff865c6b Trans 2021-06-30 18:22:40 +02:00
Laurent Destailleur
d788e58f67
Merge pull request #18036 from frederic34/codesample 
remove unused code
 2021-06-29 15:47:03 +02:00
Laurent Destailleur
2e2d9002ad Code comment 2021-06-27 14:54:17 +02:00
Frédéric FRANCE
58701bef5d
remove unused code 2021-06-26 21:10:59 +02:00
Laurent Destailleur
a657fe2fca Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-23 13:31:40 +02:00
Laurent Destailleur
6db44e66d6 FIX #18006 2021-06-23 13:30:00 +02:00
Laurent Destailleur
c46097ccd9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/main.inc.php
 2021-06-23 11:39:17 +02:00
Laurent Destailleur
de7df8ad9f Fix lang 2021-06-22 19:11:58 +02:00
Laurent Destailleur
a0b594fbdc Debug emailcollector 2021-06-21 19:47:43 +02:00
Laurent Destailleur
31db1dc412 Fix management of visibility of export/import templates. 2021-06-21 15:03:45 +02:00
Laurent Destailleur
561e75d0f8
Merge pull request #17992 from frederic34/patch-8 
fix warnings
 2021-06-21 11:39:40 +02:00
Laurent Destailleur
0dc16b135d FIX allow disabling of a module (not dangerous) even if pb with token. 2021-06-21 00:05:01 +02:00
Frédéric FRANCE
c9c3cef5d7
Update syslog.php 2021-06-20 20:15:19 +02:00
Frédéric FRANCE
9ee9556200
Update user.php 2021-06-20 18:37:43 +02:00
Frédéric FRANCE
cff5edd604
Update syslog.php 2021-06-20 18:24:00 +02:00
Frédéric FRANCE
40afa5b1cc
fix warning 
there is already an array called $option
 2021-06-20 18:21:10 +02:00
Frédéric FRANCE
c820193d11
remove not used var and fix php warnings 2021-06-20 17:01:41 +02:00
Laurent Destailleur
6e27ae6029 Fix path 2021-06-20 01:56:26 +02:00
Laurent Destailleur
4b6427f920 Fix menu entry 2021-06-20 01:55:56 +02:00
Laurent Destailleur
2efd432946 Fix list of security events enabled 2021-06-20 01:54:55 +02:00
Laurent Destailleur
61bd572a9c Fix token for ajax call 2021-06-17 03:37:52 +02:00
Laurent Destailleur
3a5770f679 Clean code 2021-06-15 20:16:05 +02:00
Laurent Destailleur
5f7dddbdcb Fix permissions 2021-06-15 14:49:08 +02:00
Laurent Destailleur
3b9936f7e2 Fix responsive 2021-06-15 01:18:17 +02:00
Laurent Destailleur
8b0c2d997c Clean code 2021-06-14 19:28:38 +02:00
Laurent Destailleur
046215f64a Fix PHP8 2021-06-14 02:08:28 +02:00
Laurent Destailleur
a72f66b456 Fix: dictionnaries are edited per entity 2021-06-13 16:32:06 +02:00
Laurent Destailleur
bb48da988b css 2021-06-13 01:32:14 +02:00
Laurent Destailleur
8b9af8f5ab Responsive 2021-06-13 01:27:04 +02:00
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
 2021-06-11 19:05:05 +02:00
Laurent Destailleur
1605564d5e Clean code 2021-06-11 14:54:18 +02:00
Marc de Lima Lucio
30e0471451 NEW: leave requests: add field into type dictionary to block request if balance is negative 2021-06-10 23:04:56 +02:00
Laurent Destailleur
1798707cce
Merge pull request #17703 from tuxgasy/Fix_new_honorific_title_label 
No try to translate label field in dictionary for new
 2021-06-10 15:38:55 +02:00
Laurent Destailleur
5a6a3561b3
Merge pull request #17834 from frederic34/knowledge 
clean code
 2021-06-10 12:52:00 +02:00
Laurent Destailleur
d4ca6bf42a Clean code 2021-06-09 13:56:03 +02:00
Laurent Destailleur
458ef9f8da Fix security test 2021-06-09 13:31:00 +02:00
Laurent Destailleur
14e3d04e25 Add more info on security page 2021-06-09 13:02:17 +02:00
Laurent Destailleur
c375668ab6 Clean code 2021-06-09 12:41:53 +02:00
Frédéric FRANCE
a586afd8b3
clean code 2021-06-06 21:35:39 +02:00
Laurent Destailleur
46a06f8e95 Fix phpcs 2021-06-06 16:37:45 +02:00
Laurent Destailleur
9f177a0c63 Debug v14 2021-06-06 16:36:41 +02:00
TuxGasy
56bb2bbd14 On dict, test $obj->code if empty before translation 2021-06-04 17:10:26 +02:00
Laurent Destailleur
c3ed30345e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-04 11:45:24 +02:00
Laurent Destailleur
2586fcd1a3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commandestats.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/holiday/month_report.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/societe/list.php
 2021-06-04 11:20:38 +02:00
Laurent Destailleur
86a5eead5a
Merge pull request #17769 from frederic34/patch-21 
force reload css after activate/desactivate module
 2021-06-04 10:40:34 +02:00
Laurent Destailleur
2dc9ca334f CSS 2021-05-31 23:36:37 +02:00
Laurent Destailleur
356e349944 Fix reposition 2021-05-30 20:01:29 +02:00
Laurent Destailleur
2f969f154e More examples 2021-05-30 17:10:38 +02:00
Laurent Destailleur
1834d642b3 Fix phpcs 2021-05-30 17:04:12 +02:00
Frédéric FRANCE
baea57ec05
force reload css after activate/desactivate module 2021-05-30 08:38:07 +02:00
Laurent Destailleur
48867c39aa Fix missing link to edit translation 2021-05-29 04:54:53 +02:00
Laurent Destailleur
240ca50a84 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-27 01:53:06 +02:00
Laurent Destailleur
7983ce941e Fix performance page 2021-05-27 01:52:52 +02:00
Laurent Destailleur
5372912b0b
Merge pull request #17642 from Givriz/dev 
Compatibility phpv8
 2021-05-26 18:22:46 +02:00
Laurent Destailleur
f9d6438bae Debug v14 2021-05-25 23:26:03 +02:00
Laurent Destailleur
f252748dbf
Merge pull request #17343 from atm-gauthier/develop_new_collapse_batch_detail 
NEW : collapse batch detail
 2021-05-25 23:04:50 +02:00
Laurent Destailleur
1b5f7b78b5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-25 20:12:34 +02:00
Laurent Destailleur
673eb73d0a
Merge branch 'develop' into dev_1 2021-05-25 19:55:31 +02:00
Laurent Destailleur
9d6e93fd01
Update security.php 2021-05-25 19:50:53 +02:00
Laurent Destailleur
67372ff7d4
Merge branch 'develop' into patch-1 2021-05-25 19:45:56 +02:00
Laurent Destailleur
d4310f49c4 FIX CWE-79 - huntr - Fix option MAIN_ALLOW_SVG_FILES_AS_IMAGES 2021-05-24 19:46:19 +02:00
Laurent Destailleur
cdf3b7f9a8 Fix responsive 2021-05-24 19:05:25 +02:00
TuxGasy
2fdd8486c9 No try to translate label field in dictionary for new 2021-05-22 06:13:16 +02:00
Givriz
0c5a934e10 Compatibility phpv8 2021-05-20 17:40:44 +02:00
Laurent Destailleur
c561669edf Code comment 2021-05-20 17:02:22 +02:00
Laurent Destailleur
04e9f2c988 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/translation.php
 2021-05-20 15:00:39 +02:00
Laurent Destailleur
865ecf7a94 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/translation.php
 2021-05-20 14:58:50 +02:00
Laurent Destailleur
58ffee193f Debug v14 2021-05-19 13:07:25 +02:00
Laurent Destailleur
e472d2d5d1 Fix bad permission position for external modules 2021-05-19 12:44:26 +02:00
gmilad
57732d4265
Fix issue #17608 for branch 10 
Fix issue #17608 for branch 10
 2021-05-18 19:45:15 +02:00
Damien BENOIT
38a5dfb263
Update listevents.php 
Added $optioncss
 2021-05-18 15:26:55 +02:00
Damien BENOIT
e7ac39fe35
Update modules.php 
Added $param
 2021-05-18 15:23:29 +02:00
Laurent Destailleur
f51e892a97 Fix phpcs 2021-05-18 02:06:35 +02:00
Laurent Destailleur
de6134965b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 19:50:19 +02:00
Laurent Destailleur
cc1f98329d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
	htdocs/ticket/card.php
	htdocs/user/class/api_users.class.php
 2021-05-17 19:50:10 +02:00
Givriz
6bbd6db84b Compatibility phpv8 2021-05-17 18:39:08 +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
caea6f8d6c
Update listevents.php 2021-05-17 16:29:00 +02:00
Laurent Destailleur
caf1c625a3
Update listevents.php 2021-05-17 16:28:19 +02:00
Laurent Destailleur
c8758c53d2
Update listevents.php 2021-05-17 16:27:14 +02:00
Laurent Destailleur
68fe68b844
Update listevents.php 2021-05-17 16:25:25 +02:00
Laurent Destailleur
b2ba1f5540 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/stock/replenish.php
 2021-05-17 10:47:00 +02:00
Laurent Destailleur
985301939d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-17 10:31:25 +02:00
Ferran Marcet
f923c70f38 Fix: Before there was no mistake 2021-05-17 10:17:54 +02:00
Laurent Destailleur
2f9a504dce Fix label 2021-05-17 09:30:09 +02:00
Laurent Destailleur
7bb71dd89f FIX #17602 2021-05-17 09:25:18 +02:00
Laurent Destailleur
af2f40cc18 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
 2021-05-17 09:19:31 +02:00
Laurent Destailleur
892a38e681 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-17 09:15:21 +02:00
Laurent Destailleur
6bf66adff0 Fix remove some $_REQUEST 2021-05-17 07:27:02 +02:00
Ferran Marcet
c577d1c51e FIX: Impossible to add multiple localtax2 2021-05-13 13:35:28 +02:00
Laurent Destailleur
9eda9c1e21 Enhance setup 2021-05-12 19:55:16 +02:00
Givriz
81d899947d Update listevents.php 2021-05-12 18:41:41 +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
2dd3148e3f Fix look and feel v14 2021-05-10 15:24:07 +02:00
Frédéric FRANCE
0d3afb573a
align check code 2021-05-10 14:33:26 +02:00
Gauthier PC portable 024
f9afe7e81a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_collapse_batch_detail 2021-05-10 09:17:15 +02:00
Laurent Destailleur
a349f6c6e7 Fix hide a non ready feature 2021-05-09 20:30:42 +02:00
Laurent Destailleur
ff14d2817d css 2021-05-07 14:08:39 +02:00
Anthony Berton
e71e0f18ce Update pdf.php 2021-05-06 23:01:33 +02:00
Anthony Berton
14860febd5 Update pdf.php 2021-05-06 22:59:06 +02:00
Anthony Berton
1d81322120 Update pdf.php 2021-05-06 22:54:32 +02:00
Frédéric FRANCE
7b8d4c2656
phpcs 2021-05-06 20:32:41 +02:00
Laurent Destailleur
457050f1c5 Add pen to edit dictionary 2021-05-06 18:45:20 +02:00
Laurent Destailleur
b8b6919cb0 Fix label of dictionaries 2021-05-06 18:41:27 +02:00
Laurent Destailleur
3e34557066 Clean code 2021-05-06 18:36:02 +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
6019df2dfc Merge branch 'batch_status_dict' of 
https://github.com/altairisfr/dolibarr into altairisfr-batch_status_dict

# Conflicts:
#	htdocs/langs/fr_FR/productbatch.lang
 2021-05-06 17:29:41 +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
7a76dc4648
Merge pull request #17382 from DorianVabre/dev_EventOrganizer_payment 
new: working on conference or booth object and event type #FoundationFunding
 2021-05-06 16:31:30 +02:00
Laurent Destailleur
e1498ca7ef Clean code 2021-05-05 01:26:06 +02:00
Laurent Destailleur
f37033b1f4 CSS 2021-05-05 00:56:40 +02:00
ATM john
6574e54a41 Fix saving template email 2021-05-04 18:09:13 +02:00
Laurent Destailleur
816acaa4c2 css 2021-05-04 00:17:47 +02:00
Laurent Destailleur
b2901bfae0 Make code simpler 2021-05-04 00:15:06 +02:00
Laurent Destailleur
af9b2414a0
Merge pull request #17480 from bb2a/ajax-pdf-option 
Use AJAX PDF Options
 2021-05-04 00:06:18 +02:00
Laurent Destailleur
b3af666697 Clean code 2021-05-03 23:09:11 +02:00
Anthony Berton
9ef49a15e4 Update pdf.php 2021-05-03 22:28:40 +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
a54e60d345 Look and feel v14 2021-05-02 13:13:55 +02:00
Laurent Destailleur
173ef31ad4 Enhance modulebuilder 2021-05-02 12:15:31 +02:00
Laurent Destailleur
e99355a0c2 Clean html 2021-04-30 15:22:17 +02:00
Laurent Destailleur
67fd5477c9
Merge pull request #17427 from Hystepik/develop#4 
New Module Knowledge Management
 2021-04-30 12:12:15 +02:00
Laurent Destailleur
195163b81a Enhance security center 2021-04-30 11:45:45 +02:00
Laurent Destailleur
e7e2953a9e Look and feel 2021-04-29 15:49:44 +02:00
altairis-noe
38bba5dddc Merge branch 'develop' into batch_status_dict 2021-04-29 13:13:41 +02:00
altairis-noe
b04afc1753 merge conflict resolution 2021-04-29 13:08:24 +02:00
altairis-noe
762f41ea86 llx_c_productbatch_qcstatus as dictionnary name 2021-04-29 12:49:15 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
Dorian Vabre
cb21131259
Merge branch 'develop' into dev_EventOrganizer_payment 2021-04-29 10:31:43 +02:00
Laurent Destailleur
de8e291c7e Debug v14 2021-04-29 10:01:10 +02:00
lmarcouiller
6da32015f4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4 2021-04-29 09:45:30 +02:00
Anthony Berton
b6ddea57f3 update 2021-04-29 00:17:55 +02:00
Anthony Berton
bb5a11ff75 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/17185 2021-04-29 00:06:35 +02:00
Anthony Berton
c1e6109c4b Update 2021-04-29 00:03:16 +02:00
Anthony Berton
5d17e26738 add_pdf_template_and_read_if_module_activate 2021-04-28 23:25:03 +02:00
Laurent Destailleur
2dc597f5d0 Make setup easier to understand 2021-04-28 18:04:00 +02:00
Laurent Destailleur
1166dfb458
Merge pull request #17365 from Givriz/dev 
Compatibility phpv8
 2021-04-28 17:01:22 +02:00
Laurent Destailleur
367a6b15a6
Update modules.php 2021-04-28 17:00:29 +02:00
lmarcouiller
97043ca665 New module KnowledgeManagement 2021-04-28 14:57:49 +02:00
Laurent Destailleur
cb72a010cd FIX notifications for expense report has disappeared. 2021-04-27 22:14:19 +02:00
Damien BENOIT
d8ec9de58b
Update delais.php 2021-04-27 20:53:05 +02:00
Gauthier PC portable 024
ed8b9fda13 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_collapse_batch_detail 2021-04-27 09:28:08 +02:00
Laurent Destailleur
d6cdfcdd8c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/card.php
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/public/members/new.php
 2021-04-27 02:07:48 +02:00
Anthony Berton
e7242cb87f next 2021-04-27 00:23:59 +02:00
Anthony Berton
6353084777 init 2021-04-27 00:22:39 +02:00
Laurent Destailleur
d138e7410b Clean code 2021-04-26 19:12:23 +02:00
Laurent Destailleur
42938ffe31 FIX #yogosha5879 2021-04-24 21:15:09 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Givriz
a451fee68f Compatibility phpv8 2021-04-23 18:01:11 +02:00
Dorian Vabre
432bdaea65 same as previous commit 2021-04-23 10:36:12 +02:00
ksar
efcc5e714a FIX #17363 2021-04-22 15:49:37 +02:00
Givriz
3c49a2b49a Compatibility phpv8 2021-04-21 18:59:25 +02:00
altairis-noe
07cd751c59 batch status dictionnary 2021-04-20 15:51:02 +02:00
Laurent Destailleur
db5fb42c11 css 2021-04-20 12:27:00 +02:00
Laurent Destailleur
f1f63cd4e2 Enhance detection of update available 2021-04-20 11:56:26 +02:00
Laurent Destailleur
4fde184afb Add the setup page of module accounting to not search where is setup 2021-04-20 11:40:43 +02:00
Gauthier PC portable 024
cbfb2d9b47 Merge branch '13.0_new_collapse_batch_detail' of github.com:atm-gauthier/dolibarr into develop_new_collapse_batch_detail 2021-04-20 09:44:24 +02:00
Laurent Destailleur
22daecbeec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-19 22:52:26 +02:00
Laurent Destailleur
ea97992c3d css 2021-04-19 22:52:13 +02:00
Laurent Destailleur
18d87ae575
Merge pull request #17255 from Givriz/dev_1 
Compatibility phpv8
 2021-04-19 21:44:25 +02:00
Laurent Destailleur
ee9c823c33
Merge pull request #17279 from aspangaro/14a38 
NEW: Add constant MAIN_BUGTRACK_URL to add possibility to redirect to other service
 2021-04-19 21:42:13 +02:00
Laurent Destailleur
e71e5d533d Fix HTML5 2021-04-19 21:30:25 +02:00
Laurent Destailleur
c966914f67
Merge branch 'develop' into new/check_update_for_module 2021-04-19 21:26:01 +02:00
Laurent Destailleur
2df9e69293
Merge pull request #17320 from dolibit-ut/patch-279 
Update agenda.php
 2021-04-19 21:00:02 +02:00
Laurent Destailleur
474bf5cfd9 Show MAIN_SECURITY_ANTI_SSRF_SERVER_IP option into security page 2021-04-19 15:26:24 +02:00
Gauthier PC portable 024
894eb1e5a4 NEW : "+" and "-" to show / hide batch details on product "stock" tab 2021-04-19 14:34:11 +02:00
UT from dolibit
6116e22ed5
Update agenda.php 
$wikihelp  =>  $help_url
 2021-04-19 14:15:16 +02:00
Laurent Destailleur
0537fdd1c6 Add local ip into excluded IP for external URL download. 
Fix #yogosha5861
 2021-04-19 13:52:12 +02:00
stickler-ci
fff358f040 Fixing style errors. 2021-04-18 20:28:36 +00:00
ATM john
fb922d9a5a remove space 2021-04-18 22:26:27 +02:00
ATM john
da11ac42ac New check update for modules 2021-04-18 22:13:37 +02:00
Laurent Destailleur
a8a540a58d Clean code 2021-04-18 20:34:14 +02:00
Laurent Destailleur
d42ccef92d Position autoset 2021-04-18 20:33:37 +02:00
ATM john
7794927a64 New check update for modules 2021-04-18 20:12:24 +02:00
Laurent Destailleur
c929c05dc5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-17 03:33:31 +02:00
Laurent Destailleur
0d8a354934 Set default length of password to 12 car. 
FIX #yogosha5855
 2021-04-17 03:11:58 +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
ce9d707040
Merge pull request #17269 from bb2a/picto_massactions 
Next picto mass actions
 2021-04-16 20:40:19 +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
8b2304ec8e Better warning 2021-04-15 19:28:13 +02:00
Givriz
0a0804e7d5 Update dict.php 2021-04-15 16:36:17 +02:00
Laurent Destailleur
af39923a62 Debug v14 2021-04-15 15:41:21 +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
Dorian Vabre
12a796fd8e dynamic selector print improved, now using ref instead of id 2021-04-15 12:57:19 +02:00
Dorian Vabre
764d984ebf fix on dynamic selector 2021-04-15 12:28:53 +02:00
Dorian Vabre
98c622446e dynamic selector of service/product used for the invoice added 2021-04-15 12:14:34 +02:00
Dorian Vabre
dd7c09582f payment page structure ok, still need to confirm the attendee after the payment 2021-04-15 10:45:44 +02:00
Alexandre SPANGARO
140f098c79 NEW: Add constant MAIN_BUGTRACK_URL to add possibility to redirect to other service 2021-04-14 23:16:30 +02:00
Laurent Destailleur
d4420bbfd9 Look and feel v14 2021-04-14 22:31:44 +02:00
Givriz
47cdfee1d2 Compatibility pvpv8 2021-04-14 22:03:04 +02:00
Laurent Destailleur
195d3b578b Fix phpcs 2021-04-14 20:44:34 +02:00
Laurent Destailleur
8bfb69cdba Fix security check 2021-04-14 18:56:31 +02:00
Givriz
9b66895945 Update mails_templates.php 2021-04-14 16:06:53 +02:00
Givriz
32d401bed4 Update mails.php 2021-04-14 15:26:18 +02:00
Anthony Berton
a612831e28 next_change 2021-04-14 14:45:55 +02:00
Dorian Vabre
55afc59db2 removed useless fetch, moved link to the fetch method of the conferenceorbooth class, wip on service to use on the invoice 2021-04-14 14:33:11 +02:00
Laurent Destailleur
7f62b6c49b Look and feel v14 2021-04-13 22:58:37 +02:00
Laurent Destailleur
97292d6843 Fix phpcs 2021-04-13 20:28:25 +02:00
Givriz
bc78b87020 pvpv8 continuous integration 2021-04-13 16:32:19 +02:00
Laurent Destailleur
8c9cacba4d
Merge branch 'develop' into 14a36 2021-04-13 16:05:57 +02:00
Laurent Destailleur
3f159fa39f
Merge pull request #17251 from DorianVabre/dev_EventOrganizer 
Dev event organizer: public registration page to a conference
 2021-04-13 15:31:40 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
Dorian Vabre
167da1445d securekey added in 2021-04-12 17:16:24 +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
Alexandre SPANGARO
bbd774f987 Work on split module fournisseur 2021-04-12 05:50:57 +02:00
Alexandre SPANGARO
c2f7e15add Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 05:31:12 +02:00
Alexandre SPANGARO
80c6458faa Work on split module fournisseur 2021-04-11 22:25:45 +02:00
Laurent Destailleur
3893c69dc1 Enhance perf and security page 2021-04-11 21:30:41 +02:00
Alexandre SPANGARO
ce7c5a0c7b Work on split module fournisseur 2021-04-11 04:24:21 +02:00
stickler-ci
2b58bc904b Fixing style errors. 2021-04-09 14:36:02 +00: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
c0dc784061
Update eventorganization.php 2021-04-09 11:46:50 +02:00
Dorian Vabre
056143450b NEW: add config type securekey module builder 2021-04-09 10:58:33 +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
Dorian Vabre
6f51c69588 securekey ok 2021-04-08 17:15:49 +02:00
Dorian Vabre
af5b623b59 securekey added 2021-04-08 16:32:50 +02:00
Anthony Berton
822d9b227b Update notification.php 2021-04-08 13:50:55 +02:00
Anthony Berton
f613688b28 add_option 2021-04-08 13:37:09 +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
1e1b963ca7 Restriction on name of files 2021-04-07 19:38:54 +02:00
Damien BENOIT
ac2cca51c0
Update delais.php 2021-04-07 19:37:17 +02:00
Laurent Destailleur
10fb793fb1 Enhance the security page 2021-04-06 13:56:33 +02:00
Laurent Destailleur
767aa605a2 Enhance security page 2021-04-06 13:09:00 +02:00
Laurent Destailleur
6c521073ea Fix perm id and sort of modules by id. 2021-04-05 13:52:19 +02:00
Damien BENOIT
1bac38eef2
Update company.php 2021-04-04 18:24:58 +02:00
Givriz
5ed01f6733 Fix errors phpv8 2021-04-03 17:09:14 +02:00
Laurent Destailleur
fb83d66d27 NEW Can show the project ref or label into PDF documents 2021-04-01 13:04:24 +02:00
Laurent Destailleur
06078f231b NEW Can show the project ref or label into PDF documents 2021-04-01 13:02:44 +02:00
Laurent Destailleur
39b71e1ea6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-31 23:16:42 +02:00
Laurent Destailleur
eed14ad6e1 Fix missing token 2021-03-31 23:15:33 +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
625ade1a53 Clean log 2021-03-31 12:41:44 +02:00
Laurent Destailleur
12f14f8bd5
Merge pull request #17021 from bb2a/add_option_warehouse_affect_thirparty 
ADD Option warehouse affect thirparty
 2021-03-30 19:47:19 +02:00
Laurent Destailleur
0c76d830fd
Merge pull request #17031 from dolibit-ut/patch-193 
Update PSWebServiceLibrary.class.php
 2021-03-30 19:28:50 +02:00
Laurent Destailleur
56b44d2e33
Merge pull request #17034 from dolibit-ut/patch-194 
Update sms.php
 2021-03-30 19:17:41 +02:00
Laurent Destailleur
3744bc6a7a FIX #yogosha5746 - next step (work in progress) 2021-03-30 18:17:13 +02:00
UT from dolibit
5935d7d082
Update sms.php 
href="https://www.dolistore.com/
 2021-03-30 17:42:44 +02:00
UT from dolibit
87c9b4b9fd
Update PSWebServiceLibrary.class.php 
https://
 2021-03-30 17:21:10 +02:00
Anthony Berton
96b450a849 20210330 2021-03-30 14:58:47 +02:00
Laurent Destailleur
d61f61ab45 Clean $_GET 2021-03-30 03:55:17 +02:00
Laurent Destailleur
fb84608586 Clean sql 2021-03-30 03:37:54 +02:00
Florian HENRY
14a90a3a9d on goung 2021-03-29 17:26:43 +02:00
Florian HENRY
5fe6aa429d Merge branch 'dev_EventOrganisation_draft' into dev_EventOrganisation 2021-03-29 12:08:02 +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
1bb07c0eb1 Look and feel v14 2021-03-27 13:59:50 +01:00
Florian HENRY
47675d28d7 add filter for select list attendees 2021-03-26 19:47:48 +01:00
Florian HENRY
f87711bf2f Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation 2021-03-26 18:30:08 +01:00
Laurent Destailleur
44cb9dca67 FIX must use getUrlContent to get external url in RSS module 2021-03-25 19:05:01 +01:00
Laurent Destailleur
d9108362ba War against $_POST 2021-03-25 16:59:47 +01:00
Laurent Destailleur
5b68c6af62 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-25 13:48:41 +01:00
Laurent Destailleur
c98f38a209 Fix #yogosha5737 2021-03-25 13:36:43 +01:00
UT from dolibit
72c194e2d8
Create index.html 2021-03-25 11:04:47 +01:00
Florian HENRY
373a52063d add commit 2021-03-24 20:13:30 +01:00
Laurent Destailleur
4015f5952e Look and feel v14 2021-03-24 12:51:14 +01:00
Laurent Destailleur
37c04b794f Add property "ticket group is public" in dicitonary of ticket groups. 2021-03-24 12:13:23 +01:00
Laurent Destailleur
e3b019f923 Clean code 2021-03-23 01:32:17 +01:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
Laurent Destailleur
2b3599dba5 Clean code 2021-03-20 21:29:36 +01:00
Laurent Destailleur
d0f647301b
Merge pull request #16882 from frederic34/patch-4 
fix php8 warning
 2021-03-20 13:41:32 +01:00
Frédéric FRANCE
c1cab76722
fix php8 warning 2021-03-20 13:15:54 +01:00
Frédéric FRANCE
7df344191f
fix php8 warnings 2021-03-20 13:07:46 +01:00
Laurent Destailleur
e54ca79a8c
Merge pull request #16854 from frederic34/confglobal 
get conf global function
 2021-03-20 11:26:32 +01:00
Laurent Destailleur
430bb24049
Merge pull request #16857 from frederic34/patch-9 
fix nested comments for doxygen
 2021-03-20 11:25:11 +01:00
Frédéric FRANCE
bae1770176
uniformise comments to remove nested comments 2021-03-20 10:00:24 +01:00
Frédéric FRANCE
e2fcadef4a
fix nested comments for doxygen 2021-03-20 08:59:54 +01:00
Frédéric FRANCE
4c5ddc44dc
get conf global function 2021-03-19 17:58:01 +01:00
Laurent Destailleur
8462c4d3d3 Clean menu 2021-03-19 13:37:43 +01:00
Laurent Destailleur
ff7f1feaae Fix test on perm 2021-03-19 13:28:04 +01:00
Laurent Destailleur
aef2f1713e FIX #yogosha5673 2021-03-19 13:25:58 +01:00
Laurent Destailleur
d83d005284 FIX #yogosha5674 2021-03-19 12:44:59 +01:00
Frédéric FRANCE
7878f3cba0
fix php8 warning 2021-03-18 08:08:37 +01:00
Laurent Destailleur
b5b86d794f
Merge pull request #16740 from dolibit-ut/patch-100 
Update dav.php
 2021-03-17 17:04:07 +01:00
Laurent Destailleur
bd58e96430 Fix position of param 2021-03-17 11:12:30 +01:00
UT from dolibit
a18e27688d
Update dav.php 
$help_url = 'EN:Module_DAV';

llxHeader('', $langs->trans("DAVSetup"), $help_url);
 2021-03-16 16:54:58 +01:00
Laurent Destailleur
8246eb814b Enhance the page for security advices 2021-03-16 16:02:15 +01:00
Laurent Destailleur
e366d2c379 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/export_files.php
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
	test/phpunit/FilesLibTest.php
 2021-03-16 14:57:04 +01:00
UT from dolibit
a131d9be63
Update barcode.php 
$help_url   add  ->  DE:Modul_Barcode
 2021-03-15 16:19:29 +01:00
Laurent Destailleur
614720fc0a FIX #16671 Can not generate zip file of documents in backup tool 2021-03-15 14:51:36 +01:00
Frédéric FRANCE
191ca62420
fix php8 warning 2021-03-15 00:11:37 +01:00
Laurent Destailleur
5faecef0e1 Look and feel v14 2021-03-13 18:56:02 +01:00
Laurent Destailleur
0dfe79e619 CSS 2021-03-13 14:10:07 +01:00
Laurent Destailleur
c2200e6ffd Clean code 2021-03-10 16:41:48 +01:00
Laurent Destailleur
c3a047ee06 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
 2021-03-08 19:31:47 +01:00
Laurent Destailleur
89066e50f8 css 2021-03-08 12:07:01 +01:00
Laurent Destailleur
c0e0300eb3 Enhance the page security 2021-03-08 11:08:58 +01:00
Frédéric FRANCE
fee5bbf65b
fix usage of else if 2021-03-07 09:12:46 +01:00
Laurent Destailleur
cbd6357f45
Merge pull request #16556 from marc-dll/NEW_ldap_group_filter 
NEW: LDAP: usergroup search can be filtered
 2021-03-06 11:08:24 +01:00
Laurent Destailleur
3cbced439a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/compta/bank/line.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/paiement/cheque/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/ticket.lib.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/cron/list.php
	htdocs/expedition/card.php
	htdocs/mrp/mo_list.php
	htdocs/product/stock/productlot_card.php
	htdocs/public/emailing/mailing-read.php
	htdocs/public/emailing/mailing-unsubscribe.php
	htdocs/ticket/list.php
	test/phpunit/FactureRecTest.php
 2021-03-05 19:29:09 +01:00
stickler-ci
06cabb35ec Fixing style errors. 2021-03-05 10:24:28 +00:00
Marc de Lima Lucio
25b1469b54 FIX: ldap group search test: bad key used + edit label/comments + remove useless code 2021-03-05 11:18:51 +01:00
Marc de Lima Lucio
f731545af4 NEW: ldap: filter search on usergroups 2021-03-05 11:14:21 +01:00
Laurent Destailleur
ffa0e6c391 FIX Timezone management for datetime on list of events 2021-03-04 15:34:29 +01:00
Frédéric FRANCE
bb2a505404
Update eventorganization.php 2021-03-02 18:26:04 +01:00
Laurent Destailleur
7f1d61f8a8 Fix phpcs 2021-03-02 15:34:43 +01:00
Florian HENRY
812d3279b3 Merge branch 'dev_new_conf_defaulteventstatus' of github.com:FHenry/dolibarr into dev_new_conf_defaulteventstatus 2021-03-02 11:06:52 +01:00
Florian HENRY
0f7144a391 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus 2021-03-02 11:05:20 +01:00
Laurent Destailleur
ebc3210308 FIX #16343 2021-03-02 01:58:36 +01:00
stickler-ci
54d35fa59f Fixing style errors. 2021-03-01 20:00:32 +00:00
Florian HENRY
f62386a6a5 set Default values as CURD classes 2021-03-01 20:36:42 +01:00
Florian HENRY
1b57d2a4a0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus 2021-03-01 19:57:54 +01:00
Florian HENRY
7d3bd131ab default envent status 2021-03-01 19:54:30 +01:00
Florian HENRY
0edae6e19a add class default values 2021-03-01 18:25:23 +01:00
Laurent Destailleur
87bc0f9c24 Fix align 2021-02-28 14:28:41 +01:00
Laurent Destailleur
886cbc61c8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/boxes/box_factures_fourn.php
	htdocs/core/boxes/box_factures_fourn_imp.php
	htdocs/core/boxes/box_ficheinter.php
	htdocs/core/boxes/box_members.php
	htdocs/core/boxes/box_propales.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2021-02-28 13:37:45 +01:00
Laurent Destailleur
3a19cbb062 FIX #16420 #16423 #16488 #16477 2021-02-28 12:47:24 +01:00
Frédéric FRANCE
608b933ef5
code syntax admin dir 2021-02-26 22:04:03 +01:00
Frédéric FRANCE
5199e3da5b
code syntax 2021-02-22 18:50:45 +01:00
Laurent Destailleur
f6080d45fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-22 16:21:26 +01:00
Laurent Destailleur
0d01041166 css 2021-02-21 12:10:07 +01:00
Laurent Destailleur
8f91dd48c9 Fix file integrity message 2021-02-20 11:46:48 +01:00
Laurent Destailleur
2904cc803f Fix selection in combo 2021-02-18 13:56:13 +01:00
Laurent Destailleur
bfe71e8509 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-17 14:28:19 +01:00
Florian HENRY
8b5ac45e34 fix typo 2021-02-16 19:29:45 +01:00
Florian HENRY
02a2610432 NEW: Conf for default actiomm status when created from card 2021-02-16 19:22:36 +01:00
Florian Mortgat
186dcab1b7 Merge branch 'NEW/12.0_new_payments_on_vat' of github.com:ATM-Consulting/dolibarr into NEW/14.0_new_payments_on_vat_default_checkbox_value 2021-02-16 16:28:14 +01:00