Commit Graph

1419 Commits

Author SHA1 Message Date
Laurent Destailleur
7a732318c5 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-07-02 13:43:54 +02:00
Laurent Destailleur
63f2631cab Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-07-02 13:43:18 +02:00
Laurent Destailleur
25971c3e6f Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-07-02 13:41:32 +02:00
Laurent Destailleur
a7dcd9cccb Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-07-02 13:40:57 +02:00
Laurent Destailleur
75f853f2db Fix date of invoice. We want the date of the user. 2024-07-01 02:46:48 +02:00
Alexandre SPANGARO
96afcaa476 Better comments (#30200)
* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* Fix language

* CI Missing language key

* Update eventorganization.lang

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-30 21:02:50 +02:00
Marc de Lima Lucio
6031f8437b FIX: pos: invoice date incorrectly set beacause of timezome mismatches (reverts #36e91da) (#30184) 2024-06-30 12:36:59 +02:00
Laurent Destailleur
c54a97e923 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-06-24 01:47:18 +02:00
Laurent Destailleur
2d87289be7 Debug v20 2024-06-22 01:18:10 +02:00
EUSHOP.NET
325c331cca 19.0 takepos - add the ability to hide the search box if head is hidden (#30066)
* add the ability to hide the search box if head is hidden

* Update index.php

---------

Co-authored-by: root <root@erp.sbg.fleischerverband.at>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-06-18 18:35:50 +02:00
Laurent Destailleur
f413481f7d Clean code 2024-06-17 13:48:15 +02:00
atm-lena
5d5d1ea8c5 llxHeader BodyCss - takepos part (#29952)
Co-authored-by: atm-lena <lena.papazian@atm-consulting.fr>
2024-06-09 11:49:33 +02:00
Laurent Destailleur
60d8513e69 Fix HTML5 2024-06-07 23:06:32 +02:00
altairis-melina
2f00a634e4 ADD: TAKEPOS_NO_SPLIT_SALE const (#29767) 2024-06-04 19:33:54 +02:00
Laurent Destailleur
172f7b910b Debug v20 2024-06-01 10:59:16 +02:00
Laurent Destailleur
5edb71afb8 Debug v20 2024-05-31 23:57:44 +02:00
Philippe Grand
369aafeff2 Fix : Warning: Undefined property: stdClass::$TAKEPOS_TICKET_VAT_GROUPPED in /home/httpd/vhosts/aflac.fr/domains/dol190.aflac.fr/httpdocs/takepos/receipt.php on line 230 (#29687)
* fix : Warning: Undefined variable  in /home/httpd/vhosts/aflac.fr/domains/dol190.aflac.fr/httpdocs/compta/bank/various_payment/list.php on line 370

* backward

* update

* Fix waning during migration

* fix : Warning: Undefined property: stdClass:: in /home/httpd/vhosts/aflac.fr/domains/dol190.aflac.fr/httpdocs/takepos/receipt.php on line 230

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-05-15 15:53:49 +02:00
Frédéric FRANCE
b0695abca9 fix phan (#29591)
* fix phan

* fix typos and translations

* fix phan remove code doing nothing

* fix phan remove code doing nothing

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

* fix phpstan

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-05-03 18:01:17 +02:00
Laurent Destailleur
f416094a17 Fix phan 2024-05-02 20:22:00 +02:00
Laurent Destailleur
1d2371af34 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2024-05-02 13:30:08 +02:00
Jonathan Botquin
ca3f43d4ea remove debug in terminal php (#29550) 2024-05-01 17:14:20 +02:00
Frédéric FRANCE
028554c8fc fix phan (#29560)
* fix phan

* fix excludes

* clean code

* css picto

* clean code
2024-05-01 16:20:29 +02:00
Laurent Destailleur
afc178f246 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-30 13:21:04 +02:00
Laurent Destailleur
d39adede68 Show more info into popup 2024-04-30 13:17:59 +02:00
Laurent Destailleur
3cfdf3f0d0 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-04-30 13:03:17 +02:00
Laurent Destailleur
9b0e884ee0 FIX Support of lot serial not working on TakePOS 2024-04-30 12:54:51 +02:00
Laurent Destailleur
c84a48c00b FIX Support of lot serial not working on TakePOS 2024-04-30 12:42:10 +02:00
Laurent Destailleur
68e6155b03 FIX Support of lot serial not working on TakePOS 2024-04-30 11:01:37 +02:00
Laurent Destailleur
e3daa23949 Look and feel v20 2024-04-30 09:45:28 +02:00
Laurent Destailleur
29155d35cc Doc 2024-04-23 13:07:03 +02:00
Laurent Destailleur
612e41a8ca Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/fourn/commande/card.php
	htdocs/install/mysql/migration/19.0.0-20.0.0.sql
	htdocs/product/stock/replenish.php
	htdocs/takepos/invoice.php
2024-04-18 02:48:52 +02:00
Laurent Destailleur
028a099e13 Fix warnings 2024-04-14 03:07:02 +02:00
Laurent Destailleur
6c26562140 Debug v20 2024-04-10 03:14:59 +02:00
Christophe Battarel
d591289e53 NEW : TakePOS - add buttons to allow keyboard usage for discounts (#24819)
* NEW : TakePOS - add buttons to allow keyboard usage for discounts

* modern html

* remove useless code

---------

Co-authored-by: Christophe Battarel <christophe@altairis.fr>
2024-04-10 02:59:10 +02:00
Laurent Destailleur
0fe0cd7c01 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-04-04 11:39:02 +02:00
Laurent Destailleur
404ba88107 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-04-04 11:19:45 +02:00
Laurent Destailleur
cdf46276ac Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-04-04 11:06:46 +02:00
Regis Houssin
cbf1014ab9 FIX multiple problems with multicompany 2024-03-31 13:56:44 +02:00
Laurent Destailleur
e73f79ca96 Qual: Remove unnecessary use of $_GET 2024-03-28 20:19:28 +01:00
Laurent Destailleur
51a3641105 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/bom/tpl/objectline_create.tpl.php
	htdocs/compta/bank/releve.php
	htdocs/core/class/html.formsetup.class.php
	htdocs/takepos/freezone.php
2024-03-22 02:35:37 +01:00
Laurent Destailleur
b658bde88a Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
Conflicts:
	htdocs/core/class/html.formsetup.class.php
	htdocs/takepos/index.php
2024-03-22 02:11:58 +01:00
Laurent Destailleur
fa45588c49 Merge pull request #29007 from vold-lu/fix_takepos_update_invoice
FIX : TakePOS | Add product / Delete line of existing invoice
2024-03-21 14:46:36 +01:00
Rémi Champlon
d8b87ff6eb fix 2024-03-21 14:22:12 +01:00
Laurent Destailleur
b5804aecfd Fix bad cast for name newtoken 2024-03-21 13:34:16 +01:00
Rémi Champlon
ab10f29db7 add invoice id 2024-03-21 13:06:09 +01:00
Laurent Destailleur
5bae4ffe4d FIX #28978 FIX #28976 2024-03-20 21:29:29 +01:00
Laurent Destailleur
440c7b4493 FIX #28978 FIX #28976 2024-03-20 21:28:35 +01:00
Laurent Destailleur
e16d1d5de9 FIX #28978 FIX #28976 2024-03-20 21:27:28 +01:00
Laurent Destailleur
ef1d1fdcfb Fix warnings 2024-03-20 21:09:32 +01:00
MDW
4407eb4787 Fix arg type to set_cookie() with cast to string 2024-03-19 02:59:36 +01:00