Commit Graph

1419 Commits

Author SHA1 Message Date
Laurent Destailleur
9d25ea418f Clean code to use getDolGlobalInt 2023-10-26 17:45:03 +02:00
Laurent Destailleur
e1bf377f20 QUAL: Removed deprecated field remise, remise_percent, remise_absolute 2023-10-20 10:47:08 +02:00
Christophe Battarel
20f1a0f3a6 NEW : TakePOS - amount label with or without tax in free product (#24829)
* NEW : TakePOS - amount label with or without tax in free product

* fix php8

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-10-16 01:43:49 +02:00
Laurent Destailleur
7a3e6606b7 Fix php8.2 warnings 2023-10-15 18:46:18 +02:00
Laurent Destailleur
c2bdb3be90 Fix php8.2 warnings 2023-10-15 18:41:39 +02:00
Christophe Battarel
3a9db24c2c NEW : TakePOS - add constant to choose contact instead of customer (#24807)
* add constant to choose contact instead of customer in TakePOS

* fix conflict

* fix

* check perm

* fix phpcs

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-10-13 16:19:10 +02:00
sonikf
7077cb31b4 fix travis ci error in #25941 (#26207) 2023-10-13 15:43:42 +02:00
Christophe Battarel
09541d5dad NEW : TakePOS - add constant to check qty asked is available (#24820)
* credentials

* NEW : TakePOS - add constant to check qty asked is available

* fix php8

* fix

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2023-10-12 20:24:55 +02:00
Laurent Destailleur
caf00b2456 Merge branch 'reduction' of https://github.com/altairisfr/dolibarr into
altairisfr-reduction
2023-10-12 20:09:00 +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
46bd07c8b0 Fix show warning to avoid bad setup 2023-10-10 12:55:36 +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
Laurent Destailleur
0ecf2b3327 Fix warnings 2023-10-09 14:14:37 +02:00
Dev2a
fcd4c4e429 Fix: Change access to $conf->global to function getDolGlobal (automatique) 2023-10-08 23:19:49 +02:00
Alexandre SPANGARO
0fd8123606 NEW FontAwesome - Add possibility to select another version 2023-09-26 21:49:15 +02:00
Laurent Destailleur
a98b9a86b7 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-11 15:34:13 +02:00
Laurent Destailleur
9356bfac48 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-11 11:41:57 +02:00
Laurent Destailleur
6b0152841f Fix warning 2023-09-09 15:40:31 +02:00
Laurent Destailleur
1acbbda254 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-09 15:33:09 +02:00
Laurent Destailleur
9c903ecf56 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-09 14:33:13 +02:00
Laurent Destailleur
9bd406ca1e FIX Prices visible on TakePOS KO with multiprices support 2023-09-09 14:29:16 +02:00
Laurent Destailleur
84d12cf591 NEW Add option TAKEPOS_HIDE_PRODUCT_PRICES to hide prices in TakePOS 2023-09-06 02:38:57 +02:00
Laurent Destailleur
c3e5529d87 Trans 2023-08-29 11:46:35 +02:00
Laurent Destailleur
dbd65ca242 NEW Option to show label, ref+label or only ref of product in TakePOS 2023-08-28 17:34:05 +02:00
Laurent Destailleur
bf1549e6e0 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-24 00:14:55 +02:00
Laurent Destailleur
076c811690 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-08-24 00:12:52 +02:00
Laurent Destailleur
5047fc20ea Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-08-23 23:59:55 +02:00
Laurent Destailleur
e52bde9c94 Fix php 5.6 compat broken 2023-08-23 23:50:07 +02:00
Laurent Destailleur
e179660787 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-08-23 23:43:12 +02:00
Laurent Destailleur
c065675f57 FIX Bad calculation of localtax when price_base_type not defined. 2023-08-23 23:41:16 +02:00
Laurent Destailleur
329473c3cb Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-21 14:14:44 +02:00
Adnan RIHAN
30ec5dfd75 FIX TakePOS receipt preview in admin #25648
Receipt preview in admin shows header and footer repeating themselves because in preview, $constFreeText equals TAKEPOS_HEADER (as there is no $_SESSION['takeposterminal'] defined).

Back compatibility for #25648
2023-08-19 17:27:06 +02:00
Adnan RIHAN
e2f587dd80 Fix TakePOS receipt preview in admin
Receipt preview in admin shows header and footer repeating themselves because in preview, `$constFreeText` equals `TAKEPOS_HEADER` (as there is no `$_SESSION['takeposterminal']` defined).
2023-08-19 12:25:40 +02:00
Laurent Destailleur
08e428b46d Fix missing param 2023-08-09 18:00:31 +02:00
Regis Houssin
dd268982b5 FIX missing multicompany filter (#25585) 2023-08-08 21:15:17 +02:00
Laurent Destailleur
b077e10ce6 Clean code 2023-08-05 15:48:31 +02:00
Laurent Destailleur
7ce9bf6b23 Clean code 2023-08-05 15:44:28 +02:00
Laurent Destailleur
332f8ad95c Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-08-01 13:15:48 +02:00
Laurent Destailleur
5ac5dce4cb Look and feel v19 2023-07-31 21:44:03 +02:00
Laurent Destailleur
b45483b631 Code comment 2023-07-31 14:34:56 +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
36e91da160 FIX Try to fix the date of invoice on TakePOS on eastern timezone 2023-07-30 14:30:47 +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
71abe871ef Debug v18 2023-07-30 03:12:16 +02:00
Laurent Destailleur
0cbbadcef3 Tooltip 2023-07-20 01:02:02 +02:00
Laurent Destailleur
42fea0090d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-07-12 16:41:11 +02:00
Laurent Destailleur
5fe1763043 Fix missing mandatory legal date 2023-07-12 02:52:10 +02:00
Laurent Destailleur
e72e472fd3 small perf fix 2023-07-10 19:33:25 +02:00