Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
129,424 Commits 35 Branches 179 Tags 1.7 GiB
02dea8d103
Commit Graph

129 Commits

Author SHA1 Message Date
Laurent Destailleur
9b0e884ee0 FIX Support of lot serial not working on TakePOS 2024-04-30 12:54:51 +02:00
Laurent Destailleur
404ba88107 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-04-04 11:19:45 +02:00
Laurent Destailleur
cdf46276ac Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-04-04 11:06:46 +02:00
Regis Houssin
cbf1014ab9 FIX multiple problems with multicompany 2024-03-31 13:56:44 +02:00
Laurent Destailleur
1e00cf34d4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-03 19:50:22 +01:00
Laurent Destailleur
717297ef29 FIX Wrong currency shown in TakePOS payment page 2024-03-02 14:49:27 +01:00
Laurent Destailleur
619155f65e Fix with php-cs-fixer 2023-12-04 13:53:48 +01:00
Laurent Destailleur
e27478230f
Update pay.php 2023-12-01 19:53:25 +01:00
Gaspard d'Hautefeuille
32e1991c04
Add multicurrency support 2023-12-01 06:25:58 +01:00
Gaspard d'Hautefeuille
90fca395ba
Amount was set to 0 instead of the real amount 2023-12-01 05:05:11 +01:00
Gaspard d'Hautefeuille
dc25f652d0
Add SumUp connector compatibility with SumUp app on iOS 
https://github.com/sumup/sumup-android-api
VS https://github.com/sumup/sumup-ios-url-scheme

The amount field is deprecated on the Android API but not on the iOS API. The iOS API does not support the total field, only the Android API does support the total field. Hopefully, the Android API only supports the amount field that is only partially deprecated on the Android API. For maximum compatibility with both Android/iOS SumUp app, best to keep this field as "amount" rather than "total".
 2023-12-01 04:36:50 +01:00
Laurent Destailleur
075ee02901 Fix php8.2 warnings 2023-11-27 12:08:48 +01:00
Laurent Destailleur
9d25ea418f Clean code to use getDolGlobalInt 2023-10-26 17:45:03 +02:00
Laurent Destailleur
c2bdb3be90 Fix php8.2 warnings 2023-10-15 18:41:39 +02:00
Laurent Destailleur
946239dbf3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-10 23:04:47 +02:00
Laurent Destailleur
25d3ead0a0 FIX Error not returned on sales with takepos and batch module enabled 2023-10-10 11:51:52 +02:00
Laurent Destailleur
cd3147381a Fix javascript error 2023-10-10 11:16:28 +02:00
Laurent Destailleur
df454003da FIX php8.2 2023-10-09 15:44:57 +02:00
Dev2a
fcd4c4e429 Fix: Change access to $conf->global to function getDolGlobal (automatique) 2023-10-08 23:19:49 +02:00
Laurent Destailleur
cfaa9b7971 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-07-30 18:38:37 +02:00
Laurent Destailleur
db15f04ab0 FIX fatal error on Stripe setup page and security when terminal not used 2023-07-30 14:13:27 +02:00
Laurent Destailleur
e2ec34e1e5 Clean code 2023-05-01 14:33:08 +02:00
Laurent Destailleur
d40fe56cb4 Fix warning 2023-04-30 04:50:10 +02:00
Laurent Destailleur
395312737b
Merge pull request #22406 from aspangaro/17p6 
Use isModEnabled
 2022-10-04 18:01:59 +02:00
ptibogxiv
9727fac3d9
Fix token error 2022-10-01 14:23:48 +02:00
Alexandre SPANGARO
abcd68071e Use isModEnabled 2022-09-25 22:00:20 +02:00
Laurent Destailleur
45c9e6064e FIX #yogosha12439 Remove define('NOCSRFCHECK', '1') 2022-09-12 12:47:00 +02:00
Laurent Destailleur
4566342d59 FIX #yogosha12439 Remove define('NOCSRFCHECK', '1') 2022-09-12 11:47:06 +02:00
Laurent Destailleur
7a277d9560
Merge branch 'develop' into loaddolibarrenv 2022-09-09 17:02:05 +02:00
UT from dolibit
376825b3dd
Update pay.php 2022-09-08 20:12:52 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Laurent Destailleur
a5c18ea776 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-08-31 17:57:14 +02:00
Laurent Destailleur
1b1ebdd636
Merge branch '16.0' into 16p1 2022-08-29 01:05:47 +02:00
Alexandre SPANGARO
4543aeeff0 PHP8 Warnings 2022-08-27 08:19:49 +02:00
Alexandre SPANGARO
c2d87ad75c TakePos - Use isModEnabled 2022-08-26 17:03:20 +02:00
Laurent Destailleur
301d14d58e
Merge pull request #21824 from ptibogxiv/patch-40 
Fix hook in takepos/pay.php
 2022-08-22 10:42:26 +02:00
Laurent Destailleur
0258da808c FIX MVC and missing http header in TakePOS 2022-08-22 01:56:19 +02:00
ptibogxiv
c582f060ec
Fix hook in takepos.pay.php 2022-08-21 12:28:00 +02:00
Christophe Battarel
1faa9d8231 add hook to complete payment 2022-08-11 16:29:55 +02:00
ptibogxiv
852dc909aa
NEW add hook un takepos/pay.php 
add hook for new payment method
 2022-08-04 14:46:20 +02:00
ptibogxiv
87f98b5bcb Update pay.php 2022-06-12 21:44:17 +02:00
ptibogxiv
627f346933 Update pay.php 2022-06-12 21:40:21 +02:00
ptibogxiv
348fb8e9f2 Stripe Terminal 2022-06-12 21:34:35 +02:00
andreubisquerra
1f09151a25
TakePOS without bank account pay.php 2022-06-06 06:44:15 +02:00
Scrutinizer Auto-Fixer
f7a41f1848 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-23 20:22:10 +00:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
 2021-10-16 13:01:03 +02:00
lvessiller
ab4da186c5 FIX 2 columns for total labels 2021-10-12 15:52:59 +02:00
Laurent Destailleur
605aea62ca FIX TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT #18957 2021-10-12 15:25:44 +02:00
lvessiller
1788508963 FIX payment style and html5 tags 2021-10-12 14:11:19 +02:00
Alexandre SPANGARO
7f47df6ea4 HTML5 - <font> tag is deprecated, replace by <span> 2021-10-05 11:44:48 +02:00