Commit Graph

138 Commits

Author SHA1 Message Date
Laurent Destailleur
4616d2b9e6 Clean code 2023-03-03 18:02:56 +01:00
Laurent Destailleur
b78eebaae2 Clean code 2023-01-20 12:44:56 +01:00
Laurent Destailleur
4c85236243 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-31 17:30:44 +01:00
Laurent Destailleur
97222603c1 Debug v17 2022-12-31 17:14:58 +01:00
Laurent Destailleur
208306cb71 Clean code 2022-12-28 12:42:44 +01:00
Alexandre SPANGARO
a7a39cba97 Use isModEnabled 2022-09-25 21:59:46 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Laurent Destailleur
533e4f2424 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/fr_FR/accountancy.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/products.lang
2022-08-12 16:03:09 +02:00
Laurent Destailleur
059d0073ff FIX Maxi debug v16 2022-08-12 15:54:50 +02:00
Laurent Destailleur
1a61209c0d Fix fatal error in Stripe setup page
Conflicts:
	htdocs/stripe/admin/stripe.php
2022-07-28 10:55:38 +02:00
Laurent Destailleur
2020a58ebd Fix fatal error in Stripe setup page 2022-07-28 10:47:36 +02:00
Laurent Destailleur
e9b3d436ca css 2022-07-10 19:47:36 +02:00
stickler-ci
445add32e3 Fixing style errors. 2022-07-10 08:16:04 +00:00
ptibogxiv
1c61dda0dd Update stripe.php 2022-07-10 10:11:23 +02:00
ptibogxiv
348fb8e9f2 Stripe Terminal 2022-06-12 21:34:35 +02:00
ptibogxiv
97d2722c4c Update stripe.php 2021-11-12 13:21:40 +01:00
Laurent Destailleur
897b00faf0 Clean code 2021-11-05 14:23:19 +01:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
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
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
1ffc598bef Use placeholder 2021-03-23 18:15:12 +01:00
Laurent Destailleur
3a463ac061 FIX #yogosha5723 2021-03-23 17:46:06 +01:00
Frédéric FRANCE
ebfba19778 code syntax s... t.. dir 2021-02-26 21:17:52 +01:00
Laurent Destailleur
f3af16f208 Typo 2021-01-28 22:30:13 +01:00
ptibogxiv
25de393685 Update stripe.php 2021-01-24 13:38:23 +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
Laurent Destailleur
0361d3afde Debug v13 2020-12-07 11:42:35 +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
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
Frédéric FRANCE
5a3780e062 end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
9a470fa42d replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
6e2a9dc0c9 Fix error management in Stripe 2020-09-24 21:54:21 +02:00
Laurent Destailleur
ad1d60740b Fix string 2020-09-20 18:05:49 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Laurent Destailleur
7cbc621f6b css 2020-09-14 19:00:18 +02:00
Laurent Destailleur
8afd448def Add warning if a hidden option is on to encourage to remove it. 2020-09-14 15:05:35 +02:00
Laurent Destailleur
f6555a9077 Look and feel v12 2020-09-14 14:46:38 +02:00
Laurent Destailleur
550cec06a4 Look and feel v12 2020-09-14 14:41:11 +02:00
Laurent Destailleur
837697b234 Try to merge manually PR #12500 2020-09-05 14:14:56 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ee6fadd0d5 add new rule 2020-05-21 01:41:27 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Laurent Destailleur
1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
2020-02-05 14:53:47 +01:00
Laurent Destailleur
d4ae8b81e4 Card examples 2020-02-03 20:49:21 +01:00
Laurent Destailleur
d49534e646 Merge pull request #12546 from ptibogxiv/patch-285
Upgrade Stripe - minimal stripe update for compatibility
2020-01-29 23:04:25 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
4ed44140e7 Merge branch 'develop' into patch-285 2019-12-01 11:01:40 +01:00
ptibogxiv
753439efee Update stripe.php 2019-11-28 23:23:08 +01:00