Commit Graph

76336 Commits

Author SHA1 Message Date
Laurent Destailleur
54596d2286 FIX #13967 2020-06-17 19:26:17 +02:00
Laurent Destailleur
32eaa9137c FIX #14034 2020-06-17 18:29:29 +02:00
Laurent Destailleur
2f687a3c40 FIX #14033 2020-06-17 17:57:32 +02:00
Laurent Destailleur
adb988a18b FIX Add missing label of event for #14094. Still missing link to object 2020-06-17 15:45:26 +02:00
Laurent Destailleur
13cdd5bc45 FIX #14095 2020-06-17 15:42:55 +02:00
Laurent Destailleur
8f4a181380 css 2020-06-17 15:35:52 +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
Florian Mortgat
3d69a1dc70 FIX 11.0 - multicurrency amount not fetched when fetching payments from llx_paiement or llx_paiementfourn 2020-06-17 11:06:31 +02:00
Laurent Destailleur
bbbcd5b6b3 Fix phpcs 2020-06-16 22:48:19 +02:00
Xebax
5d76b4781e FIX Upload of documents for members using the REST API. 2020-06-16 22:48:14 +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
Laurent Destailleur
cbd99ea7a2 FIX #14088 2020-06-16 21:57:49 +02:00
gauthier
e50d239322 FIX : force rounding 2 on export ld compta 2020-06-16 11:40:01 +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
7b64e8643f Trans and css 2020-06-15 16:08:48 +02:00
Laurent Destailleur
40e16672e3 FIX BlindBoolean SQL injection reported by Christian Weiler
<sak1.s3curity@gmail.com>
2020-06-15 15:08:52 +02:00
Laurent Destailleur
15dd1bd705 Merge 2020-06-14 21:50:40 +02:00
Laurent Destailleur
964f17c507 Fix escape fields 2020-06-14 21:49:25 +02:00
Laurent Destailleur
f9da31e658 Fix rounding 2020-06-14 21:49:19 +02:00
Laurent Destailleur
83263cc174 Fix supplier sepa 2020-06-14 21:49:12 +02:00
Laurent Destailleur
2c327aae66 Prepare v12 2020-06-12 19:30:23 +02:00
Laurent Destailleur
b7e7ccee54 Update demo 2020-06-12 18:55:36 +02:00
Laurent Destailleur
c90ab62989 Fix We must include version into filename 2020-06-12 15:31:12 +02:00
Laurent Destailleur
2a20fc3968 Fix missing author into export_alias 2020-06-12 15:27:28 +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
a0b6d9c4e0 css 2020-06-12 01:19: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
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
0023d14e65
Merge pull request #14037 from OPEN-DSI/v10-fix-takepos-free-text-html
FIX free text on cash desk
2020-06-11 23:33:31 +02:00
Laurent Destailleur
ffb345e724
Merge pull request #14062 from atm-florianm/11.0_FIX_missing_translation
FIX: missing translation value for key "NoMorePredefinedProductToDispatch"
2020-06-11 23:05: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
7d4a7a4be0
Merge pull request #14067 from atm-john/11.0_fix_ticket_file_save
Fix ticket file save
2020-06-11 23:01:33 +02:00
Laurent Destailleur
f1f37c7b29
Merge pull request #14064 from atm-florianm/FIX_11.0_postgresql_fatal_on_contact_agenda
FIX 11.0 - fatal with postgres on contact/agenda.php
2020-06-11 23:01: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
c70cd01971 Fix css 2020-06-11 17:58:00 +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
Regis Houssin
997cb214f1 FIX avoid error "Call to undefined function measuringUnitString()" 2020-06-11 16:52:24 +02:00
Laurent Destailleur
503206af88 Fix analytics tag 2020-06-11 16:38:58 +02:00