Ankush Menat
33c4a0b5a9
fix: bad default for non-existing serial nos
...
serial_no field should have empty string if it doesn't have any serial
nos
2022-01-21 15:27:10 +05:30
Ankush Menat
ea5efd0791
perf: single query to update serial nos
2022-01-21 15:27:10 +05:30
Noah Jacob
11c9a5a79f
fix: update status on visit cancel ( #29389 )
...
* fix: update status on cancelling visit
* test: updated test for cancelling visits
2022-01-21 14:48:33 +05:30
Saqib Ansari
c7e75f9551
Merge pull request #29385 from nextchamp-saqib/asset-fix-depr-fix
...
fix: first depreciation amount in asset
2022-01-21 14:25:43 +05:30
Saqib Ansari
eff1d6bf67
Merge branch 'develop' into grouped-asset-purchase
2022-01-21 14:20:47 +05:30
Saqib Ansari
a09259f175
Merge branch 'develop' into grouped-asset-purchase
2022-01-21 14:20:27 +05:30
Deepesh Garg
0d3b279fe6
Merge pull request #29362 from nextchamp-saqib/fix-cancel-jv
...
fix: cannot cancel jv after migrating from v12
2022-01-21 14:20:25 +05:30
Himanshu
f5ed0c83b7
fix(Timesheets): calculate to time ( #28589 )
...
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
2022-01-21 13:05:47 +05:30
Saqib Ansari
c3e890e59f
Merge branch 'develop' into fix-cancel-jv
2022-01-21 12:25:30 +05:30
Saqib Ansari
53addfda15
fix: sider issue
2022-01-21 12:23:52 +05:30
Saqib Ansari
0666996e4e
Merge pull request #29373 from nextchamp-saqib/validate-asset-cc
...
fix: cost center validation of asset
2022-01-21 12:21:49 +05:30
Saqib Ansari
ae580d116c
fix: failing test cases
2022-01-21 12:19:53 +05:30
Noah Jacob
20216fa9f1
fix: updated packed_items getting fetched on Sales Return / Credit Note ( #28607 )
...
* fix: updated packed_items getting fetched on sales return
* fix: updated test cases for product bundle returns
* fix: moved calculate_mapped_packed_items_return to stock.utils
* fix: updated packed_items getting fetched on Return/Credit Note
* refactor: change var name to avoid `self`
* fix: check item code before assigning parent item
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-01-21 11:50:13 +05:30
Saqib Ansari
0bbde4819b
fix: depreciation amount on selling an asset
2022-01-21 11:44:05 +05:30
Saqib Ansari
60bfead773
fix: first depreciation amount in asset
2022-01-21 11:32:55 +05:30
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
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
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