Commit Graph

1586 Commits

Author SHA1 Message Date
Marica
73c9a21987
Merge branch 'develop' into supplier_defaults_fix 2021-07-13 10:31:10 +05:30
Noah Jacob
0be6583083 refactor: suggested changes 2021-07-12 09:18:19 +05:30
Noah Jacob
34a5cb9106 fix: Sider 2021-07-12 08:48:04 +05:30
Noah Jacob
8db974b1b9 test: updated test cases 2021-07-02 22:00:33 +05:30
Nabin Hait
fa006402b8 fix: merge conflict 2021-07-01 12:47:28 +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
rohitwaghchaure
82adb4f16e
Merge pull request #26118 from rohitwaghchaure/fixed-linking-between-mr-and-sq-develop
fix: material request and supplier quotation not linked if supplier quotation created from supplier portal
2021-06-21 22:36:03 +05:30
Noah Jacob
acef77fb53 test: test case for fetching supplier group details 2021-06-21 15:39:05 +05:30
Noah Jacob
ffe306c2f6 feat: details fetched from supplier group in supplier 2021-06-21 15:36:46 +05:30
Rohit Waghchaure
e5fb23972a fix: available qty for consumption 2021-06-20 15:28:25 +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
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
9e616b09a2 fix: material request and supplier quotation not linked if sq created from supplier portal against rfq 2021-06-20 15:17:20 +05:30
rohitwaghchaure
ab3cd7e283
Merge pull request #26023 from rohitwaghchaure/fixed-linking-between-mr-and-sq
fix: material request and supplier quotation not linked if supplier quotation created from supplier portal
2021-06-20 15:16:32 +05:30
Rohit Waghchaure
f5db407461 fix: available qty for consumption 2021-06-19 23:19:45 +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
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
Rohit Waghchaure
8c844e4515 fix: material request and supplier quotation not linked if sq created from supplier portal against rfq 2021-06-19 16:08:26 +05:30
Nabin Hait
0950481253 fix: merge conflict 2021-06-15 20:18:06 +05:30
marination
5d082b05a9 fix: Flaky test for Report Subcontracted Raw materials to be transferred 2021-06-14 16:31:45 +05:30
marination
3b070d1b05 fix: Flaky test for Report Subcontracted Raw materials to be transferred 2021-06-14 14:51:33 +05:30
Marica
d37912fff1
Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop 2021-06-12 16:00:14 +05:30
Ankush Menat
9891780f5a
perf(minor): remove unnecessary comprehensions (port #25645) 2021-06-11 18:40:22 +05:30
Marica
d7d5c4c329
Merge pull request #26011 from marination/subcontracted-rm-to-transfer-report
fix: Report Subcontracted Raw Materials to be Transferred
2021-06-11 17:50:30 +05:30
marination
ea3e61d3b0 fix: Test 2021-06-11 17:29:55 +05:30
marination
c4d851e45f fix: Test 2021-06-11 17:27:43 +05:30
Ankush Menat
a9c84f749a
perf(minor): remove unnecessary comprehensions (#25645) 2021-06-11 16:00:48 +05:30
marination
a4ed6a3519 fix: Sider 2021-06-11 12:51:36 +05:30
marination
c5da51dd7a fix: Report Raw Materials to be Transferred 2021-06-11 12:51:10 +05:30
marination
ec4a3723cc fix: Sider 2021-06-11 12:47:06 +05:30
marination
687ad9b942 fix: Report Raw Materials to be Transferred 2021-06-10 21:18:19 +05:30
Deepesh Garg
758db793be Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-09 13:39:07 +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
Deepesh Garg
6f2dacc60c Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-06 19:31:50 +05:30
Nabin Hait
a3d1b6973a fix: merge conflict 2021-05-31 11:21:33 +05:30
Suraj Shetty
d48ea663d9 test: Fix test name
- Rename TestSubcontractedItemToBeReceived > TestSubcontractedItemToBeTransferred
2021-05-28 09:10:33 +05:30
Deepesh Garg
be3671fe7b fix: Create new supplier for test case 2021-05-27 13:27:17 +05:30
Deepesh Garg
b07f7d1b70 fix: Linting and other fixes 2021-05-25 17:39:04 +05:30
Deepesh Garg
e2f83ffaa4 fix: Linting fixes and other checks 2021-05-25 17:35:41 +05:30
Deepesh Garg
79b422c0a9 fix: Advance TDS in TDS payable monthly report 2021-05-25 17:33:59 +05:30
Deepesh Garg
d18dde7757 fix: Add tds in PO and code cleanup 2021-05-25 17:32:28 +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
rohitwaghchaure
651e934415
Merge pull request #25683 from noahjacob/supplier_item_group_link
feat: linking supplier with an item group for filtering items
2021-05-21 12:07:53 +05:30
noahjacob
bf7f0530e6 fix: added error handling if entry already exists 2021-05-19 13:53:22 +05:30
noahjacob
3768216dca refactor: updated permissions and mandatory fields 2021-05-19 13:50:35 +05:30
noahjacob
0ab0fcdd51 feat: added supplier item group link in supplier dashboard 2021-05-18 15:21:24 +05:30
Suraj Shetty
a83d2aacd9
Merge branch 'develop' into esbuild 2021-05-18 14:48:28 +05:30