Commit Graph

40 Commits

Author SHA1 Message Date
Frédéric FRANCE
da7dc72ddb Merge branch 'develop' into patch-9 2018-09-22 10:20:02 +02:00
Laurent Destailleur
fab57e163e Fix phpcs 2018-09-21 14:52:06 +02:00
Frédéric FRANCE
b064b580b4 remove superfluous spaces 2018-09-21 12:19:59 +02:00
ptibogxiv
60cb83cf25 Update transaction.php 2018-09-21 09:55:24 +02:00
ptibogxiv
d09b74abe5 Update transaction.php 2018-09-21 09:54:07 +02:00
ptibogxiv
933f253c86 Update transaction.php 2018-09-21 09:52:27 +02:00
ptibogxiv
61d0aa66a5 Update transaction.php 2018-09-21 09:52:08 +02:00
ptibogxiv
d0fafe8f0f fix link with connect transaction.php 2018-09-21 09:49:13 +02:00
ptibogxiv
1a841b48ae Update transaction.php 2018-09-19 20:15:12 +02:00
ptibogxiv
203a2291ba Update transaction.php 2018-09-19 19:05:46 +02:00
ptibogxiv
7e0bad97eb Update transaction.php 2018-09-19 18:59:32 +02:00
ptibogxiv
0770d8e56e Update transaction.php 2018-09-16 23:14:22 +02:00
ptibogxiv
3c5a9326e1 Update transaction.php 2018-09-16 23:13:24 +02:00
ptibogxiv
35f2f5f48c Update transaction.php 2018-09-16 22:41:17 +02:00
ptibogxiv
7f4378870c Fix link display 2018-09-16 22:39:38 +02:00
Laurent Destailleur
2527127859 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 09:50:30 +02:00
Laurent Destailleur
eebd329c7c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modFacture.class.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/en_US/main.lang
	htdocs/stripe/transaction.php
2018-09-16 09:50:13 +02:00
Laurent Destailleur
856b1e7f40 Fix phpcs 2018-09-15 23:58:02 +02:00
Frédéric FRANCE
c86e734299 remove superfluous space 2018-09-15 21:06:33 +02:00
Laurent Destailleur
c587de4a3d Merge branch 'develop' into stripetransac 2018-09-15 17:27:04 +02:00
Laurent Destailleur
69a577f58d Update transaction.php 2018-09-15 17:07:18 +02:00
Frédéric FRANCE
79cb1f5699 clean code 2018-09-13 13:57:01 +02:00
ptibogxiv
c36ee72de0 Update transaction.php 2018-09-13 11:32:52 +02:00
ptibogxiv
fad2502525 Update transaction.php 2018-09-13 11:31:39 +02:00
ptibogxiv
2ed0a72db5 Fix currency display in transaction.php 2018-09-13 11:10:58 +02:00
ptibogxiv
7f3f0f3643 Fix status display in transaction.php 2018-09-11 12:10:48 +02:00
Frédéric FRANCE
6f74ecceaf Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 18:21:59 +02:00
Philippe GRAND
de5281e587 standerdize 2018-08-05 10:56:39 +02:00
Frédéric FRANCE
6cb0fb10d6 trim trailing 2018-07-26 19:05:34 +02:00
Frédéric FRANCE
812b182680 loadlangs 2018-05-26 17:04:23 +02:00
Laurent Destailleur
ccd9aa8059 Fight against dolibarr warnings 2018-04-21 12:16:12 +02:00
Laurent Destailleur
9ba55f0d1f Debug list of transactions 2018-04-06 14:19:11 +02:00
Laurent Destailleur
8e778df0ff Debug stripe module 2018-04-06 14:05:07 +02:00
Laurent Destailleur
b25f3ba322 Fix to avoid stripe live mode beeing disabled when stripeconnect off 2018-03-13 14:13:32 +01:00
Laurent Destailleur
2cd0122d34 Fix phpcs 2018-03-08 20:59:23 +01:00
Laurent Destailleur
235db1f405 Enhance OAuth module to store the stripe account in llx_oauth_token 2018-03-08 19:51:18 +01:00
ptibogxiv
7edec37b28 FIx call stripe.class.php 2018-03-07 17:27:45 +01:00
ptibogxiv
b09e6f3279 Update transaction.php 2018-03-05 21:35:00 +01:00
ptibogxiv
76e81eec90 Update transaction.php 2018-03-05 20:06:14 +01:00
ptibogxiv
877b446373 NEW add stripe transaction 2018-03-05 20:01:55 +01:00