Commit Graph

83428 Commits

Author SHA1 Message Date
Laurent Destailleur
928ed6eecc
Merge pull request #13889 from atm-john/11.0_fix_multicompany_shared_filter
Fix multicompany supplier product price filter
2020-05-14 15:44:45 +02:00
ATM john
9f6a5d4cc9 Fix multicompany supplier product price filter 2020-05-14 10:50:20 +02:00
Laurent Destailleur
0544434482 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-12 15:26:11 +02:00
Laurent Destailleur
b6afd86354 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-12 15:25:59 +02:00
Laurent Destailleur
4cf99585f8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-12 15:24:15 +02:00
Laurent Destailleur
e9b387a4e9
Merge pull request #13868 from ATM-Consulting/Fix_Ticket_public_extrafieldsVisibility_3
fix visibility of extrafields in public interface
2020-05-12 03:01:12 +02:00
Laurent Destailleur
4a9c85ae39
Merge pull request #13869 from frederic34/patch-6
Fix dolistore search with csrf active
2020-05-12 02:59:06 +02:00
Frédéric FRANCE
4d50ba5e37
Fix dolistore search with csrf active 2020-05-11 20:42:47 +02:00
atm-greg
64d2f906bc fix visibility of extrafields in public interface 2020-05-11 16:35:58 +02:00
Laurent Destailleur
a2f311d25a
Merge pull request #13845 from atm-maxime/fix_missing_hook_params
Fix missing hook params for printFieldListValue
2020-05-08 19:48:08 +02:00
Laurent Destailleur
6d1eb9277b
Merge pull request #13844 from hregis/11.0_bug
FIX missing file manifest.json.php
2020-05-08 19:47:33 +02:00
Maxime Kohlhaas
1a9afe6b20 Fix missing hook params for printFieldListValue 2020-05-08 01:40:25 +02:00
Regis Houssin
d9a0edcf2b FIX missing file manifest.json.php 2020-05-08 00:01:56 +02:00
Laurent Destailleur
0cd05887ce FIX count of open day when date and start are not open should be 0 2020-05-07 17:21:27 +02:00
Laurent Destailleur
d6887f3ca4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/list.php
	htdocs/core/class/notify.class.php
2020-05-07 11:59:13 +02:00
Laurent Destailleur
695771726f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-07 11:39:45 +02:00
Laurent Destailleur
d4400cf80f FIX links into emails of notifications 2020-05-07 11:39:32 +02:00
Laurent Destailleur
387c2209d7 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-06 16:17:45 +02:00
Laurent Destailleur
b3a064d309 Fix dup 2020-05-06 16:02:34 +02:00
Laurent Destailleur
860b6e7557
Merge pull request #13812 from mapiolca/patch-45
Fix issue in status name
2020-05-06 02:23:15 +02:00
Laurent Destailleur
d9cef1c8d7 Fix packager to publish on new web site 2020-05-06 01:49:19 +02:00
Laurent Destailleur
fa305fdaca Prepare version 11.0.4 2020-05-05 21:49:46 +02:00
Laurent Destailleur
36a0780f14 More complete fix for #13817 2020-05-05 15:20:40 +02:00
Laurent Destailleur
3f9731a3a0
Merge pull request #13817 from atm-lena/11.0_FIX_UserRights_MenuCommercial
FIX wrong user right's name to top menu "commercial"
2020-05-05 15:16:15 +02:00
Laurent Destailleur
d7d48936d2
Merge pull request #13816 from atm-gauthier/10.0_missinghookinit_and_tablefix
FIX : missing hook init + table class + $page not set
2020-05-05 15:15:42 +02:00
atm-lena
78a427c996 FIX wrong user right's name to top menu "commercial" 2020-05-05 14:35:03 +02:00
gauthier
c14b6884e3 FIX : missing hook init + table class + $page not set 2020-05-05 10:03:19 +02:00
Pierre Ardoin
c0b9fef229
Fix issue in status name
Before : $commandestatic->LibStatut($obj->nb) shows bad value because bad param

Now : $commandestatic->LibStatut($obj->fk_statut) shows good value.
2020-05-05 08:40:30 +02:00
Laurent Destailleur
d2d9ce3576
Merge pull request #13794 from atm-maxime/fix_addline_titles
Fix addline titles
2020-05-04 22:08:34 +02:00
Laurent Destailleur
2afd38e2f6 FIX Combo list of available users to filter on the list of leaves. 2020-05-04 21:59:31 +02:00
Laurent Destailleur
6d894b7abd Fix missing link in message 2020-05-04 19:08:31 +02:00
Maxime Kohlhaas
e0ebe85c13 Fix addline titles 2020-05-03 09:15:12 +02:00
Laurent Destailleur
160009630f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
2020-05-01 21:57:28 +02:00
Laurent Destailleur
aab9a2ff75 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-01 21:03:38 +02:00
Laurent Destailleur
b41b22996f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/class/utils.class.php
	htdocs/core/lib/files.lib.php
2020-05-01 21:03:16 +02:00
Laurent Destailleur
385f998254 Fix restore param --quick 2020-05-01 21:01:40 +02:00
Laurent Destailleur
8ed100ca87
Merge pull request #13776 from ATM-Consulting/9.0_backport_FIX_document_export
FIX Several pb in export of documents
2020-05-01 20:48:15 +02:00
Laurent Destailleur
1c7873b4f4 FIX Sanitizing menu parameter 2020-05-01 15:53:56 +02:00
Laurent Destailleur
4c27ae6530 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/compta/facture/card.php
2020-04-30 18:47:18 +02:00
Laurent Destailleur
b1495e12ce FIX A variable was erased by a temporary variable 2020-04-30 18:45:00 +02:00
Laurent Destailleur
82ace4b4ef FIX Several pb in export of documents
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
2020-04-30 11:52:30 +02:00
Laurent Destailleur
908e5d7f0a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/api/class/api_setup.class.php
2020-04-29 18:05:01 +02:00
Laurent Destailleur
84bca036c9 FIX Link missing into email of some notification 2020-04-29 18:03:28 +02:00
Laurent Destailleur
a0c013d87b Fix missing link
Conflicts:
	htdocs/core/class/notify.class.php
2020-04-28 19:18:31 +02:00
Laurent Destailleur
c22e13b138 FIX Avoid infinite loop when a fetch is inside a compute field. 2020-04-28 14:27:51 +02:00
Laurent Destailleur
a8740352af FIX Extrafields of type price must be '' and not '0' if not defined 2020-04-28 14:27:42 +02:00
Laurent Destailleur
91523b4b64 FIX Can switch from double to price type for extrafields
Conflicts:
	htdocs/core/tpl/admin_extrafields_edit.tpl.php
2020-04-28 14:27:22 +02:00
Laurent Destailleur
fe6fb12d18 Fix missing link 2020-04-27 17:13:23 +02:00
Laurent Destailleur
635b9bb0fe FIX #13641 2020-04-27 15:27:03 +02:00
Laurent Destailleur
ed045b2673 FIX #13749 2020-04-27 15:04:31 +02:00