Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
128,694 Commits 36 Branches 189 Tags
4b2cd22a2e70fe43a0692efcbda07b67390a8a7f
Commit Graph

474 Commits

Author SHA1 Message Date
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
028a099e13 Fix warnings 2024-04-14 03:07: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
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
Ferran Marcet
9430bebbb1 Fix: Correction so that warehouse does not have to be indicated if it is a service 2024-03-14 16:44:07 +01:00
Ferran Marcet
05a9dc5f72 Fix: Correction for batches with letters in Takepos 2024-03-14 16:33:38 +01:00
Laurent Destailleur
c1c7b04cba Debug v19 2024-02-10 12:02:09 +01:00
Laurent Destailleur
097290fc38 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 
Conflicts:
	htdocs/comm/action/peruser.php
	htdocs/core/class/commonobject.class.php
 2024-02-07 18:16:57 +01:00
Laurent Destailleur
e6b165003f Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2024-02-07 18:01:11 +01:00
Laurent Destailleur
792606925f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2024-02-07 17:50:38 +01:00
Laurent Destailleur
5a756ffc4c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/takepos/invoice.php
 2024-02-07 17:44:39 +01:00
Laurent Destailleur
be830d31be Debug v19 selection of ticket printer per terminal 2024-02-06 17:06:47 +01:00
Laurent Destailleur
4cba87129c Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-02-01 12:22:54 +01:00
Laurent Destailleur
9dd1646818 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-02-01 12:20:12 +01:00
Laurent Destailleur
7b178844e8 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-02-01 12:16:50 +01:00
Laurent Destailleur
07d0093fbc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-02-01 12:14:30 +01:00
Laurent Destailleur
ab585b6efc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-01 12:11:25 +01:00
tnegre
9c638968ff Takepos : display errors on payment error 2024-01-26 16:23:24 +01:00
Laurent Destailleur
368efbb77f Debug v19 2024-01-07 20:43:05 +01:00
Laurent Destailleur
7f7f904541 Debug v19 2024-01-07 20:23:52 +01:00
Laurent Destailleur
619aa10797 Debug v19 2024-01-07 19:32:53 +01:00
Laurent Destailleur
02f267c36b Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-07 16:31:44 +01:00
Laurent Destailleur
c5cf8b8805 Debug v19 2024-01-07 15:07:59 +01:00
Laurent Destailleur
8c8075a2c3 Debug v19 2024-01-07 12:49:43 +01:00
Laurent Destailleur
b28ae5d8d3 Clean code 2023-12-27 12:12:20 +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
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
e1bf377f20 QUAL: Removed deprecated field remise, remise_percent, remise_absolute 2023-10-20 10:47:08 +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
946239dbf3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-10 23:04:47 +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
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
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