Commit Graph

1044 Commits

Author SHA1 Message Date
Laurent Destailleur
8ef227f24a
Merge pull request #11902 from OPEN-DSI/fix-formproduct-select-warehouses-cache
FIX empty cache when we want to load specific warehouses in select
2019-09-27 14:59:14 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
2019-09-24 14:25:02 +02:00
Laurent Destailleur
6431e8e16d FIX SQL injection on qty 2019-09-24 12:43:44 +02:00
VESSILLER
6e806a5aed FIX empty cache when we want to load specific warehouses in select 2019-09-16 10:37:55 +02:00
Laurent Destailleur
12d67c5f85 Rename api to get all purchase prices 2019-09-15 17:18:10 +02:00
Laurent Destailleur
68a3c5b41c
Merge pull request #11853 from ptibogxiv/patch-259
NEW add supplier's product list
2019-09-15 17:04:17 +02:00
Laurent Destailleur
5d0ba10f34
Update api_products.class.php 2019-09-15 17:04:08 +02:00
Laurent Destailleur
4a815da993
Merge pull request #11854 from OPEN-DSI/new-formproduct-loadWarehouses-stockmin-order
NEW add minimum stock filter in load warehoues for product form
2019-09-14 17:09:27 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
VESSILLER
6a734ea828 NEW add minimum stock filter in load warehoues for product form 2019-09-09 16:58:20 +02:00
stickler-ci
be66e1bd20 Fixing style errors. 2019-09-09 14:36:02 +00:00
ptibogxiv
f4a565544f
Update api_products.class.php 2019-09-09 16:33:12 +02:00
Laurent Destailleur
a5f7211730 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/install/repair.php
2019-09-06 16:10:55 +02:00
Laurent Destailleur
348ab4765c Fix sql injection 2019-09-06 15:20:04 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Frédéric FRANCE
a5aedacb7e
Update productbatch.class.php 2019-09-03 16:49:41 +02:00
Laurent Destailleur
ffcea3dfd8 Fix phpcs 2019-09-03 14:48:06 +02:00
ptibogxiv
d7cc76b94a
NEW purchase_prices API 2019-08-26 20:10:00 +02:00
ptibogxiv
0ce22d68ef
Update product.class.php 2019-08-10 09:43:26 +02:00
ptibogxiv
4f69be2c2c
Update product.class.php 2019-08-10 09:12:40 +02:00
ptibogxiv
33cf4d8417
Update product.class.php 2019-08-10 09:12:15 +02:00
ptibogxiv
3e94b3dc59
FIX count negative in stats whithcredit note 2019-08-06 16:54:44 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Laurent Destailleur
694be619b2 Fix doxygen 2019-07-11 22:16:32 +02:00
Laurent Destailleur
b065cbc6f8 FIX #11446 2019-07-04 12:09:04 +02:00
atm-josselin
c24a95b7ad Sanitize at creation of the product instead of the creation of the filepath 2019-07-01 09:31:01 +02:00
Laurent Destailleur
b177787f0a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
	htdocs/product/class/product.class.php
2019-06-29 18:28:51 +02:00
Laurent Destailleur
93b0e45246 Fix duplicate class in some cases 2019-06-29 02:27:58 +02:00
Laurent Destailleur
36e240a16d NEW Add statistics on product into contracts 2019-06-29 02:03:57 +02:00
Laurent Destailleur
3ca258c93d Remove dead code 2019-06-24 22:58:21 +02:00
Laurent Destailleur
b202c7eaa0 Fix confusion between ->childs and ->childsoncascade 2019-06-22 20:17:40 +02:00
Laurent Destailleur
1a6dc83d4c Fix: default accounting account for eec and export sales were not used. 2019-06-20 12:25:58 +02:00
Francis Appels
a26c868783 Fix scrutinizer bugs 2019-06-12 22:05:10 +02:00
ATM John BOTELLA
f714b45efb FIX scrutinizer feedback 2019-05-18 15:53:07 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All
methods requires the object User as first parameter.
2019-04-25 12:11:32 +02:00
Laurent Destailleur
cb08bf6021 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/class/product.class.php
2019-04-11 16:25:33 +02:00
Laurent Destailleur
54b3acc997 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/product/class/product.class.php
2019-04-11 16:23:56 +02:00
gauthier
9a24007c0a FIX : better test 2019-04-11 15:32:50 +02:00
gauthier
524b186959 FIX : Product accountancey sell intra code must be visible if main feature level 1 2019-04-11 15:19:40 +02:00
Laurent Destailleur
fff9b7db9d Fix doxygen 2019-04-04 18:33:12 +02:00
Laurent Destailleur
50395b7dd7 New: Input field to search product always visible with focus so you can
use a barcode flasher at any time
2019-03-28 18:51:04 +01:00
Laurent Destailleur
1a8902f23e Fix migration for compatibility 2019-03-19 12:03:02 +01:00
Laurent Destailleur
1a05cdfaa1 Fix regressions in selecting duration of service 2019-03-19 11:42:50 +01:00
Laurent Destailleur
3c40d5d30c
Merge pull request #10821 from OPEN-DSI/fix-select-measuring-units
Fix measure unit id in select options
2019-03-14 14:10:13 +01:00
Frédéric FRANCE
ba749ffc8c
Update product.class.php 2019-03-14 09:14:29 +01:00
Lionel VESSILLER
17dd88d397 Fix measure unit id in select options 2019-03-13 14:05:32 +01:00
Laurent Destailleur
3559d600e2
Merge pull request #10770 from atm-john/theme_badge_status
Add badge status css part1
2019-03-11 20:49:31 +01:00
John BOTELLA
57c6c60118 Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status 2019-03-11 14:44:35 +01:00
Frédéric FRANCE
86c1694195
update doc in product class 2019-03-09 10:36:39 +01:00