Commit Graph

1489 Commits

Author SHA1 Message Date
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
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
Regis Houssin
edd4565921 FIX wrong check of hook return 2025-10-27 12:09:49 +01:00
Laurent Destailleur
3fca1d8cb1 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-10-21 01:46:46 +02:00
Laurent Destailleur
f82675c729 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-10-21 01:40:55 +02:00
Laurent Destailleur
700b89d578 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-10-21 01:35:08 +02:00
ThomasNgr-OpenDSI
e801a7602c FIX day of ticket on takePOS. Backport 6abdb6e. (#35745) 2025-10-17 02:28:38 +02:00
ldestailleur
6ead2839d0 Fix missing several test on permission on actions 2025-09-23 16:41:53 +02:00
ldestailleur
8089334670 Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into 22.0 2025-09-04 14:01:27 +02:00
ldestailleur
05f3111134 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-09-04 13:51:56 +02:00
ldestailleur
5ae358d5b5 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-09-04 13:49:07 +02:00
ldestailleur
258fe1124b Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2025-09-04 13:38:03 +02:00
kkhelifa-opendsi
247c38923f FIX: Add security test for show terminal selection if no terminal selected when invoice.php is call (#34717)
* FIX: Add security test for show terminal selection if no terminal selected when invoice.php is call

* Modification to take into account the value saved in the cookie

* Update invoice.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-09-03 16:36:18 +02:00
Lucas Marcouiller
659f758d61 Fix table webhook history (#34737)
* Fix name of option for supplier

* Update functions.lib.php (#34718)

Add __MYCOMPANY_URL__ & __MYCOMPANY_PHONEMOBILE__ in getCommonSubstitutionArray

* Fix bad value  fourn paiement process (#34722)

* Fix bad value  fourn paiement process

* best fix

* fix takepos console error (#34709)

* fix console error

* exit early

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>

* Fix CI

* Clean code

* Fix table wenhook history

---------

Co-authored-by: ldestailleur <eldy@destailleur.fr>
Co-authored-by: Deefaze <6393617+Deefaze@users.noreply.github.com>
Co-authored-by: Francis Appels <francis.appels@yahoo.com>
2025-07-15 06:13:10 +02:00
ldestailleur
6bc3036b18 Removed option forcesandbox 2025-07-10 19:47:58 +02:00
Charlène Benke
95027c5dfd php error on takepos admin (#34660) 2025-06-29 12:45:52 +02:00
Laurent Destailleur
221c27c091 Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-06-09 18:15:59 +02:00
Laurent Destailleur
326c75dc51 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-06-09 17:58:54 +02:00
Laurent Destailleur
473ddbc53a Merge remote-tracking branch 'origin/19.0' into 20.0 2025-06-09 17:42:02 +02:00
Sébastien NASSIET
58bd0ed0f6 Use DOL_DATA_ROOT instead of DOL_DOCUMENT_ROOT for upload_dir_tmp in CMailFile (#34367) 2025-06-08 14:29:36 +02:00
Ferran Marcet
d82f9f4927 New: Add function to make substitutions on Takepos receipt (#34369)
* New: Mail template for contacts

* New: Mail template for contacts

* New: Mail template for contacts

* New: Andorra's Accounting Plan

* New: Add function to make substitutions on Takepos receipt

* New: Add function to make substitutions on Takepos receipt

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-06-08 14:28:19 +02:00
ldestailleur
094a05b9a5 Debug v22 2025-05-27 14:48:25 +02:00
ldestailleur
ac357c1059 Debug v22 2025-05-10 14:51:05 +02:00
ldestailleur
82709ea1c4 CSS 2025-05-10 14:26:53 +02:00
ldestailleur
a674676ded Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop 2025-05-10 13:33:53 +02:00
ldestailleur
d76848351c Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into 21.0 2025-05-10 13:30:36 +02:00
ldestailleur
ae94c71a10 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2025-05-10 13:25:31 +02:00
ldestailleur
629533494a Fix error management 2025-05-10 13:08:49 +02:00
ldestailleur
b0501b1c35 Fix renering of status of invoice in takepos. Fix use short label. 2025-05-10 12:42:29 +02:00
ldestailleur
2536f7bd62 Fix Show invoice ref when invoice is closed in takepos 2025-05-10 11:30:55 +02:00
lvessiller-opendsi
c85cc3061b NEW shipment kits with dispatcher v2 (#33750)
* NEW shipment kits with dispatcher v2

* Show stock of virtual product on select warehouse when dispatching a shipment

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2025-04-16 21:11:58 +02:00
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