Commit Graph

20240 Commits

Author SHA1 Message Date
Laurent Destailleur
4a5467234d Merge pull request #13074 from simicar29/simicar29-patch-4
Show extrafields only when enabled
2020-02-12 18:47:32 +01:00
Laurent Destailleur
4678c7ef7a Merge pull request #13081 from bb2a/patch-14
Constant MAIN_DEFAULT_PAYMENT_TYPE_ID can used to set default value
2020-02-12 18:46:08 +01:00
Laurent Destailleur
3a9125b097 Merge pull request #13087 from ptibogxiv/patch-304
Fix netmeasure update and display
2020-02-12 18:35:44 +01:00
Laurent Destailleur
bd0666bf53 Update product.lib.php 2020-02-12 18:35:15 +01:00
Laurent Destailleur
e74df397eb FIX #13094 2020-02-12 17:28:18 +01:00
ptibogxiv
f17c7f4cb3 fix for unit with rowid (netmeasure) 2020-02-11 20:21:53 +01:00
Laurent Destailleur
cc6313cdf3 Fix import examples 2020-02-11 19:32:27 +01:00
Laurent Destailleur
2afe86a1d6 Fix look and feel v11 2020-02-11 19:19:13 +01:00
Laurent Destailleur
74d3912763 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
2020-02-11 16:52:58 +01:00
Laurent Destailleur
8518e0752f NEW Can edit option PDF_USE_ALSO_LANGUAGE_CODE from PDF setup page 2020-02-11 16:01:32 +01:00
Laurent Destailleur
05f0242198 NEW The info_admin() can show text after click on other text 2020-02-11 10:38:09 +01:00
Anthony Berton
6b6355f373 Update html.form.class.php 2020-02-11 09:57:52 +01:00
Ruger
8d9de521f3 FIX: #13038 ExpenseReport PDF - custom category description is not correct 2020-02-11 09:13:15 +01:00
Regis Houssin
275b5d1f77 FIX #10309 2020-02-11 07:32:29 +01:00
Laurent Destailleur
5823e2f5ef add warning 2020-02-10 20:57:55 +01:00
Pierre Ardoin
fab8536f05 add project ref and title 2020-02-10 17:02:10 +01:00
Pierre Ardoin
f9b03596f6 Add project ref and title 2020-02-10 17:01:21 +01:00
Pierre Ardoin
573d86c725 Add project's ref and Title 2020-02-10 16:57:59 +01:00
Pierre Ardoin
546e7b1bcf Add project Ref and Title 2020-02-10 16:57:02 +01:00
Pierre Ardoin
f279b4138b Add Project Ref and Title 2020-02-10 16:52:41 +01:00
Laurent Destailleur
82f5482e25 Merge pull request #13071 from aspangaro/12.0_a13
NEW: Add accountancy code of thirdparty in supplier export
2020-02-10 15:40:09 +01:00
Laurent Destailleur
4973f49113 Merge pull request #13070 from aspangaro/12.0_a12
NEW: Add accountancy code of thirdparty in contact export
2020-02-10 15:38:45 +01:00
Laurent Destailleur
8604ff99ed Merge pull request #13068 from andreubisquerra/develop
Add time tags to Receipt Printers module
2020-02-10 15:37:37 +01:00
simicar29
8bce409db0 Show extrafields only when enabled
Show extrafields only in context where they are enabled (especially in edit mode that uses the showOptionals function).
2020-02-10 13:14:42 +01:00
Pierre Ardoin
6de3795648 change translation Ref
ProjectRef -> RefProject
2020-02-10 09:10:45 +01:00
Pierre Ardoin
d74e1d9182 Update pdf_crabe.modules.php 2020-02-10 09:07:26 +01:00
stickler-ci
5022e58b95 Fixing style errors. 2020-02-10 08:04:40 +00:00
Pierre Ardoin
bd00803090 Update pdf_crabe.modules.php 2020-02-10 09:03:00 +01:00
stickler-ci
6ffbab0a63 Fixing style errors. 2020-02-10 08:01:40 +00:00
Pierre Ardoin
815206cb15 Add Project Title in header of pdf
Add project Title if Global Constant PDF_SHOW_PROJECT_TITLE is active.
2020-02-10 08:59:22 +01:00
Alexandre SPANGARO
20f9154cf3 NEW: Add accountancy code of thirdparty in supplier export 2020-02-10 06:24:13 +01:00
Alexandre SPANGARO
d28f110100 NEW: Add accountancy code of thirdparty in contact export 2020-02-10 06:06:27 +01:00
Laurent Destailleur
ecb1f1f2d7 Responsive 2020-02-10 01:01:22 +01:00
Laurent Destailleur
70c19fedeb Responsive 2020-02-10 00:47:44 +01:00
Laurent Destailleur
d49943ab37 FIX #13019 2020-02-09 18:38:27 +01:00
Laurent Destailleur
94d6fa06dc FIX #13022 2020-02-09 18:34:53 +01:00
Laurent Destailleur
8645fd8946 FIX CVE-2019–17223 FIX #13053 2020-02-09 18:28:57 +01:00
Laurent Destailleur
6badf724cf FIX Mail smtps truncated if content has a line with single .
Conflicts:
	htdocs/core/class/CMailFile.class.php
2020-02-09 16:38:19 +01:00
Laurent Destailleur
5c000159c1 FIX Mail smtps truncated if content has a line with single . 2020-02-09 16:36:38 +01:00
Laurent Destailleur
18d332994f FIX Mail smtps truncated if content has a line with single . 2020-02-09 15:51:43 +01:00
andreubisquerra
37e815183e Add time tags 2020-02-09 14:06:02 +01:00
Laurent Destailleur
1ee959a11f Generic graph 2020-02-08 17:46:41 +01:00
Laurent Destailleur
33addfab01 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-08 17:21:17 +01:00
Laurent Destailleur
3852ba0655 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-08 17:16:25 +01:00
Laurent Destailleur
81df5cd9ab Merge pull request #13032 from atm-florianm/FIX_11.0_select_extrafield_filtering
FIX 11.0 - default filtering for 'select' extrafields should use "=", not "LIKE"
2020-02-08 17:16:01 +01:00
Laurent Destailleur
aed3ea25cb Code comment 2020-02-08 17:14:04 +01:00
Laurent Destailleur
3dfe7161cf Merge pull request #13035 from Dolibarr/scrutinizer-patch-2
Scrutinizer Auto-Fixes
2020-02-08 17:09:25 +01:00
Laurent Destailleur
665876ffa4 Merge pull request #13061 from andreubisquerra/develop
Add and finish receipt printer tags
2020-02-08 16:19:44 +01:00
pnueda
c083458adf Update html.formfile.class.php
Corrects a bug that adds a second '?' in the url string. When strpos returns 0 as the initial position for '?', it is (mis)taken as FALSE value, and then replaced by a second '?' in the list of get parameters, resulting in something like:
/compta/facture/card.php?facid=397?action=remove_file...
instead of 
/compta/facture/card.php?facid=397&action=remove_file...
2020-02-08 16:18:52 +01:00
Laurent Destailleur
c9f7dacda1 Merge pull request #13060 from pnueda/patch-1
Update html.formfile.class.php
2020-02-08 16:18:17 +01:00