lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
86,822 Commits 43 Branches 150 Tags 886 MiB
54596d2286
Commit Graph

20416 Commits

Author SHA1 Message Date
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
fdbb6debc9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-06-17 13:30:43 +02:00
Laurent Destailleur
6660923e94 FIX Privilege escalation reported by wizlynx WLX-2020-011 2020-06-17 13:29:43 +02:00
Laurent Destailleur
6ea4928c79
Merge pull request #14090 from ATM-Consulting/FIX_11.0_missing_currency_columns_in_supplier_exports 
11.0 - FIX - missing currency columns in supplier exports
 2020-06-16 22:00:56 +02:00
Florian Mortgat
18d5ec7750 11.0 - FIX - missing currency columns in supplier exports 
(copy-pasted from modFacture.class.php)
 2020-06-16 10:56:10 +02:00
Laurent Destailleur
b7d835eceb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-15 16:10:27 +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
1ba03566dc Fix case of delete contact not correctly implemented. 2020-06-12 02:15:02 +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
e04557948d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-06-11 23:37:04 +02:00
Laurent Destailleur
2109a91992 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/takepos/admin/setup.php
 2020-06-11 23:36:55 +02:00
Laurent Destailleur
9aafb82fd3
Merge pull request #14059 from atm-florianm/FIX_10.0_missing_global_langs_when_activating_modContrat 
FIX 10.0 - undefined $langs if template file copy fails during activation of modContrat
 2020-06-11 23:02:19 +02:00
Laurent Destailleur
3698af39f1
Merge pull request #14060 from indelog/fix_measuringunitstring 
Fix 11.0 -  undef func measuringUnitString() in From::select_produits_fournis…
 2020-06-11 23:02:01 +02:00
Laurent Destailleur
b36e658b20
Update html.formticket.class.php 2020-06-11 22:58:58 +02:00
Laurent Destailleur
ee611fa7a0 Fix bad definition of field for parent 2020-06-11 18:32:05 +02:00
Laurent Destailleur
3831b56423 Missing tags 2020-06-11 17:07:41 +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
Laurent Destailleur
5b882e333d Fix tooltip on localtaxes 2020-06-10 23:00:17 +02:00
gauthier
58ff96af30 FIX : $arraydefaultmessage is an object, as well as in /htdocs/core/class/html.formmail.class.php 2020-06-10 16:48:02 +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
Laurent Destailleur
756ef0b583 Fix disallow < > into meta info 
Fix message page regenerated
 2020-06-09 21:43:42 +02:00
DEMAREST Maxime (Indelog)
1ac341e651 Fix undef func measuringUnitString() in From::select_produits_fournisseurs_list 2020-06-09 15:33:10 +02:00
Florian Mortgat
0a2099e0ac FIX 10.0 - undefined $langs if template file copy fails during activation of modContrat 2020-06-09 14:22:32 +02:00
Laurent Destailleur
f4f0da6de2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-08 15:42:27 +02:00
Laurent Destailleur
366f458b39 Show more info to help fix corrupted data 2020-06-08 15:20:01 +02:00
Laurent Destailleur
fd8f8ff4e1 Error message 2020-06-08 15:12:07 +02:00
Laurent Destailleur
7ce7905d31 Fix check for mrp 2020-06-07 23:03:58 +02:00
Laurent Destailleur
09047dc19c Doc 2020-06-07 19:26:37 +02:00
Laurent Destailleur
81c80b254e Fix lang property on database menu entry was not propagated 2020-06-07 19:25:25 +02:00
Laurent Destailleur
2a1d547267 Celan dead code 2020-06-07 18:44:37 +02:00
Laurent Destailleur
19405d5f5b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2020-06-06 23:02:05 +02:00
Laurent Destailleur
cbafbe16a2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/supplier/index.php
	htdocs/admin/mails_templates.php
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formticket.class.php
	htdocs/langs/en_US/admin.lang
 2020-06-06 23:00:24 +02:00
Laurent Destailleur
b221c65165 Merge 2020-06-06 21:56:23 +02:00
Laurent Destailleur
b386400365 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-06-06 21:52:55 +02:00
Laurent Destailleur
261d0772f8
Update commonobject.class.php 2020-06-06 21:47:27 +02:00
Laurent Destailleur
bb192195f1
Update commonobject.class.php 2020-06-06 21:41:33 +02:00
Laurent Destailleur
87806346c7
Update commonobject.class.php 2020-06-06 21:40:20 +02:00
Laurent Destailleur
d9ac7ab9da
Update commonobject.class.php 2020-06-06 21:37:53 +02:00
Laurent Destailleur
a66926cf08
Update commonobject.class.php 2020-06-06 21:30:08 +02:00
Laurent Destailleur
4f2af3bf67
Merge pull request #14021 from atm-gauthier/10.0_fix_modelmail_tickets 
FIX : Tickets mail models doesn't work
 2020-06-06 21:24:04 +02:00
Laurent Destailleur
30c6ae394b
Update html.formticket.class.php 2020-06-06 21:23:35 +02:00