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

5365 Commits

Author SHA1 Message Date
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
Saqib Ansari
cd2513ceec
Merge pull request #29939 from nextchamp-saqib/ordered-qty-for-packed-items 
feat: update ordered qty for packed items
 2022-03-02 17:10:20 +05:30
Ankush Menat
55a966ec41
chore: get stock reco qty from SR instead of SLE (#30059) 
[skip ci]
 2022-03-02 14:49:45 +05:30
Ankush Menat
701878f60b revert "fix: FIFO valuation in case of multi-item entries" 
This reverts commit b8ee193d1a124668691b3d8181ce4e3bf612afe0.

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

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

* fix: remove allow_on_submit and refresh trigger

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

* docs: reposting technical implementation notes
 2022-02-22 17:03:11 +05:30
Ankush Menat
7f55226a58
fix: remove customer field value when MR is not customer provided (#29938) 2022-02-22 16:55:43 +05:30
Saqib Ansari
8005fee656 feat: update ordered qty for packed items 2022-02-22 15:06:19 +05:30
Ankush Menat
9661058cc7 fix: only set batchwise valuation flag if new batch 2022-02-21 19:04:10 +05:30
Ankush Menat
af9fa049c7 fix: batchwise valuation can only be used by FIFO/LIFO 2022-02-21 18:02:40 +05:30
Ankush Menat
75fb561698 test: force correct flag in test data 2022-02-21 18:02:40 +05:30
Ankush Menat
f38690f703 fix: check if Moving average item can use batchwise valuation 2022-02-21 18:02:40 +05:30
Ankush Menat
6b0bc35063 test: mixed moving average items 2022-02-21 18:02:40 +05:30
Ankush Menat
609d2fccad fix: reset stock value if no qty 2022-02-21 18:02:40 +05:30
Ankush Menat
35483242b3 fix: extend round_off_if_near_zero fix to other methods 2022-02-21 18:02:40 +05:30
Ankush Menat
76b395d62e test: old/new mix batches valuation consumption 2022-02-21 18:02:40 +05:30