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

7934 Commits

Author SHA1 Message Date
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