Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 17:13:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
70,692 Commits 37 Branches 191 Tags
5daf095fc60f5bbed9fdbb3cdec8db4e109f7869
Commit Graph

1019 Commits

Author SHA1 Message Date
Laurent Destailleur
1d80e16ad1 Merge pull request #9831 from frederic34/payment 
payments
 2018-10-24 03:25:01 +02:00
Frédéric FRANCE
85a94ec577 Update view.php 2018-10-22 22:40:18 +02:00
Frédéric FRANCE
fbc5ce623e payments 2018-10-20 17:17:21 +02:00
Laurent Destailleur
58240c8f1c Merge pull request #9767 from ptibogxiv/patch-74 
NEW Save external payment IDs into table of payment
 2018-10-16 20:32:23 +02:00
Laurent Destailleur
2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/expedition/class/expeditionbatch.class.php
	htdocs/public/payment/newpayment.php
	htdocs/stripe/config.php
 2018-10-16 18:47:11 +02:00
ptibogxiv
00f839e8b4 add external modepayment in payment 2018-10-16 16:57:16 +02:00
Laurent Destailleur
b0569de166 Work on multilang support 2018-10-14 18:44:29 +02:00
Laurent Destailleur
1e635cff1b Fix new stripe API 2018-10-12 21:00:33 +02:00
Laurent Destailleur
d8edb1f6b8 Fix regression in online payment 2018-10-12 20:28:26 +02:00
Laurent Destailleur
6a363fd1ab API Stripe 2018-09-24 2018-10-12 19:26:00 +02:00
Laurent Destailleur
fcf62744d7 Add ref in description 2018-10-10 16:23:00 +02:00
Laurent Destailleur
1204fb1e74 Fix online payments use id instead of ref into TAG 2018-10-10 16:16:17 +02:00
Laurent Destailleur
8f4b74733c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
 2018-10-10 01:51:54 +02:00
Laurent Destailleur
b1289632e0 CSS 2018-10-10 01:27:31 +02:00
Laurent Destailleur
506ba30d5a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-06 20:54:14 +02:00
Laurent Destailleur
a7d26409c7 FIX trackid into email sent from member module. 2018-10-06 20:51:35 +02:00
Laurent Destailleur
3e49935eac Fix online payment 2018-10-06 15:48:47 +02:00
Laurent Destailleur
36b75031f5 Merge pull request #9681 from ptibogxiv/patch-70 
Fix metadata for charge.php
 2018-10-06 12:44:16 +02:00
Laurent Destailleur
5045bbc3bd Update newpayment.php 2018-10-06 12:44:06 +02:00
Laurent Destailleur
835ca4e4a5 Update newpayment.php 2018-10-06 12:42:14 +02:00
Laurent Destailleur
429b078708 Typo 2018-10-05 13:42:30 +02:00
ptibogxiv
0e83863d45 Add save or not source functionnality 2018-10-04 20:32:49 +02:00
ptibogxiv
f5966e6303 Update newpayment.php 2018-10-04 19:29:52 +02:00
Laurent Destailleur
571bc86836 Update newpayment.php 2018-10-04 19:03:18 +02:00
Laurent Destailleur
31916c94f0 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-04 17:57:20 +02:00
Laurent Destailleur
b3b2305651 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/pdf.lib.php
 2018-10-04 17:56:56 +02:00
Laurent Destailleur
7a94f4fc00 Add more logs 2018-10-04 11:34:46 +02:00
ptibogxiv
762abf7060 Update newpayment.php 2018-10-04 10:59:06 +02:00
ptibogxiv
d36dda37e6 Fix metadata for charge.php 
Fix for dol_id, dol_type
 2018-10-04 10:56:29 +02:00
Alexey Pyltsyn
49de7a5881 Replace multiple load calls with loadLangs method 2018-10-01 09:22:23 +03:00
Philippe GRAND
3464afe391 Update comment 2018-09-21 15:12:17 +02:00
Frédéric FRANCE
20e245108f clean html donateur_code.php 2018-09-17 13:12:04 +02:00
Frédéric FRANCE
987fdbe73c Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Laurent Destailleur
b3dec042b5 Fix translation 2018-09-12 21:12:15 +02:00
Laurent Destailleur
056ef802e4 Fix syntax error 2018-09-12 19:49:57 +02:00
Laurent Destailleur
88192d1bae Merge pull request #9456 from frederic34/stripeuser 
add stripe user for actions
 2018-09-12 18:37:31 +02:00
Laurent Destailleur
fb71edd35a Update ipn.php 2018-09-12 18:37:24 +02:00
Frédéric FRANCE
3e71f4e6b0 Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 18:36:49 +02:00
Laurent Destailleur
f5074f4962 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 18:12:17 +02:00
Laurent Destailleur
48ae4de47b FIX Add paypal error message in alert email 2018-09-12 16:11:10 +02:00
Laurent Destailleur
016bc6851b Fix generation of tpl 2018-09-10 23:37:51 +02:00
Frédéric FRANCE
afdf87603b add stripe user for actions 2018-09-10 20:50:10 +02:00
Frédéric FRANCE
5f1b3fbc12 add stripe user for actions 2018-09-10 20:18:16 +02:00
Frédéric FRANCE
f02b2f0239 Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-09 13:35:58 +02:00
Laurent Destailleur
700e3b9748 Standardize code for modulepart=mycompany like others modulepart. 2018-09-09 12:53:30 +02:00
Frédéric FRANCE
a558c3bdac replace select_date 2018-09-09 11:25:59 +02:00
Frédéric FRANCE
4a7ea33008 replace select_date 2018-09-09 08:02:26 +02:00
Laurent Destailleur
ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2018-09-04 21:35:43 +02:00
Laurent Destailleur
392f31abbd FIX invert mime type and name 2018-09-04 00:21:48 +02:00
Laurent Destailleur
540999faa5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/lib/company.lib.php
 2018-09-03 14:06:51 +02:00