Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,494 Commits 3 Branches 0 Tags 1 GiB
c37cec9b9d
Commit Graph

4866 Commits

Author SHA1 Message Date
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
Rohit Waghchaure
2330c41cca fix: total time calculation 2021-06-24 18:14:19 +05:30
Rohit Waghchaure
57307443f0 is corrective job card 2021-06-24 18:14:19 +05:30
Rohit Waghchaure
c878389050 fix: or condition filter in the get_all 2021-06-24 18:14:18 +05:30
Rohit Waghchaure
fcab53b238 fix: skip job card 2021-06-24 18:07:31 +05:30
Rohit Waghchaure
6e81489095 feat: Job Card Enhancements 2021-06-24 18:07:30 +05:30
Saqib Ansari
f6dce4df73 test: service item purchase with perpetual inventory enabled 2021-06-24 17:41:52 +05:30
Saqib
c10fea8a59
Merge branch 'develop' into pr-item-gl-fix 2021-06-24 17:39:36 +05:30
Afshan
7fd44907ba
feat: fetching of qty as per received qty from PR to PI (#26184) 2021-06-24 14:26:36 +05:30
Deepesh Garg
269962a8dc fix: Check if item tax template exists 2021-06-24 10:40:07 +05:30
Deepesh Garg
808f83f385 fix: Make item tax templates optional 2021-06-24 10:39:58 +05:30
Deepesh Garg
94d460412a fix: User is not able to change item tax template 2021-06-24 10:39:49 +05:30
Afshan
53fefd7513
feat: fetching of qty as per received qty from PR to PI (#25837) 2021-06-24 10:09:02 +05:30
Deepesh Garg
7e006496dd fix: Check if item tax template exists 2021-06-23 22:52:51 +05:30
Deepesh Garg
c9c1d10435 fix: Make item tax templates optional 2021-06-23 22:47:29 +05:30
Deepesh Garg
1f7b95f390 fix: User is not able to change item tax template 2021-06-23 20:56:27 +05:30
rohitwaghchaure
b4863bfa50
Merge pull request #25696 from rohitwaghchaure/incorrect-serial-no-qty-valuation-report 
feat: Incorrect valuation rate report for serialized items
 2021-06-23 16:52:51 +05:30
Saqib
46ae97dfd3
Merge branch 'develop' into pr-item-gl-fix 2021-06-23 11:02:48 +05:30
marination
ea2c02738d fix: Include Stock Reco logic in update_qty_in_future_sle 2021-06-22 21:44:50 +05:30
Noah Jacob
ce72d0c2c1
fix: fixed rounding off ordered percent to 100 in condition (#26148) 2021-06-22 17:54:16 +05:30
Noah Jacob
c05496a5a7
fix: fixed rounding off ordered percent to 100 in condition (#26152) 2021-06-22 17:53:53 +05:30
marination
49ec0e5ac3 feat: Optionally allow rejected quality inspection on submission 2021-06-21 16:18:35 +05:30
Ankush
7dae0fbe95
fix: status indicator for delivery notes (bp #26062) 
On list view `per_returned` isn't fetched i.e. `undefined` which become
0 hence the list view indicator is false.

This "computation" is already done by status updater, so relying on
doc.status is better than redefining it.
 2021-06-21 11:19:47 +05:30
Saqib Ansari
9b54aee43e test: service item purchase with perpetual inventory enabled 2021-06-21 11:18:56 +05:30
Ankush
e78364c191
fix: status indicator for delivery notes (#26062) 
On list view `per_returned` isn't fetched i.e. `undefined` which become
0 hence the list view indicator is false.

This "computation" is already done by status updater, so relying on
doc.status is better than redefining it.
 2021-06-21 11:15:16 +05:30
Rohit Waghchaure
e5fb23972a fix: available qty for consumption 2021-06-20 15:28:25 +05:30
Rohit Waghchaure
110e152fa3 fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice 2021-06-20 15:28:23 +05:30
Rohit Waghchaure
6bbc8ec3e8 fix: code cleanup and convert public method to private for subcontracting class 2021-06-20 15:27:04 +05:30
Rohit Waghchaure
d755b29943 fix: toggle consumed qty field based on condition 2021-06-20 15:27:04 +05:30
Rohit Waghchaure
21b58ef045 fix: semgrep error 2021-06-20 15:27:04 +05:30
Rohit Waghchaure
7b7ceaadd9 feat: subcontract code refactor and enhancement 2021-06-20 15:27:01 +05:30
Rohit Waghchaure
f5db407461 fix: available qty for consumption 2021-06-19 23:19:45 +05:30
Rohit Waghchaure
5cc3f14506 fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice 2021-06-19 23:16:23 +05:30
Rohit Waghchaure
ddb0ec261a fix: code cleanup and convert public method to private for subcontracting class 2021-06-19 23:16:23 +05:30
Rohit Waghchaure
2fb5291785 fix: toggle consumed qty field based on condition 2021-06-19 23:16:22 +05:30
Rohit Waghchaure
9a2db0b5b1 fix: semgrep error 2021-06-19 23:16:22 +05:30
Rohit Waghchaure
a94b89727c feat: subcontract code refactor and enhancement 2021-06-19 23:16:22 +05:30
rohitwaghchaure
1c846c5be7
Merge pull request #26114 from rohitwaghchaure/fixed-stock-entry-submission-performance-v13-hotfix 
fix: time out while submitting the stock transactions with more than 50 Items
 2021-06-19 18:51:47 +05:30
Rohit Waghchaure
4d81d45a0e fix: time out while submitting the stock transactions with more than 50 items 2021-06-19 16:15:08 +05:30
rohitwaghchaure
a2bb1b8acd
Merge pull request #26081 from rohitwaghchaure/fixed-stock-entry-submission-performance 
fix: time out while submit / cancel the stock transactions with more than 50 Items
 2021-06-19 16:14:14 +05:30
Rohit Waghchaure
8520edc952 fix: time out while submitting the stock transactions with more than 50 items 2021-06-19 00:55:35 +05:30
Ankush
4e88dcf956
fix: auto unlink warehouse from item on delete (#26073) (#26101) 
* fix: auto unlink warehouse from item on delete

* fix: sider

* refactor: use delete_doc

* test: add test for unlinking warehouse from item

* refactor: add msgprint to inform user of unlink

* refactor: cleanup and reuse extant functions

* fix: don't delete row, update table

Co-authored-by: Alan <2.alan.tom@gmail.com>
 2021-06-18 14:48:30 +05:30
Rohit Waghchaure
7fc50ba460 fix: timeout while cancelling stock reconciliation 2021-06-18 10:45:53 +05:30
rohitwaghchaure
3bb9f4a742
Merge pull request #26098 from rohitwaghchaure/enqueue-cancel-action-in-stock-reco 
fix: timeout while cancelling stock reconciliation
 2021-06-18 10:44:59 +05:30
Rohit Waghchaure
ef97269386 fix: timeout while cancelling stock reconciliation 2021-06-18 10:11:53 +05:30
Alan
f9390f596d
fix: auto unlink warehouse from item on delete (#26073) 
* fix: auto unlink warehouse from item on delete

* fix: sider

* refactor: use delete_doc

* test: add test for unlinking warehouse from item

* refactor: add msgprint to inform user of unlink

* refactor: cleanup and reuse extant functions

* fix: don't delete row, update table
 2021-06-17 18:13:23 +05:30
Suraj Shetty
00332d1834 Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing 2021-06-17 09:47:16 +05:30
Nabin Hait
0950481253 fix: merge conflict 2021-06-15 20:18:06 +05:30
Suraj Shetty
d1902dfadb Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing 2021-06-14 12:25:49 +05:30
Ankush Menat
9891780f5a
perf(minor): remove unnecessary comprehensions (port #25645) 2021-06-11 18:40:22 +05:30
Ankush Menat
a9c84f749a
perf(minor): remove unnecessary comprehensions (#25645) 2021-06-11 16:00:48 +05:30
rohitwaghchaure
387de3f3fa
Merge pull request #26015 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation-develop 
fix: timeout error in the repost item valuation
 2021-06-11 12:18:13 +05:30
Rohit Waghchaure
17408c6388 fix: on click of duplicate button system copy the difference account from first row 2021-06-11 10:58:00 +05:30
Rohit Waghchaure
b103b24ae1 fix: timeout error in the repost item valuation 2021-06-11 10:55:05 +05:30
Deepesh Garg
5434dd048b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into dynamic_gst_rates 2021-06-10 18:56:39 +05:30
walstanb
8f5ae0470d fix: syntax error in stock entry 2021-06-10 16:35:27 +05:30
rohitwaghchaure
8975c5241e
Merge pull request #25988 from rohitwaghchaure/donot-copy-difference-account 
fix: on click of duplicate button system has not copied the difference account
 2021-06-10 14:39:56 +05:30
Anupam Kumar
21b8e2f0d8
fix: hiding Rounding Adjustment field (#25380) 
* fix: hiding Rounding Adjustment field

* fix: updating purchase_invoice.json
 2021-06-09 12:57:21 +05:30
Rohit Waghchaure
99b583f688 fix: on click of duplicate button system copy the difference account from first row 2021-06-09 00:06:35 +05:30
18alantom
6f79c4c348 fix: add account filter 2021-06-07 13:58:45 +05:30
18alantom
23b907df1a fix: use stock value diff for calculation 2021-06-07 13:52:26 +05:30
Deepesh Garg
3646c301ed fix: Linting issues 2021-06-05 13:21:03 +05:30
Deepesh Garg
e8a78bd43d fix: Add test cases 2021-06-05 13:16:39 +05:30
Deepesh Garg
8a7e283926 feat: Item Taxes based on net rate 2021-06-04 22:53:26 +05:30
18alantom
672c8bb112 feature: report for cost of goods sold by item group 2021-06-04 16:44:30 +05:30
Ankush Menat
215516f819
fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice' (#25902) (#25957) 
* fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice'

This error occurs when upgrading from erpnext 13.0.1 to 13.4.0 after typing
bench update --patch --reset

* fix(minor): use .get instead of getattr

Co-authored-by: D Tim Cummings <tim@triptera.com.au>
 2021-06-04 13:09:14 +05:30
D Tim Cummings
fb3ec7ccb8
fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice' (#25902) 
* fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice'

This error occurs when upgrading from erpnext 13.0.1 to 13.4.0 after typing
bench update --patch --reset

* fix(minor): use .get instead of getattr
 2021-06-04 11:58:45 +05:30
rohitwaghchaure
25b953ad16
Merge pull request #25854 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation 
fix: timeout error in the repost item valuation
 2021-06-03 22:14:22 +05:30
Rohit Waghchaure
10558344b0 fix: timeout error in the repost item valuation 2021-06-03 16:34:31 +05:30
Marica
7437748a1d
Merge pull request #25805 from ankush/refactor_item 
refactor: item doctype
 2021-06-03 14:23:18 +05:30
Rohan Bansal
a06ec03efc test: add test for new QI function 2021-06-02 14:55:31 +05:30
Rohan Bansal
11aff80dea Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts 2021-06-02 14:22:32 +05:30
Rohit Waghchaure
6432aaa07a feat: added reports to check incorrect qty and valuation for serialized items 2021-06-01 12:46:43 +05:30
Ganga Manoj
c8b34798fe
fix(Delivery Note): Assign Product Bundle's conversion_factor to Packed Items (#25840) 2021-06-01 10:44:26 +05:30
rohitwaghchaure
970f00922d
Merge pull request #25898 from anupamvs/stock-reconciliation 
fix: featching serialized items
 2021-05-31 20:00:35 +05:30
rohitwaghchaure
6463cbd15e
Merge pull request #25897 from anupamvs/stock-reconciliation 
fix: featching serialized items
 2021-05-31 20:00:26 +05:30
Anupam
0358b64743 fix: featching serialized items 2021-05-31 15:59:32 +05:30
Nabin Hait
a3d1b6973a fix: merge conflict 2021-05-31 11:21:33 +05:30
Suraj Shetty
54354a84e1 test: Fix permission error 2021-05-28 09:10:33 +05:30
Suraj Shetty
d1a13ec050 test: Fix valuation rate for raw materials 2021-05-28 09:10:33 +05:30
Suraj Shetty
a891d6eed2 fix: allow_zero_valuation_rate for rejected qty 2021-05-28 09:10:33 +05:30
Suraj Shetty
c26d41acf9 chore: Remove unnecessary print statements 2021-05-28 09:09:36 +05:30
Rohan Bansal
9857d63523 fix: add requested changes 2021-05-26 15:41:36 +05:30
Rohan Bansal
1cdf5a0dba fix: add requested changes 2021-05-26 14:42:15 +05:30
Marica
be157e7467
Merge branch 'version-13-hotfix' into se-supplier-customer 2021-05-26 11:19:50 +05:30
Suraj Shetty
b14a935c5d Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing 2021-05-25 11:02:03 +05:30
Suraj Shetty
2f8a742aa8 refactor: Replace render imports 2021-05-25 10:28:32 +05:30
Ankush Menat
15f8a0fb22
test: fix flaky test 2021-05-24 17:55:39 +05:30
Ankush Menat
3aed662f46
chore: translation / semgrep / sider fixes 2021-05-24 17:55:39 +05:30
Ankush Menat
c15fef571f
test: item naming series behaviour 2021-05-24 17:55:39 +05:30
Ankush Menat
42e057d079
test: add test for get_timeline_data in item 2021-05-24 17:55:38 +05:30
Ankush Menat
e971b4592e
test: add test for is_stock_item 2021-05-24 17:55:38 +05:30
Ankush Menat
57266a7343
refactor: check_stock_uom_with_bin 2021-05-24 17:55:38 +05:30
Ankush Menat
fc54cf68ac
test: add tests for checking stock_uom with bin 2021-05-24 17:55:38 +05:30
Ankush Menat
4e360f805f
test: hoist defaults to function signature 2021-05-24 17:55:38 +05:30
Ankush Menat
eb17732876
test: add test for item attribute completion 2021-05-24 17:55:37 +05:30
Ankush Menat
f5a937bc45
test: check index creation on item table 2021-05-24 17:55:37 +05:30
Ankush Menat
b9fa12d572
test: add tests for uom conversion function 2021-05-24 17:55:37 +05:30
Ankush Menat
019be66b7b
fix: consider all UOMs for intermediate conversion 
- Using `get_value` will restrict intermediate UOM to first UOM that is
  found.
- A self join is required to truly capture the required behaviour.
- Add explanation and examples.
 2021-05-24 17:55:37 +05:30
Ankush Menat
0d7f54c6c2
refactor: simplify UOM conversion logic 
- Remove unnecessary sql query
- Remove convoluted matching logic and be explcitiy while querying.
- better variable names for understanding matching cases
 2021-05-24 17:55:37 +05:30
Ankush Menat
297dc5e345
perf: add basic optimisation for uom conversion 2021-05-24 17:55:37 +05:30
Ankush Menat
958d485ba4
refactor: msgprint(raise_exception)->frappe.throw 2021-05-24 17:55:36 +05:30
Ankush Menat
ccbde0efa0
refactor: use enumerate instead of trackign index 
also removed dead code
 2021-05-24 17:55:36 +05:30
Ankush Menat
44c489223b
chore: remove py2 compat code 2021-05-24 17:55:18 +05:30
rohitwaghchaure
6809ff4f64
Merge pull request #25776 from rohitwaghchaure/fixed-warehouse-not-found-issue 
fix: warehouse not found in stock entry
 2021-05-24 17:00:06 +05:30
marination
c12264f6bc chore: Cleanup Customer and Supplier Details section in Stock Entry 
- Changed depends on value to "Send to Subcontractor" for supplier fields
- Removed Customer fields as they are not relevant to any Stock Entry purpose
- Renamed section to "Supplier Details" visibe on subcontracting transfer
 2021-05-24 13:20:22 +05:30
rohitwaghchaure
ce88c945cd
Update stock_entry.js 2021-05-24 11:53:27 +05:30
Ankush Menat
c229ac9322
refactor: add guard clause for readability 
Both functions only execute based on a condition. In such cases
condition should immediately exit the function, this is called "guard
clause" and helps in readability (less indent, and easy to "exit" when
reading the code.
 2021-05-23 16:31:29 +05:30
Ankush Menat
4b484d741d
refactor: use is_new() instead of __islocal 
Interface over implementation.
 2021-05-23 16:31:29 +05:30
Ankush Menat
931c886f92
fix: not checking all fields 
`break` will break out of the loop without checking remaining fields.
 2021-05-23 16:31:29 +05:30
Ankush Menat
83e6e2e68a
refactor: add guard clause for readability 2021-05-23 16:31:29 +05:30
Ankush Menat
0b4858d8e5
refactor: eliminate unnecessary loop, container casts 2021-05-23 16:31:29 +05:30
Ankush Menat
ad58a8164a
refactor: code cleanup 
minor fixes for improving code quality
 2021-05-23 16:31:29 +05:30
Ankush Menat
4a2dbd4885
refactor: cleanup get_timeline_data, remove py2 2021-05-23 16:31:28 +05:30
Ankush Menat
330353a5ce
refactor: use frappe.throw instread of recreating 
_msgprint was basically duplicating behvaiour of frappe.throw
 2021-05-23 16:31:16 +05:30
Marica
eaf0465c44
Merge pull request #25797 from marination/item-variants-report 
fix: Item Variant Details Report
 2021-05-22 19:05:54 +05:30
marination
b0019bcf5b fix: Item Variant Details Report 
Co-authored-by: gavindsouza <gavin18d@gmail.com>

- Handling of variants with special characters
- Set data in appropriately named columns
- Code cleanup
 2021-05-21 21:42:11 +05:30
rohitwaghchaure
ab34f5b485
Merge pull request #25742 from ankush/disable_submit_btn 
fix: duplicate stock entry on multiple click
 2021-05-21 18:13:01 +05:30
rohitwaghchaure
579a1b7028
Merge pull request #25779 from ankush/parallel_stock_transactions 
fix: wrong quantity after transaction for parallel stock transactions
 2021-05-21 18:11:34 +05:30
Suraj Shetty
81d49e9c71 fix: Use extend_cscript function to properly extend class methods to cscript 2021-05-21 17:03:09 +05:30
Alan
1097dc89c5
fix: show allow zero valuation only when auto checked (#25778) 2021-05-21 14:04:03 +05:30
Ankush Menat
4dcac4ae81
refactor(minor): Use identity instead of equality 
Ignore false positive.
 2021-05-21 13:49:58 +05:30
Ankush Menat
9979cf5fcc
fix: wrong quantity after transaction for parallel stock transactions 
When two transactions are inserted parallelly then previous SLE could be
incorrect for some of them. Locking SLE table would prevent reading from
it till transaction is complete.
 2021-05-21 12:31:06 +05:30
Rohit Waghchaure
795909fdcd fix: warehouse not found in stock entry 2021-05-21 11:31:01 +05:30
rohitwaghchaure
94a52c0e17
Merge pull request #25752 from rohitwaghchaure/fixed-do-not-repost-if-scheduler-is-in-running 
fix: the status of repost item valuation showing In Progress since long time
 2021-05-21 09:50:33 +05:30
rohitwaghchaure
84730aa4a5
Merge pull request #25754 from rohitwaghchaure/fixed-do-not-repost-if-scheduler-is-in-running-13 
fix: the status of repost item valuation showing In Progress since long time
 2021-05-21 09:50:18 +05:30
Rohit Waghchaure
5456873641 fix: run scheduler for reposting if there is no scheduler is running for the reposting 2021-05-19 12:30:28 +05:30
Marica
814fd19424
Merge pull request #25732 from noahjacob/ux_landed_cost_voucher 
refactor: updated applicable charges form in landed cost voucher
 2021-05-18 16:39:31 +05:30
Ankush Menat
ecbb8cbc84
revert: "fix: duplicate stock entry (#25486)" 
Not required anymore, submit button is disabled.
 2021-05-18 16:35:55 +05:30
Ankush Menat
042b8524cc
fix: disable submit button to avoid multiple calls 2021-05-18 16:35:49 +05:30
Devin Slauenwhite
bdba064fa6
fix: duplicate stock entry (#25486) 
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-05-18 16:12:53 +05:30
Suraj Shetty
a83d2aacd9
Merge branch 'develop' into esbuild 2021-05-18 14:48:28 +05:30
noahjacob
41ac8be6f2 refactor: base_amount field moved below amount field and renamed 2021-05-17 13:58:27 +05:30
Rohit Waghchaure
0517abad43 fix: run scheduler for reposting if there is no scheduler is running for the reposting 2021-05-17 13:31:12 +05:30
Nabin Hait
8b2fef11b1 fix: merge conflict 2021-05-17 11:37:14 +05:30
Alan
55c2fec683
feat: add pending qty section to batch/serial selector dialog (#25519) 
* feat: add pending qty section to batch/serial selector dialog

* fix: call attach in setup and refresh, fix conditional

* refactor: camel to snake casing
 2021-05-14 12:36:41 +05:30
rohitwaghchaure
2aa401826e
fix: validation message of quality inspection in purchase receipt (#25666) 2021-05-14 12:34:50 +05:30
rohitwaghchaure
e9f6c8cdb1
fix: validation message of quality inspection in purchase receipt (#25667) 2021-05-14 12:34:13 +05:30
Deepesh Garg
be3cde9313
chore: Code clean up for purchase receipt GL (#25379) 
* chore: Code clean up for purchase receipt GL

* fix: add params for debit and credit in account curreny

* chore: Asset GL entry code cleanup

* fix: Syntax error

* fix: Update variable names

* fix: function naming

* fix: Add undefined variables

* fix: Supplier warehouse fetching

* fix: Linting issues
 2021-05-14 12:20:38 +05:30
rohitwaghchaure
ba940bb9e1
Merge pull request #25702 from rohitwaghchaure/change-today-to-now-for-reposting 
fix: change today to now to get data for reposting
 2021-05-13 17:44:38 +05:30
rohitwaghchaure
fc44478810
Update repost_item_valuation.py 2021-05-13 17:42:33 +05:30
Rohit Waghchaure
a0a88a710e fix: change today to now to get data for reposting 2021-05-13 17:42:06 +05:30
Rohit Waghchaure
af1376c1df chore: change today to now to get data for reposting 2021-05-13 17:39:49 +05:30
Rohit Waghchaure
27f50d5852 fix: timeout error while loading warehouse tree 2021-05-13 15:54:35 +05:30
Rohit Waghchaure
d984be0ccd fix: don't map set warehouse from delivery note to purchase receipt 2021-05-12 12:32:14 +05:30
Suraj Shetty
404e7d07c5 test: Fix permission error 2021-05-10 18:39:09 +05:30
Suraj Shetty
4d6d5f4d89 test: Fix valuation rate for raw materials 2021-05-10 17:37:44 +05:30
Suraj Shetty
a132de42ca fix: allow_zero_valuation_rate for rejected qty 2021-05-10 17:25:21 +05:30
Suraj Shetty
ec6b652cd4 refactor: Rename assertEquals to assertEqual to avoid deprecation warnings 2021-05-10 09:18:25 +05:30
Ganga Manoj
aa9e172091
feat: Add Create Expense Claim button in Delivery Trip (#25526) 
* feat(Delivery Trip): Add employee_code field

* feat(Expense Claim): Add Delivery Trip Number field

* feat(Delivery Trip): Add Create Expense Claim button

* feat(Delivery Trip): Make Create Expense Claim button show up after save

* fix(Delivery Trip): Fix Sider issues

* fix(Delivery Trip): Display button after submit

* fix(Delivery Trip & Expense Claim): Rename new fields

* fix(Delivery Trip): Add button in refresh

* fix(Delivery Trip): Remove redundant line

* fix(Expense Claim): Display delivery_trip only if non-empty

* fix(Delivery Trip): Add test for Create Expense Claim

* fix(Delivery Trip): Fix Sider Issue

* fix(Delivery Trip): Only display Create Expense Claim if the driver is an employee

* fix(Delivery Trip): Fix test

* fix(Delivery Trip): Fix make_expense_claim()

* fix: sider

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-05-08 17:15:33 +05:30
Suraj Shetty
80aa8a3149 Merge branch 'develop' of github.com:frappe/erpnext into parallel-distributed-testing 2021-05-08 11:28:27 +05:30
rohitwaghchaure
64bd4f27b8
Merge pull request #25611 from rohitwaghchaure/validation-to-check-duplicate-serial-nos 
fix: added validation in stock entry to check duplicate serial nos
 2021-05-07 23:30:27 +05:30
rohitwaghchaure
42fe07bd19
Merge pull request #25551 from rohitwaghchaure/fixed-total-stock-summary-report 
fix: total stock summary report not working
 2021-05-07 23:30:06 +05:30
rohitwaghchaure
1726ce547c
Merge pull request #25471 from rohitwaghchaure/allow-to-receipt-same-serial-no 
fix: allow to receive same serial numbers multiple times
 2021-05-07 23:27:50 +05:30
Alan
c6dc9eaf2e
feat!: add pick batch button (#25413) 
* feat!: add pick batch button

BREAKING CHANGE: replaces setup_serial_no with setup_serial_or_batch_no.

* refactor: use setup_serial_or_batch_no instead of setup_serial_no

* refactor: use setup_serial_or_batch_no instead of setup_serial_no

* refactor: use setup_serial_or_batch_no instead of setup_serial_no

* style: add sider review changes

* refactor: make consice, extract function

* refactor: camel to snake casing
 2021-05-07 20:30:04 +05:30
Ankush Menat
90e671905a
chore: replace assertEquals with alias assertEqual (#25613) 
* chore: replace assertEquals with alias assertEqual

assertEquals has been deprecated.

ref: https://docs.python.org/3/library/unittest.html#deprecated-aliases

* chore: sider fixes
 2021-05-07 20:28:51 +05:30
Faris Ansari
69eb6d476e Merge remote-tracking branch 'upstream/develop' into esbuild 2021-05-07 15:21:33 +05:30
Faris Ansari
464d838447 fix: Update bundle paths 2021-05-07 14:53:42 +05:30
Saqib
27cf19a19f
feat(pos): show POS reserved stock in stock projected qty report (#25593) 
* feat(pos): consider POS reserved stock in stock projected qty report

* chore: remove unwanted string formats
 2021-05-07 13:37:42 +05:30
Ganga Manoj
5618ce3852
fix(Material Request): Add 'Partially Received' to Status drop-down list (#24857) 
Co-authored-by: Ganga Manoj <ganga_manoj@Gangas-MacBook-Air.local>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-05-07 13:35:09 +05:30
Umair Sayed
7f79d463f6
fix: Stock and Accounts Settings form refactor (#25534) 
* stock and accounts settings page

* fix: Stock and accounts settings page cleanup

Co-authored-by: Umair Sayed <umairsayed@Umairs-MacBook-Air.local>
 2021-05-07 12:28:57 +05:30
Anuja Pawar
f132ed4335
fix: update item level cost center from POS (#25609) 2021-05-07 12:11:09 +05:30
Nabin Hait
7481f54e0c Merge branch 'version-13' into develop 2021-05-06 19:18:18 +05:30
Nabin Hait
0e41295c0e
perf: Performance enhancement on setup wizard (#25606) 
* perf: Performance enhancement on setup wizard

* fix: create departments without updating nsm
 2021-05-06 19:14:06 +05:30
Nabin Hait
134eaa5786
perf: Performance enhancement on setup wizard (#25605) 
* perf: Performance enhancement on setup wizard

* fix: create departments without updating nsm
 2021-05-06 19:13:54 +05:30
Suraj Shetty
c702408f99 chore: Remove unnecessary print statements 2021-05-06 18:37:45 +05:30
Rohit Waghchaure
695becdd05 fix: added validation in stock entry to check duplicate serial nos 2021-05-06 18:03:32 +05:30
rohitwaghchaure
dc6233b703
Merge pull request #25541 from rohitwaghchaure/fixed-incorrect-serial-no-set 
fix: serial no changed after saving stock reconciliation
 2021-05-06 17:44:36 +05:30
Rohit Waghchaure
bb3e5d00f4 fix: allow to receive same serial numbers multiple times 2021-05-06 12:38:35 +05:30
Rohit Waghchaure
c432766a70 fix: stock reconciliation getting time out error during submission 2021-05-05 10:16:21 +05:30
Rohit Waghchaure
ba8dc1ffbd fix: stock balance and batchwise balance history report showing different closing stock 2021-05-04 15:03:10 +05:30
18alantom
308905b1be fix: semgrep, refactor default mutable dict 2021-05-04 11:46:13 +05:30
18alantom
e36f303042 fix: use percent string templates for db.sql calls 2021-05-04 11:46:13 +05:30
rohitwaghchaure
1f4df80565
Merge pull request #25531 from noahjacob/fix_mr_filter 
fix: updated item filters for material request
 2021-05-03 18:36:25 +05:30
rohitwaghchaure
88734eea14
Merge pull request #25557 from rohitwaghchaure/increased-timeout-of-stoc-reco 
fix: stock reconciliation getting time out error during submission
 2021-05-03 18:25:33 +05:30
Rohit Waghchaure
8f34ca4ac6 fix: stock reconciliation getting time out error during submission 2021-05-03 15:32:13 +05:30
rohitwaghchaure
9cc7c294e7
Update stock_reconciliation.py 2021-05-03 10:25:53 +05:30
Rohit Waghchaure
6a5a380c07 fix: total stock summary report not working 2021-05-02 18:02:28 +05:30
Rohit Waghchaure
35d4829383 fix: serial no changed after saving stock reconciliation 2021-05-02 17:57:28 +05:30
rohitwaghchaure
2e38f1514f
fix: stock ledger entry created against draft stock entry (#25539) 2021-05-01 13:53:46 +05:30
rohitwaghchaure
00ea336b52
fix: stock ledger entry created against draft stock entry (#25540) 2021-05-01 13:53:39 +05:30
Nabin Hait
a19c6a9278
fix: Fetch total stock at company in PO (#25533) 2021-04-30 18:38:49 +05:30
Nabin Hait
da0ba15cbf
fix: Fetch total stock at company in PO (#25532) 2021-04-30 18:38:41 +05:30
noahjacob
a90c81626f fix: updated item filters for material request 2021-04-30 15:49:36 +05:30
Noah Jacob
dc086dd52f
fix: item stock levels displaying inconsistently (#25506) 
* fix: fixed stock levels dashboard not displaying after any interactions

* fix: minor translation fix
 2021-04-29 11:03:27 +05:30
rohitwaghchaure
b9078a0c86
Merge pull request #25126 from rohitwaghchaure/purchase-invoice-to-purchase-receipt-develop 
feat: purchase receipt creation from purchase invoice
 2021-04-27 09:56:28 +05:30
Ankush Menat
9178d95cca
fix: can not create item variants (#25433) 
* fix: item_code assigned to function returning None

* fix: ignore has_variants and attributes in variant

* fix: patch to remove has_variants and attributes

* chore: fix whitespace in translation
 2021-04-26 15:37:17 +05:30
Walstan Baptista
4a805b5622
chore: frappe.whitelist for doc methods (#25465) 2021-04-24 14:23:08 +05:30
Faris Ansari
1fe891b287 refactor: Replace Class.extend with native class 2021-04-23 08:04:00 +05:30
Nabin Hait
840c921229
Merge branch 'develop' into purchase-invoice-to-purchase-receipt-develop 2021-04-19 13:30:19 +05:30
Deepesh Garg
cb718fce88
feat: Role to allow over billing, delivery, receipt (#24854) 
* feat: Role to allow  over billing, delivery, receipt

* fix: Typo
 2021-04-19 13:25:15 +05:30
Alan
ac8a467b0a
fix: exclude spurious Stock Entry Types from 'consumed' calculation (#25352) 
* fix: exclude spurious 'Stock Entry Type's from 'consumed' calculation

* fix: filter using purpose, make requested changes

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-04-19 12:38:25 +05:30
Marica
e8bc912ffc
perf: Fetching exchange rate on every line item slows down PO (#25345) 
* fix: Dont fetch exchange rates for each line item once fetched at parent
`

* perf: Use price list conversion rate from parent

- If price list conversion rate exists in args already from earlier call, use that
- `get_price_list_currency_and_exchange_rate` wont be called for each child row

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-04-19 11:05:21 +05:30
Ankush Menat
9229ee1745
fix: update shipment status in database 
Caught by semgrep rule:
https://github.com/frappe/erpnext/blob/develop/.github/helper/semgrep_rules/frappe_correctness.yml#L4
 2021-04-18 13:22:19 +05:30
Ankush Menat
dedf2c1b61
fix: remove duplicate keys from dictionaries 2021-04-17 16:56:08 +05:30