Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-08 18:48:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
101,561 Commits 36 Branches 190 Tags
b1cba14718f901b459681a56ee7a9f58ffdd18ab
Commit Graph

512 Commits

Author SHA1 Message Date
Laurent Destailleur
756786f717 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/fourn/facture/card.php
	htdocs/holiday/list.php
	htdocs/paybox/admin/paybox.php
	htdocs/paypal/admin/paypal.php
	htdocs/product/price.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/permonth.php
	htdocs/projet/activity/perweek.php
	htdocs/stripe/admin/stripe.php
 2021-06-11 19:05:05 +02:00
Florian HENRY
11bbd2ace3 fix: bad GETPOST test on payment module configuration 2021-05-28 10:31:54 +02:00
Laurent Destailleur
5a5fa1edbb Fix regression amount was always empty. 2021-05-27 11:57:17 +02:00
Laurent Destailleur
de8e291c7e Debug v14 2021-04-29 10:01:10 +02:00
Laurent Destailleur
e71e5d533d Fix HTML5 2021-04-19 21:30:25 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
1ffc598bef Use placeholder 2021-03-23 18:15:12 +01:00
Laurent Destailleur
3a463ac061 FIX #yogosha5723 2021-03-23 17:46:06 +01:00
Laurent Destailleur
ca1715df96 Add some protection for SQL injection 2021-03-22 13:31:06 +01:00
Frédéric FRANCE
0bf0fc3504 fix php8 warning 2021-03-14 23:44:54 +01:00
Frédéric FRANCE
ebfba19778 code syntax s... t.. dir 2021-02-26 21:17:52 +01:00
Laurent Destailleur
153d3855ad Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-03 17:20:26 +01:00
Laurent Destailleur
5a969539d2 Better log 2021-02-03 17:20:05 +01:00
Laurent Destailleur
bf2defbef4 More complete log 2021-02-03 12:04:28 +01:00
Laurent Destailleur
4d029194d3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/ajax.lib.php
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
 2021-02-02 13:22:23 +01:00
Laurent Destailleur
2f6a8c85c2 Doc 2021-02-02 10:25:57 +01:00
Laurent Destailleur
0ead5abaa8 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/stripe/class/stripe.class.php
 2021-01-28 23:22:35 +01:00
Laurent Destailleur
6ed3a1c227 Fix idempotencey make stripe payment fails 2021-01-28 23:18:10 +01:00
Laurent Destailleur
848b4db509 Fix regression: It was not more possible to create payment offline 2021-01-28 23:13:43 +01:00
Laurent Destailleur
616a66702c Try a fix to solve offline payment problems 2021-01-28 22:32:00 +01:00
Laurent Destailleur
f3af16f208 Typo 2021-01-28 22:30:13 +01:00
Laurent Destailleur
3571b868fe Add log 2021-01-28 22:10:38 +01:00
Laurent Destailleur
1ea1dd9c33 Add doc 2021-01-28 22:06:13 +01:00
Laurent Destailleur
1a27480927 Test to fix a regression 2021-01-28 22:01:39 +01:00
Laurent Destailleur
7365974594 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/langs/en_US/banks.lang
	htdocs/stripe/class/stripe.class.php
 2021-01-24 15:24:56 +01:00
stickler-ci
c9dd854c2c Fixing style errors. 2021-01-24 12:40:36 +00:00
ptibogxiv
25de393685 Update stripe.php 2021-01-24 13:38:23 +01:00
ptibogxiv
4765d7fb4f Update stripe.class.php 2021-01-24 13:38:03 +01:00
ptibogxiv
4857a04acd ADD new payment method for stripe 
still in development (work for support more payment modes)
 2021-01-24 13:37:05 +01:00
ptibogxiv
ae2b61d5ef Fix stripe off_session set/unset 2021-01-23 18:49:11 +01:00
Laurent Destailleur
c112c807ac Fix action after payment on member registration 2020-12-18 19:53:33 +01:00
Laurent Destailleur
eed14bd9af Fix warnings 2020-12-17 17:04:42 +01:00
Laurent Destailleur
0361d3afde Debug v13 2020-12-07 11:42:35 +01:00
Laurent Destailleur
030df716a2 Clean dead code: Function showStripePaymentUrl, getStripePaymentUrl, 
showPaypalPaymentUrl and getPaypalPaymentUrl has been removed. The
generic one showOnlinePaymentUrl and getOnlinePaymentUrl are always
used.
 2020-12-07 11:01:08 +01:00
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
Laurent Destailleur
ad04646c05 Fix must use json_encode/decode instead of dol_json_encode/decode 2020-11-11 15:56:19 +01:00
Laurent Destailleur
2668c07e5a Clean code 2020-11-03 01:25:58 +01:00
Laurent Destailleur
f483ba65c3 Use getUserRemoteIP() to record remote ip 2020-11-02 15:11:42 +01:00
Laurent Destailleur
77f2d0a7b9 Fix for compatibility with stripe API 2020-08-07 2020-11-02 15:07:59 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Laurent Destailleur
b3333da5c1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/main.inc.php
 2020-10-30 04:39:41 +01:00
Laurent Destailleur
840ca73464 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/class/hookmanager.class.php
	htdocs/main.inc.php
	htdocs/theme/eldy/info-box.inc.php
	htdocs/theme/eldy/style.css.php
 2020-10-30 04:21:07 +01:00
Laurent Destailleur
1b5bcaccc6 Fix remove warnings 2020-10-30 04:13:31 +01:00
Frédéric FRANCE
5a3780e062 end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
ae3228b9e0 retrieve the spelling 🎉 2020-10-23 20:08:35 +02:00
Frédéric FRANCE
9a470fa42d replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
3d215048d0 Update Stripe API use to 2020-08-27 2020-10-17 11:16:30 +02:00
Laurent Destailleur
7504f92a41 Standardize code and look and feel 2020-10-16 13:30:20 +02:00
Laurent Destailleur
ce1c5c6873 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/stripe/class/stripe.class.php
	htdocs/takepos/invoice.php
 2020-10-01 19:43:23 +02:00
Laurent Destailleur
f5f2ea57e3 Fix compatibility 2020-10-01 16:57:49 +02:00