Commit Graph

4045 Commits

Author SHA1 Message Date
Laurent Destailleur
83ae27d122 FIX Deletion of files in migration 2018-07-27 12:33:36 +02:00
Laurent Destailleur
20f178fdfe Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/lib/functions.lib.php
2018-07-24 19:22:00 +02:00
Frédéric FRANCE
d582f72bd9
__NEXT_MONTH __PREVIOUS_MONTH give day instead month 2018-07-22 17:27:02 +02:00
Laurent Destailleur
7fcec5f6c3 Fix duplicate tab "contact" on thirdparty 2018-07-17 13:54:13 +02:00
Laurent Destailleur
aeb5f5e4f3 Fix phpcs 2018-07-10 13:56:03 +02:00
Laurent Destailleur
8e0a663b7c Code comment 2018-07-10 10:53:59 +02:00
Laurent Destailleur
e427496ddf FIX Injection 2018-07-09 14:13:01 +02:00
Laurent Destailleur
9f77ea0ece Code comment 2018-06-25 17:05:15 +02:00
Laurent Destailleur
533c19cc2c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/core/lib/functions.lib.php
2018-06-22 15:29:26 +02:00
Regis Houssin
8fc2f7441c Fix: to avoid deleting line breaks 2018-06-20 09:06:16 +02:00
Laurent Destailleur
63fb82931c
Update functions.lib.php 2018-06-18 10:41:11 +02:00
altatof
5d6cd381b9 Fix <br/> detection 2018-06-15 15:59:14 +02:00
Laurent Destailleur
30b04c0d3d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/core/lib/files.lib.php
2018-06-05 18:16:32 +02:00
Laurent Destailleur
4c21ad4e4e FIX: dol_delete_file must work in a context without db handler loaded
Conflicts:
	htdocs/core/lib/files.lib.php
2018-06-05 18:12:14 +02:00
Laurent Destailleur
9c32e49bd3 FIX: dol_delete_file must work in a context without db handler loaded 2018-06-05 18:05:33 +02:00
Laurent Destailleur
02da9b6992 FIX #8893 to get formatted price as substitution vars 2018-05-30 11:04:44 +02:00
Laurent Destailleur
08cf034e2f FIX to allow IRPF not null even if main VAT is null.
From https://www.javierrguez.com/problema-facturas-irpf-sin-iva-dolibarr/
2018-05-03 13:39:44 +02:00
Laurent Destailleur
4eb4cf6506
Merge pull request #8693 from Librethic/fix-api-product-check-perm
FIX : missing english name for object
2018-05-01 10:19:27 +02:00
jfefe
7cedf55c27 FIX : missing english name for object
'product' is used by API to check perms and return a 401 error even if user has correct
permissions
2018-04-27 20:54:48 +02:00
Laurent Destailleur
3faeb08b78
Merge pull request #8672 from ATM-Nicolas/fix_action_contact
FIX : Related contact printed in societe agenda
2018-04-27 10:00:18 +02:00
Laurent Destailleur
83b762b681 FIX CVE-2018-9019 2018-04-25 16:01:06 +02:00
ATM-Nicolas
736c56705b FIX : Related contact printed in societe agenda 2018-04-24 10:02:26 +02:00
Laurent Destailleur
57c03553dd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/core/lib/functions.lib.php
2018-04-15 12:09:07 +02:00
Laurent Destailleur
37e4da30d0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-15 11:33:27 +02:00
Juanjo Menent
bfed1b9db1 FIX: some localtaxes errors 2018-04-14 12:45:40 +02:00
Regis Houssin
556a418132 Fix: best method 2018-04-13 19:30:11 +02:00
Regis Houssin
199bf4c044 Fix: avoid focus problem when select2 is in a modal dialog window 2018-04-13 17:10:07 +02:00
Laurent Destailleur
3df873ee06
Merge pull request #8562 from ATM-Marc/FIX_modulebuilder
FIX: various modulebuilder-related issues
2018-04-11 18:01:04 +02:00
Marc de Lima Lucio
fa8cf98249 FIX: modulebuilder: handle 'price' fieldtype 2018-04-11 12:18:54 +02:00
Marc de Lima Lucio
2f75bfcd83 FIX: modulebuilder: could not create html fields 2018-04-11 11:46:47 +02:00
atm-greg
4f13a4f45b fix #8521 2018-04-10 14:16:01 +02:00
Laurent Destailleur
1a321e19c8 FIX XSS in company setup page 2018-04-06 19:12:13 +02:00
Laurent Destailleur
88b3e08b22 FIX filter/sorting on extrafield on contact list from contact tab 2018-04-05 11:34:26 +02:00
Laurent Destailleur
51cd793d80 Fix log and duplicate vat_by_date function 2018-03-27 14:37:29 +02:00
Laurent Destailleur
d63c8356f4
Merge pull request #8437 from hregis/7.0_bug6
Fix: uniformize getEntity('intervention')
2018-03-24 16:36:27 +01:00
Laurent Destailleur
224fa1c03e Fix external links ko when substitution key are inside domain 2018-03-24 12:48:33 +01:00
Regis Houssin
9cf66e53f6 Fix: wrong module name 2018-03-22 16:39:47 +01:00
Laurent Destailleur
a3a416aa7a Can remove comment added due to lack of test 2018-03-20 16:46:09 +01:00
Laurent Destailleur
46e8692620 Escape db 2018-03-16 12:17:20 +01:00
arnaud
32ce42610a FIX show status on societe banner 2018-03-16 11:18:00 +01:00
Laurent Destailleur
ce7da41bef Fix save setup 2018-03-15 23:47:16 +01:00
Laurent Destailleur
6a70d268e0 Fix SQLi reported by op7ica 2018-03-15 01:22:32 +01:00
Laurent Destailleur
af9fff4f83 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-08 16:35:12 +01:00
Laurent Destailleur
3762ed12c7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/core/class/html.formfile.class.php
2018-03-08 16:33:51 +01:00
Laurent Destailleur
343ca1bc77
Merge pull request #8294 from hregis/7.0_bug5
Fix: avoid conflict between invoice and invoicenumber sharings
2018-03-08 16:24:05 +01:00
Laurent Destailleur
c02e8e9831 Css 2018-03-07 19:13:15 +01:00
Regis Houssin
a0774d523d Fix: avoid conflict between invoice and invoicenumber sharings 2018-03-07 15:24:23 +01:00
Laurent Destailleur
004839b368 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-07 13:03:40 +01:00
alexis Algoud
cb27eb98e1 FIX natural search double quote 2018-03-07 11:42:47 +01:00
Laurent Destailleur
23a4a60970 Fix status of task 2018-03-06 21:51:43 +01:00