Commit Graph

80525 Commits

Author SHA1 Message Date
Laurent Destailleur
00d5cff00d Fix XSS injection into textarea 2019-09-18 14:44:31 +02:00
Laurent Destailleur
e52788eb75 Fix xss 2019-09-18 14:31:03 +02:00
Laurent Destailleur
771104bc68 Fix XSS 2019-09-18 14:25:53 +02:00
Laurent Destailleur
345ac28c89 Fix js injection
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/user/group/card.php
2019-09-18 14:21:02 +02:00
Laurent Destailleur
7b512587aa FIX XSS 2019-09-18 14:15:20 +02:00
John Botella
d72548bd76 add filters 2019-09-18 13:43:34 +02:00
Laurent Destailleur
ad3d21578c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-18 13:13:02 +02:00
Laurent Destailleur
2da5071642 Fix VAT in New caledonia is now called TGC 2019-09-18 13:12:22 +02:00
VESSILLER
cf7193691f FIX dol_print_date format in buying price tooltip 2019-09-18 11:22:32 +02:00
com4WEB
7455d772a2
Update README.md 2019-09-18 10:50:07 +02:00
VESSILLER
ca18448b48 NEW add units fields in buying price tab of product card 2019-09-18 10:36:13 +02:00
Frédéric FRANCE
c01ab451cc
Update box_fournisseurs.php 2019-09-17 23:04:43 +02:00
Frédéric FRANCE
c38c0bec1c
Update box_fournisseurs.php 2019-09-17 23:03:37 +02:00
Frédéric FRANCE
87d41256d4
Update box_contacts.php 2019-09-17 22:59:23 +02:00
Laurent Destailleur
a43253eab8 Fix for deposit not correctly closed 2019-09-17 18:49:56 +02:00
Laurent Destailleur
3f6afa810c Code comment 2019-09-17 17:55:30 +02:00
Laurent De Coninck
49b75e3f52 support referent in the beluga export.
The beluga export of a project, now supports additional referents, coming from the hooks. When the element is present in the view of all elements of the project, the beluga export will also export this element.

[see: X]
2019-09-17 17:40:42 +02:00
VESSILLER
ea5ff59076 FIX check if a resource is in use after a drag and drop from events 2019-09-17 16:43:36 +02:00
ptibogxiv
b969de46bc
Update 10.0.0-11.0.0.sql 2019-09-17 14:05:39 +02:00
ptibogxiv
4c59f6bffa
Update llx_adherent_type_lang.sql 2019-09-17 14:03:55 +02:00
ptibogxiv
430ffae8ad
Delete llx_adherent_type_lang.php 2019-09-17 14:03:22 +02:00
ptibogxiv
afb055c8a6
Create llx_adherent_type_lang.sql 2019-09-17 14:03:09 +02:00
ptibogxiv
50be1a634c
Create llx_adherent_type_lang.php 2019-09-17 14:02:19 +02:00
stickler-ci
8d8ded324d Fixing style errors. 2019-09-17 11:56:16 +00:00
ptibogxiv
a295d57e0c
Update adherent_type.class.php 2019-09-17 13:54:17 +02:00
ptibogxiv
c01ab4ab53
Update adherent_type.class.php 2019-09-17 13:53:34 +02:00
ptibogxiv
cff6da34df
Create traduction.php 2019-09-17 13:53:06 +02:00
ptibogxiv
c8bfd2c7c2
NEW translation for member type
usefull for sync with API and multilanguage front end or application
2019-09-17 13:37:34 +02:00
Frédéric FRANCE
5e7b7bbc33
Update eldy.lib.php 2019-09-17 13:31:45 +02:00
Laurent Destailleur
214bf4375e Fix missing include 2019-09-17 13:28:36 +02:00
Laurent Destailleur
24cb1390e4 FIX Update of leave request when CSRF with token is on
FIX Export of leave request show the number of open days
2019-09-17 13:17:25 +02:00
Laurent Destailleur
41a2a25729 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/ligne.php
2019-09-17 12:23:58 +02:00
Laurent Destailleur
90850c4d31 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-17 12:20:23 +02:00
Laurent Destailleur
ab9dee631b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-17 12:20:05 +02:00
Laurent Destailleur
64c53e2e85 Fix "project i am contact for" filter 2019-09-17 12:19:33 +02:00
Laurent Destailleur
b53293d84d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-17 12:18:38 +02:00
Laurent Destailleur
a91f39ea3e FIX selection of project i am contact of. 2019-09-17 12:18:29 +02:00
Laurent Destailleur
d3b17f4f2d FIX form not closed. 2019-09-17 12:08:33 +02:00
gauthier
2ac8bd4e16 FIX : If we share invoice, we need to see discount created from a deposit on each entity 2019-09-17 11:59:58 +02:00
Frédéric FRANCE
a44836ae40
Update CMailFile.class.php 2019-09-17 10:15:55 +02:00
VESSILLER
3654a5d01c FIX selectFields for GROUP BY and show only if units defined 2019-09-17 10:05:35 +02:00
Ferran Marcet
81d8055a9c New: Load invoices only if showed 2019-09-17 09:43:15 +02:00
Ferran Marcet
3f25a8d8d5 New: Load invoices only if showed 2019-09-17 09:38:08 +02:00
Ferran Marcet
e4984492b3 Dejarlo igual que develop 2019-09-17 09:32:43 +02:00
Ferran Marcet
c48fc3a2cf Merge branch 'developup' into develop
# Conflicts:
#	htdocs/compta/facture/fiche-rec.php
#	htdocs/install/mysql/migration/9.0.0-10.0.0.sql
2019-09-17 09:27:42 +02:00
Frédéric FRANCE
850b9fd52a
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-17 08:24:31 +02:00
Frédéric FRANCE
155e8fb500
fix syntax 2019-09-17 08:18:01 +02:00
Frédéric FRANCE
0d63c43ccd
add doaction to actioncommcard 2019-09-17 08:15:01 +02:00
Frédéric FRANCE
ecac1f9f40
wip 2019-09-17 08:02:55 +02:00
Frédéric FRANCE
a2d3cde291
some update after night 2019-09-17 07:59:46 +02:00