Commit Graph

68848 Commits

Author SHA1 Message Date
Inovea Conseil
8964ec7ea1
Fix #9572
Fix #9572
2018-12-01 15:58:37 +01:00
Juanjo Menent
7d4553179d Fix #9929 2018-12-01 15:48:46 +01:00
Laurent Destailleur
03a67cee99
Merge pull request #10113 from frederic34/patch-9
llx_paiementfourn.sql #8723
2018-12-01 14:54:57 +01:00
Laurent Destailleur
305ab85f5d
Merge pull request #10114 from frederic34/patch-17
Update 6.0.0-7.0.0.sql #8723
2018-12-01 14:54:31 +01:00
Laurent Destailleur
60610ca49d
Merge pull request #10119 from simnandez/8.0
Fix #10097
2018-12-01 14:48:39 +01:00
Juanjo Menent
6104d16b08
Merge pull request #10117 from atm-maxime/fix_pdf_contract
Fix pdf strato for contract with multipage
2018-12-01 11:14:38 +01:00
Juanjo Menent
1c04c2b5f4 Fix #10097 2018-12-01 10:38:40 +01:00
Juanjo Menent
163f67d600
Merge pull request #10115 from atm-florian/8.0
fix #10006
2018-12-01 08:57:23 +01:00
Maxime Kohlhaas
2b5bf0e2dd Fix pdf strato for contract with multipage 2018-12-01 01:07:15 +01:00
florian HENRY
cddb6e0c47 Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0 2018-12-01 00:40:12 +01:00
florian HENRY
38059ed60d fix #10006 2018-12-01 00:39:37 +01:00
Frédéric FRANCE
335327827d
Update 6.0.0-7.0.0.sql 2018-12-01 00:34:17 +01:00
Frédéric FRANCE
0270da7d8c
Update 5.0.0-6.0.0.sql 2018-12-01 00:28:58 +01:00
Frédéric FRANCE
6ab12b5911
Update llx_paiementfourn.sql 2018-12-01 00:26:51 +01:00
Juanjo Menent
ace14434e9
Merge pull request #10111 from atm-florian/8.0
fix #10069
2018-11-30 23:58:16 +01:00
Juanjo Menent
d1df592c7e
Merge pull request #10110 from atm-maxime/fix_supp_pay_specimen
Fix #9074
2018-11-30 23:57:49 +01:00
Juanjo Menent
859d6c4401
Merge pull request #10109 from atm-maxime/fix_dupl_code
Fix #9070
2018-11-30 23:57:32 +01:00
Juanjo Menent
6d8f3aedc3
Merge pull request #10107 from atm-maxime/fix_import_extrafields
Fix extrafields in import tool
2018-11-30 23:56:57 +01:00
florian HENRY
7a182c7880 fix #10069 2018-11-30 23:25:44 +01:00
Maxime Kohlhaas
e8a02a971d Fix #9074 2018-11-30 23:05:12 +01:00
Maxime Kohlhaas
7585461486 Fix #9070 2018-11-30 22:16:17 +01:00
Maxime Kohlhaas
5dcb3d2a1f Fix extrafields in import tool 2018-11-30 19:23:05 +01:00
Laurent Destailleur
d8ab614efb
Merge pull request #10088 from ATM-Marc/FIX_7.0_select_type_actions
FIX: form actions: select_type_actions could be too small + bad $db init
2018-11-29 11:16:57 +01:00
Laurent Destailleur
28902e18ee Fix for screen with antiblue system 2018-11-28 16:32:53 +01:00
ptibogxiv
21f4d474b4 Fix sql don.class.php 2018-11-28 16:11:10 +01:00
Laurent Destailleur
0373cad2cd FIX Method setValid not found 2018-11-28 16:11:00 +01:00
Marc de Lima Lucio
c13cc5d697 FIX: form actions: select_type_actions could be too small + bad init 2018-11-28 15:46:27 +01:00
Juanjo Menent
2f61d29b06 FIX: #10080 Supplier translations are in english 2018-11-28 10:40:45 +01:00
Ferran Marcet
9d6c95e8a9 Merge remote-tracking branch 'upstream/7.0' into 7.0 2018-11-27 11:39:07 +01:00
Ferran Marcet
d8537a3c76 FIX Lines are not inserted correctly if VAT have code 2018-11-27 11:36:31 +01:00
Laurent Destailleur
b5c136bc32 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-26 23:02:23 +01:00
Laurent Destailleur
653b99cb33 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-26 23:02:07 +01:00
Laurent Destailleur
ecb6ea9151
Merge pull request #10058 from frederic34/patch-2
correct link and avoid warning in resource list
2018-11-24 11:17:56 +01:00
Laurent Destailleur
fe4d8e36be
Merge pull request #10072 from fappels/7.0_fix_expensereport_paid
Fix expensereport class fetch method
2018-11-24 11:06:47 +01:00
fappels
322ce410d7 Add missing paid field in fetch sql 2018-11-23 09:42:43 +01:00
Laurent Destailleur
1d4c756783 FIX Remote ip detection was wrong with proxy (example: cloudflare) 2018-11-22 11:44:37 +01:00
Laurent Destailleur
084516b885 Fix ip detection of geoip 2018-11-21 15:11:57 +01:00
Frédéric FRANCE
e8cac0df35
correct link and avoid warning in resource list 2018-11-21 14:06:06 +01:00
Laurent Destailleur
25ee999d27 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-19 20:05:32 +01:00
Laurent Destailleur
20dbbaf5cc Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-19 20:05:04 +01:00
Laurent Destailleur
fb6aa01207 FIX #10030 better german chart 2018-11-19 20:04:31 +01:00
Laurent Destailleur
8191df4857
Merge pull request #9962 from atm-john/fix_extrafield_view
FIX hidden extrafield
2018-11-19 18:37:18 +01:00
Laurent Destailleur
8535844737 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-19 18:27:00 +01:00
Laurent Destailleur
1931fd33eb
Merge pull request #10041 from atm-ph/fix_8.0_optional_param
Fix new params has been added not optional
2018-11-19 18:26:21 +01:00
Laurent Destailleur
bd8856b988
Merge pull request #10033 from frederic34/patch-9
Update CMailFile.class.php
2018-11-19 18:20:20 +01:00
Laurent Destailleur
7a3f088fcb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-19 18:19:11 +01:00
Laurent Destailleur
77bc1c4313 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
2018-11-19 18:18:43 +01:00
Laurent Destailleur
fcb9b693cf
Merge pull request #10042 from atm-gauthier/6.0_fix_massaction_sendinvoicebymail
FIX : We want to be able to send PDF of paid invoices
2018-11-19 18:14:12 +01:00
Laurent Destailleur
1e50e0576b
Merge pull request #10039 from atm-florian/7.0
fix list agenda extrafield visibility
2018-11-19 18:09:21 +01:00
Laurent Destailleur
4bedeabc5b FIX #10036 2018-11-19 18:02:29 +01:00