Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-14 08:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
65,492 Commits 39 Branches 191 Tags
e179161bfac2c7c19dd7a699bcc1b213e919f40e
Commit Graph

65492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ptibogxiv
e179161bfa FIX support for stripeconnect mode 2018-03-14 12:01:15 +01:00
Laurent Destailleur
cc9a6ee6e0 Merge pull request #7428 from ruistrecht-alt/NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE 
NEW Show region in company info & Global option to show state code MAIN_SHOW_STATE_CODE
 2018-03-14 10:49:54 +01:00
Laurent Destailleur
35fbcb2c84 Update company.lib.php 2018-03-14 10:48:56 +01:00
Laurent Destailleur
8e58ef5ce2 Merge pull request #8380 from ptibogxiv/patch-20 
Fix IPN delete customer stripe with new database
 2018-03-14 10:38:49 +01:00
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
a1b03081f6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-13 18:05:11 +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
6b2490f4e4 Merge pull request #8375 from atm-quentin/6.0 
FIX reverse field to have object loaded in doaction
 2018-03-13 17:56:06 +01:00
Laurent Destailleur
c923231d54 Merge pull request #8374 from ptibogxiv/patch-17 
Fix select by default gateway's icon
 2018-03-13 17:54:09 +01:00
Laurent Destailleur
43c8309fd7 Merge branch 'develop' into patch-17 2018-03-13 17:54:02 +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
ptibogxiv
1ff13cff7a Fix select by default gateway's icon 2018-03-13 15:43:11 +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
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
1c731f1d0c Merge pull request #8368 from ptibogxiv/patch-13 
FIX for nondisplay of  fk_element 's id in  REST API response
 2018-03-13 10:49:37 +01:00
Laurent Destailleur
cd71e49762 Picto ticket module 2018-03-13 10:42:58 +01:00