nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 13:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,436 Commits 469 Branches 1,756 Tags
0419ba1d7843cd3e095ccc6968682bedbf6e6eff
Commit Graph

1578 Commits

Author SHA1 Message Date
Frappe PR Bot
d9b9888ad5 feat: (consistency) Add Primary Address and Contact section in Supplier (#27232) (#27233) 
* feat: (consistency) Add Primary Address and Contact section in Supplier

- The same is present in customer and is inconsistent with supplier
- Helps quickly create primary address and contact via quick entry

* fix: Popup stale build and data consistency

- Include `supplier_quick_entry.js` in erpnext.bundle.js
- Create primary supplier address on update
- Set newly created address (quick entry)  in Supplier and Customer
- Clear address set in supplier and customer on delete (dependency)

* fix: Indentation and removed f-strings

- Sider: fixed indentation in js
- Dont use f-strings in queries

(cherry picked from commit 3d87d9f1d3)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-08-30 18:49:40 +05:30
rohitwaghchaure
5320f3e5ea Merge branch 'version-13-hotfix' into supplier_defaults_v13hf 2021-08-24 12:28:16 +05:30
Saqib
dbca11071e refactor: scan barcode field scanning (#26990) (#27076) 2021-08-23 11:23:46 +05:30
Ankush Menat
9bb69e711a chore: whitespace cleanup from codebase 2021-08-19 14:33:03 +05:30
Frappe PR Bot
90818d57f1 fix: change print_format_type from Server to Jinja (#26374) (#26985) 
(cherry picked from commit a2966db1e5)

Co-authored-by: Mohammed Redah <mhbu50@gmail.com>
 2021-08-17 13:36:08 +00:00
Deepesh Garg
5ace2767af test: Fix test cases for payment terms fetch 2021-08-08 19:17:38 +05:30
Deepesh Garg
25d131a39f test: Improve test case for not coping payment terms 2021-08-07 17:39:40 +05:30
Deepesh Garg
0bba425fe3 fix: Ignore default payment term templates when coping payment terms from orders 2021-08-06 23:53:16 +05:30
GangaManoj
0b11420147 fix: Disable automcatically_fetch_payment_terms after running its associated tests 2021-08-05 00:35:45 +05:30
GangaManoj
8328f45230 fix: Rename test to reflect changes in code 2021-08-04 17:33:35 +05:30
GangaManoj
57df4a3aa1 fix: Rename tests 2021-07-29 19:27:54 +05:30
GangaManoj
e94604f517 fix: Add test to check if payment terms are fetched when creating a Purchase Invoice 2021-07-29 19:26:39 +05:30
GangaManoj
def7cc6cb3 fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order() 2021-07-29 19:26:39 +05:30
GangaManoj
b389c9e375 fix: Fetch Payment Terms from Sales/Purchase Orders 2021-07-29 19:25:29 +05:30
Noah Jacob
449c58d809 refactor: suggested changes 2021-07-13 11:12:33 +05:30
Noah Jacob
a1a4e8d616 fix: Sider 2021-07-13 11:12:33 +05:30
Noah Jacob
e60a349432 test: updated test cases 2021-07-13 11:12:33 +05:30
Noah Jacob
d160e73c03 test: test case for fetching supplier group details 2021-07-13 11:12:33 +05:30
Noah Jacob
47c2317b1a feat: details fetched from supplier group in supplier 2021-07-13 11:12:33 +05:30
Rohit Waghchaure
61690775a8 feat: provision to make subcontracted purchase order from the production plan 2021-06-29 19:59:20 +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
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
marination
3b070d1b05 fix: Flaky test for Report Subcontracted Raw materials to be transferred 2021-06-14 14:51:33 +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
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
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
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
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
Alan
98fc4195b3 fix: send emails on rfq submit (#25695) 
* fix: send emails on rfq submit

* fix: check if email is present for supplier
 2021-05-14 12:22:28 +05:30
noahjacob
7715441842 feat: added supplier item group doctype 2021-05-09 20:02:23 +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
Nabin Hait
840c921229 Merge branch 'develop' into purchase-invoice-to-purchase-receipt-develop 2021-04-19 13:30:19 +05:30