Commit Graph

5619 Commits

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