lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

1702 Commits

Author SHA1 Message Date
Laurent Destailleur
6bd1bc767b doc 2021-10-12 15:17:34 +02:00
Benjamin Chantalat
91164951de Remove not complete order from virtual stock 2021-10-11 15:24:56 +02:00
Laurent Destailleur
d5d892b263
Merge pull request #18831 from SteiniGreenwork/develop 
NEW Can select existing batch numbers for a combo list (in mrp consumtion)
 2021-10-06 15:20:52 +02:00
Laurent Destailleur
a984eb5c98
Merge branch 'develop' into 14_fix_api_priduct_warning 2021-10-06 13:43:18 +02:00
Laurent Destailleur
7b1b7c0ad6
Update api_products.class.php 2021-10-06 13:42:49 +02:00
Laurent Destailleur
5d9c87a9ea
Update api_products.class.php 2021-10-06 13:42:13 +02:00
Florian HENRY
9d1915f9c2 fix php warning 2021-10-06 09:56:10 +02:00
Laurent Destailleur
e85a0c54cc
Update product.class.php 2021-10-05 18:43:35 +02:00
xgerhard
e44c3a46e1 Fix #18895 Fix negative stock correction 
If people use a negative number as input, I think we can assume they want to delete units. It will now set the movement to 1 if the number is negative and 'add' was selected.

For each negative number we now multiply this number by -1, to make it a positive number again.
 2021-10-05 00:25:52 +02:00
Stephan Steininger
3bb941f3b8
Merge branch 'Dolibarr:develop' into develop 2021-10-04 08:12:19 +02:00
Laurent Destailleur
7863642daa FIX #18852 2021-10-02 19:16:42 +02:00
Laurent Destailleur
3d4bb66853 Clean code 2021-09-30 15:59:47 +02:00
Stephan Steininger
5bb717b887 Merge branch 'develop' of https://github.com/SteiniGreenwork/dolibarr into develop 2021-09-30 15:07:37 +02:00
Stephan Steininger
2e2048f6d8 Update documentation 2021-09-30 15:06:57 +02:00
Laurent Destailleur
aaf170313f Clean code 2021-09-30 14:51:38 +02:00
Laurent Destailleur
63218d5d5c
Update product.class.php 2021-09-30 14:30:50 +02:00
Laurent Destailleur
3565a47954
Merge branch 'develop' into NEW_develop_virtual_product_DragAndDrop 2021-09-30 14:24:30 +02:00
stickler-ci
b069f81965 Fixing style errors. 2021-09-30 11:58:20 +00:00
Stephan Steininger
94cc75cb69 Changed input type from select to input. 
New function selectLot
 2021-09-30 13:56:43 +02:00
Norbert Penel
2205073f25
load_stats_reception is not loaded 2021-09-30 12:09:17 +02:00
Stephan Steininger
372aa6bf4c
Merge branch 'Dolibarr:develop' into develop 2021-09-30 09:05:05 +02:00
Laurent Destailleur
80165811e0 Clean code 2021-09-27 15:50:19 +02:00
stickler-ci
526380a4b8 Fixing style errors. 2021-09-27 08:10:49 +00:00
Stephan Steininger
c7ff60866a load existing batch numbers for item within mrp consumtion 2021-09-27 10:04:59 +02:00
Laurent Destailleur
27c41946b7
Merge pull request #18182 from atm-jpb/NEW_field_in_service_object 
NEW : field and behavior in product object
 2021-09-23 12:14:09 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2021-09-23 02:41:53 +02:00
Laurent Destailleur
a5566473d9 Clean code 2021-09-21 18:06:48 +02:00
Laurent Destailleur
76ee014b52 Fix add a hidden solution to fix a corrupted value for AWP. 2021-09-21 16:32:32 +02:00
Laurent Destailleur
b1cb32c743 Fix some sql 2021-09-15 20:03:38 +02:00
Laurent Destailleur
bfa75e91e2 Code comment 2021-09-08 20:59:56 +02:00
jpb
65a2486f94 merge conflict 2021-09-06 09:43:52 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
8ea1a9602b NEW Add import / export of MO and BOMLines - Close #18499 2021-09-02 21:00:31 +02:00
Laurent Destailleur
b04ea59a51 More sql sanitizing 2021-09-02 13:58:42 +02:00
Adrien Raze
58845082b1 FIX : Travis 2021-08-30 17:20:50 +02:00
Adrien Raze
f44ae62eb3 FIX : Travis 2021-08-30 16:59:09 +02:00
Adrien Raze
fb183f4f5d FIX : Travis 2021-08-30 16:13:51 +02:00
Adrien Raze
08364d2492 FIX : Travis 2021-08-30 16:08:07 +02:00
Adrien Raze
7794a01a0b FIX : Stickler-ci 2021-08-30 15:51:59 +02:00
stickler-ci
73b4f0df51 Fixing style errors. 2021-08-30 13:38:55 +00:00
Adrien Raze
709a297563 NEW : Allow drag and drop on kits 2021-08-30 14:45:42 +02:00
Laurent Destailleur
8b996627eb
Merge pull request #18462 from grandoc/new_branch_22_08_2021 
fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\ht…
 2021-08-28 18:35:40 +02:00
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +02:00
Laurent Destailleur
29abbbe2fb Clean code 2021-08-28 01:45:53 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +02:00
Laurent Destailleur
23829ae637 Cast numeric into on sql request 2021-08-23 18:56:46 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Philippe GRAND
ba9ede39bf fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\comm\propal\card.php on line 265 2021-08-22 22:28:53 +02:00
Philippe GRAND
e439e0f14d fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\product\class\propalmergepdfproduct.class.php on line 251 2021-08-22 21:55:00 +02:00
Philippe GRAND
16f2a53fb8 fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\product\class\propalmergepdfproduct.class.php on line 236 2021-08-22 21:52:57 +02:00
Laurent Destailleur
e4aafcf91e Code comment 2021-08-18 18:43:33 +02:00
Laurent Destailleur
ecb673f15c Debug default BOM on product 2021-08-16 23:02:55 +02:00
Laurent Destailleur
c36bb0fbf7
Merge branch 'develop' into patch-163 2021-08-11 21:43:42 +02:00
stickler-ci
eadfc9f4ae Fixing style errors. 2021-08-11 19:36:18 +00:00
jpb
f99ba2c1e1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object 2021-08-04 17:26:23 +02:00
Laurent Destailleur
9ceab9b86b Doc 2021-08-03 15:47:00 +02:00
jpb
875167d593 add escape to sql 2021-07-20 16:17:17 +02:00
jpb
f16eba1811 quick fix create product 2021-07-20 16:04:12 +02:00
jpb
e11afb7da0 add color on date dield and warning on line 2021-07-20 11:23:35 +02:00
jpb
97287af987 add field to object product, add sql 2021-07-19 14:03:03 +02:00
Laurent Destailleur
202ee8340a FIX #18091 2021-07-12 23:01:34 +02:00
Francis Appels
d6c327ed85 Remove duplicate code 2021-07-08 13:17:07 +02:00
Laurent Destailleur
d43e043b48 Fix regression when adding a product with multicompany 2021-07-05 12:49:10 +02:00
Laurent Destailleur
f6efe51032 Fix trouble with product id = -1 2021-07-04 21:02:02 +02:00
Laurent Destailleur
2c4fd9e409 Debug ENTREPOT_EXTRA_STATUS 2021-06-24 11:51:10 +02:00
Laurent Destailleur
c03958a867 Fix look and feel v14 2021-06-23 19:02:14 +02:00
Laurent Destailleur
3bc1f90589 Fix rounding 2021-06-23 02:51:31 +02:00
Laurent Destailleur
23c0edf854
Merge pull request #17784 from atm-john/new_expedition_warehouse_auto_picking 
NEW/FIX : Allow auto picking for child warehouse and taking into account of the quantities already affected in list
 2021-06-20 12:55:30 +02:00
Laurent Destailleur
ac1e6c9966 FIX sql error on strict mysql 2021-06-16 20:17:21 +02:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Laurent Destailleur
026d919a03
Merge pull request #17900 from frederic34/patch-7 
fix warnings
 2021-06-13 16:15:58 +02:00
Laurent Destailleur
abfc87c1de Fix separator extrafields must not appear as selected fields 2021-06-13 13:32:41 +02:00
Frédéric FRANCE
56afefd6ad
fix warnings 2021-06-12 07:12:45 +02:00
Laurent Destailleur
77efbda148 Fix responsive 2021-06-10 20:04:21 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
1e657b8621 Fix value of showoncombobox 2021-06-05 15:14:10 +02:00
Laurent Destailleur
2586fcd1a3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commandestats.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/holiday/month_report.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/societe/list.php
 2021-06-04 11:20:38 +02:00
ATM john
f13388122c Add fetch stock order 2021-06-01 21:43:05 +02:00
Laurent Destailleur
81a94f5642 FIX option MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE 2021-05-28 18:04:45 +02:00
Laurent Destailleur
9aee8a2a0b FIX #17406 2021-05-25 21:53:44 +02:00
Laurent Destailleur
625aab34d6 Fix phpcs 2021-05-20 15:30:33 +02:00
Laurent Destailleur
dc3b5846fb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-20 09:24:09 +02:00
Frédéric FRANCE
c8b1eb180a
doxygen 2021-05-20 08:50:15 +02:00
ATM john
3bf71d456d fix doc 2021-05-19 12:01:47 +02:00
ATM john
1512abf96a Remove hpcs:disable 2021-05-19 12:00:27 +02:00
ATM john
9219dcfecb Fix price log spam 2021-05-19 11:52:34 +02:00
Francis Appels
009588e04d fix implode on string for formproduct loadwarehouse 2021-05-14 11:02:55 +02:00
Laurent Destailleur
a9ddf2a5ad Fix phpcs 2021-05-13 19:07:47 +02:00
Laurent Destailleur
ce8c606132 Clean APIs 2021-05-12 11:04:22 +02:00
Laurent Destailleur
e2ccacd4a9
Merge pull request #17512 from altairisfr/productcard_traceability_fields 
Stock product card traceability fields
 2021-05-11 21:40:50 +02:00
antonin_tdj
35c8bb6b29
fix bug PMP per entity 
wrong alias in SQL query
 2021-05-07 18:28:30 +02:00
Noé Cendrier
b608038370
Merge branch 'develop' into productcard_traceability_fields 2021-05-06 17:41:11 +02:00
Noé Cendrier
5e57a7173d
Merge branch 'develop' into productcard_traceability_fields 2021-05-06 15:21:48 +02:00
altairis-noe
8a108ae5e8 qcstatus out of formproduct and corrections in syntax 2021-05-06 09:59:33 +02:00
stickler-ci
60fc9f5ecd Fixing style errors. 2021-05-04 07:52:53 +00:00
kastoras
ee4288fae3 NEW Add pagination at Get Products response 
At REST API generate pagination data when getting products list using $pagination_data parameter
 2021-05-04 10:48:31 +03:00
Laurent Destailleur
d6617f82ca
Merge branch 'develop' into develop 2021-05-04 00:23:28 +02:00
Laurent Destailleur
08806a6d9a
Merge pull request #17403 from kastoras/product_variants_api_add_stock_to_response 
New/NEW Product Variants API, add variant stock to response
 2021-05-03 19:39:50 +02:00
Laurent Destailleur
1c95e2b7c7 FIX #17453 2021-05-03 14:58:29 +02:00
kastoras
127654e792 New/NEW Product Variants API, add variant stock to response 
Remove dependency inserded by mistake
 2021-05-01 22:32:08 +03:00
Laurent Destailleur
e99355a0c2 Clean html 2021-04-30 15:22:17 +02:00
altairis-noe
c10b165d33 qc_status change in stock correct -> display select 2021-04-30 14:36:25 +02:00
altairis-noe
fd42979def qc_status change in stock transfer -> display select 2021-04-30 11:12:33 +02:00
altairis-noe
1224327f91 qcstatus everywhere 2021-04-29 17:50:11 +02:00
Laurent Destailleur
655056ed31 Debug v14 2021-04-29 12:10:55 +02:00
stickler-ci
58b4074e57 Fixing style errors. 2021-04-28 21:10:06 +00:00
kastoras
eca04b675b Merge remote-tracking branch 'origin/product_variants_api_add_stock_to_response' into product_variants_api_add_stock_to_response 2021-04-29 00:10:35 +03:00
kastoras
24dec80c7e New/NEW Product Variants API, add variant stock to response by parameter 
If $includestock parameter is set to 1, the response will contain variant stock data
 2021-04-29 00:06:47 +03:00
kastoras
e5cd6f97f9 New/NEW Product Variants API, add variant stock to response 
When acessing product variants via GET API /products/{id}/variants, Include stock_warehouse data to the response
 2021-04-28 23:19:24 +03:00
altairis-noe
82ae633617 lifetime and qc_frequency now treated in add and update 2021-04-28 17:08:17 +02:00
Laurent Destailleur
75a8dc28ea
Merge pull request #17261 from aspangaro/14a39 
Maxi debug of societe/product per entity
 2021-04-28 17:06:45 +02:00
Laurent Destailleur
3ecf2015b3
Merge pull request #17393 from kastoras/product_api_get_only_products_not_variants 
Close/CLOSE #17390 Products API, GET /products without variants
 2021-04-28 16:14:01 +02:00
Laurent Destailleur
b56b9aa707
Merge branch 'develop' into develop 2021-04-28 16:05:07 +02:00
Laurent Destailleur
0b0d1ee832
Merge pull request #17413 from kastoras/product_api_get_product_stock 
Close/CLOSE #13739 Product API route added to get product stock
 2021-04-28 15:31:33 +02:00
stickler-ci
925c324872 Fixing style errors. 2021-04-27 21:38:03 +00:00
kastoras
2e108e1e2f Close/CLOSE #13739 Product API route added to get product stock 
Using GET /products/{id}/stock user can get product stock from all warehouses. Using warehouse id will get stock of warehouse given.
 2021-04-28 00:32:37 +03:00
kastoras
f3504e8c54 Close/CLOSE #17390 Products API, GET /products variants filter 
Added new parameter for variants filter. Using this filter you can get products without variants only, parrent products only, child products only.
 2021-04-27 23:47:00 +03:00
altairis-noe
99df144e04 edit traceability fields in productlot card 2021-04-27 15:28:39 +02:00
Antonin MARCHAL
00ef5b94bf lint(stickler) 2021-04-27 09:59:33 +02:00
Antonin MARCHAL
c865199a78 lint(stickler) 2021-04-27 09:58:36 +02:00
Antonin MARCHAL
b573d81e45 fix(lint) eldy's remarks + other table used 2021-04-27 09:54:38 +02:00
stickler-ci
1c1e111b0c Fixing style errors. 2021-04-26 22:06:11 +00:00
kastoras
8ba08552ca New/NEW Product Variants API, add variant stock to response 
When acessing product variants via GET API /products/{id}/variants, Include stock_warehouse data to the response
 2021-04-27 01:01:27 +03:00
Laurent Destailleur
8e67af8d58
Update api_products.class.php 2021-04-26 21:09:56 +02:00
Antonin MARCHAL
a296f81bc6 lint(travis) 2021-04-26 20:30:21 +02:00
Antonin MARCHAL
57118da206 lint(stickler)3rd 2021-04-26 20:13:55 +02:00
Antonin MARCHAL
285fa4a506 lint(stickler) again 2021-04-26 20:10:57 +02:00
Antonin MARCHAL
1d162cc62c lint(stickler) 2021-04-26 20:06:45 +02:00
Antonin MARCHAL
14269ab8ee Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2021-04-26 19:30:00 +02:00
Antonin MARCHAL
9e2ee5bf57 add(pmp) PMP per entity 2021-04-26 19:29:56 +02:00
Alexandre SPANGARO
d95be3e08b Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-26 13:53:16 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
stickler-ci
a8563de1c4 Fixing style errors. 2021-04-25 13:34:26 +00:00
kastoras
474bfdd6bc Close/CLOSE #17390 Products API, GET /products without variants 
When accessing get /products, using $without_variants parameter to true (the deault value is false), the api retur only products and no variants.
 2021-04-25 16:20:17 +03:00
Laurent Destailleur
b2c2c55214 Fix #yogosha5877 2021-04-24 21:00:26 +02:00
Laurent Destailleur
d0cc64479d Fix protect sql 2021-04-24 20:18:11 +02:00
Alexandre SPANGARO
d27030df3f Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-20 04:43:14 +02:00
Christophe Battarel
ccc05a0a43
Merge branch 'develop' into batch_mask_product 2021-04-14 08:30:19 +02:00
Alexandre SPANGARO
2f31720896 Maxi debug of societe/product per entity 2021-04-14 04:45:17 +02:00
altairis-noe
eee40a1840 Merge branch 'develop' of github.com:altairisfr/dolibarr into batch_mask_product 2021-04-13 10:36:37 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Alexandre SPANGARO
2d77b9bdf0 Work on split module fournisseur 2021-04-12 06:15:47 +02:00
Alexandre SPANGARO
ce7c5a0c7b Work on split module fournisseur 2021-04-11 04:24:21 +02:00
Laurent Destailleur
0cf659eb85 Fix syntax error 2021-04-10 00:26:28 +02:00
altairis-noe
000342c2d8 custom masks : create, edit and display 2021-04-09 13:40:37 +02:00
Laurent Destailleur
60711f415d Fix permission on external user 2021-04-08 19:52:07 +02:00