Commit Graph

57040 Commits

Author SHA1 Message Date
ptibogxiv
e62df03681 Fix delete customer stripe with new database 2018-03-14 08:59:05 +01:00
Laurent Destailleur
fe68e8acdd Trans 2018-03-13 22:54:28 +01:00
Laurent Destailleur
da617f7d32 Can work both with remote and local payment modes 2018-03-13 22:43:50 +01:00
Laurent Destailleur
c78e5d23ea Work on the customer payment mode tab 2018-03-13 20:23:59 +01:00
Laurent Destailleur
a86da671ba Remove verbose log 2018-03-13 18:13:31 +01:00
Laurent Destailleur
60283a8205 Remove file incoterm.lang 2018-03-13 18:07:58 +01:00
Laurent Destailleur
0258d3aeeb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-13 18:04:59 +01:00
Laurent Destailleur
ca809a11af Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/commande/class/commande.class.php
2018-03-13 18:04:18 +01:00
Laurent Destailleur
3f490906f9 Trans 2018-03-13 17:52:15 +01:00
Laurent Destailleur
0a642a2656 Fix regression 2018-03-13 17:49:30 +01:00
Laurent Destailleur
2566170c68 Use code of societeaccount 2018-03-13 17:47:43 +01:00
Laurent Destailleur
944ba69cd8 Add unique key. Dolibarrize view of stripe card. 2018-03-13 17:32:49 +01:00
atm-quentin
af09a3714b FIX reverse field to have object loaded in doaction 2018-03-13 17:12:03 +01:00
Laurent Destailleur
f88536068f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-13 15:30:07 +01:00
Laurent Destailleur
17b7c6268e FIX avoid "Array" on screen 2018-03-13 15:29:52 +01:00
Laurent Destailleur
a955e74329 Better MVC 2018-03-13 15:19:31 +01:00
Laurent Destailleur
9c92e09295 Fix syntax 2018-03-13 14:48:01 +01:00
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
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
ptibogxiv
4f6f0b302e FIX for nondisplay of fk_element 's id in REST API response
the fk_element don't display when the call is made with REST API (reason non found)
2018-03-13 10:28:44 +01:00
Laurent Destailleur
5d512af4b4 Fix migration 2018-03-13 09:53:33 +01:00
Laurent Destailleur
dcd3387a30 Update commande.class.php 2018-03-13 09:53:21 +01:00
Laurent Destailleur
51229a602f Update commande.class.php 2018-03-13 09:51:45 +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
490acd96dc It is better to let the caller decide which mode (live or not) to take 2018-03-13 09:37:59 +01:00
atm-quentin
6c7a5cebdf FIX check verif exped on delete order 2018-03-13 09:34:50 +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
16dc00a7fc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-12 21:29:34 +01:00