Commit Graph

22515 Commits

Author SHA1 Message Date
David Bensel
bc9f7c83f4 update 2020-12-14 22:40:47 +03:00
Laurent Destailleur
098f51413f Fix translation 2020-12-14 20:33:27 +01:00
Laurent Destailleur
2d343ab016 Fix 2020-12-14 20:01:17 +01:00
Laurent Destailleur
9595504b56 Fix graph 2020-12-14 19:57:59 +01:00
Laurent Destailleur
5f9b53004b Fix warning 2020-12-14 17:40:40 +01:00
Laurent Destailleur
8114e86cf9 Fix phpcs 2020-12-14 13:40:30 +01:00
Laurent Destailleur
e612f53494 Fix warning 2020-12-14 13:01:25 +01:00
Laurent Destailleur
107e58403a Fix position of captcha 2020-12-14 12:54:54 +01:00
Laurent Destailleur
b0e3f1678f Debug v13 2020-12-14 10:58:09 +01:00
Laurent Destailleur
cce0b2f31b Fix code 2020-12-14 10:44:51 +01:00
stickler-ci
d32d3060cc Fixing style errors. 2020-12-14 09:15:06 +00:00
Stephane Lesage
5e4cc7fcfd companycard-directedit-typent 2020-12-14 10:14:31 +01:00
Laurent Destailleur
d739fa1951 Fix log 2020-12-13 18:32:55 +01:00
Laurent Destailleur
acb73966f7 Clean code. Removed phpexcel library. 2020-12-13 16:27:44 +01:00
Laurent Destailleur
3d33d3aa3a Fix warning 2020-12-13 14:36:00 +01:00
Laurent Destailleur
427fb16256 Fix warning 2020-12-13 13:29:47 +01:00
Laurent Destailleur
16ae3b83f9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-13 13:02:59 +01:00
Laurent Destailleur
ac34fce015
Merge pull request #15696 from StephaneLesage/12importexporticonslabels
Fix & sync import/export entity icons/labels translation
2020-12-13 12:50:30 +01:00
Laurent Destailleur
8a0d3e3f6f Fix warning 2020-12-13 12:38:47 +01:00
Frédéric FRANCE
346fe8ae85
clean 2020-12-12 22:35:51 +01:00
Frédéric FRANCE
6c3a9cbc40
clean 2020-12-12 21:27:56 +01:00
Laurent Destailleur
3521a736fc Fix warnings 2020-12-12 19:49:13 +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
d19cdae980
Merge pull request #15727 from frederic34/patch-8
add option hide topmenu in Config/Display
2020-12-12 18:48:11 +01:00
Laurent Destailleur
96c1429713
Merge pull request #15741 from frederic34/socialnetworkslink
Socialnetworkslink
2020-12-12 18:42:00 +01:00
Laurent Destailleur
fa05982a8b Fix CSS v13 2020-12-12 18:37:51 +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
643b507a96
ucfirst 2020-12-12 17:31:10 +01:00
Frédéric FRANCE
46bf871127
target 2020-12-12 17:23:42 +01:00
Frédéric FRANCE
d523ed9f85
socialnetworks links 2020-12-12 17:01:25 +01:00
Frédéric FRANCE
4664ac1a1c
socialnetworks links 2020-12-12 17:00:23 +01:00
Laurent Destailleur
b452852b30 Fix phpcs 2020-12-12 16:35:30 +01:00
Laurent Destailleur
7fdae69546 Fix warning 2020-12-12 14:11:50 +01:00
Laurent Destailleur
a3d302d91c Debug v13 2020-12-12 13:58:21 +01:00
Laurent Destailleur
0968c68cf9 Enhance widget 2020-12-12 12:45:43 +01:00
Laurent Destailleur
33bb1919f0
Merge branch 'develop' into develop#3 2020-12-12 12:23:33 +01:00
Laurent Destailleur
11eb48b60a
Merge pull request #15737 from frederic34/pdfBuildThirdpartyName
thirdparty need to be object
2020-12-12 12:16:31 +01:00
Laurent Destailleur
2046b3d042
Merge pull request #15740 from frederic34/pdfproforma
fix warning
2020-12-12 12:12:43 +01:00
Frédéric FRANCE
479d709a96
fix warning 2020-12-12 09:39:54 +01:00
stickler-ci
87038f953a Fixing style errors. 2020-12-11 19:58:05 +00:00
Frédéric FRANCE
9b2c989906
thirdparty need to be object 2020-12-11 20:57:02 +01:00
Frédéric FRANCE
0b3a5dc796
fix style 2020-12-11 18:09:37 +01:00
Laurent Destailleur
9100e1410e Fix translation, add comments and clean code, fix also a small
regression on colors for graph with lines
2020-12-11 17:59:18 +01:00
Frédéric FRANCE
8882759e7a
hide topmenu option in config/display 2020-12-11 17:55:08 +01:00
Laurent Destailleur
18efbebd02 css 2020-12-11 17:11:50 +01:00
Laurent Destailleur
91ddcf6446
Merge pull request #15724 from Hystepik/develop#1
Close #15383 : New format for funnel of prospection
2020-12-11 16:31:46 +01:00
Laurent Destailleur
ab0b508984
Merge pull request #15720 from zuiko/patch-1
V13 Update html.form.class.php to complete Fix #15565 Enhanced behaviour to select product on customer/supplier order to be able to use barcode reader efficiently
2020-12-11 16:31:19 +01:00
Laurent Destailleur
8a0c065163 Debug v13 2020-12-11 16:30:45 +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
lmarcouiller
dea75e6158 Close #15729 : fix error on box name and format 2020-12-11 15:55:17 +01:00
lmarcouiller
54228ad256 Close #15729 : fix bug with nb jobs 2020-12-11 15:49:47 +01:00
lmarcouiller
a5cf177025 Close #15729 : first push 2020-12-11 15:22:29 +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
2353ade957
Merge pull request #15732 from frederic34/patch-14
fix phpcs
2020-12-11 14:36:04 +01:00
Laurent Destailleur
2adbd29b49 Debug generation of doc from modulebuilder 2020-12-11 14:22:36 +01:00
Frédéric FRANCE
54d51ec557
Update html.form.class.php 2020-12-11 13:46:47 +01:00
Frédéric FRANCE
eb2d7fa657
fix phpcs 2020-12-11 13:43:03 +01:00
Laurent Destailleur
697ca3e4f5 Fix selection of duration type 2020-12-11 02:23:43 +01:00
Laurent Destailleur
4ec598d571 Debug v11 2020-12-11 02:12:39 +01:00
Laurent Destailleur
2f8ee92c51 Fix CSS 2020-12-11 02:02:41 +01:00
Laurent Destailleur
206caec290 Debug v13 2020-12-11 01:20:40 +01:00
Laurent Destailleur
1f28590e5e Fix style 2020-12-10 19:05:54 +01:00
Laurent Destailleur
df4d2e1b24 Fix path of user photo 2020-12-10 18:13:30 +01:00
Frédéric FRANCE
d9682df682
hide also topmenu if disabled 2020-12-10 17:37:44 +01:00
Laurent Destailleur
693a7590ef Fix boxes 2020-12-10 17:09:25 +01:00
lmarcouiller
716bb433e8 ajout pictogramme graph dans info box head 2020-12-10 15:50:18 +01:00
Stephane Lesage
bcf4f65cc9 Fix & sync import/export entity icons/labels translation 2020-12-10 14:15:33 +01:00
stickler-ci
0a2f656137 Fixing style errors. 2020-12-10 12:19:43 +00:00
lmarcouiller
4f6923442a fix merge and sql synthax 2020-12-10 13:19:10 +01:00
Laurent Destailleur
2c37fe13d6 Fix substitution var keys 2020-12-10 12:14:58 +01:00
Laurent Destailleur
155fa43dc6 Fix substitution var __AMOUNT_TEXT__ 2020-12-10 12:01:22 +01:00
Hystepik
a57b01e9ba
Update box_funnel_of_prospection.php 2020-12-10 11:12:33 +01:00
stickler-ci
492715811c Fixing style errors. 2020-12-10 10:10:12 +00:00
Hystepik
14358f022d
Merge branch 'develop' into develop#1 2020-12-10 11:09:42 +01:00
stickler-ci
38e03778dc Fixing style errors. 2020-12-10 10:07:09 +00:00
lmarcouiller
ecd642e465 Close #15383 : New format for funnel of prospection 2020-12-10 10:58:07 +01:00
Laurent Destailleur
44713825e6
Merge pull request #15713 from FHenry/fix_extrafield_chbx
NEW extrafield checkbox from table (#CrowdFunding_DarkJeff_2021)
2020-12-09 22:04:31 +01:00
Laurent Destailleur
66ed76c97c
Merge pull request #15718 from frederic34/box_funnel
fix warnings
2020-12-09 21:57:43 +01:00
Laurent Destailleur
dac0267a38 Fix debug various payment module.
Fix debug report income/expense (for situation that should not happen
but if it happen, result is consistent with other screens).
2020-12-09 21:51:01 +01:00
zuiko
b3ca58d2d0
Update html.form.class.php
Complete the Fix to #15565 Enhanced behaviour to select product on customer/supplier order to be able to use barcode reader efficiently.
Answer to Eldy, https://github.com/Dolibarr/dolibarr/pull/15704#discussion_r538763166
In fact the change alone to htdocs/core/lib/ajax.lib.php  is not, for me, sufficient to fix the issue.
if $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, the combo remains even if the product is alone.
So I recommend that the code is $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 1, (wihout combo) for product selection only for customer order filling because for this usage the the probability is higher to use a barcode scanner.
It is less relevant for filling supplier orders (which are not usually entered by barcode scanner), because the combo gives verification information which then disappears. (This is especially true for the purchase price, which is not pre-filled in the box for the moment I tested(?).
2020-12-09 21:16:25 +01:00
Laurent Destailleur
10a0c98f94 Debug v13 2020-12-09 19:26:41 +01:00
Laurent Destailleur
a0d9d98402 Fix phpcs 2020-12-09 18:03:02 +01:00
Frédéric FRANCE
a256bfeb46
fix warnings 2020-12-09 17:50:21 +01:00
lmarcouiller
83286d99be funnel horizontal bar 2020-12-09 13:31:14 +01:00
Florian HENRY
29b682d810 fix extrafield checkbox from table (#CroudFounding_DarkJeff_2021) 2020-12-09 10:35:30 +01:00
Laurent Destailleur
70b772cf74 Kit must show details on PDF. 2020-12-08 21:56:48 +01:00
Laurent Destailleur
c26efd756f FIX #15704 #15565 #15694 2020-12-08 20:53:42 +01:00
Laurent Destailleur
769a8886b9 Debug notification on events 2020-12-08 20:32:37 +01:00
Laurent Destailleur
0234df6224
Merge pull request #15705 from StephaneLesage/fix-boxes-thirdparty
Fix boxes third-parties information
2020-12-08 17:58:09 +01:00
Laurent Destailleur
791d129c9c
Merge pull request #15699 from hregis/fix_bcc_only_if_not_exists
FIX add autocopy to if not already exists in $to
2020-12-08 17:56:04 +01:00
Laurent Destailleur
240648d540 css 2020-12-08 17:09:48 +01:00
Stephane Lesage
376e4d150a Third-party details in comm action lists 2020-12-08 15:56:42 +01:00
Stephane Lesage
5d8dfadd09 Third-party details in Lists in project index 2020-12-08 15:47:22 +01:00
Stephane Lesage
3161f35971 Fix boxes third-parties information 2020-12-08 14:08:32 +01:00
Laurent Destailleur
8491be2572 Fix look and feel v13 2020-12-08 11:58:47 +01:00
Regis Houssin
fc34c97666 FIX add autocopy to if not already exists in $to 2020-12-08 08:49:06 +01:00
Stephane Lesage
08ccc11f9e Export warehouses 2020-12-08 00:50:27 +01:00
Laurent Destailleur
86e1082138
Merge pull request #15644 from Hystepik/develop#1
New #8172 : PHPExcel replaced by PHPSpreadSheet
2020-12-07 23:06:21 +01:00
Laurent Destailleur
f21a4e8aed
Merge branch 'develop' into develop#3 2020-12-07 22:46:36 +01:00
Laurent Destailleur
465cee7e92
Merge pull request #15662 from frederic34/boxproduits
fix missing fields in box
2020-12-07 22:41:20 +01:00
Laurent Destailleur
64e2ddbd80
Merge pull request #15666 from Zebedeu/develop
New #8472 personal and professional titles added
2020-12-07 22:40:01 +01:00
Laurent Destailleur
d9ba821411
Merge pull request #15669 from frederic34/template
typo ortho
2020-12-07 22:35:45 +01:00
Laurent Destailleur
efc3bad7c6
Merge pull request #15678 from frederic34/fk_element
doxygen
2020-12-07 22:31:08 +01:00
Laurent Destailleur
ffa866585a
Update emailsenderprofile.class.php 2020-12-07 22:29:17 +01:00
Laurent Destailleur
97abb5bf64
Merge pull request #15685 from RomainDeschamps/patch-1
Enabling StockAtDate menu
2020-12-07 22:21:13 +01:00
Laurent Destailleur
6e403e6ce0 Fix warnings 2020-12-07 18:29:14 +01:00
Laurent Destailleur
ee0e882607 Clear code 2020-12-07 16:15:47 +01:00
Laurent Destailleur
3fb63e6a4b Look and feel v13 2020-12-07 15:51:22 +01:00
Laurent Destailleur
e77413e1e4 Fix warning 2020-12-07 15:36:37 +01:00
Laurent Destailleur
cc44ce7ddd Fix warning 2020-12-07 15:35:38 +01:00
Laurent Destailleur
f21fc43e7e Fix label of field 2020-12-07 14:25:49 +01:00
Laurent Destailleur
ca2ce88bd2 Fix warning 2020-12-07 13:29:56 +01:00
Laurent Destailleur
4f826fae26 Fix warnings 2020-12-07 12:18:53 +01:00
Laurent Destailleur
0361d3afde Debug v13 2020-12-07 11:42:35 +01:00
Romain DESCHAMPS
ccf95542f1
Enabling StockAtDate menu 2020-12-07 09:52:25 +01:00
Hystepik
2ac98d06f5
Merge branch 'develop' into develop#3 2020-12-07 09:03:59 +01:00
Laurent Destailleur
d1c66059cd Add missing tag order_ref and order_ref_customer on shipments for ODT
generation.

Conflicts:
	htdocs/core/class/commondocgenerator.class.php
2020-12-06 19:03:46 +01:00
Laurent Destailleur
025cbe8557 Add missing tag order_ref and order_ref_customer on shipments for ODT
generation.
2020-12-06 19:01:09 +01:00
Laurent Destailleur
e0d656e0c8 Fix phpcs 2020-12-06 18:01:23 +01:00
Laurent Destailleur
a87ef49172 Fix remove warning 2020-12-06 17:59:49 +01:00
Laurent Destailleur
de61a7cfd3 Fix cleaning html tags with trans and with GETPOST. 2020-12-06 17:30:27 +01:00
Laurent Destailleur
1f83e22aea Fix set of translation of website page during cloning 2020-12-06 15:59:19 +01:00
Zebedeu
dadb257c85 Fix #15675 fixed the error of installation start of version 13.0.0-beta
this patch fixed the problem but nevertheless does not pass the test because at the time of installation the variable $conf->theme is null
2020-12-06 07:58:46 +01:00
Zebedeu
50b80785f5 Revert "Fix #15675 fixed the error of installation start of version 13.0.0-beta"
This reverts commit 35ea990cff.
2020-12-06 07:56:18 +01:00
Zebedeu
35ea990cff Fix #15675 fixed the error of installation start of version 13.0.0-beta
this patch fixed the problem but nevertheless does not pass the test because at the time of installation the variable $conf->theme is null
2020-12-06 07:49:22 +01:00
Zebedeu
e38c6e4322 Revert "Fix #15675 fixed the error of installation start of version 13.0.0-beta"
This reverts commit 3b7e510e61.
2020-12-06 07:42:45 +01:00
Zebedeu
3b7e510e61 Fix #15675 fixed the error of installation start of version 13.0.0-beta
this patch fixed the problem but nevertheless does not pass the test because at the time of installation the variable $conf->theme is null
2020-12-06 07:31:54 +01:00
Zebedeu
2a4fe639ae Revert "fix | fixed the error of installation start of version 13.0.0-beta"
This reverts commit 8697fda78b.
2020-12-06 07:28:18 +01:00
Zebedeu
8697fda78b fix | fixed the error of installation start of version 13.0.0-beta
this patch fixed the problem but nevertheless does not pass the test because at the time of installation the variable $conf->theme is null
2020-12-06 07:22:06 +01:00
Zebedeu
f708065445 Revert "Fix | fixed the error of installation start of version 13.0.0-beta"
This reverts commit 1a1850c6f1.
2020-12-06 07:14:11 +01:00
Frédéric FRANCE
fbc0be3a43
doxygen 2020-12-05 23:57:31 +01:00
Frédéric FRANCE
4e18f46f28
doxygen 2020-12-05 23:53:55 +01:00
Zebedeu
1a1850c6f1 Fix | fixed the error of installation start of version 13.0.0-beta 2020-12-05 20:28:55 +01:00
Zebedeu
1917d9b508 Revert "Fix #15675 fixed the error of installation start of version 13.0.0-beta"
This reverts commit 7a8d031d56.
2020-12-05 20:23:31 +01:00
Zebedeu
7a8d031d56 Fix #15675 fixed the error of installation start of version 13.0.0-beta 2020-12-05 20:17:57 +01:00
Laurent Destailleur
6c2d520e21 FIX caluclation of open days must not depends on TZ. 2020-12-05 17:41:05 +01:00
Frédéric FRANCE
d1204e5e9b
typo ortho 2020-12-05 15:35:52 +01:00
Laurent Destailleur
6023f2e16f Fix php8 2020-12-05 14:57:41 +01:00
Laurent Destailleur
cb9d6318e7 Fix warning 2020-12-05 14:09:51 +01:00
Laurent Destailleur
15455690b9 Fix setup 2020-12-05 14:06:50 +01:00
Laurent Destailleur
5860bf69ce fix warning 2020-12-05 13:48:51 +01:00
Laurent Destailleur
3b55eb1d82 FIX master must be after session_start but dol_getprefix must be before
and after filefunc.inc.php.
2020-12-05 13:26:58 +01:00
Frédéric FRANCE
325951877b
fix missing fields in box 2020-12-05 08:58:20 +01:00
Frédéric FRANCE
e9a12b5324
fix missing fields in box 2020-12-05 08:56:17 +01:00
Laurent Destailleur
8455e03a08 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-04 22:30:56 +01:00
Laurent Destailleur
af1bb09338 NEW: Graphics can be horizontal bars. 2020-12-04 22:30:34 +01:00
Laurent Destailleur
bb0c33a49e
Merge pull request #15654 from frederic34/commonkanban
keep common if wanted
2020-12-04 22:25:51 +01:00
Laurent Destailleur
b9f7d9ab4b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-04 22:12:43 +01:00
Laurent Destailleur
d8b01d9a33 Fix chart is default graph lib 2020-12-04 22:12:20 +01:00
Laurent Destailleur
a05021a344
Merge pull request #15653 from frederic34/typeusermenuleft
fix type_user not defined in left menu
2020-12-04 22:03:54 +01:00