Commit Graph

65436 Commits

Author SHA1 Message Date
Laurent Destailleur
f7dd7e89de Add option to create stripe customer if not found (so we can use
function to find without side effect)
2018-03-13 14:44:35 +01:00
Laurent Destailleur
a658f7c455 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-13 14:27:35 +01:00
Laurent Destailleur
b1ac4246a1
Merge pull request #8373 from ptibogxiv/patch-16
ADD trigger when modify, delete thirdparty
2018-03-13 14:20:33 +01:00
Laurent Destailleur
59b7187501
Rename interface_99_modStripe_Stripe.class.php to interface_80_modStripe_Stripe.class.php 2018-03-13 14:20:23 +01:00
Laurent Destailleur
4b7f4d29d1
Update interface_99_modStripe_Stripe.class.php 2018-03-13 14:19:26 +01:00
Laurent Destailleur
d6e8872af4
Update interface_99_modStripe_Stripe.class.php 2018-03-13 14:14:33 +01: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
4bd05f854c
Merge pull request #8371 from frederic34/pdfaddress
add object in pdf_build_address source
2018-03-13 14:04:49 +01:00
Laurent Destailleur
72d4b0dcf9
Merge pull request #8370 from ptibogxiv/patch-15
FIX with new database llx_societe_account
2018-03-13 14:02:24 +01:00
Laurent Destailleur
9f07ff0f9b Fix travis 2018-03-13 14:00:35 +01:00
Laurent Destailleur
e6dd312bd5 Debug ticket module 2018-03-13 13:56:45 +01:00
Laurent Destailleur
e6d8219396 Dolibarrize module ticket 2018-03-13 13:26:03 +01:00
ptibogxiv
3dd90a1f1a
FIX name of file 2018-03-13 13:21:36 +01:00
Laurent Destailleur
4380367923 Error management 2018-03-13 12:54:53 +01:00
ptibogxiv
3aa0bdfe5c
ADD trigger when modify, delete thirdparty
More fix todo with new class of stripe.class.php
2018-03-13 12:17:57 +01:00
Frédéric FRANCE
c76dce64d3
add object in pdf_build_address source 2018-03-13 12:15:03 +01:00
Laurent Destailleur
fd249c60da Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-13 12:14:16 +01:00
Laurent Destailleur
8048259733 Work on ticket module integration 2018-03-13 12:13:47 +01:00
ptibogxiv
7feaeb1b89
more FIX for unified stripe's payment class 2018-03-13 12:07:53 +01:00
ptibogxiv
eabc5c0812
FIX with new database llx_societe_account 2018-03-13 11:37:40 +01:00
Laurent Destailleur
475a96e675
Merge pull request #8369 from ptibogxiv/patch-14
Fix database name
2018-03-13 11:32:40 +01:00
ptibogxiv
0f15f3c129
Fix database name 2018-03-13 11:27:16 +01:00
Laurent Destailleur
cd71e49762 Picto ticket module 2018-03-13 10:42:58 +01:00
Laurent Destailleur
5d512af4b4 Fix migration 2018-03-13 09:53:33 +01:00
Laurent Destailleur
c375fd58be
Merge pull request #8366 from ptibogxiv/patch-12
ADD key_account variable for stripe or other gateway
2018-03-13 09:40:52 +01:00
Laurent Destailleur
c75cb4167e
Merge pull request #8364 from frederic34/patch-2
Update ticketsup.class.php
2018-03-13 09:39:25 +01:00
Laurent Destailleur
b34e176060
Merge pull request #8365 from ptibogxiv/patch-11
Fix SQL and ADD support LIVE/TEST mode
2018-03-13 09:38:22 +01:00
Laurent Destailleur
490acd96dc
It is better to let the caller decide which mode (live or not) to take 2018-03-13 09:37:59 +01:00
ptibogxiv
d6be9651a0
ADD key_account variable for stripe or other gateway 2018-03-13 00:29:28 +01:00
ptibogxiv
9408a98c52
Fix SQL and ADD support LIVE/TEST mode 2018-03-13 00:26:09 +01:00
Laurent Destailleur
01f25b00b0 Test 2018-03-12 23:43:47 +01:00
Laurent Destailleur
16dc00a7fc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-12 21:29:34 +01:00
Laurent Destailleur
7b864aeaec Fix regression with live box 2018-03-12 21:29:03 +01:00
Frédéric FRANCE
08bca60ae2
Update ticketsup.class.php 2018-03-12 20:52:39 +01:00
Frédéric FRANCE
56d023165e
Update ticketsup.class.php 2018-03-12 20:43:38 +01:00
Laurent Destailleur
e6de2ab40e
Merge pull request #8362 from frederic34/patch-9
Update CMailFile.class.php for swiftmailer
2018-03-12 20:32:44 +01:00
Laurent Destailleur
a4fd9e83ba
Merge pull request #8361 from frederic34/patch-2
Update typo actions_ticketsup.class.php
2018-03-12 20:32:08 +01:00
Laurent Destailleur
717a1daf28 Fix sql injection 2018-03-12 20:26:47 +01:00
Laurent Destailleur
3e1cc1f03f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-12 20:16:58 +01:00
Laurent Destailleur
ae5080dab4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-12 20:16:23 +01:00
Laurent Destailleur
f2bba8fb03 Fix translation 2018-03-12 20:11:34 +01:00
Laurent Destailleur
d045dca003 Fix financial commitment 2018-03-12 20:04:25 +01:00
Laurent Destailleur
8f21f0e265 Fix financial commitment 2018-03-12 20:03:32 +01:00
Laurent Destailleur
7a338de15d Fix enable module 2018-03-12 19:33:47 +01:00
Laurent Destailleur
612d36a2f8 Fix phpunit 2018-03-12 19:32:57 +01:00
Laurent Destailleur
bf36d671ba Fix ticket deletion 2018-03-12 19:30:21 +01:00
Laurent Destailleur
78b0585798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/taxes.php
2018-03-12 19:09:57 +01:00
Laurent Destailleur
55d3e72463 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/societe/card.php
2018-03-12 19:02:30 +01:00
Laurent Destailleur
4068bbd0b2 Enable module ticketsup 2018-03-12 18:22:39 +01:00
Laurent Destailleur
cbbaf4763b Start to introduce thirdparty website accounts 2018-03-12 16:04:23 +01:00