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
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
Saqib Ansari
1d976655f5
refactor: exclude submittable doctype from SLA ( #29286 )
2022-01-14 18:46:52 +05:30
Saqib Ansari
cc88b31f1f
test: remove sla if no active sla found
2022-01-14 18:17:40 +05:30
Saqib Ansari
b31679b6ef
fix: customer filter while fetching active sla
2022-01-14 16:31:48 +05:30
Saqib Ansari
0bfbfa3719
fix: reset sla if no active sla found
2022-01-14 16:13:17 +05:30
Saqib Ansari
a68fc546e7
refactor: do not allow submittable doctypes for SLA
2022-01-14 15:35:40 +05:30
Saqib Ansari
203fca45bf
fix: order of company form fields ( #29287 )
2022-01-14 14:59:58 +05:30
Deepesh Garg
b9b4c9aff7
Merge pull request #29270 from nextchamp-saqib/change-fieldtype
...
fix: threshold fields shows incorrect currency
2022-01-14 14:50:45 +05:30
Chillar Anand
39eb4e040c
fix(healthcare): Remove custom fields related to healthcare ( #29129 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2022-01-14 12:37:32 +05:30
Saqib Ansari
a9ab157198
fix: remove dashboard showing only issue count
2022-01-14 11:42:34 +05:30
Deepesh Garg
08f26de3df
fix: Remove comment
2022-01-13 23:05:27 +05:30
Deepesh Garg
1846dbfb4d
Merge branch 'develop' of https://github.com/frappe/erpnext into nil_exempt_non_gst_gstr_1
2022-01-13 22:40:20 +05:30
Deepesh Garg
55c445cd37
fix: JSON for nil/exempt and non gst
2022-01-13 22:39:57 +05:30
rohitwaghchaure
388293dbea
Merge pull request #29280 from rohitwaghchaure/company-filter-issue-for-default-account
...
fix: accounts are coming from different company in the dropdown
2022-01-13 21:11:55 +05:30
Shariq Ansari
dd56bf205a
fix: fixed card for buying workspace
2022-01-13 20:19:49 +05:30
Shariq Ansari
469bddcadf
fix: minor fix
2022-01-13 19:50:26 +05:30
Deepesh Garg
24bb1e8987
fix: Test case
2022-01-13 19:44:26 +05:30
Shariq Ansari
bc187c121a
fix: updated standard workspace json files
2022-01-13 19:24:11 +05:30
Marica
343f517740
Merge pull request #29271 from marination/allow-multiple-fg-in-repack
...
fix: Don't validate FG in repack entry
2022-01-13 15:27:22 +05:30
marination
c49dff385a
test: Check for FinishedGoodError if 0 FG in repack entry
2022-01-13 15:02:59 +05:30
marination
3922a39591
test: Basic test one item repacked into two
...
- Also run fg validation and fg marking after checking purpose, avoid unnecessary calls
2022-01-13 14:36:21 +05:30
Rucha Mahabal
3a18e62a9b
fix: filter for leave period in Bulk Leave Policy Assignment ( #29272 )
...
* fix: filter for leave period in Bulk Leave Policy Assignment
* fix: set title for Leave Policy Assignment
2022-01-13 14:08:11 +05:30
marination
eac7b5d5aa
fix: Allow multiple fg in repack entry
2022-01-13 13:44:20 +05:30
Rohit Waghchaure
dabe5981bb
fix: accounts are coming from different company in the dropdown
2022-01-13 12:51:34 +05:30
Saqib Ansari
0e1b8322c1
fix: threshold fields shows incorrect currency
2022-01-13 12:06:03 +05:30
mergify[bot]
82b2d22627
fix(Payroll): Cannot submit salary slips from amended payroll entry. (backport #29228 ) ( #29268 )
...
* fix: salary slip transaction state after payroll entry cancel
* fix: use db_set in on_cancel method
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 81f1b7dfeb68c5a70f4aa9bc0e24f7aedcd79669)
Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
2022-01-13 11:09:36 +05:30
Ankush Menat
c80d5f70bc
Merge branch 'develop' into maint_sch_link_fix
2022-01-12 19:46:52 +05:30
Ankush Menat
eb8d08b411
fix: remove all stock UOM conversion when changing stock UOM
2022-01-12 19:41:28 +05:30
Rucha Mahabal
5cda4ea39f
fix: autoname generated for Job Applicant is too long ( #29260 )
...
* fix: autoname generated for Job Applicant is too long
- autoname based on email and append number if exists instead of concatenating name, email, title
- add more search fields for context during selection
* test: Job applicant naming and fix related tests
2022-01-12 19:03:36 +05:30
Mohammed Yusuf Shaikh
8b5827ed6d
fix: from time and to time not updated in drag and drop action #29114
...
fix: from time and to time not updated in drag and drop action
2022-01-12 18:49:33 +05:30
Marica
efcfb825d7
Merge pull request #29257 from marination/fix-reset-wh-defaults
...
fix: Avoid resetting Default wh fields for Manufacture Entry
2022-01-12 16:44:33 +05:30
Saqib Ansari
11fae15bec
fix(asset): check if fixed asset account is set against company ( #29189 )
2022-01-12 13:23:18 +05:30
rohitwaghchaure
71466c6456
Merge pull request #29179 from rohitwaghchaure/fixed-incorrect-scrap-qty-in-manufacture
...
fix: incorrect scrap item qty
2022-01-12 13:13:30 +05:30
Saqib Ansari
aef432ee2f
fix: description not fetched in sales order analytics report ( #29230 )
2022-01-12 13:11:21 +05:30
Rohit Waghchaure
8f0b2fa90e
fix: incorrect scrap item qty
2022-01-12 11:30:20 +05:30
Ankush Menat
f8119563ca
fix(patch): enable all uoms on recently created sites
2022-01-11 17:49:30 +05:30
Ankush Menat
33aad4b950
fix: UOM autocomplete broken
...
All new recent sites seem to have all UOMs as disabled by default. The
desired behaviour is exact opposite of this.
2022-01-11 17:49:30 +05:30
