Commit Graph

41528 Commits

Author SHA1 Message Date
Ankush Menat
f4766ae4eb test: opening balance in stock balance report 2022-04-14 18:01:42 +05:30
Ankush Menat
8b2432dfa0 test: stock balance report tests 2022-04-14 18:01:42 +05:30
Ankush Menat
64ac22af82 refactor: add filter type info 2022-04-14 18:01:42 +05:30
HENRY Florian
e6aa28ea14
fix: update translation (#30716)
* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation
2022-04-14 17:46:47 +05:30
Ankush Menat
15576c1ce8
Merge pull request #30707 from marination/values-out-of-sync-jv
fix: Remove "Values Out of Sync" validation
2022-04-14 17:39:18 +05:30
Deepesh Garg
1659f1eb6d
Merge pull request #29963 from nabinhait/income-tax-computation
feat: Income tax computation Report
2022-04-14 15:31:17 +05:30
Deepesh Garg
e2fa9f708e
Merge pull request #30710 from deepeshgarg007/advance_jv_allocation
fix: Exchange gain and loss on advance Journal Entry allocation
2022-04-14 15:10:04 +05:30
Nabin Hait
cd2ab32242 fix: orginised code 2022-04-14 14:05:21 +05:30
Nabin Hait
bc7007d588
fix: get enabled deduction components
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2022-04-14 14:02:01 +05:30
Nabin Hait
d06b7378f8
fix: get enabled and submitted income tax slab
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2022-04-14 14:01:44 +05:30
Nabin Hait
67086e618d
fix: get enabled earning components
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2022-04-14 14:00:28 +05:30
Marica
87117313a1
Merge branch 'develop' into values-out-of-sync-jv 2022-04-14 13:41:27 +05:30
Deepesh Garg
c38be53ce8 test: Update customer in Sales Invoice 2022-04-14 13:26:47 +05:30
Suraj Shetty
11fa187263
Merge pull request #30715 from surajshetty3416/fix-exotel-call-log 2022-04-14 12:45:15 +05:30
Suraj Shetty
77599fe443 fix: Set correct options for link field
issue introduced via https://github.com/frappe/erpnext/pull/30711
2022-04-14 12:32:31 +05:30
Deepesh Garg
86cfa3a53f
Merge pull request #30712 from frappe/mergify/bp/develop/pr-30700
fix: Payment reco query with max invoice and payment amount limit (backport #30700)
2022-04-14 12:32:11 +05:30
Deepesh Garg
7536da0b41
Merge pull request #30675 from deepeshgarg007/item_wise_provisional_accounting
feat: Item-wise provisional accounting for service items
2022-04-14 12:30:50 +05:30
marination
d75d5ebe8d chore: Remove Values Out of Sync from Repost hourly job
- It runs after repost (after commiting), so it has 0 impact on repost itself
- Just that scheduled job log shows up as failed, while actually repost is done and repost document is "Completed"
- The check is inaccurate also, so best to remove this
- Users cant do anything about it anyway. This just piles up phantom failed jobs unneccessarily
2022-04-14 12:30:06 +05:30
Deepesh Garg
065c38152a Merge branch 'develop' of https://github.com/frappe/erpnext into item_wise_provisional_accounting 2022-04-14 12:04:21 +05:30
Deepesh Garg
ad171c6225 test: Update test case 2022-04-14 12:03:12 +05:30
Deepesh Garg
e6cb948a96 fix: Payment reco query with max invocie and payment amount limit
(cherry picked from commit 4008c95ac6afc3b06a0a602e3f469db61e1f0453)
2022-04-14 05:42:17 +00:00
Deepesh Garg
972d9ec5b4 test: Update customer 2022-04-14 11:10:41 +05:30
Suraj Shetty
5ed9b9f42f
Merge pull request #30711 from surajshetty3416/call-log-fixes 2022-04-14 10:05:52 +05:30
Suraj Shetty
6e837bcdfc style: Fix linter warning 2022-04-14 10:02:15 +05:30
Suraj Shetty
c272170b86 fix(call log): Convert Data to Link for type_of_call
Convert `Data` to `Link` for type_of_call,
employee_user_id and call_received_by fields
2022-04-14 09:51:54 +05:30
Deepesh Garg
31883b699d fix: Exchange gain and loss on advance jv allocation 2022-04-13 20:52:25 +05:30
Ankush Menat
79fbc2c504
test: flaky PR close test (#30709) 2022-04-13 20:42:25 +05:30
Suraj Shetty
d890ee9495
Merge pull request #29962 from nemesis189/exotel-fixes
fix: Exotel Call Log fixes
2022-04-13 20:36:03 +05:30
Suraj Shetty
ff41b8da4e fix: Update received_by if "to" is changed 2022-04-13 20:12:08 +05:30
Suraj Shetty
cef28df8db test: Do not overwrite frappe.form_dict to retain proxy reference
Set frappe.local.form_dict instead
2022-04-13 19:10:19 +05:30
marination
89fab78027 fix: Remove "Values Out of Sync" validation from Journal Entry
- Even if there is a difference there's not much a user can do
- Checking it at the JV level is senseless. Blindly making users post another JV will lead to more error.
- Users making JV are usually accountants who know what they are doing
- The validation computes incorrect values for an account that contributes partially to warehouse's value.
2022-04-13 18:44:50 +05:30
Ankush Menat
71de754368
ci: coverage not getting processed (#30704) 2022-04-13 18:23:22 +05:30
Ankush Menat
0f09042962
chore(deps)!: Drop pandas as dependency (#30598)
depends on https://github.com/frappe/erpnext/pull/30597
depends on https://github.com/frappe/erpnext/pull/30584 


Closes https://github.com/frappe/erpnext/issues/27047 (read for more details)
2022-04-13 09:55:47 +00:00
Raffael Meyer
6453fb4cea
refactor!: remove DATEV integration (#30584)
The DATEV integration follows the trend and moves into a separate app.

- the DATEV Integration will be maintained at https://github.com/alyf-de/erpnext_datev (version-14 branch)
- the German Compliance and Localization will be maintained at https://github.com/alyf-de/erpnext_germany
2022-04-13 09:24:19 +00:00
Marica
143067f5a7
Merge pull request #30688 from marination/pp-wo-company
fix: Map Production Plan company in subassembly WO created from it
2022-04-13 12:43:15 +05:30
Marica
c5247a0767
Merge branch 'develop' into pp-wo-company 2022-04-13 11:52:15 +05:30
marination
6315acc450 fix: Map correct company to PO made via Prod Plan (subcontract) 2022-04-13 11:47:58 +05:30
Deepesh Garg
228195ba74
Merge pull request #30689 from deepeshgarg007/disabled_gl_dimensions
fix: Do not show disabled dimensions in reports
2022-04-12 16:11:07 +05:30
Deepesh Garg
4f9b38a591
Merge pull request #30686 from nabinhait/ignore-permlevel-for-fields
feat: Ignore permlevel for specific fields
2022-04-12 15:55:28 +05:30
Noah Jacob
8261b2bb4f
refactor: trigger generate schedule when any change made in items table (#29874)
* refactor: trigger generate schedule when any change made in items table

* chore: added serial validation on server side

* test: serials updated in schedules after save

* fix: schedule not generating after updating some fields

* feat: generate_schedule is triggered on_save when items table is changed

* test: updated tests to check other field changes on save

* chore: removed serial validation function for schedules table and added no_of_visits validation function

* test: updated for manually deleted schedele rows

* refactor: updated validate_items_table_change to return bool

* test: updated test_schedule_with_serials to cover validate_items_table_change

* fix: linting
2022-04-12 15:30:49 +05:30
Deepesh Garg
9a1c560c82 fix: Do not show disabled dimensions in reports 2022-04-12 15:27:08 +05:30
marination
2777c5c67c fix: Map Production Plan company in subassembly WO created from it 2022-04-12 14:30:01 +05:30
Nabin Hait
993c6c0de9 feat: Ignore permlevel for specific fields 2022-04-12 12:24:47 +05:30
Ankush Menat
60fb71bd2a
fix: ignore item-less maintenance visit for sr no (#30684) 2022-04-12 11:14:02 +05:30
Deepesh Garg
7d263e9ecf
Merge pull request #30651 from deepeshgarg007/gst_download_json_key_error
fix: Download JSON for GSTR-1 report
2022-04-12 00:06:25 +05:30
Marica
014298a867
Merge pull request #30674 from marination/work-order-partial-transfer
fix: Handle multiple item transfer in separate SEs against WO
2022-04-11 17:23:57 +05:30
Deepesh Garg
79b90118e1
Merge branch 'develop' into gst_download_json_key_error 2022-04-11 17:15:04 +05:30
Deepesh Garg
76d3c3d617
Merge pull request #30602 from deepeshgarg007/deferred_revenue_default_account_fixes
fix: Deferred Revenue/Expense Account validation
2022-04-11 17:03:01 +05:30
Marica
3f8be3ac10
Merge branch 'develop' into work-order-partial-transfer 2022-04-11 16:49:22 +05:30
marination
5aa60bb651 test: Multiple RM transfer in separate Stock Entries
- Added test and acceptance of 0 as For Quantity in test helper
2022-04-11 16:44:55 +05:30