Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,663 Commits 3 Branches 0 Tags 1 GiB
745f7bc5f0
Commit Graph

5223 Commits

Author SHA1 Message Date
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