Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
127,354 Commits 36 Branches 190 Tags
0d7bbcb996a0f9050b8c80e98497b51f65be5973
Commit Graph

1221 Commits

Author SHA1 Message Date
Laurent Destailleur
b28ae5d8d3 Clean code 2023-12-27 12:12:20 +01:00
Laurent Destailleur
1985d1fd4d Fix warnings 2023-12-23 20:00:57 +01:00
Laurent Destailleur
07f4c9b335 Fix warnings 2023-12-23 19:47:10 +01:00
Laurent Destailleur
fb083a6cfc Fix warning with rector 2023-12-13 16:33:17 +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
andreubisquerra
afbee4111e FIX free product box size (#26874) 
Resize the 'free product' box and hide scroll bar. And use percentage instead of fixed size to improve on mobile.
 2023-11-28 09:17:17 +01:00
Laurent Destailleur
1d589fd74e Fix warnings 2023-11-27 13:26:44 +01:00
Laurent Destailleur
075ee02901 Fix php8.2 warnings 2023-11-27 12:08:48 +01:00
andreubisquerra
3a87df33a8 NEW TakePOS compatibility with lots and serials (#26426) 
* NEW TakePOS compatibility with lots and serials

* Travis FIX

* Remove special_code

* Last improvements

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-11 12:23:12 +01:00
Laurent Destailleur
8a5d57b09a Debug v19 2023-11-09 11:31:16 +01:00
Laurent Destailleur
a4218a142c Look and feel v19 2023-10-26 18:11:34 +02:00
Christophe Battarel
11c1094b76 FIX : TakePOS - fix option TAKEPOS_PRODUCT_IN_STOCK must read on the POS warehouse (#24809) 
* fix stock displayed

* fix php8

* fix php8

* fix

* php8

* fix group by

* fix empty

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
 2023-10-26 17:49:19 +02:00
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