mergify[bot]
f469ec87d9
fix: broken patches (backport #29067 ) ( #29406 )
...
* chore: patch fixes
(cherry picked from commit 8b5b146f6d2720587a16f78a8d47840be8dca2b7)
# Conflicts:
# erpnext/patches/v13_0/make_homepage_products_website_items.py
* fix: remove desktop icons while deleting sales reports
(cherry picked from commit 5f72026cb932d01fc827c382747e996a94b441fd)
* refactor: dont ignore dangerous exceptions in patches
(cherry picked from commit 0aa1ea8aeb7757592616bd491de98c69fef08854)
* fix: make patch kinda idempotent
with previous query rerunning would've caused all values to become 0.
* chore: conflicts
* fix: check type before patching
Co-authored-by: Saurabh <saurabh6790@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-01-25 11:14:08 +05:30
Ankush Menat
b8fbfed096
fix: fetch "transfer material against" from BOM ( #29435 )
2022-01-24 21:45:51 +05:30
Deepesh Garg
b72cdb4bca
fix: Previous document currency getting overriden
...
(cherry picked from commit ef782fd35b0717e3f7c50dbb6c5dde7c96ae9ef6)
2022-01-24 15:19:54 +00:00
Rucha Mahabal
a1f0cb4ed1
fix: honour 'include holidays' setting while marking attendance for leave application ( #29425 )
2022-01-24 19:05:24 +05:30
Ankush Menat
3d3f0139fd
test: clear singles cache for changed settings ( #29430 )
2022-01-24 18:44:08 +05:30
marination
78b6b29a57
fix: Use get for conditionally available fields while setting missing values
...
- Due to custom field "supplier" and missing field "supplier_address", dot operator breaks
- Make sure to use "get" instead of just dot operator if field is in some doctypes, not all
2022-01-24 13:39:10 +05:30
Deepesh Garg
108d1045e6
Merge pull request #29360 from ruthra-kumar/test_case_deferred_report
...
test: unit test for deferred item with zero months
2022-01-24 12:41:37 +05:30
Deepesh Garg
34be90b396
Merge pull request #29407 from ruthra-kumar/dimension_in_opening_invoice
...
fix: opening invoice creation tool can fetch multiple accounting dimension
2022-01-24 12:36:20 +05:30
rohitwaghchaure
19b1b7f8cc
Merge pull request #29419 from rohitwaghchaure/fix-incorrect-rm-qty-in-stock-entry
...
fix: incorrect raw materials quantity in manufacture stock entry
2022-01-24 12:13:54 +05:30
Rohit Waghchaure
f8d232ac26
fix: incorrect raw materials quantity in manufacture stock entry
2022-01-24 11:35:06 +05:30
rohitwaghchaure
a3ec78991f
Merge pull request #29353 from anupamvs/crm-contact-duplication-develop
...
fix: contact duplication on converting lead to customer
2022-01-24 10:16:49 +05:30
ruthra
f122a47d0d
refactor: fix failing test cases
2022-01-24 10:08:25 +05:30
ruthra
80ea163953
fix: linter issue
2022-01-23 21:49:02 +05:30
mergify[bot]
8e3cd1ab31
fix: Don't delete barcode while saving Item ( #29411 ) ( #29417 )
...
(cherry picked from commit 096e7b9ec5e3b67983cfa3a06335fba435f88c97)
Co-authored-by: Britlog <info@britlog.com>
2022-01-23 17:04:55 +05:30
ruthra
88463dc494
test: validating custom accouting dimension in opening invoice tool
...
- create new dimension 'department'
- assign and validate department in opening invoices
2022-01-21 19:33:06 +05:30
ruthra
e2267cdba8
fix: opening invoice creation tool not taking in accouting dimension
2022-01-21 19:21:26 +05:30
Saqib Ansari
0a24953906
Merge pull request #29367 from nextchamp-saqib/fix-credit-balance-report
...
fix: bypass_credit_limit_check in credit balance report
2022-01-21 16:36:48 +05:30
Ankush Menat
dc8dad4456
fix(patch): skip patch if column doesn't exist
2022-01-21 16:12:13 +05:30
Saqib Ansari
58cc3b32fa
Merge pull request #29334 from nextchamp-saqib/grouped-asset-purchase
2022-01-21 15:33:13 +05:30
Ankush Menat
4fa93e246e
test: create and cancel sr no with stock reco
2022-01-21 15:27:10 +05:30
Ankush Menat
203f0086f8
fix(patch): update stock reconciliation current serial nos
...
When current serial nos are non-existing there shouldn't be any value in
current_serial_no field.
2022-01-21 15:27:10 +05:30
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
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
