Commit Graph

3677 Commits

Author SHA1 Message Date
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
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
Rohit Waghchaure
478360397d fix: fetch batch items in stock reco 2021-06-26 22:31:03 +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
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
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
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
Afshan
53fefd7513
feat: fetching of qty as per received qty from PR to PI (#25837) 2021-06-24 10:09:02 +05:30
Saqib
46ae97dfd3
Merge branch 'develop' into pr-item-gl-fix 2021-06-23 11:02:48 +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
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
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
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