Commit Graph

1451 Commits

Author SHA1 Message Date
ldestailleur
f0bd86c8a4 Debug v22 link with dolistore 2025-04-15 16:55:35 +02:00
ldestailleur
b84bc626d9 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-04-10 14:34:59 +02:00
ldestailleur
5e3313bf13 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-04-10 14:24:21 +02:00
David Beniamine
b96c3d0df3 Take into account subcategories shown to get product offset (#33788) 2025-04-09 16:01:48 +02:00
David Beniamine
846dc771ef Takepos check only for openned cash fence (#33789)
* Check only for openned cash fence

* Also show close button
2025-04-09 15:51:31 +02:00
ldestailleur
6c8ae0b2a6 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-03-31 16:28:08 +02:00
ldestailleur
533ca31814 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-03-29 17:32:45 +01:00
ldestailleur
4ba3f0d90e Clean and standardize code for Categories 2025-03-29 15:03:36 +01:00
Frédéric FRANCE
81f232c9cc fix CI (#33631)
* fix CI

* Update invoice.php
2025-03-28 15:00:06 +01:00
ldestailleur
6abdb6e254 Try a fix for #33611 2025-03-28 12:09:05 +01:00
Laurent Destailleur
f7145ea4d3 Fix POS has some product unvisible when using smartphone 2025-03-20 02:52:12 +01:00
Laurent Destailleur
88c41d4970 Remove verbose log 2025-03-20 02:49:35 +01:00
Laurent Destailleur
dad235f6d9 Fix POS has some product unvisible when using smartphone 2025-03-20 02:45:36 +01:00
Laurent Destailleur
996dacbd50 Fix POS has some product unvisible when using smartphone 2025-03-20 02:39:21 +01:00
ldestailleur
b45a1c21ee NEW introduce method dolSetCookie 2025-03-11 10:21:45 +01:00
MDW
c1533bb4aa Fix ci - TYPE_CREDITNOTE -> TYPE_CREDIT_NOTE 2025-03-02 20:54:16 +01:00
ldestailleur
19ff066f99 Close #32233 2025-03-02 20:05:44 +01:00
ldestailleur
abcd0d2cf2 Qual: Clean code related to categories 2025-02-23 19:42:49 +01:00
MDW
81e870f7c1 Qual: Fix phan notices (takepos) 2025-02-18 22:55:56 +01:00
Laurent Destailleur
7bb331f9f8 Merge pull request #32042 from rycks/develop_takepos_search_term_is_not_same_as_term_variable
new variable search_term to be more clear
2025-02-12 04:11:45 +01:00
MDW
288aca6423 Qual: Fix phan (project-2) 2025-02-11 22:08:21 +01:00
MDW
fd7fee2e8f Qual: Fix textwithpicto $type argument (0->info,1->help) 2025-02-08 01:49:54 +01:00
Laurent Destailleur
d0b45c9723 Merge pull request #32691 from Tetras-Libre/takepos-start-new-sale-on-click-product-after-payment
TakePos Once payment is complet, a click on a product should start a new sale
2025-02-05 18:02:07 +01:00
Frédéric France
57b440677a Merge remote-tracking branch 'upstream/develop' into fix_phpstan_2025_01_05_01 2025-01-05 19:02:46 +01:00
Frédéric France
9eb58c9ce9 fix phpstan 2025-01-05 19:02:28 +01:00
Laurent Destailleur (aka Eldy)
8e3948fda7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2025-01-05 18:39:39 +01:00
Laurent Destailleur (aka Eldy)
1cfa3b5803 Fix warning 2025-01-05 18:34:01 +01:00
Bahfirilyes
1751705f1f Merge branch 'develop' into lounes2001-3 2024-12-30 22:08:25 +01:00
ilyes bahfir
77e1dd62ad Fix: hook for adding params for bill closing 2024-12-29 23:28:14 +01:00
Laurent Destailleur (aka Eldy)
5fa3881f64 Debug v21 2024-12-09 14:07:37 +01:00
Laurent Destailleur (aka Eldy)
5c2b0b4321 Debug v21 2024-12-09 11:20:35 +01:00
Laurent Destailleur (aka Eldy)
352d156dd7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-12-08 17:07:14 +01:00
Frédéric FRANCE
aefde2bbd8 Update auto_order.php 2024-12-07 14:37:40 +01:00
Frédéric FRANCE
fde5d6fdea fix include bad path 2024-12-07 14:34:01 +01:00
Laurent Destailleur (aka Eldy)
5c321cc678 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-12-02 01:52:08 +01:00
Laurent Destailleur (aka Eldy)
9227add8f4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-12-02 01:41:40 +01:00
David Beniamine
343873c82f Once payment is complet, a click on a product should start a new sale 2024-11-26 13:13:07 +01:00
Laurent Destailleur
1fc7bc278b Merge branch 'develop' into develop_takepos_search_term_is_not_same_as_term_variable 2024-11-26 03:59:08 +01:00
Frédéric FRANCE
2b264ae5d0 fix phpstan (#32063) 2024-11-22 15:24:11 +01:00
Laurent Destailleur
65aadd446a Debug v21 2024-11-22 12:33:53 +01:00
Laurent Destailleur
ef714b23c0 Debug v21 2024-11-22 12:29:00 +01:00
Laurent Destailleur
999754c184 Debug v21 2024-11-22 12:07:48 +01:00
Eric Seigne
101ee350d3 new variable search_term to be more clear, term is only for terminal number 2024-11-21 19:51:29 +01:00
lvessiller-opendsi
c12a7e144a FIX TakePos barcode rule (#31857)
* FIX TakePos barcode rule

* Keep last test confition on barcode rule
2024-11-21 19:07:58 +01:00
lvessiller-opendsi
d2f5ee65ae FIX Takepos barcode rule with float qty (#31916)
* FIX Takepos barcode rule with float qty

* Replace floatval by cast in float and GETPOSTINT by GETPOSTFLOAT for qty

* Keep last test condition on barcode value
2024-11-19 13:21:31 +01:00
Laurent Destailleur
1386d8c388 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-11-19 04:21:29 +01:00
Delthair
c2a7c4bbc1 FIX #31724 (#31885)
* FIX TakePOS : Undefined variable $servicestatus in pay.php on lines 126, 368 and 392 when stripe is not enabled #31724

TakePOS : Undefined variable $servicestatus in pay.php on lines 126, 368 and 392 when stripe is not enabled #31724

* nettoyage ligne 89 whitespace
2024-11-15 23:59:30 +01:00
HENRY Florian
ba46e7dfd5 fix/feat: ProductLot document folder have to be the rowid (#29859)
* fix/feat: ProductLot docuement folder have to be ID as batch is not unique

* fix/feat: ProductLot docuement folder have to be ID as batch is not unique

* add translation

* fix travis

* fix travis

* fix CI*

* fix CI

* fix: travis CI

* reset from develop

* reset from develop

* reset from develop

* reset from develop

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-11-13 23:58:12 +01:00
Laurent Destailleur
66ee2a2cfe Close #24828 2024-11-12 02:24:25 +01:00
MDW
9ec4618199 Qual: Fix FunctionArray phan notices (#31754)
* Qual: Fix FunctionArray phan notices

* Fix class name in typing of htdocs/modulebuilder/index.php

* Fix customreports phpdoc

* Adjust file type after completeFileArrayWithDatabaseInfo

* Further phpdoc typing improvements

* More phpdoc

* Improve typing with cast on position field

* Force phpstan version

* Add phpstan exception

* Fix array index type + adjust phan config comment
2024-11-11 14:48:18 +01:00