lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
92,645 Commits 43 Branches 150 Tags 886 MiB
ab0b508984
Commit Graph

92645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Laurent Destailleur
b3d49c4dce Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-11 15:54:31 +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
6a24da54a1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-11 14:49:02 +01:00
Laurent Destailleur
ad4a8eac52
Merge pull request #15725 from fmarcet/11.0 
FIX: Bad rigths to send contract
 2020-12-11 14:41:08 +01:00
Laurent Destailleur
8151e4430b
Merge pull request #15728 from FHenry/dev_add_ecm_files_info_api_docuements 
NEW : add ECM files table info into API document entry GET
 2020-12-11 14:40:40 +01:00
Laurent Destailleur
aa8a6fde84
Merge pull request #15726 from FHenry/develop 
fix: manage price min for PRODUIT_CUSTOMER_PRICES
 2020-12-11 14:36:32 +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
f4b299e530 Fix generation of PDF 2020-12-11 14:35:13 +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
Florian HENRY
dca48e4fb6 NEW : add ECM files table info into API document entry GET 2020-12-11 10:21:10 +01:00
Laurent Destailleur
7ac3bb1b67 Debug v13 2020-12-11 02:40:48 +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
cfa194436f Debug v13 2020-12-11 00:55:21 +01:00
Laurent Destailleur
1f28590e5e Fix style 2020-12-10 19:05:54 +01:00
Laurent Destailleur
6b1ce7c050 Fix management of photo of users 2020-12-10 18:58:11 +01:00
Laurent Destailleur
df4d2e1b24 Fix path of user photo 2020-12-10 18:13:30 +01:00
Florian HENRY
2653d173b9 Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop 2020-12-10 17:16:07 +01:00
Laurent Destailleur
693a7590ef Fix boxes 2020-12-10 17:09:25 +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
6e465afb03 Remove data 2020-12-10 15:47:34 +01:00
Florian HENRY
3438d080f5 Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop 2020-12-10 15:09:03 +01:00
Florian HENRY
2a2b372ba9 fix: manage price min for PRICE PER CUSTOMER 2020-12-10 15:08:36 +01:00
Laurent Destailleur
59938147b6 Prepare v13 2020-12-10 13:38:12 +01:00
Ferran Marcet
7360fcd03e FIX: Bad rigths to send contract 2020-12-10 13:11:55 +01:00
Laurent Destailleur
d040f53dc2 Update web templates 2020-12-10 13:02:51 +01:00
Laurent Destailleur
be163c684f Fix phpcs 2020-12-10 12:54:13 +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
Laurent Destailleur
eedaca1476 Fix bad encoding of link 2020-12-10 00:43:51 +01:00
Laurent Destailleur
2c9eb5417a Look and feel v13 2020-12-10 00:20:22 +01:00
Laurent Destailleur
3fcfcb3e88 Fix field declaration 2020-12-09 23:38:24 +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
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
b8b5d87a09
Merge pull request #15716 from JoolsMcFly/fix/document-api-implementation-notes 
Fix wrong API parameter name in document/buildoc implementation notes
 2020-12-09 22:00:08 +01:00
Laurent Destailleur
dca5b5b1d3
Merge pull request #15710 from hregis/fix_add_hook_for_security 
FIX rename hook to be more explicit and $test = false
 2020-12-09 21:58:47 +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