Alexandre SPANGARO
01dfbac1a1
Use isModEnabled
2022-09-25 06:04:56 +02:00
Laurent Destailleur
e2e91c6e67
Update fournisseurs.php
2022-09-24 18:47:35 +02:00
Philippe GRAND
804f13fbe6
update code toward php8 compliance
2022-09-24 14:54:23 +02:00
Philippe GRAND
90c923a94b
update code toward php8 compliance
2022-09-24 14:53:29 +02:00
Philippe GRAND
afe918c76b
update code toward php8 compliance
2022-09-24 14:52:21 +02:00
Philippe GRAND
66360758aa
update code toward php8 compliance
2022-09-24 14:51:39 +02:00
Laurent Destailleur
c52327297a
Merge pull request #22333 from atm-lena/16.0_FIX_TokenError_StockTransferDeleteAction
...
FIX Token Error : delete stock transfer
2022-09-24 12:22:18 +02:00
Laurent Destailleur
7b4d43723f
Update stocktransfer_card.php
2022-09-24 12:22:08 +02:00
Jean
a919618bf4
FIX #22382 Error on length of supplier reference
2022-09-24 09:47:56 +02:00
Laurent Destailleur
8ade44b7ca
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-09-23 18:53:42 +02:00
Laurent Destailleur
a87aa30e75
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-09-23 18:53:18 +02:00
Laurent Destailleur
4b1d333637
Merge pull request #22353 from frederic34/patch-7
...
update doc
2022-09-23 17:41:21 +02:00
Laurent Destailleur
4ef5a3b6b6
css
2022-09-23 13:13:13 +02:00
Regis Houssin
4f6cf3f067
FIX missing check if category module is enabled
2022-09-23 11:46:55 +02:00
Laurent Destailleur
388dd6395b
Clean code
2022-09-22 14:06:50 +02:00
Laurent Destailleur
d314ed380b
NEW Can edit property css, cssview, csslist on extrafields
2022-09-22 13:01:11 +02:00
Frédéric France
2247bc2ae4
clean code
2022-09-21 21:01:18 +02:00
Frédéric FRANCE
caa54f7f11
Update product.class.php
2022-09-21 20:27:54 +02:00
Frédéric FRANCE
e7afc7ac75
Update product.class.php
2022-09-21 20:22:54 +02:00
Frédéric FRANCE
8dfd24b5cb
update doc
2022-09-21 20:19:00 +02:00
Laurent Destailleur
6fb9a4713c
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-09-21 01:30:40 +02:00
Laurent Destailleur
36e1bfb297
NEW Option PRODUCTBATCH_SHOW_WAREHOUSE_ON_SHIPMENT showing wh on PDF
2022-09-21 00:50:04 +02:00
Quentin VIAL-GOUTEYRON
18be0b4f27
FIX missing facture class inclusion
2022-09-20 14:44:43 +02:00
atm-lena
1d9db98a11
FIX Token Error : delete stock transfer
2022-09-20 14:22:37 +02:00
stickler-ci
982a574205
Fixing style errors.
2022-09-15 13:15:44 +00:00
ptibogxiv
1a76b26731
Fix php 8 error
2022-09-15 15:14:36 +02:00
Frédéric FRANCE
9646c9c8a3
add debug to product massaction
2022-09-15 15:11:19 +02:00
Quentin VIAL-GOUTEYRON
27880e73fa
Merge branch 'FIX_invoice_theorical_stock' of github.com:atm-quentin/dolibarr into FIX_invoice_theorical_stock
2022-09-14 09:45:48 +02:00
Quentin VIAL-GOUTEYRON
4fcfe96690
fix two sides
2022-09-14 09:45:18 +02:00
Laurent Destailleur
7dbde6f934
Merge branch 'develop' into develop_NEW_Service_DefaultWorkstation
2022-09-13 01:38:49 +02:00
Laurent Destailleur
f9b5a370ab
Merge pull request #22226 from fboitel/fboitel-dev-scrutinizer-11/09/2022
...
Fix scrutinizer 2
2022-09-13 01:22:33 +02:00
Laurent Destailleur
7485188b49
Update price.php
2022-09-13 01:11:09 +02:00
Thomas Negre
3d88e8cc0e
add tr ids
2022-09-12 15:19:17 +02:00
Thomas Negre
56c2b8b775
Product: display TTC price on price card
2022-09-12 15:19:12 +02:00
atm-lena
7b7e0437a0
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_of_consumption_selectbatch
2022-09-12 13:42:21 +02:00
Laurent Destailleur
4566342d59
FIX #yogosha12439 Remove define('NOCSRFCHECK', '1')
2022-09-12 11:47:06 +02:00
Faustin
9cdcac7c1c
scrutinizer on product/stock/stocktransfer/class/stocktransfer.class.php: var ref_client undefined on object, so added it and added also ref_customer because ref_client is deprecated
2022-09-11 22:38:51 +02:00
Faustin
da10379090
scrutinizer on product/stock/stocktransfer/class/stocktransferline.class.php: unset a non-existent var
2022-09-11 22:26:02 +02:00
Faustin
0ac45a01ff
scrutinizer on product/stock/stocktransfer/class/stocktransferline.class.php: unset a non-existent var
2022-09-11 22:21:52 +02:00
Frédéric France
705b436494
replace other deprecated
2022-09-10 14:03:47 +02:00
Frédéric France
e96eee56b0
sample deprecated function
2022-09-10 13:55:40 +02: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
62f8c533c5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-09-09 18:36:06 +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
Laurent Destailleur
cf887dba16
Merge pull request #22075 from grandoc/new_branch_04_09_2022
...
update code
2022-09-09 18:03:43 +02:00
Laurent Destailleur
81b12c2814
Merge branch 'develop' into Add_notes_to_productlot
2022-09-09 18:02:02 +02:00
Laurent Destailleur
b873034ae1
Merge pull request #22126 from atm-adrien/FIX_inventory_columns
...
FIX : inventory total columns
2022-09-09 18:01:03 +02:00
Laurent Destailleur
7a277d9560
Merge branch 'develop' into loaddolibarrenv
2022-09-09 17:02:05 +02:00
UT from dolibit
34522910e8
Update card.php
2022-09-08 19:37:40 +02:00
Frédéric France
da8617e3ff
Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv
2022-09-08 18:59:23 +02:00
Laurent Destailleur
4c09252650
Clean code
2022-09-08 12:29:46 +02:00
Laurent Destailleur
25fcc201e1
Fix warning
2022-09-08 11:44:09 +02:00
atm-lena
81ed97e9fc
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation
2022-09-08 11:21:05 +02:00
Lefteris Kotsonis
ec30316f49
Removed note_public and note_private variables from productlot.class.php
2022-09-08 10:55:41 +02:00
stickler-ci
c4793fdb06
Fixing style errors.
2022-09-08 08:32:08 +00:00
Quentin VIAL-GOUTEYRON
1833add141
FIX theorical stock when stock calculate on bill
2022-09-08 10:12:40 +02:00
UT from dolibit
2b9350cd09
Update productcustomerprice.class.php
...
fetchAll
2022-09-07 20:51:13 +02:00
Frédéric France
63195e0ca3
fix license
2022-09-07 20:21:01 +02:00
Frédéric France
835441d437
remove blank line
2022-09-07 20:14:49 +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
Laurent Destailleur
0e09dd6669
Merge pull request #22050 from eurya/develop
...
Force date of movement in MouvementStock propagated to subproducts
2022-09-07 14:08:50 +02:00
Frédéric France
fbbdcd1d4c
fix php8 warnings
2022-09-07 10:28:23 +02:00
Laurent Destailleur
d3097b07b6
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-09-06 22:56:57 +02:00
Laurent Destailleur
8666e193a2
Fix td balance
2022-09-06 22:56:09 +02:00
Lefteris Kotsonis
20e9dc3f07
[NEW][ #22048 ][Added notes to productlot module]
2022-09-05 16:49:57 +02:00
Philippe GRAND
94a646103d
update code
2022-09-04 13:32:12 +02:00
Laurent Destailleur
362288fd02
Merge pull request #21992 from thomas-Ngr/develop_product_supplier_price_auto_fill_vat_rate
...
NEW : Product supplier price: autofill default supplier VAT
2022-09-04 12:39:41 +02:00
Laurent Destailleur
cfd3eeb245
NEW All ajax pages have now a top_httphead()
2022-09-03 20:08:13 +02:00
Philippe GRAND
371f5ee581
Update code
2022-09-03 11:30:24 +02:00
Nicolas MANAUD
f52680a7e0
Force date of movement in MouvementStock propagated to subproducts (When using the class MouvementStock, it's possible to force a date of movement
...
by specifying a date (parameter). If this MouvementStock is affected to a product containing sub-product.s, this date of movement forced will
also be applied to the MouvementStock of the related sub-products.)
2022-09-02 16:29:02 +02:00
Laurent Destailleur
027e597776
Merge branch 'develop' into productbatch
2022-09-02 10:11:47 +02:00
Laurent Destailleur
d4c3537188
Merge pull request #22012 from bb2a/FIX---Add-an-advanced-permission-to-read-price
...
FIX - Advanced permission to read price
2022-09-02 10:02:16 +02:00
Laurent Destailleur
89da4e5bc3
Update index.php
2022-09-02 10:01:16 +02:00
Frédéric France
47c5ec7fc6
Merge remote-tracking branch 'upstream/develop' into productbatch
2022-09-01 19:55:24 +02:00
Laurent Destailleur
6c45b13178
NEW Add filter "Product subject to lot/Serial" in stock per lot/serial
2022-09-01 12:32:27 +02:00
Anthony Berton
67e523de20
fix index
2022-09-01 09:51:10 +02:00
Frédéric France
8e66b7207e
replace ! empty by !empty
2022-08-31 22:14:20 +02:00
Frédéric France
e71692e745
fix php8 warnings
2022-08-31 22:02:31 +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
Laurent Destailleur
a5c18ea776
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-08-31 17:57:14 +02:00
Laurent Destailleur
017a2258ce
FIX bad sort order field on DMD in product lot page
2022-08-31 01:03:30 +02:00
Thomas Negre
425405a9b2
Product supplier price: autofill default supplier VAT
2022-08-30 17:10:18 +02:00
Alexandre SPANGARO
7db656a9ba
PHP8 Warnings
2022-08-30 17:01:31 +02:00
Laurent Destailleur
c69f5be89d
Merge pull request #21962 from dolibit-ut/patch-473
...
Update list.php
2022-08-30 00:54:40 +02:00
Laurent Destailleur
cf71c58acc
Merge pull request #21963 from dolibit-ut/patch-474
...
Update card.php
2022-08-30 00:54:10 +02:00
Laurent Destailleur
62b70c3c97
Merge pull request #21964 from dolibit-ut/patch-475
...
Update index.php
2022-08-30 00:54:01 +02:00
UT from dolibit
c9826f975c
Update document.php
2022-08-29 18:49:48 +02:00
UT from dolibit
eb83c818ac
Update index.php
2022-08-29 18:47:35 +02:00
UT from dolibit
5b8f7cf00c
Update card.php
2022-08-29 18:45:11 +02:00
UT from dolibit
7657bc35d7
Update list.php
2022-08-29 18:43:06 +02:00
Laurent Destailleur
d0e08818e1
Merge pull request #21931 from grandoc/new_branch_27_08_2022
...
FIX php8 compatibility
2022-08-29 01:09:49 +02:00
Laurent Destailleur
5e8d983604
Merge pull request #21923 from dolibit-ut/patch-450
...
Update inventory.class.php
2022-08-29 00:49:17 +02:00
Philippe GRAND
45248e1dbd
FIX php8 compatibility
2022-08-28 14:24:54 +02:00
Philippe GRAND
18d6a95a7d
FIX php8 compatibility
2022-08-28 14:24:26 +02:00
Philippe GRAND
76dd110bc3
FIX php8 compatibility
2022-08-28 14:23:54 +02:00
Philippe GRAND
9d7e025d45
FIX php8 compatibility
2022-08-28 14:23:27 +02:00
Philippe GRAND
30891769d8
FIX php8 compatibility
2022-08-28 14:22:57 +02:00
UT from dolibit
48bef039a2
Update stocktransfer.class.php
...
line 113 -> 'help'=>"LinkToThirdparty"
2022-08-27 13:49:13 +02:00
UT from dolibit
98d3c246e5
Update inventory.class.php
...
line 766 -> 'help'=>'LinkToThirdparty'),
2022-08-27 13:43:58 +02:00
Laurent Destailleur
2e905b127a
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/accountancy/index.php
htdocs/product/admin/product.php
2022-08-25 14:35:08 +02:00
Laurent Destailleur
ac6a1b0549
Merge pull request #21873 from bb2a/Right-price
...
NEW - Add right for read price if const MAIN_USE_ADVANCED_PERMS
2022-08-25 12:24:35 +02:00
Anthony Berton
b9b3e5ca29
Correction droit
2022-08-25 08:51:39 +02:00
Anthony Berton
198ff21890
forgot
2022-08-25 08:32:18 +02:00
Anthony Berton
6f8de50004
Add right
2022-08-24 19:59:06 +02:00
Laurent Destailleur
33361e7948
Merge pull request #21852 from frederic34/useismodenabled
...
use isModEnabled
2022-08-24 18:12:02 +02:00
atm-lena
6e5d395ac8
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation
2022-08-24 11:38:19 +02:00
Francis Appels
38ea28813f
HAR-19 Fix missing shared supplier orders in product related objects.
2022-08-24 11:11:03 +02:00
Frédéric France
e78f9a56be
use isModEnabled
2022-08-23 20:16:28 +02:00
Frédéric France
86a7a7c8bb
use isModEnabled
2022-08-23 20:05:09 +02:00
Frédéric France
582f6b196e
use isModEnabled
2022-08-23 20:02:37 +02:00
Frédéric France
4bef0f5745
use isModEnabled
2022-08-23 20:01:34 +02:00
Laurent Destailleur
06be8dc4bf
Trans
2022-08-23 13:39:06 +02:00
Laurent Destailleur
156479cda3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-08-22 15:18:55 +02:00
Laurent Destailleur
1e51bdc284
Merge pull request #21726 from frederic34/correctstockbatch
...
keep batch info when correcting stock
2022-08-22 15:11:36 +02:00
Laurent Destailleur
f17f22755c
Clean code using of oldcopy
2022-08-22 15:06:09 +02:00
Laurent Destailleur
2b5205b639
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-08-22 13:05:22 +02:00
Laurent Destailleur
1be8746a78
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2022-08-22 13:03:39 +02:00
Laurent Destailleur
4e678c5065
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-08-22 13:02:51 +02:00
Frédéric FRANCE
c6a0605940
Merge remote-tracking branch 'upstream/develop' into correctstockbatch
2022-08-19 20:12:06 +02:00
Frédéric FRANCE
7d25d3c710
apply fix
2022-08-19 19:59:53 +02:00
Frédéric FRANCE
74ae6ef027
fix syntax
2022-08-19 18:12:54 +02:00
Frédéric FRANCE
7f60a34799
use isModEnabled
2022-08-19 18:07:21 +02:00
Christian Humpel
c6f49371c6
Fix #20004 correct SQL command to detect "products to be ordered"
2022-08-17 21:31:09 +02:00
Laurent Destailleur
c0e187d39c
Merge pull request #21184 from Quatadah/fix21094
...
FIX #21094
2022-08-17 10:51:06 +02:00
atm-lena
420b2c1651
FIX : display labl in workstation select, no ref
2022-08-17 09:44:20 +02:00
Laurent Destailleur
9ac38f25a0
Merge pull request #21759 from SylvainLegrand/PR_new_hook_on_movement_list
...
PR new hook "addMoreActionsButtons" on movement list
2022-08-16 19:55:50 +02:00
Laurent Destailleur
94da628cf4
Clean code for http header + better support for Content-Security-Policy
2022-08-16 15:19:45 +02:00
Frédéric FRANCE
590cd657df
Merge remote-tracking branch 'upstream/develop' into correctstockbatch
2022-08-16 10:54:10 +02:00
Sylvain Legrand
cf0b54661c
PR new hook "addMoreActionsButtons" on movement list
2022-08-14 17:02:35 +02:00
Laurent Destailleur
75abbc819b
Clean code
2022-08-14 16:46:22 +02:00
Laurent Destailleur
29499ce52f
Merge pull request #21749 from vdegrandpre/develop
...
CLOSE 21748 Maillage sur ErrorProductAlreadyExists en créant produit
2022-08-14 16:16:08 +02:00
stickler-ci
6c1289382c
Fixing style errors.
2022-08-14 13:49:28 +00:00
Vincent de Grandpré
7a22e6f339
commentaires du code en anglais
2022-08-14 09:48:49 -04:00
stickler-ci
142f242267
Fixing style errors.
2022-08-13 22:35:53 +00:00
Vincent de Grandpré
fd64b3baec
CLOSE 21748 Maillage sur ErrorProductAlreadyExists en créant produit
2022-08-13 18:32:30 -04:00
This Charlène
63d821d06f
php V8 warning
2022-08-13 15:56:33 +02:00
Laurent Destailleur
533e4f2424
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/fr_FR/accountancy.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cashdesk.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/members.lang
htdocs/langs/fr_FR/products.lang
2022-08-12 16:03:09 +02:00
Laurent Destailleur
059d0073ff
FIX Maxi debug v16
2022-08-12 15:54:50 +02:00
Frédéric FRANCE
dc0e5e8d89
keep batch info when correcting stock
2022-08-12 10:59:15 +02:00
Laurent Destailleur
15c0d1e3f0
doc
2022-08-12 00:38:10 +02:00
Laurent Destailleur
9bc6c41ca7
Clean code: No more fetch to clone
2022-08-11 23:59:25 +02:00
atm-lena
2fbba30e2a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation
2022-08-11 12:11:41 +02:00
Laurent Destailleur
93e29672d6
Merge pull request #21701 from dolibit-ut/patch-407
...
Update note.php
2022-08-11 01:29:44 +02:00
Laurent Destailleur
6d12caae98
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-08-10 18:34:52 +02:00
Laurent Destailleur
a0f5c69ccd
Debug v16
2022-08-10 14:45:21 +02:00
Laurent Destailleur
ec042b1701
css
2022-08-10 14:32:26 +02:00
UT from dolibit
6f6ced5b9c
Update note.php
...
$help_url
+ DE:Modul_Produkte
+ DE:Modul_Leistungen
2022-08-10 13:31:44 +02:00
Laurent Destailleur
95b1b3f990
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/commande/card.php
htdocs/emailcollector/class/emailcollector.class.php
htdocs/index.php
htdocs/website/index.php
2022-08-10 13:16:02 +02:00
Laurent Destailleur
9e55377f0a
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
2022-08-10 13:10:52 +02:00
Laurent Destailleur
643f4c8bdc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-08-10 13:08:03 +02:00
Laurent Destailleur
abcdb8dd10
css
2022-08-10 05:06:58 +02:00
Laurent Destailleur
528c853b49
Merge pull request #21660 from Hystepik/develop#2
...
Fix : regretion on stockmovement
2022-08-10 04:40:07 +02:00
Laurent Destailleur
2dd1ef22fa
css
2022-08-10 03:34:16 +02:00
Frédéric FRANCE
5ef9d2d40d
keep url
2022-08-08 11:11:17 +02:00
Frédéric FRANCE
96c17b485c
do not loose decription
...
when changing country, reload cause description lost
2022-08-08 11:07:38 +02:00
ptibogxiv
fcff96d43f
Update product.class.php
2022-08-07 20:00:25 +02:00
stickler-ci
07f6ae34dc
Fixing style errors.
2022-08-07 17:52:32 +00:00
ptibogxiv
e55b45cdc8
Update stockatdate.php
2022-08-07 19:52:06 +02:00
ptibogxiv
6ff002405e
NEW manage virtual stock at future date
2022-08-07 19:37:15 +02:00
lmarcouiller
236c8e21f5
Fix : regretion on stockmovement
2022-08-04 15:05:16 +02:00
Laurent Destailleur
528d54ba79
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-08-02 20:28:07 +02:00
Laurent Destailleur
a32b31bf4f
Fix bad var $liste_limit
2022-08-02 18:57:20 +02:00
Laurent Destailleur
cc9cc7f832
Picto
2022-07-29 14:57:20 +02:00
Laurent Destailleur
aca6b848d2
Picto
2022-07-29 13:58:30 +02:00
atm-lena
462352b957
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation
2022-07-29 12:06:43 +02:00
Quatadah Nasdami
2d60fe26f9
done as it should
2022-07-27 11:07:28 +02:00
Quatadah Nasdami
586d496d5a
done as it should
2022-07-27 11:03:29 +02:00
Laurent Destailleur
5903a9f87f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2022-07-26 12:24:24 +02:00
lmarcouiller
e4d2e538c4
remove escape
2022-07-26 11:03:27 +02:00
lmarcouiller
d964aabcea
fix with advices
2022-07-26 11:01:53 +02:00
Laurent Destailleur
66c27139e1
Fix php8
2022-07-25 19:21:14 +02:00
lmarcouiller
1e282aaded
FIX : js injection in stockmovement.php
2022-07-25 10:49:19 +02:00
Laurent Destailleur
ab81492fa4
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formwebsite.class.php
htdocs/core/lib/cron.lib.php
2022-07-24 22:17:25 +02:00
Laurent Destailleur
da8a9e6082
Merge pull request #20625 from Easya-Solutions/new-inventory-category-field
...
NEW Can use products categories to make inventory
2022-07-24 22:06:55 +02:00
Laurent Destailleur
e465c0f34b
Debug v16
2022-07-24 19:05:55 +02:00
Laurent Destailleur
cf0a1d1e14
Merge
2022-07-24 11:26:10 +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
Laurent Destailleur
274b0ff6b8
Remove useless test
2022-07-24 00:01:03 +02:00
lmarcouiller
bac8efd4c8
Fix : PHP 8.1 warnings
2022-07-22 17:32:18 +02:00
lvessiller
1f28734a83
FIX resolve conflicts
2022-07-22 08:50:50 +02:00
lmarcouiller
eb38875119
Fix : PHP 8.1 warnings
2022-07-20 16:35:51 +02:00
lvessiller
8f338d84b0
FIX resolve conflicts
2022-07-15 17:35:19 +02:00
lvessiller
e5877cb2e3
FIX product filter in inventory list (Issue #21504 )
2022-07-15 09:33:27 +02:00
Laurent Destailleur
97acf949fc
Clean message on email limit
2022-07-13 13:39:16 +02:00
Laurent Destailleur
bec9181d3f
Fix show no record if list empty
2022-07-13 01:01:44 +02:00
Laurent Destailleur
713b506980
Fix label
2022-07-13 00:59:39 +02:00
Laurent Destailleur
8422d3079c
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-07-12 19:10:08 +02:00
Laurent Destailleur
c74ca9dc03
Fix trans
2022-07-12 18:28:37 +02:00
atm-lena
5146fee408
FIX line deleted
2022-07-12 13:57:22 +02:00
lvessiller
b57c40ef78
FIX load product stock in inventory lines
2022-07-12 11:32:12 +02:00
stickler-ci
a41dee9e06
Fixing style errors.
2022-07-12 08:09:45 +00:00
atm-lena
db5c5b9020
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation
2022-07-12 09:21:22 +02:00
Quatadah Nasdami
66ed4aa524
refixing the bug
2022-07-11 14:04:31 +02:00
Laurent Destailleur
11fa745caa
Merge pull request #21198 from OPEN-DSI/develop_new_hook_virtual_product_stock
...
NEW: Add new hook for show virtual stock details on product stock card
2022-07-11 01:53:51 +02:00
Laurent Destailleur
25e034721c
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-07-11 00:06:57 +02:00
Laurent Destailleur
24dc936000
Revert "default to create on card.php if $action is empty"
...
This reverts commit e0b664066b
2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b
default to create on card.php if $action is empty
2022-07-11 00:01:42 +02:00
Laurent Destailleur
2ce695f939
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-07-10 19:48:20 +02:00
Laurent Destailleur
9a92c7d9b0
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/class/extrafields.class.php
2022-07-10 19:28:16 +02:00
Laurent Destailleur
61f1595f8c
Fix look and feel v15
2022-07-08 11:21:54 +02:00
Christian Foellmann
aaca9bc03d
default to create on card.php if $action is empty
2022-07-08 09:16:02 +02:00
Laurent Destailleur
da03175c07
Merge branch 'develop' into dev_19763
2022-07-07 23:06:22 +02:00
Laurent Destailleur
17016d5296
Merge pull request #20615 from Easya-Solutions/new-inventory-list-with-product-categories-filter
...
NEW product categories filter on inventory list
2022-07-07 22:54:24 +02:00
Laurent Destailleur
33a65dd9b8
Merge pull request #21246 from Easya-Solutions/new-inventory-list-show-product-ref-with-label
...
NEW show product label on inventory
2022-07-07 22:08:06 +02:00
Laurent Destailleur
a871aa8f85
Merge pull request #21382 from fboitel/NEW#20650
...
NEW #20650 Checkbox column on left for lists
2022-07-07 21:48:51 +02:00
Laurent Destailleur
116633ed2f
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-07-07 20:14:47 +02:00
Laurent Destailleur
2f269c75de
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/fr_FR/bills.lang
2022-07-07 20:12:23 +02:00
Laurent Destailleur
f9d13290d5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/compta/facture/list.php
2022-07-07 19:15:58 +02:00
Christian Foellmann
4c5e05e411
fix page titles
...
Conflicts:
htdocs/compta/bank/annuel.php
htdocs/contact/list.php
htdocs/product/stock/movement_list.php
htdocs/user/list.php
2022-07-06 19:19:08 +02:00
atm-lena
16415a1c92
Clean Code
2022-07-06 17:28:29 +02:00
Laurent Destailleur
76e3c10c06
Revert "fix page titles"
2022-07-06 15:56:04 +02:00
lvessiller
ed9c7ff251
FIX resolve conflicts
2022-07-06 09:23:44 +02:00
atm-lena
5d18cfaef8
Add select workstation in product card
2022-07-06 08:47:32 +02:00
atm-lena
4e1dc2792c
Add default workstation in service card
2022-07-05 13:58:35 +02:00
Laurent Destailleur
4c4e081997
Debug v16
2022-06-28 13:09:53 +02:00
Florian HENRY
739d24e1ae
fix: replannish view lost filter and sort on pagination and sorting
2022-06-28 11:22:01 +02:00
stickler-ci
23d948cec4
Fixing style errors.
2022-06-27 10:56:08 +00:00
Christian Foellmann
89d1389e2d
fix page titles
2022-06-27 12:48:04 +02:00
Laurent Destailleur
11e11c99b8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-06-27 12:12:07 +02:00
Laurent Destailleur
bbd2f05e3a
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
2022-06-27 12:11:40 +02:00
Laurent Destailleur
bec187b9b4
Merge pull request #21370 from atm-lena/develop_FIX_TransferCorrectionStock_Extrafields
...
FIX : don't display product's extrafields for transer / correction stock
2022-06-27 11:45:31 +02:00
Laurent Destailleur
d6aa53168c
Merge pull request #21379 from cfoellmann/PR/fix-disable-product-accounting
...
fix PRODUCT_DISABLE_ACCOUNTING
2022-06-27 11:33:42 +02:00
Laurent Destailleur
149fc6ed83
Update list.php
2022-06-27 11:26:57 +02:00
Laurent Destailleur
834d129634
Update product.class.php
2022-06-27 11:11:43 +02:00
BB2A Anthony Berton
f3b3e97d49
Recursive call if there is childs to child
2022-06-27 08:51:12 +02:00
BB2A Anthony Berton
ebe8e34249
total init
2022-06-27 08:49:27 +02:00
BB2A Anthony Berton
550c57d53e
FIX - php V8 composition card
2022-06-27 08:45:38 +02:00
Christian Foellmann
082c7091fc
fix PRODUCT_DISABLE_ACCOUNTING + STOCK_SUPPORT_SERVICES on products/services list page
2022-06-26 15:47:24 +02:00
Christian Foellmann
b65c9f4ead
fix PRODUCT_DISABLE_ACCOUNTING - hide fields on product/card view
2022-06-25 15:04:28 +02:00
Laurent Destailleur
14832bb543
FIX timeout due to too many the same request
2022-06-25 04:15:04 +02:00
lvessiller
7b7ecf44ad
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-inventory-category-field
2022-06-24 17:30:14 +02:00
Faustin
1b81b5be5a
NEW #20650 completing checkcolumn on left for stock list
2022-06-24 17:23:58 +02:00
Faustin
4b704e40e7
NEW #20650 completing checkcolumn on left for product list
2022-06-24 17:12:03 +02:00
atm-lena
9d1b1c2c82
FIX : don't display product's extrafields for transer / correction stock
2022-06-24 12:12:22 +02:00
Laurent Destailleur
e0cfeedae7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-06-23 13:14:14 +02:00
Laurent Destailleur
3179fd13d8
FIX #21303
2022-06-23 13:07:53 +02:00
Laurent Destailleur
5627d7ff9d
Fix token
2022-06-23 12:45:28 +02:00
Laurent Destailleur
f4997d052d
Merge pull request #21326 from defrance/patch-209
...
php V8 warning, no soc associated with storage
2022-06-23 12:39:05 +02:00
Laurent Destailleur
540cd43596
Merge branch 'develop' into patch-210
2022-06-23 12:37:47 +02:00
Laurent Destailleur
b2603c9b53
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/fournisseurs.php
2022-06-23 12:26:26 +02:00
Laurent Destailleur
c0240ae996
Merge
2022-06-23 12:24:34 +02:00
Frédéric France
287f868fbb
use getDolGlobalString
2022-06-22 08:36:24 +02:00
Frédéric France
62c171c26d
isModEnabled
2022-06-21 20:54:28 +02:00
atm-lena
a94e39f0f4
Merge branch '14.0' of https://github.com/Dolibarr/dolibarr into 14.0_FIX_productfournprice_saveextrafieldsvalues
2022-06-21 16:38:09 +02:00
atm-lena
d99adae850
Product Fourn Price : fix error save extrafields values
2022-06-21 16:34:23 +02:00
BENKE Charlene
88cab8b8e7
Update card.php
2022-06-20 15:41:19 +02:00
BENKE Charlene
fcc23909b3
Update card.php
2022-06-20 15:39:11 +02:00
BENKE Charlene
67021bfd31
php V8 warning
2022-06-20 15:32:04 +02:00
BENKE Charlene
955f14e299
php V8 warning, no soc associated with storage
2022-06-20 15:25:47 +02:00
Laurent Destailleur
8ee30e067f
Rename var
2022-06-20 02:23:37 +02:00
Laurent Destailleur
e97f021380
Fix #yogosha11295
2022-06-19 19:02:16 +02:00
HENRY Florian
770abb73f6
Merge branch 'Dolibarr:develop' into dev_19763
2022-06-18 11:54:44 +02:00
lvessiller
61a9521e3c
NEW Changelog and reorder getNomUrl parameters
2022-06-17 17:32:22 +02:00
lvessiller
813a87eb3c
FIX resolve conflicts
2022-06-16 17:32:53 +02:00
lvessiller
d5269cd97b
FIX resolve conflicts
2022-06-16 17:08:00 +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
lvessiller
dddd4186a8
NEW show product label on inventory
2022-06-13 15:37:43 +02:00
Laurent Destailleur
bc11cf62f8
FIX #hunterdev2acfc8fe-247c-4f88-aeaa-042b6b8690a0
2022-06-13 10:44:20 +02:00
Laurent Destailleur
b2bc6059df
Fix test
2022-06-12 18:55:16 +02:00
Laurent Destailleur
f0d0bf6442
Update api_products.class.php
2022-06-12 18:52:43 +02:00
ptibogxiv
727fb63833
Fix php 8 compatibility
2022-06-12 14:21:14 +02:00
Laurent Destailleur
c2fe5de852
Merge pull request #21195 from frederic34/useismodenabled
...
use isModEnabled function
2022-06-12 11:56:31 +02:00
Laurent Destailleur
04d625cccf
Merge pull request #21213 from rycks/15_add_invoice_template_in_product_used_list
...
#21212 : add template invoices stats on products card
2022-06-12 11:46:17 +02:00
Eric Seigne
c23b5947b3
#21212 : add template invoices stats on products card
2022-06-12 11:05:12 +02:00
Frédéric France
3fdbce7a31
use isModEnabled function
2022-06-11 09:46:28 +02:00
kamel
50ae1b1f76
NEW: Add new hook for show virtual stock details on product stock card
2022-06-10 10:19:56 +02:00
Frédéric FRANCE
38b18a68d7
Merge branch 'develop' into useismodenabled
2022-06-10 10:07:41 +02:00
Frédéric France
0b8179d7ef
use isModEnabled function
2022-06-09 22:49:48 +02:00
Frédéric France
5dcfc28913
use isModEnabled function
2022-06-09 22:41:59 +02:00
Frédéric France
400afc937f
use isModEnabled function
2022-06-09 22:16:48 +02:00
NASDAMI Quatadah
53bf6db23f
commenting a line => resolves the bug
2022-06-09 13:46:04 +02:00
Laurent Destailleur
3bb8e9cdda
Debug v16
2022-06-09 12:07:35 +02:00
Laurent Destailleur
b5a1ded537
Merge branch 'develop' into 15_fix_reception_stock_move
2022-06-09 02:41:51 +02:00
Laurent Destailleur
1f26dee554
Fix deprecated functions
2022-06-08 17:19:12 +02:00
Francis Appels
c9049a9c85
Fix non numeric warning
2022-06-08 12:38:50 +02:00
Laurent Destailleur
0f7b84cfae
Fix phpcs
2022-06-03 18:20:02 +02:00
Laurent Destailleur
bed0cf8339
Fix phpcs
2022-06-03 18:12:58 +02:00
Laurent Destailleur
cd041c9ea1
Clean code
2022-06-03 02:41:00 +02:00
Laurent Destailleur
cbead0fa5a
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/class/productbatch.class.php
2022-06-02 19:39:42 +02:00
Laurent Destailleur
f9f902f7f4
# WARNING: head commit changed in the meantime
...
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-06-02 19:37:47 +02:00
Laurent Destailleur
867168fcf4
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-06-02 19:35:58 +02:00
Laurent Destailleur
12f3c016d3
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2022-06-02 19:35:03 +02:00
Laurent Destailleur
704266445c
Debug v16
2022-06-01 19:45:46 +02:00
Laurent Destailleur
e3fa24fab2
Merge pull request #18283 from atm-gauthier/NEW_stockstransfers
...
NEW : Stocks transfers objects management
2022-06-01 14:49:21 +02:00
Laurent Destailleur
a7155676af
Debug v16
2022-05-31 12:49:03 +02:00
Laurent Destailleur
480452e291
FIX missing filters
2022-05-29 10:35:49 +02:00
Laurent Destailleur
2c9c55bc75
Fix filter on dates
2022-05-28 16:52:39 +02:00
Laurent Destailleur
7ddf4ef315
Fix look and feel v16
2022-05-28 12:50:44 +02:00
Laurent Destailleur
59fcd9de13
Fix trans
2022-05-28 12:36:03 +02:00
Laurent Destailleur
dcfb0679c8
FIX Look and field v16 for list of lot
2022-05-28 12:24:11 +02:00
BENKE Charlene
17c5337312
PHP V8 Warning
2022-05-24 22:53:26 +02:00
Laurent Destailleur
b43159db6d
Merge branch 'develop' into dev_19763
2022-05-24 22:07:50 +02:00
Laurent Destailleur
4c10c04f9f
Merge pull request #20495 from atm-john/new_fix_regression_select_extrafield_search
...
FIX : regression select extrafield search + fix function name
2022-05-24 21:55:33 +02:00
Laurent Destailleur
13944ea2c0
Merge pull request #20994 from fappels/16_fix_lot_document_management
...
FIX: Product lot document management should not use batch but ref (is lot id)
2022-05-24 21:39:49 +02:00
Laurent Destailleur
6f83c8c6f3
Update productbatch.class.php
2022-05-24 21:22:14 +02:00
Laurent Destailleur
e89c80651b
Update card.php
2022-05-24 21:09:12 +02:00
atm-greg
8213756c37
fix sql to avoid getting product_stock of another product with same batch
2022-05-24 16:49:55 +02:00
BENKE Charlene
9b50b63850
FIX PHP V8 warning
...
$sameunits not initialy defined
no default_lang needed (and field not present on stock class
2022-05-23 21:58:29 +02:00
Francis Appels
8574f36e35
dol_dir_list fast mode
2022-05-23 15:25:31 +02:00
lvessiller
512aff8fa4
NEW MAIN_SEARCH_CATEGORY_PRODUCT_ON_LISTS const to show category customer filter
2022-05-23 12:17:02 +02:00
Francis Appels
71ed1ec602
Product lot document management should not use batch but ref (is lot id)
2022-05-23 12:07:37 +02:00
lvessiller
ce571508a1
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new-inventory-list-with-product-categories-filter
2022-05-23 12:02:40 +02:00
Maxime Kohlhaas
6445dd3882
Merge branch 'develop' into NEW_stockstransfers
2022-05-21 16:06:59 +02:00
Maxime Kohlhaas
cff5ec8605
Fix : fields must check module enabled
2022-05-21 00:08:18 +02:00
Laurent Destailleur
5dfd5ed444
css
2022-05-19 12:34:15 +02:00
Laurent Destailleur
e1c2968ae7
Look and feel v16
2022-05-18 23:11:59 +02:00
Laurent Destailleur
308e7a3d9b
Fix scrutinizer
2022-05-18 12:40:44 +02:00
Laurent Destailleur
177e8c17fb
Fix scrutinizer
2022-05-18 11:23:21 +02:00
Laurent Destailleur
4de50da0dd
Repare code to forbidden var_dump() into code
2022-05-17 14:55:38 +02:00
Laurent Destailleur
c020325587
Debug v16
2022-05-16 19:54:49 +02:00
Laurent Destailleur
4cc1f67632
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/line.php
2022-05-16 16:03:07 +02:00
Laurent Destailleur
c3673bfc3c
NEW A public form for to send a message and create a lead is available
2022-05-16 13:05:17 +02:00
Florian HENRY
b9d78da4f6
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763
2022-05-13 09:09:31 +02:00
Laurent Destailleur
7a361a3bde
More info to help debug
2022-05-12 14:28:17 +02:00
lmarcouiller
207ebc9266
fix php 8.0 warnings
2022-05-11 15:06:11 +02:00
Laurent Destailleur
da5cf74a08
Fix total
2022-05-11 10:17:56 +02:00
Florian HENRY
54d6916a20
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_19763
2022-05-11 08:26:44 +02:00
Gauthier PC portable 024
60defe4108
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2022-05-09 13:29:46 +02:00
lvessiller
00f321475b
NEW replace fk_categories_product with categories_product in inventory
2022-05-09 09:33:44 +02:00
Laurent Destailleur
f14e614430
Merge pull request #20779 from atm-GregM/develop_new_massaction_extrafield_product
...
NEW : Add massaction "Edit Extrafield" for Product
2022-05-08 19:15:25 +02:00
Laurent Destailleur
b04ef20708
Merge pull request #20782 from atm-adrien/FIX_move_inventory_column-develop
...
Fix move inventory column develop
2022-05-08 19:13:26 +02:00
Laurent Destailleur
6592eb5d73
Debug for php 8.1
2022-05-08 18:25:22 +02:00
Laurent Destailleur
f52a7a26f6
Debug v16 - Fix for postgresql - Fix for sql loading per module - php8
2022-05-08 15:18:34 +02:00
Laurent Destailleur
bb6f73136a
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2022-05-06 12:46:26 +02:00
Laurent Destailleur
0426be5059
FIX Update of sale price (log not correctly updated)
...
Conflicts:
htdocs/product/class/product.class.php
htdocs/product/price.php
2022-05-06 12:42:45 +02:00
Laurent Destailleur
f222328ff8
FIX Update of sale price (log not correctly updated)
2022-05-06 12:37:18 +02:00
Laurent Destailleur
203c4e8082
Fix bad test
2022-05-06 11:48:15 +02:00
Gauthier PC portable 024
2c840e80fb
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2022-05-06 11:41:18 +02:00
Laurent Destailleur
f3a630fd30
Clean code
2022-05-06 05:21:26 +02:00
Laurent Destailleur
583343a171
Clean code
2022-05-06 05:08:54 +02:00
stickler-ci
23ae3af247
Fixing style errors.
2022-05-05 07:38:40 +00:00
GregM
885324629f
commit resolve conflict
2022-05-04 17:10:39 +02:00
GregM
d2bf2fdb98
update massaction langs & script
2022-05-04 16:53:57 +02: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
lvessiller
734cdffa59
FIX resolve conflicts
2022-05-02 10:03:23 +02:00
Laurent Destailleur
d7398f573c
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-05-01 20:49:43 +02:00
Laurent Destailleur
c26c6b58ca
Merge pull request #20737 from lainwir3d/allow_product_api_sqlfilters_extrafield
...
CLOSE #20736 Allow extrafields SQL filters on REST API product lookup
2022-05-01 12:23:26 +02:00
Laurent Destailleur
a2ff15164f
Update api_products.class.php
2022-05-01 12:23:02 +02:00
Laurent Destailleur
c96e3bdddf
PHP v8 compatibility
2022-04-30 19:50:20 +02:00
f187f4214a
Product REST API: Always JOIN extrafields table.
2022-04-30 13:24:44 +04:00
Laurent Destailleur
fdfde165a9
FIX #20702 #20699 #20700
2022-04-29 17:48:40 +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
Laurent Destailleur
67048cd2c6
Merge pull request #20721 from altairisfr/getsellprice
...
NEW : add hook to getSellPrice function
2022-04-29 16:39:30 +02:00
Laurent Destailleur
4a8864ed63
Merge pull request #20739 from lainwir3d/inventories_fix_movement_display
...
FIX #20738 Inventory: Add missing <td....> for movement number / card.
2022-04-29 16:06:07 +02:00
Laurent Destailleur
5817c1f1b7
Update inventory.php
2022-04-29 16:05:52 +02:00
atm-lena
18ea7b08f8
Merge branch 'develop_NEW_InventoryProduct_AddPage' of github.com:atm-lena/dolibarr into develop_NEW_InventoryProduct_AddPage
2022-04-29 15:42:28 +02:00
atm-lena
e0ff5a01d1
Close inventory : save before
2022-04-29 15:40:53 +02:00
atm-lena
e15504bf30
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_InventoryProduct_AddPage
2022-04-29 15:39:59 +02:00
John BOTELLA
02cf3fa361
end factoring
2022-04-29 15:38:12 +02:00
GregM
3e4cd251ea
add edit extrafields Massaction products
2022-04-29 11:45:50 +02:00
3b98f74a56
Fix typo and switch to old join style.
2022-04-28 22:56:44 +04:00
Laurent Destailleur
40d0c3b996
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/tva/card.php
htdocs/langs/en_US/admin.lang
2022-04-28 19:23:13 +02:00
Adrien Raze
5fe448e86c
FIX : [inventory] Update PMP when qty stay the same
2022-04-28 15:49:31 +02:00
88bd28323c
FIX #20738 Inventory: Add missing <td....> for movement number / card.
2022-04-28 16:46:42 +04:00
b35b40649f
CLOSE #20736 Allow extrafields SQL filters on REST API product lookup
2022-04-28 15:48:07 +04:00
stickler-ci
6ab88d0169
Fixing style errors.
2022-04-28 10:09:02 +00:00
f0e65e8bdd
FIX #20733 Inventory: Do not use batch qty even if present if batch module is disabled.
2022-04-28 14:00:24 +04:00
Christophe Battarel
75f540c30c
fix for reshook when several module use the hook but only on is concerned
2022-04-28 11:49:15 +02:00
Adrien Raze
ed4610b36b
FIX : Move column "Real Qty" just before "Real PMP" column
2022-04-28 11:45:55 +02:00
Christophe Battarel
25078b292d
fix hookmanager
2022-04-27 09:40:09 +02:00
Christophe Battarel
543e6f186c
add hook to getSellPrice function
2022-04-27 09:03:51 +02:00
stickler-ci
7a6a980b69
Fixing style errors.
2022-04-22 07:36:56 +00:00
atm-lena
229cd53fa8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_InventoryProduct_AddPage
2022-04-22 09:31:30 +02:00
atm-lena
bcfcbe4849
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_of_consumption_selectbatch
2022-04-22 08:48:47 +02:00
Laurent Destailleur
8bc4e9082c
Merge pull request #20647 from FHenry/15.0_fix_html_PRODUCT_LOT_ENABLE_QUALITY_CONTROL
...
fix: HTML on PRODUCT_LOT_ENABLE_QUALITY_CONTROL
2022-04-15 13:22:31 +02:00
lvessiller
c3a3fee2d9
NEW label on products categories filter
2022-04-15 09:40:22 +02:00
lvessiller
c8bec685a9
FIX resolve conflicts
2022-04-15 09:25:13 +02:00
Florian HENRY
b4fb6cf527
fix: HTML on PRODUCT_LOT_ENABLE_QUALITY_CONTROL
2022-04-15 09:13:41 +02:00
Laurent Destailleur
f61ca0b516
Merge branch 'develop' into NEW_stockstransfers
2022-04-14 22:50:31 +02:00
Laurent Destailleur
1fd004d2a7
Merge pull request #20135 from atm-quentin/NEW_inventory_pmp_hidden_conf
...
New hidden conf to manage pmp on inventory
2022-04-14 22:42:35 +02:00
Laurent Destailleur
6075b627a3
Merge pull request #20633 from Easya-Solutions/fix-stockcorrection-include-tpl-path
...
FIX include tpl path in product stock
2022-04-14 21:03:15 +02:00
Laurent Destailleur
4e34649fc2
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/modulebuilder/index.php
2022-04-14 16:10:23 +02:00
lvessiller
ab61c4d735
NEW show category tree in sellist and chkbxlst for common object
2022-04-14 11:08:05 +02:00
lvessiller
5f7f9a7515
FIX include tpl path in product stock
2022-04-14 09:48:06 +02:00
lvessiller
7ad7943d2b
FIX categories product property comment
2022-04-13 16:17:14 +02:00
lvessiller
1cb56adb2e
NEW products categories in inventory card
2022-04-13 15:44:27 +02:00
Laurent Destailleur
29242a23c3
Update product.class.php
2022-04-13 12:11:35 +02:00
Norbert Penel
e9e10e84b2
ensure priority in this usage
...
ensure priority in this usage
2022-04-13 10:47:33 +02:00
Florian HENRY
902301659b
finish invoice per product per line
2022-04-13 09:31:30 +02:00
lvessiller
4510af6747
FIX travis SQL syntax
2022-04-12 16:59:46 +02:00
lvessiller
f17d09743f
NEW product categories filter on inventory list
2022-04-12 16:40:59 +02:00
Gauthier PC portable 024
6faefa7d86
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2022-04-12 09:08:57 +02:00
Laurent Destailleur
cb15a21e41
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/originproductline.tpl.php
htdocs/fourn/facture/card.php
htdocs/install/mysql/migration/14.0.0-15.0.0.sql
htdocs/user/card.php
2022-04-11 21:22:27 +02:00
Laurent Destailleur
3ac268c200
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/holiday/card.php
htdocs/user/card.php
2022-04-11 21:14:51 +02:00
stickler-ci
ddb50264ae
Fixing style errors.
2022-04-11 13:58:59 +00:00
Quentin VIAL-GOUTEYRON
67e7c91c3e
pmp inventory conf MAIN_PRODUCT_PERENTITY_SHARED
2022-04-11 15:47:38 +02:00
lvessiller
18488cf1dd
FIX replenish and manage product stock by warhouse
2022-04-11 13:53:35 +02:00
atm-lena
b58c1c37db
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_of_consumption_selectbatch
2022-04-11 08:55:41 +02:00
Laurent Destailleur
b8c8d2af93
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
2022-04-09 00:56:42 +02:00
Laurent Destailleur
26c3e235cf
Merge pull request #19459 from frederic34/productmerge
...
can merge products
2022-04-07 15:02:03 +02:00
Laurent Destailleur
afdefad55b
FIX bad link to add a customer price (token duplicated)
2022-04-06 21:01:04 +02:00
Florian HENRY
c4f0c60a11
FIX: Filter on Object Referent page give CRSF page
2022-04-06 09:19:56 +02:00
Laurent Destailleur
16b18557a9
Merge pull request #20190 from atm-GregM/DolGetButtonAction_Product_card
...
FIX: replace butAction to dolGetButtonAction on product card
2022-04-02 18:09:49 +02:00
Laurent Destailleur
f141eee005
Update card.php
2022-04-02 18:08:52 +02:00
Laurent Destailleur
e2a957c738
Clean some trigger names
2022-04-02 16:08:04 +02:00
Laurent Destailleur
5b91ae062f
All triggers with a name XXX_UPDATE have been renamed XXX_MODIFY for
...
code consistency purpose.
2022-04-02 10:31:58 +02:00
Laurent Destailleur
a51c868a8e
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2022-04-01 14:40:50 +02:00
Laurent Destailleur
0948a88d52
Merge pull request #20508 from FHenry/15.0_fix_message_inventories_lot_series
...
fix: Show error message on inventory input line for serial num product #Evarisk
2022-04-01 13:16:37 +02:00
Florian HENRY
0c44f164c7
fix: Show error message on inventory input line for serial num product
2022-04-01 09:38:06 +02:00
ATM john
c1d9ea95dc
fix function name
2022-03-30 12:16:17 +02:00
Laurent Destailleur
63d9f69732
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2022-03-29 15:55:47 +02:00
Laurent Destailleur
5108240ed5
Merge pull request #20456 from hregis/fix_mutlicompany_sharings_compatibility
...
FIX multicompany sharings compatibility
2022-03-29 13:56:43 +02:00
Laurent Destailleur
13d0701351
FIX filter into the list of product lots
2022-03-29 11:20:39 +02:00
Laurent Destailleur
3fd1f22b28
NEW Can filter on a thirdparty of product statistics
2022-03-28 21:09:01 +02:00
Quentin VIAL-GOUTEYRON
c7e8a2bd8f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf
2022-03-28 16:04:12 +02:00
Quentin VIAL-GOUTEYRON
6462fd8306
update pmp real even if it's not edit
2022-03-28 16:02:18 +02:00
Regis Houssin
4479ba8015
FIX missing translation keys
2022-03-26 08:32:20 +01:00
Regis Houssin
e8dae7a8db
FIX Multiccompany sharings compatibility
2022-03-24 16:40:51 +01:00
Laurent Destailleur
4a80f35aaa
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2022-03-23 17:26:25 +01:00
Laurent Destailleur
c620757dbc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/langs/en_US/projects.lang
htdocs/product/price.php
htdocs/reception/class/reception.class.php
2022-03-23 17:23:21 +01:00
Laurent Destailleur
32f2499c36
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/langs/en_US/projects.lang
htdocs/langs/en_US/propal.lang
htdocs/product/price.php
htdocs/projet/card.php
htdocs/reception/class/reception.class.php
2022-03-23 17:04:31 +01:00
Laurent Destailleur
6167d8a02c
Merge pull request #20302 from marc-dll/13.0_FIX_product_price_update_error_management
...
FIX: better error management at product selling price update
2022-03-23 16:48:15 +01:00
Laurent Destailleur
18636103fc
Merge pull request #20412 from dolibit-ut/patch-383
...
Update fournisseurs.php
2022-03-23 15:53:43 +01:00
Regis Houssin
b95bb58ba0
FIX remove unused global
2022-03-22 16:49:29 +01:00
Regis Houssin
4ca3d45eca
NEW add hook printFieldWhere in load_state_board function
2022-03-22 15:51:30 +01:00
UT from dolibit
1313be410a
Update fournisseurs.php
...
$helpurl for DE
2022-03-21 10:49:37 +01:00
Laurent Destailleur
8603d493ad
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/install/mysql/tables/llx_partnership.key.sql
2022-03-19 17:34:26 +01:00
Laurent Destailleur
ed631b2b06
Fix doxygen, missing error message
2022-03-18 16:14:20 +01:00
Laurent Destailleur
167df9593b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/comm/action/card.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/langs/en_US/products.lang
htdocs/reception/class/reception.class.php
2022-03-17 19:08:51 +01:00
Laurent Destailleur
e46ee982ec
FIX Option to manage packaging. FIX size/length/volume of reception
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/install/mysql/migration/14.0.0-15.0.0.sql
htdocs/langs/en_US/products.lang
htdocs/reception/card.php
htdocs/reception/class/reception.class.php
2022-03-17 19:00:19 +01:00
Laurent Destailleur
5d415b183e
FIX Option to manage packaging. FIX size/length/volume of reception
2022-03-17 18:53:50 +01:00
Laurent Destailleur
a06b51e06c
Merge pull request #20385 from hregis/fix_missing_object_for_known_current_element
...
FIX missing to known the current object element
2022-03-17 13:29:22 +01:00
Laurent Destailleur
43e7547611
Fix sql errors
2022-03-17 11:49:14 +01:00
Regis Houssin
7a3b051ca0
FIX missing object element and action
2022-03-17 09:51:44 +01:00
Regis Houssin
f6c9791f2f
FIX missing to known the current object element
2022-03-17 09:18:08 +01:00
Laurent Destailleur
813e1a23eb
Var not defined
2022-03-17 02:13:08 +01:00
Laurent Destailleur
079fcacf13
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/products.lang
2022-03-17 00:16:14 +01:00
Laurent Destailleur
caf999aa1f
Fix scanner in inventory. Fix button must not be clicable if disabled.
2022-03-17 00:12:05 +01:00
Regis Houssin
cdc3f43a01
NEW add printFieldListWhere hook in product reassort card
2022-03-16 19:09:16 +01:00
Laurent Destailleur
4b3b9ed66b
Look and feel v15
2022-03-14 11:43:58 +01:00
Laurent Destailleur
6ffa4fa7ce
Fix setup when js disabled.
2022-03-14 11:19:08 +01:00
Laurent Destailleur
32a68995d6
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/product/class/product.class.php
2022-03-10 14:08:19 +01:00
Gauthier PC portable 024
b73e1019ed
FIX : cast int sql
2022-03-10 12:02:25 +01:00
Gauthier PC portable 024
c103c7d61e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2022-03-10 10:31:56 +01:00
Laurent Destailleur
cc57d3dbc1
Fix phpcs
2022-03-09 22:25:29 +01:00
Marc de Lima Lucio
e989371651
FIX: better error management at product selling price update
2022-03-08 14:49:26 +01:00
stickler-ci
38e0a8817d
Fixing style errors.
2022-03-08 09:49:31 +00:00
atm-lena
85628bad21
Fix save button
2022-03-08 10:20:58 +01:00
atm-lena
4e8dd1b6a5
Delete function disable button disablebuttonmakemovementandclose()
2022-03-08 10:02:30 +01:00
Quentin VIAL-GOUTEYRON
b904ea73a6
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf
2022-03-08 08:55:21 +01:00
Laurent Destailleur
84b951c2f9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2022-03-07 15:27:07 +01:00
Laurent Destailleur
54ecf1f98c
# WARNING: head commit changed in the meantime
...
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2022-03-07 15:24:08 +01:00
Laurent Destailleur
c4a20685a4
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-03-07 15:21:38 +01:00
Laurent Destailleur
c0088191f1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/product/admin/product.php
htdocs/product/class/product.class.php
2022-03-07 15:19:51 +01:00
Laurent Destailleur
d13ae9f721
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
htdocs/product/admin/product.php
htdocs/product/class/product.class.php
2022-03-07 15:13:25 +01:00
Laurent Destailleur
df0b20aad3
Merge pull request #20241 from noec764/12.0_Product_Fournisseur_Migration
...
Correction of the modification on the fly of the table llx_product_fournisseur_price
2022-03-07 15:01:40 +01:00
Laurent Destailleur
e085c3989a
Update product.php
2022-03-07 14:59:55 +01:00
Laurent Destailleur
eff4a894c2
Merge pull request #20242 from JohnXLivingston/fix_status_batch_doc
...
Fix: update status_batch documentation
2022-03-07 14:55:34 +01:00
Laurent Destailleur
e13038dc30
Update product.class.php
2022-03-07 14:06:54 +01:00
Quentin VIAL-GOUTEYRON
cc591b3a03
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_inventory_pmp_hidden_conf
2022-03-07 10:12:17 +01:00
atm-lena
f3fb0ffd8a
Keep qty value between pages
2022-03-04 16:44:15 +01:00
Eric Seigne
744b84cb09
fix #20270 : use product_id in sql only if product_id is defined
2022-03-04 15:20:50 +01:00
atm-lena
ac740e0a93
Add pages to products list in inventory
2022-03-04 11:28:03 +01:00
Laurent Destailleur
358f21f06e
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/customreports.php
2022-03-01 16:48:29 +01:00
John Livingston
29eec8444e
Fix: update status_batch documentation
...
$product->status_batch has a new possible value that was not documented.
2022-03-01 16:41:07 +01:00
Laurent Destailleur
2a48dd349e
Fix #hunterb03d4415-d4f9-48c8-9ae2-d3aa248027b5
2022-03-01 16:38:06 +01:00
stickler-ci
5c3b0847c2
Fixing style errors.
2022-03-01 15:20:28 +00:00
noec764
f1af7ca2f2
Update product.php
2022-03-01 16:17:32 +01:00
Noé Courtier
035bc32323
Correction of the modification on the fly of the table llx_product_fournisseur_price by an addition in the script creation of the table as well as in the script of version upgrade from 12 ->13
2022-03-01 16:14:31 +01:00
Laurent Destailleur
a08bbd6acd
Fix regression
2022-03-01 00:11:30 +01:00
Laurent Destailleur
9cc79de31b
Clean code
2022-03-01 00:02:23 +01:00
Frédéric FRANCE
018fc53554
Merge remote-tracking branch 'upstream/develop' into productmerge
2022-02-27 08:40:01 +01:00
GregM
79a0aa816f
DolGetButtonAction add $usercancreate
2022-02-25 16:42:25 +01:00
atm-lena
5072f69ee9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_of_consumption_selectbatch
2022-02-25 13:45:13 +01:00
GregM
22aae26f71
update product card
2022-02-25 10:27:26 +01:00
GregM
a761afe5ed
FIX add dolGetButtonAction on Product
2022-02-25 10:14:39 +01:00
GregM
c65680dbcf
WIP dolGetButtonAction on Product
2022-02-24 11:48:10 +01:00
Laurent Destailleur
e96061dd18
Fix phpunit SecurityTest
2022-02-22 23:46:57 +01:00
Frédéric FRANCE
b277ab9ee3
Merge remote-tracking branch 'upstream/develop' into productmerge
2022-02-22 21:49:17 +01:00
Laurent Destailleur
8cc0f3bb58
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2022-02-22 18:47:26 +01:00
Laurent Destailleur
2c5d88d7a6
Merge pull request #20138 from defrance/patch-178
...
fix : bad redirection after create
2022-02-22 01:17:22 +01:00
BENKE Charlene
5647a04369
fix : bad redirection after create
...
we have __ID__ on url redirect, so repplace it with the $id value
2022-02-21 16:50:12 +01:00
stickler-ci
0eb8eab7f0
Fixing style errors.
2022-02-21 14:51:57 +00:00
Quentin VIAL-GOUTEYRON
76e2ee2dde
uncomment line
2022-02-21 15:36:58 +01:00
atm-lena
dd6d0a118a
Translation
2022-02-21 15:28:38 +01:00
atm-lena
8bbbc843eb
Ajout onglet paramètres "Inventaire extrafields"
2022-02-21 15:20:22 +01:00
Quentin VIAL-GOUTEYRON
595a6c2782
new pmp column
2022-02-21 14:25:18 +01:00
Quentin VIAL-GOUTEYRON
5c2c06de3b
NEW : JS inventory autocalc input
2022-02-18 15:39:56 +01:00
Quentin VIAL-GOUTEYRON
879afaa59e
NEW : Beginning of PMP management on inventory
2022-02-18 12:16:50 +01:00
Laurent Destailleur
3697cb9ca4
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/reception/class/reception.class.php
2022-02-17 11:34:54 +01:00
Laurent Destailleur
cebada1966
Merge pull request #20071 from frederic34/patch-1
...
NEW Hook getNomUrl available everywhere in tooltip of ref links
2022-02-16 20:36:02 +01:00
Laurent Destailleur
2a18bce2f3
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/api/index.php
htdocs/langs/en_US/productbatch.lang
htdocs/langs/fr_FR/productbatch.lang
htdocs/ticket/list.php
2022-02-16 20:31:55 +01:00
Laurent Destailleur
645bf9564e
Merge pull request #20084 from altairis-noe/stock_doc14
...
FIX: correct warehouse document location
2022-02-16 20:18:43 +01:00
Noé Cendrier
98c50f531c
translation string instead of error message text
2022-02-16 15:57:39 +01:00
Laurent Destailleur
60ada5fe72
Can filter on status purchase on list of products
2022-02-16 14:06:16 +01:00
Frédéric FRANCE
eb77f10d7b
Merge remote-tracking branch 'upstream/develop' into productmerge
2022-02-15 19:11:24 +01:00
Frédéric FRANCE
a613553f37
Merge branch 'hookgetnomurl' into patch-1
2022-02-15 18:44:06 +01:00
Frédéric FRANCE
c8640f329e
add missing global
2022-02-15 18:31:05 +01:00
Laurent Destailleur
9173eec8ac
Fix input lost
2022-02-14 23:02:43 +01:00
Laurent Destailleur
b98f547c4a
Fix autoselect
2022-02-12 12:12:50 +01:00
Noé Cendrier
664860863e
correct warehouse document location
2022-02-10 17:59:12 +01:00
Laurent Destailleur
d69f9eca40
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2022-02-10 11:25:15 +01:00
