Commit Graph

78415 Commits

Author SHA1 Message Date
Laurent Destailleur
2140f05eb4
Merge pull request #14040 from aspangaro/10.0_p40
FIX: Accountancy - Binding index - Add a filter on sql request for module Subtotal & Jalon
2020-06-06 21:01:40 +02:00
Alexandre SPANGARO
e5f8f38fbf FIX: Accountancy - Binding index - Add a filter on sql request for module Subtotal & Jalon 2020-06-05 17:24:59 +02:00
Laurent Destailleur
bc1724a3aa Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-31 00:23:40 +02:00
Laurent Destailleur
4303d3d3e8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/margin/tabs/productMargins.php
2020-05-31 00:23:33 +02:00
Laurent Destailleur
2696a6a4d0
Merge pull request #14000 from OPEN-DSI/fix_erreur_facture_v10
FIX: Fix link of the button to create a credit note and fix the awareness of a error happen when to create a credit note
2020-05-30 17:24:08 +02:00
kamel
1e208e537f FIX: Fix link of the button to create a credit note and fix the awareness of a error happen when to create a credit note 2020-05-29 16:24:07 +02:00
Laurent Destailleur
c17c2a6c23
Merge pull request #13977 from atm-florianm/FIX_10.0_pagination_bons_prelevement
FIX 10.0 - pagination in prelevement/bons.php
2020-05-28 12:21:04 +02:00
Florian Mortgat
954c29786e FIX 10.0 - pagination in prelevement/bons.php 2020-05-27 12:15:42 +02:00
Laurent Destailleur
2595f571c7 Fix exclude credit note when searching situation invoice to use for next 2020-05-25 00:21:09 +02:00
Laurent Destailleur
e29d2588cf
Merge pull request #13931 from altatof/fixdispatch
FIX missing rollbacks on trigger bad return
2020-05-23 14:24:15 +02:00
Laurent Destailleur
475abbe24b
Merge pull request #13944 from atm-maxime/fix_board_expensereport
Fix board expensereport and holiday
2020-05-23 14:20:28 +02:00
Laurent Destailleur
afacfa702d
Merge pull request #13943 from atm-maxime/fix_pgsql_if
Fix SQL IF for PGSQL
2020-05-23 13:41:18 +02:00
Maxime Kohlhaas
fb0f31c142 Fix board filters for expense report and holiday 2020-05-22 00:33:30 +02:00
Maxime Kohlhaas
6434f255c3 Fix load_state_board doesn't take parameters 2020-05-22 00:32:55 +02:00
Maxime Kohlhaas
f89195e39f Fix SQL IF for PGSQL 2020-05-21 23:23:59 +02:00
Laurent Destailleur
434341316b suggest some fix to debug situation invoices 2020-05-20 19:51:04 +02:00
altairis
55def0248c fix missing rollbacks 2020-05-20 14:37:35 +02:00
Laurent Destailleur
6d62e92e12 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-18 15:50:42 +02:00
Laurent Destailleur
45345440a4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/expedition/class/expedition.class.php
	scripts/cron/cron_run_jobs.php
2020-05-18 15:50:36 +02:00
Laurent Destailleur
40565cdf06
Merge pull request #13907 from ptibogxiv/patch-341
FIX php error if multicompany disabled
2020-05-18 15:07:55 +02:00
Laurent Destailleur
ca14f9a0fa
Merge pull request #13901 from atm-maxime/fix_cron_globals
Fix cron globals reload, missing mysoc and langs
2020-05-18 15:02:00 +02:00
Laurent Destailleur
18a19dafe5
Update cron_run_jobs.php 2020-05-18 15:01:29 +02:00
Laurent Destailleur
3d385dd378
Merge pull request #13903 from atm-maxime/fix_actioncomm_fetch_entity
Fix : entity was missing in actioncomm fetch
2020-05-18 14:59:10 +02:00
Laurent Destailleur
2d1f151fb2
Merge pull request #13905 from atm-maxime/fix_expedition_fetch_entity
Fix : entity was missing in expedition fetch
2020-05-18 14:58:57 +02:00
ptibogxiv
a9d1519f96
FIX php error if multicompany disabled 2020-05-18 14:52:33 +02:00
Maxime Kohlhaas
3d9d5d0ad5 Fix : entity was missing in expedition fetch 2020-05-18 11:03:32 +02:00
Maxime Kohlhaas
cf96383bf9 Fix : entity was missing in actioncomm fetch 2020-05-18 10:44:55 +02:00
Maxime Kohlhaas
54af917afb Fix cron globals reload, missing mysoc and langs 2020-05-16 20:13:47 +02:00
Laurent Destailleur
987d3cf52e Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-15 14:04:58 +02:00
Laurent Destailleur
e327d609d7
Merge pull request #13891 from aspangaro/9.0p1
FIX Site ec.europa.eu has moved to https://
2020-05-15 14:01:28 +02:00
Alexandre SPANGARO
3811586cd0 FIX Site ec.europa.eu has moved to https:// 2020-05-14 20:34:48 +02:00
Laurent Destailleur
2b8da85eea Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-14 16:20:15 +02:00
Laurent Destailleur
49cfc1afd8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/install/upgrade2.php
2020-05-14 16:20:04 +02:00
Laurent Destailleur
b8265d3604
Merge pull request #13878 from atm-gauthier/10.0_fix_wrong_param
FIX : wrong url param
2020-05-14 15:59:37 +02:00
Laurent Destailleur
cf039b26f9
Merge pull request #13887 from atm-florianm/FIX_9.0_fatal_during_migration_from_dolibarr_3.1_if_php7
FIX 9.0 - fatal during migration from 3.1 using PHP 7
2020-05-14 15:49:08 +02:00
Florian Mortgat
bd3504c473 FIX 9.0 - delete unused mandatory argument from migrate_clean_association: argument count mismatch causes a fatal error since php7 2020-05-13 10:26:44 +02:00
gauthier
fc2f2c6da7 FIX : wrong url param 2020-05-12 17:41:21 +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
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
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
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
gauthier
c14b6884e3 FIX : missing hook init + table class + $page not set 2020-05-05 10:03:19 +02:00
Laurent Destailleur
6d894b7abd Fix missing link in message 2020-05-04 19:08:31 +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
b1495e12ce FIX A variable was erased by a temporary variable 2020-04-30 18:45:00 +02:00