Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,262 Commits 3 Branches 0 Tags 1 GiB
0328874018
Commit Graph

5523 Commits

Author SHA1 Message Date
Deepesh Garg
e4e38ad60b
Merge branch 'develop' into sales_purchase_retrun_optimization 2022-03-13 12:45:10 +05:30
mergify[bot]
b085e96a12
revert: "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount" (#29782) (#29807) 
* Revert "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount"

This reverts commit 038f94955006c88209f9df28e3a785c59a4ddb28, reversing
changes made to c7b491843476bca89be02851ccafb7e409876609.

* fix: linter

(cherry picked from commit 7fa46f77e0bdbc516b3c0cb0fb20594ee7fa398b)

# Conflicts:
#	erpnext/patches.txt

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2022-03-11 18:28:50 +05:30
Ankush Menat
472fe8e319 test: submit PR directly 2022-03-10 18:08:29 +05:30
Ankush Menat
7dd10367f4 fix: only update valuation rate if not None 2022-03-10 18:08:29 +05:30
Ankush Menat
73901aad6f fix: handle duplicate bins during item merge renames 2022-03-10 17:01:22 +05:30
Ankush Menat
b4d4ae6aa3 test: refactor item merge test and disable commits 2022-03-10 17:01:22 +05:30
Ankush Menat
4126455975
fix: dont reset UOM in MR on every get_item_detail call (#30164) 2022-03-10 15:43:09 +05:30
Deepesh Garg
a5befb6bf8 fix: Update modified timestamp 2022-03-10 14:18:54 +05:30
Himanshu
5193a63781
fix: do not reset asset_category (#29696) 2022-03-10 13:43:35 +05:30
Deepesh Garg
395b15058c fix: Sales and Purchase retrun optimization 2022-03-10 10:50:03 +05:30
Chillar Anand
fe4b6771b5
refactor: Remove dead code (#30140) 2022-03-09 17:16:05 +05:30
Ankush Menat
64905188c4
fix: dont fetch entire barcode table in get_item_details (#30131) 2022-03-09 15:37:14 +05:30
Deepesh Garg
e829f65fde
Merge pull request #30102 from deepeshgarg007/pick_list_query 
fix: Ambigous column in picklist query
 2022-03-09 10:17:26 +05:30
mergify[bot]
7a3d30161f
fix: translate error message titles (#30105) 
(cherry picked from commit 456ebc32f00be56cc9972cc76ac412776581060a)

Co-authored-by: Türker Tunalı <turker.tunali@gmail.com>
 2022-03-08 10:42:30 +05:30
Deepesh Garg
d9d4c2ce79 fix: Remove unintentional changes 2022-03-08 07:56:44 +05:30
Deepesh Garg
517fbf1d1f fix: Ambigous column in picklist query 2022-03-07 22:31:42 +05:30
Marica
7579981fb5
Merge pull request #29987 from marination/mr-to-order-and-receive-report 
fix: Get MRs that are yet to be received but fully ordered in Report `Requested Items to Order and Receive`
 2022-03-07 10:18:28 +05:30
Saqib Ansari
cd2513ceec
Merge pull request #29939 from nextchamp-saqib/ordered-qty-for-packed-items 
feat: update ordered qty for packed items
 2022-03-02 17:10:20 +05:30
Ankush Menat
55a966ec41
chore: get stock reco qty from SR instead of SLE (#30059) 
[skip ci]
 2022-03-02 14:49:45 +05:30
Ankush Menat
701878f60b revert "fix: FIFO valuation in case of multi-item entries" 
This reverts commit b8ee193d1a124668691b3d8181ce4e3bf612afe0.

This is huge performance regression for large docs.
 2022-03-02 13:11:04 +05:30
Ankush Menat
2f71c5bcca test: repack FIFO rates 2022-03-02 13:11:04 +05:30
Ankush Menat
ccd2ce56b1 fix: FIFO valuation in case of multi-item entries 2022-03-02 13:11:04 +05:30
Ankush Menat
b3b7cdfb49 test: FIFO transfer for multi-batch transaction 2022-03-02 13:11:04 +05:30
Ankush Menat
5d85b35f41 test: fix flaky bin value test 2022-03-02 12:32:54 +05:30
Ankush Menat
eb8495a401 docs: explain make_sl_entries arguments 2022-03-02 12:27:18 +05:30
Ankush Menat
efc4b943f8 fix: ignore serial no during landed cost voucher 2022-03-02 12:27:18 +05:30
Marica
e0d5c6118f
Merge branch 'develop' into mr-to-order-and-receive-report 2022-03-02 12:14:50 +05:30
Saqib Ansari
89f87cee87
Merge branch 'develop' into ordered-qty-for-packed-items 2022-03-02 12:13:56 +05:30
marination
e6952cb7f9 refactor: Convert to QB, added test file, removed white space 
- Converted mysql raw query to qb
- Test file for Report Requested Items to Order and Receive
- Removed white space and edited copyright year
 2022-03-01 17:15:04 +05:30
Ankush Menat
d22a1d440c fix: track changes on warehouse 2022-03-01 13:08:25 +05:30
Ankush Menat
b0d1e6db54 test(refactor): use FrappeTestCase 2022-02-28 17:23:32 +05:30
Ankush Menat
3cc47d5ba5 fix: correct fieldname for source warehouse 2022-02-28 13:06:56 +05:30
Ankush Menat
0bed592777 fix: open stock entry instead of submitting from item dashboard 2022-02-28 13:06:56 +05:30
Ankush Menat
88a21ca7d2 fix: only show child warehouses for transfer 2022-02-28 13:06:56 +05:30
Deepesh Garg
1b186682ea Merge branch 'develop' of https://github.com/frappe/erpnext into grant_commission_check 2022-02-28 12:42:21 +05:30
Saqib Ansari
cde711151e
Merge branch 'develop' into ordered-qty-for-packed-items 2022-02-28 11:35:42 +05:30
Sagar Sharma
77ffcd3aed
fix(ux): make "allow zero valuation rate" readonly if "s_warehouse" is set (#29681) 
* chore: make allow zero valuation rate readonly if s_warehouse is set

* fix: setting the checkbox to zero whenever the source warehouse is set

* fix: remove allow_on_submit and refresh trigger

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-02-26 11:25:02 +05:30
Deepesh Garg
0373914704 fix: Commission not applied while making Sales Order from Quotation 2022-02-24 14:42:56 +05:30
Marica
4d8d4acec4
Merge pull request #29913 from marination/item-merge-bundles 
fix: Block merging items if both have product bundles
 2022-02-23 16:59:22 +05:30
marination
a33f04ea41 fix: Check if both old and new items have bundles before merging 
- If only one has bundle against it, they can be merged
 2022-02-23 16:26:20 +05:30
Marica
8b1ef7bcc6
Merge pull request #29964 from marination/fox-flaky-stock-reports-test 
chore: Rollback after each test, due to premature commit via `remove_user_permission`
 2022-02-23 15:18:39 +05:30
marination
5ff3705872 test: Make Variant if absent in test_variant_work_order, keep test atomic 2022-02-23 14:54:16 +05:30
Ankush Menat
9c7df2eec5 fix: ignore duplicates explicitly 2022-02-23 14:27:45 +05:30
marination
bf8743713d chore: Rollback after each test, due to premature commit via remove_user_permission 
- `remove_user_permission` in `test_warehouse_user` calls delete_doc that enqueues dynamic link deletion
- Execution of background job eventually commits
- While in the test suite it runs sequentially in the same thread and commits whatever was done until then
- Which is why the rollback in `tearDownClass` is quite useless here
- This premature commit causes many illegal transactions caught by `assertRaises` to be committed in the db
- This creates faulty/dirty ledgers and breaks reports, as outiside the test suite this shouldn't/wouldn't happen
- Rollback after each test, and for `test_warehouse_user` in particular, manually cancel transaction
 2022-02-23 14:03:48 +05:30
Marica
0fde2f522e
Merge branch 'develop' into item-merge-bundles 2022-02-23 00:28:51 +05:30
Ankush Menat
5d403449bd
test: move report tests to subttest (#29945) 
Basically failfast=False but for sub-tests
 2022-02-22 19:24:49 +05:30
Saqib Ansari
3ee1383802
Merge branch 'develop' into ordered-qty-for-packed-items 2022-02-22 18:45:31 +05:30
Ankush Menat
745f7bc5f0
docs: add human readable specifications for stock ledger (#29308) 
* docs: add human readable specifications for stock ledger

* docs: reposting technical implementation notes
 2022-02-22 17:03:11 +05:30
Ankush Menat
7f55226a58
fix: remove customer field value when MR is not customer provided (#29938) 2022-02-22 16:55:43 +05:30
Saqib Ansari
8005fee656 feat: update ordered qty for packed items 2022-02-22 15:06:19 +05:30
Ankush Menat
9661058cc7 fix: only set batchwise valuation flag if new batch 2022-02-21 19:04:10 +05:30
Ankush Menat
af9fa049c7 fix: batchwise valuation can only be used by FIFO/LIFO 2022-02-21 18:02:40 +05:30
Ankush Menat
75fb561698 test: force correct flag in test data 2022-02-21 18:02:40 +05:30
Ankush Menat
f38690f703 fix: check if Moving average item can use batchwise valuation 2022-02-21 18:02:40 +05:30
Ankush Menat
6b0bc35063 test: mixed moving average items 2022-02-21 18:02:40 +05:30
Ankush Menat
609d2fccad fix: reset stock value if no qty 2022-02-21 18:02:40 +05:30
Ankush Menat
35483242b3 fix: extend round_off_if_near_zero fix to other methods 2022-02-21 18:02:40 +05:30
Ankush Menat
76b395d62e test: old/new mix batches valuation consumption 2022-02-21 18:02:40 +05:30
Ankush Menat
b1555fd477 chore: batch flag and consumption rate in invariant report 2022-02-21 18:02:40 +05:30
Ankush Menat
b534fee2c7 refactor: use queue difference instead of actual values 2022-02-21 18:02:40 +05:30
Ankush Menat
aba7a7ce4e fix: handle negative inventory inside a batch 2022-02-21 18:02:40 +05:30
Ankush Menat
d7ca83ef0b refactor: code duplication for fallback rates 2022-02-21 18:02:40 +05:30
Ankush Menat
c5bd34d238 test: multi-batch stock entry 2022-02-21 18:02:40 +05:30
Ankush Menat
60b8bae85f test: batch wise valuation for transfer and intermediate 2022-02-21 18:02:40 +05:30
18alantom
683ef8a603 test: more tests for batchwise valuation 
Co-Authored-By: Ankush Menat <ankush@frappe.io>
 2022-02-21 18:02:40 +05:30
Ankush Menat
d130233ffc test: fix expected test failures 2022-02-21 18:02:40 +05:30
Ankush Menat
102fff24c8 refactor: convert query to QB and make creation optional 2022-02-21 18:02:40 +05:30
Ankush Menat
ab926521bd fix: correct incoming rate for batched items 2022-02-21 18:02:40 +05:30
Ankush Menat
342d09a671 feat: get_valuation_rate batch wise 
This function is used to show valuation rate on frontend and also as
fallback in case values aren't available. Add "batch_no" param to get
batch specific valuation rates.

Co-Authored-By: Alan Tom <2.alan.tom@gmail.com>
 2022-02-21 18:02:40 +05:30
Ankush Menat
ce0514c8db feat: batch wise valuation rates 
start with most used case: negative inventory isn't enabled

- simple addition of qty and value when new batch qty is added
- fetch outgoing rate from stock movement of specific batch
 2022-02-21 18:02:40 +05:30
18alantom
f4af75f60b feat: batchwise valuation flag 
This is required to avoid breaking behaviour in valuation
of old batches
 2022-02-21 18:02:40 +05:30
Ankush Menat
00e8565868 fix: round off increments in numeric item variant 2022-02-21 17:42:34 +05:30
marination
530f9f7029 test: Item Merging with Product Bundles 2022-02-21 16:48:04 +05:30
marination
28cc2dbb72 fix: Block merging items if both have product bundles 2022-02-21 16:14:40 +05:30
Marica
d1a283fd79
Merge branch 'develop' into repack-entry-stock-ageing 2022-02-18 18:54:23 +05:30
marination
d5be536740 test: Negative Stock, over consumption & over production with split rows, balance precision 2022-02-18 18:53:05 +05:30
marination
ed4a6c6cc6 fix: Range Qty precision 2022-02-18 18:52:42 +05:30
marination
d3fbbcfed3 fix: Precision of available qty and negative stock in transfer bucket 
- Maintain only positive values in transfer bucket
- Use it to neutralize/add stock to fifo queue
 2022-02-18 16:33:28 +05:30
Ankush Menat
d9fc3f3d90 test: putaway rule re-application shouldn't do anything 2022-02-17 12:26:51 +05:30
Ankush Menat
b000e93744 fix: avoid updating items table if no change due to putaway 2022-02-17 12:26:51 +05:30
Marica
c3c9a8d445
Merge branch 'develop' into so-mr-wo-back-update 2022-02-16 13:39:58 +05:30
Marica
201a38bfbf
Merge branch 'develop' into item-variants-perf 2022-02-16 13:03:32 +05:30
marination
f6233e77c6 chore: Add transfer bucket working to .md file 2022-02-15 20:30:16 +05:30
marination
ea3b7de867 test: Stock Ageing FIFO buckets for Repack entry with same item 2022-02-15 18:41:42 +05:30
marination
799671c748 fix: Transfer Bucket logic for Repack Entry with split batch rows 2022-02-15 18:41:08 +05:30
marination
18731622c4 fix: Update SO via Work Order made from MR (attached to SO) 
- Add SO Item reference in WO from MR (that was made from SO)
 2022-02-15 12:50:56 +05:30
Ankush Menat
1e9766433a
fix: get_item_details overrides parentype (#29799) 2022-02-15 10:57:06 +05:30
Marica
cd728fc9e7
Merge branch 'develop' into fifo-slot-by-wh 2022-02-14 20:42:57 +05:30
marination
f221a0d253 test: Cover back to back recos from different warehouses 2022-02-14 20:14:14 +05:30
Saqib Ansari
3713ae75ab fix: incorrect pricing rule filtering on selecting first item 2022-02-14 13:31:37 +05:30
Ankush Menat
eb8b424722
feat: item-wise negative stock setting (#29761) 2022-02-12 13:08:28 +05:30
marination
f62b3207ff fix: Generate Wh wise FIFO Queue and later aggregate if required 
- Back to back stock recos cause incorrect qty calculation across warehouses
- Hard to differentiate how much of the qty is reset by the reco
- Maintain Queue and balances warehouse wise and later aggregate for accurate values
 2022-02-11 18:14:28 +05:30
Ankush Menat
77be98295c fix: update bin modified timestamp when updating qty 
These timestamps are used for writing integrations hence whenever bin is
updated timestamp should update to reliabily use Bin for integration
logic.
 2022-02-11 11:54:58 +05:30
Ankush Menat
1553fa9c90 refactor!: drop deprecated and dead code 2022-02-11 11:23:37 +05:30
Ankush Menat
2abc1c244e
Merge pull request #29715 from aaronmenezes/fix_reserved_for_production_calc 
fix: Reserved for Production calculation considered closed work orders
 2022-02-09 15:59:52 +05:30
Ankush Menat
a8bf3a3f0d refactor: move reserve quantity computation to work order 2022-02-09 11:26:03 +05:30
aaronmenezes
6a8b7eeffe fix: Reserved for Production calculation considered closed work orders 2022-02-08 19:25:49 +05:30
Ankush Menat
befcca4183
Merge branch 'develop' into lifo_valuation 2022-02-08 17:38:06 +05:30
Bhavesh Maheshwari
3969840ee8 fix: ignore rate validation for work order 
(cherry picked from commit f29aed7f7130b805810075db1e5e1003e997bef8)
 2022-02-08 14:01:41 +05:30
marination
a64228741d fix: Trim spaces from attributes (multi-variant creation) & explicit method for building cache 
- Multiple Item Variants creation fails due to extra spaces in attributes from popup. Clean them before passing to server side
- Mention explicit method to build variants cache to avoid ambiguity between old method path (pre-refactor)
 2022-02-08 11:15:19 +05:30
Mohammed Yusuf Shaikh
a3e69cf75d
feat: Bulk Transaction Processing (#28580) 
* feat: Bulk Transaction Processing

* fix: add flags to ignore validations and exception handling correction

* fix: remove duplicate code, added logger functionality and improved notifications

* fix: linting and sider issues

* test: added tests

* fix: linter issues

* fix: failing test case

* fix: sider issues and test cases

* refactor: mapping function calls to create order/invoice

* fix: added more test cases to increase coverage

* fix: test cases

* fix: sider issue

* fix: rename doctype, improve formatting and minor refactor

* fix: update doctype name in hooks and sider issues

* fix: entry log test case

* fix: typos, translations and company name in tests

* fix: linter issues and translations

* fix: linter issue

* fix: split into separate function for marking failed transaction

* fix: typos, retry failed transaction logic and make log read only

* fix: hide retry button when no failed transactions and remove test cases not rrelevant

* fix: sider issues and indentation to tabs

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-02-08 01:00:37 +05:30
Deepesh Garg
2280ae5554
Merge pull request #29549 from frappe/mergify/bp/develop/pr-29290 
fix: billed amount in delivery note items (backport #29290)
 2022-02-07 23:49:19 +05:30
Deepesh Garg
529cc72863
Merge pull request #29656 from ankush/credit_debit_pr 
fix: dont ignore items that dont have SVD
 2022-02-07 23:46:07 +05:30
Ankush Menat
f82d7eb73f test: commit item/warehouse creation to db 2022-02-07 22:55:56 +05:30
Ankush Menat
43f8ee1dd1 chore: drop dead field from stock reconciliation 2022-02-07 22:55:56 +05:30
Ankush Menat
699519f7b6 test: product bundle reposting 2022-02-07 22:55:56 +05:30
Ankush Menat
853e658dcc test: move bundle info to class variables 2022-02-07 22:55:56 +05:30
Ankush Menat
1022db0474 fix: merge stock ledger item warehouse with doc's 2022-02-07 22:55:56 +05:30
Ankush Menat
5e6227e3d8
fix(ux): make stock entry type the title field (#29674) 2022-02-07 13:19:08 +05:30
Umair Sayed
104a55aff1
feat: Tab views in Stocks and Accounts Settings (#29638) 
* tab views in Stocks and Accounts Settings. Clean-up in Selling and Buying Settings.

* chore: undo changes to creation timestamp

happened because of a bug in fw

Co-authored-by: Umair Sayed <umairsayed@Umairs-MacBook-Air-2.local>
 2022-02-07 10:42:55 +05:30
Ankush Menat
f089d39675 refactor: better method name 
Co-authored-by: gavin <gavin18d@gmail.com>
 2022-02-06 20:12:15 +05:30
Ankush Menat
3e5f940686 test: e2e test for LIFO valuation 2022-02-06 20:12:15 +05:30
Ankush Menat
61c5ad44d3 refactor: get incoming fifo/lifo rate functions 
Re-use same logic for computing incoming rate.
 2022-02-06 20:12:15 +05:30
Ankush Menat
97e18a1cd0 feat: allow selecting LIFO valuation 2022-02-06 20:12:11 +05:30
Ankush Menat
9c49d2d3aa feat: LIFOValuation class for handling LIFO 2022-02-06 20:12:11 +05:30
Ankush Menat
b855030e7c refactor: valuation class to allow extending 2022-02-06 20:12:11 +05:30
Ankush Menat
d1f5753885 test: check when PR moves stock from neg to pos 2022-02-05 23:35:28 +05:30
Ankush Menat
c88c368880 fix: dont ignore items that dont have SVD 
When items go from negative to positive stock value diff can be zero but
item might have taxes / need divisional loss adjustment.
 2022-02-05 22:54:18 +05:30
Ankush Menat
69c65afd72 test: regression test for LCV GL entries 2022-02-05 20:58:56 +05:30
Ankush Menat
8858c703a8 fix: ignore cancelled svd while updating GLE for PR 
This happens because LCV cancels and reposts entries so unless filtered
by non-cancelled entries you can randomly get old values.
 2022-02-05 20:58:56 +05:30
marination
bd41a99c8a fix: Regenerate packed items on newly mapped doc 
- Cannot determine action on newly mapped DN that hasnt been inserted
- Rows could have been deleted, updated, added, etc. before first save
- In this case , reset packing table
 2022-02-04 22:06:56 +05:30
Marica
79ab8e6459
Merge pull request #29456 from marination/product-bundle-packing-list-logic 
fix: Incorrect packing list for recurring items & code cleanup
 2022-02-03 22:09:52 +05:30
Ankush Menat
04f6426dbf
feat: show stock value difference in stock ledger report (#29607) 2022-02-03 17:14:57 +05:30
marination
f18ec2d947 fix: (Linter) import sequence 2022-02-03 17:07:11 +05:30
Marica
e9fc6c3249
Merge branch 'develop' into product-bundle-packing-list-logic 2022-02-03 17:02:57 +05:30
marination
4e7b4dc9a8 test: Packed Items test file 2022-02-03 17:01:33 +05:30
Marica
780e29b42e
Merge branch 'develop' into e-commerce-refactor-develop 2022-02-02 10:45:14 +05:30
Deepesh Garg
528c71382f
feat: Provisional accounting for expenses (#29451) 
* feat: Provisonal accounting for expenses

* fix: Method for provisional accounting entry

* chore: Add test case

* fix: Remove test case

* fix: Use company doctype

* fix: Add provisional expense account field in Purchase Receipt Item

* fix: Test case

* fix: Move provisional expense account to parent

* fix: Patch
 2022-02-01 14:42:55 +05:30
marination
2933cf243a fix: Failing test, sider and linter 
- Remove unused imports
- fix test `test_product_list_attribute_filter_builder`
 2022-02-01 12:08:33 +05:30
Sagar Sharma
ce0b84f54d refactor: use frappe.qb instead of sql 
(cherry picked from commit 0a9ec9f591f8b4d0e630a3c902b69c9996f080dd)
 2022-02-01 05:39:39 +00:00
Sagar Sharma
b50036c04a fix: consider returned_qty while updating billed_amt 
(cherry picked from commit 63aaa1e357280b24c537a502a479f7bb7a6654e4)
 2022-02-01 05:39:37 +00:00
marination
7bc087ed44 fix: Merge conflicts, Linter and Server Test 
- Resolve inconsistency due to conflict with https://github.com/frappe/erpnext/pull/27050
- Resolve Linter issues (imports and spaces)
- Include customer_reviews.js in bundle, move it to /public/js
 2022-02-01 10:51:50 +05:30
marination
9fb61efba8 chore: Fix imports and formatting (linter) & Sider (unused import) 2022-02-01 00:54:54 +05:30
Ankush Menat
6cd7c47409 Merge branch 'develop' into e-commerce-refactor-develop 2022-01-31 17:14:36 +05:30
Ankush Menat
a254201696
chore: revert manual handling of stock level section (#29537) 2022-01-31 15:37:19 +05:30
Ankush Menat
a1e7771cdd fix: ignore None item/wh whie updating reservation 2022-01-30 18:43:02 +05:30
Ankush Menat
08810dbcce fix: add unique constraint on bin at db level 2022-01-30 18:42:59 +05:30
Ankush Menat
b20df3745e refactor: reusable clean_serial_nos 2022-01-29 14:01:21 +05:30
marination
2f4d266ee1 refactor: Price fetching and updation logic 
- fetch price from price list, use item master valuation rate as fallback fo0r packed item
- use a item code, item row name map to maintain cumulative price
- reset table if item in a row is replaced
- loop over items table only to set price, lesser iterations than packed items table
 2022-01-28 19:03:40 +05:30
marination
2c14ab0439 chore: Break updation logic into smaller functions 
- Smaller functions for updation
- All calls visible from parent function to avoid context switching due to nested calls
 2022-01-28 13:25:55 +05:30
mergify[bot]
0dafa8a12a
fix: stock ledger rendering glitch 
undefined Issue

(cherry picked from commit f38004219518e901eb736780b181c19fe88ce823)

Co-authored-by: smehata <53169014+smehata@users.noreply.github.com>
 2022-01-27 20:23:24 +05:30
marination
4c677eafe9 fix: Linter and minor code refactor 
- Create an indexed map of stale packed items table to avoid loops to check if packed item row exists
- Reset packed items if row deletion takes place
- Renamed functions to self-explain them
- Split long function
- Reduce function calls inside function (makes it harder to follow through)
 2022-01-26 01:10:24 +05:30
Ankush Menat
f5f3552abb test: cover more reports in test 2022-01-25 23:22:14 +05:30
marination
f8a5786542 chore: SQL to QB & accomodate Update Items 
- `doc_before_save` does not exist via Update Items (updates stuff in the backend so doc isn't considered unsaved/dirty)
- converted more raw sql to qb and ORM
 2022-01-25 19:51:47 +05:30
marination
3f48fc1898 fix: Incorrect packing list for recurring items & code cleanup 
- Fix Incorrect packing list for recurring items in the Items table
- Re-organised functions based on external use and order of use
- Deleted `clean_packing_list` function and reduced no.of loops
- Raw SQL to QB
- Minor formatting changes
 2022-01-25 18:38:41 +05:30
rohitwaghchaure
19b1b7f8cc
Merge pull request #29419 from rohitwaghchaure/fix-incorrect-rm-qty-in-stock-entry 
fix: incorrect raw materials quantity in manufacture stock entry
 2022-01-24 12:13:54 +05:30
Rohit Waghchaure
f8d232ac26 fix: incorrect raw materials quantity in manufacture stock entry 2022-01-24 11:35:06 +05:30
mergify[bot]
8e3cd1ab31
fix: Don't delete barcode while saving Item (#29411) (#29417) 
(cherry picked from commit 096e7b9ec5e3b67983cfa3a06335fba435f88c97)

Co-authored-by: Britlog <info@britlog.com>
 2022-01-23 17:04:55 +05:30
Saqib Ansari
58cc3b32fa
Merge pull request #29334 from nextchamp-saqib/grouped-asset-purchase 2022-01-21 15:33:13 +05:30
Ankush Menat
4fa93e246e test: create and cancel sr no with stock reco 2022-01-21 15:27:10 +05:30
Ankush Menat
33c4a0b5a9 fix: bad default for non-existing serial nos 
serial_no field should have empty string if it doesn't have any serial
nos
 2022-01-21 15:27:10 +05:30
Saqib Ansari
a09259f175
Merge branch 'develop' into grouped-asset-purchase 2022-01-21 14:20:27 +05:30
Noah Jacob
20216fa9f1
fix: updated packed_items getting fetched on Sales Return / Credit Note (#28607) 
* fix: updated packed_items getting fetched on sales return

* fix: updated test cases for product bundle returns

* fix: moved calculate_mapped_packed_items_return to stock.utils

* fix: updated packed_items getting fetched on Return/Credit Note

* refactor: change var name to avoid `self`

* fix: check item code before assigning parent item

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-21 11:50:13 +05:30
Saqib Ansari
35a6b58c12 feat: purchase grouped asset 2022-01-18 13:10:23 +05:30
Ankush Menat
fabe0bce15
fix: enable allow negative stock by default in reposts (#29331) 
Negative stock validation is done BEFORE reposting as such it's not
required to be performed again and most likely this fails on old
intermediate data where user has no clue why it failed.
 2022-01-18 11:48:44 +05:30
Marica
dbda10e092
Merge pull request #28987 from ankush/fix/srvaluation 
fix: incorrect serial no valuation
 2022-01-17 16:55:21 +05:30
Ankush Menat
3db8d908dc
Merge pull request #29278 from shariquerik/update-workspace-json 
fix: Updating public workspace json based on new design
 2022-01-17 13:25:16 +05:30
rohitwaghchaure
9088984481
Merge pull request #29304 from ankush/fix/zero_valued_reposts 
fix: dont update sle values from get_gl_entries
 2022-01-17 11:59:17 +05:30
Ankush Menat
66bf21f143
fix(patch): sle.serial_no = "\n" causes incorrect queue (#29306) 
This happens due to old data.
 2022-01-16 20:45:59 +05:30
Ankush Menat
82ea958730
fix: ignore cancelled SLEs (#29303) 2022-01-16 20:19:04 +05:30
Ankush Menat
5d27a7672e test: serial no valuation test case 2022-01-16 17:54:12 +05:30
Ankush Menat
0272397e54 test: make sure zero incoming rate is maintained while consuming 2022-01-16 13:24:40 +05:30
Ankush Menat
b0cf6195e9
fix: only add stock queue if FIFO (#29302) 2022-01-16 13:02:23 +05:30
Ankush Menat
b9642a1036 fix: incorrect incoming rate computation for sr no 2022-01-16 12:39:34 +05:30
Dany Robert
2b681f04fd
fix: exclude existing serial numbers while auto creating new #29292 
fix: exclude existing serial numbers while auto creating new
 2022-01-15 20:08:11 +05:30
Shariq Ansari
bc187c121a fix: updated standard workspace json files 2022-01-13 19:24:11 +05:30
marination
c49dff385a test: Check for FinishedGoodError if 0 FG in repack entry 2022-01-13 15:02:59 +05:30
marination
3922a39591 test: Basic test one item repacked into two 
- Also run fg validation and fg marking after checking purpose, avoid unnecessary calls
 2022-01-13 14:36:21 +05:30
marination
eac7b5d5aa fix: Allow multiple fg in repack entry 2022-01-13 13:44:20 +05:30
Ankush Menat
eb8d08b411 fix: remove all stock UOM conversion when changing stock UOM 2022-01-12 19:41:28 +05:30
Marica
efcfb825d7
Merge pull request #29257 from marination/fix-reset-wh-defaults 
fix: Avoid resetting Default wh fields for Manufacture Entry
 2022-01-12 16:44:33 +05:30
rohitwaghchaure
71466c6456
Merge pull request #29179 from rohitwaghchaure/fixed-incorrect-scrap-qty-in-manufacture 
fix: incorrect scrap item qty
 2022-01-12 13:13:30 +05:30
Rohit Waghchaure
8f0b2fa90e fix: incorrect scrap item qty 2022-01-12 11:30:20 +05:30
Marica
b5abf68b0d
Merge branch 'develop' into e-commerce-refactor-develop 2022-01-12 02:52:03 +05:30
Ankush Menat
24fc487dd8
fix: incorrect serial no valuation report showing cancelled entries (#29172) 2022-01-06 17:03:34 +05:30
Subin Tom
7385497219 fix: using get_batch_qty method to get available_qty 2022-01-03 16:57:00 +05:30
Subin Tom
267da48889 fix: added Sum() in query 2022-01-03 16:40:11 +05:30
Saqib Ansari
568550874d
Merge branch 'develop' into pos-batch-no-stock-validation 2022-01-03 14:46:29 +05:30
rohitwaghchaure
f02e6b4631
fix: incorrect posting time fetching incorrect qty (#29103) 2022-01-03 14:28:34 +05:30
Ankush Menat
087ebcae5a
Merge pull request #29014 from ankush/rename_sr_no 
fix!: disable renaming on serial nos
 2021-12-28 15:34:50 +05:30
Marica
02b9541b43
Merge branch 'develop' into independent-manu-entry 2021-12-28 13:26:00 +05:30
marination
22809a2838 fix: Avoid Impact on Repack Entry 
- Repack entries must be considered for fg/scrap checkbox auto set
- This must be avoided only for Manufacture entries, due to confusion between scrap and fg
- No scrap in repack, so its straight forward
 2021-12-28 13:23:27 +05:30
marination
7d0340e660 fix: Sider 2021-12-28 13:06:35 +05:30
marination
6ca978c18b fix: Linter (extra line after import) 2021-12-28 11:46:46 +05:30
marination
098f72e7ec test: Stock Ageing FIFO Slot generation 2021-12-28 02:33:54 +05:30
Marica
0eb38a4b13
Merge branch 'develop' into stock-ageing-negative-stock 2021-12-28 01:29:01 +05:30
marination
c007f84ade chore: Added .md file to explain stock ageing business logic 2021-12-28 01:27:24 +05:30
marination
878fd377c2 chore: Use frappe.qb for query 2021-12-27 21:09:05 +05:30
Deepesh Garg
ab09dc545e fix(UX): Optimize rate updation of changing price list 
(cherry picked from commit 6087d5a6038d6e636ce1ba006ebd59e820b3cd8e)
 2021-12-24 14:03:47 +00:00
Ankush Menat
7987a46509
chore: add running stock value difference in invariant report (#29012) 
[skip ci]
 2021-12-23 21:13:22 +05:30
Ankush Menat
db7aef2fef
style: better labels for SLE fields (#28988) 
* style: better labels for SLE fields

* style: rename stock queue field

[skip ci]

Co-Authored-by: marination <maricadsouza221197@gmail.com>
 2021-12-21 17:39:27 +05:30
Saqib
7f786e44a1
Merge branch 'develop' into pos-batch-no-stock-validation 2021-12-21 17:05:43 +05:30
Marica
d7c4b8a383
Merge branch 'develop' into independent-manu-entry 2021-12-21 12:55:12 +05:30
marination
24a35c69c0 fix: Sider and Server side test 
- args passed to wrong function
- missing space around '='
 2021-12-21 12:52:03 +05:30
Ankush Menat
d7148adee5
test: remove unnecessary creation of companies #28965 
test: remove unnecessary creation of companies
 2021-12-20 22:00:31 +05:30
Marica
d209e5d6c5
Merge branch 'develop' into independent-manu-entry 2021-12-20 21:55:38 +05:30
marination
8951a5c267 fix: Linter (imports) 2021-12-20 21:53:47 +05:30
marination
0f43792dbb fix: Stock Ageing Report - Negative Opening Stock 
- Consider negative opening stock in logic and neutralise it with +ve stock
- minor code refactor: class for FIFOSlots to generate chronological FIFO queue
 2021-12-20 21:33:59 +05:30
Ankush Menat
2bb7bca464 test: bin qty on backdated SR 2021-12-20 20:05:49 +05:30
Ankush Menat
ff9a6e8e89 fix: correct bin qty on backdated transactions 
When making a backdated transactions current balance qty depends on
evaluation of whole ledger inbetween, instead of doing that just fetch
the last sle's qty_after_transaction when future transactions are
detected against SLE

fix: don't update bin's actual_qty

1. it's already updated by repost_current_voucher
2. update if future sle exists
 2021-12-20 20:05:49 +05:30
Ankush Menat
f5d5281119 chore: drop deprecated qunit tests 2021-12-20 17:03:10 +05:30
Ankush Menat
107b404105 chore: rename FifoValuation to FIFOValuation 2021-12-20 13:20:03 +05:30
Ankush Menat
745caf911a perf: specify slots on FIFO queue 2021-12-20 13:20:03 +05:30
Ankush Menat
aa0e163b1f test: hypothesis tests for FIFO queue 2021-12-20 13:20:03 +05:30
Ankush Menat
9d177433cb fix: return consumed bin on collapsing queue 2021-12-20 13:20:03 +05:30
Ankush Menat
a00d8d02b2 refactor: outgoing rate and defaults for remove_stock 2021-12-20 13:20:03 +05:30
Ankush Menat
db1c0889d3 feat: get consumed bins from Fifo queue on pop 2021-12-20 13:20:03 +05:30
Ankush Menat
1833f7ab81 test: FifoValuation tests 2021-12-20 13:20:03 +05:30
Ankush Menat
e6e679cf7a fix: round off if near zero while popping from queue 2021-12-20 13:20:03 +05:30
Ankush Menat
a71b476652 feat: repr, eq and iter for fifo queue 2021-12-20 13:20:03 +05:30
Ankush Menat
4b29fb6d08 refactor: move Fifo Valuation to a new class 2021-12-20 13:20:03 +05:30
Ankush Menat
6ba8f7644d
chore: ledger invariant check report (#28921) 2021-12-16 22:31:31 +05:30
Subin Tom
68beee2a00 fix: replaced sql query with frappe.qb 2021-12-16 13:26:21 +05:30
Subin Tom
9f235526d4 fix: Validation in POS for item batch no stock quantity 2021-12-15 22:34:44 +05:30
DeeMysterio
2be62c279f
feat: provision to have limited parameters for in-process quality ins… (#28549) 
* feat: provision to have limited parameters for in-process quality inspection

* chore: formatting
 2021-12-15 19:41:30 +05:30
Ankush Menat
228e011819
perf: remove forcing of posting sort index on stock balance (#28902) 
mysql is generally smart enough to figure out which index is better
based on cardinality of index. While posting sort index is better for
low item high # of SLE scenario it's bad for high item variety each with
lower count of SLEs.
 2021-12-15 19:18:41 +05:30
Saqib
56bc8a52f4
Merge branch 'develop' into home-onboarding 2021-12-15 10:40:40 +05:30
Ankush Menat
66960cf050
fix: remove set only once from valuation method (#28876) 2021-12-14 17:12:46 +05:30
Ankush Menat
80f1a8c645
fix: incorrect logic for "Reserved Qty for Production" (#28880) 
* fix: reservation for production incorrect

The query uses case to decide what fields to compute reservation on,
this case is outermost case hence the very first Work order's "Skip
transfer" is considered for ALL work orders.

Solution: move the case inside Sum.

Steps to reproduce:
1. Make work order for more than 1 qty (with | without skip transfer)
2. Create manufacture and transfer entries.
3. Keep checking reserved quantities during this process.

* test: use default warehouse for testing reservation
 2021-12-14 17:02:42 +05:30
aaronmenezes
304aa44feb
fix: Nonstock item showing in Itemwise Recommended Reorder Level report (#28873) 2021-12-14 15:18:03 +05:30
Ankush Menat
534c64abcd
fix: packing slip incorrect item value (#28862) 2021-12-14 11:55:09 +05:30
Jannat Patel
74d086ffd1
Merge branch 'develop' into home-onboarding 2021-12-13 17:51:38 +05:30
Ankush Menat
75bc404cbe test: stock frozen validation 2021-12-10 12:39:38 +05:30
Ankush Menat
d37541d3fb fix: ensure that reposting is finished before freezing stock/account 2021-12-10 12:31:49 +05:30
Sagar Sharma
6485ac4e59
fix: misleading "Set Default X" fields after saving (#28798) 
* fix: misleading "Set Default X" fields after saving

* refactor: remove unncessary code and minor formatting

* fix: extend to more doctypes and correct fieldnames

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-12-09 17:04:00 +05:30
Ankush Menat
c64d5028b4
fix: deduplicate after finishing the repost (#28803) 
Not really a bug but avoids potential of prematurely skipping something
if failure occurs and failure isn't resolved.
 2021-12-09 13:45:44 +05:30
Ankush Menat
96a019ec49 test: add multi-batch negative qty test 2021-12-08 15:52:40 +05:30
Ankush Menat
f0152d03a4 test: simplfy test and expect specific exception 2021-12-08 15:52:40 +05:30
Ankush Menat
9c90b7a40d refactor: remove redundant batch qty validation 
This check was only checking total sum, which is problamatic when making
backdated entries that can cause intermediate values to go negative
while overall values stay positive.
 2021-12-08 15:52:40 +05:30
Ankush Menat
5eba57528c fix: check future negative stock for batches 
batch's ledger is only maintained in form of `actual_qty` on batch's
SLEs. To validate if batch has any negative qty in future, cumulative
total of `actual_qty` is required to ensure it never goes negative.
 2021-12-08 15:52:40 +05:30
18alantom
1cbeba5f1d test: check execution of illegal stock entry seq 2021-12-08 15:52:40 +05:30
Ankush Menat
ca230e4267
test: index test should pass without calling function #28771 
test: index test should pass without calling function

[skip ci]
 2021-12-07 15:11:31 +05:30
rohitwaghchaure
fc4e6a2bed
Merge pull request #28710 from noahjacob/calc_outgoing_stock_entry 
fix: incorrect outgoing rates when material_consumption enabled
 2021-12-04 12:34:33 +05:30
Ankush Menat
ba5a7ffd60 fix: weird item sorting by idx 2021-12-03 19:08:06 +05:30
Ankush Menat
5caf411be3 fix: remove autocommit from item rename 2021-12-03 18:47:53 +05:30
Ankush Menat
72dbc3d6b8 fix!: dont allow renaming warehouse primary key 2021-12-03 18:47:53 +05:30
Noah Jacob
35346de162 test: added tests for manufacture stock entry when material_consumption is enabled 2021-12-03 17:21:49 +05:30
Noah Jacob
7f3e6d149a fix: incorrect outgoing rates when material_consumption enabled 2021-12-03 15:11:18 +05:30
Ankush Menat
cef84c25a7 refactor: simplify the way SLEs are submitted 2021-12-03 14:51:25 +05:30
Ankush Menat
97060c45e9 refactor: replace misleading variable name 2021-12-03 14:51:25 +05:30
Ankush Menat
a37c99a23d
fix: dont requeue repost immediately and clear progress (#28684) 2021-12-02 14:51:04 +05:30
Jannat Patel
427938f87b fix: new item form tour for home onboarding 2021-12-02 11:25:47 +05:30
Ganga Manoj
dc3449c304
Merge branch 'develop' into product-bundle-fixes 2021-12-01 23:27:40 +05:30
Sagar Vora
ab280f7142
fix: update modified timestamp for delivery note #28657 
fix: update `modified` timestamp for delivery note
 2021-12-01 11:01:49 +05:30
GangaManoj
a473e1dbe9 fix: Add item to packing list 2021-12-01 01:29:35 +05:30
Raffael Meyer
e10ab1626c
feat: Grant commission on certain items only (#27467) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-11-30 17:54:18 +05:30
Ankush Menat
aeb62af544 fix(ux): remove attachment limits 2021-11-30 12:46:53 +05:30
Saqib
c0cc72ec1d
fix: incorrect discount amount set when item is replaced (#28556) 2021-11-29 15:05:06 +05:30
Ankush Menat
c7701ace80 chore: correct docstrings 2021-11-29 13:04:29 +05:30
Ankush Menat
f862339024 fix: use get_all instead of get_list for child tables 2021-11-29 13:04:29 +05:30
Jannat Patel
8cc1dc8079
Merge branch 'develop' into home-onboarding 2021-11-29 10:24:06 +05:30
Ankush Menat
69a17b9e51
refactor: move Bin queries to qb/orm (#28522) 2021-11-27 20:07:02 +05:30
Noah Jacob
7ff30a4b2b
fix: incorrect balance for warehouses (#28583) 2021-11-26 17:33:57 +05:30
marination
dfff972a78 fix: Linter (imports) 2021-11-26 13:29:05 +05:30
Marica
26207d9517
Merge branch 'develop' into independent-manu-entry 2021-11-26 13:20:33 +05:30
marination
affb29194b test: Independent Manufacture Entry 
- Check validations
- Check if FG basic rate is calculated correctly
 2021-11-26 13:19:04 +05:30
Ganga Manoj
a1055d6bd3
Merge branch 'develop' into product-bundle-fixes 2021-11-25 20:00:30 +05:30
Ankush Menat
87f2dcfb59
fix: total stock summary UI glitch #28564 
fix: total stock summary UI glitch
 2021-11-25 19:38:44 +05:30
Ankush Menat
ed94f0f3f2 refactor: deduplicate during repost background job 2021-11-25 16:37:19 +05:30
Ankush Menat
55631dd0d6 test: item-wh deduplication in reposting 2021-11-25 16:37:19 +05:30
Ankush Menat
0d0e24a5f5 perf: skip unnecessary item-wh reposts 
Using basic idea that repost with older posting date will also take care
of subsequent posting dates...

When Item-WH reposts are queued:

1. If another repost with same item-wh but older posting date exists
    then skip current one.
2. If another repost with same item-wh but newer posting date exists
    then skip another one.
 2021-11-25 16:37:19 +05:30
Ankush Menat
1d3842f03a fix: dont erase voucher_type and voucher_no for item_wh repost 
kept for tracability.
 2021-11-25 16:37:19 +05:30
Ankush Menat
a5a8c9104f perf: index for item-sh on repost item valuation 
Item-WH based reposting requires querying existing similar repost.
Assuming there is only 1 max extra entry with same params just indexing
item-WH is sufficient to speed up the query.
 2021-11-25 16:37:19 +05:30
Ankush Menat
45dd46be3d feat: option to select reposting method 
In current implementation selecting Item-Warehouse based reposting is
better for few users, who don't use depenent SLEs but have frequent
transactions involving same items.

This change lets them switch to item-warehouse based reposting if
required.

Only use this if you understand technicalities of stock reposting. This
is experimental but will become mainstream in coming days.
 2021-11-25 16:37:19 +05:30
Ankush Menat
a36c249d3d test: item-wh repost creation 2021-11-25 16:37:19 +05:30
marination
8c9779d69d fix: Dont auto set is finished item or is scrap itm checkbox for independent entry 
- System cant differentiate between scrap and FG when WO is absent, so dont auto set
- User must set it manually
- `validate_finished_goods` checks this
 2021-11-25 13:23:10 +05:30
marination
d6bc121999 fix: Validate Finished Goods for Independent Manufacture entries as well 
- Check if FG exists even if WO is absent
- Check if multiple FGs are there, block.
 2021-11-25 13:18:58 +05:30
GangaManoj
8370042f82 fix: Reset indices in the Packed/Bundle Items table on deleting Product Bundles 2021-11-24 21:06:23 +05:30
Jannat Patel
5b2ba24563 fix: company tour 2021-11-24 19:19:45 +05:30
Saqib
136dd4f801
Merge branch 'develop' into product-bundle-fixes 2021-11-24 11:27:12 +05:30
GangaManoj
0803f87660 fix: Fix Product Bundle price calculation when there are multiple Product Bundles 2021-11-24 06:07:58 +05:30
Ankush Menat
0df9cf9526
chore: remove dead/irrelevant links from workspace (#28519) 
* chore: remove dead link to shopify settings

* chore: unlink "debug" reports from stock dashboard
 2021-11-23 15:08:51 +05:30
Ankush Menat
c436e30ee6 fix: don't use cached doc while reposting 2021-11-22 12:40:18 +05:30
Ankush Menat
aa024fc9da fix: ignore permissions while creating repost 
If user reached this code then they already have permission to create
stock transaction, hence ignore permission checks while
creating/cancelling repost item valuation entries.
 2021-11-22 12:40:18 +05:30
Ankush Menat
42f1dd98dd fix: restrict repost valuation to manager roles 2021-11-22 12:40:18 +05:30
marination
23486a929d fix: (style) Warehouse Capacity Dashboard UI 
- Made refresh button icon visible
- Edit Capacity button size and alignment
- Medium font on dashboard
 2021-11-17 14:21:37 +05:30
Marica
612bb5c749
Merge branch 'develop' into se-required-items-from-jc 2021-11-16 18:03:40 +05:30
marination
1bb135b2d3 fix: Sider and CI 
- Incorrect path and Settings in price_list.py import due to merge
- Extra space removed in website_item.py
- Changed client side namespace to `erpnext.e_commerce.*`
 2021-11-16 17:23:39 +05:30
marination
9aeb211142 chore: Remove Home Page is Products and Sider fixes 
- Removed `Home Page is Products` checkbox in E Comm Settings. Can be manually set in Website Settings
- Removed hooks trigger to reset home page as products
- Sider: duplicate color attribute, shift `return` to next line, over-indentation
 2021-11-16 17:21:46 +05:30
marination
80fbe16be8 test: Product Query & Filter Engine, Item Group Page 
- Test for ProductQuery engine and ProductFilters engine
- Test for engine for Item Group too
- Renamed ‘product_configurator’ to ‘variant_selector’
- Cleaned up filters.py
- Modal freeze backdrop lighter only in cart, since there’s nothing over it
- Fixed unusual spacing in variant selector dialog
- Made `get_child_groups_for_website` more readable
- Replaced ‘Configure’ with ‘Select’ for variant selection
 2021-11-16 17:21:17 +05:30
marination
4d254a7ad3 test: Website Item (Item full page) 
- Tests for website item. Desk tests and portal tests
- Allow guests on method `get_offer_details`
- Fetch stock details only if `show_stock_availability` is enabled
- Validation for duplicate web items on item merge
- Separate method for `validate_properties_before_merge`
- Common error title and exception `DataValidationError` for merge validations on Item
 2021-11-16 17:10:07 +05:30
marination
3fd929c4ee test: Website Item basic test & removed product configurator tests 
- Sider fixes: missing semicolons
- Added two basic tests for Website Item
- Commented Product Configurator tests, needs to re-written fully
 2021-11-16 17:09:34 +05:30
marination
64322199df fix: Remove Website Item from Item Dashboard 
- Install breaks on CI, will add later
 2021-11-16 17:03:58 +05:30
marination
16abfd4410 fix: Sync Website Items on Item Change, Short Website Description 
- Added Short Description in Website Item for List View
- Update Website Item on Item info change
- Un-publish Web Item if Item is disabled
- Removed unnecessary dependency on Item from query engine
- Rearranged item detail fields in Website Item
- Added Link to Website Item on Item Dashboard
 2021-11-16 16:55:12 +05:30
marination
f9929ed8a6 Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop 2021-11-16 16:06:07 +05:30
Marica
4afcbfdc08
Merge branch 'develop' into pr-return-ux 2021-11-16 15:15:48 +05:30
marination
293f6cbafd fix: Sider, Linter and Server Side Test 
- Fix Server side PR test
- linter: re-arrange imports
- sider: avoid single line multi statement
- Code cleanup: Improve code readability and avoid horizontal scroll in test_purchase_receipt
- Removed unused variables in test_purchase_receipt
 2021-11-16 14:36:15 +05:30
Ahmed Shareef
952fc87c99
refactor: fix help section background in dark mode (#28406) 2021-11-16 14:30:13 +05:30
Ankush Menat
ed99aca36f test: basic test for serialize reco cancel 2021-11-16 10:00:18 +05:30
Ankush Menat
8c85012a70 fix: can not cancel stock reconciliation with sr no 2021-11-16 10:00:18 +05:30
Rohan
043e3255d6
fix: remove item-item group name validation (#28392) 2021-11-15 19:41:17 +05:30
Ankush Menat
7fcaeca403 fix: don't make naming series mandatory for items 
Item variants are an exception, hence this needs to be checked
conditionally.
 2021-11-15 18:18:22 +05:30
marination
05ec7cce82 test: Purchase Receipt Received Qty 2021-11-15 17:49:14 +05:30
marination
afe1c45f7f fix: Sider + Fields UX 
- remove extra space (sider)
- PR: Bring rejected qty in grid view
- PI: Rename `Stock Qty` to `Accepted Qty in Stock UOM`
- PI: Move `Accepted Qty in Stock UOM` under Stock UOM
 2021-11-15 17:17:29 +05:30
Marica
18f9e3558e
Merge branch 'develop' into se-required-items-from-jc 2021-11-11 11:14:37 +05:30
Ankush Menat
12e81df2b7 fix: default value for allow neg stock in repost_item_valuation 
Negative stock can be toggled back after queuing transactions, this
causes failure when repost is executed.

Now allow_negative_stock stock is set at time of queuing the repost job.
This means setting changes done afterwards won't affect already
submitted reposts.
 2021-11-10 13:05:14 +05:30
Ankush Menat
e498389b00 fix: ignore cancelled entries in incorrect balance qty report 2021-11-10 12:09:51 +05:30
Ankush Menat
fdfa39c231 fix: avoid mutating iterator while iterating over it 2021-11-09 18:04:50 +05:30
Marica
031178224f
Merge branch 'develop' into se-required-items-from-jc 2021-11-09 17:33:20 +05:30
marination
e8d0c25dff fix: Partial Trabsfers against JC 
- Fixed transferred qty not back updating on JC if partial transfer
- Partial transfer not mapping pending qty from JC correctly in SE
- tests for above cases
- minor code cleanup
 2021-11-09 17:29:29 +05:30