Commit Graph

75654 Commits

Author SHA1 Message Date
Laurent Destailleur
cf4086f970
Merge pull request #11122 from mrsof/patch-2
FIX : Fatal Errors and Warning
2019-05-04 12:15:49 +02:00
Laurent Destailleur
918e7e09b4
Merge pull request #11114 from ptibogxiv/patch-166
FIX footer on list ticket page
2019-05-04 12:15:24 +02:00
Laurent Destailleur
1ba2de511c
Merge pull request #11118 from openthink-laurent/fix-civility-translation-dutch-dict-language-file
Fix civility translation in dutch dict language file
2019-05-04 12:15:08 +02:00
Laurent Destailleur
5487900072
Merge pull request #11113 from ptibogxiv/patch-165
Fix footer on view ticket page
2019-05-04 12:14:28 +02:00
Laurent Destailleur
8059f7cf83
Merge pull request #11112 from ptibogxiv/patch-164
FIX footer public ticket page
2019-05-04 12:13:13 +02:00
Laurent Destailleur
8bb6bc326c
Merge pull request #11110 from ptibogxiv/patch-163
Fix JS for payment intent
2019-05-04 12:12:59 +02:00
Laurent Destailleur
a76dcbc3ae
Merge pull request #11126 from ptibogxiv/patch-171
Fix variable error php with constant main.inc.php
2019-05-04 12:12:19 +02:00
ptibogxiv
d7504bb3f6
Fix variable error php with constant main.inc.php 2019-05-04 12:00:14 +02:00
Laurent Destailleur
648b2506ab FIX visible ref on contract link for old contract without ref 2019-05-04 11:45:31 +02:00
Sof
8927b37ae2
FIX : Fatal Errors
"Countable array" and Class "Facture" not found
2019-05-04 11:18:14 +02:00
Laurent Léonard
476d15868c Fix civility translation in dutch dict language file 2019-05-04 06:25:53 +02:00
ptibogxiv
a3bb37eb84
FIX footer on list ticket page 2019-05-03 17:13:58 +02:00
ptibogxiv
78c18b1961
Fix footer on view ticket page 2019-05-03 17:11:13 +02:00
ptibogxiv
24775fec1b
FIX footer public ticket page 2019-05-03 17:06:57 +02:00
ptibogxiv
140cc93490
Update newpayment.php 2019-05-03 15:41:15 +02:00
ptibogxiv
65b21f3c37
Fix JS for payment intent 2019-05-03 15:14:20 +02:00
Laurent Destailleur
dd4e70efe7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
	htdocs/accountancy/class/lettering.class.php
2019-05-03 12:14:17 +02:00
Laurent Destailleur
6797c95164 Fix syntax error 2019-05-03 12:10:29 +02:00
Laurent Destailleur
d9a9c1a086 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-03 12:08:52 +02:00
Laurent Destailleur
e694d0b2c2
Merge pull request #11101 from aspangaro/9.0_lettering
FIX Massive debug in lettering function
2019-05-03 11:39:45 +02:00
Laurent Destailleur
4f3a8ad23f
Merge pull request #11106 from ATM-Nicolas/develop
FIX : Sale representative column didn't increase nbfield variable
2019-05-03 11:27:53 +02:00
Laurent Destailleur
9115df7439 Debug v10 2019-05-03 11:25:53 +02:00
ATM-Nicolas
ab3ad77704 FIX : Sale representative column didn't increase nbfield variable on proposal list 2019-05-03 10:55:51 +02:00
Laurent Destailleur
64fb7bd1c2
Merge pull request #11103 from grandoc/new_branch_02_05_2019
inactive a var_dump
2019-05-03 02:29:25 +02:00
Laurent Destailleur
eab49d4300 NEW Update Stripe library to 6.34.3 2019-05-03 02:22:27 +02:00
Laurent Destailleur
10d853cdb3 Work on stripe payment using intent with option
STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION
2019-05-02 21:54:28 +02:00
Laurent Destailleur
8442c86436 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/index.php
2019-05-02 17:40:41 +02:00
Laurent Destailleur
4e94d92b70 Fix link 2019-05-02 17:24:05 +02:00
Laurent Destailleur
9b21c827c3 Fix remove var_dump 2019-05-02 17:17:52 +02:00
Laurent Destailleur
4899d03ff8 FIX Confusion between expired and late 2019-05-02 17:15:24 +02:00
Laurent Destailleur
a764a79c1f Fix scrutinizer error 2019-05-02 16:08:58 +02:00
Laurent Destailleur
2839eedbbf Fix error on emailcollector for tickets 2019-05-02 16:06:14 +02:00
Laurent Destailleur
8d7f24a6d9 FIX Default value on form to send email 2019-05-02 15:34:29 +02:00
Philippe GRAND
bcd96ba8d6 inactive a var_dump 2019-05-02 14:42:02 +02:00
Laurent Destailleur
4f9ea912ab Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/website.inc.php
2019-05-02 14:41:56 +02:00
Laurent Destailleur
79754eb326 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/comm/remx.php
2019-05-02 14:39:30 +02:00
Laurent Destailleur
45d618cd7a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-05-02 14:37:54 +02:00
Laurent Destailleur
ae7ba162f2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-05-02 14:37:46 +02:00
Laurent Destailleur
c222cbfef1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-02 14:37:23 +02:00
Laurent Destailleur
66b7a446a7
Merge pull request #11102 from grandoc/develop
FIX : typo error
2019-05-02 14:24:07 +02:00
Philippe GRAND
8e936fda4f FIX : typo error 2019-05-02 14:19:50 +02:00
Laurent Destailleur
220a81dfc8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-02 14:19:47 +02:00
Alexandre SPANGARO
7bd99c0eee fix 2019-05-02 14:08:28 +02:00
Alexandre SPANGARO
cbe23741eb FIX Massive debug in lettering function 2019-05-02 14:06:55 +02:00
Laurent Destailleur
1a16dc1166
Merge pull request #11089 from frederic34/patch-5
Fix do not delete all discount when splitting (supplier)
2019-05-02 14:05:49 +02:00
Laurent Destailleur
e2c7c0574e
Merge pull request #11086 from andreubisquerra/master
NEW Add history to view and print previous sales on TakePos.
2019-05-02 14:04:57 +02:00
Laurent Destailleur
1378d5e89b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-02 14:03:47 +02:00
Laurent Destailleur
263b6cafbc Fix var 2019-05-02 14:03:35 +02:00
Laurent Destailleur
8c76c404bd
Merge pull request #11088 from defrance/patch-141
planned_timespent not present on task
2019-05-02 14:01:19 +02:00
Laurent Destailleur
a75223c850 Debug ticket module 2019-05-02 13:53:13 +02:00