Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,935 Commits 3 Branches 0 Tags 1 GiB
9a7e9d902d
Commit Graph

5471 Commits

Author SHA1 Message Date
Ankush Menat
6d6616dbcd
fix: always update item_name for stock entry (#31068) 
If item_name is already set and for some reason becomes outdated then
it's not updated in backend.

Fix: always set item_name and stock_uom when fetching item details
 2022-05-19 14:25:47 +05:30
Ankush Menat
3714e36b44
fix: disable pricing rules for internal transfers (#31034) 
* fix: disable pricing rules for internal transfers

* fix: only apply validation on internal transfers

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* fix: internal_party_field undefined

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-05-16 18:09:14 +05:30
Marica
06c036f49f
Merge pull request #30834 from ankush/transfer_precision 
fix: precision loss when transferring
 2022-05-16 16:00:06 +05:30
Ankush Menat
6bd1cb9235 fix: remove item attribute limit from variant selector 2022-05-16 12:28:52 +05:30
Ankush Menat
80d959c579
fix: dont fail repost for recoverable errors (#30979) 
recoverable erros:
1. timeout
2. lock/deadlocks
 2022-05-16 11:23:35 +05:30
Deepesh Garg
34de20f6ee
Merge pull request #30987 from ankush/internal_transfer_with_margin 
fix: prevent bypassing forced valuation rate
 2022-05-15 20:49:55 +05:30
Ankush Menat
b08180092e
fix(patch): avoid checking for return field if it doesnt exits (#30995) 
fix(patch): avoid checking for qty field if it doesnt exits
 2022-05-13 11:55:47 +05:30
Ankush Menat
ee0a277540 fix: prevent bypassing forced valuation rate 
if you edit "margin_rate_or_amount" after saving DN then based on
selected margin the rate gets updated which isn't valuation rate.
 2022-05-12 19:01:26 +05:30
Marica
5b8c7438cc
Merge pull request #30945 from ankush/stock_analytics_fix 
fix: stock analytics report shows incorrect data there's no stock movement in a period
 2022-05-12 12:26:54 +05:30
Ankush Menat
b1c90e9949 fix: stock transfer value when precision differs 2022-05-12 11:09:30 +05:30
Marica
3d96ad2afa
Merge pull request #30950 from marination/actual-qty-total-js-reactive 
fix: Set actual qty and basic rate in SE on warehouse triggers (`get_warehouse_details`)
 2022-05-11 20:13:54 +05:30
Ankush Menat
2f1d118f36 fix: disable serial no scanning for picklist 
Current design of picklist doc doesn't have "picked serial no" so it
doesn't make much sense to scan it. Instead it should increment qty
only. Might add this in future after fixing UX problems
 2022-05-11 18:56:22 +05:30
Ankush Menat
372d2d870e fix: better message for picked qty shortfall 2022-05-11 18:43:10 +05:30
Ankush Menat
d3121fd845 fix(UX): hide scan section for non-draft docs 2022-05-11 18:40:44 +05:30
Ankush Menat
a4f0be6c5e Merge branch 'develop' into feat-picklist-scan 2022-05-11 18:38:53 +05:30
Marica
d024f72ab8
Merge branch 'develop' into actual-qty-total-js-reactive 2022-05-11 18:02:20 +05:30
marination
4fa15b50ca test: Test for mapped SE and fix for failing tests 
- Remove `set_missing_values` from mapper util function since a lot of item data is set after this function is run
- `split_batch` can skip `set_missing_values` since no warehouses are set on mapping and relies on user input
 2022-05-11 17:58:48 +05:30
Sagar Sharma
1a70701eca
fix: per_billed for return DN (#30868) 
* fix: per_billed for return DN

* chore: move patch from v14 to v13
 2022-05-11 16:49:28 +05:30
marination
90a8e924f5 fix: set_missing_values in SE and re-use the same on all SE mappings 
- `set_missing_values` in SE will set actual qty, transfer qty and calculate rate/amount
- Re-use `set_missing_values` wherever SE is doc is being mapped
 2022-05-11 14:54:22 +05:30
Ankush Menat
f6d6463a33 chore: fifo queue vs qty after transaction comparison report 2022-05-11 14:43:03 +05:30
Ankush Menat
198b91f8d4 fix: only carry-forward balances till today's period 
Showing data in future doesn't make sense. Only carry-forward till last
bucket that contains today's day.
 2022-05-10 15:38:02 +05:30
Ankush Menat
287b255ad6 fix: batch_no doesn't maintain qty_after_transaction 2022-05-10 15:38:02 +05:30
Ankush Menat
6ab0046e9c fix: consider previous balance is missing 
Also remove `total`, total of total is a meaningless value.
 2022-05-10 15:38:02 +05:30
Ankush Menat
d81422fb58 test: basic test for stock analytics report 2022-05-10 15:38:02 +05:30
Ankush Menat
d25841369d
Merge pull request #30913 from ankush/against_voucher_processing 
fix: double future qty updates
 2022-05-10 14:46:37 +05:30
marination
a65b20d976 style: Spaces to Tabs 
(cherry picked from commit a2fff8741e7ea928c4152d8f867db3ef9eb08b19)
 2022-05-09 13:32:45 +00:00
marination
9fd673e498 fix: Remove commit from stock entry test. The assertion is not important 
(cherry picked from commit c449b35cc11615fc7d9e616c2038b9e90c3957d6)
 2022-05-09 13:32:44 +00:00
marination
64f3b4d68b fix: Wrap SLE actual_qty in flt to avoid NoneType operation 
- Since Batch cancellation SLEs do not set qtys (will fix separately), `merge_similar_entries` gets `actual_qty` as None
- This causes NoneType operation error on tests that cancel batch-serial reco
- Modified tests to avoid using commit and rollback explicitly

(cherry picked from commit d53228b153437f9dedcb1229bf579411f3122729)
 2022-05-09 13:32:43 +00:00
marination
de3d90c5ab fix: Item Alternative Test 
(cherry picked from commit 964de1fc69b32d377f8c2a6f15d6ab7381669606)
 2022-05-09 13:32:42 +00:00
marination
14ea40d270 chore: Tests for Stock Reconciliation 
(cherry picked from commit 5bc5af1066e0bb4bead98598ed4bf9911d340734)
 2022-05-09 13:32:41 +00:00
marination
3bc3cf34eb chore: Tests for Stock Entry 
(cherry picked from commit a144548db95ec829b953ca6305fe898b1a9cdeb0)
 2022-05-09 13:32:40 +00:00
marination
577df1753e fix: Unlink and delete batch created from stock reco on cancel 
(cherry picked from commit fc353231065f1c33890d5b7e55c2e4e2506d986d)
 2022-05-09 13:32:37 +00:00
Ankush Menat
7e2fbc050a fix: sort before picking next stock reco 2022-05-09 13:16:02 +05:30
marination
1ce45f623e fix: Set actual qty and basic rate in SE on warehouse triggers (get_warehouse_details) 
- set `actual_qty` on source and target warehouse change
 2022-05-09 13:00:00 +05:30
Ankush Menat
ae842d8145 chore: remove datettime formatting from debug report 
This hides some information that would otherwise help during debugging
 2022-05-09 11:29:00 +05:30
Ankush Menat
7c839c4503 fix: double future qty updates 
update_qty_in_future_sle is reprocessing rows which are already
processed by process_sle_against_current_voucher
 2022-05-09 11:28:21 +05:30
Devin Slauenwhite
e9cf5cb4b0 feat: add prompt qty flag to pick list 2022-05-05 10:47:06 -04:00
Ankush Menat
d48ab81622 fix: auto-fulfill picking list when not in scan mode 2022-05-04 12:43:31 -04:00
Devin Slauenwhite
7ae89dedd5 fix: cleanup dont_allow_new_row logic 2022-05-04 11:06:16 -04:00
Devin Slauenwhite
4a19c1c19d Revert "fix(test): manually select picked_qty since before_submit validates qty instead of auto filling it" 
This reverts commit c2335ec0
 2022-05-04 10:29:52 -04:00
Devin Slauenwhite
5d8e3f264c Merge branch 'feat-picklist-scan' of /home/devin/repos/erpnext into feat-picklist-scan 2022-05-03 16:28:54 -04:00
Devin Slauenwhite
c2335ec0d8 fix(test): manually select picked_qty since before_submit validates qty instead of auto filling it 2022-05-03 16:28:28 -04:00
Devin Slauenwhite
afb841c771
Merge branch 'develop' into feat-picklist-scan 2022-05-03 11:15:42 -04:00
Ankush Menat
59a5090843
fix(UX): misleading stock entry lables (#30870) 
* fix(UX): misleading stock entry lables

* chore: field labels

[skip ci]

Co-authored-by: Marica <maricadsouza221197@gmail.com>

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-05-02 15:11:14 +05:30
Rushabh Mehta
548afba8bb
fix(minor): update frappe.error_log to new API (#30864) 
* fix(minor): update frappe.error_log to new API

* refactor: changes for updated log_error api

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-05-02 15:04:26 +05:30
Ankush Menat
dcda55641b
fix: convert default_item_manufacturer to link field (#30835) 2022-05-02 13:58:22 +05:30
Deepesh Garg
19d66e5219 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_consistency 2022-04-30 22:15:27 +05:30
Devin Slauenwhite
5ff471e22f fix: linter 2022-04-29 16:39:33 -04:00
Devin Slauenwhite
fa1378dd49 fix: prevent user from proceeding without all qty picked. 2022-04-29 16:38:52 -04:00
Devin Slauenwhite
5f8f83c6d8 fix: warn user pick list is not complete instead of auto fulfilling picked_qty. 2022-04-29 16:28:49 -04:00