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

92869 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Laurent Destailleur
9e8cc7e0f6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/admin/pdf.php
 2020-12-09 17:41:07 +01:00
Laurent Destailleur
075cacb8cf Show setup of option SHOW_SUBPRODUCT_REF_IN_PDF 2020-12-09 17:40:28 +01:00
Laurent Destailleur
30da1ab8b2 Show setup of option SHOW_SUBPRODUCT_REF_IN_PDF 2020-12-09 17:35:02 +01:00
Laurent Destailleur
f56b46bd3e Debug v13 2020-12-09 17:14:35 +01:00
Laurent Destailleur
51738e7e60 Fix links into translation strings 2020-12-09 17:02:26 +01:00
Jools
5ef73bf882
Change module_part to modulepart 2020-12-09 16:26:31 +01:00
lmarcouiller
83286d99be funnel horizontal bar 2020-12-09 13:31:14 +01:00
Laurent Destailleur
d7434ce97a Fix css 2020-12-09 12:42:21 +01:00
Laurent Destailleur
89828c18d1 CSS 2020-12-09 12:32:21 +01:00
Laurent Destailleur
7459607eb9 Look fix 2020-12-09 12:23:37 +01:00
Florian HENRY
29b682d810 fix extrafield checkbox from table (#CroudFounding_DarkJeff_2021) 2020-12-09 10:35:30 +01:00
Regis Houssin
c18e8ac317 FIX regenerate mycompany logos thumbs if not exists 2020-12-09 09:28:46 +01:00
Regis Houssin
37193557df FIX rename hook to be more explicit and $test = false 2020-12-09 08:56:39 +01:00
Laurent Destailleur
43b1be01d9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-08 23:08:56 +01:00
Laurent Destailleur
2429cbe7ca Update doc 2020-12-08 23:08:47 +01:00
Laurent Destailleur
a92ad1484a
Merge pull request #15709 from hregis/fix_add_hook_for_security 
NEW add hook "loginCheckSecurityAccess" (eg for external captcha)
 2020-12-08 23:08:17 +01:00
Laurent Destailleur
a5eb2e56cb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/card.php
 2020-12-08 22:27:27 +01:00
Laurent Destailleur
89854ea137 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-08 22:24:14 +01:00
Laurent Destailleur
75b8794d72 Fix column must be NULL 2020-12-08 22:23:24 +01:00
Laurent Destailleur
e987e6e093 Context for hook showSocinfoOnPrint has been moved from 
"showsocinfoonprint" to "main"
 2020-12-08 22:16:38 +01:00
Laurent Destailleur
51128c1d55
Merge pull request #15692 from ATM-Consulting/FIX/12.0_regression_basic_html_tags_no_longer_allowed_in_product_label 
FIX 12.0 - XSS protection too stringent -> replace 'alphanohtml' with 'restricthtml'
 2020-12-08 22:09:27 +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
bfa813e1b0 Load langs 2020-12-08 20:16:41 +01:00
Laurent Destailleur
5b031473ff Fix hide table if empty 2020-12-08 20:08:14 +01:00
Laurent Destailleur
bb6f23d81b CSS 2020-12-08 19:32:43 +01:00
Regis Houssin
3836e5685a FIX same context of others 2020-12-08 19:30:40 +01:00