lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
65,520 Commits 43 Branches 150 Tags 886 MiB
852bf8dab7
Commit Graph

2486 Commits

Author SHA1 Message Date
Laurent Destailleur
852bf8dab7 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/societe/class/societe.class.php
 2018-03-15 01:57:35 +01:00
Laurent Destailleur
f0f6f71161 Fix Sqli 2018-03-15 01:55:47 +01:00
Laurent Destailleur
4957ea9178 Fix SQLi reported by op7ica 2018-03-15 01:55:16 +01:00
Laurent Destailleur
c3b9c91200 Fix SQLi reported by op7ica 2018-03-15 01:33:46 +01:00
Laurent Destailleur
6a70d268e0 Fix SQLi reported by op7ica 2018-03-15 01:22:32 +01:00
Laurent Destailleur
c62d68f4be Fix SQLi reported by op7ica 2018-03-15 01:21:44 +01:00
Laurent Destailleur
821a75cef0 Fix payment modes 2018-03-15 00:53:24 +01:00
Laurent Destailleur
f75334f131
Merge pull request #8386 from ptibogxiv/patch-21 
FIX support for stripeconnect mode
 2018-03-15 00:40:52 +01:00
Laurent Destailleur
87bbb4ef87 Can create card from dolibarr 2018-03-15 00:40:29 +01:00
Laurent Destailleur
c69f5843da
Update card.php 2018-03-15 00:36:56 +01:00
Laurent Destailleur
bf4a0e46aa Add a credit card on stripe 2018-03-14 21:07:45 +01:00
Laurent Destailleur
302fed8646 More fa image to replace png picto 2018-03-14 20:08:44 +01:00
Laurent Destailleur
8c535db04c Use .... before end of card number 2018-03-14 17:15:31 +01:00
Laurent Destailleur
9994b1f133 Work on stripe interface 2018-03-14 17:12:32 +01:00
Laurent Destailleur
b232681318 NEW Add a button to create Stripe customer from the Payment mode tab 2018-03-14 16:53:16 +01:00
Laurent Destailleur
3f7cd8b1bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-14 13:56:41 +01:00
Laurent Destailleur
5c2a005e75 Work on generic customer payment modes 2018-03-14 13:56:21 +01:00
fmarcet
5140c1c5d2 Fix: Merge categories when merging thirds 2018-03-14 13:25:05 +01:00
ptibogxiv
e179161bfa
FIX support for stripeconnect mode 2018-03-14 12:01:15 +01:00
Laurent Destailleur
268b07bcf0 Can add/delete credit card localy 2018-03-14 11:51:13 +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
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
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
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
a955e74329 Better MVC 2018-03-13 15:19:31 +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
cbbaf4763b Start to introduce thirdparty website accounts 2018-03-12 16:04:23 +01:00
Laurent Destailleur
7362b3f3d7 Add table to store thirparty account in external web sites 2018-03-12 15:59:03 +01:00
Laurent Destailleur
03f7df88c6
Update card.php 2018-03-11 00:05:32 +01:00
Inovea Conseil
c2397fad60
Fix #8092 2018-03-10 23:49:43 +01:00
Inovea Conseil
5e46813323
Add phone research 2018-03-09 23:45:28 +01:00
Laurent Destailleur
9f42e1b172 Prepare code to introduce different payment modes than BAN 2018-03-08 22:33:40 +01:00
Laurent Destailleur
489dde4db4 Prepare database to store payment modes of customers 2018-03-08 22:26:42 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm 
NEW: supplier credit notes & discounts (absolute and relative)
 2018-03-08 20:06:37 +01:00
Laurent Destailleur
5b8006a6bb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/payment/paymentok.php
	htdocs/public/paypal/paymentok.php
 2018-03-08 16:37:17 +01:00
ptibogxiv
7774b49beb
Fix paymentmodes.php 2018-03-08 10:03:36 +01:00
ptibogxiv
5c04c2886c
Delete because replace by paymentmodes.php 2018-03-08 02:09:27 +01:00
ptibogxiv
c3e211f3f7
Delete gateway.php 2018-03-08 02:08:43 +01:00
ptibogxiv
197ce2fc3d
Fix set default 2018-03-08 02:08:14 +01:00
ptibogxiv
d791b014a5
update comment and class 2018-03-07 16:17:25 +01:00
Laurent Destailleur
b2f6105ae2 FIX #8277 2018-03-07 15:52:58 +01:00
Laurent Destailleur
d060cf840d
Merge branch 'develop' into develop 2018-03-07 13:19:25 +01:00
ptibogxiv
5e0327329c
NEW convert rib.php to gateways.php 
do stripe integration 
be conform to PSD2 rules
less tab fo company
 2018-03-06 13:23:35 +01:00