Deepesh Garg
3f376cc3a5
fix: Parent dimension filters in orders
2022-06-02 13:57:54 +05:30
Sun Howwrongbum
48bde2de2a
fix: Trial Balance failing to ignore Finance Book
2022-06-01 20:20:16 +05:30
hrzzz
c4af63ad98
feat: two new groupby mode: Monthly, Payment Term
2022-05-31 10:46:56 -03:00
Mitchy25
a0c412a0dd
Ignore Cancelled GL Entries
...
Profitability Analysis includes 'is_cancelled' GL Entries which means that the profit numbers are incorrect. This change will ensure that the profit figures ignore cancelled GL Entries.
2022-05-31 15:25:09 +12:00
ruthra kumar
4c74637c91
refactor: remove naming expression for payment ledger
2022-05-30 19:06:56 +05:30
HarryPaulo
4b04694c2c
fix(pos): freeze screen while processing pos invoices ( #30850 )
2022-05-27 12:16:07 +05:30
Sagar Sharma
bcaac8f90f
Merge branch 'develop' into subcontracting
2022-05-26 15:01:23 +05:30
Saqib Ansari
ca75d814a3
fix: timesheet fetching in sales invoice
...
(cherry picked from commit 216c32f4bc13376335ae31bd09fe6b5c01855ba2)
2022-05-25 14:45:41 +00:00
xdlumertz
c5e922c76b
fix: Chart data for monthly periodicity in Cash Flow report ( #31039 )
...
fix: Chart data for monthly periodicity in Cash Flow report
2022-05-25 19:39:59 +05:30
Deepesh Garg
efa5b5b3db
Merge pull request #31038 from alyf-de/taxes-title-field
...
feat: show title when linking Taxes and Charges Template
2022-05-25 19:28:59 +05:30
Deepesh Garg
d68187caae
Merge branch 'develop' into loan_doc_reco_queries
2022-05-25 18:50:54 +05:30
Deepesh Garg
9e4a36089e
chore: Linting Issues
2022-05-25 18:10:42 +05:30
Deepesh Garg
a1f53f8d31
chore: Linting Issues
2022-05-25 17:59:40 +05:30
Deepesh Garg
147fc8fde7
fix: Loan Doc query in Bank Reconciliation Statement
2022-05-25 17:58:30 +05:30
Deepesh Garg
ac17ecb84b
Merge branch 'develop' into party_account_currency_check
2022-05-25 16:21:06 +05:30
Deepesh Garg
bc34737709
chore: Update test case
2022-05-25 15:42:47 +05:30
Sagar Sharma
07dc5f180d
Merge branch 'develop' into subcontracting
2022-05-21 10:02:47 +05:30
ruthra kumar
dac678e3fc
test: payment ledger entry
2022-05-20 18:21:47 +05:30
ruthra kumar
e888975007
refactor: link payment ledger with gl entry creation
2022-05-20 18:21:47 +05:30
ruthra kumar
59ed7c854d
refactor: ignore linked Payment Ledger Entry in basic transactions
2022-05-20 18:21:47 +05:30
ruthra kumar
451cf3a937
refactor: helper class for ple creation and delinking
...
Helper functions for delinking ple and for creating payment ledger
entry for transactions on receivable/payable account types
2022-05-20 18:21:47 +05:30
ruthra kumar
163085f201
feat: payment ledger doctype created
2022-05-20 18:21:47 +05:30
Sagar Sharma
213113bc00
Merge branch 'develop' into subcontracting
2022-05-20 12:13:13 +05:30
Sagar Sharma
5fa3f58c06
refactor!: Purchase Invoice
2022-05-20 10:45:33 +05:30
Sagar Sharma
409df263e8
refactor!: change "is_subcontracted" field type from "Select" to "Check"
2022-05-20 10:45:33 +05:30
barredterra
cad64f19b7
feat: show title field for Sales Taxes and Charges
2022-05-16 16:19:53 +02:00
barredterra
9553319d87
feat: show title field for Purchase Taxes and Charges
2022-05-16 16:19:32 +02:00
Deepesh Garg
65232edfd5
test: Update test cases
2022-05-16 10:52:58 +05:30
Deepesh Garg
5b8726405d
fix: Remove validation from Journal Entry
2022-05-15 21:10:52 +05:30
Rohit Waghchaure
69be22ba7c
fix: select multiple values for accounting dimenssion
2022-05-14 17:19:34 +05:30
HarryPaulo
328b1b54d9
fix: payments duplicate on pos closing entry ( #30976 )
2022-05-13 15:06:02 +05:30
Saqib Ansari
319c858d63
Merge pull request #30968 from nextchamp-saqib/validate-on-hold-invs
...
fix(accounts): minor fixes & validations
2022-05-12 22:06:35 +05:30
Deepesh Garg
33d9767382
Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_currency_check
2022-05-12 16:40:29 +05:30
Saqib Ansari
6c16422beb
test: sales_invoice_with_disabled_account
2022-05-12 12:05:53 +05:30
Saqib Ansari
92613777b9
test: payment_entry_against_onhold_purchase_invoice
2022-05-12 11:17:36 +05:30
Saqib Ansari
95b059a98c
fix: validate disabled accounts before posting ledger entries
2022-05-11 13:26:15 +05:30
Saqib Ansari
b0f302e579
fix: validate on hold purchase invoices in payment entry
2022-05-11 12:42:35 +05:30
Saqib Ansari
cf13a20438
feat(india): generate qrcode button for e-invoice ( #30939 )
2022-05-10 12:07:47 +05:30
Ankush Menat
05dd1d6d15
refactor: tax rule validity query ( #30934 )
2022-05-09 19:26:13 +05:30
HarryPaulo
ebbe27c183
fix: subtract change_amount from paid_amount field on POS Register ( #30922 )
2022-05-09 15:14:57 +05:30
Deepesh Garg
c05144fb60
Merge pull request #30897 from deepeshgarg007/general_ledger_consolidated
...
fix: Consider party and party type as well in group by consolidated view
2022-05-06 13:10:00 +05:30
Deepesh Garg
cf4128edba
Merge pull request #30900 from alyf-de/bank-account-website
...
feat: remove website from bank account
2022-05-06 13:01:28 +05:30
Deepesh Garg
826c3f5c63
Merge pull request #30899 from deepeshgarg007/timesheet_link
...
fix: Show linked time sheets in sales invoice dashboard
2022-05-04 19:54:06 +05:30
barredterra
f1b8a969cf
feat: remove website from bank account
2022-05-04 15:51:52 +02:00
Deepesh Garg
3e38dc7ea8
fix: Show linked time sheets in sales invoice dashboard
2022-05-04 17:30:52 +05:30
Deepesh Garg
c2d52a1ac0
fix: Consider paryt and party type as well in group by consolidated view
2022-05-04 15:59:24 +05:30
Deepesh Garg
e8d6eb207d
fix: Ignore loan repayments made from salary slip
...
(cherry picked from commit b7e1d40e43c136f0e967111e10af95ddc80e2fd5)
2022-05-04 04:15:07 +00:00
Deepesh Garg
2e3e666784
Merge branch 'develop' of https://github.com/frappe/erpnext into erpnext_setup_cleanup
2022-05-03 18:17:36 +05:30
Deepesh Garg
e0fd980bcc
Merge pull request #30848 from deepeshgarg007/cost_center_filter_p_r
...
fix: Cost center filter in payment reconciliation
2022-05-02 17:58:45 +05:30
Deepesh Garg
b440dabe12
test: Add test for payment reconciliation
2022-05-02 16:09:48 +05:30
Rushabh Mehta
548afba8bb
fix(minor): update frappe.error_log to new API ( #30864 )
...
* fix(minor): update frappe.error_log to new API
* refactor: changes for updated log_error api
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-05-02 15:04:26 +05:30
Ankush Menat
bae8ab2fa9
Merge branch 'develop' into education_sepration
2022-05-02 11:47:37 +05:30
Deepesh Garg
c7edc29152
Merge branch 'develop' of https://github.com/frappe/erpnext into cost_center_filter_p_r
2022-04-30 22:11:43 +05:30
Deepesh Garg
ab94b73e93
fix: Cost center filter on payment reconciliation
2022-04-29 18:06:13 +05:30
Deepesh Garg
a8452c2ba2
fix: Multi currency opening invoices
2022-04-29 14:27:03 +05:30
Deepesh Garg
1622faad40
Merge pull request #30802 from deepeshgarg007/multi_currency_opening
...
fix: Allow multi-currency opening invoices
2022-04-29 13:34:54 +05:30
Deepesh Garg
f25251bb70
chore: Clean up patches
2022-04-29 12:42:29 +05:30
Deepesh Garg
44c54f69f8
chore: Remove references for Student doctype
2022-04-28 16:16:47 +05:30
Deepesh Garg
429361ce87
chore: Remove domains from Setup
2022-04-27 13:32:51 +05:30
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
d3582ea399
fix: Allow multi-currency opening invoices
2022-04-25 18:18:39 +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
Deepesh Garg
3ce64170db
feat: Item-wise provisional accounting for service items
2022-04-11 14:35:22 +05:30
Ankush Menat
086d31b59f
fix: dont validate currency exchange in setup
...
Redues ~4-5 seconds of time and chances of setup failure.
2022-04-11 13:19:17 +05:30
Deepesh Garg
809117229d
Merge pull request #30626 from nextchamp-saqib/einv-utgst
...
feat(india): e-invoicing for intra-state union territory transactions
2022-04-10 18:54:17 +05:30
Ankush Menat
af6b07f9b9
fix: block cancellation of SL/GL entries ( #30652 )
...
Individual GL/SLEs aren't supposed to be cancelled by users.
2022-04-08 18:05:04 +05:30
rahib-hassan
171c60ff37
fix: removed discount account field from account settings
2022-04-08 16:50:56 +05:30
rahib-hassan
786887768e
fix: removed discount-accounting code from account settings
2022-04-08 16:50:36 +05:30
Sagar Vora
3b4754f3f6
fix: define tax_columns below consistency
2022-04-07 17:01:10 +05:30
Sagar Vora
fa4f57f470
fix: dont reassign mutable (list) to a different field
2022-04-07 16:51:27 +05:30
Deepesh Garg
18b1a93c7e
Merge pull request #30606 from deepeshgarg007/exchange_gain_loss_button
...
fix: Exchange gain and loss button in Payment Entry
2022-04-07 16:49:05 +05:30
Deepesh Garg
22e8ae9dac
test: Pricing rule test for transactions
2022-04-07 13:20:53 +05:30
Saqib Ansari
45fca6bed7
feat(india): e-invoicing for intra-state union territory transactions
2022-04-07 13:09:05 +05:30
Deepesh Garg
8feb4f08c5
fix: Exchange gain and loss button in Payment Entry
2022-04-06 20:51:51 +05:30
Deepesh Garg
9bf5f76ac8
fix: Deferred Revenue/Expense Account validation
2022-04-06 17:33:46 +05:30
Deepesh Garg
41a979ef34
Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_user_perm
2022-04-06 10:15:16 +05:30
Saqib Ansari
c4b5fa8ed1
Merge pull request #30573 from frappe/mergify/bp/develop/pr-30382
...
fix: Added validation for single_threshold in Tax With Holding Category (backport #30382 )
2022-04-05 15:52:28 +05:30
Saqib Ansari
2451452434
Merge branch 'develop' into e-inv-paid-invoice-fix
2022-04-05 13:12:08 +05:30
Sherin KR
e796267214
fix: Validation for single threshold in Tax With Holding Category ( #30382 )
...
(cherry picked from commit 0a2c72c594963f63551985a908c1c79302556e91)
2022-04-04 13:38:43 +00:00
Saqib Ansari
b91bf40f1b
fix: server error while viewing gst e-invoice
2022-04-04 14:40:07 +05:30
Ankush Menat
52eb0a93bb
Merge pull request #30528 from s-aga-r/is-subcontracted-fieldtype
...
refactor!: change "is_subcontracted" field type from "Select" to "Check"
2022-04-04 14:01:20 +05:30
Ankush Menat
a896895a9e
fix: bulk fix (~330) missing translations
2022-04-04 13:59:51 +05:30
Sagar Sharma
e80cd29d2e
Merge branch 'develop' into is-subcontracted-fieldtype
2022-04-04 13:31:46 +05:30
Deepesh Garg
18a3c5d536
fix: Ignore user perm for party account company
2022-04-04 12:32:33 +05:30
Sagar Sharma
0a3cdc2623
chore: rename "is_subcontracted" field label to "Is Subcontracted"
2022-04-01 13:22:54 +05:30
Sagar Sharma
d074c93ac7
refactor!: change "is_subcontracted" field type from "Select" to "Check"
2022-04-01 13:22:44 +05:30
Saqib Ansari
bfc34e1084
fix: check for debit credit difference even after round-off adjustment ( #30050 )
2022-04-01 11:03:16 +05:30
Deepesh Garg
8598d64d2c
Merge pull request #30502 from dj12djdjs/fix-pe-ex-rate-precision
...
fix(accounts): payment entry exchange rate precision
2022-04-01 09:48:15 +05:30
Deepesh Garg
df06d263ae
Merge pull request #30510 from deepeshgarg007/tax_mapping
...
fix: Taxes getting overriden from mapped to target doc
2022-04-01 09:43:19 +05:30
Saqib Ansari
9af353ffa9
Merge pull request #30461 from nextchamp-saqib/fix-asset-warehouse-validation
...
fix(asset): do not validate warehouse on asset purchase
2022-03-31 14:15:16 +05:30
Deepesh Garg
544533ced2
Merge pull request #30486 from deepeshgarg007/account_currenct_change_test
...
fix: Account currency validation
2022-03-31 13:39:04 +05:30
Deepesh Garg
4720969ce6
fix: Taxes getting overriden from mapped to target doc
2022-03-31 12:14:16 +05:30
Devin Slauenwhite
62266b29aa
fix: exchange rate precision
2022-03-30 14:22:44 -04:00
Deepesh Garg
45f78977bf
Merge pull request #30493 from nabinhait/party-account-in-ar-ap-report
...
feat: Receivable/Payable Account column and filter in AR/AP report
2022-03-30 21:16:32 +05:30
Deepesh Garg
d93edbc859
fix: make test record
2022-03-30 21:07:56 +05:30
Sagar Vora
7bece37918
fix: update get_cached_value usage based on changes in definition
2022-03-30 15:35:56 +05:30
Saqib Ansari
5408980223
Merge pull request #30453 from rahib-hassan/fix-paymentorder-row-delete
...
fix: enable row deletion in reference table
2022-03-30 15:31:54 +05:30
Saqib Ansari
291415d255
Merge pull request #30453 from rahib-hassan/fix-paymentorder-row-delete
...
fix: enable row deletion in reference table
2022-03-30 15:00:16 +05:30
Deepesh Garg
d4cc7c553e
fix: Account currency validation
2022-03-30 12:43:18 +05:30
Saqib Ansari
6528218ac3
perf: skip warehouse validation for non-stock items
2022-03-29 18:43:33 +05:30
Saqib Ansari
b60fad6113
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-asset-warehouse-validation
2022-03-29 10:50:21 +05:30
Saqib Ansari
136466d255
fix(asset): do not validate warehouse on asset purchase
2022-03-29 10:47:27 +05:30
Ankush Menat
3821a97a75
Merge branch 'develop' into mergify/bp/develop/pr-30395
2022-03-28 20:14:19 +05:30
Ankush Menat
494bd9ef78
style: format code with black
2022-03-28 18:52:46 +05:30
Sagar Vora
77c36f6d22
fix: set options for Currency field Incoming Rate ( #30384 )
2022-03-28 17:55:23 +05:30
rahib-hassan
500870b2b0
fix: enable row deletion in reference table
2022-03-28 15:25:01 +05:30
Deepesh Garg
19b1b1f4ba
test: test for auto write-off amount
...
(cherry picked from commit 6a50f36b3167d43b1e964d4f0cf96af587f1a4a2)
# Conflicts:
# erpnext/public/js/controllers/taxes_and_totals.js
2022-03-25 15:27:12 +00:00
Saqib Ansari
80c7d7064b
Merge branch 'develop' into fix-minor-custom-cash-flow
2022-03-25 17:16:42 +05:30
Saqib Ansari
5450542fdb
fix: unsupported operand type(s) for +=: 'int' and 'NoneType'
2022-03-25 16:44:37 +05:30
Saqib Ansari
33863cd6ab
Merge pull request #30324 from nextchamp-saqib/fix-pos-issues-again
...
fix: multiple pos issues
2022-03-25 15:34:54 +05:30
Deepesh Garg
a9d992ac9f
Merge pull request #30338 from deepeshgarg007/bank_transaction_currency_symbol_fixes
...
fix: Currency symbol in bank transactions
2022-03-25 14:39:01 +05:30
Saqib Ansari
1b556d1c53
fix: test cases
2022-03-24 17:59:34 +05:30
Saqib Ansari
cb4873c019
fix: sider issues
2022-03-24 17:56:27 +05:30
Saqib Ansari
cf51a0a1b8
fix(pos): cannot close the pos if sr. no. is sold & returned
2022-03-24 16:22:36 +05:30
Saqib Ansari
4aabe97565
Merge branch 'develop' into fix-pos-issues-again
2022-03-24 11:18:13 +05:30
Deepesh Garg
3a1e31592e
Merge branch 'develop' into ignore_price_list
2022-03-23 09:27:44 +05:30
Deepesh Garg
405dcb1d3c
fix: Add ignore pricelist for missing flows
2022-03-23 09:04:03 +05:30
Saqib Ansari
f2ae63cbfd
fix(pos): remove returned sr. nos. from pos reserved sr. nos. list
2022-03-22 17:41:49 +05:30
Deepesh Garg
ec04242d72
Merge pull request #30340 from deepeshgarg007/opening_too_field_fixes
...
fix: Opening invoice tool field placement
2022-03-22 16:17:12 +05:30
Deepesh Garg
749ab9b799
Merge branch 'develop' into bank_transaction_currency_symbol_fixes
2022-03-22 16:16:03 +05:30
Ankush Menat
f37316a266
refactor: use get_value instead of exists
2022-03-22 13:07:45 +05:30
barredterra
5c4eabf075
fix: usage of frappe.db.exists
2022-03-22 13:07:45 +05:30
Deepesh Garg
01cd9e7c2e
Merge branch 'develop' into opening_too_field_fixes
2022-03-22 11:53:06 +05:30
Deepesh Garg
69a4b8c80b
Merge branch 'develop' into bank_transaction_currency_symbol_fixes
2022-03-22 11:52:20 +05:30
HarryPaulo
3eb5440aa9
fix: linters erros on report sales payments summary ( #30345 )
...
* fix: wrong values for report and get change amout based on payment TYPE.
* charcase for select field.
* fix: linter check erros
* fix: linters errors
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-03-22 11:39:15 +05:30
Deepesh Garg
636e7f67eb
fix: Opening invoice tool field placement
2022-03-21 19:34:57 +05:30
Deepesh Garg
e78a445c24
fix: Currency symbol in bank transactions
2022-03-21 19:06:04 +05:30
HarryPaulo
01fd3adedf
fix: report sales payments summary ( #30264 )
2022-03-21 16:57:27 +05:30
Saqib Ansari
aff7408775
fix(pos): allow validating stock on save
2022-03-21 14:08:56 +05:30
Deepesh Garg
1daaf6be2a
Merge pull request #30317 from deepeshgarg007/opening_gl_validation
...
fix: P&L account validation on cancellation
2022-03-21 10:45:07 +05:30
Saqib Ansari
6dc7d6b085
Merge pull request #30287 from nextchamp-saqib/fix-cash-flow-query
...
fix: custom cash flow mapper doesn't show any data
2022-03-21 10:32:42 +05:30
Deepesh Garg
2ff6790283
fix: P&L account validation on cancellation
2022-03-21 09:43:31 +05:30
Ankush Menat
c2aad115c1
fix: disable deferred naming on SLE/GLE if hash method is used. ( #30286 )
...
* fix: dont rename GLE/SLE that dont have naming series
* test: tests for deferred naming of ledgers
2022-03-20 19:26:34 +05:30
Deepesh Garg
01638a01cb
Merge pull request #30292 from frappe/mergify/bp/develop/pr-30284
...
fix: Cleanup and fixes in Dimension-wise Accounts Balance Report (backport #30284 )
2022-03-18 17:36:59 +05:30
Saqib Ansari
00bfee97c7
refactor: convert raw sql to frappe.qb
2022-03-18 14:31:30 +05:30
Deepesh Garg
8819ba07a9
Merge pull request #30266 from deepeshgarg007/expense_income_account_validation
...
fix: Validate income/expense account in sales and purchase invoice
2022-03-17 18:32:34 +05:30
Deepesh Garg
5390d5e65a
Merge branch 'develop' into mergify/bp/develop/pr-30284
2022-03-17 18:02:57 +05:30
Deepesh Garg
4237e5d928
fix: Test case
2022-03-17 18:00:39 +05:30
Deepesh Garg
a651a0ffc8
Merge pull request #30261 from deepeshgarg007/bank_reco_error
...
fix: Error in bank reconciliation statement
2022-03-17 17:29:15 +05:30
Deepesh Garg
5f89cb2cca
fix: Remove comments
...
(cherry picked from commit cab69fe1f298b44613be21c06591e868c24ee249)
2022-03-17 11:57:50 +00:00
Deepesh Garg
2dd0e20003
fix: Clean and fixes in Dimension-wise Accounts Balance Report
...
(cherry picked from commit 08a06ce5c68023c41f53b584082b5e1c4ddb1f59)
2022-03-17 11:57:50 +00:00
Saqib Ansari
119273e633
fix: custom cash flow mapper doesn't show any data
2022-03-17 14:47:50 +05:30
Ankush Menat
b781e8b7d1
revert: "fix: updated packed_items getting fetched on Sales Return / Credit Note ( #28607 )"
...
This reverts commit 20216fa9f1
2022-03-16 13:36:53 +05:30
Deepesh Garg
2958f60b46
Merge pull request #30269 from deepeshgarg007/implicit_pricing_rule_enable_v2
...
fix: Do not update ignore pricing rule check implicitly
2022-03-16 12:32:25 +05:30
Deepesh Garg
1f79b47a17
fix: Do not update ignore prcing rule check implicitly
2022-03-16 11:55:43 +05:30
Deepesh Garg
06936cf1c0
fix: Validate income/expense account in sales and purchase invoice
2022-03-16 09:02:04 +05:30
Saqib Ansari
1797b6013e
Merge pull request #30244 from nextchamp-saqib/fix-gl-representation
...
fix: incorrect debit credit amount in presentation currency
2022-03-15 18:39:37 +05:30
Deepesh Garg
fbcb413d96
fix: Error in bank reco statement
2022-03-15 18:20:11 +05:30
Saqib Ansari
12d99ed69a
test: foreign_account_balance_after_exchange_rate_revaluation
2022-03-15 17:56:42 +05:30
Saqib Ansari
7b0a97d679
fix(pos): loyalty points in case of returned pos invoice ( #30242 )
2022-03-15 15:54:37 +05:30
Saqib Ansari
83a5fae591
fix: incorrect debit credit amount in presentation currency
2022-03-14 20:14:46 +05:30
Deepesh Garg
25a128220a
Merge pull request #30207 from deepeshgarg007/trail_balance_for_party
...
fix: Do not consider cancelled entries
2022-03-14 17:19:34 +05:30
Saqib Ansari
935218598a
Merge pull request #30198 from nextchamp-saqib/pos-fixes-#12
...
fix(pos): do not reset mode of payments in case of consolidation
2022-03-14 12:34:40 +05:30
Saqib Ansari
2e265d9bf6
test: mode of payments in case of consolidation
2022-03-14 11:02:33 +05:30
Deepesh Garg
835c029e53
Merge pull request #29979 from deepeshgarg007/bank_reco_multicurrency_fix
...
fix: Multi-currency bank reconciliation fixes
2022-03-13 20:27:04 +05:30
Ankush Menat
1a256c62c4
fix: attach sr no si standalone credit note
2022-03-13 19:00:34 +05:30
Ankush Menat
1c37d2711a
test: standalone SI creates and attaches serial nos
2022-03-13 19:00:34 +05:30
Deepesh Garg
6308e1be91
fix: Do not consider cancelled entries
2022-03-13 18:13:12 +05:30
mergify[bot]
b085e96a12
revert: "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount" ( #29782 ) ( #29807 )
...
* Revert "Merge pull request #29290 from s-aga-r/fix/delivery-note/billed-amount"
This reverts commit 038f94955006c88209f9df28e3a785c59a4ddb28, reversing
changes made to c7b491843476bca89be02851ccafb7e409876609.
* fix: linter
(cherry picked from commit 7fa46f77e0bdbc516b3c0cb0fb20594ee7fa398b)
# Conflicts:
# erpnext/patches.txt
Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
2022-03-11 18:28:50 +05:30
Deepesh Garg
13dce71c21
Merge pull request #30181 from deepeshgarg007/shipping_rule_application
...
fix: Shipping rule application fixes
2022-03-11 12:04:12 +05:30
Deepesh Garg
d596e0e4df
fix: Shipping rule application fixes
2022-03-10 20:56:36 +05:30
Saqib Ansari
e5fb871ef4
fix: Ignore missing customer group while fetching price list
2022-03-10 13:54:43 +05:30
Saqib Ansari
9dc9758522
Merge branch 'develop' of https://github.com/frappe/erpnext into party
2022-03-10 13:51:36 +05:30
Saqib Ansari
8021572432
Merge branch 'develop' into fix-psoa-template
2022-03-10 12:17:11 +05:30
Saqib Ansari
5d5ae16fe5
fix(psoa): no such element: dict object['account']
2022-03-10 11:12:33 +05:30
Saqib Ansari
45c1d83ea1
Merge pull request #30145 from nextchamp-saqib/add-filter-to-psoa
...
fix(psoa): add company filter to account
2022-03-10 10:53:52 +05:30
Saqib Ansari
fc42041f8f
fix(psoa): add company filter to account
2022-03-09 18:04:35 +05:30
Deepesh Garg
9b8258479c
fix: Update timestamp
2022-03-09 15:43:26 +05:30
Deepesh Garg
8a2fe7a2e3
fix: Remove tax invoice no field
2022-03-09 15:42:06 +05:30
Deepesh Garg
e192956520
Merge pull request #30096 from deepeshgarg007/debit_note_ux
...
fix(ux): Improve label for better understanding
2022-03-09 15:34:11 +05:30
Chillar Anand
282e9f83b9
Merge branch 'develop' into party
2022-03-08 09:53:03 +05:30
ChillarAnand
9ace7d606c
fix: Ignore missing customer group while fetching price list
2022-03-08 08:44:48 +05:30
Saqib Ansari
a13624d78b
Merge branch 'develop' into fix-pos-round-off
2022-03-07 18:24:13 +05:30
Saqib Ansari
17445c7e04
fix(pos): multiple pos round off cases
2022-03-07 18:01:07 +05:30
Deepesh Garg
f3a95d3c27
fix(ux): Improve label for better understanding
2022-03-07 16:10:26 +05:30
Deepesh Garg
629a296fb6
Merge branch 'develop' into bank_reco_multicurrency_fix
2022-03-06 18:09:30 +05:30
Sagar Vora
3d45f3a6a8
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-03-03 10:20:50 +05:30
Deepesh Garg
2eb7921bff
fix: Exchange rate not getting set in payment entry
...
(cherry picked from commit 86e6bdf2c9ffc0a656c14663b6f790071a7f3afd)
2022-03-01 12:49:09 +00:00
Ankush Menat
65bb727030
fix: dont validate empty category
2022-03-01 17:47:47 +05:30
Saqib Ansari
6b494eed79
Merge pull request #30032 from nextchamp-saqib/fix-debit-credit-diff
...
fix: debit credit difference case with rounding adjustment
2022-03-01 14:12:31 +05:30
Saqib Ansari
ad2c64f3ff
fix: debit credit difference case with rounding adjustment
2022-03-01 13:32:34 +05:30
Deepesh Garg
0542416c47
Merge pull request #30026 from deepeshgarg007/deferred_revenue_post_accounts_freeze
...
fix: Deferred revenue booking
2022-03-01 12:41:41 +05:30
Deepesh Garg
366120ffee
fix: Deferred revenue booking
2022-03-01 11:57:34 +05:30
Deepesh Garg
785fcca957
Merge branch 'develop' of https://github.com/frappe/erpnext into payment_entry_total_taxes
2022-02-28 18:06:14 +05:30
Deepesh Garg
19fb7ead9f
test: Add test case for payment entry taxes
2022-02-28 18:05:58 +05:30
Ankush Menat
b0d1e6db54
test(refactor): use FrappeTestCase
2022-02-28 17:23:32 +05:30
Deepesh Garg
1b186682ea
Merge branch 'develop' of https://github.com/frappe/erpnext into grant_commission_check
2022-02-28 12:42:21 +05:30
Deepesh Garg
4e9a9f35a6
test: add correct test case
2022-02-28 12:41:59 +05:30
Deepesh Garg
83ad8f9caa
Merge pull request #29928 from deepeshgarg007/psoa_account_filter
...
fix: Account filter in PSOA
2022-02-28 11:41:50 +05:30
Rucha Mahabal
a891c426b5
Merge branch 'develop' into remove-nonprofit
2022-02-28 09:50:45 +05:30
Deepesh Garg
5464ba6430
Merge branch 'develop' into psoa_account_filter
2022-02-25 15:55:06 +05:30
Saqib Ansari
69c34cd7ae
fix(pos): mode of payment disappears after save
2022-02-25 14:36:29 +05:30
Sagar Vora
5159e2e6c5
refactor: remove India specific code
2022-02-25 11:36:18 +05:30
Rucha Mahabal
d647de3782
Merge branch 'develop' into remove-nonprofit
2022-02-24 17:03:52 +05:30
Deepesh Garg
cbb5ffb6fe
fix: Multi-currency bank reconciliation fixes
2022-02-24 15:58:12 +05:30
Deepesh Garg
0373914704
fix: Commission not applied while making Sales Order from Quotation
2022-02-24 14:42:56 +05:30
Deepesh Garg
b1a46c80d5
fix: Total taxes and charges in payment entry for multicurrency payments
2022-02-24 13:11:17 +05:30
Ankush Menat
b44cead317
test: fix flaky stateful tests ( #29749 )
...
Co-Authored-By: Marica <maricadsouza221197@gmail.com>
2022-02-23 16:17:41 +05:30
Ankush Menat
9c7df2eec5
fix: ignore duplicates explicitly
2022-02-23 14:27:45 +05:30
Deepesh Garg
1bdcb73d5d
Merge pull request #29879 from deepeshgarg007/misc_fixes
...
fix: Validate party account with company
2022-02-23 11:22:08 +05:30
Deepesh Garg
bd80e04aa7
Merge pull request #29865 from deepeshgarg007/loan_bank_reco
...
feat: Bank Reconciliation for loan documents
2022-02-22 20:43:00 +05:30
Ankush Menat
5d403449bd
test: move report tests to subttest ( #29945 )
...
Basically failfast=False but for sub-tests
2022-02-22 19:24:49 +05:30
Deepesh Garg
70b960e650
fix: Account filter in PSOA
2022-02-22 09:16:08 +05:30
Deepesh Garg
0d8c24f488
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco
2022-02-21 22:22:02 +05:30
Deepesh Garg
a4c6cb9f12
fix: Remove print statements
2022-02-21 17:08:25 +05:30
Deepesh Garg
b7c388976d
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco
2022-02-21 16:58:52 +05:30
Deepesh Garg
6bf7bd6a9f
Merge branch 'develop' into gross_profit_non_stock_item
2022-02-21 16:56:49 +05:30
Deepesh Garg
40a45a3139
Merge pull request #29907 from deepeshgarg007/tds_payable_total_amount
...
fix: Total Credit amount in TDS Payable monthly report
2022-02-21 15:33:58 +05:30
Ankush Menat
afc81351b7
test: only test erpnext doctypes
...
Co-authored-by: gavin <gavin18d@gmail.com>
2022-02-21 15:32:28 +05:30
Ankush Menat
3a5dbfab50
fix: make cashflow mapping template child doctype
2022-02-21 15:32:28 +05:30
Deepesh Garg
a82cf7214e
fix: Total Credit amount in TDS Payable monthly report
2022-02-21 13:58:56 +05:30
Deepesh Garg
e13d774e8e
Merge branch 'develop' into gross_profit_non_stock_item
2022-02-21 12:34:14 +05:30
Deepesh Garg
0b5e618e3a
fix: Update bank reconciliation statement
2022-02-21 11:46:44 +05:30
Deepesh Garg
295cbb0ff2
fix: Update queries in Bank Reconciliation Tool
2022-02-21 11:45:23 +05:30
Deepesh Garg
5a2b571aa9
fix: Validate party account with company
2022-02-18 20:05:49 +05:30
Deepesh Garg
8b3d9088df
Merge branch 'develop' into consolidated_financial_statment_error
2022-02-17 23:32:50 +05:30
Deepesh Garg
555b1335f6
feat: Bank Reconciliation for loan documents
2022-02-17 19:15:30 +05:30
ChillarAnand
b3d4465db6
Merge branch 'develop' into remove-nonprofit
2022-02-17 15:30:11 +05:30
Saqib Ansari
680f8c4dc2
Merge pull request #29848 from nextchamp-saqib/fix-brt-currency
...
fix: currency in bank reconciliation tool
2022-02-17 14:27:07 +05:30
Saqib Ansari
60674e52b8
fix: currency in bank reconciliation tool
2022-02-17 14:19:42 +05:30
ChillarAnand
db1957ffe6
Merge branch 'develop' into remove-nonprofit
2022-02-17 13:00:58 +05:30
Deepesh Garg
4a33cdab34
Merge pull request #29791 from deepeshgarg007/tds_payable_cancelled_entries
...
fix: Fixes in TDS payable monthly report
2022-02-15 15:39:47 +05:30
Deepesh Garg
fec40aac7a
fix: Linting issues
2022-02-15 12:15:35 +05:30
Deepesh Garg
42cdd6d237
fix: Remove commented out code
2022-02-15 12:05:51 +05:30
Deepesh Garg
10629f78fa
Merge branch 'develop' into reverse_entry_dead_lock
2022-02-15 11:59:50 +05:30
Deepesh Garg
973f6b1bbd
fix: Gross profit for credit notes
2022-02-14 22:14:17 +05:30
Deepesh Garg
04cbde2e52
fix: Filter out bank payment entries
2022-02-14 20:38:04 +05:30
Deepesh Garg
2ff6b3560e
fix: Fixes in TDS payable monthly report
2022-02-14 19:51:58 +05:30
Saqib Ansari
18d0a59a9d
fix: disable rounded total in opening invoice creation tool
2022-02-14 18:38:02 +05:30
Deepesh Garg
ae613008be
fix: Error in consolidated financial statements
2022-02-12 21:54:22 +05:30
Deepesh Garg
07bcbc6c7e
fix: Remove unused param
2022-02-12 19:05:03 +05:30
Ankush Menat
eb8b424722
feat: item-wise negative stock setting ( #29761 )
2022-02-12 13:08:28 +05:30
Sagar Vora
d93d2a80b1
chore: remove deprecated print format
2022-02-11 15:21:17 +05:30
Deepesh Garg
2172ab2d37
fix: Update columns in new format
2022-02-11 14:48:39 +05:30
Saqib Ansari
78dd364b0b
fix: cannot jump to sales invoice in gross profit report
2022-02-11 12:32:45 +05:30
Deepesh Garg
da73685f71
fix: Multiple fixes in Gross Profit report
2022-02-10 13:07:51 +05:30
Saqib Ansari
b35b637d01
Merge pull request #29701 from nextchamp-saqib/consolidation-round-off-err
...
fix(pos): incorrect grand_total in case of inclusive taxes on item
2022-02-09 16:42:30 +05:30
Saqib Ansari
0ebd32dc63
fix: cancelling of consolidated sales invoice that doesn't have closing entry
2022-02-09 16:08:28 +05:30
Saqib Ansari
75256863c6
fix(test): do not enable negative stock
2022-02-09 16:07:33 +05:30
Saqib Ansari
8ff7587aaa
Merge branch 'develop' into fix-ignore-pricing-rule
2022-02-09 10:31:22 +05:30
Deepesh Garg
6fd5281b46
Merge branch 'develop' into reverse_entry_dead_lock
2022-02-08 22:37:18 +05:30
Saqib Ansari
07dc228e32
Merge branch 'develop' into consolidation-round-off-err
2022-02-08 18:06:41 +05:30
Saqib Ansari
6fa406dd04
fix(test): pass price_list_rate only if pricing rule has to be removed
2022-02-08 17:51:53 +05:30
Saqib Ansari
c2b83a0283
fix(test): case if write off is calculated as negative amount
2022-02-08 17:36:39 +05:30
Saqib Ansari
b51a5d9225
Merge pull request #29709 from nextchamp-saqib/fix-bank-reco-currency
...
fix: currency in bank reconciliation chart
2022-02-08 16:32:35 +05:30
Saqib Ansari
afc5c26d1c
fix(test): ignore stock validation
2022-02-08 16:04:08 +05:30
Saqib Ansari
3f962739fb
Merge branch 'develop' of https://github.com/frappe/erpnext into consolidation-round-off-err
2022-02-08 16:02:18 +05:30
Saqib Ansari
0fc5d2278d
fix: currency in bank reconciliation chart
2022-02-08 15:50:41 +05:30
Saqib Ansari
4f4395545e
Merge branch 'develop' into fix-ignore-pricing-rule
2022-02-08 15:29:28 +05:30
Saqib Ansari
8eff2969b0
Merge pull request #29699 from nextchamp-saqib/improve-debit-to-err-msg
...
chore: show credit/debit-to account in error message
2022-02-08 11:42:57 +05:30
Saqib Ansari
4c3d751421
Merge branch 'develop' into fix-ignore-pricing-rule
2022-02-08 11:42:33 +05:30
Saqib Ansari
0452d7de20
fix(pos): incorrect grand_total in case of inclusive taxes on item
2022-02-08 11:26:23 +05:30
Saqib Ansari
e93bb8a336
chore: show credit/debit-to account in error message
2022-02-08 10:49:37 +05:30
Mohammed Yusuf Shaikh
a3e69cf75d
feat: Bulk Transaction Processing ( #28580 )
...
* feat: Bulk Transaction Processing
* fix: add flags to ignore validations and exception handling correction
* fix: remove duplicate code, added logger functionality and improved notifications
* fix: linting and sider issues
* test: added tests
* fix: linter issues
* fix: failing test case
* fix: sider issues and test cases
* refactor: mapping function calls to create order/invoice
* fix: added more test cases to increase coverage
* fix: test cases
* fix: sider issue
* fix: rename doctype, improve formatting and minor refactor
* fix: update doctype name in hooks and sider issues
* fix: entry log test case
* fix: typos, translations and company name in tests
* fix: linter issues and translations
* fix: linter issue
* fix: split into separate function for marking failed transaction
* fix: typos, retry failed transaction logic and make log read only
* fix: hide retry button when no failed transactions and remove test cases not rrelevant
* fix: sider issues and indentation to tabs
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-02-08 01:00:37 +05:30
Deepesh Garg
2280ae5554
Merge pull request #29549 from frappe/mergify/bp/develop/pr-29290
...
fix: billed amount in delivery note items (backport #29290 )
2022-02-07 23:49:19 +05:30
Deepesh Garg
cec971b5db
Merge pull request #29349 from alyf-de/disable-item-tax-category
...
feat: option to disable Item Tax Template and Tax Category
2022-02-07 11:01:03 +05:30
Umair Sayed
104a55aff1
feat: Tab views in Stocks and Accounts Settings ( #29638 )
...
* tab views in Stocks and Accounts Settings. Clean-up in Selling and Buying Settings.
* chore: undo changes to creation timestamp
happened because of a bug in fw
Co-authored-by: Umair Sayed <umairsayed@Umairs-MacBook-Air-2.local>
2022-02-07 10:42:55 +05:30
Chillar Anand
768e6b2e0e
Merge branch 'develop' into remove-nonprofit
2022-02-07 10:29:25 +05:30
Deepesh Garg
ff57450e77
fix: Replace ORM with query builder
2022-02-06 22:56:12 +05:30
Deepesh Garg
81b967851a
Merge pull request #29601 from deepeshgarg007/provisonal_loss_bs
...
fix: Incorrect provisional profit and loss in balance sheet
2022-02-06 19:33:12 +05:30
Deepesh Garg
3e6fade08d
Merge pull request #29641 from deepeshgarg007/jv_cancel_ignore
...
fix: Ignore linked invoices on Journal Entry cancel
2022-02-06 18:57:13 +05:30
Ankush Menat
8858c703a8
fix: ignore cancelled svd while updating GLE for PR
...
This happens because LCV cancels and reposts entries so unless filtered
by non-cancelled entries you can randomly get old values.
2022-02-05 20:58:56 +05:30
Raffael Meyer
b5242df15b
Merge branch 'develop' into disable-item-tax-category
2022-02-04 18:10:39 +01:00
Deepesh Garg
6f7ae62907
fix: Ignore linked invoices on Journal Entry cancel
2022-02-04 20:13:20 +05:30
Ankush Menat
ba847ef218
Merge branch 'develop' into provisonal_loss_bs
2022-02-03 17:18:00 +05:30
ChillarAnand
325dc92d37
Merge branch 'develop' into remove-nonprofit
2022-02-03 16:38:01 +05:30
Deepesh Garg
ed2c6b6637
fix: Incorrect provisional profit and loss in balance sheet
2022-02-02 22:36:45 +05:30
Saqib Ansari
5a7236efcd
Merge branch 'develop' into fix-ignore-pricing-rule
2022-02-02 21:47:51 +05:30
Deepesh Garg
ffec865e00
fix: Make a deep copy of GLE
2022-02-02 17:14:42 +05:30
Deepesh Garg
f1c3bcee1f
fix: Deadlock on making reverse GL Entries
2022-02-02 17:09:34 +05:30
marination
4b62d2d7fe
fix: (Linter) Write queries using QB/ORM and other minor lines for semgrep to skip
2022-02-02 12:58:31 +05:30
Marica
780e29b42e
Merge branch 'develop' into e-commerce-refactor-develop
2022-02-02 10:45:14 +05:30
Nabin Hait
008b331f49
Merge branch 'cc-allocation' into develop
2022-02-01 22:27:23 +05:30
Nabin Hait
81d1ad6059
fix: Allocation percentage fieldtype changed to percent
2022-02-01 22:26:39 +05:30
Saqib Ansari
4055cc76a7
Merge pull request #29556 from nextchamp-saqib/nemesis189-pos-service-items
...
feat: Allowing non stock items in POS
2022-02-01 16:36:10 +05:30
Deepesh Garg
528c71382f
feat: Provisional accounting for expenses ( #29451 )
...
* feat: Provisonal accounting for expenses
* fix: Method for provisional accounting entry
* chore: Add test case
* fix: Remove test case
* fix: Use company doctype
* fix: Add provisional expense account field in Purchase Receipt Item
* fix: Test case
* fix: Move provisional expense account to parent
* fix: Patch
2022-02-01 14:42:55 +05:30
Saqib Ansari
4557b6a150
Merge branch 'develop' into pos-service-items
2022-02-01 12:25:25 +05:30
Sagar Sharma
1fd8539873
fix: check so_detail before dn_detail
...
(cherry picked from commit 5de6b8dc4df407fd953efe69640e22bd4ea90b6e)
2022-02-01 05:39:38 +00:00
Marica
19e5dfbb7c
Merge branch 'develop' into e-commerce-refactor-develop
2022-02-01 00:56:11 +05:30
Nabin Hait
5b0ec6437b
fix: sider issues
2022-01-31 18:41:42 +05:30
Nabin Hait
6099af5d00
fix: Fixed test case and sider issues
2022-01-31 17:43:37 +05:30
Ankush Menat
6cd7c47409
Merge branch 'develop' into e-commerce-refactor-develop
2022-01-31 17:14:36 +05:30
Nabin Hait
3dadfc9048
patch: Removed files and code related to old distributed cost center feature
2022-01-31 15:58:40 +05:30
Nabin Hait
c09d5a613e
fix: Delete old fields from cost center related to distributed cost center
2022-01-31 13:26:09 +05:30
Nabin Hait
174104c0d4
feat: Workspace link for Cost Center Allocation
2022-01-31 13:24:18 +05:30
Nabin Hait
004c1ed094
feat: Split Gl Entry based on cost center allocation
2022-01-31 13:24:18 +05:30
Nabin Hait
ac2e19103f
Cost Center Allocation doctype, validations and test cases
2022-01-31 13:24:18 +05:30
Subin Tom
05bbb69d0e
fix: Validation for invalid serial nos at POS invoice level ( #29447 )
2022-01-31 13:08:19 +05:30
Saqib Ansari
1170bee951
Merge pull request #29480 from nextchamp-saqib/revert-drop-einvoicing
...
revert: "refactor!: drop e-invoicing integration from erpnext"
2022-01-31 11:35:48 +05:30
smehata
b818b93568
Update sales_invoice.js ( #29491 )
...
undefined issue
2022-01-30 17:27:20 +05:30
Deepesh Garg
2bf405d44c
fix:Add shipping charges to taxes only if applicable
...
(cherry picked from commit e8bc4f12a734ff286a008e6b31dffa9c6c946365)
2022-01-29 07:27:21 +00:00
Saqib Ansari
273fbe792c
Merge branch 'develop' into fix-ignore-pricing-rule
2022-01-29 12:44:19 +05:30
Saqib Ansari
452a809ef4
Merge pull request #28877 from nextchamp-saqib/multiple-pricing-rule-fix
...
fix: qty filter not working if apply_multiple_pricing_rules is enabled
2022-01-29 12:43:41 +05:30
Saqib Ansari
8a66a7ad46
Merge branch 'develop' into fix-ignore-pricing-rule
2022-01-29 12:42:00 +05:30
Saqib Ansari
2c100a5313
Merge branch 'develop' into revert-drop-einvoicing
2022-01-28 14:34:29 +05:30
Saqib
0b626816d0
feat(e-invoicing): dispatch address ( #28084 )
2022-01-27 20:19:37 +05:30
Saqib Ansari
c5782b0e71
revert: "refactor!: drop e-invoicing integration from erpnext ( #26940 )"
...
This reverts commit c335962827
2022-01-27 20:09:56 +05:30
Ankush Menat
b05287dea0
fix: drop six code ( #29479 )
2022-01-27 20:08:05 +05:30
ChillarAnand
16ca81d6a6
refactor: Remove non-profit code in ERPNext
2022-01-27 10:08:41 +05:30
Deepesh Garg
b72cdb4bca
fix: Previous document currency getting overriden
...
(cherry picked from commit ef782fd35b0717e3f7c50dbb6c5dde7c96ae9ef6)
2022-01-24 15:19:54 +00:00
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
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
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
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
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
b8c41e3030
test: item price on remove pricing rule
2022-01-20 13:06:56 +05:30
Saqib Ansari
f6dda738dc
fix: ignore pricing rule in all transactions
2022-01-20 12:22:56 +05:30
Saqib Ansari
3da2cac772
chore: undo unnecessary changes
2022-01-20 12:09:04 +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
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
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
0efdbae783
fix: minor onboarding fixes
2022-01-18 18:38:59 +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
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
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
Deepesh Garg
1e34300f69
Merge branch 'develop' into project_in_purchase_invoice
2022-01-15 21:00:14 +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
b9b4c9aff7
Merge pull request #29270 from nextchamp-saqib/change-fieldtype
...
fix: threshold fields shows incorrect currency
2022-01-14 14:50:45 +05:30
Deepesh Garg
08f26de3df
fix: Remove comment
2022-01-13 23:05:27 +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
Saqib Ansari
0e1b8322c1
fix: threshold fields shows incorrect currency
2022-01-13 12:06:03 +05:30
Marica
b5abf68b0d
Merge branch 'develop' into e-commerce-refactor-develop
2022-01-12 02:52:03 +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
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
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
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
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
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
Deepesh Garg
9d3a5c3184
fix: Inconsistency in calculating outstanding amount
2022-01-06 18:58:49 +05:30
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
ruthra
ca17c7226c
fix: get project from PO into payment entry
2022-01-06 11:34:47 +05:30
Saqib Ansari
fbd706f232
fix: existing party link validation ( #29159 )
2022-01-05 17:55:08 +05:30
Subin Tom
3febca1a9a
fix: Modifying Opening invoice creation tool timestamp ( #29127 )
2022-01-04 19:37:44 +05:30
Saqib Ansari
f4db474be0
fix: minor issues ( #29130 )
2022-01-04 19:12:19 +05:30
Chillar Anand
0900c3d655
refactor: Removed agriculture module from ERPNext ( #29022 )
2022-01-04 17:26:11 +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
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
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
Saqib Ansari
d0f5beeb34
fix: filter query in bank reconciliation tool ( #29098 )
2022-01-03 11:33:03 +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
db829a0610
Merge pull request #29050 from mohsinalimat/patch-1
...
feat: Add currency in import download statement
2022-01-02 17:15:01 +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
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
Deepesh Garg
6405699821
Merge branch 'develop' into mergify/bp/develop/pr-28996
2021-12-28 14:46:12 +05:30
Deepesh Garg
6f933db3cc
fix: Deferred revenue test case
2021-12-28 14:16:19 +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
MohsinAli
a0863d1cb1
feat: Add currency in import download statement
...
Add currency in bank statement import
2021-12-28 10:27:19 +05:30
Subin Tom
ec37930404
fix: Allowing non stock items in POS
2021-12-22 19:14:47 +05:30
Pruthvi Patel
617f7565ce
Merge branch 'develop' into fix-invoice-statuses
2021-12-21 22:16:14 +05:45
Saqib
7f786e44a1
Merge branch 'develop' into pos-batch-no-stock-validation
2021-12-21 17:05:43 +05:30
Saqib
c3a9ca09d1
chore: remove extra whitespace
2021-12-21 17:05:36 +05:30
Saqib
9c8f523537
fix: typo
2021-12-21 17:01:10 +05:30
Ganga Manoj
1ed30ee7c7
fix: Reset value_after_depreciation on reversing journal entry during Asset return
2021-12-21 13:59:53 +05:30
Ankush Menat
d7148adee5
test: remove unnecessary creation of companies #28965
...
test: remove unnecessary creation of companies
2021-12-20 22:00:31 +05:30
Deepesh Garg
c5c7777bd5
Merge pull request #28959 from deepeshgarg007/consolidated_balance_return_fix
...
fix: Error on viewing consolidated financial statement
2021-12-20 17:13:12 +05:30
Ankush Menat
f5d5281119
chore: drop deprecated qunit tests
2021-12-20 17:03:10 +05:30
Deepesh Garg
5d6199cf35
fix: Error on viewing consolidated financial statement
2021-12-20 16:54:52 +05:30
Pruthvi Patel
4d48ca4228
test: update_invoice_status
2021-12-20 13:23:14 +05:30
Dany Robert
c68b2c3763
Merge branch 'develop' into currency-exchange-settings
2021-12-18 18:32:12 +05:30
Saqib
1abdcf2bea
Merge branch 'develop' into multiple-pricing-rule-fix
2021-12-18 12:13:33 +05:30
Dany Robert
e75295a151
Merge branch 'develop' into ledger-merger
2021-12-18 11:32:20 +05:30
Dany Robert
ab7f38224f
fix: remove db commit
2021-12-17 16:42:24 +00:00
Dany Robert
32e5db7cb8
chore: styling according to linter
2021-12-17 16:38:16 +00:00
Dany Robert
399446460a
feat: tests
2021-12-17 16:18:42 +00:00
Subin Tom
e85da7a03a
fix: Add Invoice Number field to list view in Opening Inv Creation Tool ( #28938 )
2021-12-17 21:48:10 +05:30
Dany Robert
b3a3367d1d
feat: allow group accounts
2021-12-17 13:06:30 +00:00
Deepesh Garg
6ab753015e
fix: Add tests for multicurrency subscription
2021-12-16 17:38:29 +05:30
Deepesh Garg
0e4842b986
fix: Multicurrency invoices using subscription
2021-12-16 16:51:41 +05:30
Subin Tom
9f235526d4
fix: Validation in POS for item batch no stock quantity
2021-12-15 22:34:44 +05:30
Deepesh Garg
64f68d5e94
Merge branch 'develop' into deferred_report_revenue_and_expense
2021-12-15 14:14:34 +05:30
Subin Tom
5c4d3f89d2
feat: 'Invoice Number' field in Opening Invoice Creation Tool ( #28844 )
2021-12-15 14:14:16 +05:30
Subin Tom
be103ab8e6
fix: Currency fix for cost field in subscription plan ( #28821 )
2021-12-15 13:01:48 +05:30
Saqib Ansari
5a7a9a598b
chore: rename redefinition of multiple pricing rule test
2021-12-15 10:32:23 +05:30
ruthra
9ec8841b91
refactor: rename checkbox and translations
...
- rename checkbox and make it
- added translation text for labels
- fixes for linter error
2021-12-14 20:59:14 +05:30
ruthra
a8a598ace7
refactor: remove unused function 'get_postings'
2021-12-14 16:34:51 +05:30
Saqib Ansari
c0d1f4869f
test: add test_multiple_pricing_rules
2021-12-14 14:58:31 +05:30
Saqib Ansari
1e17d6a607
fix: qty filter not working if apply_multiple_pricing_rules is enabled
2021-12-14 14:58:20 +05:30
Saqib
c3e0de28b1
fix: validate if asset account is set against company
2021-12-13 20:13:53 +05:30
Deepesh Garg
a7f15a0eea
Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_currency_check
2021-12-12 21:09:11 +05:30
Deepesh Garg
b966c45fa8
Merge pull request #28748 from deepeshgarg007/accounts_receivable_jv_due_date
...
fix: Ageing in AR/AP report for advances
2021-12-12 17:27:21 +05:30
Deepesh Garg
a6fba7f128
Merge pull request #28764 from deepeshgarg007/tds_report_fixes
...
fix: TDS Monthly payable report
2021-12-12 17:11:58 +05:30
ruthra
c3453cd73c
feat: Deferred Revenue and Expense report
...
- show deferred revenue and expense with actual and expected postings
- unit tests added
2021-12-10 19:30:43 +05:30
Dany Robert
75de5be53e
fix: import issue and minor fixes
2021-12-10 10:27:15 +00:00
Dany Robert
614b9270e7
fix: convert whitespace to tabs
2021-12-10 09:45:00 +00:00
Dany Robert
7554f11260
feat: progress bar, account name field
2021-12-10 08:45:47 +00:00
Ankush Menat
d37541d3fb
fix: ensure that reposting is finished before freezing stock/account
2021-12-10 12:31:49 +05:30
Dany Robert
b7cc20eac0
Merge branch 'develop' of https://github.com/rtdany10/erpnext into ledger-merger
2021-12-09 15:26:45 +00:00
Dany Robert
75f8117daf
feat: merge functionality
2021-12-09 15:23:10 +00:00
Dany Robert
57a7633f9b
feat: form updates and progressbar
2021-12-09 15:22:46 +00:00
Dany Robert
ad5d7897a8
feat: ledger merger doctype
2021-12-09 13:31:54 +00:00
Sagar Sharma
6485ac4e59
fix: misleading "Set Default X" fields after saving ( #28798 )
...
* fix: misleading "Set Default X" fields after saving
* refactor: remove unncessary code and minor formatting
* fix: extend to more doctypes and correct fieldnames
Co-authored-by: Ankush Menat <ankush@frappe.io>
2021-12-09 17:04:00 +05:30
Dany Robert
0592096c62
Merge branch 'develop' into currency-exchange-settings
2021-12-07 22:36:36 +05:30
Deepesh Garg
3e1591c145
Merge pull request #28731 from deepeshgarg007/better_deferred_revenue_error_logging
...
fix: Better Error logging for deferred revenue/expense booking
2021-12-07 15:42:05 +05:30
Deepesh Garg
d106d59c3f
fix: TDS Monthly payable report
2021-12-06 20:36:48 +05:30
Deepesh Garg
3dabac15ed
fix: Ageing in AR/AP report for advances
2021-12-06 15:05:20 +05:30
Deepesh Garg
3c64e201cc
fix: Log error before throwing exception
2021-12-04 20:05:37 +05:30
Deepesh Garg
0ba4fcee2a
fix: Commit joural entries
2021-12-04 19:25:44 +05:30
Deepesh Garg
67a001d876
fix: Better Error logging fordeferred revenue/expense booking
2021-12-04 19:19:03 +05:30
Deepesh Garg
f12be3001d
fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice
...
(cherry picked from commit 6a75e8d283bb76214af832bb0a29c20eefae328c)
2021-12-03 04:12:42 +00:00
Deepesh Garg
107fb43d6a
fix: Paid showing in AR/AP report
...
(cherry picked from commit 5e7ce5370f6af634f7674772529cf4933114f3ef)
2021-12-02 13:44:27 +00:00
Ankush Menat
fdffa037b5
test: dynamic fiscal year creation in tests ( #28667 )
2021-12-01 17:31:17 +05:30
Dany Robert
3708cf17ad
fix(POS Profile): replace cur_frm with frm ( #28390 )
2021-12-01 12:14:06 +05:30
Ankush Menat
bb00d38dd7
Merge branch 'develop' into asset-capitalization
2021-11-30 19:32:11 +05:30
mergify[bot]
071118fa4e
fix: Unable to search project by project name in Sales Invoice (bp #28648 )
...
(cherry picked from commit 08b7c856b2ee94d1f8ac2c019c556eef4d7dd7da)
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-11-30 13:15:20 +00:00
Deepesh Garg
ad8d296c08
Merge pull request #28636 from deepeshgarg007/zero_values_report
...
feat: Show Zero Values filter in consolidated financial statement
2021-11-30 18:15:50 +05:30
Raffael Meyer
e10ab1626c
feat: Grant commission on certain items only ( #27467 )
...
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-11-30 17:54:18 +05:30
Deepesh Garg
9610086d0c
feat: Show Zero Values filter in consolidated financial statement
2021-11-30 13:24:23 +05:30
Ankush Menat
f862339024
fix: use get_all instead of get_list for child tables
2021-11-29 13:04:29 +05:30
xdlumertz
cdaf0a04cf
fix(ux): allow translations ( #28455 )
...
* Translation
* Translations
Co-authored-by: xdlumertz <alexandrelumertz@gmail>
2021-11-27 15:03:35 +00:00
Deepesh Garg
38dfb60243
Merge pull request #27348 from deepeshgarg007/advance_tds_allocation_gl
...
fix (refactor): Tax Withholding for Advances using Payment Entry against suppliers
2021-11-26 14:28:50 +05:30
Saqib
9c913c9b2d
fix: over billing validation ( #28218 )
2021-11-26 12:00:13 +05:30
Deepesh Garg
f07f010962
fix: Add tests
2021-11-25 23:58:16 +05:30
Deepesh Garg
5ba3b28d69
fix(refactor): Advance tds allocation to purchase invoice
2021-11-25 15:42:30 +05:30
Deepesh Garg
0931d17a2a
Merge branch 'develop' into currency-exchange-settings
2021-11-23 12:39:25 +05:30
Ganga Manoj
5ef2330022
fix: Replace 'parent' with 'invoice_or_item' ( #28513 )
2021-11-23 12:28:41 +05:30
Ganga Manoj
7d0558e202
fix: Add extra column to display Invoice or Item when grouped by Invoice ( #28380 )
2021-11-22 12:34:46 +05:30
Saqib
cb52e6dd6b
fix: cost center wise ledger posting for pcv ( #28477 )
2021-11-22 12:24:32 +05:30
Saqib
78851ecb70
feat: create party link from customer/supplier ( #28387 )
...
* feat: create party link from customer/supplier
* test: create_party_link method
2021-11-22 12:23:23 +05:30
Saqib
7677d6d4c3
Merge pull request #28402 from GangaManoj/gross-profit-percentage
...
fix: Gross Profit report totals
2021-11-22 12:21:22 +05:30
Ahmed Shareef
3a2074ce05
fix: add child button in coa tree ( #28413 )
2021-11-22 11:46:58 +05:30
Saqib
08ad93d82f
fix: coa balance rendering bug ( #28468 )
2021-11-20 15:15:46 +05:30
Deepesh Garg
a57d39909e
Merge pull request #28302 from nemesis189/shipping-rule-updation-error
...
fix: Shipping Rule picking up old net_rate
2021-11-19 08:21:53 +05:30
Ganga Manoj
5d8a85db10
Merge branch 'develop' into gross-profit-percentage
2021-11-17 19:23:34 +05:30
rohitwaghchaure
b9c8489de6
Merge pull request #28417 from rohitwaghchaure/currency-wise-pricing-rule-not-working
...
fix: currency wise pricing rule not working
2021-11-17 14:02:19 +05:30
Rohit Waghchaure
43aeb541c2
fix: currency wise pricing rule not working
2021-11-17 13:30:17 +05:30
Sagar Vora
c00d0a3e24
fix: better validation for Integration Request ( #28186 )
2021-11-16 20:31:18 +05:30
Subin Tom
a8e2c02e14
fix: fixed tests, separated a method for shipping charges
2021-11-16 19:06:49 +05:30
Marica
6bd0c1dbf1
Merge pull request #28269 from marination/pr-return-ux
...
refactor: (ux) Accepted/Rejected/Received Qty UX
2021-11-16 18:00:42 +05:30
Marica
0afcdecb9b
Merge branch 'develop' into e-commerce-refactor-develop
2021-11-16 17:58:53 +05:30
Subin Tom
a1807a2f98
fix: POS idx issue in taxes table while merging ( #28389 )
2021-11-16 17:46:26 +05:30
marination
f9929ed8a6
Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop
2021-11-16 16:06:07 +05:30
Saqib
5f30104e00
Merge branch 'develop' into gross-profit-percentage
2021-11-16 16:00:07 +05:30
Marica
4afcbfdc08
Merge branch 'develop' into pr-return-ux
2021-11-16 15:15:48 +05:30
marination
293f6cbafd
fix: Sider, Linter and Server Side Test
...
- Fix Server side PR test
- linter: re-arrange imports
- sider: avoid single line multi statement
- Code cleanup: Improve code readability and avoid horizontal scroll in test_purchase_receipt
- Removed unused variables in test_purchase_receipt
2021-11-16 14:36:15 +05:30
Ahmed Shareef
952fc87c99
refactor: fix help section background in dark mode ( #28406 )
2021-11-16 14:30:13 +05:30
marination
e9c75d6eea
test: Purchase Invoice Received Qty
2021-11-16 11:55:34 +05:30
Rohit Waghchaure
d82910b08a
fix: Pricing Rule not created against the Promotional Scheme
2021-11-16 10:27:59 +05:30
GangaManoj
1affa12b74
fix: Replace 'Totals' with 'Total'
2021-11-16 03:36:47 +05:30
GangaManoj
508a2301ee
fix: Display totals row in bold
2021-11-16 03:22:04 +05:30
GangaManoj
c7ffe3a7b4
fix: Remove unnecessary condition
2021-11-16 02:36:58 +05:30
GangaManoj
582a7ae964
fix: Add totals row when Grouped By Invoice
2021-11-16 02:33:51 +05:30
GangaManoj
3aaf7cb408
fix: Remove default Totals row
2021-11-16 02:33:12 +05:30
marination
afe1c45f7f
fix: Sider + Fields UX
...
- remove extra space (sider)
- PR: Bring rejected qty in grid view
- PI: Rename `Stock Qty` to `Accepted Qty in Stock UOM`
- PI: Move `Accepted Qty in Stock UOM` under Stock UOM
2021-11-15 17:17:29 +05:30
Dany Robert
3f8ad54c5c
Merge branch 'develop' into currency-exchange-settings
2021-11-13 13:13:15 +05:30
Dany Robert
e50893e991
fix: eslint brace style issue
2021-11-13 13:12:38 +05:30
Deepesh Garg
829f92f10a
Merge pull request #28363 from deepeshgarg007/default_party_account
...
fix: Default party account getting overriden in invoices
2021-11-12 13:04:21 +05:30
Deepesh Garg
88648570d7
fix: Default party account getting overriden in invoices
2021-11-12 12:39:30 +05:30
rohitwaghchaure
0157da57b5
Merge pull request #28308 from rohitwaghchaure/commision-rate-not-fetch-from-sales-person
...
fix: commission rate not fetch from sales person
2021-11-11 19:11:31 +05:30
Saqib
ecbe4b16b8
perf(minor): general ledger report ( #27987 )
2021-11-11 13:55:21 +05:30
Saif Ur Rehman
06aead0470
chore: isort
2021-11-10 13:45:40 +05:00
Saqib
6d05bb5274
fix(pos): get mode of payments query ( #28321 )
2021-11-10 13:06:55 +05:30
Anuja Pawar
2f004693c3
fix(Bank Reconciliation): get credit amount for bank account of type liability
2021-11-10 12:36:54 +05:30
Rohit Waghchaure
4d4bfa2333
fix: commision rate not fetch from sales person
2021-11-10 00:00:38 +05:30
Deepesh Garg
8a253ed1f3
Merge pull request #28238 from nextchamp-saqib/perf-financial-statements
...
perf: improve financial statement loading time
2021-11-09 16:29:58 +05:30
Saqib
4a3cef6436
fix: update 'current_invoice_end' after processing invoice ( #28278 )
2021-11-09 14:16:38 +05:30
Saif Ur Rehman
cdb1800087
chore: remove unused import
2021-11-09 12:35:01 +05:00
Saif Ur Rehman
13f8edd43f
Merge remote-tracking branch 'upstream/develop' into asset-capitalization
...
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/sales_invoice.py
2021-11-09 12:17:17 +05:00
Dany Robert
01e7076b65
Merge branch 'develop' into currency-exchange-settings
2021-11-06 09:59:00 +05:30
Ankush Menat
8fe5feb6a4
chore: remove all six compat code
2021-11-05 11:16:29 +05:30
Ankush Menat
897e90ac55
chore: remove past module dependencies
2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9
chore: remove utf-8 compat code
2021-11-05 11:16:29 +05:30
Saif Ur Rehman
dc3c27fd1b
fix(Asset Capitalization): update code for changes in depreciation logic
2021-11-04 13:47:33 +05:00
Saif Ur Rehman
2d9da22721
Merge branch 'develop' of https://github.com/frappe/erpnext into asset-capitalization
...
# Conflicts:
# erpnext/accounts/doctype/sales_invoice/sales_invoice.py
# erpnext/assets/doctype/asset/test_asset.py
# erpnext/assets/workspace/assets/assets.json
2021-11-04 12:48:33 +05:00
Dany Robert
4716523c77
fix: sider issues
2021-11-04 05:38:00 +00:00
Dany Robert
4a0f2175ad
fix: pre-commit issues
2021-11-04 05:25:48 +00:00
Dany Robert
e65a76b214
chore: clean up
2021-11-04 05:04:10 +00:00
Dany Robert
08b2735a79
fix: make fields editable only when service provider is custom
2021-11-04 05:01:37 +00:00
Dany Robert
7291d9f236
feat: option for preconfigured selectable service providers
2021-11-03 14:13:22 +00:00
Saqib Ansari
b7a44fe0a3
perf: improve financial statement loading time
2021-11-03 18:17:31 +05:30
