Commit Graph

43341 Commits

Author SHA1 Message Date
Sagar Sharma
c71f805667
Merge pull request #32738 from vishdha/pr_dashboard
fix: Added Material Request Reference in Purchase Recipt Dashboard for Tracking
2022-10-28 14:23:54 +05:30
Vishal Dhayagude
db0f2c0b10
Merge branch 'develop' into pr_dashboard 2022-10-28 13:36:43 +05:30
Deepesh Garg
09fa2298ba
Merge pull request #32716 from deepeshgarg007/bank_account_filter
fix: Company bank account filter in Bank Clearance
2022-10-28 12:53:53 +05:30
Vishal
e8c0157017 chore: minor linting issue fixed 2022-10-28 11:59:10 +05:30
Vishal
a04c44fe34 chore: Added Material Request Reference in Purchase Recipt Dashboard for Tracking 2022-10-28 11:36:14 +05:30
Deepesh Garg
16959c0a8c
Merge pull request #32717 from deepeshgarg007/discount_section_collapse
fix: Add condition for discount section collapse
2022-10-28 11:24:25 +05:30
Deepesh Garg
591291caee
Merge pull request #32724 from deepeshgarg007/ap_report_filter_fixes
fix: Filter fixes in Accounts Payable report
2022-10-28 11:23:52 +05:30
Deepesh Garg
a5a73ba857 fix: Filter fixes in Accounts Payable report 2022-10-26 21:18:50 +05:30
Deepesh Garg
4cd65027c4 fix: Add condition for discount section collapse 2022-10-26 16:48:24 +05:30
Deepesh Garg
f9f78c1086 fix: Company bank account filter in Bank Clearance 2022-10-26 11:02:14 +05:30
rohitwaghchaure
183662c0e2
Merge pull request #32693 from rohitwaghchaure/searchfield-not-working-for-customer-supplier
fix: Search field not working for customer, supplier
2022-10-24 17:11:27 +05:30
Rohit Waghchaure
5f84993bae test: added test case to validate seachfields for customer, supplier 2022-10-24 16:10:47 +05:30
Rohit Waghchaure
46d148defd fix: searchfield not working for cuctsomer, supplier as per customize form 2022-10-24 15:48:34 +05:30
Deepesh Garg
48808aeb8a
Merge pull request #32424 from deepeshgarg007/loan_schedule_types
feat: Repayment schedule types for term loans
2022-10-23 19:37:40 +05:30
Deepesh Garg
e59b147a62 chore: Update tests 2022-10-23 18:51:51 +05:30
Deepesh Garg
77d509eb9a
Merge pull request #32650 from barredterra/unset-contact-details
fix: unset contact details
2022-10-23 18:21:01 +05:30
Deepesh Garg
ef0cb17faf chore: Add repayment date on option 2022-10-22 23:46:01 +05:30
ruthra kumar
eedf7e44a2
Merge pull request #32651 from ruthra-kumar/report_payment_ledger
feat: Payment Ledger report
2022-10-21 11:25:24 +05:30
Deepesh Garg
51d8e9dc5e Merge branch 'develop' of https://github.com/frappe/erpnext into loan_schedule_types 2022-10-20 18:35:16 +05:30
Deepesh Garg
2a50a0ce69
Merge pull request #32551 from codezart/subscription-plan-fix-months
fix: number of months subscription plan
2022-10-20 17:24:24 +05:30
Ankush Menat
11207c4e56 fix: dont update item info twice
[skip ci]
2022-10-20 16:18:48 +05:30
Devin Slauenwhite
b88e850d55
perf: cache barcode scan result (#32629)
* perf: cache barcode scan result

* feat: BarcodeScanResult type

* fix: use safe `get_value` `set_value`

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2022-10-20 15:56:07 +05:30
rohitwaghchaure
adeb1f92c8
Merge pull request #32667 from rohitwaghchaure/fixed-bom-cost-update-message
fix: BOM cost update message
2022-10-20 14:36:43 +05:30
Rohit Waghchaure
9cfe527492 fix: BOM cost update message 2022-10-20 13:49:46 +05:30
Deepesh Garg
1ca472cc8a chore: Linting issues 2022-10-20 12:09:42 +05:30
Deepesh Garg
b4d008b743
Merge branch 'develop' into subscription-plan-fix-months 2022-10-20 12:07:44 +05:30
Deepesh Garg
ae54610b2a
Merge pull request #32659 from deepeshgarg007/inter_company_purchase_doc_address
fix: Billing Address for inter-company purchase docs
2022-10-20 11:58:53 +05:30
rohitwaghchaure
873502c95d
Merge pull request #32654 from rohitwaghchaure/fixed-conversion-issue-in-material-request
fix: incorrect qty in material request created from PP
2022-10-20 09:59:19 +05:30
Deepesh Garg
796f2d3c09 fix: Billing Address for inter-company purchase docs 2022-10-19 23:50:39 +05:30
FinByz Tech Pvt. Ltd
c52b41d311
feat(report): added account wise redirection
* feat(report):added account wise redirection

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2022-10-19 23:14:10 +05:30
Raffael Meyer
4ad3002861
fix: allow to create Sales Order from expired Quotation (#32641) 2022-10-19 22:07:02 +05:30
ruthra kumar
6e55b419a6 test: invoice outstandings and payments 2022-10-19 21:49:13 +05:30
ruthra kumar
8f60f0a0cf feat: Basic Payment Ledger report 2022-10-19 21:49:08 +05:30
Rohit Waghchaure
4d5ef721f7 test: validate qty and purchase uom in material request which is created from PP 2022-10-19 19:08:27 +05:30
Rohit Waghchaure
ad278b2007 fix: incorrect qty in material request 2022-10-19 18:38:34 +05:30
rohitwaghchaure
de4c0528f9
Merge pull request #32645 from rohitwaghchaure/fixed-capacity-planning-error
fix: overlap error not raised for job card in case of workstation with production capacity
2022-10-19 17:04:48 +05:30
barredterra
23f0bb45b0 fix: unset contact details 2022-10-19 12:26:56 +02:00
Deepesh Garg
430492152f
fix: Advance paid amount in orders (#32642) 2022-10-19 15:37:13 +05:30
Rohit Waghchaure
8b2165e0d1 fix: overlap error not raised for job card in case of workstation with production capacity 2022-10-19 14:19:50 +05:30
ruthra kumar
f844097f8e
Merge pull request #32635 from ruthra-kumar/fix_tax_or_charges_acc_updating_voucher_outstanding
fix: Integrity Error on PLE while submitting sales invoice
2022-10-19 09:43:24 +05:30
Maharshi Patel
96b4211ea1
fix: pricing rule for non stock UOM and conversions
* fix: pricing rule for non stock UOM and conversions
2022-10-18 22:26:11 +05:30
ruthra kumar
8f42e7f703 test: use payable account in tax and to trigger party validation 2022-10-18 17:27:46 +05:30
rohitwaghchaure
f08c42e920
Merge pull request #32520 from s-aga-r/refactor/stock/reports
refactor: rewrite stock reports queries in qb
2022-10-18 13:48:15 +05:30
Sagar Sharma
ae8a63827d
Merge branch 'develop' into refactor/stock/reports 2022-10-18 10:48:52 +05:30
Deepesh Garg
7184330acd
Merge pull request #32527 from s-aga-r/refactor/buying/reports
refactor: rewrite buying reports queries in qb
2022-10-18 10:06:10 +05:30
ruthra kumar
43b80683eb fix: party type and party mandatory on updating outstanding 2022-10-18 09:33:37 +05:30
Deepesh Garg
32117c030a
Merge pull request #32622 from deepeshgarg007/ignore_pi_reference
fix: Ignore linked purchase invoice on cancel
2022-10-17 19:38:26 +05:30
Deepesh Garg
faadf78332 fix: Ignore linked purchase invoice on cancel 2022-10-17 18:50:54 +05:30
ruthra kumar
aab325eca5
Merge pull request #32598 from ruthra-kumar/refactor_create_payment_ledger_function
refactor: split ple creation function into two
2022-10-17 18:44:36 +05:30
ruthra kumar
9b50221bf0 refactor: split ple creation function into two
refactor create_payment_ledger_entry function into 2.
one for generating ple map and one for DB entry creation
2022-10-17 18:02:52 +05:30