Commit graph

366 commits

Author SHA1 Message Date
MDW
5db08a3151
Qual: Fix 'SqlInjection' notices (#39213)
# Qual: Fix 'SqlInjection' notices

Batch of 25 files with changes to fix 'SqlInjection' Notices
2026-07-19 17:32:14 +02:00
Laurent Destailleur
9b3bebcd5e Automated merge from 23.0 to develop 2026-06-19 03:59:57 +02:00
w3houde
57e3c37162
Fix #38863 enforce takepos editlines permission on delete-line button (#38889)
The trash button in takepos index.php was rendered without server-side check, and
the deleteline action in invoice.php only required 'takepos > run' which every POS
user has. Wrap the button with hasRight('takepos','editlines') and tighten the
action guard, so users without the edit-lines permission can no longer remove
ticket lines from the keypad before validation.

Signed-off-by: Dolicraft <contact@dolicraft.com>
Co-authored-by: Dolicraft <contact@dolicraft.com>
2026-06-19 03:13:04 +02:00
w3houde
28103ac4f8
Fix #38597 stop TakePOS popup from firing again after cash control close (#38752)
The auto-open popup in TakePOS used SELECT ... WHERE date_creation >
first_hour_today AND status = 0. The 'status = 0' filter excluded the
just-closed fence, so a browser refresh on the same calendar day after
closing a cash control sequence found no row and the popup was triggered
again.

Drop the status filter so any fence created today on the terminal
(open or closed) counts as 'already had a cash control today' and
suppresses the popup. The first open of a new calendar day still
triggers it because no row from today exists yet.

Signed-off-by: Dolicraft <contact@dolicraft.com>
Co-authored-by: Dolicraft <contact@dolicraft.com>
2026-06-15 15:05:00 +02:00
Laurent Destailleur
4ed21499e2 Merge branch '23.0' of git@github.com:Dolibarr/dolibarr.git into develop 2026-06-15 01:21:31 +02:00
w3houde
f9712f978d
Fix #37205 pass selectedline to invoice.php addline so supplements attach to parent (#38760)
TakePOS supplement handling needs the rowid of the previously selected
line so the new line can be attached as a child via fk_parent_line.
htdocs/takepos/invoice.php:837 reads $selectedline = GETPOSTINT('selectedline')
and SELECTs FROM facturedet WHERE rowid = $selectedline to find the
parent.

When the JS in htdocs/takepos/index.php:590 dropped the selectedline
query parameter (regression since 19.x), GETPOSTINT returns 0, the
parent lookup matches no row, fk_parent_line stays null and the
supplement is added as a regular standalone line.

Restore the &selectedline= parameter to the AJAX URL.

Signed-off-by: Dolicraft <contact@dolicraft.com>
Co-authored-by: Dolicraft <contact@dolicraft.com>
2026-06-13 01:48:23 +02:00
MDW
fc48006717
# FIX #36258: Do not format qty from barcode (#38624)
# FIX #36258: Do not format qty from barcode

When a barcode contains a quantity (e.g., 0.275 from qu=0 and qd=275),
the quantity is already in international format (using '.' as decimal separator).
However, when this qty is passed to invoice.php, it uses GETPOSTFLOAT('qty')
which defaults to option=2, meaning it treats the value as local user format.

In Spanish/Argentinian locale (thousand separator=., decimal separator=,),
price2num with option=2 incorrectly treats 0.275 as a number with thousand separator
and converts it to 275.

## Solution:

1. Add a 'qty_std' parameter to the URL when calling invoice.php from barcode
2. In invoice.php, use GETPOSTFLOAT('qty', '', 1) when qty_std is set
3. Option=1 tells price2num that the value is NOT in local user format

This way, qty from barcode (already in international format) is not converted,
while qty from user input (in local format) continues to be converted correctly.

Changes:
- htdocs/takepos/index.php: Add qty_std parameter to ClickProduct and pass it through to invoice.php
- htdocs/takepos/invoice.php: Use GETPOSTFLOAT with option=1 when qty_std is set

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-06-08 01:18:21 +02:00
Laurent Destailleur
a23244896f Fix creation of payment on a credit note from TakePOS 2026-06-06 15:09:25 +02:00
Mateo Day
5e1b3c1682
Fix TakePOS New button confirmation after paid sale (#38089)
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2026-05-07 23:34:39 +02:00
Laurent Destailleur
82d3d3ba92 Merge branch '23.0' of git@github.com:Dolibarr/dolibarr.git into develop 2026-03-02 05:54:03 +01:00
Laurent Destailleur
57a1f05d49 FIX #37372 FIX #37374 2026-03-02 05:52:05 +01:00
Laurent Destailleur
c295e97f9c Debug 2025-02-05 14:59:32 +01:00
Laurent Destailleur
4fdbfcf581 Debug v23 2026-02-04 14:24:18 +01:00
Laurent Destailleur
265acd7133 Fix CI 2026-02-01 01:01:49 +01:00
Laurent Destailleur
4224c9fc05 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 23.0 2026-01-26 19:34:10 +01:00
Laurent Destailleur
b623ea1f57 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2026-01-26 19:22:43 +01:00
Laurent Destailleur
360718fa7b Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2026-01-26 19:19:13 +01:00
Laurent Destailleur
c6a398639c Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2026-01-26 19:17:02 +01:00
Laurent Destailleur
449870d347 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2026-01-26 19:05:09 +01:00
Laurent Destailleur
081a1abbe8 Debug v23 2026-01-23 16:49:49 +01:00
Laurent Destailleur
28b2b0c1d6 Debug v23 2026-01-09 13:38:27 +01:00
Laurent Destailleur
e4cecad00d Debug v23 2026-01-04 15:36:32 +01:00
pat
400c31def6 FIX : action button panel display (partial)
- simplify function which simulates navigating to the next/previous panel
- call the hook only after all original buttons have been added
- Remove button hiding at positions %3 == 2 depending on Dolibarr configuration
2025-12-17 23:06:58 +01:00
Noé
2ee07bb049 FIX: Remove <?= 2025-12-04 17:27:57 +01:00
Noé
3416c6ccc0 FIX: getDolGlobalInt 2025-11-27 10:00:43 +01:00
Noé
92197cb100 FIX: php echo instead of <? 2025-11-21 16:06:09 +01:00
Noé
9319059349 FIX: Sometimes socid = undefined 2025-11-20 14:01:29 +01:00
Laurent Destailleur
0bfd72a995 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-11-20 12:00:49 +01:00
Laurent Destailleur
10c0de4467 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-11-20 11:55:18 +01:00
Laurent Destailleur
ae131796d6 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-11-20 11:51:51 +01:00
Laurent Destailleur
ecda16a5f6 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-11-20 11:48:23 +01:00
Laurent Destailleur
515a615915 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-11-20 11:44:40 +01:00
noec764
ac4820b4cb
FIX: TakePOS Missing Thirdparty Id when getting more products (#36341)
Co-authored-by: Noé <noe@scopen.fr>
2025-11-20 11:34:06 +01:00
Laurent Destailleur
34bd3f5755 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-11-12 22:02:50 +01:00
Laurent Destailleur
8c394c70b8 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-11-12 21:56:01 +01:00
Laurent Destailleur
1affd67437 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-11-12 21:54:29 +01:00
Laurent Destailleur
2db335dd0e Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-11-12 21:51:30 +01:00
Laurent Destailleur
dba065c222 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-11-12 21:50:04 +01:00
MDW
7655c259f8
FIX: Define keyCodeForEnter before first use (takepos) (#36060)
# FIX: Define keyCodeForEnter before first use (takepos)

Move the code to get the keyCodeForEnter from the bottom of the file closer to the top.
This ensure that the variable is defined before first use.

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-11-01 22:43:24 +01:00
Laurent Destailleur
b1c7b1154f Debug v23 - Translation not loaded when it should 2025-11-01 19:36:35 +01:00
Laurent Destailleur
ab56e3a2c1 Clean code. Removed not working and duplicate feature of post phone
interface (standard interface works better).
2025-10-28 16:57:49 +01:00
Laurent Destailleur
a1b4d1a06e WIP LNE 2025-10-28 13:07:19 +01:00
Regis Houssin
edd4565921 FIX wrong check of hook return 2025-10-27 12:09:49 +01:00
Laurent Destailleur
33e27947ca WIP LNE 2025-10-22 16:31:47 +02:00
Frédéric FRANCE
cd3b74f092
NEW add api for members statistics (#35851)
* NEW add api for members statistics

* NEW add api for members statistics

* NEW add api for members statistics

* NEW add api for members statistics

* NEW add api for members statistics

* NEW add api for members statistics

* NEW add api for members statistics

* NEW add api for members statistics

* NEW add api for members statistics

* NEW add api for members statistics

* NEW add api for members statistics

* NEW add api for members statistics

* NEW add api for members statistics

* NEW add api for members statistics

* fix

* fix

* fix

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-10-21 02:05:51 +02:00
Laurent Destailleur
655286f3b3 Fix CI 2025-10-20 23:55:59 +02:00
Laurent Destailleur
294309dbd4 Fix CI 2025-10-20 23:48:37 +02:00
Laurent Destailleur
606de1688e Dev Loi Finance 2025-10-20 02:35:55 +02:00
Laurent Destailleur
4fe22fad9e Show terminal on ticket 2025-10-20 01:47:43 +02:00
Laurent Destailleur
0d2b4faee2 Prepare code for LNE 2025-10-20 00:45:59 +02:00