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

6323 Commits

Author SHA1 Message Date
Laurent Destailleur
5e0f2f9781 Debug v14. Fix regression. 2021-05-12 22:35:21 +02:00
Laurent Destailleur
ce8c606132 Clean APIs 2021-05-12 11:04:22 +02:00
Laurent Destailleur
cfded75d11 Debug v14 2021-05-12 09:27:04 +02:00
Laurent Destailleur
f334f2a255 Fix inventory 2021-05-12 09:22:49 +02:00
Laurent Destailleur
b8254186ce Clean code 2021-05-12 09:07:36 +02:00
Laurent Destailleur
fac32ee913 Better performance 2021-05-12 08:54:36 +02:00
Laurent Destailleur
3ea6cd1c66 Fix missing columns 2021-05-12 08:53:29 +02:00
Laurent Destailleur
3b0f79c3e2 Clean code 2021-05-11 21:46:19 +02:00
Laurent Destailleur
670b604d24 Clean code 2021-05-11 21:45:37 +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
Gauthier PC portable 024
f9afe7e81a Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_collapse_batch_detail 2021-05-10 09:17:15 +02:00
antonin_tdj
35c8bb6b29
fix bug PMP per entity 
wrong alias in SQL query
 2021-05-07 18:28:30 +02:00
altairis-noe
61f8a03df6 commisionning_date out, we said 2021-05-07 15:41:48 +02:00
altairis-noe
6d92eb2e84 little correction 2021-05-07 15:38:46 +02:00
altairis-noe
8e61fc44fa traceability must be a choice and we’ll see later about commisioning date 2021-05-07 15:34:11 +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
2bdea3732d days in lifetime trans 2021-05-06 14:52:48 +02:00
altairis-noe
7c53e2bb18 too much td 2021-05-06 11:16:22 +02:00
altairis-noe
cce132b8da one more space 2021-05-06 10:04:54 +02:00
altairis-noe
435cbcd16c spaces after ! 2021-05-06 10:01:53 +02:00
altairis-noe
8a108ae5e8 qcstatus out of formproduct and corrections in syntax 2021-05-06 09:59:33 +02:00
altairis-noe
5be2bdd123 qcstatus is not for this branch 2021-05-05 18:01:47 +02:00
altairis-noe
b1a4031bde no qcstatus in productlot class 2021-05-05 17:47:01 +02:00
altairis-noe
94e485aa06 qc_frequency in days and qcstatus elsewhere 2021-05-05 16:56:25 +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
7a986b3e50 Fix colors 2021-05-01 17:44:28 +02:00
Laurent Destailleur
c848a1ce03 css 2021-05-01 16:55:49 +02:00
Laurent Destailleur
ef734aeb58 Debug module inventory 2021-05-01 16:33:05 +02: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
Laurent Destailleur
de8e291c7e Debug v14 2021-04-29 10:01:10 +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
altairis-noe
d6b936dd6e add lifetime and qc_frequency in product card 2021-04-28 16:36:15 +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
e810118a99
Merge pull request #17408 from ibuiv/patch-7 
Fix Bug replenish + Auto Filter
 2021-04-28 15:45:57 +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
antonin_tdj
dfb4a1c30a
lint (code) Apply remarks and upgrade codee 
- Sets List of all Visible Warehouses at the beginning with getEntity method (removed the call to global $mc)
- Better check for warehouse auto select (`$count == 1 && (empty($fk_entrepot) || $fk_entrepot <= 0) && ...`)
- Better SQL applying eldy's remarks
 2021-04-28 13:37:05 +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
Laurent Destailleur
e01c5313a7 Debug v14 2021-04-27 22:36:25 +02:00
Laurent Destailleur
f5d18a0023
Update replenish.php 2021-04-27 18:00:45 +02:00
Laurent Destailleur
328e70c309
Update replenish.php 2021-04-27 17:52:57 +02:00
altairis-noe
99df144e04 edit traceability fields in productlot card 2021-04-27 15:28:39 +02:00
stickler-ci
109124fdac Fixing style errors. 2021-04-27 10:16:59 +00:00
antonin_tdj
6fd1726093
Fix Bug replenish + Auto Filter 
# Fix Replenish Calculation Bug + Auto Filter

## Environment
* Version: 13
* URL(s): product/stock/replenish.php

## Configuration 
MultiCompany needed with Stock Sharing ON, 2 entities and 1 warehouse per entity

**Entity A**
* Options: don't share stocks with other entities
* Warehouse : only 1 (WAR_A)
* Stock : 1 product (PROD) Qty : 4

**Entity B :**
* Options: don't share stocks with other entities
* Warehouse : only 1 (WAR_B)
* Stock : 1 product --the same-- (PROD) Qty : 17

**Product :**
* Desired Stock : 20
* Alert : 10

**WAR_A :**
* For the product
* Desired Stock : 16
* Alert : 6
 
## Fixed behavior :
* Entity A -> Replenish
* If WAR_A selected should show the product and fill with 12 the qty to order. Physical Stock (All) and Physical Stock (this 
warehouse) should be 4.

* If no Warehouse selected show the product and fill with 12 (because only one warehouse seen by this entity) the qty to order. Physical Stock (All) should be 4.

## Actual behavior :
* Entity A -> Replenish

* The product isn't showed.

* If I intentionally incrementes the Desired Stock value. The product will be shown with the good filter (Warehouse if desired stock has been incremented on the combination ProductDesired <-> Warehouse). The qty for the order are correct and the physical stock shown is correct.

## Conclusion : 
* 1 bug and 1 improvment

**BUG** : The value of the stock taken to whether or not show the product line is wrong. It is considering the stock in warehouses not shared with the entity.

**IMPROVMENT** : If only one Warehouse, take automatically the desired and alert values for this warehouse and not the general ones.
 2021-04-27 12:14:36 +02:00
Antonin MARCHAL
5d1d6eee95 add(pmp) on Warehouse List 2021-04-27 10:51:15 +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
5fd0c1b810 fix(code)eldy's remarks 2021-04-27 09:55:35 +02:00
Antonin MARCHAL
b573d81e45 fix(lint) eldy's remarks + other table used 2021-04-27 09:54:38 +02:00
Gauthier PC portable 024
ed8b9fda13 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_collapse_batch_detail 2021-04-27 09:28:08 +02:00
Laurent Destailleur
5bd13d6daa
Merge pull request #17344 from altairis-noe/product_card_typo 
product card typo
 2021-04-27 01:31:11 +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
615f858ecb
Merge pull request #17384 from ibuiv/patch-5 
Product Stock Card - add new standard Hooks
 2021-04-26 22:40:38 +02: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
c0b6dd92d7 lint(stickler)4th 2021-04-26 20:15:32 +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
Laurent Destailleur
d138e7410b Clean code 2021-04-26 19:12:23 +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
stickler-ci
9fbb5087b9 Fixing style errors. 2021-04-23 16:05:24 +00:00
antonin_tdj
a28402e3a0
Product Stock Card - add new standard Hooks 2021-04-23 18:03:16 +02:00
altairis-noe
09807706f0 first try on productlot traceability fields 2021-04-23 14:51:02 +02:00
altairis-noe
81907191ca product card typo 2021-04-20 10:17:08 +02:00
Gauthier PC portable 024
70f739b332 Merge branch '13.0_new_collapse_batch_detail' of github.com:atm-gauthier/dolibarr into develop_new_collapse_batch_detail 2021-04-20 10:03:20 +02:00
Gauthier PC portable 024
72ea2a56ea NEW : help text 2021-04-20 10:02:53 +02:00
Gauthier PC portable 024
cbfb2d9b47 Merge branch '13.0_new_collapse_batch_detail' of github.com:atm-gauthier/dolibarr into develop_new_collapse_batch_detail 2021-04-20 09:44:24 +02:00
Gauthier PC portable 024
e5df10133e Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0_new_collapse_batch_detail 2021-04-20 09:06:05 +02:00
Alexandre SPANGARO
d27030df3f Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-20 04:43:14 +02:00
Laurent Destailleur
0ac380f23e
Merge pull request #17248 from altairisfr/batch_mask_product 
Batch mask product
 2021-04-19 22:16:22 +02:00
Laurent Destailleur
e71e5d533d Fix HTML5 2021-04-19 21:30:25 +02:00
Laurent Destailleur
46ea1084f5 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/mailing/cibles.php
	htdocs/core/extrafieldsinexport.inc.php
	htdocs/product/stock/card.php
 2021-04-19 20:59:10 +02:00
Laurent Destailleur
28f0c6c7cf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/product/stock/card.php
 2021-04-19 20:55:09 +02:00
atm-greg
74345c4f21 fix warehouse label field edition 2021-04-19 16:03:22 +02:00
Gauthier PC portable 024
b87773d5a0 Merge branch '13.0_new_collapse_batch_detail' of github.com:atm-gauthier/dolibarr into 13.0_new_collapse_batch_detail 2021-04-19 14:47:29 +02:00
Gauthier PC portable 024
2236d1b07f FIX : Hide all and check all links always available 2021-04-19 14:46:28 +02:00
stickler-ci
a79823742f Fixing style errors. 2021-04-19 12:41:17 +00:00
Gauthier PC portable 024
894eb1e5a4 NEW : "+" and "-" to show / hide batch details on product "stock" tab 2021-04-19 14:34:11 +02:00
Laurent Destailleur
94005f17a5
Merge pull request #17274 from altairisfr/project_warehouse 
Project warehouse
 2021-04-16 20:45:49 +02:00
Laurent Destailleur
ce9d707040
Merge pull request #17269 from bb2a/picto_massactions 
Next picto mass actions
 2021-04-16 20:40:19 +02:00
Laurent Destailleur
9eaf836c8e
Merge pull request #17281 from altairisfr/warehouses_in_project 
Warehouses in project
 2021-04-16 20:29:21 +02:00
stickler-ci
f76d540451 Fixing style errors. 2021-04-15 15:49:42 +00:00
Ferran Marcet
512b54d049 New: Streamline data loading on replenishment 2021-04-15 17:44:35 +02:00
altairis-noe
2e340c61cc preselect project when warehouse created from there 2021-04-15 10:31:18 +02:00
altairis-noe
658e1de45d stickler adjust 2021-04-14 16:08:28 +02:00
Anthony Berton
a612831e28 next_change 2021-04-14 14:45:55 +02:00
altairis-noe
4c8d37ce28 warehouse can now be linked to a project with 
fk_project
 2021-04-14 13:45:25 +02:00
Laurent Destailleur
9154e07689 Fix picto for tags 2021-04-14 12:33:53 +02:00
Laurent Destailleur
dcf460e248 Use css on img_picto 2021-04-14 12:28:01 +02:00
Anthony Berton
707bf5adca picto_mass_actions 2021-04-14 10:20:34 +02:00
altairis-noe
7040330914 project select in edit or create warehouse 2021-04-14 10:13:31 +02:00
Christophe Battarel
ccc05a0a43
Merge branch 'develop' into batch_mask_product 2021-04-14 08:30:19 +02:00
stickler-ci
69fd2cf24c Fixing style errors. 2021-04-14 02:50:23 +00:00
Alexandre SPANGARO
2f31720896 Maxi debug of societe/product per entity 2021-04-14 04:45:17 +02:00
Laurent Destailleur
033a243372
Merge pull request #17166 from altairisfr/product_masks 
Product masks
 2021-04-13 23:06:09 +02:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
 2021-04-13 20:19:05 +02:00
altairis-noe
2e297b5753 one more print 2021-04-13 17:02:58 +02:00
altairis-noe
ee1693edf0 colspans and inconditional GETPOST 2021-04-13 16:13:57 +02:00
Laurent Destailleur
8c9cacba4d
Merge branch 'develop' into 14a36 2021-04-13 16:05:57 +02:00
Laurent Destailleur
add6853581
Merge branch 'develop' into filter_warehouse 2021-04-13 15:58:13 +02:00
Laurent Destailleur
302dd3e43d
Merge pull request #17238 from dolibit-ut/patch-275 
Update agenda.php
 2021-04-13 15:41:35 +02:00
Anthony Berton
5fec4c346e Update index.php 2021-04-13 15:28:16 +02:00
Anthony Berton
68e46515a4 Update index.php 2021-04-13 13:54:37 +02:00
altairis-noe
14c93d14e4 whitespace correction 2021-04-13 11:39:12 +02:00
altairis-noe
a95911e096 stickler corrections 2021-04-13 11:21:41 +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
Laurent Destailleur
0d136d6806 Enhance barcode scanner tool 2021-04-13 10:24:57 +02:00
Alexandre SPANGARO
f66ec58865 Fix travis error 2021-04-12 22:06:44 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
Alexandre SPANGARO
4b9bf40a8f move include_once to include when it's a tpl 2021-04-12 21:25:58 +02:00
stickler-ci
6724fb7ba0 Fixing style errors. 2021-04-12 17:37:21 +00:00
UT from dolibit
bae363cf0c
Update agenda.php 
$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda';

llxHeader('', $title, $help_url);
 2021-04-12 19:35:14 +02:00
altairis-noe
0965f28bf7 a pinch of jquery to display only what we need when we need it 2021-04-12 17:56:57 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
81487d76b2 Clean code of ol deprecated option 2021-04-12 15:37:26 +02:00
altairis-noe
beecc6f935 Merge branch 'product_masks' of github.com:altairisfr/dolibarr into product_masks 2021-04-12 14:13:37 +02:00
altairis-noe
a61c1f8807 checkboxes for custom masks 2021-04-12 14:01:36 +02:00
Christophe Battarel
855e736d32
Merge branch 'develop' into product_masks 2021-04-12 11:42:23 +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
a50b0e7441 Debug inventory module 2021-04-09 13:15:27 +02:00
Laurent Destailleur
06a7b8f5cb
Merge pull request #17159 from Hystepik/develop#1 
Close #17145 : add link to autofill with expected qty
 2021-04-09 12:50:33 +02:00