Commit Graph

40098 Commits

Author SHA1 Message Date
marination
a9ff1fc52e fix: (enhance) BOM Operations Report
- Added filters in the Report for BOM ID, Item Code and Workstation
- Converted Raw SQL to frappe.qb and added method to get filtered data
- Changed fieldtype of 'Time in mins' from Int to Float
- Get BOM wise grouped data to  keep order and accurate grouping in report
2022-01-20 13:36:46 +05:30
Deepesh Garg
c8489d630b
Merge pull request #29369 from frappe/mergify/bp/develop/pr-29366
fix: Cleanup empty rows on bank statement import (backport #29366)
2022-01-20 12:14:36 +05:30
Chillar Anand
2718ddd784
refactor: Removed hospitality domain from ERPNext (#29167) 2022-01-20 11:57:22 +05:30
Saqib Ansari
4390adcaa1 fix: cost center validation of asset 2022-01-20 11:54:14 +05:30
Deepesh Garg
e34da90653 fix: Cleanup empty rows on bank statement import
(cherry picked from commit 25398d017bca53f14c7ebb6c9f937ef7c1390093)
2022-01-20 05:55:43 +00:00
Saqib Ansari
50c276f64f fix: bypass_credit_limit_check in credit balance report 2022-01-20 10:56:49 +05:30
Saqib Ansari
04d64567ef fix: cannot cancel jv after migrating from v12 2022-01-19 19:37:55 +05:30
Saqib Ansari
d36092d448 patch: set default asset quantity as 1 2022-01-19 18:27:19 +05:30
ruthra
1e0450ed17 test: unit test for deferred items with zero months 2022-01-19 15:51:40 +05:30
ruthra
ed0f9cc063 refactor: a more generalized way to clear old entries for test cases 2022-01-19 15:50:04 +05:30
Saqib Ansari
a5643d500e test: purchase of grouped assets 2022-01-19 15:31:31 +05:30
Saqib Ansari
7d8eef5c4e fix: cannot set asset quantity for existing assets 2022-01-19 15:31:20 +05:30
Rucha Mahabal
5ae44f3a02
chore: set title and search fields in HR and Payroll doctypes (#29351) 2022-01-19 14:42:52 +05:30
Anupam
6ebee9b4c4 fix: changed function name 2022-01-19 13:05:48 +05:30
Anupam Kumar
21287b18de
Merge branch 'develop' into crm-contact-duplication-develop 2022-01-19 12:55:31 +05:30
Anupam
e44c4e007a fix: contact duplication on converting lead to customer 2022-01-19 12:54:00 +05:30
Marica
b9f70edacb
Merge pull request #28843 from noahjacob/maint_sch_link_fix
refactor: update_serial_no function for old Maintenance Visits
2022-01-19 12:49:11 +05:30
Saqib Ansari
34fad75f5d
Merge pull request #29342 from nextchamp-saqib/minor-onboarding-fix
fix: minor onboarding fixes
2022-01-18 19:52:10 +05:30
Saqib Ansari
0efdbae783 fix: minor onboarding fixes 2022-01-18 18:38:59 +05:30
Rushabh Mehta
fcf12c4054 fix(minor): allow SLA update without permission check 2022-01-18 18:07:11 +05:30
Ankush Menat
b578dc9978
fix!: drop old broken demo files (#29339)
* fix!: drop old broken demo files

* chore: correct license
2022-01-18 17:43:27 +05:30
Saqib Ansari
35a6b58c12 feat: purchase grouped asset 2022-01-18 13:10:23 +05:30
Ankush Menat
fabe0bce15
fix: enable allow negative stock by default in reposts (#29331)
Negative stock validation is done BEFORE reposting as such it's not
required to be performed again and most likely this fails on old
intermediate data where user has no clue why it failed.
2022-01-18 11:48:44 +05:30
Ankush Menat
48f3d53556
fix: cover case when all material needs to be bought (#29326)
When material request is to be made for purchase qty should be converted
to purchase UOM
2022-01-17 22:14:42 +05:30
Maxwell Morais
9cd26fbb6a
fix: purchase to Stock UOM conversion on Production Plan #28570
fix: purchase to Stock UOM conversion on Production Plan
2022-01-17 21:50:18 +05:30
Noah Jacob
dec7513773 fix: Serial No. filters for unscheduled visits 2022-01-17 18:31:58 +05:30
Marica
dbda10e092
Merge pull request #28987 from ankush/fix/srvaluation
fix: incorrect serial no valuation
2022-01-17 16:55:21 +05:30
Rucha Mahabal
6aac8de53e
feat(UX): Option to exclude holidays while marking monthly attendance (#29185) 2022-01-17 16:28:46 +05:30
Deepesh Garg
6bea91e9fe
Merge pull request #29182 from ruthra-kumar/project_in_purchase_invoice
fix: get project from PO into payment entry
2022-01-17 15:04:03 +05:30
Deepesh Garg
09172002e7 fix: Linting issues 2022-01-17 15:01:17 +05:30
Rucha Mahabal
b07c1f3bf1
feat: add link to leave application in leave notification (#29316) 2022-01-17 14:37:25 +05:30
Ankush Menat
3db8d908dc
Merge pull request #29278 from shariquerik/update-workspace-json
fix: Updating public workspace json based on new design
2022-01-17 13:25:16 +05:30
Marica
773ed2ba7b
Merge branch 'develop' into maint_sch_link_fix 2022-01-17 13:13:56 +05:30
rohitwaghchaure
9088984481
Merge pull request #29304 from ankush/fix/zero_valued_reposts
fix: dont update sle values from get_gl_entries
2022-01-17 11:59:17 +05:30
Anupam Kumar
4d48035828
fix: show work order progress bar even it is closed (#29312) 2022-01-17 11:49:57 +05:30
Noah Jacob
d39ffeeef0
Merge branch 'develop' into maint_sch_link_fix 2022-01-17 10:34:07 +05:30
Ankush Menat
66bf21f143
fix(patch): sle.serial_no = "\n" causes incorrect queue (#29306)
This happens due to old data.
2022-01-16 20:45:59 +05:30
Ankush Menat
82ea958730
fix: ignore cancelled SLEs (#29303) 2022-01-16 20:19:04 +05:30
Ankush Menat
5d27a7672e test: serial no valuation test case 2022-01-16 17:54:12 +05:30
Ankush Menat
0272397e54 test: make sure zero incoming rate is maintained while consuming 2022-01-16 13:24:40 +05:30
Ankush Menat
b0cf6195e9
fix: only add stock queue if FIFO (#29302) 2022-01-16 13:02:23 +05:30
Ankush Menat
8f5772463c fix: dont update sle values from get_gl_entries 2022-01-16 12:42:44 +05:30
Ankush Menat
fcc885bc16 fix: get incoming rate only if not return 2022-01-16 12:40:25 +05:30
Ankush Menat
b9642a1036 fix: incorrect incoming rate computation for sr no 2022-01-16 12:39:34 +05:30
Deepesh Garg
1e34300f69
Merge branch 'develop' into project_in_purchase_invoice 2022-01-15 21:00:14 +05:30
Deepesh Garg
3438e1f0c4
Merge pull request #29175 from rtdany10/patch-14
fix: seperate custom field creation for KSA
2022-01-15 20:52:57 +05:30
Dany Robert
2b681f04fd
fix: exclude existing serial numbers while auto creating new #29292
fix: exclude existing serial numbers while auto creating new
2022-01-15 20:08:11 +05:30
Deepesh Garg
14e0d00a61
Merge pull request #29115 from deepeshgarg007/deferred_revenue_multi_currency_jv
fix: Deferred revenue booking for multi currency invoices via JV
2022-01-15 18:55:41 +05:30
Deepesh Garg
fd922f1617 fix: Remove unwanted test 2022-01-15 18:27:40 +05:30
Deepesh Garg
ae95439c7e
Merge pull request #29208 from deepeshgarg007/nil_exempt_non_gst_gstr_1
fix(India): NIL Rated, Exempted and non gst invoices in GSTR-1 report
2022-01-14 19:43:40 +05:30