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
