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
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
Florian Mortgat
037de5eac6 FIX no js + UX (button "modify") 2021-02-16 16:15:02 +01:00
Florian Mortgat
363fe1f52f NEW 12.0: option to leave the "Automatically create a total payment" checkbox empty on the tax creation page 2021-02-16 15:44:24 +01:00
Laurent Destailleur
73f4a6bfc2 css 2021-02-16 13:29:54 +01:00
Laurent Destailleur
6a46078449 Fix bad url 2021-02-16 12:59:46 +01:00
Laurent Destailleur
d16276ea2c Clean code 2021-02-16 11:15:42 +01:00
Laurent Destailleur
0506bb5e62 Trans 2021-02-16 10:43:29 +01:00
Laurent Destailleur
32370bf63d Look and feel v14 2021-02-15 20:13:38 +01:00
Laurent Destailleur
0bac454f25 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-15 16:40:45 +01:00
Laurent Destailleur
8b34c29be9 Fix translation 2021-02-15 16:39:30 +01:00
Laurent Destailleur
7b383b58c6 Trans 2021-02-15 16:35:51 +01:00
Laurent Destailleur
ad9f58d246
Update mails_templates.php 2021-02-15 15:57:08 +01:00
Laurent Destailleur
e802dd87f4
Merge branch 'develop' into dev_EventOrganisation_setuppage 2021-02-14 21:37:45 +01:00
Laurent Destailleur
9e16cd5b77 Look and feel v14 2021-02-14 20:47:57 +01:00
stickler-ci
a830c52156 Fixing style errors. 2021-02-14 16:36:28 +00:00
Florian HENRY
5958373f47 set icon fa 2021-02-14 17:31:30 +01:00
Florian HENRY
21a8d4d470 ok for setup pages 2021-02-14 17:06:49 +01:00
Florian HENRY
b5055a5edb config pages ok 2021-02-14 16:41:57 +01:00
Florian HENRY
d7dfb9138a working on setup 2021-02-14 15:00:20 +01:00
Florian HENRY
0bcfbb08d8 on going 2021-02-11 17:16:38 +01:00
Florian HENRY
13522fdf5f start module dev 2021-02-11 17:05:04 +01:00
Laurent Destailleur
401b4f641d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
 2021-02-08 22:13:50 +01:00
Laurent Destailleur
9453caa5be Avoid message when not required 2021-02-08 22:12:12 +01:00
Laurent Destailleur
6df6286688 Fix IMAP_FORCE_NORSH and option for imap without ssl 2021-02-08 19:21:32 +01:00
Laurent Destailleur
6892ad9630 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
 2021-02-08 17:25:05 +01:00
Laurent Destailleur
b04c342939 FIX #16215 2021-02-08 15:00:57 +01:00
Laurent Destailleur
9f9ace0565 FIX Localtax must be converted with price2num 2021-02-07 22:15:21 +01:00
Laurent Destailleur
dcae054352
Merge pull request #16202 from frederic34/patch-2 
remove var not used
 2021-02-07 19:57:25 +01:00
Frédéric FRANCE
8d49ca9f0d
fix html 2021-02-07 18:49:46 +01:00
Frédéric FRANCE
9aca5f0535
Update propal.php 2021-02-07 18:21:39 +01:00
Frédéric FRANCE
e37ca613d2
Update prelevement.php 2021-02-07 18:20:46 +01:00
Frédéric FRANCE
8d90063e8f
Update paymentbybanktransfer.php 2021-02-07 18:19:57 +01:00
Frédéric FRANCE
51da7273a4
Update payment.php 2021-02-07 18:18:45 +01:00
Laurent Destailleur
245fd6168d Move text into tab 2021-02-05 14:11:34 +01:00
Laurent Destailleur
726ef265f2 Look and feel v14 2021-02-04 19:21:07 +01:00
Laurent Destailleur
eee49b9132 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/delais.php
 2021-02-04 13:50:07 +01:00
Laurent Destailleur
eca010937f FIX Trigger on expense report was not fired 
FIX Bad dates on info tabs
 2021-02-04 11:56:53 +01:00
Laurent Destailleur
f301635681 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2021-02-03 21:02:32 +01:00
Laurent Destailleur
c9e232f2ff Try to fix import/export timeout by dynamic increase 2021-02-03 18:00:27 +01:00
Laurent Destailleur
4d029194d3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
 2021-02-02 13:22:23 +01:00
Laurent Destailleur
f4f9a7c461 Clean page of info tools 2021-02-02 09:44:51 +01:00
Laurent Destailleur
2e9656a5b2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formactions.class.php
	htdocs/filefunc.inc.php
 2021-02-02 03:26:20 +01:00
Laurent Destailleur
daf88944f8 FIX #16118 Timezone problem on some fields 2021-02-02 00:19:41 +01:00
andreubisquerra
ed258b95da
Clean template code to create after edit in receipt printer module 
Cleaning template code is more clear to users
 2021-01-31 22:33:07 +01:00
Laurent Destailleur
ccf2832938 Clean code 2021-01-30 12:45:43 +01:00
Laurent Destailleur
0ead5abaa8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/stripe/class/stripe.class.php
 2021-01-28 23:22:35 +01:00
Laurent Destailleur
1a52eb5ffa Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-28 19:52:17 +01:00
Laurent Destailleur
099fcd7e4e Fix test email 
Conflicts:
	htdocs/admin/mails.php
 2021-01-28 19:51:54 +01:00
Laurent Destailleur
1764d3528b Fix test email 2021-01-28 19:45:52 +01:00
Laurent Destailleur
f6aacf7656 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-28 19:39:25 +01:00
Laurent Destailleur
4c3dc6be1b Fix can't use the link button twice. 2021-01-28 19:38:06 +01:00
Laurent Destailleur
db9b6b53da NEW Can set a label as placeholder for combo lists. 2021-01-28 16:31:32 +01:00
Laurent Destailleur
a4c0459c1e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/list.php
 2021-01-27 21:09:01 +01:00
Laurent Destailleur
26c22e1b28 Fix warning 2021-01-26 13:22:20 +01:00
Laurent Destailleur
d7bf173f0d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/lib/functions.lib.php
	test/phpunit/SecurityTest.php
 2021-01-26 12:12:35 +01:00
Laurent Destailleur
8db80ff44d Fix reponsive 2021-01-26 11:19:13 +01:00
Laurent Destailleur
0f5fc7353e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/admin/mailing.php
	htdocs/admin/paymentbybanktransfer.php
	htdocs/admin/prelevement.php
	htdocs/modulebuilder/template/admin/setup.php
 2021-01-24 15:29:53 +01:00
Laurent Destailleur
452aea1d8b Fix bad test 2021-01-23 17:59:56 +01:00
Laurent Destailleur
dd69aed27b Fix error test 2021-01-23 17:49:08 +01:00
Laurent Destailleur
6d0cbd3ee5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-23 17:32:49 +01:00
Laurent Destailleur
f2c4e25827 Clean code 2021-01-23 17:32:14 +01:00
Laurent Destailleur
e1b6f33894 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/class/contact.class.php
	htdocs/langs/fr_FR/stocks.lang
	htdocs/modulebuilder/template/myobject_list.php
 2021-01-22 13:40:00 +01:00
Laurent Destailleur
c3ad443200 Fix var not defined 2021-01-21 13:52:23 +01:00
Frédéric FRANCE
3c2bf5d9e9 fix trans 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2021-01-16 17:18:58 +01:00
Laurent Destailleur
cdcc6b7324
Merge pull request #15974 from frederic34/davadmin 
fix trans
 2021-01-16 17:13:37 +01:00
Laurent Destailleur
329499c103 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-16 16:43:00 +01:00
Laurent Destailleur
992645c13d Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-16 16:35:13 +01:00
Laurent Destailleur
871691bf69 Fix missing popup 2021-01-16 16:34:49 +01:00
Laurent Destailleur
828f1c8314 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
 2021-01-15 14:04:22 +01:00
Laurent Destailleur
c3046326cb Fix help 2021-01-15 12:42:40 +01:00
Frédéric FRANCE
cb7266d261
fix trans 2021-01-13 16:18:23 +01:00
Laurent Destailleur
c2187b2ff1
Merge branch 'develop' into develop_new_workstation 2021-01-11 17:59:13 +01:00
Laurent Destailleur
cae9dc3acf
Merge pull request #15925 from FHenry/dev_add_tag_contact_thirdpartycontactcreateion 
NEW : Add contact tag and bulk email status on thirparty+contact create form
 2021-01-11 17:28:12 +01:00
Laurent Destailleur
307d718e82
Merge pull request #15931 from ATM-Nicolas/new_shipping_workflow 
NEW : Workflow to set a shipment as closed
 2021-01-11 16:34:26 +01:00
Laurent Destailleur
de9835ae47
Merge pull request #15936 from bb2a/warhouse_in_propal 
NEW Can ask the warehouse in proposal
 2021-01-11 16:23:15 +01:00
Laurent Destailleur
9a5ae77615
Merge pull request #15926 from FHenry/develop 
fix : remove php warning on install pages
 2021-01-11 16:04:04 +01:00
Laurent Destailleur
5660159a6d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/bom/bom_card.php
 2021-01-11 13:13:26 +01:00
Laurent Destailleur
c10072ccef Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-11 13:07:31 +01:00
Laurent Destailleur
fe7be8362f Fix td balance 2021-01-11 12:03:28 +01:00
Gauthier PC portable 024
8dfb088fc5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_workstation 2021-01-11 10:34:38 +01:00
Anthony Berton
d3fa8b9f20 20210110 2021-01-10 01:07:27 +01:00
ATM-Nicolas
5a6e4f54f0 NEW : Workflow to set a shipment as closed 2021-01-08 16:25:54 +01:00
Florian HENRY
89f75bb766 fix missing parethesis 2021-01-07 17:59:38 +01:00
Florian HENRY
63755d1337 fix missing parethesis 2021-01-07 17:59:19 +01:00
Florian HENRY
71589881f6 fix missing double quote 2021-01-07 17:58:41 +01:00
Florian HENRY
8adfe54949 bulk email management 2021-01-07 17:33:57 +01:00
Laurent Destailleur
b553dbb9d2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-06 20:23:07 +01:00
Laurent Destailleur
3d96c5a454 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/bom/tpl/objectline_create.tpl.php
	htdocs/bom/tpl/objectline_edit.tpl.php
	htdocs/bom/tpl/objectline_view.tpl.php
	htdocs/core/boxes/box_shipments.php
	htdocs/societe/class/societe.class.php
 2021-01-06 20:20:37 +01:00
jpb
19ee163f31 Fix add ticket on elementList 2021-01-06 13:54:51 +01:00
stickler-ci
4691b5e4df Fixing style errors. 2021-01-06 10:41:49 +00:00
Regis Houssin
fadfe4a4bf FIX syntax error 2021-01-06 11:39:12 +01:00
Regis Houssin
f80a476bc5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-06 11:37:56 +01:00
Laurent Destailleur
ba68c958e1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 19:12:57 +01:00
Laurent Destailleur
9764f086d3 Fix Field code is mandatory but not field note in tax dictionary 2021-01-05 14:31:14 +01:00
Regis Houssin
889d73d8e3 FIX avoid php8 warning 2021-01-05 10:16:24 +01:00
Regis Houssin
f845adf343 FIX use GETPOST before 2021-01-05 09:57:35 +01:00
Regis Houssin
d0d9427666 FIX regression 2021-01-02 17:23:25 +01:00
Regis Houssin
3b7f5a92cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-02 17:20:24 +01:00
Laurent Destailleur
1ab459e854 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 16:19:08 +01:00
Laurent Destailleur
f71c581140
Merge pull request #15856 from aspangaro/13b5 
FIX: Accountancy - Debug experimental function to validate movements & typo
 2021-01-02 15:53:28 +01:00
Laurent Destailleur
f16be78167 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/limits.php
	htdocs/takepos/invoice.php
 2021-01-02 15:49:30 +01:00
Laurent Destailleur
a8d15fafd2 Fix missing span 2021-01-02 14:17:54 +01:00
Regis Houssin
e36ae4ac90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2021-01-02 13:14:30 +01:00
Laurent Destailleur
5cf43a0aab Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-01 22:05:56 +01:00
Laurent Destailleur
f328bdc3f9 Fix var name 2021-01-01 22:05:12 +01:00
Laurent Destailleur
a8cd62c44e Add AUDIT_ENABLE_PREFIX_SESSION 2021-01-01 22:00:00 +01:00
Laurent Destailleur
71e4a672f5
Merge branch 'develop' into develop_patch-1 2021-01-01 20:52:43 +01:00
stickler-ci
327ec211c4 Fixing style errors. 2020-12-31 09:49:27 +00:00
Alexandre SPANGARO
46160614b8 Typo 2020-12-31 03:30:18 +01:00
Laurent Destailleur
4768bfe2a5
Merge pull request #15844 from frederic34/adminexpensereport 
remove deprecated
 2020-12-30 23:58:05 +01:00
Laurent Destailleur
020caf8809 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-30 23:52:36 +01:00
Frédéric FRANCE
f5641f8068
remove deprecated 2020-12-30 22:15:34 +01:00
Frédéric FRANCE
786e251961
remove deprecated 2020-12-30 22:13:43 +01:00
Laurent Destailleur
e4915d9825 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2020-12-30 22:02:06 +01:00
Laurent Destailleur
40d19e6c36 Fix tooltip on timezone 2020-12-30 22:01:26 +01:00
Frédéric FRANCE
02d92d3538
remove deprecated 2020-12-30 21:53:17 +01:00
Regis Houssin
c647c78ee0 FIX restore GETPOSTISSET 2020-12-30 14:02:53 +01:00
Regis Houssin
07dc29166e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2020-12-30 13:56:50 +01:00
Laurent Destailleur
8149478c77
Merge pull request #15308 from aspangaro/14a2 
NEW: Dictionary for availability - Add column position
 2020-12-30 13:12:27 +01:00
Regis Houssin
7c5248d105 FIX and the world turn again 2020-12-30 11:27:03 +01:00
Regis Houssin
aec01a95fc FIX again and again 2020-12-29 17:48:52 +01:00
Regis Houssin
acabb045fb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0 2020-12-29 17:12:18 +01:00
Regis Houssin
325c2b03f8 FIX step by step 2020-12-29 17:02:35 +01:00
Laurent Destailleur
cefd66c18f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-29 16:56:39 +01:00
Regis Houssin
20cd9cbbc7 FIX avoid warning php 8.0 2020-12-29 16:25:29 +01:00
Alexandre SPANGARO
9f0434eb69 Merge remote-tracking branch 'upstream/develop' into 14a2 2020-12-29 04:50:32 +01:00
Laurent Destailleur
d9a2e2e402 Responsive 2020-12-29 02:06:42 +01:00
Laurent Destailleur
4b3cd947f2 Fix name of function 2020-12-28 12:33:00 +01:00
Laurent Destailleur
a6eb14f68b
Merge pull request #15585 from cfoellmann/fckeditor-notes 
NEW Can toggle FCKeditor on public/private notes
 2020-12-27 15:06:35 +01:00
Laurent Destailleur
f98f9504f0 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-24 13:07:39 +01:00
Laurent Destailleur
58cd7c97a5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/mailing/card.php
	htdocs/comm/mailing/cibles.php
	htdocs/comm/mailing/class/mailing.class.php
 2020-12-24 13:05:17 +01:00
Laurent Destailleur
739695c442 Fix delay to wait between email for emailing refused float. 2020-12-24 12:49:17 +01:00
Laurent Destailleur
740105ae08 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/emailcollector_card.php
 2020-12-23 11:59:14 +01:00
Laurent Destailleur
4fcf606d04 Error management on emailcollector edition 2020-12-22 17:22:24 +01:00
Laurent Destailleur
083b6a8c87 Fix emailcollector edition 2020-12-22 17:03:57 +01:00
Laurent Destailleur
6fad9c2d3b Fix edition of operation into email collector 2020-12-22 16:59:59 +01:00
Laurent Destailleur
193d231d4c Fix edition of operation into email collector 2020-12-22 16:29:21 +01:00
Laurent Destailleur
15c0773de7
Merge pull request #15791 from frederic34/patch-8 
Remove no more needed file
 2020-12-21 18:21:51 +01:00
Gauthier PC portable 024
5116337e0b FIX : stickler feedbacks 2020-12-21 13:29:44 +01:00
Gauthier PC portable 024
7b739920a2 NEW : Workstations management 2020-12-21 12:28:45 +01:00
Laurent Destailleur
67de45b8d7 Fix responsive 2020-12-21 01:40:15 +01:00
Laurent Destailleur
d3bd709ad6 Fix phpcs 2020-12-20 18:51:17 +01:00
Frédéric FRANCE
92f38f664a
Remove no more needed file 2020-12-20 10:44:55 +01:00
Laurent Destailleur
0c6ccb64e0 Fix links 2020-12-19 21:48:29 +01:00
Laurent Destailleur
fcfd657240 Fix links 2020-12-19 21:41:15 +01:00
Laurent Destailleur
70d1cc79e0 Fix link 2020-12-19 21:30:56 +01:00
Laurent Destailleur
b41b528f33 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/sms.php
 2020-12-19 15:28:58 +01:00
ptibogxiv
22b2247442
Update sms.php 2020-12-19 13:41:49 +01:00
Laurent Destailleur
0eaf924d3b Add warning on non https website to axplain why features is broken 2020-12-18 15:08:00 +01:00
Laurent Destailleur
90d8299c92 Fix purge tool 2020-12-18 13:24:02 +01:00
Laurent Destailleur
3b8947dadd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/price.php
 2020-12-17 21:50:05 +01:00
Laurent Destailleur
f79dec80e6 Fix phpcs 2020-12-17 16:45:56 +01:00
Laurent Destailleur
b04cc22350 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/prelevement.php
 2020-12-17 14:10:45 +01:00
Laurent Destailleur
f0d787debb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-12-17 14:07:24 +01:00
Laurent Destailleur
27542ed8ed
Update prelevement.php 2020-12-17 13:53:09 +01:00
Laurent Destailleur
36d6b472ce
Update prelevement.php 2020-12-17 13:52:03 +01:00
Haldarys
10ac74162e Fix PRELEVEMENT_ADDDAYS check 
If we used a positive value in PRELEVEMENT_ADDDAYS it couldn't submit the changes to database
 2020-12-17 10:19:21 +01:00
Laurent Destailleur
9c759e91f0 Fix debug management of docs in ticket module 2020-12-16 19:01:26 +01:00
Laurent Destailleur
21c2fae00c Fix setup of antivirus 2020-12-16 17:41:18 +01:00
Laurent Destailleur
66e4de628c Fix permissions 2020-12-14 20:38:22 +01:00
Laurent Destailleur
43bb5554d7 Clean deprecated page 2020-12-14 12:19:24 +01:00
Laurent Destailleur
acb73966f7 Clean code. Removed phpexcel library. 2020-12-13 16:27:44 +01:00
Frédéric FRANCE
8aaa1905a0
create url from socialid 2020-12-12 21:03:27 +01:00
Frédéric FRANCE
758763f489
Merge remote-tracking branch 'upstream/develop' into mycompanysocialnetworks 2020-12-12 19:25:15 +01:00
Frédéric FRANCE
6a4990d5bd
clean 2020-12-12 19:21:40 +01:00
Laurent Destailleur
75570cc984
Merge pull request #15743 from frederic34/mycompanysocialnetworks 
Mycompany social networks separate tab
 2020-12-12 19:21:29 +01:00
Laurent Destailleur
a5d2e04dea Debug v13 2020-12-12 19:09:07 +01:00
Laurent Destailleur
d19cdae980
Merge pull request #15727 from frederic34/patch-8 
add option hide topmenu in Config/Display
 2020-12-12 18:48:11 +01:00
Frédéric FRANCE
818af46b86
clean 2020-12-12 18:37:09 +01:00
Frédéric FRANCE
b8a01b4d2d
my company social networks in a separate tab 2020-12-12 18:31:26 +01:00
Frédéric FRANCE
621f246d58
my company social networks in a separate tab 2020-12-12 18:26:54 +01:00
Frédéric FRANCE
0b3a5dc796
fix style 2020-12-11 18:09:37 +01:00
Frédéric FRANCE
e9288ce0da
fix translation 2020-12-11 17:58:43 +01:00
Frédéric FRANCE
8882759e7a
hide topmenu option in config/display 2020-12-11 17:55:08 +01:00
Laurent Destailleur
1f6f434a9c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/export_files.php
	test/phpunit/SecurityTest.php
 2020-12-11 15:56:19 +01:00
Laurent Destailleur
4fcd3fe493 Fix disallow -- string into filename for security purpose. Vulnerability 
reported by Yılmaz Değirmenci
 2020-12-11 15:12:42 +01:00
Laurent Destailleur
2adbd29b49 Debug generation of doc from modulebuilder 2020-12-11 14:22:36 +01:00
Laurent Destailleur
c2124479c7 Fix missing test on IMAP 2020-12-10 16:05:43 +01:00
Laurent Destailleur
c850f4c918 Fix fatal error 2020-12-10 16:01:06 +01:00
Laurent Destailleur
abe8d25a9a
Merge pull request #15711 from hregis/fix_regenerate_mycompany_thumbs 
FIX regenerate mycompany logos thumbs if not exists
 2020-12-09 22:06:19 +01:00
Laurent Destailleur
075cacb8cf Show setup of option SHOW_SUBPRODUCT_REF_IN_PDF 2020-12-09 17:40:28 +01:00
Regis Houssin
c18e8ac317 FIX regenerate mycompany logos thumbs if not exists 2020-12-09 09:28:46 +01:00
Laurent Destailleur
6e479af5b6
Merge pull request #15661 from frederic34/adminsms 
fix trans removing html
 2020-12-07 22:45:14 +01:00
Laurent Destailleur
ff1e6ec371
Merge pull request #15665 from frederic34/admin_boxes 
fix style
 2020-12-07 22:40:51 +01:00
Laurent Destailleur
d9ba821411
Merge pull request #15669 from frederic34/template 
typo ortho
 2020-12-07 22:35:45 +01:00
Laurent Destailleur
3fb63e6a4b Look and feel v13 2020-12-07 15:51:22 +01:00
Frédéric FRANCE
d1204e5e9b
typo ortho 2020-12-05 15:35:52 +01:00
Laurent Destailleur
991cfde0a2 Fix css 2020-12-05 14:46:29 +01:00
Frédéric FRANCE
8996dd9803
fix style 2020-12-05 10:28:40 +01:00
Frédéric FRANCE
cccc670c05
fix trans removing html 2020-12-05 08:45:58 +01:00
Laurent Destailleur
bb0c33a49e
Merge pull request #15654 from frederic34/commonkanban 
keep common if wanted
 2020-12-04 22:25:51 +01:00
Frédéric FRANCE
4039ca269f
fix translation removing html 2020-12-04 21:08:51 +01:00
stickler-ci
d89970ddd1 Fixing style errors. 2020-12-04 19:31:53 +00:00
Frédéric FRANCE
c8407b2f91
keep common if wanted 2020-12-04 20:28:05 +01:00
Laurent Destailleur
e7306625f0 Fix look and feel v13 2020-12-04 15:28:12 +01:00
Laurent Destailleur
56d56929ec Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/dolibarr.php
 2020-12-03 16:39:22 +01:00
Laurent Destailleur
ac29db92cb FIX #15618 2020-12-03 16:35:42 +01:00
Laurent Destailleur
1ec3d4cfdf CSS 2020-12-03 13:19:35 +01:00
Laurent Destailleur
bfe4eb7309 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/emailcollector_card.php
	htdocs/core/modules/modProduct.class.php
 2020-12-03 11:26:53 +01:00
Laurent Destailleur
b324425db8 code comment 2020-12-03 11:19:41 +01:00
Laurent Destailleur
0fd865d8af FIX Better error message with IMAP when connection fails 2020-12-03 11:16:02 +01:00
Laurent Destailleur
748630eb25 FIX Better error message when IMAP connection fails 2020-12-03 11:15:06 +01:00
Laurent Destailleur
cf2dd28a21 Fix warning when setup not complete. 2020-11-30 19:40:53 +01:00
Christian Foellmann
f801dd7d66 PR toggle FCKeditor on public/private notes 2020-11-30 16:39:14 +01:00
Laurent Destailleur
00ad6df395 Fight against $_POST 2020-11-30 14:47:07 +01:00
Laurent Destailleur
7634212811 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/phpinfo.php
	htdocs/commande/stats/index.php
	htdocs/compta/facture/stats/index.php
 2020-11-29 21:35:03 +01:00
Laurent Destailleur
150dd71774 Look and feel v13 2020-11-29 16:02:39 +01:00
Laurent Destailleur
6c65ebef0d Look and feel v13 2020-11-29 15:16:53 +01:00
Laurent Destailleur
df17c2f26a Removed dead code generating warning. 
CSS
 2020-11-28 16:48:32 +01:00
Laurent Destailleur
41984f9934 Clean code 2020-11-28 14:00:35 +01:00
Laurent Destailleur
7e6af6a54f FIX translation not loaded for error message of numbering modules 2020-11-28 02:09:27 +01:00
Frédéric FRANCE
12dce9cd75
avoid large screen for code 2020-11-26 23:53:10 +01:00
Frédéric FRANCE
f03930e55e
doxygen 2020-11-26 23:49:42 +01:00
Laurent Destailleur
4da4499569 FIX Param joinfiles not sanitized 
Conflicts:
	htdocs/admin/mails_templates.php
 2020-11-26 23:07:52 +01:00
Laurent Destailleur
4114201da9 FIX Param joinfiles not sanitized 2020-11-26 23:05:49 +01:00
Laurent Destailleur
61c0c7f0a6 Fix GETPOST second param 2020-11-26 22:59:05 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Laurent Destailleur
2f6f242d99 CSS 2020-11-23 12:29:38 +01:00
Laurent Destailleur
60bfbe2e57
Merge pull request #15448 from Givriz/dev 
Feature : creation of a "button-save" class
 2020-11-21 23:44:30 +01:00
Laurent Destailleur
f39ad2359a Debug 2020-11-21 17:01:17 +01:00
Laurent Destailleur
bf94ce6aad Fix warnings 2020-11-21 16:49:54 +01:00
Laurent Destailleur
95b79094df Fix warning. 
Module cron is more clear.
 2020-11-21 16:27:50 +01:00
Laurent Destailleur
3534555909 Fix setup of scheduled jobs 2020-11-21 14:14:53 +01:00
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
Frédéric FRANCE
f92b5e87dc
doxygen 2020-11-13 14:35:04 +01:00
Laurent Destailleur
a98d025f5a Clean option for replenishment on real stock. 2020-11-13 11:06:51 +01:00
Laurent Destailleur
56bc788d16
Merge pull request #15375 from frederic34/patch-6 
doxygen
 2020-11-13 09:33:36 +01:00
Laurent Destailleur
350d694181 Fix security page 2020-11-12 19:15:44 +01:00
Frédéric FRANCE
64c48a246a
The method PrestaShopWebservice::... is not static, but was called statically 2020-11-12 18:53:26 +01:00
Frédéric FRANCE
caa82a1e2f
Update PSWebServiceLibrary.class.php 2020-11-12 18:43:52 +01:00
Frédéric FRANCE
9c7d698cc7
Create index.html 2020-11-12 18:40:34 +01:00
Frédéric FRANCE
9e59a9aa8c
Create index.html 2020-11-12 18:39:50 +01:00
Laurent Destailleur
754a9778ea Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/modUser.class.php
 2020-11-12 14:17:10 +01:00
Laurent Destailleur
0764cb2abd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-12 14:13:19 +01:00
Laurent Destailleur
a168c3fbb1 Remove warnings 2020-11-12 12:33:29 +01:00
Frédéric FRANCE
ad05451427
Fix missing getpost for scandir odt path 2020-11-12 11:23:03 +01:00
Laurent Destailleur
a804ad4914 css 2020-11-11 16:15:06 +01:00
Laurent Destailleur
741806f47e Clean code 2020-11-11 16:08:00 +01:00
Laurent Destailleur
ad04646c05 Fix must use json_encode/decode instead of dol_json_encode/decode 2020-11-11 15:56:19 +01:00
Laurent Destailleur
e221e19212 Update doc 2020-11-11 13:20:17 +01:00
Alexandre SPANGARO
82d1f99010 Merge remote-tracking branch 'upstream/develop' into 14a2 2020-11-10 04:09:00 +01:00
jcp
50d530733e NEW: ICS fields moved into bank account table 2020-11-09 14:08:34 +01:00
Laurent Destailleur
da6c6c9e0a Clean code 2020-11-08 14:39:20 +01:00
Alexandre SPANGARO
61bca50fa6 NEW: Dictionary for availability - Add column position 2020-11-05 16:56:28 +01:00
Laurent Destailleur
779566ef30 Clean page with security summary 2020-11-05 10:03:53 +01:00
Laurent Destailleur
60f55c81bf Fix error if module xml not loaded 2020-11-04 17:45:10 +01:00
Laurent Destailleur
38d88ced0b Debug the security page 2020-11-04 16:07:59 +01:00
Laurent Destailleur
0dce2c45d9 Trans 2020-11-02 10:15:33 +01:00
Frédéric FRANCE
fcddf03164
fix 2020-11-01 14:13:39 +01:00
Frédéric FRANCE
f0d6029d60
Merge remote-tracking branch 'upstream/develop' into emailsubscription 2020-11-01 14:02:18 +01:00
Frédéric FRANCE
cdc0b8a7d7
add models 2020-11-01 13:59:43 +01:00
Frédéric FRANCE
c2202e10eb
add missing pictos 2020-11-01 13:48:32 +01:00
Frédéric FRANCE
d9bf49c5dc
phpcs 2020-10-31 21:04:38 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 17:51:30 +00:00
stickler-ci
284c9bc6a8 Fixing style errors. 2020-10-31 13:34:01 +00:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Laurent Destailleur
8d6fa350b9 Clean code 2020-10-31 12:41:26 +01:00
Laurent Destailleur
a24071492e Start fix for php8 compatibility 2020-10-30 05:56:07 +01:00
Scrutinizer Auto-Fixer
208740c9c4 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-28 16:49:52 +00:00
Scrutinizer Auto-Fixer
a2a9c51e50 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-27 18:46:07 +00:00
Laurent Destailleur
1b939ab8f4
Merge pull request #15183 from frederic34/dol_fiche_end 
end of dol_fiche_end
 2020-10-27 19:00:32 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Laurent Destailleur
80d13e711c More secured getURLContent method. Add PHPUnit on getURLContent 2020-10-27 18:02:05 +01:00
Laurent Destailleur
d750dc48a1 More secured getURLContent method. Add PHPUnit on getURLContent 2020-10-27 15:06:16 +01:00
Laurent Destailleur
4adaf67d47 Hide setup we don't need if email are disabled globally 
CSS
 2020-10-27 11:40:30 +01:00
Laurent Destailleur
8578a7cd7c Fix regressions 2020-10-25 17:02:25 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of 
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
 2020-10-25 16:01:18 +01:00
Laurent Destailleur
4d9c8e2225
Merge pull request #15124 from frederic34/retrieve 
retrieve the spelling
 2020-10-25 14:48:51 +01:00
Laurent Destailleur
335d1db3a6
Update dict.php 2020-10-25 14:43:33 +01:00
bahfir abbes
3f03b678e9 fix:rowid is string in currencies table 2020-10-24 03:47:10 +01:00
Frédéric FRANCE
ae3228b9e0
retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Laurent Destailleur
e22760e8d5
Merge pull request #15113 from frederic34/patch-8 
code field for product nature must be numeric
 2020-10-23 04:08:39 +02:00
Frédéric FRANCE
78ec68e2cf
code field for product nature must be numeric 2020-10-23 00:04:55 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
0616b9bc9b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/line.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-10-22 17:55:38 +02:00
Laurent Destailleur
b45c99faec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-22 15:03:34 +02:00
Laurent Destailleur
92c6152ad5 FIX #14995 2020-10-22 15:03:12 +02:00
Laurent Destailleur
7605cb1871
Update facture_situation.php 2020-10-21 19:54:28 +02:00
John Botella
d9074e70e1 FIX admin conf selected 2020-10-21 13:27:37 +02:00
Laurent Destailleur
4ec4801c77 FIX Only template of enabled modules visible 2020-10-20 15:54:08 +02:00
Laurent Destailleur
8432a2a0dd Fix phpcs 2020-10-17 19:05:08 +02:00
Laurent Destailleur
27698ab5c7 Protect page for module management with token even for GET action 2020-10-17 14:01:09 +02:00
Laurent Destailleur
20b6d3828e NEW Show image of user in the combo select of users 2020-10-17 13:27:39 +02:00
Laurent Destailleur
5df1218d9f Enhance page to setup email templates 2020-10-17 12:59:22 +02:00
Laurent Destailleur
e3552e7e02 Clean code 2020-10-16 20:17:54 +02:00
Laurent Destailleur
67785887fd
Merge pull request #15035 from andreubisquerra/master 
Change the tag char for security reasons in 'Receipt Printer' module
 2020-10-16 17:20:04 +02:00
Laurent Destailleur
7504f92a41 Standardize code and look and feel 2020-10-16 13:30:20 +02:00
jove@bisquerra.com
f90b236e0f Change the tag char for security reasons in 'Receipt Printer' module 2020-10-15 23:44:13 +02:00
Laurent Destailleur
64b1a31e45
Merge pull request #15018 from FHenry/dev_add_dict_NatureOfProductType 
NEW : Nature of product is now a dictionay
 2020-10-15 21:07:42 +02:00
Laurent Destailleur
844c4dec4d css 2020-10-15 13:16:17 +02:00
Florian HENRY
bcb98d1d67 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 18:16:34 +02:00
Laurent Destailleur
bb367a4489
Update dict.php 2020-10-14 17:40:27 +02:00
Laurent Destailleur
bfe760ffcb
Merge pull request #15012 from bafbes/abb120349 
fix:two fields with same ids
 2020-10-14 17:15:24 +02:00
Florian HENRY
fd1fa1c777 Merge github.com:Dolibarr/dolibarr into dev_add_dict_NatureOfProductType 2020-10-14 16:39:54 +02:00
Florian HENRY
7d09f22afa add correct import and dict edition 2020-10-14 16:39:42 +02:00
Laurent Destailleur
fe19eea540
Merge pull request #15007 from hregis/develop_bug2 
FIX avoid spaces in file name
 2020-10-14 14:45:40 +02:00
Laurent Destailleur
02fcee5d94 Fix make the default sender email mandatory into setup (if not defined, 
no emails can be sent).
 2020-10-14 12:21:31 +02:00
bahfir abbes
8b0a6d7f40 fix:two fields with same ids is incorrect html 2020-10-14 00:21:12 +01:00
Laurent Destailleur
85825a0104 Init page for security info 2020-10-14 00:57:39 +02:00
Regis Houssin
00ee1a7433 FIX compatibility with LF (Line Feed) 2020-10-13 15:08:43 +02:00
Regis Houssin
1348c03ca0 FIX avoid spaces in file name 2020-10-13 14:46:17 +02:00
Laurent Destailleur
75997bb8f5 Minor fixes 2020-10-12 14:01:15 +02:00
Laurent Destailleur
726fd1b631
Merge pull request #11227 from aspangaro/10.0_intracommreport 
NEW module Intracomm report
 2020-10-12 13:35:58 +02:00
Laurent Destailleur
920b31140b Fix exclude of backup files when path are for Windows 2020-10-11 13:32:50 +02:00
Laurent Destailleur
86c46bbb97 Fix backup - Exclude existing backup when path is uppercase. 2020-10-11 13:18:16 +02:00
Laurent Destailleur
ced91d049d Show admin star on audit page list 2020-10-10 16:43:15 +02:00
Alexandre SPANGARO
ca7ad35342 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-09 06:39:42 +02:00
Laurent Destailleur
66744658a2
Merge pull request #14966 from hregis/12_bug 
FIX Multicompany compatibility (missing entity value)
 2020-10-08 19:26:49 +02:00
Aurélien
b6283c1a5d
Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery 2020-10-08 16:19:10 +02:00
Regis Houssin
09e7420936 FIX missing entity in href 2020-10-08 15:51:46 +02:00
Regis Houssin
aa84b76b6a FIX Multicompany compatibility (missing entity value) 2020-10-08 11:43:12 +02:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-07 13:01:28 +00:00
Laurent Destailleur
f16a58a62c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modSocialNetworks.class.php
 2020-10-06 23:36:15 +02:00
Laurent Destailleur
b0d20f92dc FIX autofocus on first setup 2020-10-06 17:32:55 +02:00
AurelienBinard
39d538befc
Merge branch 'develop' into translateModLivraison2ModDelivery 2020-10-06 16:20:25 +02:00
Aurélien
1af42b313c
rename livraison pdf and dependencies #14697 2020-10-06 13:32:02 +02:00
Aurélien
af7c23b2ac
rename folder admin/livraison.php and dependencies #14697 2020-10-06 12:05:24 +02:00
Aurélien
5571a166c6
change variable #14697 2020-10-06 11:37:55 +02:00
stickler-ci
0e7d429991 Fixing style errors. 2020-10-05 13:24:17 +00:00
Christian Foellmann
fb7ed3afc1 optimize mail templates edit screen 2020-10-05 15:20:27 +02:00
Laurent Destailleur
5c3b83b82e Show small image in setup page 2020-10-05 14:06:14 +02:00
Aurélien
bdd095f6bb
translate livraison2delivery => change folder, filename and class ref into all dependencies #14697 2020-10-05 13:59:59 +02:00
Laurent Destailleur
cfc3c01815 Factorize code to know if a parameter is used to store a secret 2020-10-05 12:13:06 +02:00
Laurent Destailleur
62177edab1 NEW Can force the antivirus from conf file or autoprepend ini setup. 2020-10-05 05:00:59 +02:00
Laurent Destailleur
07e1646b3a Minor fixes 2020-10-04 19:09:25 +02:00
Laurent Destailleur
aeb895b1c6 CSS 2020-10-04 18:43:56 +02:00
Laurent Destailleur
c2fed95dc4 FIX #14877 2020-10-02 19:54:06 +02:00
Laurent Destailleur
03ede71989 Clean code 2020-10-02 16:15:24 +02:00
Frédéric FRANCE
16ff15b48c
fix 2020-10-02 00:29:36 +02:00
Frédéric FRANCE
b78e506e39
add files 2020-10-02 00:25:44 +02:00
Frédéric FRANCE
7afb62c55d
Merge remote-tracking branch 'upstream/develop' into ecm_extrafields 2020-10-02 00:24:48 +02:00
Frédéric FRANCE
f057488ae3
add extrafields on ecm 2020-10-02 00:21:13 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
f442dac2c9 Add token on most GET url for admin action 2020-09-30 15:13:28 +02:00
Laurent Destailleur
82da38df65 Removed dead code 2020-09-29 19:57:10 +02:00
Laurent Destailleur
8b2ba8cbba Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/bom/bom_card.php
	htdocs/core/class/ldap.class.php
	htdocs/core/lib/files.lib.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/admin.lang
 2020-09-29 13:28:22 +02:00
Laurent Destailleur
1f8f2c0cc3 NEW Add 2 rules for emailcollector: Message send/not sent from Dolibarr 2020-09-29 13:13:47 +02:00
Laurent Destailleur
4cf6e483ca Fix export of various payments. 2020-09-28 18:49:20 +02:00
Laurent Destailleur
4a7df01339 Fix the MAIN_EXTERNAL_SMTP_SPF_STRING_TO_ADD should be 
MAIN_EXTERNAL_MAIL_SPF_STRING_TO_ADD
 2020-09-27 19:31:54 +02:00
Laurent Destailleur
e495d0459e Look and feel v13 2020-09-27 17:53:17 +02:00
Laurent Destailleur
1b83b55995 Fix to exclude possible sql injection 2020-09-25 17:11:54 +02:00
Laurent Destailleur
3c6dda9dd5 Clean code 2020-09-25 10:27:30 +02:00
Laurent Destailleur
d6ce6bb47f Standardize code 2020-09-25 10:05:59 +02:00
Laurent Destailleur
ed2dd3f55f Clean code 2020-09-24 22:02:10 +02:00
Laurent Destailleur
64c8053b67 Fix restrict extension of files 2020-09-24 21:09:58 +02:00
Laurent Destailleur
ca7b9efec2 Add missing token 2020-09-24 17:08:31 +02:00
Laurent Destailleur
f066da1811 Minor security fixes 2020-09-24 16:19:24 +02:00
Laurent Destailleur
09c6761dae NEW Include the tag editor of page as a popup into website editor 2020-09-23 16:36:19 +02:00
Laurent Destailleur
e4bd75dbdc Enhancement for #14589 2020-09-22 16:26:53 +02:00
Laurent Destailleur
288fd5566f FIX #14776 2020-09-22 16:02:00 +02:00
Laurent Destailleur
cda101238d Fix #yogosha4543 2020-09-20 21:17:27 +02:00
Laurent Destailleur
ab94224d0c
Merge pull request #14668 from OPEN-DSI/email_smtp_allow_auto_signed 
NEW : Email configuration - Allow auto signed certificat when smtp ssl activated
 2020-09-20 17:56:23 +02:00
Laurent Destailleur
b3dd51b790 Fix warnings 2020-09-20 16:46:29 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Laurent Destailleur
2c660504bb Fix escape 2020-09-19 23:11:38 +02:00
Laurent Destailleur
54c0f742b1 Fix escape 2020-09-19 21:19:04 +02:00
Laurent Destailleur
b1985950a6 Use POST to make the ajax set/del constant 2020-09-19 12:50:47 +02:00
Laurent Destailleur
b7a97b2c81 Prepare for fix 2020-09-19 01:45:40 +02:00
Laurent Destailleur
2d38644ae1 Sanitize sortfield 2020-09-18 17:13:01 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
937d656f46 Fix #yogosha4515 2020-09-17 23:02:09 +02:00
Laurent Destailleur
5744b1e0a3 Fix #yogosha4512 2020-09-17 21:34:31 +02:00
Laurent Destailleur
a895cdcdf8 Fix dol_string_nohtmltag: the decode of entity must be done before split 2020-09-17 21:09:16 +02:00
Laurent Destailleur
9a758b7edd FIX #yogosha4483 2020-09-17 14:31:25 +02:00
Laurent Destailleur
2f100fdf79 Fix alpha into alphanohtml 2020-09-17 12:53:58 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
52c9e7230f
Merge pull request #14734 from inoveaconseil/NEW_Scope_Oauth_Google 
New scope oauth google
 2020-09-16 00:55:10 +02:00
Laurent Destailleur
c152f8d76f
Merge branch 'develop' into patch-4 2020-09-16 00:52:16 +02:00
Frédéric FRANCE
070f9a0c89
uniformise scan_dir to scandir in admin supplier payments 2020-09-15 16:32:32 +02:00
Laurent Destailleur
51963f4c2a css 2020-09-15 13:48:48 +02:00
Laurent Destailleur
5ca8141cd8 Typo 2020-09-15 12:09:48 +02:00
Laurent Destailleur
9a9b7ecb95 CSS 2020-09-15 12:07:15 +02:00
Laurent Destailleur
3dfa9acbef CSS 2020-09-15 11:18:57 +02:00
stickler-ci
b39b9e4227 Fixing style errors. 2020-09-14 13:19:26 +00:00
Nicolas
ee4e209e7c NEW Oauth SCOPE for Admin SDK 2020-09-14 15:12:57 +02:00
kkhelifa-opendsi
1f5f784b75
Merge branch 'develop' into email_smtp_allow_auto_signed 2020-09-14 10:25:15 +02:00
stickler-ci
3de5e0f957 Fixing style errors. 2020-09-14 02:30:37 +00:00
Scrutinizer Auto-Fixer
73915d51c8 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-14 02:30:04 +00:00
Laurent Destailleur
59bc8ee07c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/stats/byproperties.php
	htdocs/adherents/stats/geo.php
	htdocs/admin/system/dolibarr.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/admin.lang
	htdocs/product/class/product.class.php
 2020-09-14 02:49:19 +02:00
Laurent Destailleur
a4fb16b4f3 Add a warning to warn about security leak 2020-09-14 00:03:49 +02:00
Laurent Destailleur
7d25de5713 Enhance setup page for email setup 2020-09-12 15:39:14 +02:00
stickler-ci
97e74642ce Fixing style errors. 2020-09-11 12:26:14 +00:00
Sekan, Tobias
0a0eed289e cleanup workflow page + bugfixes 2020-09-11 14:15:10 +02:00
Laurent Destailleur
b8fe2188a6 Standardize code around model_pdf 2020-09-10 01:49:09 +02:00
Laurent Destailleur
803efa7acc Add hidden constant until feature is reliable 2020-09-09 15:39:47 +02:00
Laurent Destailleur
3aa921fd0a
Merge pull request #14665 from TobiasSekan/NewCommonFilterForModuleOverview 
NEW Add common list function for available app/module page
 2020-09-09 15:36:46 +02:00
Sekan, Tobias
37141b577a fix sticker CI, better names, add missing comapres 2020-09-09 08:34:13 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
kamel
ccff18e2a5 NEW : Email configuration - Allow auto signed certificat when ssl activated 2020-09-08 14:48:50 +02:00
Laurent Destailleur
86ed4dfa2b Debug hidden option MAIN_USE_EXPENSE_IK 2020-09-08 11:51:36 +02:00
stickler-ci
2569c792e7 Fixing style errors. 2020-09-08 08:13:56 +00:00
Sekan, Tobias
650bb54051 add common list function for module overview 2020-09-08 10:07:34 +02:00
Laurent Destailleur
198b8d8d2b debugbar ok with php5.6 2020-09-08 02:59:49 +02:00
Laurent Destailleur
1a67b4efeb Debug 2020-09-08 02:11:09 +02:00
Laurent Destailleur
c95e54843c Update lib debugbar 
Update php-parallel-lint
 2020-09-07 21:00:40 +02:00
Laurent Destailleur
b1e45aef46 Debug opensurvey. Look and feel v13. Removed deprecated properties. 2020-09-07 12:04:50 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
lvessiller
27c754e6c8 NEW add send context for ticket 2020-09-02 15:33:18 +02:00
Laurent Destailleur
4110f1df05 Responsive 2020-08-31 19:21:33 +02:00
Laurent Destailleur
0d4f7cb485 Fix responsive and title of reports 2020-08-30 17:42:49 +02:00
Laurent Destailleur
6293f76692 Debug 2020-08-29 06:17:26 +02:00
Laurent Destailleur
b721930b3b
Merge pull request #14568 from atm-lena/NEW_AgendaEvent_Remind 
Agenda Remind (Part 1)
 2020-08-29 05:19:21 +02:00
Laurent Destailleur
983a3c59c8 css 2020-08-29 01:11:08 +02:00
Laurent Destailleur
ad87e753b4 Clean trim on GETPOST (already included inside GETPOST when not 'none' 2020-08-28 21:27:50 +02:00
Laurent Destailleur
04ad25d90f NEW Add the workflow interaction close intervention on closing ticket 2020-08-28 19:07:17 +02:00
Laurent Destailleur
50b791cfca Fix css 2020-08-28 17:41:15 +02:00
Laurent Destailleur
741489fdc0 FIX #14564 2020-08-27 19:52:05 +02:00
Laurent Destailleur
2abdfe08d7 FIX Email collector decode subject 
FIX Cloning email collector clone also rules and operations
 2020-08-27 18:27:05 +02:00
atm-lena
5856033892 Replace "agenda_send" and "event_push" to "actioncomm_send" 2020-08-27 11:15:08 +02:00
atm-lena
1267e914dc Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_AgendaEvent_Remind 2020-08-26 15:16:53 +02:00
Laurent Destailleur
23bb67873f NEW Can edit the list of sending email profiles. 2020-08-25 19:40:17 +02:00
atm-lena
6a94c0f52f Add model type mail 2020-08-25 16:43:57 +02:00
Laurent Destailleur
21633e3d39 css 2020-08-24 17:10:27 +02:00
Laurent Destailleur
b600478a5a Work on recruitment module 2020-08-23 22:11:16 +02:00
Laurent Destailleur
a265bec7ca NEW Events in agenda for contact 
FIX Saving contacts of an events
 2020-08-23 02:38:56 +02:00
Laurent Destailleur
220fc6db98 Work on recruitment module 2020-08-21 13:00:12 +02:00
Laurent Destailleur
461c37c4a8 Clean code 2020-08-21 01:28:40 +02:00
Laurent Destailleur
3ebcd191bd NEW Add filter rules "is answer" and "is not answer" in email collector 2020-08-20 20:16:38 +02:00
Laurent Destailleur
3281d5ec17
Merge pull request #14451 from josemariagomezroncero/patch-7 
Bug, this option disable topic input.
 2020-08-19 14:38:51 +02:00
Laurent Destailleur
4edf190264
Update mails_templates.php 2020-08-19 14:38:02 +02:00
Laurent Destailleur
afe8f76a4a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/stock.php
 2020-08-18 15:41:57 +02:00
Laurent Destailleur
d4a502629e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/stock.php
	htdocs/core/lib/ajax.lib.php
 2020-08-18 15:35:34 +02:00
Laurent Destailleur
d21bda604d FIX Setup of stock increase/decrease 2020-08-18 15:27:17 +02:00
Laurent Destailleur
2f18ab0ea9 Debug generation of document for warehouse 2020-08-18 14:55:56 +02:00
Laurent Destailleur
6ce9d573e2 Trans 2020-08-18 14:13:36 +02:00
Laurent Destailleur
0172b76ea3 Add class reposition on some buttons 2020-08-18 14:05:35 +02:00
Laurent Destailleur
58e25768a7 NEW Add PDF document templates for warehouses (list of stock) 2020-08-18 14:02:36 +02:00
Laurent Destailleur
e3beec3e1f Fix css 2020-08-17 20:57:44 +02:00
Laurent Destailleur
bd65e5612f Fix duplicate id 2020-08-17 20:06:01 +02:00
Laurent Destailleur
75d368b706 Better translation of option 2020-08-17 14:08:52 +02:00
Laurent Destailleur
657e6a2037 No warning 2020-08-16 23:14:53 +02:00
Laurent Destailleur
4c0785e996 FIX #14469 2020-08-16 23:13:27 +02:00
Alexandre SPANGARO
3c35b20b54 Dict - Insert number 41 2020-08-16 22:17:28 +02:00
Alexandre SPANGARO
27c36713d3 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-08-16 22:10:02 +02:00
josemariagomezroncero
134bd11f47
Update mails_templates.php 2020-08-14 21:19:51 +02:00
Laurent Destailleur
0381cf5665 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/modules/modPaymentByBankTransfer.class.php
	htdocs/filefunc.inc.php
 2020-08-14 11:08:53 +02:00
josemariagomezroncero
308dea92b3
Bug, this option disable topic input. 
Bug, MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES disable topic input. We need the subject for email for save.
 2020-08-10 20:40:11 +02:00
Laurent Destailleur
537b58b446 Introduce workaround to allow integrator to suggest list of modules in 
old style by default instead of kanban style #14075
 2020-08-08 02:34:22 +02:00
Laurent Destailleur
71a6cf1207 Fix permission on type of email templates must depends on user perms. 
Conflicts:
	htdocs/admin/mails_templates.php
 2020-08-07 14:39:30 +02:00
Laurent Destailleur
5e90286a2e Fix permission on type of email templates must depends on user perms. 2020-08-07 14:38:03 +02:00
Laurent Destailleur
6fd433167f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2020-08-07 11:59:55 +02:00
Laurent Destailleur
edd19419ad Add protection to allow only jpg and png as image file 2020-08-06 17:39:36 +02:00
Laurent Destailleur
61e194bb6d Add protection to allow only jpg and png as image file 2020-08-06 17:37:00 +02:00
Laurent Destailleur
c2b03e49e1 Fix logo not visible in setup page 2020-08-06 17:28:57 +02:00
Laurent Destailleur
aa696d8343 Show warning in kanban view 2020-08-03 15:17:37 +02:00
Laurent Destailleur
fb811a1656 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/database-tables.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/langs/fr_FR/withdrawals.lang
	htdocs/societe/class/societe.class.php
 2020-08-03 14:44:01 +02:00
Laurent Destailleur
b6a3938921 FIX Size of image on the help popup of modules 2020-08-03 14:32:42 +02:00
Laurent Destailleur
55f3a8b4f8 Fix col size too large by migrating to dynamic format on tables 2020-08-03 11:37:55 +02:00
Laurent Destailleur
4afdfdda53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/card.php
 2020-08-02 22:42:17 +02:00
Laurent Destailleur
c35a103694 Fix phpcs 2020-08-02 22:40:17 +02:00
Laurent Destailleur
d9818405c6 Fix regression for v13 2020-08-02 22:30:23 +02:00
Laurent Destailleur
7297950308
Merge pull request #13759 from OPEN-DSI/stcommcontact 
NEW: Add prospect status managment for the contact with managment of custom icon
 2020-08-02 22:01:00 +02:00
Laurent Destailleur
be34a2c607 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/cashdesk.lang
	htdocs/product/stock/list.php
 2020-08-02 16:06:51 +02:00
kkhelifa-opendsi
fe0f77b967
Merge branch 'develop' into stcommcontact 2020-07-31 16:41:17 +02:00
Laurent Destailleur
f80b54e573 Debug setup of receipt printer module 2020-07-31 13:44:55 +02:00
Laurent Destailleur
d4e21538db FIX Debug setup of receipt printer module 2020-07-31 13:40:36 +02:00
Laurent Destailleur
81cb5501bc Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/database-tables.php
 2020-07-28 10:32:27 +02:00
Laurent Destailleur
45eca85bae Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
 2020-07-28 10:29:14 +02:00
Laurent Destailleur
d46d34915e FIX Checkbox "drop table" was not checked when using php method for dump 2020-07-28 10:23:09 +02:00
Laurent Destailleur
4e4f0a4575 Use same case for all sql files 2020-07-28 09:44:48 +02:00
Laurent Destailleur
fef180cf86 Fix scrutinizer errors 2020-07-28 02:54:37 +02:00
Laurent Destailleur
91a50038ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/fiche-stat.php
 2020-07-27 19:35:34 +02:00
Laurent Destailleur
9798bb1b30 Fix responsive 2020-07-27 02:29:16 +02:00
Laurent Destailleur
0011e09248 FIX Setup of clicktodial hang on smartphone 2020-07-27 02:29:11 +02:00
Laurent Destailleur
8cd4636de7 Fix responsive 2020-07-27 02:27:27 +02:00
Laurent Destailleur
2e19da3e6a FIX Setup of clicktodial hang on smartphone 2020-07-27 02:25:09 +02:00
Laurent Destailleur
353e99c26a Fix look and feel 2020-07-26 19:43:55 +02:00
Laurent Destailleur
378c45fe5c Fix look and feel 2020-07-26 19:21:47 +02:00
Laurent Destailleur
f17942675d Look and feel 2020-07-26 18:34:50 +02:00
Laurent Destailleur
195ad9e5fb Fix exclude .back files 2020-07-24 10:21:20 +02:00
Laurent Destailleur
3109d9c16a Look and feel v13 2020-07-24 09:58:39 +02:00
Laurent Destailleur
afbeb026ab Trans 2020-07-24 09:56:14 +02:00
Laurent Destailleur
aefb1483e3 NEW Can change size of logo on PDF documents 2020-07-24 03:36:44 +02:00
Laurent Destailleur
895fe63d3b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-24 01:53:51 +02:00
Laurent Destailleur
34a9eee7a6 Minor fix in translation 2020-07-24 01:50:57 +02:00
Laurent Destailleur
a46f4df147 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/clicktodial.php
 2020-07-24 00:15:56 +02:00
Laurent Destailleur
0890b15077 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-24 00:06:30 +02:00
Laurent Destailleur
c6c1830e70 FIX ClickToDial tab of users has disappeared 2020-07-24 00:06:18 +02:00
Laurent Destailleur
e5a16c530d FIX Can go on page even when module disabled 2020-07-23 23:57:12 +02:00
Laurent Destailleur
9a506ff9b3 css 2020-07-20 03:29:22 +02:00
Laurent Destailleur
8d26329653 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/lib/price.lib.php
	htdocs/projet/activity/perday.php
 2020-07-19 02:24:26 +02:00
Laurent Destailleur
f26a64fb88 FIX If using a rounding step, localtax1+2 not included in total 2020-07-19 01:47:17 +02:00
Laurent Destailleur
16d486e211 FIX Setup of currency limit and accuracy 2020-07-19 01:03:37 +02:00
Laurent Destailleur
32410b59c4 Code comment 2020-07-19 00:02:02 +02:00
Laurent Destailleur
96729769f7 Standardize Agenda view 2020-07-08 18:06:14 +02:00
Laurent Dinclaux
f2adc3de4f Fix Dolibarr/dolibarr#14181. Limits and accuracy form not saving modified values 2020-07-07 18:03:11 +11:00
Laurent Destailleur
4fd970af28 Fix phpcs 2020-07-07 01:29:31 +02:00
Alexandre SPANGARO
59ee22537d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-07-06 03:24:27 +02:00
Laurent Destailleur
344098fe23 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/actions_fetchobject.inc.php
	htdocs/langs/fr_FR/contracts.lang
	htdocs/langs/fr_FR/loan.lang
	htdocs/langs/fr_FR/stocks.lang
 2020-07-05 13:01:00 +02:00
Laurent Destailleur
1c19c97cf2 FIX missing setup of extrafields for MO 
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
 2020-07-04 16:14:53 +02:00
Laurent Destailleur
26c6e2d92e Clean code 2020-07-02 03:34:28 +02:00
Laurent Destailleur
ab88890f3a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-28 21:48:28 +02:00
Laurent Destailleur
d22a0f702e WIP Stock at date 2020-06-28 17:34:30 +02:00
Laurent Destailleur
194b92e70f Fix load of menu when 'perm' or 'enabled' is '0'. 2020-06-27 15:27:09 +02:00
Laurent Destailleur
b6c1cdad7c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/element.php
 2020-06-24 09:59:08 +02:00
Laurent Destailleur
d05c60baf0 Fix css 2020-06-23 14:33:34 +02:00
Laurent Destailleur
501fd2f7a3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/takepos/admin/receipt.php
 2020-06-21 20:48:41 +02:00
Laurent Destailleur
ccc55dcb1e Debug Receipt printer module and reduce duplicate translation key 2020-06-20 15:19:19 +02:00
atm-quentin
e3d94d44ab NEW hide closed contract lines 2020-06-16 10:45:49 +02:00
Laurent Destailleur
6f12488e30 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2020-06-07 19:55:48 +02:00
Laurent Destailleur
d1dba53f61 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/modules.php
	htdocs/install/mysql/migration/repair.sql
 2020-06-07 19:40:17 +02:00
Laurent Destailleur
42d44e996f Fix link to setup page 2020-06-07 13:50:58 +02:00
Laurent Destailleur
f2e54b9ad5 Fix link to setup page 2020-06-07 13:49:49 +02:00
Laurent Destailleur
4169aa716c FIX can install module even if (x) was appended during download. 2020-06-07 00:23:20 +02:00
Laurent Destailleur
7d3039d41f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/user/card.php
 2020-06-06 23:04:55 +02:00
Laurent Destailleur
19405d5f5b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2020-06-06 23:02:05 +02:00
Laurent Destailleur
cbafbe16a2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/supplier/index.php
	htdocs/admin/mails_templates.php
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/langs/en_US/admin.lang
 2020-06-06 23:00:24 +02:00
Laurent Destailleur
da672c8776 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/admin/translation.php
	htdocs/core/class/html.formfile.class.php
	htdocs/societe/card.php
 2020-06-06 11:57:31 +02:00
Laurent Destailleur
b75700cc0b Fix virtualstock activation when MRP module is on 2020-06-05 10:27:34 +02:00
Laurent Destailleur
630525b59c css 2020-06-05 02:22:16 +02:00
Laurent Destailleur
71cb17b58b css 2020-06-02 20:58:56 +02:00
Laurent Destailleur
3755c7d25b css 2020-06-02 20:58:18 +02:00
gauthier
68bb552dcc FIX : Tickets mail models doesn't work 2020-06-02 17:06:49 +02:00
Laurent Destailleur
8dbc0ff040 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/prelevement.php
	htdocs/admin/system/phpinfo.php
	htdocs/modulebuilder/index.php
 2020-05-31 00:31:14 +02:00
Laurent Destailleur
8146e4fdbd Fix tooltip 2020-05-30 02:17:10 +02:00
Laurent Destailleur
156f09729e Debug module Payment by credit transfer 2020-05-30 02:10:41 +02:00
Laurent Destailleur
0a8b90c4e8 Debug module Payment by credit transfer 2020-05-30 02:10:02 +02:00
Laurent Destailleur
b9051bbe22 Fix admin report 2020-05-29 09:50:38 +02:00
Laurent Destailleur
9224061aed Fix test to upload a file 2020-05-29 03:20:44 +02:00
Laurent Destailleur
5a9d968a75 Fix MAIN_BUGTRACK_ENABLELINK and MAIN_HELP_DISABLELINK setting 2020-05-29 00:02:03 +02:00
Laurent Destailleur
f8b92e507c Clean code 2020-05-28 19:10:06 +02:00
Laurent Destailleur
cf924e11e9
Merge pull request #13825 from bb2a/Add-option-in-stock-for-affect-warehouse- 
NEW Add option to define a default warehouse at user level
 2020-05-28 18:41:54 +02:00
Laurent Destailleur
2f0a5b2634
Merge pull request #13976 from OPEN-DSI/new_ticket_public_notify_new_message 
NEW Ticket message notifications when edited from public interface
 2020-05-28 17:31:26 +02:00
Laurent Destailleur
32aecb553b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2020-05-28 11:44:58 +02:00
Laurent Destailleur
45615081ec FIX Bad use/detetion of text/html when forging template email. 2020-05-28 11:41:48 +02:00
Laurent Destailleur
a2a15ceb5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/core/class/html.form.class.php
 2020-05-27 23:07:18 +02:00
Laurent Destailleur
e37e45f984 Debug credit transfer 2020-05-27 22:35:55 +02:00
Laurent Destailleur
264c1d6491 List website into combo sorted by position, ref fields 2020-05-27 14:50:10 +02:00
Anthony Berton
9efcc631d7
Merge branch 'develop' into Add-option-in-stock-for-affect-warehouse- 2020-05-27 14:47:20 +02:00
kamel
fe8eddac5e [NEW] Ticket message notifications from public interface 
Can send an email when a new message is added from public interface

 close issue #12181
 2020-05-27 11:39:06 +02:00
Laurent Destailleur
2d30d33303 NEW Can filter on container type, language and tags in the list of pages 
of website module.
 2020-05-26 12:25:41 +02:00
Laurent Destailleur
40816c02ce
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-25 22:40:59 +02:00
Laurent Destailleur
056206098b CSS 2020-05-25 12:51:17 +02:00
Laurent Destailleur
9e77dc0a26 CSS 2020-05-25 12:50:29 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
Laurent Destailleur
fd61214b97 Merge 2020-05-24 01:06:45 +02:00
Laurent Destailleur
ef17ed2f87 Look and feel v12 2020-05-24 00:01:52 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule 2020-05-23 21:07:47 +02:00
Frédéric FRANCE
5aa84c64d0
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:54:33 +02:00
Laurent Destailleur
c2b2e17b58
Merge pull request #13917 from atm-quentin/NEW_showfullarbo_in_getnomurl 
NEW conf to allow show full arbo in warehouse getnomurl
 2020-05-23 15:05:08 +02:00
Frédéric FRANCE
85625a46bb
add new rule 2020-05-21 09:35:30 +02:00
Frédéric FRANCE
ee6fadd0d5
add new rule 2020-05-21 01:41:27 +02:00
Laurent Destailleur
346082b153 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-19 19:59:24 +02:00
atm-quentin
d61cef28d7 NEW conf to allow show full arbo in getnomurl 2020-05-19 11:16:04 +02:00
Laurent Destailleur
b3a17c8da4 Look and feel v12 2020-05-19 04:21:38 +02:00
Laurent Destailleur
88c40633d5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-18 15:57:29 +02:00
Laurent Destailleur
ff8d22a80d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	scripts/cron/cron_run_jobs.php
 2020-05-18 15:57:01 +02:00
Laurent Destailleur
756c1fd73d Fix tooltip message 2020-05-18 15:26:04 +02:00
Laurent Destailleur
bd564486ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-17 20:03:09 +02:00
Laurent Destailleur
75ac377352 Fix tar command 2020-05-16 04:26:43 +02:00
Laurent Destailleur
24f4a0be1f exclude other log files 2020-05-16 04:24:23 +02:00
Laurent Destailleur
762ca96203 FIX #13841 2020-05-15 18:28:15 +02:00
Laurent Destailleur
a865dc7232
Merge pull request #13762 from indelog/rappaygroupmod 
NEW possibilty to group payments by mode and show their subtotal
 2020-05-14 16:55:37 +02:00
Laurent Destailleur
61f1a57e2f
Merge pull request #13850 from andreubisquerra/master 
TakePOS Auto Order improvements
 2020-05-14 16:18:28 +02:00
Laurent Destailleur
2c1e1f43dc
Merge pull request #13879 from frederic34/patch-4 
Update dolistore.class.php
 2020-05-14 16:00:36 +02:00
Laurent Destailleur
7c01b54d73 Fix version on module list 2020-05-14 15:42:37 +02:00
Laurent Destailleur
ae0e6e4dc8 FIX dol_concatdesc to escape < 
Better help
 2020-05-14 14:30:36 +02:00
Laurent Destailleur
bcaa83eeec FIX dol_concatdesc to escape < 
Better help
 2020-05-14 14:10:04 +02:00
Frédéric FRANCE
366ae2f116
Update dolistore.class.php 2020-05-12 18:44:26 +02:00
Laurent Destailleur
734a8ba312 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-12 15:27:00 +02:00
Laurent Destailleur
0544434482 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-12 15:26:11 +02:00
Laurent Destailleur
b6afd86354 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-12 15:25:59 +02:00
Laurent Destailleur
4cf99585f8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-12 15:24:15 +02:00
Laurent Destailleur
45caa02929
Merge pull request #13854 from bb2a/user-hide-inactive-in-config-module-users 
NEW Add option to hide all inactive users into combo list of users.
 2020-05-12 03:18:21 +02:00
Laurent Destailleur
7be47097e9
Merge pull request #13867 from frederic34/patch-4 
Only add empty select if no multiselect
 2020-05-12 03:00:10 +02:00
Frédéric FRANCE
4d50ba5e37
Fix dolistore search with csrf active 2020-05-11 20:42:47 +02:00
Laurent Destailleur
4584fa1aa6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/asset/list.php
	htdocs/compta/bank/list.php
	htdocs/contrat/services_list.php
	htdocs/core/lib/date.lib.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/holiday/list.php
	htdocs/projet/tasks/list.php
	htdocs/supplier_proposal/list.php
	htdocs/user/list.php
 2020-05-11 19:43:06 +02:00
Frédéric FRANCE
3a46d5a3dd
Update agenda_other.php 2020-05-11 18:46:54 +02:00
Laurent Destailleur
a83af075aa Fix responsive 2020-05-11 00:35:05 +02:00
Laurent Destailleur
fe241ea321 Fix removed not reliabled info in PHP info 2020-05-09 21:49:12 +02:00
Anthony Berton
3644a718d8 1 2020-05-09 01:02:51 +02:00
Laurent Destailleur
42ee755ea5 Look and feel v12 2020-05-08 02:52:55 +02:00
Maxime Kohlhaas
1a9afe6b20 Fix missing hook params for printFieldListValue 2020-05-08 01:40:25 +02:00
DEMAREST Maxime (Indelog)
889e5db4fb Fix use Form::selectyesno() for added options in admin/compta.php 2020-05-06 13:55:38 +02:00
DEMAREST Maxime (Indelog)
128ec6fd78 Add include various payments and loans in accounting report 
For simplified accouning, behaviour not enable by default and must be
  enabed in simplified accounting module admin page (or by global
  settings ACCOUNTING_REPORTS_INCLUDE_VARPAY and
  ACCOUNTING_REPORTS_INCLUDE_LOAN).
 2020-05-06 12:58:41 +02:00
Laurent Destailleur
a8222c2651 Look and feel v12 2020-05-06 05:10:42 +02:00
Laurent Destailleur
247acdd274 Fix position of custom groups of modules 2020-05-06 03:47:28 +02:00
Anthony Berton
2ccbc59bdb Update stock.php 2020-05-06 00:57:11 +02:00
Anthony Berton
c6d2a1faf3 Add options 
Add options in module stock
 2020-05-06 00:48:00 +02:00
Laurent Destailleur
07178fb6c0 Fix look and feel 2020-05-05 20:52:50 +02:00
Laurent Destailleur
ded0526ca1
Merge pull request #13738 from bb2a/patch-6 
links color for table title line is equal to Text color for table title line
 2020-05-05 18:12:07 +02:00
Laurent Destailleur
5e4ef9266e Fix update template to use for notifications 2020-05-04 20:30:02 +02:00
stickler-ci
ef3f121c88 Fixing style errors. 2020-05-03 08:51:50 +00:00
Anthony Berton
44bafb7225
Update ihm.php 2020-05-03 10:46:48 +02:00
Laurent Destailleur
cc4a9ed10d
Merge pull request #13768 from TobiasSekan/MeasuringDirectoryToolTip 
NEW tooltip for Unit_type and scale in "Dictionary setup - Measuring Units"
 2020-05-01 22:36:04 +02:00
Laurent Destailleur
75dd5f268f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/core/lib/sendings.lib.php
 2020-05-01 22:00:00 +02:00
Laurent Destailleur
160009630f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
 2020-05-01 21:57:28 +02:00
Laurent Destailleur
aab9a2ff75 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-01 21:03:38 +02:00
Laurent Destailleur
b41b22996f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/utils.class.php
	htdocs/core/lib/files.lib.php
 2020-05-01 21:03:16 +02:00
Laurent Destailleur
385f998254 Fix restore param --quick 2020-05-01 21:01:40 +02:00
Laurent Destailleur
82ace4b4ef FIX Several pb in export of documents 
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
 2020-04-30 11:52:30 +02:00
Tobias Sekan
56dee72b66
add tooltip for unit_type and scale (admin) 2020-04-29 13:30:14 +02:00
stickler-ci
2cf5f12a62 Fixing style errors. 2020-04-28 07:18:45 +00:00
DEMAREST Maxime (Indelog)
740b2c9228 NEW possibilty to group payments by mode and show their subtotal 
This add two params (PAYMENTS_REPORT_GROUP_BY_MOD and
PAYMENTS_FOURN_REPORT_GROUP_BY_MOD) for payments and supplier payments
to group them by mode and get subtotals for each mode. Add the
corresponding configuration options on admin page fore each payments and
supplier payments.
 2020-04-28 09:01:00 +02:00
kamel
9cb90cb384 NEW: Add prospect status managment for the contact with managment of custom icon 2020-04-27 17:35:14 +02:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23 2020-04-27 14:14:13 +02:00
Laurent Destailleur
4c605283f5 Fix phpcs 2020-04-27 00:09:21 +02:00
Laurent Destailleur
c0821a8ed6 Fix phpcs 2020-04-27 00:02:31 +02:00
Laurent Destailleur
31157931a9 Fix phpcs 2020-04-26 23:52:23 +02:00
Laurent Destailleur
b20d85b198 Fix phpcs 2020-04-26 23:06:52 +02:00
Laurent Destailleur
6caa872280 Enable more PHPCS rules 2020-04-25 19:27:42 +02:00