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
Devin Slauenwhite
2554cdceeb
revert: scan_mode flag
2022-04-29 13:45:59 -04:00
Devin Slauenwhite
24d8f62b21
revert: barcode scan field from pick list item.
2022-04-29 13:40:48 -04:00
Devin Slauenwhite
8053f2dbcd
feat: increment picked_qty on scan_barcode
2022-04-27 22:10:15 -04:00
Devin Slauenwhite
e04fbb6a99
feat: pick list scan fields
2022-04-27 22:02:04 -04:00
Ankush Menat
777f0204dd
test: create new item instead of using with _Test Item ( #30827 )
...
Unnecessary dependency causes flake in stock. The test was reposting all
entries for item just to test some behavior that is best tested on a
newly created item _anyway_.
2022-04-27 17:47:40 +05:30
Ankush Menat
ebd5f0b1bb
chore: make picked qty read only
2022-04-27 14:53:20 +05:30
Ankush Menat
8207697e43
fix: compare against stock qty while validating
...
Other changes:
- only allow whole number of bundles to get picked
2022-04-27 12:51:18 +05:30
Ankush Menat
9e60acdf56
test: test bundle - picklist behaviour
2022-04-27 12:05:15 +05:30
Ankush Menat
ee54ece8fd
test: product bundle fixture
2022-04-27 12:05:15 +05:30
Ankush Menat
1ac275ce61
feat: transfer picklist stock info to packing list
2022-04-27 12:05:15 +05:30
Ankush Menat
41aa4b3524
fix: round off bundle qty
...
This is to accomodate bundles that might allow floating point qty.
2022-04-27 12:05:15 +05:30
Ankush Menat
25485edfd9
refactor: remove unnecssary vars
...
also remove misleading docstring
2022-04-27 12:05:15 +05:30
Ankush Menat
23cb0d684d
feat: create DN from pick list with bundle items
2022-04-27 12:05:15 +05:30
Ankush Menat
f574121741
refactor: simpler check for non-SO items
2022-04-27 12:05:15 +05:30
Ankush Menat
277b51b404
refactor: groupby using keys instead of int index
2022-04-27 12:05:15 +05:30
Ankush Menat
3ddad6891a
refactor: simplify needlessly complicated code
2022-04-27 12:05:15 +05:30
Ankush Menat
60bc26fdbe
feat: back-update min picked qty for a bundle
2022-04-27 12:05:15 +05:30
Ankush Menat
c3fc0a4f55
perf: single update per Sales Order.
...
For each SO item the sales order picking status was being updated, this
isn't required and wasteful.
2022-04-27 12:05:15 +05:30
Ankush Menat
e64cc66df7
refactor: sales order status update
...
- rename badly named variables
- support updated packed items
2022-04-27 12:05:15 +05:30
Ankush Menat
36c5e8a14f
feat: Pick list from SO with Product Bundle
2022-04-27 12:05:15 +05:30
Ankush Menat
7d5682020a
test: bundles in picklist
2022-04-27 12:05:15 +05:30
Ankush Menat
5c3f9019cc
refactor: misc pick list refactors
...
- make tracking fields read only and no-copy 🤦
- collapse print settings section, most users configure it once and
forget about it, not need to show this.
- call pick list grouping function directly
- use get_descendants_of instead of obscure db function
2022-04-27 12:05:15 +05:30
marination
e2a163d4e9
fix: Use account_type == 'Stock'
to filter stock accounts
2022-04-26 17:50:51 +05:30
marination
44331f4f1f
chore: Warn users about multiple warehouse accounts
...
- Get distinct accounts that warehouse value has been booked against
- If same account as the one being set, ignore
- If not same account or multiple accounts: warn user that it makes it harder to track mismatches
2022-04-26 17:43:33 +05:30
Deepesh Garg
00ace8f62c
Merge branch 'develop' into accounting_dimension_consistency
2022-04-26 14:26:08 +05:30
Deepesh Garg
82a0635c66
fix: Consistent accounting dimensions across Sales and Purchase docs
2022-04-26 14:01:13 +05:30
Ankush Menat
7e555d3d8c
fix: item price query for postgres
...
postgres doesn't like bad type comparisons and doesn't have `isnull`
funciton
2022-04-26 11:47:02 +05:30
Ankush Menat
7d2587c0a9
fix: nullish check and table name
2022-04-26 11:03:32 +05:30
Ankush Menat
ce75fe0ec4
fix: out of range date value
2022-04-26 11:03:32 +05:30
Ankush Menat
e1c1687661
refactor: use db agnostic CombineDatetime
2022-04-26 11:03:32 +05:30
Ankush Menat
d6a43a39ae
test: tie breaking in SLEs ( #30796 )
...
[skip ci]
2022-04-25 11:46:01 +05:30
Ankush Menat
d5ab626a31
Merge pull request #30726 from ankush/dependent_gle_reposting
...
fix: dependent gle reposting
2022-04-21 18:06:40 +05:30
Ankush Menat
ee3036651a
fix: batch_no filtering not working when batch no is also a number in scientific notation ( #30770 )
...
[skip ci]
2022-04-21 16:34:31 +05:30
Ankush Menat
9734329094
test: discard local future SLE cache between tests
2022-04-19 17:40:28 +05:30
Ankush Menat
b24920c0e9
fix: correct sorting while updating bin
2022-04-19 17:38:36 +05:30
Ankush Menat
d2882ea436
test: use disposable item codes in tests
...
dependency causes flake
2022-04-19 17:38:36 +05:30
Ankush Menat
8f519545b0
test: repost queue progress
2022-04-19 17:38:36 +05:30
Ankush Menat
ecdb49314f
fix: dependent GLE reposting
2022-04-19 17:38:36 +05:30
Ankush Menat
a2af2daca7
test: dependent GL entry reposting
2022-04-19 17:38:36 +05:30
Ankush Menat
afc5a55a23
refactor: repost error handling
2022-04-19 17:38:36 +05:30
Ankush Menat
9af2d68945
refactor: convert queries to ORM/QB, add types
2022-04-14 18:05:38 +05:30
Ankush Menat
ba29323e11
test: increase assertions to cover all cases
2022-04-14 18:05:38 +05:30
Ankush Menat
e278ee359a
test: item attribute columns
2022-04-14 18:05:38 +05:30
Ankush Menat
febc74a21b
refactor: rewrite stock balance query to QB
2022-04-14 18:05:35 +05:30
Ankush Menat
8a499e95d3
test: uom conversion in stock balance report
2022-04-14 18:01:43 +05:30
Ankush Menat
af0ea7b532
test: assert balanaces against SLE
2022-04-14 18:01:42 +05:30
Ankush Menat
f4766ae4eb
test: opening balance in stock balance report
2022-04-14 18:01:42 +05:30
Ankush Menat
8b2432dfa0
test: stock balance report tests
2022-04-14 18:01:42 +05:30
Ankush Menat
64ac22af82
refactor: add filter type info
2022-04-14 18:01:42 +05:30
Marica
87117313a1
Merge branch 'develop' into values-out-of-sync-jv
2022-04-14 13:41:27 +05:30
marination
d75d5ebe8d
chore: Remove Values Out of Sync from Repost hourly job
...
- It runs after repost (after commiting), so it has 0 impact on repost itself
- Just that scheduled job log shows up as failed, while actually repost is done and repost document is "Completed"
- The check is inaccurate also, so best to remove this
- Users cant do anything about it anyway. This just piles up phantom failed jobs unneccessarily
2022-04-14 12:30:06 +05:30
Deepesh Garg
065c38152a
Merge branch 'develop' of https://github.com/frappe/erpnext into item_wise_provisional_accounting
2022-04-14 12:04:21 +05:30
Deepesh Garg
ad171c6225
test: Update test case
2022-04-14 12:03:12 +05:30
Ankush Menat
79fbc2c504
test: flaky PR close test ( #30709 )
2022-04-13 20:42:25 +05:30
Deepesh Garg
3ce64170db
feat: Item-wise provisional accounting for service items
2022-04-11 14:35:22 +05:30
marination
dfff4beaf4
fix: Handle multiple item transfer in separate SEs against WO
...
- Check for pending qty in child items to show/hide "Start" button
- If no qty needed to transfer (FG qty is fulfilled), but RM qty pending: map pending in SE with For Quantity = 0
2022-04-11 14:10:57 +05:30
Ankush Menat
8138e53cf3
test: flaky picklist tests
2022-04-10 17:50:57 +05:30
Ankush Menat
af6b07f9b9
fix: block cancellation of SL/GL entries ( #30652 )
...
Individual GL/SLEs aren't supposed to be cancelled by users.
2022-04-08 18:05:04 +05:30
Ankush Menat
d74181630a
test: prevent cancelling RIV of cancelled voucher
2022-04-08 14:57:55 +05:30
Ankush Menat
a281998bcb
fix: prevent deleting repost queue for cancelled transactions
2022-04-08 14:57:55 +05:30
Ankush Menat
49560d20bc
fix: remove bad defaults from BOM operation ( #30644 )
...
[skip ci]
2022-04-08 11:23:02 +05:30
Ankush Menat
f1fd4e5c27
test: cant_change validations on item
2022-04-07 17:30:12 +05:30
Ankush Menat
fba68541d6
refactor(Item): linked doc checking
2022-04-07 17:30:12 +05:30
Ankush Menat
2f1e98d1e8
feat: show Stock Reconciliation links on item dashboard
2022-04-07 17:30:12 +05:30
Ankush Menat
be04eaf723
fix: warehouse naming when suffix is present ( #30621 )
2022-04-07 13:21:08 +05:30
Ankush Menat
e4c6d6a1a6
fix: strip html tags before checking for empty description ( #30619 )
2022-04-07 12:53:10 +05:30
Marica
ff7d81020c
Merge pull request #30578 from marination/e-com-acessibility
...
chore: Accessibility for E-commerce Doctypes
2022-04-05 18:11:59 +05:30
marination
d4301d6d2f
chore: Accessibility for E-commerce Doctypes
...
- Add Website Item routing button and dashboard link in Item master
- Group Item variant buttons together
2022-04-05 12:07:50 +05:30
Ankush Menat
a9811c601c
Merge pull request #30564 from rohitwaghchaure/fixed-rejected-warehouse-issue-for-pr
...
fix: if accepted warehouse not selected during rejection then stock ledger not created
2022-04-04 18:26:17 +05:30
Rohit Waghchaure
ac5df1abbe
test: test case to validate rejected qty without accepted warehouse
2022-04-04 17:57:57 +05:30
Ankush Menat
de83511091
fix(ux): refresh update to zero val checkbox ( #30567 )
2022-04-04 17:29:51 +05:30
Ankush Menat
12c01e2975
fix: maintain FIFO queue even if outgoing_rate is not found ( #30560 )
2022-04-04 15:22:15 +05:30
Ankush Menat
52eb0a93bb
Merge pull request #30528 from s-aga-r/is-subcontracted-fieldtype
...
refactor!: change "is_subcontracted" field type from "Select" to "Check"
2022-04-04 14:01:20 +05:30
Ankush Menat
a896895a9e
fix: bulk fix (~330) missing translations
2022-04-04 13:59:51 +05:30
Sagar Sharma
e80cd29d2e
Merge branch 'develop' into is-subcontracted-fieldtype
2022-04-04 13:31:46 +05:30
Ankush Menat
e8118fcdf1
fix: doctype layout based on expected tab-order
2022-04-04 12:06:35 +05:30
Ankush Menat
deca1aaf06
fix: dont fetch qty in reco if batch is required
2022-04-04 12:06:35 +05:30
Ankush Menat
f83a1c1989
fix: dont reset barcode in scan mode
2022-04-04 12:06:35 +05:30
Ankush Menat
1736ab57ac
feat: Barcode scanning in Stock Reconciliation
...
[skip ci]
2022-04-04 12:06:35 +05:30
Ankush Menat
c8ead0a7ab
fix: dont send empty serial no in get_item_details
...
[skip ci]
2022-04-01 21:11:03 +05:30
Ankush Menat
47f27a5171
refactor: move scan api to stock utils; add item_info
2022-04-01 21:11:03 +05:30
Ankush Menat
9bf427985f
fix!: remove barcode field triggers
...
use "scan barcode" field instead for scanning
[skip ci]
2022-04-01 21:11:03 +05:30
Ankush Menat
6c5b01c60d
perf: index barcode for faster scans ( #30543 )
2022-04-01 15:27:46 +05:30
Sagar Sharma
0a3cdc2623
chore: rename "is_subcontracted" field label to "Is Subcontracted"
2022-04-01 13:22:54 +05:30
Sagar Sharma
d074c93ac7
refactor!: change "is_subcontracted" field type from "Select" to "Check"
2022-04-01 13:22:44 +05:30
Rohit Waghchaure
2f51011f91
test: test case to check pick list name has mapped or not
2022-03-31 18:47:09 +05:30
Rohit Waghchaure
2f63ae2ee9
feat: minor, pick list item reference on delivery note item table
2022-03-31 18:43:42 +05:30
Ankush Menat
b981fae5a4
fix: remove naming series from bin, repost queue ( #30497 )
...
Removing naming series from:
1. Bin
2. Repost queue
These doctypes are not user facing and dont really need naming series.
Current implementation of naming makes stock transaction sequential if
these documents are to be created during submission.
2022-03-30 21:46:15 +05:30
Ankush Menat
8ab226a2fc
test: add class to uniquely id item dashboard ( #30487 )
2022-03-30 13:20:54 +05:30
Marica
7e719a12f1
Merge pull request #30377 from marination/stock-entry-items-idx
...
fix: Dont set `idx` while adding WO items to Stock Entry
2022-03-30 11:14:18 +05:30
Saqib Ansari
87dc9c6331
Merge pull request #30470 from nextchamp-saqib/fix-dn-credit-limit-validation
...
fix: credit limit validation in delivery note
2022-03-30 11:08:25 +05:30
Ankush Menat
b80fac03af
fix: validate 0 transfer qty in stock entry ( #30476 )
2022-03-29 17:19:22 +05:30
Ankush Menat
b12fe0f15b
fix: dont check for failed repost while freezing ( #30472 )
...
[skip ci]
2022-03-29 13:54:26 +05:30
Saqib Ansari
c122882884
fix: credit limit validation in delivery note
2022-03-29 13:36:00 +05:30
marination
639d380c1f
chore: Remove redundant idx query and value setting
...
- idx can be removed from `select_columns` as it is already in the main query
- setting idx to '' is not required as it is not used further
2022-03-28 21:00:00 +05:30
Ankush Menat
40d7418dca
Merge branch 'develop' into stock-entry-items-idx
2022-03-28 20:21:21 +05:30
Ankush Menat
494bd9ef78
style: format code with black
2022-03-28 18:52:46 +05:30
Ankush Menat
c34847e801
refactor: dont hardcode child table "items"
2022-03-28 12:07:00 +05:30
Ankush Menat
69ae2661d2
fix: update picked qty on cancellation
2022-03-28 10:43:32 +05:30
Ankush Menat
f06ef17b5d
fix: copy has_batch_no and has_serial_no while duplicating
2022-03-25 16:18:58 +05:30
Ankush Menat
f4b39b87e3
fix(UX): use autocomplete for variant fields
2022-03-25 16:18:58 +05:30
Saqib Ansari
9a0f5bff65
Merge branch 'develop' into fix-pos-issues-again
2022-03-25 10:52:08 +05:30
Ankush Menat
788d492757
test: basic item and wh capacity dashboard tests
2022-03-25 10:51:19 +05:30
Saqib Ansari
cb4873c019
fix: sider issues
2022-03-24 17:56:27 +05:30
Saqib Ansari
4aabe97565
Merge branch 'develop' into fix-pos-issues-again
2022-03-24 11:18:13 +05:30
marination
a787ebb732
fix: Dont set idx
while adding WO items to Stock Entry
...
- `idx` must be computed by base document's `self.append()` function, so do not set it
2022-03-23 14:59:27 +05:30
Deepesh Garg
3a1e31592e
Merge branch 'develop' into ignore_price_list
2022-03-23 09:27:44 +05:30
Deepesh Garg
66ca085e39
fix: Changing item prices on converting orders/receipts to invoices
2022-03-22 23:03:41 +05:30
Saqib Ansari
f2ae63cbfd
fix(pos): remove returned sr. nos. from pos reserved sr. nos. list
2022-03-22 17:41:49 +05:30
Ankush Menat
41db43cdc5
fix: consider full integer batch nos
2022-03-22 16:40:17 +05:30
Ankush Menat
a18c687844
fix: ignore already fetched serial no
...
exclude_sr_nos is sent as JSON string of list, so load it before
operating on it.
2022-03-22 16:40:17 +05:30
Ankush Menat
d3be84bfe8
test: correct use of test decorator
2022-03-21 15:40:34 +05:30
Ankush Menat
c2aad115c1
fix: disable deferred naming on SLE/GLE if hash method is used. ( #30286 )
...
* fix: dont rename GLE/SLE that dont have naming series
* test: tests for deferred naming of ledgers
2022-03-20 19:26:34 +05:30
HENRY Florian
ca8d757691
fix: clear "Retain Sample" and "Max Sample Quantity" in Item card if Has Batch No is uncheck ( #30307 )
2022-03-20 15:27:00 +05:30
Ankush Menat
4859574233
perf: Single query to delete bins instead of N
2022-03-19 20:55:27 +05:30
Ankush Menat
684d9d66d1
test: warehouse conversion and treeview test
2022-03-19 20:55:27 +05:30
Ankush Menat
953afda01b
refactor(warehouse): raw query to ORM
2022-03-19 20:55:27 +05:30
Ankush Menat
4b695915f4
refactor: Use QB for serial fetching query
2022-03-19 20:55:27 +05:30
Ankush Menat
a585dff6fd
refactor: batch no filter handling
2022-03-19 20:55:27 +05:30
Ankush Menat
b9eec331e3
test: auto serial fetching
2022-03-19 20:55:27 +05:30
Ankush Menat
4f8bb91eae
fix: sort serial nos before sending
2022-03-19 20:55:27 +05:30
Ankush Menat
0a533d6ccc
fix: skip already selected serials in sr selector
2022-03-19 20:55:27 +05:30
mergify[bot]
c2cbd407c1
fix: Allow on Submit for Material Request Item Required Date ( #30174 ) ( #30308 )
...
* fix: Allow on Submit for Material Request Item Required Date
* chore: whitespace
(cherry picked from commit cca9668309711bf3ca517726a94df547c5a16bbb)
Co-authored-by: Devarsh Bhatt <58166671+bhattdevarsh@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2022-03-19 20:31:06 +05:30
Ankush Menat
5a9bf9ffd6
fix: respect db multi_tenancy while fetching precision ( #30301 )
...
[skip ci]
2022-03-18 17:29:09 +05:30
rohitwaghchaure
da16ee159a
Merge pull request #30238 from KrithiRamani/bulk_create_PL_and_DN
...
feat: Create single PL/DN from several SO.
2022-03-17 15:39:45 +05:30
Ankush Menat
76187d175f
refactor: call repost directly during tests ( #30277 )
...
enqueue(now=frappe.flags.in_test) is always true in test, this change avoids
confusion.
2022-03-16 19:50:56 +05:30
Noah Jacob
2a0ca7c91a
refactor: removed unrequired code and test for standalone delivery note serial return ( #30276 )
2022-03-16 19:27:47 +05:30
Ankush Menat
b93ce78df1
chore: dont supress errors server side
...
not required after https://github.com/frappe/frappe/pull/16284
2022-03-16 17:50:34 +05:30
Krithi Ramani
a12895ec03
corrected spacing
2022-03-16 13:56:54 +05:30
Ankush Menat
b46d6e3c05
test: packed item return scenarios
2022-03-16 13:36:53 +05:30
Ankush Menat
b781e8b7d1
revert: "fix: updated packed_items getting fetched on Sales Return / Credit Note ( #28607 )"
...
This reverts commit 20216fa9f1
.
2022-03-16 13:36:53 +05:30
Krithi Ramani
0211f27e83
as per review comments - changed for loop
2022-03-16 12:28:30 +05:30
Krithi Ramani
e970616b51
removed semicolon for break statement
2022-03-15 21:52:34 +05:30
Krithi Ramani
f33a725a9e
fixed spacings
2022-03-15 15:35:51 +05:30
Deepesh Garg
07715118cf
Merge pull request #30206 from deepeshgarg007/implicit_pricing_rule_enable
...
fix: Do not update ignore prcing rule check implicitly
2022-03-14 21:46:24 +05:30
Ankush Menat
8e559f01c8
test: refactor BOM quality template test
2022-03-14 18:28:08 +05:30
Florian HENRY
9415229e8d
fix: BOM - clear Quality Inspection Template according to Inspection Quality Required
...
Squashed commit of the following:
commit b73fa210b234d2c8067db2c32f94f362b89afe5a
Author: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon Mar 14 08:30:24 2022 +0100
add json tes
commit 984d015a7d9aceb6ea64be7ed9f1cc0caa356714
Author: Florian HENRY <florian.henry@open-concept.pro>
Date: Mon Mar 14 08:30:06 2022 +0100
better test
commit 42061146658598da02eda7cb781bd2cf44c8ca34
Author: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri Mar 11 16:12:57 2022 +0100
update test
commit 6259c0957566600b044fcd4a5e14e69cdff71020
Author: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri Mar 11 13:59:13 2022 +0100
update test
commit cbc4ad9566f6f7f01dd622651458fea309d80954
Merge: faa44b3fdd 94d0f8d4e7
Author: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri Mar 11 12:46:48 2022 +0100
Merge branch 'develop' of https://github.com/frappe/erpnext into dev_fix_30190
commit faa44b3fdd983adfc04bbf04a7ebfef114501bb3
Author: Florian HENRY <florian.henry@open-concept.pro>
Date: Fri Mar 11 12:03:35 2022 +0100
fix: clear Quality Inspection Template according to Inspection Quality Required
2022-03-14 18:25:00 +05:30
Krithi Ramani
466df6bdb7
to enable selection of SO irrespective of customer,removed validation for customer
2022-03-14 17:29:02 +05:30
Krithi Ramani
61eb9b6c68
feat: Create single PL/DN from several SO. New PR from latest develop to avoid rebase
2022-03-14 17:20:49 +05:30
Ankush Menat
02d64a32c2
fix(ux): negative stock warning
2022-03-14 17:16:39 +05:30
Deepesh Garg
2b6e7963f6
Merge branch 'develop' into implicit_pricing_rule_enable
2022-03-14 15:49:21 +05:30
Noah Jacob
60c4593f7b
chore: removed unrequired batch_no parameter while fetching stock_balance
2022-03-14 15:36:56 +05:30
Noah Jacob
00797fa02d
test: checking balance serial nos in stock ledger report
2022-03-14 15:36:56 +05:30
Noah Jacob
e8ba1f4e74
fix: incorrect balance serial no in stock ledger report
2022-03-14 15:36:56 +05:30
Saqib Ansari
c1740ced97
fix: cannot create multicurrency sales order with product bundles ( #30166 )
2022-03-14 13:43:55 +05:30
Ankush Menat
91fd9d917a
test: negative fifo test
2022-03-14 10:25:18 +05:30
Ankush Menat
1a256c62c4
fix: attach sr no si standalone credit note
2022-03-13 19:00:34 +05:30
Deepesh Garg
96b5cedcf8
fix: Do not update ignore prcing rule check implicitly
2022-03-13 17:48:37 +05:30
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
Sagar Vora
3d45f3a6a8
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-03-03 10:20:50 +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
Sagar Vora
5159e2e6c5
refactor: remove India specific code
2022-02-25 11:36:18 +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
Anupam Kumar
092936d8ba
Merge branch 'develop' into manufacturing-work-order-stop
2021-11-09 10:51:09 +05:30
Anupam
663a7afe4d
fix: get_planned_qty chnages
2021-11-09 10:50:38 +05:30
marination
5fb5a757cf
refactor: (ux) Accepted/Rejected/Received Qty UX
2021-11-08 13:23:42 +05:30
mergify[bot]
c0b889b94d
fix: auto update price list rate ( #28255 ) ( #28256 )
...
* fix: auto update price list rate
* fix: hide field when auto insert isn't enabled
(cherry picked from commit bb3957eba35a5204a1a01e412dee596532bd525e)
Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>
[skip ci]
2021-11-07 17:42:51 +05:30
Ankush Menat
8fe5feb6a4
chore: remove all six compat code
2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9
chore: remove utf-8 compat code
2021-11-05 11:16:29 +05:30
mergify[bot]
25f647f067
fix: Bulk update of valid upto field wasn't working (bp #28242 )
...
* fix: Bulk update of valid upto field wasn't working
Check in dates for the price list was failing because valid_upto field was string. Converting to date fixed the problem.
* chore: extend fix and cleanup whitespace
Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 95a5ef1d416d54ecf0f557586b341b0dce2a0b05)
Co-authored-by: fatihustaoglu <46131068+fatihustaoglu@users.noreply.github.com>
2021-11-04 21:46:48 +05:30
Marica
51fb543f67
Merge branch 'develop' into se-required-items-from-jc
2021-11-08 18:05:11 +05:30
Noah Jacob
cb064b06ad
fix: added job_card_item link in material request ( #28222 )
...
* fix: added job_card_item links in material request
* fix: add no copy to row references
2021-11-03 11:53:57 +00:00
marination
3da03028f3
fix: Pull Items that are in JC in Stock Entry against JC
...
- Check if items pulled in stock entry are present in Job Card
- Code cleanup and removed redundant checks
Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
2021-11-03 17:05:57 +05:30
marination
48886ee705
chore: Add comment above fix for future reference
2021-11-02 15:57:41 +05:30
marination
048210a8f6
fix: Remove warehouse filter on Batch field for Material Receipt
2021-11-02 15:49:58 +05:30
Ankush Menat
1eab3a44f6
fix(ux): stock levels take time after item merge
...
Item merge creates a repost and depending on number of entries it can
take from 1 to n hours for it to finish. (depending upon queued up
reposts)
Added message so users don't feel confused till this operation is
finished.
2021-11-01 15:32:59 +05:30
Ankush Menat
f7ffe04a4b
fix: use warehouse to find company
2021-11-01 14:13:56 +05:30
Ankush Menat
a0727b2e82
fix: pass company while fetching valuation rate
...
If company is not supplied and valuation rate is 0, then default
company is used for checking if perpetual inventory is enabled or not.
This makes little sense as different companies can have different
setting for perpetual inventory.
2021-11-01 14:13:56 +05:30
Ankush Menat
ff9cfe0d14
fix: sort by creation to break tie
2021-10-29 16:56:15 +05:30
Ankush Menat
f4b60a48f5
refactor: simplify sr no fetching
2021-10-29 16:56:15 +05:30
Ankush Menat
2aa019ae4c
fix: fetch serial nos from ledger unconditionally
2021-10-29 16:56:15 +05:30
Noah Jacob
deb6b38fab
refactor: replaced db.sql with qb
2021-10-29 16:56:15 +05:30
Noah Jacob
b44945380d
fix: incorrect amount of serial_nos fetched
2021-10-29 16:56:15 +05:30
Ankush Menat
b01635e1da
refactor!: remove hub #28117
...
refactor!: remove hub
2021-10-28 14:07:15 +05:30
Ankush Menat
5902762ec8
fix(ux): alternative item two way validation
2021-10-27 19:46:06 +05:30
Saqib
879a1fca76
perf(minor): improve sales invoice submission ( #27916 )
...
* perf: skip get_pricing_rules if no pricing rule exists
* perf: fetch mode of payments data in single query
* perf: get total company stock only for purchase order
* perf: skip insertion of stock ledger entry
* fix: undo changes to allow negative stock flag
* fix: sider
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-10-27 11:42:50 +05:30
Ankush Menat
479ecb8de0
test: picklist item grouping
2021-10-27 11:10:52 +05:30
Ankush Menat
6942900555
refactor: use defaultdict and enumeration
2021-10-27 11:10:52 +05:30
Diksha Jadhav
f2d136e574
feat(pick list): group items based on item code and warehouse before printing picklist
2021-10-27 11:10:52 +05:30
Noah Jacob
fdaf93f76c
refactor: shows opening balance from filtered from_date ( #26877 )
...
* refactor: shows opening balance from filtered from_date
* refactor: opening balance considered from filtered from_date in stock ledger
* fix: check if stock reco is opening and misc cleanups
2021-10-23 21:04:42 +05:30
Alan
2849297471
refactor: move process loss report to manufacturing ( #28043 )
...
* refactor: move process loss report to manufacturing
* test: fix process loss report test
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-10-21 11:07:47 +05:30
Ankush Menat
da3635b94f
test: execute manufacturing reports
2021-10-20 20:35:11 +05:30
Ankush Menat
126ba16740
fix: remove debug from query
2021-10-20 20:35:11 +05:30
marination
a9341672cf
test: Include serial no with spaces in it in sanitation test
2021-10-14 19:49:13 +05:30
Shariq Ansari
790c1cda6f
fix: Removing unused fields from workspace JSON files #27612
...
fix: Removing unused fields from workspace JSON files
2021-10-13 16:18:20 +05:30
Ankush Menat
4ebae7c5dc
Merge branch 'develop' into optimize-get-item-details
2021-10-12 20:39:49 +05:30
Ankush Menat
7bafa11d57
fix: undo changes to allow negative stock flag
2021-10-12 20:39:10 +05:30
Deepesh Garg
6f107da165
perf: Add indexes in stock queries and speed up bin updation #27758
...
perf: Add indexes in stock queries and speed up bin updation
2021-10-12 20:15:55 +05:30
marination
fd6f3c6b88
Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop
2021-10-12 18:24:21 +05:30
marination
71f4b98d0c
chore: Sider and Semgrep
2021-10-12 17:52:54 +05:30
marination
3d5f029e51
fix: Sider and Tests
2021-10-12 17:33:22 +05:30
marination
22f41a17b7
chore: Removed Shopping Cart Module
...
- Moved all files and web templates from Shopping Cart to E-commerce module
- Made Shopping Cart module obsolete
- Moved select E-commerce related files from Portal to E-commerce module
- Minor cleanups
- Fixed Shopping Cart and Product Configurator tests
2021-10-12 16:54:11 +05:30
Ankush Menat
8d69ec72a6
fix: remove transaction commit from tests
2021-10-12 16:17:15 +05:30
Ankush Menat
acdb26a4bb
refactor: rollback after full test
2021-10-12 16:17:15 +05:30
Ankush Menat
06fa35a9c1
test: add custom TestCase class and use in stock
2021-10-12 16:17:15 +05:30
marination
37a246e738
chore: Patches for Website Item
...
- Patch to make website item from item
- Patch to move Products and Shopping Cart Settings into E Commerce Settings
- Patch to move products in Homepage from Item to Website Item
- Minor cleanup, replacing/removing references to Item website fields (obsolete)
2021-10-12 16:16:17 +05:30
marination
f1ce418bdc
fix: Hide Attribute filters if 'Hide Variants' is enabled in E Commerce Settings
...
- Hide Attribute filters if 'Hide Variants' is enabled in E Commerce Settings
- Consider 'Hide Variants' in ProductQuery Engine
- Added docstrings
- Remove `get_e_commerce_settings`, redundant
2021-10-12 16:09:50 +05:30
marination
b38339c979
fix: Sider and indexing (minor)
2021-10-12 16:06:13 +05:30
marination
025574d9b5
chore: Removing Item's Website section & references
...
- Removed old onboarding slide json and `create_onboarding_docs` methods
- Removed website sections from Item master
- Removed references to item website fields
- Shifted Item doctype website methods to Website Item
- Removed WebsiteGenerator from Item doctype
- Website Items in Homepage Products section
- Removed redundant code from item_group.py
- Fix: Item field filters won’t appear in website
2021-10-12 16:03:19 +05:30
marination
eef9cf152f
chore: Drive E-commerce via Website Item
...
- Removed Shopping Cart Settings
- Portal fully driven via E Commerce Settings
- All Item listing querying will happen via ProductQuery engine only
- Product Listing via Website Items
- removed redundant code
- Moved all website logic from Item to Website Item
2021-10-12 15:48:06 +05:30
marination
939b0dd67d
feat: E-commerce Refactor
...
- Created "Website Item" to handle website related information
- Publishing Item new flow
- Created "E Commerce Settings"
- Removed Products Settings
2021-10-12 15:16:21 +05:30
Saqib Ansari
c7fc609236
perf: skip insertion of stock ledger entry
2021-10-12 13:30:40 +05:30
Saqib Ansari
eb3aae870f
perf: get total company stock only for purchase order
2021-10-12 13:29:32 +05:30
Noah Jacob
4bbe434d43
Merge pull request #27800 from noahjacob/buy_on
...
refactor: updated buying onboarding tours.
2021-10-11 15:33:58 +05:30
Ankush Menat
6019f60d0a
fix(perf): index creation on voucher_detail_no ( #27866 )
...
voucher_detail_no is supposed to have an index, it was added on
on_doctype_update function of table, however this function is only
called if DocType itself is updated and `on_update` is called on
DocType. Stock ledger Entry doctype hasn't changed since addition of
this index in function.
Before: Lack of this index was causing full table scan in
get_future_sle_to_fix function. (~50 seconds in a reposting job)
After: Single row is fetched (~0.5 second in full reposting job)
Learnings:
1. Add simple indexes via doctype only
2. For complex indexes always change doctype.json file for it to take
effect.
2021-10-08 16:12:15 +05:30
Deepesh Garg
fabbf68e0e
Merge pull request #27872 from 18alantom/fix-make-billing-address-not-read-only
...
fix: remove readonly from billing address
2021-10-08 15:07:15 +05:30
18alantom
41fefa356f
fix: remove readonly from billing address
2021-10-08 14:31:13 +05:30
Chillar Anand
772d4753e7
refactor: Clean up mutable defaults and add CI check ( #27828 )
...
* refactor: Clean up mutable defaults and add CI check
2021-10-06 16:58:48 +00:00
Alan
d4b2471cea
fix: use ceil in case of whole uoms for reorder qty ( #27834 )
...
* fix: use ceil in case of whole uoms for reorder qty
* fix: cache uom query
2021-10-06 18:16:33 +05:30
mergify[bot]
233bf5dd29
fix: using DN for transfer w/o internal customer (backport #27798 ) (backport #27805 ) ( #27807 )
...
* fix: using DN for transfer w/o internal customer (backport #27798 ) (#27805 )
* fix: using DN for transfer w/o internal customer (#27798 )
This used to be work before though not "advertised", since a lot of
users have started using it as feature, it can't be broken now.
(cherry picked from commit df1f8fddf6e2f4106c1a2778614ba9a1dc5ff67e)
* fix(ux): use toast instead of popup
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit fa944382c53bdeeb92f2dcc876e2c11ed03e20cc)
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
* fix: resolve conflict
* fix: resolve conflicts
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-10-05 16:16:21 +05:30
Noah Jacob
3132dcd94a
fix: batch_no not mapped from PR to Stock Entry ( #27794 )
2021-10-05 14:40:40 +05:30
Noah Jacob
f5e0cad6a1
refactor: updated onboarding cards and tours
2021-10-05 13:24:22 +05:30
Alan
7da777880b
fix: add (uom, brand) Item details in an Item Price ( #27561 )
...
* fix: add (uom, brand) and update (uom) Item details in an Item Price
* fix: order of query interpolation args
Co-authored-by: Marica <maricadsouza221197@gmail.com>
* fix: named interpolation, remove item price
* fix: sql error
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-10-05 12:35:23 +05:30
Alan
5c372202d5
fix: set item uom as stock_uom if it isn't set ( #27623 )
...
* fix: set item uom as stock_uom if it isn't set
2021-10-04 22:38:04 +05:30
Ankush Menat
a04f9c904e
fix: option to limit reposting in certain timeslot ( #27725 )
2021-10-01 13:05:36 +05:30
Ankush Menat
4685ed5a8c
fix: distribution of additional costs in mfg stock entry ( #27629 )
...
* refactor: remove unnecessary list comprehensions
* fix: correct cost distribution logic
While apportioning costs same condition should be present on both sides
so total value is representative of all items to be apportioned.
Here while calculating incoming_items_cost only FG items are considered,
but while apportioning all items with to_warehouse are considered.
Solution: only apportion additional cost on FG items
* test: test cost distribution
* fix: patch for additional cost
fix(patch): consider PCV while patching
- consider Period closing voucher while patching
- recomute rates for SLE of affected stock entries
consider only FG/scrap item SLEs for recomputation of rates
* fix: remove client side logic for addn cost
All of this is done in python code hence removed client side code.
2021-09-30 09:58:59 +05:30
Deepesh Garg
b39f8a6215
fix: Ignore user permission for Represents Company field in Sales and Purchase docs ( #27684 )
...
* fix: Ignore user permission for Represents Company field in Sales and Purchase docs
* fix: Ignore user permission for fiscal year company
2021-09-29 15:54:35 +05:30
Alan
b91333afdd
fix: set item.qty as mandatory in picklist ( #27680 )
2021-09-28 06:41:37 +00:00
rohitwaghchaure
bf2a590332
fix: View Stock / Accounting Ledger button not showing in the stock entry ( #27570 )
2021-09-17 18:39:21 +05:30
Saqib
e03d9aa889
fix: unecessary keyword args were passed in mapper functions ( #27563 )
2021-09-17 13:03:27 +05:30
Marica
41f11eca72
fix: Remove duplicates from customer_code field ( #27555 )
2021-09-17 10:27:29 +05:30
Saqib
5eba1ccd51
fix: no validation on item defaults ( #27393 )
...
* fix: no validation on item defaults
* fix: cache value while validating
* test: item default company relation
* fix: reorder validations
* refactor: add guard conditions on update_defaults
* test: add default warehouse for item group
* fix: validate item defaults for item groups
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-09-16 17:31:37 +05:30
Marica
9b388883d3
fix: Validate if item exists on uploading items in stock reco ( #27538 )
...
* fix: Validate if item exists on uploading items in stock reco
- Uploading non existent item in stock reco and then changing warehouse or batch gave an error
- Check for non existent item
* chore: translation
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2021-09-16 15:47:17 +05:30
rohitwaghchaure
e6a1ad8016
fix: not able to submit stock entry with 350 items ( #27523 )
2021-09-15 20:42:47 +05:30
Ankush Menat
70c203d19e
test: automated test for running all stock reports ( #27510 )
...
* test: automated test for running all stock reports
These test do not assert correctness, they just check that "execute" function
is working with sane filters.
* test: make report execution test modular
2021-09-15 19:24:35 +05:30
Frappe PR Bot
d4d5e2786f
fix: Maintain same rate in Stock Ledger until stock become positive ( #27227 ) ( #27478 )
...
* fix: Maintain same rate in Stock Ledger until stock become positive
* fix: Maintain same rate in Stock Ledger until stock become positive
(cherry picked from commit 10754831c33b3459d5a45c98f875afa48a444627)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-09-15 17:07:58 +05:30
rohitwaghchaure
c5a77f60ed
feat: provision to add scrap item in job card ( #27483 )
2021-09-15 16:45:57 +05:30
Marica
de9f78350b
Merge branch 'develop' into job-card-excess-transfer
2021-09-14 16:50:06 +05:30
marination
9520215e2b
feat: Handle Excess/Multiple Item Transfer against Job Card
...
- Hide MR/Material Transfer buttons in JC if cancelled
- Show MR/Material transfer buttons if pending to transfer or excess transfer allowed
- Renamed ‘Transferred Qty’ to ‘FG Qty from Transferred Raw Materials’ in JC
- Set status to Completed in JC in case of excess transfer too
- During excess transfer against JC, avoid negative ‘For Quantity’. Set to 0 instead
- Job card section and excess transfer allowance checkbox in Manufacturing Settings
- Renamed ’Allow Multiple Material Consumption’ to ‘Allow Continuous Material Consumption’ (fiedname is same)
- Secured denominator variables in `get_transfered_raw_materials` to avoid ZeroDivisionError
2021-09-14 12:33:21 +05:30
Saqib
7292f5476d
feat: (get_items_from) filter material request item in purchase order ( #27449 )
2021-09-13 12:13:43 +05:30
Ankush Menat
d743c41b54
fix(ux): apply proper filtering in stock reports ( #27411 )
...
* fix(ux): apply proper filtering in stock reports
Stock Balance: apply company filter to warehouse field
Stock Ageing: apply company filter to warehouse field
* fix: unnecessary parens
Co-authored-by: Alan <2.alan.tom@gmail.com>
2021-09-12 16:38:18 +05:30
Ankush Menat
6ef879fca2
fix(ux): clean invalid fields from variant setting ( #27412 )
2021-09-12 16:36:51 +05:30
Marica
61a1356109
fix: Check if Item is serialised before trying to fetch SN and set SO in it ( #27358 )
2021-09-07 14:42:17 +05:30
Marica
0f2a52078c
fix: Dont fetch Stopped/Cancelled MRs in Stock Entry Get Items dialog ( #27326 )
2021-09-06 13:14:09 +05:30
rohitwaghchaure
7b4a65484a
fix: manually added weight per unit reset to zero after save ( #27330 )
2021-09-03 22:00:14 +05:30
Chillar Anand
915b34391c
chore: Clean up imports ( #27302 )
...
* chore: Added isort to pre-commit config
* chore: Sort imports with isort
* chore: Clean up imports with pycln
* chore: Sort imports with isort
* chore: Fix import issues
* chore: Clean up sider issues
* chore: Remove import errors from flake8 ignore list
* chore: Clean up lint issues
2021-09-02 16:44:59 +05:30
Saqib
a158b825fc
Merge pull request #27124 from GangaManoj/gross-profit-product-bundle
...
feat: Improve Product Bundle handling
2021-09-02 11:12:56 +05:30
Ankush Menat
81eb6fde07
Merge pull request #27288 from ankush/strict_linting
...
chore: cleanup linting errors and introduce strict linting checks
2021-09-01 19:32:49 +05:30
Marica
9506c14d35
fix: Zero division error while fetching unconsumed materials ( #27293 )
...
`
2021-09-01 18:49:12 +05:30
Ankush Menat
b147b85e6a
chore: whitespace / eof fixes
2021-09-01 16:57:21 +05:30
GangaManoj
bc79084dac
fix: Add Product Bundle field in Items table
2021-09-01 16:06:47 +05:30
GangaManoj
816ba55b74
fix: Make Rate read-only by default
2021-09-01 15:11:08 +05:30
Ankush Menat
9fec0a5c68
refactor: itemgetter instead of assigned lambda
2021-09-01 15:02:29 +05:30
Ankush Menat
694ae81618
fix: remove bare excepts
2021-09-01 15:02:28 +05:30
Alan
9dc0843cbd
fix: translate labels ( #27282 )
...
[skip ci]
2021-09-01 12:58:34 +05:30
Ganga Manoj
82118975e2
Merge branch 'develop' into gross-profit-product-bundle
2021-08-31 22:08:10 +05:30
Ankush Menat
c1d986a0c6
fix: revert "refactor: simplify initialize_previous_data" ( #27270 )
...
This reverts commit 2f5624e588541103adb4a3170f2886590dcee42e.
2021-08-31 19:43:42 +05:30
Alan
88aa7b824e
fix: pass labels through translation function ( #27252 )
2021-08-31 15:16:04 +05:30
Dany Robert
5fd04101d4
fix: Stock Ageing report issues for serialized items ( #27228 )
...
* fix: incorrect calculation in get_range_age
* fix: remove serial numbers not in stock from fifo_queue
* refactor: make serial_no condition explicit
* refactor: reduce code duplication
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
2021-08-30 18:11:33 +05:30
GangaManoj
e44567754d
fix: Display Packed/Bundle Items table only if it exists
2021-08-27 20:16:13 +05:30
GangaManoj
a7be02fe32
fix: Only add Item to packed_items list if it's not already there
2021-08-27 20:02:36 +05:30
Kamal Johnson
a285b5b78b
feat: Accounts, Selling & Assets Onboarding cleanup ( #27112 )
...
* refactor: company form fields arrangement
* refactor: accounts onboarding steps
* refactor: re-arrange fields & modify labels in company form
* feat: onbording steps for accounts module
* fix: updated onboarding steps for selling module
* fix: remove unwanted steps from accounts
* feat: add more onboarding steps
* feat: Refactor onboarding-module for accounting workspace
* feat: Add basic asset onboarding steps
* feat: Add basic asset item form tour
* feat: Add basic selling onboarding-steps
* feat: Add basic form tour for purchase recipt
* feat: Add basic form tour for existing asset
* feat: Adding asset category form tour
* feat: Add form tour for asset category
* feat: Refactor sales taxes and charges template form tour with new method
* refactor: Remove old form tour for accounts settings
* refactor: Change asset category form tour with new tour method
* refactor: Change asset item form tour with new tour method
* refactor: Change purchase receipt form tour with new tour method
* refactor: Change asset form tour with new tour method
* refactor: Remove old form tour for selling settings
* refactor: general fix/typo in onboarding steps
* Apply suggestions from code review
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* refactor: Remove old form tour method for sales order.
* fix: removed duplicate section break
* fix: Removed duplicate fields
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Anuja <anuja.pawar20@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-27 15:47:11 +05:30
Saqib
8008598eb2
Merge branch 'develop' into gross-profit-product-bundle
2021-08-27 14:48:54 +05:30
GangaManoj
c33f5cad01
fix: Hide Rate of Bundle Items while printing
2021-08-27 01:21:52 +05:30
GangaManoj
99e6e2ce3f
fix: Make Rate column read only by default
2021-08-27 01:15:01 +05:30
GangaManoj
e506cd6a2f
fix: Enable Fetch If Empty for Rate
2021-08-27 01:06:48 +05:30
GangaManoj
d4405c5e52
fix: Calculate Product Bundle price based on the prices of its child items
2021-08-27 01:02:34 +05:30
Noah Jacob
422f67a4c9
refactor: update manufacturing module onboarding ( #26945 )
...
* refactor: updated manufacturing onboarding cards
* refactor: added form tours
* refactor: updated form tours and card descriptions
* Fix: Case of description
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-08-26 21:40:48 +05:30
Ankush Menat
ae55eab599
chore: remove deprecated and empty QUnit tests ( #27179 )
...
* chore: remove deprecated and empty QUnit tests
* ci: fix UI test config
Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.
2021-08-26 20:43:06 +05:30
Ankush Menat
a9852a5483
fix(ux): hide irrelevant fields for asset items ( #26274 )
2021-08-26 20:02:51 +05:30
Marica
73b686a498
Merge pull request #27169 from marination/internal-customer-util
...
fix: Remove duplicate `create_internal_customer` utility
2021-08-26 16:42:28 +05:30
Ankush Menat
e7109c18db
fix: negative qty validation on stock reco cancellation ( #27170 )
...
* test: negative stock validation on SR cancel
* fix: negative stock setting ignored in stock reco
In stock reconcilation cancellation negative stock setting is ignored as
`db.get_value` is returning string `'0'` which is not casted to int/bool
for further logic. This causes negative qty, which evantually gets
caught by reposting but by design this should stop cancellation.
* test: typo and minor refactor
2021-08-26 16:40:45 +05:30
marination
501b91a608
fix: internal customer util returns str not doc object
2021-08-26 16:18:23 +05:30
Marica
e11bfe7da4
Merge pull request #27111 from 18alantom/feat-bom-process-loss-fp
...
feat: add provision for process loss in manufac (frontport #26151 )
2021-08-26 16:10:05 +05:30
marination
45edfd9d50
fix: Remove duplicate create_internal_customer
util
...
- Introduced via https://github.com/frappe/erpnext/pull/27086
2021-08-26 15:53:52 +05:30
Marica
f4dc9ee2aa
fix: Don't create inward SLE against SI unless is internal customer enabled ( #27086 )
...
* fix: Dont create inward SLE against SI unless is internal customer enabled
- Check if is internal customer enabled apart from target warehouse
- Test to check if inward SLE is made if target warehouse is accidentally set but customer is not internal
* test: Use internal customer for delivery of bundle items to target warehouse
- created `create_internal_customer` util
- reused it in delivery note and sales invoice tests
- use internal customer for target warehouse test in delivery note
2021-08-26 13:12:51 +05:30
18alantom
e20d21924c
Merge branch 'develop' into feat-bom-process-loss-fp
2021-08-26 13:05:59 +05:30
rohitwaghchaure
fe4540d74d
fix: allow to change rate manually in case of stand-alone credit note ( #27036 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-08-26 12:52:36 +05:30
18alantom
c7e11c89ff
fix: get filters to work
...
- reorder and rename columns
- add work order filter
2021-08-25 18:58:56 +05:30
18alantom
dbea840ecf
fix: re-order tour to circumvent glitchy save highlight
2021-08-25 16:34:31 +05:30
GangaManoj
e4c25bf4bb
fix: Return if there are no Items
2021-08-25 15:40:42 +05:30
Ganga Manoj
3e5bbc9aa6
Merge branch 'develop' into gross-profit-product-bundle
2021-08-25 00:55:47 +05:30
GangaManoj
77352ae47e
fix: Only update Product Bundle prices if 'Calculate Product Bundle Price based on Child Items' Rates' is enabled
2021-08-25 00:12:43 +05:30
GangaManoj
129df6e129
fix: Update Product Bundle rate based on its updated amount
2021-08-24 21:55:54 +05:30
GangaManoj
31482a08dc
fix: Update Product Bundle price based on the rates of its child Items
2021-08-24 21:42:44 +05:30
18alantom
aff9aee29c
Merge branch 'develop' into feat-bom-process-loss-fp
2021-08-24 20:15:51 +05:30
18alantom
8f73d587f9
feat: process loss report, fix set pl query condition
2021-08-24 18:38:23 +05:30
GangaManoj
b4b6d10b5d
fix: Add editable Rate column
2021-08-24 17:59:11 +05:30
Marica
774f305713
Merge branch 'develop' into update-stock-onboarding-fp
2021-08-24 16:23:42 +05:30
18alantom
ad735522cb
fix: rename form tours to doctype names, remove tours from js controllers
2021-08-24 14:54:38 +05:30
Ankush Menat
c09d8a2809
fix(ux): keep stock entry title & purpose in sync ( #27043 )
...
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2021-08-24 12:20:34 +05:30
Ankush Menat
0dff0beaba
fix: stock analytics report date range issues and add company filter ( #27014 )
...
* test: tests for correct get_period_date_ranges
* fix: stock analytics report date range issues
- Upon selecting second half of month with Monthly filter, data from
that period was missing.
- Solution: "round down" the date as per expected frequency.
* chore: drop py2 and fix misleading docstring
* test: fix test to avoid FY clash
* feat: add company filter in stock analytics report
[skip ci]
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-08-24 12:16:46 +05:30
rohitwaghchaure
db385261f0
Merge pull request #27080 from rohitwaghchaure/fixed-stock-ledger-report-with-included-uom
...
fix: stock ledger report not working if include UOM selected in filter
2021-08-24 10:16:35 +05:30
rohitwaghchaure
da3220e38e
Merge branch 'develop' into fixed-stock-ledger-report-with-included-uom
2021-08-24 08:50:49 +05:30
rohitwaghchaure
129a0fc8b2
Merge branch 'develop' into fixed-donot-overrride-batch-no
2021-08-23 18:07:22 +05:30
Rohit Waghchaure
e1f070437a
fix: selected batch no changed on updation of qty
2021-08-23 14:27:55 +05:30
Rohit Waghchaure
098d349bf4
fix: stock ledger report not working if include uom selected in filter
2021-08-23 13:36:13 +05:30
18alantom
810bce8da2
Merge branch 'develop' into update-stock-onboarding-fp
2021-08-20 16:31:27 +05:30
18alantom
f4487c3ae5
refactor: use Form Tour doc instead of controller form tour
...
note - keeping controller form tours as a fallback, new form tours
seem to work only for Stock Settings
2021-08-20 16:25:20 +05:30
18alantom
77ebbdd172
fix: minor changes
...
- remove Is Group from warehouse
- change stock entry type
- link to stock entry type
- add posting date to stock reco
- change report to Stock Projected Qty
- highlight quality inspection action
- remove allow neg highlight
2021-08-20 16:21:33 +05:30
Saqib
153fe1cdb4
refactor: scan barcode field scanning ( #26990 )
2021-08-20 11:09:51 +05:30
Nabin Hait
b8c998119b
Merge pull request #27040 from marination/cart-pl-exchange-rate
...
fix: Shopping cart Exchange rate validation
2021-08-20 10:56:10 +05:30
marination
45617ae22f
fix: Shopping cart Exchange rate validation
...
- Use `get_exchange_rate` to check for price list exchange rate in cart settings
- Move cart exchange rate validation for Price List from hooks to doc event
- Call cart exchange rate validation on PL update only if PL is in cart and currency is changed
2021-08-19 20:01:05 +05:30
Noah Jacob
cf8d2d97dd
fix: Incorrect mandatory error message for warehouse
2021-08-19 15:43:20 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes
2021-08-19 13:43:28 +05:30
18alantom
cc177f3415
fix: wo tests, sider, account for pl in se validation
2021-08-17 16:49:00 +05:30
18alantom
55acb2e843
fix: sider
2021-08-17 16:37:34 +05:30
18alantom
cdf253aeb4
fix: add more validations, remove source wh req for pl item
2021-08-17 16:36:32 +05:30
18alantom
8ecb146231
test: add bom tests for process loss val, add se test for qty calc
2021-08-17 16:36:24 +05:30
18alantom
3df8d0cdf0
fix: add warehouse and unset is scrap for process loss items
2021-08-17 16:29:42 +05:30
18alantom
b6dc0efa27
feat: add provision for process loss in manufac
2021-08-17 16:23:19 +05:30
Rohit Waghchaure
eb1e3181a4
fix: conflicts while merging brnach version-13 to develop
2021-08-17 10:53:19 +05:30
18alantom
f7b747e19c
refactor: reduce steps, reword cards
2021-08-16 15:14:36 +05:30
18alantom
599c1024a2
fix: semgrep, remove trailing and leading whitespaces
2021-08-16 15:14:22 +05:30
18alantom
95992a7ea5
refactor: fix typo, remove target warehouse cause SE Type dependency
2021-08-16 15:13:45 +05:30
18alantom
37466631f2
refactor: reorder steps according to stock settings refactor
2021-08-16 15:13:14 +05:30
18alantom
9581836885
refactor: add watch video step for stock opening balance
2021-08-16 15:13:05 +05:30
18alantom
1d67d20185
refactor: remove DN, PR; change wording, add/remove steps in tour
2021-08-16 15:12:57 +05:30
18alantom
51d2317bb5
refactor: sider/semgrep
2021-08-16 15:12:28 +05:30
18alantom
1851232e3c
refactor: move trailing whitespace out of translate func
2021-08-16 15:12:23 +05:30
18alantom
0b669b3d7e
refactor: add form tour for stock module onboarding
2021-08-16 15:12:16 +05:30
18alantom
23e1d2b536
refactor: update stock onboarding
2021-08-16 15:12:09 +05:30
Deepesh Garg
7145e9d183
Merge pull request #26359 from GangaManoj/enable-discount-accounting
...
feat: Enable discount accounting
2021-08-14 18:05:29 +05:30
Deepesh Garg
5122948450
Merge branch 'develop' of https://github.com/frappe/erpnext into enable-discount-accounting
2021-08-13 16:00:20 +05:30
Marica
2e6899fbe4
fix: Copy previous balance dict object instead of assigning ( #26942 )
...
- Due to plain assignment, dict mutation gave wrong monthly values
(cherry picked from commit fe2a34f171
)
2021-08-13 10:08:41 +00:00
Marica
fe2a34f171
fix: Copy previous balance dict object instead of assigning ( #26942 )
...
- Due to plain assignment, dict mutation gave wrong monthly values
2021-08-13 15:37:45 +05:30
Shariq Ansari
b32c2fa561
fix: updated erpnext wspace json files ( #26380 )
...
* fix: updated erpnext wspace json files
* fix: updated wspace json files
* fix: updated wspace json files
* fix: removed padding code from wspace json files
* fix: Updated restrict_to_domain in wspace json
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-08-13 12:19:16 +05:30
Noah Jacob
b8658d003f
fix: from_warehouse getting set to None ( #26920 )
2021-08-12 20:03:28 +05:30
Marica
08e4026456
fix: Stock Analytics Report must consider warehouse during calculation ( #26908 )
...
* fix: Stock Analytics Report must consider warehouse during calculation
* fix: Brand filter in Stock Analytics
(cherry picked from commit 703b081172981833bcf9a1fc5c86517817c3ff32)
2021-08-12 05:02:42 +00:00
Deepesh Garg
f037bae8ea
Merge pull request #26397 from GangaManoj/po-payment-terms
...
feat: Fetch Payment Terms from linked Sales/Purchase Order
2021-08-11 22:28:34 +05:30
Deepesh Garg
a7054560da
Merge branch 'develop' into po-payment-terms
2021-08-11 19:31:30 +05:30
Marica
42899d69ea
Merge branch 'develop' into stock-analytics
2021-08-11 18:44:29 +05:30
Ankush
9152715f90
perf: various minor perf fixes for ledger postings ( #26775 )
...
* perf: only validate if voucher is journal entry
* perf: optimize merge GLE
- Order fields such that comparison will fail faster
- Break out of loops if not matched
* perf: don't try to match SLE if count mismatch
* refactor: simplify initialize_previous_data
* perf: use cache for fetching valuation_method
These are set only once fields
* refactor: simplify get_future_stock_vouchers
* refactor: simplify get_voucherwise_gl_entries
* perf: fetch only required fields for GL comparison
`select *` fetches all fields, output of this function is only used for
comparing.
* perf: reorder conditions in PL cost center check
* perf: reduce query while validating new gle
* perf: use cache for validating warehouse props
These properties don't change often, no need to query everytime.
* perf: use cached stock settings to validate SLE
* docs: update misleading docstring
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-08-11 11:17:50 +05:30
marination
eb2050b407
fix: Brand filter in Stock Analytics
2021-08-10 20:37:09 +05:30
marination
55d8aaf0b6
fix: Stock Analytics Report must consider warehouse during calculation
2021-08-10 19:01:05 +05:30
Marica
173c4c8564
Merge branch 'develop' into test-asset-lcv
2021-08-10 14:38:31 +05:30
marination
510e31952d
test: Serial no sanitation
2021-08-10 14:35:51 +05:30
marination
f22b858253
fix: Clean Serial No input on Server Side
2021-08-10 14:35:41 +05:30
Marica
fd12f65047
Merge pull request #26854 from marination/asset-lcv-gl-entry-hotfix
...
fix: Faulty Gl Entry for Asset LCVs (#26803 )
2021-08-10 14:07:12 +05:30
marination
948386d85d
test: Serial no sanitation
2021-08-10 14:00:55 +05:30
Marica
f6ea00e029
Merge branch 'develop' into serial-no-space
2021-08-10 13:17:08 +05:30
marination
06b6b7e3cc
fix: Set CWIP Account in company at the start to avoid flaky test
2021-08-10 13:14:32 +05:30
marination
9ca2febd88
fix: Set CWIP Account in company at the start to avoid flaky test
2021-08-10 13:10:46 +05:30
Deepesh Garg
25a2f2b90e
Merge pull request #26579 from deepeshgarg007/discount_accounting_v13
...
feat: Enable discount accounting
2021-08-10 11:48:14 +05:30
rohitwaghchaure
c5e7673277
Merge pull request #26814 from noahjacob/mr_allowance_feat_v13
...
feat: over transfer allowance for material transfers (bp #26264 )
2021-08-10 11:32:43 +05:30
Deepesh Garg
9b561ea839
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into discount_accounting_v13
2021-08-10 10:38:14 +05:30
Deepesh Garg
cd980f5e6b
Merge pull request #26723 from GangaManoj/backport-po-payment-terms
...
feat: Fetch Payment Terms from linked Sales/Purchase Order
2021-08-10 10:34:39 +05:30
Afshan
f5b5be9644
Merge branch 'develop' into po-payment-terms
2021-08-10 09:32:08 +05:30
Deepesh Garg
bcf56e64ba
fix: Ignore default payment term templates when coping payment terms from orders
2021-08-09 18:53:14 +05:30
GangaManoj
1200872c7e
fix: Disable automcatically_fetch_payment_terms after running its associated tests
2021-08-09 18:53:13 +05:30
Ankush
9f5111809d
test: fix flaky purchase receipt test ( #26859 ) ( #26860 )
...
# Conflicts:
# erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
2021-08-09 15:35:26 +05:30
Ankush
7ba8c821a1
test: fix flaky purchase receipt test ( #26859 )
2021-08-09 15:14:26 +05:30
Frappe PR Bot
ea83e2b45f
fix: validate python expressions ( #26835 ) ( #26856 )
...
(cherry picked from commit 07337d5c78
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-08-09 14:48:59 +05:30
Ankush
07337d5c78
fix: validate python expressions ( #26835 )
2021-08-09 12:38:40 +05:30
Marica
a8166c06c7
fix: Faulty Gl Entry for Asset LCVs ( #26803 )
...
* fix: Faulty Gl Entry for Asset LCVs
- Both Gl entries were crediting in their respective accounts
- Asset Account must be debited into
* fix: Use keyword arguments instead of positional for better readability
* chore: Test for LCV for draft asset created via Purchase Receipt
2021-08-09 12:38:12 +05:30
Marica
ab8f0cab4d
fix: Faulty Gl Entry for Asset LCVs ( #26803 )
...
* fix: Faulty Gl Entry for Asset LCVs
- Both Gl entries were crediting in their respective accounts
- Asset Account must be debited into
* fix: Use keyword arguments instead of positional for better readability
* chore: Test for LCV for draft asset created via Purchase Receipt
2021-08-09 12:24:04 +05:30
Frappe PR Bot
210441d9b5
fix: price list with 0 value are ignored (bp #26655 )
...
* fix: price list with 0 value are ignored
Steps to reproduce:
1. Create 2 item price for two different supplier. One of them should be
zero.
2. Create PO
3. Add supplier with non-zero price and add item.
4. change supplier. Price won't change. If price was non-zero it
would've changed.
Root cause: falsiness check instead of null value check is used for
checking if price list value exists. 0 is evaluated as false.
* refactor: make get_price_list_rate function pure
(cherry picked from commit 16d4de5130
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-08-09 11:34:33 +05:30
Marica
4c929b6994
Merge branch 'develop' into serial-no-space
2021-08-09 10:50:09 +05:30
Ankush
16d4de5130
fix: price list with 0 value are ignored ( #26655 )
...
* fix: price list with 0 value are ignored
Steps to reproduce:
1. Create 2 item price for two different supplier. One of them should be
zero.
2. Create PO
3. Add supplier with non-zero price and add item.
4. change supplier. Price won't change. If price was non-zero it
would've changed.
Root cause: falsiness check instead of null value check is used for
checking if price list value exists. 0 is evaluated as false.
* refactor: make get_price_list_rate function pure
2021-08-09 10:41:24 +05:30
Deepesh Garg
a59a761f99
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into backport-po-payment-terms
2021-08-06 23:55:01 +05:30
Deepesh Garg
0bba425fe3
fix: Ignore default payment term templates when coping payment terms from orders
2021-08-06 23:53:16 +05:30
Frappe PR Bot
aec7846407
test: fix pricelist tests ( #26839 ) ( #26840 )
...
problem: exchange rate API is returning exchange rates for "_Test currency".
These tests were relying on failure of that function.
(cherry picked from commit 27a29eb6bc
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-08-06 21:55:01 +05:30
Ankush
27a29eb6bc
test: fix pricelist tests ( #26839 )
...
problem: exchange rate API is returning exchange rates for "_Test currency".
These tests were relying on failure of that function.
2021-08-06 21:34:44 +05:30
Frappe PR Bot
9ea24db20a
test: use item that allows fractional UOM in test ( #26837 ) ( #26838 )
...
(cherry picked from commit 614336fe1d
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-08-06 21:14:40 +05:30
Ankush
614336fe1d
test: use item that allows fractional UOM in test ( #26837 )
2021-08-06 19:36:21 +05:30
Saqib
668f442139
Merge branch 'develop' into po-payment-terms
2021-08-06 13:42:10 +05:30
Frappe PR Bot
2e352834a2
fix: fetching of item tax from hsn code ( #26736 ) ( #26792 )
...
* fix: fetching of item tax from hsn code
(cherry picked from commit 3a50490c04
)
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-08-06 10:59:29 +05:30
GangaManoj
0b11420147
fix: Disable automcatically_fetch_payment_terms after running its associated tests
2021-08-05 00:35:45 +05:30
GangaManoj
23c104555b
fix: Remove irrelevant code
2021-08-05 00:28:42 +05:30
Noah Jacob
673bc58193
test: test case for over transfer of materials
2021-08-04 18:48:24 +05:30
Noah Jacob
8fced95f8c
feat: over transfer allowance for material transfers
2021-08-04 18:48:24 +05:30
Frappe PR Bot
85815f989c
fix: Reset weight_per_unit on replacing Item ( #26619 ) ( #26791 )
...
* fix: Assign Item's default weight_per_unit as its weight_per_unit in get_item_details
* fix: Set weight_uom in get_item_details as Item's default weight_uom
(cherry picked from commit 471f48f64d
)
Co-authored-by: Ganga Manoj <ganga.manoj98@gmail.com>
2021-08-03 20:06:07 +05:30
Saqib
3a50490c04
fix: fetching of item tax from hsn code ( #26736 )
...
* fix: fetching of item tax from hsn code
2021-08-03 15:57:11 +05:30
Ganga Manoj
471f48f64d
fix: Reset weight_per_unit on replacing Item ( #26619 )
...
* fix: Assign Item's default weight_per_unit as its weight_per_unit in get_item_details
* fix: Set weight_uom in get_item_details as Item's default weight_uom
2021-08-03 14:39:38 +05:30
Frappe PR Bot
373ed1f65c
fix: remove limit from stock balance report ( #26773 ) ( #26779 )
...
(cherry picked from commit b3740e9afc
)
Co-authored-by: Ankush <ankush@iwebnotes.com>
2021-08-03 13:28:50 +05:30
Deepesh Garg
db40d88fc2
Merge pull request #26780 from nemesis189/added-dispatch-address-to-sales-v13-new
...
feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill
2021-08-02 21:11:50 +05:30
Subin Tom
8800aaaee7
feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill
2021-08-02 20:36:37 +05:30
Ankush
b3740e9afc
fix: remove limit from stock balance report ( #26773 )
2021-08-02 20:13:26 +05:30
rohitwaghchaure
31fe5f5b92
fix: added progress bar in repost item valuation ( #26680 )
2021-08-02 11:01:30 +05:30
Rohit Waghchaure
343143037c
fix: conflicts
2021-08-01 14:45:24 +05:30
rohitwaghchaure
41da6f0d13
Merge pull request #26735 from rohitwaghchaure/fixed-cogs-in-purchase-receipt
...
fix: COGS account in purchase receipt
2021-07-31 14:50:47 +05:30
Rohit Waghchaure
2a14f255cf
fix: COGS account in purchase receipt
2021-07-31 11:14:14 +05:30
Marica
7cbd755951
Merge branch 'develop' into serial-no-space
2021-07-30 14:09:19 +05:30
Marica
0eed394f5e
Merge branch 'develop' into stock-reco-fetch-non-empty-stock
2021-07-29 19:54:56 +05:30
rohitwaghchaure
22eac9bd0c
Merge pull request #26720 from rohitwaghchaure/skip-cancelled-entries-in-report-develop
...
fix: remove cancelled entries from Stock and Account Value comparison report
2021-07-29 19:50:00 +05:30
rohitwaghchaure
b7bbefee15
Merge pull request #26722 from rohitwaghchaure/skip-cancelled-entries-in-report
...
fix: remove cancelled entries from Stock and Account Value comparison report
2021-07-29 19:49:42 +05:30
Ankush
57cd273f7c
fix: empty "against account" in Purchase Receipt GLE bp #26712 ( #26719 )
...
* fix: correct field for GLE against account in PR
* fix: remove incorrect field check from reposting
2021-07-29 19:49:36 +05:30
Ankush
c7df759324
fix: empty "against account" in Purchase Receipt GLE bp #26712 ( #26718 )
...
* fix: correct field for GLE against account in PR
* fix: remove incorrect field check from reposting
2021-07-29 19:49:12 +05:30
marination
533ee9a401
feat: (Stock Reco) Ignore Empty Stock while fetching items from warehouse
...
- Added checkbox to `Fetch Items from Warehouse` dialog to ignore empty stock
- fix: Items fetched twice due to Item Defaults
- Improved code readability
2021-07-29 19:39:32 +05:30
GangaManoj
57df4a3aa1
fix: Rename tests
2021-07-29 19:27:54 +05:30
GangaManoj
0413a5aafd
fix: Add test to check if payment terms are fetched when creating a Purchase Invoice
2021-07-29 19:27:52 +05:30
GangaManoj
293c5e10c3
fix: Add test to check if payment terms are fetched when creating a Sales Invoice
2021-07-29 19:26:39 +05:30
GangaManoj
def7cc6cb3
fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order()
2021-07-29 19:26:39 +05:30
GangaManoj
b389c9e375
fix: Fetch Payment Terms from Sales/Purchase Orders
2021-07-29 19:25:29 +05:30
Rohit Waghchaure
a6d276a06f
fix: remove cancelled entries from Stock and Account Value comparison report
2021-07-29 19:16:20 +05:30
Rohit Waghchaure
c1c5a4ae17
fix: remove cancelled entries from Stock and Account Value comparison report
2021-07-29 19:15:34 +05:30
Deepesh Garg
8b7e3775c2
Merge pull request #26712 from ankush/against_acc_pr
...
fix: empty "against account" in Purchase Receipt GLE
2021-07-29 19:10:38 +05:30
Rohit Waghchaure
379ce70126
fix: remove cancelled entries from Stock and Account Value comparison report
2021-07-29 18:06:17 +05:30
Saqib
bbb96899a5
Merge branch 'develop' into po-payment-terms
2021-07-29 17:23:09 +05:30
Ankush Menat
c3e739caf8
fix: correct field for GLE against account in PR
2021-07-29 15:34:18 +05:30
Rohit Waghchaure
56b81565fa
fix: added progress bar in repost item valuation
2021-07-27 22:11:30 +05:30
Noah Jacob
ba18a96b0c
test: test case for over transfer of materials
2021-07-26 18:12:40 +05:30
Noah Jacob
bc82344fc7
feat: over transfer allowance for material transfers
2021-07-26 18:12:37 +05:30
GangaManoj
aed39a23dc
fix: Rename tests
2021-07-23 03:45:59 +05:30
GangaManoj
13e7103ee0
fix: Add test to check if payment terms are fetched when creating a Purchase Invoice
2021-07-23 03:44:56 +05:30
GangaManoj
9c07454f91
fix: Add test to check if payment terms are fetched when creating a Sales Invoice
2021-07-23 03:23:29 +05:30
marination
eecfc4c0ae
fix: Clean Serial No input on Server Side
2021-07-22 13:23:54 +05:30
GangaManoj
4323f4bcac
fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order()
2021-07-22 05:57:42 +05:30
rohitwaghchaure
ac6bfeaa8d
Merge pull request #26558 from rohitwaghchaure/fixed-incorrect-gross-profit-report
...
fix: incorrect valuation rate calculation in gross profit report
2021-07-21 19:35:55 +05:30
GangaManoj
d6f409addc
fix: Sider issues
2021-07-21 14:23:52 +05:30
GangaManoj
ee025b501f
fix: Filter options for Default Discount Account
2021-07-21 14:21:16 +05:30
GangaManoj
546c8d125c
fix: Move Default Discount Account field to Item Defaults
2021-07-21 14:21:16 +05:30
GangaManoj
cdfefa261e
feat: Assign Item's Default Discount Account if present
2021-07-21 14:20:06 +05:30
GangaManoj
acb9e207ec
feat: Add Default Discount Account field
2021-07-21 14:20:06 +05:30
Deepesh Garg
3e109840f9
Merge pull request #26464 from nemesis189/added-dispatch-address-to-sales
...
feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill
2021-07-21 10:52:10 +05:30
Subin Tom
013b352639
fix: Price list rate not fetched for return sales invoice fixed ( #26559 )
...
Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-07-20 21:03:11 +05:30
Subin Tom
2d225e621f
fix: Price list rate not fetched for return sales invoice fixed ( #26560 )
...
Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
2021-07-20 20:41:04 +05:30
Rohit Waghchaure
c14aa45720
fix: incorrect valuation rate calculation in gross profit report
2021-07-20 18:19:15 +05:30
Ankush
92273cade0
fix(ux): item description should fall back to name ( #26339 ) ( #26552 )
...
Don't set item description = item code from front end. This is already
being set to item_name in before_insert and item_name is better
fallback than item code for description.
Also fixed wrong condition for erasing description while duplicating
item.
2021-07-19 20:44:05 +05:30
Ankush
80e269887d
fix(ux): item description should fall back to name ( #26339 )
...
Don't set item description = item code from front end. This is already
being set to item_name in before_insert and item_name is better
fallback than item code for description.
Also fixed wrong condition for erasing description while duplicating
item.
2021-07-19 20:42:44 +05:30
GangaManoj
cde0cc0678
fix: Fetch Payment Terms from Sales/Purchase Orders
2021-07-17 22:53:21 +05:30
Ganga Manoj
bfb7256143
Merge branch 'develop' into enable-discount-accounting
2021-07-17 20:01:09 +05:30
Nabin Hait
11475487fb
fix: merge conflict
2021-07-16 15:58:50 +05:30
Rohit Waghchaure
56e4a88956
fix: added patch to fix missing FG item
2021-07-16 15:06:57 +05:30
Nabin Hait
9ddf33715e
Merge pull request #26513 from rohitwaghchaure/patch-to-fix-missing-fg-item
...
fix: added patch to fix missing FG item
2021-07-16 15:05:23 +05:30
Noah Jacob
3362c080b6
fix: validation check when no conversion_factor ( #26527 )
2021-07-16 15:00:08 +05:30
Rohit Waghchaure
13e9aa5956
fix: added patch to fix missing FG item
2021-07-16 14:34:24 +05:30
Rohit Waghchaure
0c6ca09e06
fix: added patch to fix missing FG item
2021-07-16 14:33:25 +05:30
Rohit Waghchaure
df5c2b9aaf
fix: FG item not fetched in manufacture entry
2021-07-16 11:35:14 +05:30
GangaManoj
6bff653cf0
fix: Sider issues
2021-07-16 02:18:45 +05:30
Rohit Waghchaure
a748dd9261
feat: provision to make subcontracted purchase order from the production plan
2021-07-15 19:01:36 +05:30
Noah Jacob
d8668f78f4
fix: validation check when no conversion_factor ( #26219 )
2021-07-15 18:32:15 +05:30
Rohit Waghchaure
9997cce1ea
fix: FG item not fetched in manufacture entry
2021-07-15 15:32:21 +05:30
rohitwaghchaure
4d444559ff
Merge pull request #26508 from rohitwaghchaure/fixed-fg-items-not-added-for-batch-item
...
fix: FG item not fetched in manufacture entry
2021-07-15 15:32:05 +05:30
Rohit Waghchaure
74b97b5ec9
fix: FG item not fetched in manufacture entry
2021-07-15 14:52:21 +05:30
Noah Jacob
03f4db0606
fix: validation check for batch for stock reconciliation type in stock entry(bp #26370 ) ( #26488 )
...
* fix(ux): added filter for valid batch nos.
* fix: not validating batch no if entry type stock reconciliation
* test: validate batch_no
2021-07-14 16:28:54 +05:30
Noah Jacob
2c67894135
fix: validation check for batch for stock reconciliation type in stock entry(bp #26370 ) ( #26487 )
...
* fix(ux): added filter for valid batch nos.
* fix: not validating batch no if entry type stock reconciliation
* test: validate batch_no
2021-07-14 16:28:40 +05:30
Noah Jacob
c932baeb32
fix: validation check for batch for stock reconciliation type in stock entry ( #26370 )
...
* fix(ux): added filter for valid batch nos.
* fix: not validating batch no if entry type stock reconciliation
* test: validate batch_no
2021-07-14 16:25:42 +05:30
Saqib
bb493a0602
Merge pull request #26159 from GangaManoj/asset-credit-note
2021-07-14 12:02:02 +05:30
rohitwaghchaure
96eb147bb6
Merge pull request #26457 from rohitwaghchaure/fixed-multi-currency-issue
...
fix: multi-currency issue
2021-07-13 23:01:30 +05:30
rohitwaghchaure
bd8699b8a9
Merge pull request #26458 from rohitwaghchaure/fixed-multi-currency-issue-pre
...
fix: multi-currency issue
2021-07-13 16:05:36 +05:30
Rohit Waghchaure
4acbeecbbe
fix: multi-currency issue
2021-07-13 15:35:30 +05:30
Rohit Waghchaure
0d190bb930
fix: multi-currency issue
2021-07-13 15:32:39 +05:30
Subin Tom
5265ba39f0
feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill
2021-07-13 14:58:17 +05:30
rohitwaghchaure
84f23ac8d2
Merge pull request #26222 from 18alantom/teabox-cogs-by-item-group
...
feat: report to show cogs by item groups
2021-07-13 11:24:59 +05:30
GangaManoj
b85d3017a1
fix: Filter options for Default Discount Account
2021-07-13 01:45:20 +05:30
GangaManoj
0b7d8fb3af
fix: Move Default Discount Account field to Item Defaults
2021-07-13 01:45:20 +05:30
Nabin Hait
97bce3af9a
refactor: Optimized code for reposting item valuation
2021-07-12 13:33:08 +05:30
Nabin Hait
0003938f2b
refactor: Optimized code for reposting item valuation
2021-07-12 13:29:20 +05:30
Nabin Hait
01aada6c90
refactor: Optimized code for reposting item valuation
2021-07-12 13:28:19 +05:30
Nabin Hait
45e6cffa4f
refactor: Optimized code for reposting item valuation
2021-07-12 13:26:08 +05:30
rohitwaghchaure
e2c97b1a2b
Merge pull request #26351 from rohitwaghchaure/fixed-putaway-fixing-for-material-receipt-develop
...
fix: stock entry with putaway rule not working
2021-07-12 12:49:25 +05:30
Ankush
caacd0ad2c
fix: stock levels disapperaing on refresh (bp #26305 )
...
refresh_section removes all sections with `custom` class, added
different class to avoid this behaviour.
# Conflicts:
# erpnext/stock/doctype/item/item.js
2021-07-12 10:20:19 +05:30
Ankush Menat
b99469cdab
fix: stock levels disapperaing on refresh
...
refresh_section removes all sections with `custom` class, added
different class to avoid this behaviour.
2021-07-12 10:09:50 +05:30
Marica
f7748e4109
Merge pull request #26133 from marination/qi-rejection
...
feat: Optionally allow rejected quality inspection on submission
2021-07-10 21:04:32 +05:30
marination
f67f13c384
chore: Test case for QI Rejection in Stock Entry
...
- Use `get_single_value` instead of `get_doc` in validation
- Test Case to check impact of stock settings on SE with rejected qi
2021-07-10 21:02:36 +05:30
marination
9ac9a4ef21
feat: Optionally allow rejected quality inspection on submission
2021-07-10 21:02:03 +05:30
marination
c8a825c478
chore: Test case for QI Rejection in Stock Entry
...
- Use `get_single_value` instead of `get_doc` in validation
- Test Case to check impact of stock settings on SE with rejected qi
2021-07-10 18:26:36 +05:30
Marica
eb0dea09bb
Merge pull request #26333 from marination/lcv-validate-invoice
...
fix: Validate LCV for Invoices without Update Stock
2021-07-09 13:41:34 +05:30
marination
98173038b5
fix: Rename function and tweak logic
...
- Dont validate PI on `else`
2021-07-09 13:38:23 +05:30
marination
86f5dfbb8f
fix: Validate LCV for Invoices without Update Stock
2021-07-09 13:38:15 +05:30
Marica
01be96adb2
Merge branch 'version-13-hotfix' into qi-rejection
2021-07-09 13:30:21 +05:30
marination
bf462abb00
fix: Rename function and tweak logic
...
- Dont validate PI on `else`
2021-07-09 13:12:33 +05:30
Saqib
f6f924b340
Merge branch 'develop' into asset-credit-note
2021-07-09 10:38:50 +05:30
Alan
257cbd3b92
fix: track changes on batch ( #26382 )
2021-07-08 18:44:30 +05:30
GangaManoj
298b43c177
fix: Let create_item() make items that are fixed assets
2021-07-07 20:56:15 +05:30
Saqib
9910968398
Merge branch 'develop' into enable-discount-accounting
2021-07-07 12:56:11 +05:30
Rohit Waghchaure
dd1b2995a8
fix: stock entry with putaway rule not working
2021-07-07 00:16:35 +05:30
rohitwaghchaure
2bdc0e8993
Merge pull request #26350 from rohitwaghchaure/fixed-putaway-fixing-for-material-receipt
...
fix: stock entry with putaway rule not working
2021-07-07 00:15:26 +05:30
Rohit Waghchaure
0bd190b885
fix: stock entry with putaway rule not working
2021-07-07 00:14:51 +05:30
Saqib
422325bb74
test: fetching of previous sle ( #26352 )
2021-07-06 18:37:12 +05:30
Saqib
f9e9d86955
test: fetching of previous sle ( #26352 )
2021-07-06 18:09:21 +05:30
Noah Jacob
5e99aa7f65
fix: stock_rbnb not defined ( #26354 )
2021-07-06 18:00:35 +05:30
GangaManoj
657e9b5320
feat: Assign Item's Default Discount Account if present
2021-07-06 16:51:12 +05:30
GangaManoj
ef667a9a64
feat: Add Default Discount Account field
2021-07-06 16:29:19 +05:30
Deepesh Garg
381c05eb87
Merge pull request #26322 from deepeshgarg007/party_dashboard_develop
...
fix: Do not consider cancelled entries in party dashboard
2021-07-06 16:13:49 +05:30
Noah Jacob
0734901a89
fix: stock_rbnb not defined ( #26345 )
2021-07-06 15:56:10 +05:30
Deepesh Garg
8985231a96
fix: Rewrite tests
2021-07-06 15:34:47 +05:30
marination
44c1e8da06
chore: Test to block backdated reco causing future scarcity
2021-07-05 21:59:28 +05:30
marination
e8c9ab4b01
chore: Test for backdated reco qty reposting
2021-07-05 21:59:14 +05:30
marination
8c441263f8
fix: Sider
2021-07-05 21:59:04 +05:30
marination
4038977e2e
fix: Handle Stock Reco cancellation and limit reposting
...
- Handled cancellation of reco with and without prior SLE
- Repost / Recalculate balance qty only till next stock reco
2021-07-05 21:58:57 +05:30
marination
8418c4bfe0
fix: Include Stock Reco logic in update_qty_in_future_sle
2021-07-05 21:58:50 +05:30
marination
57d06a86f8
chore: Test to block backdated reco causing future scarcity
2021-07-05 21:56:57 +05:30
Marica
4f51b56928
Merge branch 'version-13-hotfix' into stock-reco-repost_qty
2021-07-05 20:26:01 +05:30
marination
fa9e67502c
chore: Test for backdated reco qty reposting
2021-07-05 20:23:00 +05:30
marination
c69bc54297
fix: Validate LCV for Invoices without Update Stock
2021-07-05 14:24:38 +05:30
marination
311e277204
fix: Sider
2021-07-02 18:11:13 +05:30
marination
4503a38361
fix: Handle Stock Reco cancellation and limit reposting
...
- Handled cancellation of reco with and without prior SLE
- Repost / Recalculate balance qty only till next stock reco
2021-07-02 17:13:45 +05:30
18alantom
865900fd2d
refactor: add type hints, remove comment, sort imports
2021-07-01 14:37:37 +05:30
Nabin Hait
fa006402b8
fix: merge conflict
2021-07-01 12:47:28 +05:30
Deepesh Garg
cf7af62b05
fix: Code cleanup
2021-06-30 14:14:32 +05:30
Rohit Waghchaure
815e6ec846
fix: minor removed unused file
2021-06-30 11:35:50 +05:30
rohitwaghchaure
2a1d1e1cb1
Merge pull request #26240 from rohitwaghchaure/production-plan-sub-assembly-enhancement
...
feat: provision to make subcontracted purchase order from the production plan
2021-06-30 11:15:11 +05:30
Rohit Waghchaure
46b67b901b
fix: incorrect valuation rate in stock reconciliation
2021-06-30 00:31:00 +05:30
Rohit Waghchaure
61690775a8
feat: provision to make subcontracted purchase order from the production plan
2021-06-29 19:59:20 +05:30
GangaManoj
d748e7f49c
fix: Create common function for fetching conversion rate details of linked docs
2021-06-28 22:39:43 +05:30
GangaManoj
506d5ac3d5
fix: Make exchange rate handling more efficient
2021-06-28 22:39:43 +05:30
GangaManoj
a826fb8f95
fix(Purchase Receipt): Remove print statements
2021-06-28 22:38:59 +05:30
GangaManoj
5314445d58
fix(Purchase Receipt): Add test for exchange rate difference handling
2021-06-28 22:02:57 +05:30
GangaManoj
d97505b277
fix(Purchase Receipt): Resolve difference caused by change in exchange rate
2021-06-28 22:02:22 +05:30
rohitwaghchaure
9bcc402f41
Merge pull request #26230 from rohitwaghchaure/fixed-fetch-bom-items-in-stock-reco-pre
...
fix: fetch batch items in stock reconciliation
2021-06-28 15:18:07 +05:30
Rohit Waghchaure
478360397d
fix: fetch batch items in stock reco
2021-06-26 22:31:03 +05:30
Rohit Waghchaure
5d5dc56f94
fix: removed values out of sync validation from stock transactions
2021-06-26 22:29:19 +05:30
rohitwaghchaure
c1853ddf73
Merge pull request #26226 from rohitwaghchaure/fixed-removed-values-out-of-sync-on-stock-transaction-submission
...
fix: removed values out of sync validation from stock transactions
2021-06-26 22:28:42 +05:30
Rohit Waghchaure
170f2ad056
fix: removed values out of sync validation from stock transactions
2021-06-26 21:42:47 +05:30
Rohit Waghchaure
e5c47f8957
fix: fetch batch items in stock reco
2021-06-26 17:40:27 +05:30
18alantom
98c9b0e9ed
refactor: remove unused func, sider fixes
2021-06-25 16:13:09 +05:30
Deepesh Garg
8dd99c02cc
fix: Check for is None
2021-06-25 14:27:50 +05:30
Deepesh Garg
cae42b48f1
fix: Error while fetching item taxes
2021-06-25 14:27:43 +05:30
Deepesh Garg
6eb8d19cc9
fix: Check for is None
2021-06-25 14:02:12 +05:30
Deepesh Garg
cd36ba7e64
fix: Error while fetching item taxes
2021-06-25 14:02:04 +05:30
Deepesh Garg
e955a4ee72
fix: Check for is None
2021-06-25 13:38:06 +05:30
Deepesh Garg
2ca9b765ef
fix: Error while fetching item taxes
2021-06-25 13:34:00 +05:30
Alan
37a25308ae
fix: add validation for 'for_qty' else throws errors ( #25829 ) ( #26214 )
...
* fix: add validation for 'for_qty' else throws errors
* fix: check if for_qty is None
* fix: check purpose
* fix: add purpose to pick list get_doc
* fix: set as read only to prevent se from picking up value
* chore: undo changes to doctype modified timestamp
2021-06-25 12:40:38 +05:30
Deepesh Garg
3239f774bd
Merge pull request #26183 from deepeshgarg007/item_tax_fetch_fix_develop
...
fix: User is not able to change item tax template
2021-06-25 10:46:14 +05:30
Deepesh Garg
8cdd7ce7b6
fix: Add python 3 compatible string types
2021-06-24 21:13:10 +05:30
Alan
8958f55890
fix: add validation for 'for_qty' else throws errors ( #25829 )
...
* fix: add validation for 'for_qty' else throws errors
* fix: check if for_qty is None
* fix: check purpose
* fix: add purpose to pick list get_doc
* fix: set as read only to prevent se from picking up value
Co-authored-by: Ankush <ankushmenat@gmail.com>
* chore: undo changes to doctype modified timestamp
Co-authored-by: Ankush <ankushmenat@gmail.com>
2021-06-24 21:01:55 +05:30
Ankush
21e44b19f0
perf: don't query unless required (bp #26175 )
...
re-order conditionals so queries are not evaluated unless required.
# Conflicts:
# erpnext/stock/doctype/batch/batch.py
2021-06-24 20:58:07 +05:30
Ankush
2ea750eadd
perf: don't query unless required ( #26175 )
...
re-order conditionals so queries are not evaluated unless required.
2021-06-24 20:29:18 +05:30
Deepesh Garg
b4b76b75cd
Merge pull request #26176 from deepeshgarg007/item_tax_fetch_fix
...
fix: User is not able to change item tax template
2021-06-24 19:55:49 +05:30
Ankush
5708b7140b
fix: batch nos in packed items (bp #26105 )
...
* test: batch info in packed_items
* fix(ux): make packed items editable
* refactor: allow custom table name for set_batch
In some doctypes there are multiple child tables requiring batched
items. This change makes the function a bit more flexible.
* fix: Auto fetch batch_nos in packed_item table
2021-06-24 19:38:37 +05:30
Saqib
3b5978cdb8
Merge pull request #26093 from nextchamp-saqib/pr-item-gl-fix
...
fix: purchase receipt gl entries with same item code
2021-06-24 19:29:08 +05:30
Deepesh Garg
e21e435a0d
fix: Add python 3 compatible string types
2021-06-24 19:17:58 +05:30
Ankush
7a63d782db
fix: batch nos in packed items ( #26105 )
...
* test: batch info in packed_items
* fix(ux): make packed items editable
* refactor: allow custom table name for set_batch
In some doctypes there are multiple child tables requiring batched
items. This change makes the function a bit more flexible.
* fix: Auto fetch batch_nos in packed_item table
2021-06-24 19:07:16 +05:30
Deepesh Garg
11591b3e3e
Merge pull request #26202 from nextchamp-saqib/pr-item-gl-fix-v13
...
fix: purchase receipt gl entries with same item code
2021-06-24 18:36:23 +05:30