Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,428 Commits 3 Branches 0 Tags 1 GiB
eaccef6116
Commit Graph

30785 Commits

Author SHA1 Message Date
Ankush Menat
7eab945d8c
refactor: move existing patches to post migration (#28940) 
Also remove duplicates :')
 2022-01-26 12:40:21 +05:30
marination
4c677eafe9 fix: Linter and minor code refactor 
- Create an indexed map of stale packed items table to avoid loops to check if packed item row exists
- Reset packed items if row deletion takes place
- Renamed functions to self-explain them
- Split long function
- Reduce function calls inside function (makes it harder to follow through)
 2022-01-26 01:10:24 +05:30
Ankush Menat
f5f3552abb test: cover more reports in test 2022-01-25 23:22:14 +05:30
Deepesh Garg
c68c70f8bc feat: Refund entry against loans 2022-01-25 19:59:33 +05:30
marination
f8a5786542 chore: SQL to QB & accomodate Update Items 
- `doc_before_save` does not exist via Update Items (updates stuff in the backend so doc isn't considered unsaved/dirty)
- converted more raw sql to qb and ORM
 2022-01-25 19:51:47 +05:30
marination
3f48fc1898 fix: Incorrect packing list for recurring items & code cleanup 
- Fix Incorrect packing list for recurring items in the Items table
- Re-organised functions based on external use and order of use
- Deleted `clean_packing_list` function and reduced no.of loops
- Raw SQL to QB
- Minor formatting changes
 2022-01-25 18:38:41 +05:30
Saqib Ansari
0b9a850a17
chore: add comment 2022-01-25 17:28:28 +05:30
Saqib Ansari
a73ad6759d fix(sales order): incorrect no. of items fetched while creating dn 2022-01-25 17:12:41 +05:30
Deepesh Garg
c6a17d1966
Merge pull request #29434 from frappe/mergify/bp/develop/pr-29404 
fix: Previous document currency getting overridden (backport #29404)
 2022-01-25 15:50:06 +05:30
Marica
a707d3705c
Merge pull request #29426 from marination/mr-safeguard 
fix: Use get for conditionally available fields while setting missing values
 2022-01-25 12:51:40 +05:30
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
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
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
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
Marica
b5abf68b0d
Merge branch 'develop' into e-commerce-refactor-develop 2022-01-12 02:52:03 +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
Deepesh Garg
d6ee678ec9
Merge pull request #29193 from ruthra-kumar/bug_deferred_report 
fix: deferred report division by zero exception
 2022-01-11 17:19:08 +05:30
Saqib Ansari
c45042c00e
feat: early payment discount on sales & purchase orders (#29101) 2022-01-11 15:03:07 +05:30
Rucha Mahabal
2b33e63d2c
fix: use get_all instead of get_list while fetching SLA doctypes (#29216) 
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-01-11 14:40:08 +05:30
Ankush Menat
754596dfc1
fix: "update cost" should ignore overridden routing times #29154 
fix: "update cost" should ignore overridden routing times
 2022-01-11 14:20:44 +05:30
Saqib Ansari
75c8b2556e
fix(pos): cannot ignore pricing rule for one particular invoice (#29222) 2022-01-11 13:25:42 +05:30
Saqib Ansari
c62083653b
fix(gl-report): group by cost center only if include_dimensions is checked (#28883) 2022-01-11 12:45:40 +05:30
Deepesh Garg
93d784dde3 Merge branch 'develop' of https://github.com/frappe/erpnext into currency-exchange-settings 2022-01-10 21:28:53 +05:30
Deepesh Garg
ca5ea5f55f fix: test cases 2022-01-10 21:28:29 +05:30
Marica
9d36e30ef7
Merge pull request #29131 from ankush/serial_no_patch 
fix(patch): serial no whitespace trimming
 2022-01-10 19:51:26 +05:30
Ankush Menat
f195f803ff test: account reports 2022-01-10 19:14:22 +05:30
Ankush Menat
2d76c05175 refactor: unnecessary joining of lists 2022-01-10 19:14:22 +05:30
Saqib Ansari
e5b649b588
fix: pos invoices consolidation case with permlevel (#29011) 2022-01-10 18:24:08 +05:30
Deepesh Garg
3fdd47e71f Merge branch 'develop' of https://github.com/frappe/erpnext into currency-exchange-settings 2022-01-10 17:32:15 +05:30
Deepesh Garg
e2dab6f421 fix: Cleanup and fixes 2022-01-10 17:31:38 +05:30
Ankush Menat
cbaa8fdade refactor: convert query to ORM 2022-01-10 16:13:52 +05:30
Ankush Menat
0faa116f97 fix(patch): serial no whitespace trimming 
old data can contain trailing/leading whitespace which doesn't work well
with code to find last SLE for serial no.
 2022-01-10 16:02:27 +05:30
ruthra
8026f86548 refactor: get project from basic transactions 
- sales order, sales invoice, purchase order and purchase order
- if project not found in transaction, get from items
 2022-01-10 12:58:58 +05:30
Deepesh Garg
7d85755595 fix(India): NIL Rated, Exempted and non gst invoices in GSTR-1 report 2022-01-10 12:50:34 +05:30
Conn Campbell
31123436fb
fix: Task Depends on not removed from Gantt chart (#28309) 
Co-authored-by: conncampbell <conncampbell@conzu.ca>
 2022-01-10 10:28:10 +05:30
Deepesh Garg
18c4ddadf1 fix: Test case 2022-01-07 20:57:15 +05:30
Deepesh Garg
30a647ff80 fix: Handle frozen books while handling 2022-01-07 19:52:38 +05:30
Deepesh Garg
2aea078699 Merge branch 'develop' of https://github.com/frappe/erpnext into deferred_revenue_multi_currency_jv 2022-01-07 19:06:16 +05:30
Shadrak Gurupnor
25c875e447
chore: remove framework patch for custom fields (#29117) 
* chore: patches were breaking during migration

* fix: rewrote the query in query builder

* chore: removed patch from patches.txt
 2022-01-07 18:54:50 +05:30
Deepesh Garg
68723c753f
Merge pull request #29191 from frappe/mergify/bp/develop/pr-29135 
fix: Show GL balance in Accounts Receivable and Payable summary (backport #29135)
 2022-01-07 18:51:01 +05:30
Deepesh Garg
b83608b029
Merge pull request #28994 from nextchamp-saqib/zero-qty-debit-note 
fix: cannot create debit note with zero qty
 2022-01-07 18:35:24 +05:30
Deepesh Garg
2de5122262
fix: Add iteritems back 2022-01-07 18:30:19 +05:30
Deepesh Garg
00055bb159
fix: Conflicts 2022-01-07 18:11:38 +05:30
Deepesh Garg
14689a51f4 Merge branch 'develop' of https://github.com/frappe/erpnext into deferred_revenue_multi_currency_jv 2022-01-07 16:49:57 +05:30
ruthra
fe4d7f86ee fix: deferred report division by zero exception 2022-01-07 16:30:56 +05:30
Deepesh Garg
bf5930c4bb fix: Show GL balance in Accounts Receivable and payable summary 
(cherry picked from commit 1d270dca05501b5a15d19e3270188029b48eafde)

# Conflicts:
#	erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
 2022-01-07 09:35:19 +00:00
Deepesh Garg
f6f449ed18
Merge pull request #29176 from deepeshgarg007/outstanding_amount_anomaly 
fix: Inconsistency in calculating outstanding amount
 2022-01-07 13:28:52 +05:30
Dany Robert
2e5f22a370
patch: run field creation patch 2022-01-07 13:01:19 +05:30
Deepesh Garg
a456cf4225
Merge pull request #29169 from deepeshgarg007/loan_repayment_salary_slip 
fix: GL Entries for loan repayment via Salary
 2022-01-07 12:54:25 +05:30
Deepesh Garg
d28d7119b0
Merge pull request #29171 from frappe/mergify/bp/develop/pr-29155 
fix: Currency in KSA VAT report (backport #29155)
 2022-01-06 19:00:38 +05:30
Deepesh Garg
9d3a5c3184 fix: Inconsistency in calculating outstanding amount 2022-01-06 18:58:49 +05:30
Dany Robert
63a4c1d926
chore: linter style 2022-01-06 18:48:02 +05:30
Dany Robert
00b2dede14
fix: function name issue 2022-01-06 18:42:56 +05:30
Dany Robert
90eb046ce6
fix: remove unwanted fields from KSA setup 2022-01-06 18:15:40 +05:30
Ankush Menat
24fc487dd8
fix: incorrect serial no valuation report showing cancelled entries (#29172) 2022-01-06 17:03:34 +05:30
Deepesh Garg
fe929304cf fix: Currency in KSA VAT report 
(cherry picked from commit 1d87e9d8f67e3611993d638f2d422fe66acf2c00)
 2022-01-06 10:53:14 +00:00
Deepesh Garg
80dce1ab73
Merge pull request #29125 from nextchamp-saqib/fix-reverse-jv 
fix: cannot create reverse journal entry
 2022-01-06 13:30:50 +05:30
Deepesh Garg
f316aaf41e fix: GL Entries for loan repayment via Salary 2022-01-06 13:19:17 +05:30
ruthra
ca17c7226c fix: get project from PO into payment entry 2022-01-06 11:34:47 +05:30
Rucha Mahabal
26247be3b8
fix: Earned Leave allocation from Leave Policy Assignment (#29163) 
* fix: Earned Leave allocation from Leave Policy Assignment

* test: Earned Leave Allocation from Leave Policy Assignment
 2022-01-06 11:21:59 +05:30
Saqib Ansari
fcc5fa14c8
fix: failing tests of first response time (#29153) 2022-01-05 20:44:06 +05:30
Saqib Ansari
fbd706f232
fix: existing party link validation (#29159) 2022-01-05 17:55:08 +05:30
Rucha Mahabal
ac816f4fed
fix(UX): validate setup on clicking Mark Attendance button in Shift Type (#29146) 2022-01-04 21:46:31 +05:30
Rucha Mahabal
72ef35bace
Merge branch 'develop' into accounting-dimension-mapping 2022-01-04 19:59:02 +05:30
Subin Tom
3febca1a9a
fix: Modifying Opening invoice creation tool timestamp (#29127) 2022-01-04 19:37:44 +05:30
Rucha Mahabal
5eeb94db31 fix: map Accounting Dimensions for Bank Entry against Payroll Entry 2022-01-04 19:21:16 +05:30
Subin Tom
19bb01c973
fix: POS items added to cart despite low qty (#29126) 2022-01-04 19:14:40 +05:30
Saqib Ansari
f4db474be0
fix: minor issues (#29130) 2022-01-04 19:12:19 +05:30
Anupam Kumar
08dcbd6fce
feat: allow user to change the parent company 2022-01-04 19:05:36 +05:30
Ankush Menat
733c9defdf
fix: update idx after updating items in so/po (#29134) 2022-01-04 18:39:30 +05:30
Chillar Anand
0900c3d655
refactor: Removed agriculture module from ERPNext (#29022) 2022-01-04 17:26:11 +05:30
Ankush Menat
e73c51bee6 test: fix test broken by todo schema change 2022-01-04 17:23:03 +05:30
Deepesh Garg
e311667a25 fix: Test case 2022-01-04 16:24:24 +05:30
Saqib Ansari
3aa1817f7b fix: cannot create reverse journal entry 2022-01-04 14:43:02 +05:30
Deepesh Garg
094158f287 fix: Add test case for multicurrency invoice 2022-01-04 14:04:18 +05:30
Nabin Hait
11cfa16158
fix: future recurring period calculation (#29083) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-01-04 11:38:49 +05:30
Deepesh Garg
98f294a8ae fix: Deferred revenue booking for multi currency invoices via JV 2022-01-03 19:40:47 +05:30
Saqib Ansari
7e777356ee
Merge pull request #28160 from resilient-tech/fix-invoice-statuses 
refactor: `update_invoice_status` with query builder
 2022-01-03 17:59:11 +05:30
Subin Tom
7385497219 fix: using get_batch_qty method to get available_qty 2022-01-03 16:57:00 +05:30
Subin Tom
267da48889 fix: added Sum() in query 2022-01-03 16:40:11 +05:30
Subin Tom
9e20fa85c1 fix: Removed validate_non_stock_items, filter_service_items methods 2022-01-03 14:46:53 +05:30
Saqib Ansari
568550874d
Merge branch 'develop' into pos-batch-no-stock-validation 2022-01-03 14:46:29 +05:30
rohitwaghchaure
f02e6b4631
fix: incorrect posting time fetching incorrect qty (#29103) 2022-01-03 14:28:34 +05:30
Saqib Ansari
d0f5beeb34
fix: filter query in bank reconciliation tool (#29098) 2022-01-03 11:33:03 +05:30
Subin Tom
6b973d658c
fix: sider issues 2022-01-03 10:47:13 +05:30
rohitwaghchaure
650b388bc1
Merge pull request #28458 from anupamvs/crm-carry-forward-communication-comments 
feat: carry forward communication and comments throughout the sales c…
 2022-01-03 10:19:56 +05:30
Deepesh Garg
c3d890f3f1
fix: get fiscal year based on date 2022-01-02 19:10:49 +05:30
Deepesh Garg
4b6217a683 fix: Test Case 
(cherry picked from commit 342658ea7028cc0d890200364cc08cf97e55d6d0)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
 2022-01-02 13:36:43 +00:00
Deepesh Garg
466e549842 fix(India): Tax and Charges template not getting fetched based on tax category assigned 
(cherry picked from commit 7a5937a98c3d74bdb1da79c3d5a8f49ef76ded2d)
 2022-01-02 13:36:41 +00:00
Deepesh Garg
db829a0610
Merge pull request #29050 from mohsinalimat/patch-1 
feat: Add currency in import download statement
 2022-01-02 17:15:01 +05:30
Deepesh Garg
ebc1039610
Merge pull request #29070 from frappe/pr-addded-to-po-dashboard 
refactor: Payment Request added to PO Dashboard
 2022-01-02 17:04:12 +05:30
Deepesh Garg
9c1773f56e
Merge pull request #28812 from rtdany10/ledger-merger 
feat: ledger merger
 2022-01-02 16:45:48 +05:30
Deepesh Garg
9199513de4
Merge pull request #29037 from wojosc/patch-20 
feat: update de.csv
 2022-01-02 16:29:43 +05:30
Raffael Meyer
a4e3d79bc1
revert: german translation of "Minute" 2021-12-31 17:43:10 +01:00
Raffael Meyer
538dffa617
fix: apply suggestions from review 2021-12-31 14:12:28 +01:00
Vaibhav Chopra
dbbc8d8aed
fix: leave_allocation variable not being defined (#29086) 2021-12-31 13:34:20 +05:30
Dany Robert
321730a88e
Merge branch 'develop' into ledger-merger 2021-12-31 13:02:12 +05:30
MohsinAli
72369092a3
Merge branch 'develop' into patch-1 2021-12-30 17:13:59 +05:30
Saqib Ansari
79ccf80faf
Merge branch 'develop' into zero-qty-debit-note 2021-12-29 17:32:16 +05:30
Kanchan Chauhan
8c4cdf7afc
refactor: Payment Request added to PO Dashboard 2021-12-29 16:44:20 +05:30
Saqib Ansari
689e08aca3
Merge branch 'develop' into pos-service-items 2021-12-29 14:55:20 +05:30
Pruthvi Patel
fc0dd3fcd7
Merge branch 'develop' into fix-invoice-statuses 2021-12-29 13:45:35 +05:45
Rohit Waghchaure
d9b9f4e8b7 fix: optimize patch for update bom in SO and MR 2021-12-29 10:14:03 +05:30
Deepesh Garg
b1d8815556
Merge pull request #28034 from deepeshgarg007/term_loan_enhancement 
fix: Updates in term loan processing
 2021-12-28 18:39:31 +05:30
Deepesh Garg
68d49817a1 fix: Add test for loan repayment cancellation 2021-12-28 18:10:52 +05:30
Deepesh Garg
f78bf4c6ef fix: Test cases 2021-12-28 17:40:05 +05:30
Anupam Kumar
2fd870ff15
Merge branch 'develop' into crm-carry-forward-communication-comments 2021-12-28 17:21:51 +05:30
Deepesh Garg
be5e6f02ae Merge branch 'develop' of https://github.com/frappe/erpnext into term_loan_enhancement 2021-12-28 17:14:24 +05:30
Rucha Mahabal
251ed3aa74
Merge branch 'develop' into multiple-cost-centers-against-employee 2021-12-28 17:10:32 +05:30
Rucha Mahabal
88df5ce530
fix: tests (#29051) 
* fix(test): create salary slip as per timesheet dates for Project Profitability

* fix(test): reload salary slip before checking for payment days
 2021-12-28 17:09:46 +05:30
Ankush Menat
087ebcae5a
Merge pull request #29014 from ankush/rename_sr_no 
fix!: disable renaming on serial nos
 2021-12-28 15:34:50 +05:30
Deepesh Garg
6405699821
Merge branch 'develop' into mergify/bp/develop/pr-28996 2021-12-28 14:46:12 +05:30
Marica
27b157de22
Merge pull request #29057 from deepeshgarg007/unit_test_fixes 
fix: Deferred revenue test case
 2021-12-28 14:43:53 +05:30
Marica
18eb47f693
Merge pull request #28555 from marination/independent-manu-entry 
fix: Validate Finished Goods for Independent Manufacture entries as well
 2021-12-28 14:36:32 +05:30
Deepesh Garg
6f933db3cc fix: Deferred revenue test case 2021-12-28 14:16:19 +05:30
Development for People
095a6e186f
fix: rename non existent doctype field to the right one (#29055) 2021-12-28 14:08:22 +05:30
Deepesh Garg
057cfb22d6 fix: Remove debug statement 
(cherry picked from commit becb39da902e7e113c3dacb7eee7921144b8e99d)
 2021-12-28 08:11:18 +00:00
Deepesh Garg
d807d78313 fix: Issues in Bank Reconciliation tool 
(cherry picked from commit ff183ee895fb0dd1ca595eb76e2286695063315a)
 2021-12-28 08:11:18 +00:00