Ankush Menat
88e257ff6d
fix: column name in party query
2022-04-26 11:47:05 +05:30
Ankush Menat
052171f51c
fix: date condition in tax rule
2022-04-26 11:47:05 +05:30
Ankush Menat
a90e7e32a4
fix: proper quoting in sql queries
2022-04-26 11:47:05 +05:30
Deepesh Garg
4ffea617ef
Merge pull request #30754 from deepeshgarg007/round_off_account_cost_center
...
fix: First preference to parent cost center rather than round off cost center
2022-04-25 17:06:19 +05:30
Deepesh Garg
3fa1c63479
test: Unit test for round off entry dimensions
2022-04-25 16:29:26 +05:30
Deepesh Garg
f064e0b15e
Merge pull request #30642 from rahib-hassan/separate-discount-account
...
feat: separate discount accounting for buying and selling
2022-04-25 14:07:20 +05:30
Deepesh Garg
02aaa6546c
chore: Remove dead code
2022-04-25 12:42:06 +05:30
rahib-hassan
6c86067d90
Merge branch 'develop' into separate-discount-account
2022-04-25 12:17:50 +05:30
Deepesh Garg
618fa0e8ea
Merge branch 'develop' into accpunting_dimension_validate_ignore_new
2022-04-24 20:55:50 +05:30
Deepesh Garg
afc6aa88f0
Merge pull request #30763 from deepeshgarg007/loan_reconciliation
...
fix: Add loan doctypes in bank clearance
2022-04-24 20:55:29 +05:30
Deepesh Garg
c515abc392
test: Remove teardown method
2022-04-24 19:20:29 +05:30
Deepesh Garg
c312cd3725
fix: Check if accounting dimension exists
2022-04-24 18:11:32 +05:30
Deepesh Garg
783793deac
Merge branch 'develop' of https://github.com/frappe/erpnext into round_off_account_cost_center
2022-04-23 21:40:38 +05:30
Deepesh Garg
015812b0b8
fix: Add accounting dimensions for round off GL Entry
2022-04-23 21:40:08 +05:30
Deepesh Garg
d4d83f4bb6
test: Fixes in test case
2022-04-23 12:33:35 +05:30
Deepesh Garg
0eacc99ab7
test: Fixes in test case
2022-04-23 12:08:30 +05:30
Deepesh Garg
9bb132fdd3
fix: Do not validate while creating accounting dimension
2022-04-22 13:39:43 +05:30
Deepesh Garg
8a8476bb5c
test: Add test coverage for bank clearance
2022-04-21 18:53:18 +05:30
Deepesh Garg
c42547d40f
fix: Use parent cost center for Sales and Purchase Invoice
2022-04-21 13:26:44 +05:30
rahib-hassan
02e17dbded
fix: removed manual enable-discount-account method
2022-04-21 02:42:42 +05:30
rahib-hassan
2c78cc2014
fix: removed manual rollback - enable discount account
2022-04-21 02:40:59 +05:30
Deepesh Garg
3d0e68acaa
fix: select doctype as payment_document
2022-04-20 19:49:53 +05:30
Deepesh Garg
c3e27b5556
fix: Loan doctypes in bank reconciliation
2022-04-20 19:07:53 +05:30
rahib-hassan
13092bcc2d
fix: enable discount roll_back
2022-04-20 16:46:29 +05:30
rahib-hassan
1e143e7479
fix: use @change_settings to enable_discount_account
2022-04-20 16:06:55 +05:30
rahib-hassan
f058755ad3
fix: test cases updated
2022-04-20 13:24:15 +05:30
Deepesh Garg
0ac11a5b30
fix: First preference to parent cost center rather than round off cost center
2022-04-20 12:18:11 +05:30
Ankush Menat
700e864d90
fix: sort stock vouchers before reposting GLE
2022-04-19 17:40:26 +05:30
rahib-hassan
52fd804aed
Merge branch 'develop' of github.com:rahib-hassan/erpnext into separate-discount-account
2022-04-18 14:13:46 +05:30
Bhavesh Maheshwari
72757994f8
fix: process statement to_date override
...
(cherry picked from commit 378d15d388ae9cac7a5f897af83c99605403503a)
2022-04-14 13:14:11 +00:00
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
Ankush Menat
0d64349142
Merge branch 'develop' into separate-discount-account
2022-04-14 17:29:28 +05:30
rahib-hassan
01fde15bd5
fix: dependent codes updated
2022-04-14 15:48:55 +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
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
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
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
Deepesh Garg
31883b699d
fix: Exchange gain and loss on advance jv allocation
2022-04-13 20:52:25 +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
bfaaebde0d
Merge branch 'develop' into separate-discount-account
2022-04-12 18:38:23 +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
9a1c560c82
fix: Do not show disabled dimensions in reports
2022-04-12 15:27:08 +05:30
Deepesh Garg
553178bfe7
test: Add test
2022-04-11 15:29:20 +05:30
Deepesh Garg
54eef3daad
Merge branch 'develop' of https://github.com/frappe/erpnext into deferred_revenue_default_account_fixes
2022-04-11 15:09:30 +05:30
Saqib Ansari
0373347a97
Merge branch 'develop' into separate-discount-account
2022-04-11 14:55:42 +05:30
