Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
126,990 Commits 36 Branches 189 Tags
c2c99ab2b86b8ee4ee252a67ecf8a01d0b1cf80d
Commit Graph

169 Commits

Author SHA1 Message Date
Laurent Destailleur
4daacd3371 Fix with php-cs-fixer 2023-12-04 13:49:31 +01:00
Saami PERDRIX
b7b190950f fix warnings on inventory when batch is null (#26901) 2023-11-30 17:43:24 +01:00
Laurent Destailleur
e8dc651877 Fix php8.2 warnings 2023-11-27 11:56:32 +01:00
Laurent Destailleur
a0bba05b02 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/api_orders.class.php
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/class/api_supplier_orders.class.php
	htdocs/fourn/class/fournisseur.facture-rec.class.php
	htdocs/langs/en_US/stocks.lang
 2023-11-17 18:24:53 +01:00
lvessiller-opendsi
8444c1e389 FIX pagination parameters on save and cancel buttons (#26605) 2023-11-16 15:41:34 +01:00
Laurent Destailleur
a48e541093 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/core/class/html.formadmin.class.php
	htdocs/core/lib/functions.lib.php
 2023-11-12 23:18:19 +01:00
Laurent Destailleur
2f340a1a77 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/comm/propal/card.php
 2023-11-12 23:06:31 +01:00
HENRY Florian
caf41ca9ff fix: display stock mvt in inventories done (#26527) 2023-11-10 18:51:22 +01:00
Laurent Destailleur
b8c8e903c2 Fix php8.2 warnings 2023-10-15 18:39:13 +02:00
Rémi Champlon
a0c1553420 Fix order on saving inventory 2023-09-30 13:45:03 +02:00
Rémi Champlon
753a4e810a Fix order on saving inventory 2023-09-29 09:30:08 +02:00
Laurent Destailleur
f4bf4b31d5 Clean code 2023-08-23 19:36:59 +02:00
Adrien Raze
0d759e8090 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_include_sub_warehouse_in_inventory 2023-06-26 10:46:13 +02:00
Frédéric FRANCE
d66ed4adf9 use isModEnabled 2023-06-09 13:47:07 +02:00
bomuux
d21daa267c FIX: Inventory lines values deleted when changing page length 
On page /product/inventory/inventory.php

1. With the default page limit of 20,
2. With an inventory containing more than 20 lines, let's say 30, thus displayed on 2 pages:

-> updating when changing page WITH ARROWS works well.
-> switching page length (limit) from 20 to more (say 30) WILL ERASE VALUES from line 21 to 30.
the reason is that javascript posts the form with a limit value of 30 and values of line fields from 1 to 20 (values for lines 21 to 30 are not posted, they're not on the page!): the code evaluates values for line 21 to 30 to empty and wrongly deletes them.

The correction checks that values are really posted. I guess that updating (deleting) not posted values is not desired here.
 2023-05-08 17:54:42 +02:00
Laurent Destailleur
eccbe94131 Debug v18 2023-05-03 04:54:04 +02:00
Laurent Destailleur
0fb03fdc2d Clean code 2023-04-08 01:43:21 +02:00
Laurent Destailleur
6c589955a6 FIX Autofill / clear qty in inventory page 2023-04-01 15:00:54 +02:00
Laurent Destailleur
36fd6e6870 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-19 13:24:46 +01:00
Laurent Destailleur
6ce20e3bae Merge pull request #23541 from FHenry/16_fix_token 
fix: token for scan inventory
 2023-01-18 23:33:00 +01:00
Laurent Destailleur
50db6de309 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-01-18 00:20:53 +01:00
Laurent Destailleur
af7570a2cd Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-01-18 00:16:03 +01:00
Laurent Destailleur
40e956646d Merge pull request #23523 from altairis-noe/status_for_inventory_update 
FIX: do not let closed inventories reset stock with URL
 2023-01-13 13:22:47 +01:00
Florian HENRY
534cb8f0a0 fix: token for scan inventory 2023-01-13 09:55:57 +01:00
Noé Cendrier
272f131b07 do not let closed inventories reset stock with URL 2023-01-12 10:18:47 +01:00
Laurent Destailleur
50c76110bb Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2022-12-14 11:19:12 +01:00
Laurent Destailleur
62b0447c7b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-12-14 11:02:23 +01:00
Laurent Destailleur
64de591770 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-12-14 10:20:47 +01:00
Aloïs Micard
8a1df1df92 Give order to inventory lines 2022-12-12 17:36:00 +01:00
Laurent Destailleur
99e0b5e945 Merge pull request #20298 from atm-lena/develop_NEW_InventoryProduct_AddPage 
Add paging to inventory card
 2022-09-10 09:49:44 +02:00
Laurent Destailleur
09700a6aa7 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-09 18:35:36 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
stickler-ci
24a61b57db Fixing style errors. 2022-09-07 16:09:08 +00:00
Adrien Raze
acdac6552b FIX : inventory total columns 2022-09-07 17:49:39 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Frédéric France
fc01cc66cd fix php8 warnings 2022-08-31 21:55:55 +02:00
Frédéric France
194c76727e fix php8 warnings 2022-08-31 21:37:10 +02:00
Frédéric FRANCE
7f60a34799 use isModEnabled 2022-08-19 18:07:21 +02:00
Laurent Destailleur
252c581ea6 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-24 11:23:52 +02:00
Laurent Destailleur
58923ec3d7 Merge 2022-07-24 11:21:02 +02:00
lvessiller
b57c40ef78 FIX load product stock in inventory lines 2022-07-12 11:32:12 +02:00
atm-lena
ef4dc58fe7 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_InventoryProduct_AddPage 2022-06-16 15:12:42 +02:00
atm-lena
99efd244d6 FIX Page limit GET / POST 2022-06-16 14:57:32 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Adrien Raze
df9c70d41e Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_include_sub_warehouse_in_inventory 2022-05-09 11:15:46 +02:00
stickler-ci
23ae3af247 Fixing style errors. 2022-05-05 07:38:40 +00:00
Adrien Raze
82ac8b4c0a FIX : move "Real Qty" column 2022-05-02 10:44:31 +02:00
Adrien Raze
2d033ef8a5 Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_move_inventory_column-develop 2022-05-02 10:33:24 +02:00
Adrien Raze
0e75b4e9c7 FIX : GetnomURL sur les numéro de lot/série 2022-05-02 10:14:06 +02:00
Laurent Destailleur
bc03658f18 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-04-29 16:42:43 +02:00