Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
87,205 Commits 35 Branches 179 Tags 1.7 GiB
c2bb0431f0
Commit Graph

6242 Commits

Author SHA1 Message Date
Laurent Destailleur
8b879ee23b FIX Edit extrafield of type long text loose carriage returns 2020-07-30 14:49:00 +02:00
Laurent Destailleur
8045cff888 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
 2020-07-29 13:53:09 +02:00
Laurent Destailleur
930ae84dac Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/lib/pdf.lib.php
 2020-07-29 13:50:31 +02:00
Laurent Destailleur
566f683c54 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-29 13:40:19 +02:00
Laurent Destailleur
f2390e85b9
Merge pull request #14287 from atm-florianm/FIX_allow_more_html_tags 
NEW: additional html tags allowed by dol_string_onlythesehtmltags()
 2020-07-29 13:34:45 +02:00
Laurent Destailleur
8c06e3577d Fix several trouble with diret debit module and credit transfer module 2020-07-27 19:33:24 +02:00
VERDOL Gauthier
25994e61bc FIX : We need to see unit line on PDF even though it's an option 2020-07-27 16:04:21 +02:00
Laurent Destailleur
d945ef67e1 FIX Picto of HRM module 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2020-07-26 20:53:22 +02:00
Laurent Destailleur
dd86c21382 FIX dolGetElementUrl and agenda page for external modules 2020-07-25 03:01:04 +02:00
Laurent Destailleur
573feed66f FIX locataxes lost on lines when cloning a vendor invoice 2020-07-25 02:59:49 +02:00
FlorianMortgat
c48a294a2b FIX: allow more harmless html tags 2020-07-25 00:57:40 +02:00
Laurent Destailleur
34a9eee7a6 Minor fix in translation 2020-07-24 01:50:57 +02:00
Laurent Destailleur
431b207dab Fix to solve sql error on some databases 2020-07-24 01:02:07 +02:00
Laurent Destailleur
0890b15077 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-24 00:06:30 +02:00
Laurent Destailleur
c6c1830e70 FIX ClickToDial tab of users has disappeared 2020-07-24 00:06:18 +02:00
Laurent Destailleur
f26a64fb88 FIX If using a rounding step, localtax1+2 not included in total 2020-07-19 01:47:17 +02:00
Laurent Destailleur
ac92a9fa40 Doc more complete 2020-07-18 22:59:47 +02:00
Laurent Destailleur
a252c87c82 Fix comment 2020-07-18 19:41:11 +02:00
Laurent Destailleur
fd95551940 Fix upload of file in import module 
Conflicts:
	htdocs/core/lib/security.lib.php
 2020-07-09 21:52:27 +02:00
Laurent Destailleur
7d7ef1e72a FIX option PRODUIT_CUSTOMER_PRICES_BY_QTY 
Fix setup of product
 2020-07-06 15:34:26 +02:00
Laurent Destailleur
4819e58d06 Fix trans 2020-07-04 13:04:53 +02:00
Laurent Destailleur
e2a9743dd4 Debug module credit transfer 2020-07-01 14:19:47 +02:00
Laurent Destailleur
9bb0ef04f5 Fix upload of file in import module 2020-06-29 18:07:51 +02:00
Laurent Destailleur
5b3670f300 FIX SQL syntax error when editing extrafields 
Conflicts:
	htdocs/core/lib/security.lib.php
 2020-06-29 14:28:53 +02:00
Laurent Destailleur
a5893db106 FIX upload documents into manual ECM was reported a permission error 2020-06-28 22:05:55 +02:00
Laurent Destailleur
95729e2375 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2020-06-28 21:47:43 +02:00
Laurent Destailleur
8dee17446d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/company.lib.php
 2020-06-28 21:46:08 +02:00
Florian Mortgat
ccfe6f18fe FIX 10.0 - fatal with postgres 
backport of https://github.com/Dolibarr/dolibarr/pull/14064/files
 2020-06-25 16:06:16 +02:00
Laurent Destailleur
566c1aaf84 Fix for credit transfer module 2020-06-22 22:54:33 +02:00
Laurent Destailleur
c919d3d5aa
Merge pull request #14100 from atm-florian/12_fixAdvTargetTplWarning 
fix: warning and clean old code about multiselect category for advtarget tpl
 2020-06-20 12:18:35 +02:00
Laurent Destailleur
989737af6b Update website templates 2020-06-19 10:36:19 +02:00
florian HENRY
29c049e358 set correct global conf 2020-06-19 09:49:43 +02:00
Laurent Destailleur
eef07afc90 Try to solve pb with too many columns. Merge 2 columns of amounts in 1 2020-06-18 03:32:13 +02:00
Laurent Destailleur
a5ce3ada0a Keep feature experimental as it need a lot of change 2020-06-18 02:35:08 +02:00
Laurent Destailleur
c0b269b9ee Fix Permissions on MO and API for MO 2020-06-18 01:09:30 +02:00
Laurent Destailleur
2f687a3c40 FIX #14033 2020-06-17 17:57:32 +02:00
Laurent Destailleur
1a7f0741b5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/fourn/class/paiementfourn.class.php
 2020-06-17 14:53:24 +02:00
Laurent Destailleur
6d6abd4320 FIX vulenrability reported by wizlynx WLX-2020-012 2020-06-17 14:45:15 +02:00
Laurent Destailleur
23df5596e8 FIX vulenrability reported by wizlynx WLX-2020-012 2020-06-17 13:42:38 +02:00
Laurent Destailleur
6660923e94 FIX Privilege escalation reported by wizlynx WLX-2020-011 2020-06-17 13:29:43 +02:00
Laurent Destailleur
15dd1bd705 Merge 2020-06-14 21:50:40 +02:00
Laurent Destailleur
9bb5135317 Fix We never add .noexe of files into medias dir 2020-06-12 15:20:28 +02:00
Laurent Destailleur
5d5fb46af6 Fix We never add .noexe of files into medias dir 2020-06-12 14:35:50 +02:00
Laurent Destailleur
e087edf005 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/ticket/class/ticket.class.php
 2020-06-11 23:39:26 +02:00
Laurent Destailleur
78204f92e6 Fix tag 2020-06-11 17:00:22 +02:00
Laurent Destailleur
58fdd8a59a Fix tag at bad place 2020-06-11 16:59:24 +02:00
Laurent Destailleur
503206af88 Fix analytics tag 2020-06-11 16:38:58 +02:00
Florian Mortgat
5bc80f8626 FIX 11.0 - fatal with postgres because empty string literals are assigned to fields typed as integers as per UNION syntax 2020-06-10 16:22:48 +02:00
Laurent Destailleur
5794b1abea Fix for use with text browser 
Conflicts:
	htdocs/main.inc.php
 2020-06-10 12:46:55 +02:00
Laurent Destailleur
9bbdaffe9d FIX Sharing buttons 2020-06-10 12:45:02 +02:00