Commit Graph

41586 Commits

Author SHA1 Message Date
Ankush Menat
cce35c1536
fix(patch): delete hospitality custom fields (#29382) 2022-01-20 19:42:08 +05:30
Anupam Kumar
ebb9d8d45b
Merge branch 'develop' into crm-contact-duplication-develop 2022-01-20 17:30:14 +05:30
Marica
180f06dae2
Merge pull request #29375 from marination/bom-ops-report
fix: (enhance) BOM Operations Report
2022-01-20 14:54:31 +05:30
Ankush Menat
7e407bcc42
fix: show stock UOM for material transfers (#29376) 2022-01-20 14:49:39 +05:30
marination
af734298c8 fix: Allow only BOM with ops in BOM ID filter & add total row to report 2022-01-20 14:29:18 +05:30
marination
3c7b772112 fix: Sider (unused imports) and Linter(add extra empty line) 2022-01-20 14:19:08 +05:30
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
Saqib Ansari
b8c41e3030 test: item price on remove pricing rule 2022-01-20 13:06:56 +05:30
Saqib Ansari
f6dda738dc fix: ignore pricing rule in all transactions 2022-01-20 12:22:56 +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
Saqib Ansari
3da2cac772 chore: undo unnecessary changes 2022-01-20 12:09:04 +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
ChillarAnand
f423de530a refactor: Code cleanup 2022-01-20 11:14:33 +05:30
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
Krithi Ramani
8c536ffb20 bypass selling price validation for free item 2022-01-19 15:27:09 +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
Deepesh Garg
4abc7da2c0 chore: Add test case 2022-01-19 14:28:00 +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
Deepesh Garg
d37feb8208 feat: Splitting group assets 2022-01-19 10:00:05 +05:30
barredterra
663c594ead feat: option to disable tax category 2022-01-18 21:16:29 +01:00
barredterra
f60e040d69 feat: option to disable Item Tax Template 2022-01-18 21:15:27 +01:00
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
Rucha Mahabal
17b1f5f256 test: employee advance status 2022-01-18 18:35:25 +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
Rucha Mahabal
85be0d22d4 fix: employee advance status update on return via additional salary 2022-01-18 14:38:16 +05:30
Rucha Mahabal
0843d43885 fix(Expense Claim): validate advances after setting totals 2022-01-18 14:37:45 +05:30
Rucha Mahabal
bf30932de0 patch: Employee Advance return statuses 2022-01-18 14:36:38 +05:30
Rucha Mahabal
e04b3aaf7a feat(Employee Advance): add 'Returned' and 'Partly Claimed and Returned' status 2022-01-18 14:36:22 +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
Subin Tom
845c02a989 fix: remove qty indicator from non stock items 2022-01-17 20:49:11 +05:30
Subin Tom
27b35d72e2 fix: sider fix 2022-01-17 19:53:39 +05:30
Subin Tom
ac9a9fb229 fix: removing get_value call by returning is_stock_item in get_stock_availability method 2022-01-17 19:38:05 +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