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

8709 Commits

Author SHA1 Message Date
ruthra kumar
123355392b fix: incorrect paid_amount and exchange rate in PE 
If Company master has no default cash or bank account set but Party has
default company bank account set. In this case, paid_amount and
conversion rate are not calculated correctly
 2023-04-30 08:36:56 +05:30
ruthra kumar
4ccce93394 refactor: checkbox to toggle parent doc cost center preference 2023-04-28 14:20:50 +05:30
ruthra kumar
0f3b06cc8a refactor: checkbox in Sales Invoice 2023-04-28 14:20:50 +05:30
ruthra kumar
ebe6787510 refactor: checkbox to toggle parent doc cost center preference 2023-04-28 14:20:48 +05:30
ruthra kumar
b44331c981 refactor: checkbox in purchase invoice 2023-04-28 14:06:04 +05:30
Nihantra Patel
6dfca79af3 fix: Report link, option, and added a link for Sales Person in GP 2023-04-27 15:04:50 +05:30
Kitti U. @ Ecosoft
c36dc3dc57
fix: v14, Bank Reconcile Tools not cover case JV debit bank (#35000) 2023-04-25 21:34:28 +05:30
rohitwaghchaure
b24704740b
Merge pull request #34918 from s-aga-r/FIX-ISS-22-23-06298 
perf: Journal Entries
 2023-04-25 21:27:52 +05:30
Raffael Meyer
d6bc8bba8b
fix: per_billed condition for Payment Entry (#34969) 2023-04-25 20:51:11 +05:30
Deepesh Garg
ecea9b44a3
fix: Payment entry with TDS in bank reco statement (#34961) 2023-04-25 19:17:13 +05:30
Deepesh Garg
b545e3def0
fix: Add company field to lower deduction certificate (#34914) 2023-04-25 19:07:45 +05:30
Sagar Sharma
31cdfa395a
Merge branch 'develop' into FIX-ISS-22-23-06298 2023-04-25 13:57:34 +05:30
s-aga-r
e782a054c8 refactor: get_stock_value_on() to get stock value of multiple warehouses at once 2023-04-25 13:54:36 +05:30
Anand Baburajan
ca388ed9cd
fix: value of depreciable assets not updating after manual depr entry [develop] (#35020) 
* fix: value of depreciable assets not updating after manual depr entry

* chore: add asset depr schedule to jv's ignore_doctypes_on_cancel_all
 2023-04-25 12:45:05 +05:30
ruthra kumar
20226d0a47
Merge branch 'develop' into revert-33699-tds_report_percentage 2023-04-25 10:43:18 +05:30
ruthra kumar
cb7a99cbaa Revert "fix: Rate from LDC in TDS reports (#33699)" 
This reverts commit db9beb3cdd.
 2023-04-25 10:13:07 +05:30
Marica
88647c63ba
Merge branch 'develop' into bank-trans-party-automatch 2023-04-24 12:13:12 +05:30
ruthra kumar
ed14d1ce44
feat: Reconcile Payments in background (#34596) 
* feat: auto reconcile in background

* chore: Option to enable auto reconciliation in settings

* refactor: validate if feature is enabled in settings

* refactor: check for running job while using reconciliation tool

* chore: using doc to get filter values

* chore: use frappe.db.get_value in validations

* chore: cleanup commented out code

* chore: replace get_list with get_all

* chore: use block scope variable

* chore: type information for functions

* refactor: flag to ignore job validation check

* refactor: update parent doc status if all reconciled

* chore: create test_records file

* test: create a bunch of vouchers for testing auto reconcile

* chore: renamed auto_reconcile to process_payment_reconciliation

* chore: another child doctype to hold payments

* chore: remove duplicate field

* chore: add fetched payments to log

* chore: Popup comment message update

* chore: replace get_all with get_value

* chore: replace label in settings page

* chore: remove unit test and records

* refactor: status in reconciliation log

* refactor: set status in log as well

* chore: fix field name

* chore: change triggered job name

* chore: use status field in list view of log

* chore: status while there are no allocations

* refactor: split trigger function into two

* chore: adding cancelled status

* refactor: function trigger queued docs

* chore: cron job scheduled

* chore: fixing accouts settings json file

* chore: typos and variable scope

* chore: use 'pluck' in db call

* chore: remove redundant whitelist decorator

* chore: use single DB call to fetch values

* chore: replace get_all with get_value

* refactor: use raw db calls to fetch reconciliation log records

Using get_doc on `Process Payment Reconciliation Log` is costly when
handling large volumes of invoices.

Use raw frappe.db.get_all to selectively pull status and reconciled count

* chore: update status on successful batch operation

* chore: make payment table readonly

* chore: ability to pause the background job

* chore: remove isolate_each_allocation

* chore: more description in progress bar

* refactor: partially working state

* refactor: update reconcile flag and setting hard limits for fetching

* chore: make allocation editable -- NEED TO REVERT

* chore: pause button

* refactor: skip setter function in Payment Entry for better performan

* refactor: split reconcile function and skip a setter function

1. Split reconcile function into 2
2. While reconciling against payment entry, skip a
set_missing_ref_details setter method

* chore: increase payment limit

* refactor: replace frappe.db.get_all with frappe.db.get_value

* chore: remove unwanted doctypes

* refactor: make allocation table readonly

* perf: update ref_details only for newly linked invoices

* chore: rename skip flag

* refactor(UI): receivable_payable field should auto populate

* refactor: no control statements in finally block

* chore: cleanup section and rename checkbox

* chore: update new fieldname in code

* chore: update error msg

* refactor: start and pause integrated into status

pause checkbox has been removed

* refactor: added cancelled status to the log doctype

1. Moved the status section to the bottom in parent doc
2. Using alerts to indicate Job trigger status
 2023-04-22 17:24:35 +05:30
rohitwaghchaure
56d62cae7a
Merge pull request #34980 from rohitwaghchaure/fix-inter-transfer-validation 
fix: validation for internal transfer entry
 2023-04-21 17:45:54 +05:30
Rohit Waghchaure
19911b48fd fix: validation for internal transfer entry 2023-04-21 16:56:09 +05:30
ruthra kumar
3ec1597860
Merge pull request #34940 from ruthra-kumar/broken_set_exchange_gain_loss_btn_in_payment_entry 
fix: broken 'set exchange gain/loss' btn in payment entry
 2023-04-21 09:47:53 +05:30
Sagar Vora
17ef3c964f fix: set frappe.flags.company to call regional code accurately 2023-04-20 05:17:30 -07:00
ruthra kumar
fc6486d87d
Merge pull request #34922 from ruthra-kumar/refactor_payment_entry_ref_details 
refactor: refactor set_missing_values and set_missing_ref_details in Payment Entry
 2023-04-20 10:59:50 +05:30
ruthra kumar
df0682fa8c fix: broken set exchagne gain/loss btn broken in payment entry 2023-04-20 10:39:15 +05:30
ruthra kumar
b7d6e30f63 refactor: update ref details for selected references 
set_missing_ref_details can update only for selected references
 2023-04-19 15:13:10 +05:30
ruthra kumar
11cb2db3fe refactor: move set_missing_ref_detials out of set_missing_values 2023-04-19 11:54:08 +05:30
ruthra kumar
a3e3fe149d refactor: checkbox to toggle merging of JE account heads 2023-04-18 08:59:33 +05:30
Marica
fd38e8e0af
Merge branch 'develop' into bank-trans-party-automatch 2023-04-17 16:34:46 +05:30
Deepesh Garg
5c75894065
fix: Advance payment against payment terms (#34872) 2023-04-16 17:11:24 +05:30
Devin Slauenwhite
51c4338661
fix(ux): don't throw error when company defaults aren't set (#34825) 
* fix(ux): don't throw error when company defaults aren't set; instead prompt account input.

* fix: translate label and title
 2023-04-14 15:20:51 +05:30
Deepesh Garg
66130493eb
fix: Remove unnecessary checkbox from Accounts doctype (#34821) 2023-04-14 09:47:15 +05:30
marination
430b247dfc fix: Remove bank details fields from Shareholder 2023-04-11 01:33:08 +05:30
marination
7ed8f59dc8 test: Match by Account No, IBAN, Party Name, Desc and match correction 2023-04-10 22:11:00 +05:30
Marica
36de35c6d9
Merge branch 'develop' into bank-trans-party-automatch 2023-04-10 20:04:16 +05:30
Deepesh Garg
91a26608ee
fix: Unable to create payment request against purchase invoice (#34762) 2023-04-06 12:40:58 +05:30
Marica
fcc8f9f164
Merge branch 'develop' into bank-trans-party-automatch 2023-04-05 17:04:07 +05:30
marination
d7bc192804 fix: Match by both Account No and IBAN & other cleanups 
- A BT could have both account and iban, and a Supplier could have only IBAN set
- In this case, matching by either (only account) gives no match
- Match by Account OR IBAN, use `or_filters`
- If matched, set both account no. and IBAN in Bank Party Mapper

- Explain AutoMatchParty
- Add type hints to return values
- Use `set_value` to set values in BT after matching since its an after submit event
 2023-04-05 15:28:47 +05:30
Lucky-Tsuma
9bf87d708e
fix: payment entry is already created on posawesome. (#34712) 2023-04-05 13:52:00 +05:30
Deepesh Garg
fd3fb64aa3
feat: Auto allocate advance payments only against orders (#34727) 
feat: Auto allocate advance payments only againt orders
 2023-04-05 12:02:44 +05:30
anandbaburajan
1101b7bfdf fix: don't include cancelled JVs in assdeprledger report 
(cherry picked from commit 3896d41e95a2054b4ec76c5f5b2819b3f28ef98e)
 2023-04-05 06:04:43 +00:00
marination
aea4315435 chore: Make auto matching party configurable 
- Checkbox in Accounts settings "Enable Automatic Party Matching"
- Check before invoking automatching methods
- misc: Remove TODO comments
 2023-04-04 20:16:14 +05:30
marination
33604550ce chore: Perform automatch on submit 
- misc: Clearer naming
 2023-04-04 19:42:25 +05:30
marination
27ce789023 feat: Manually Update/Correct Party in Bank Transaction 
- On updating bank trans.n party after submit, the corresponding mapper doc will be updated too
- The mapper doc in turn will update all linked bank transactions that do not have this updated value
- Added Bank Party Mapper hidden link in Bank Transaction
- Rename field in BPM to `Party Name` as it does not hold description data
- If a BT matches with a BPM record, link that record in the BT
 2023-04-04 19:27:01 +05:30
marination
37c1331aba fix: Don't set description as key in Mapper doc if matched by description 
- Description is volatile and will keep changing
- It will lead to multiple Bank Party Mapper docs for the same party that will never be referenced again
- Parts of the descripton keep changing which is why it will never match a mapper record
- If matched by desc, dont create mapper record.
 2023-04-04 14:03:35 +05:30
marination
3a898289b0 chore: Single query with or filter to search Party Mapper by name/desc 2023-04-03 16:11:00 +05:30
ruthra kumar
1eefd517d1
Merge pull request #34694 from ruthra-kumar/recalculate_difference_on_allocation_change 
fix(ui): recalculate difference amount on allocation change
 2023-04-03 10:03:01 +05:30
Deepesh Garg
4c61ee30bb
fix: Multiple issues in purchase invoice submission (#34600) 
* fix: Multiple issues in purchase invoice submission

* fix: Base grand total calculation

* chore: Calculate base grand total separately only in multi currency docs

* fix: Add gl entry for round off
 2023-04-02 09:35:27 +05:30
Kitti U. @ Ecosoft
74b29eb5e2
fix: Bank clearance for case loan (disburstment/repayment) (#34586) 2023-04-01 18:50:30 +05:30
Deepesh Garg
1e3eb4deed
Merge pull request #34287 from frappe/early-payment-loss 
fix: Allocate tax loss to tax account head on early payment discount
 2023-04-01 18:49:02 +05:30
ruthra kumar
32a4ca6b6c fix: recalculate difference amount on allocation change 2023-04-01 09:17:33 +05:30
marination
e7745033df feat: Party auto-matcher from Bank Transaction data 
- Created Bank Party Mapper
- Created class to auto match by account/iban or party name/description(fuzzy)
- Automatch and set in transaction or create mapper
- `rapidfuzz` introduced
 2023-03-31 16:11:00 +05:30
marination
ad31e02616 feat: Store Party bank details in party records (Customer/Supplier/Employee/Shareholder) 2023-04-04 11:45:37 +05:30
Deepesh Garg
576575c227
fix: Column value mismatch in COA blank template (#34658) 2023-03-31 11:10:50 +05:30
Deepesh Garg
7c42b72ee7
fix: Total debit and credit while importing via Data Import (#34659) 2023-03-30 17:28:19 +05:30
akiratfli
07c9b99072
fix: bad strings format for update-translations (#34592) 
Co-authored-by: justin.li <justin.li@lungteh.com>
 2023-03-28 17:20:54 +05:30
ruthra kumar
7c13533f30
Merge pull request #34608 from ruthra-kumar/reconciliation_debit_credit_mismatch 
chore: removing redundant validation
 2023-03-28 16:54:37 +05:30
Vishal Dhayagude
7aafc90d58
fix: Tax Category not able to set hence it calculating zero tax for item whoes tax template set (#34525) 
* fix: Tax Category not able to set hence it calculating zero tax for item whoes tax template set

* fix: minor change added
 2023-03-28 16:48:03 +05:30
Devin Slauenwhite
393bc25e2d
fix: don't get zero value entries for exchange rate calculation (#34475) 
* fix: multiply None by float

* chore: remove debug
 2023-03-28 16:34:24 +05:30
Deepesh Garg
50c1172f29
fix: Party Name in SOA print when viewed from Customer/Supplier master (#34597) 
fix: Party Name in SOA print when viewd from Customer/Supplier master
 2023-03-28 15:36:16 +05:30
Marica
dae40dfbb4
Merge branch 'develop' into early-payment-loss 2023-03-28 15:01:28 +05:30
ruthra kumar
d52f7e2820 fix: removing redundant validation 2023-03-28 13:44:23 +05:30
marination
216a46bd66 feat: Make Tax loss booking optional 
- Checkbox in Accounts Settings
- Apply checkbox in PE deductions setting logic
- Adjust tests
 2023-03-27 16:11:00 +05:30
ruthra kumar
f7780cdb58
refactor: additional filters and columns in Payment Ledger report (#34577) 
1. 'Party type' and 'Party' filters have been added
2. checkbox to include Amount in Acccount Currency
3. Grouping vouchers on Party
4. Replaced Company with Posting Date
 2023-03-24 12:25:03 +05:30
Deepesh Garg
8ce1da111e chore: Improve validation message 2023-03-23 19:14:12 +05:30
Deepesh Garg
f8cff09129 fix: CS financial statement param 2023-03-23 19:12:42 +05:30
Deepesh Garg
b7dcf27b01 fix: Partial trial balance view 2023-03-23 19:06:07 +05:30
Deepesh Garg
30eb6c8512 fix: Validation for cancelation 2023-03-23 19:05:25 +05:30
Deepesh Garg
528ab503f2 fix: Don't validate if no GL Entry exists 2023-03-23 15:32:24 +05:30
Deepesh Garg
fa991b2dcf Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry 2023-03-21 17:00:08 +05:30
Deepesh Garg
f9397a87ac fix: Ignore opening entries if PCV posted 2023-03-21 16:59:22 +05:30
Richard Case
d8e73b63f3
fix: remove non-maintained Tax Detail report and missing workspace links (#34192) 
* fix: remove non-maintained Tax Detail report and missing workspace links

* patch: delete report "Tax Detail"

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-03-21 16:23:27 +05:30
Vishal Dhayagude
6966fa4d88
fix: POS not picking up pos profile company address instead fetch any random company address (#34521) 2023-03-21 15:43:57 +05:30
Marica
c5da7f5fb1
Merge branch 'develop' into early-payment-loss 2023-03-21 11:40:30 +05:30
Deepesh Garg
44053db010 chore: Remove unnecessary list comprehension 2023-03-19 19:46:01 +05:30
ruthra kumar
1eea585d29 refactor: allow for concurrent use of reconciliation tool 
1. set default filter dates a period of one month from current date
 2023-03-19 14:20:03 +05:30
ruthra kumar
2d14d92b32 fix: incorrect currency symbol in Bank Reconciliation tool 2023-03-19 12:47:29 +05:30
Deepesh Garg
0aadb680eb chore: Add missing validations 2023-03-19 12:46:42 +05:30
Deepesh Garg
00fe3042b2 chore: Simplify query 2023-03-18 20:05:43 +05:30
Deepesh Garg
7f11373b58 fix: Account sub query 2023-03-17 16:59:23 +05:30
Deepesh Garg
d11a64ddcb Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry 2023-03-17 16:50:49 +05:30
Danny
ca10e2bb9f
fix: bad strings format for command get-untraslated (#34361) 
* fix: bad string foramt

* fix: bad string format

* fix: pre-commit format

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-03-17 16:13:32 +05:30
Deepesh Garg
d8ece86463
fix: Update account number from parent company (#34474) 2023-03-17 15:55:11 +05:30
Deepesh Garg
7b630217bd
fix: Multiple accounting dimension filtering in AR/AP reports (#34464) 
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-03-17 15:51:33 +05:30
ruthra kumar
6b0dc62681
Merge pull request #34456 from ruthra-kumar/gp_return_invoice_issue 
fix: Gross Profit reports Invoices with -ve qty for Invoices with Cr Notes
 2023-03-17 15:26:41 +05:30
ruthra kumar
cc61daeec4 test: Gross Profit report output for Cr notes 
2 New test cases added.
1. Standalone Cr notes will be reported as normal Invoices
2. Cr notes against an Invoice will not overallocate qty if there are
multiple instances of same item
 2023-03-17 14:48:57 +05:30
ruthra kumar
d0715a82eb refactor: Ignore linked Cr Notes in Report output 2023-03-17 14:48:57 +05:30
ruthra kumar
e2f19c6a14 fix: Overallocation of 'qty' from Cr Notes to Parent Invoice 
Cr Notes 'qty' are overallocated to parent invoice, when there are
mulitple instances of same item in Invoice.
 2023-03-17 14:48:57 +05:30
ruthra kumar
ec075122b6 refactor: difference amt validation for same currency accounts 2023-03-17 14:14:17 +05:30
ruthra kumar
861387f164 test: difference amount should not be calculated for base currency 2023-03-17 14:14:17 +05:30
ruthra kumar
48fae0c1ce fix: difference amount calculation for company currency accounts 2023-03-17 14:14:17 +05:30
marination
d6d0163514 fix: Provision to apply early payment discount if payment is recorded late 
- Party could have paid on time but payment is recorded late
- Prompt for reference date so that discount is applied while mapping
- Prompt only if discount in payment schedule of valid doctypes
- test: Reference date and impact on PE
- `make_payment_entry` (JS) must be able to access `this`
 2023-03-14 14:22:39 +05:30
Deepesh Garg
c6999fc687
fix: Total row in trail balance report (#34395) 
* fix: Total row in trail balance report

* fix: Calculate total after preparing opening and closing
 2023-03-13 21:18:30 +05:30
Deepesh Garg
91f7b0bbd6 Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry 2023-03-13 20:52:48 +05:30
Deepesh Garg
fa776d2987
fix: Use customer name instead of name(id) in PSOA (#34412) 2023-03-13 19:37:09 +05:30
Deepesh Garg
d8e54a21fb
test: Update values in Sales Invoice tests (#34419) 2023-03-13 19:34:15 +05:30
Sagar Vora
5c06620f97
fix: set tax category from address before executing get_regional_address_details (#34372) 2023-03-13 19:32:50 +05:30
Deepesh Garg
c8cc3fc65f
chore: Move source and campaign to additional info section (#34414) 2023-03-13 18:37:19 +05:30
Marica
e1d28063b0
Merge branch 'develop' into early-payment-loss 2023-03-13 16:23:24 +05:30
Deepesh Garg
7101e7acc4
fix: Filtering issue in payment entry (#34332) 2023-03-13 14:05:13 +05:30
marination
caa1a3dccf fix: Handle rounding more gracefully 
- Round off pending discount loss to avoid miniscule losses rounded to 0.0 that are added in deductions
- Use base amounts to calculate base losses instead of using conversion factor which increases rounding error
- Round of total base loss instead of individual income and tax losses to reduce rounding error
- Use default round off account for pending rounding loss in deductions
 2023-03-13 14:01:31 +05:30
Deepesh Garg
aae53bb910
fix: Error in consolidated financial statement (#34330) 2023-03-11 19:06:56 +05:30
Deepesh Garg
0157fa15eb chore: Use account closing balance in set gl entries 2023-03-10 13:02:01 +05:30
Marica
ae0a8a6529
Merge branch 'develop' into early-payment-loss 2023-03-09 18:36:36 +05:30
marination
9abf0ef615 test: Multi currency SI with multi-currency accounting and single currency accounting + Early payment discount 2023-03-09 16:32:36 +05:30
marination
b09c2381ca fix: Multi-currency SI with base currency PE 
- Return total discount loss in base currency
- Allocate payment based on terms: Set allocated amount in references table in base currency if accounting is in that currency
- Allocate payment based on terms: While back updating set paid amount (payment schedule) in transaction currency always
- minor: discount msgprint in correct currency
 2023-03-09 16:25:45 +05:30
Deepesh Garg
719ac5c8f3 Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry 2023-03-08 18:35:26 +05:30
Deepesh Garg
f0267feca8 test: Add test case for closing balance 2023-03-08 18:34:07 +05:30
marination
761f68d7bf fix: Paid amount must be discounted considering accounting currency 
- Accounting is in the same currency if party currency and company currency is the same
- If accounting is in the same currency, paid and recvd amount is in the base currency
- Then, discount amount must also be in the base currency as it is deducted from paid amount
- Received amount must be in base currency if not multi currency
- cleanup: Deductions setting broken into smaller functions
 2023-03-08 17:20:48 +05:30
Deepesh Garg
3249a79f07 chore: rename Closing Balance to Account Closing Balance 2023-03-08 15:15:33 +05:30
Devin Slauenwhite
6de826b8c4
fix: exchange rate revaluation errors (#33947) 
* fix: set new balance for non-positive balances

* fix: don't add debit: 0, credit: 0 entries to journal entry.

* fix: add journal entry difference to unbooked gain/loss of exchange.

* chore: linter

* chore: remove invlaid TODO. [skip-ci]
 2023-03-07 17:16:15 +05:30
marination
f02fc8acf0 fix: Don't add to deductions if amount is 0 
- misc: better docstring
 2023-03-07 12:12:45 +05:30
Deepesh Garg
ea8e23384d
fix: Payment Request against sales order with disabled rounded total (#34281) 
* fix: Payment Request against sales order with disabled rounded total

* chore: Do not consider advance amount
 2023-03-07 11:40:29 +05:30
marination
7f2e7badff fix: Set deduction amount in company currency on Doctype 
- Even via JS, deductions amount is always in company currency
- Since there is nothing dynamic about this field, set it in the doctype spec itself
- fixed: Inconsistency between label currency and field currency formatted value
 2023-03-06 17:45:26 +05:30
Deepesh Garg
5dabc98ba5 chore: Add index to period closing voucher column 2023-03-06 16:56:33 +05:30
marination
c217bb2018 test: PE from SI with early payment discount amount & PE assertions in discount % test 2023-03-06 15:02:32 +05:30
marination
2ae5834290 fix: Back update discounted amount in Invoice based on discount type 
- Discount value was always trated as a percentage on back updation
 2023-03-06 14:54:46 +05:30
Deepesh Garg
310f71c313 test: Add static posting dates to tests 2023-03-05 18:43:26 +05:30
Deepesh Garg
4a2046dfb6 fix: Aggregation with previous closing balance 2023-03-05 18:18:33 +05:30
marination
dc2998f544 fix: Set deductions in base currency 
- Use field precision to get more accurate values
 2023-03-03 17:24:43 +05:30
marination
75ec0a0a85 fix: Recalculate difference amount after setting deductions 2023-03-03 14:13:27 +05:30
Marica
619824855a
Merge branch 'develop' into early-payment-loss 2023-03-03 13:53:57 +05:30
marination
768c3a4927 fix: Taxes aren't discounted on early payment discount 
- Deductions in payment entry must be split into income loss and tax loss
- Compute total discount in percentage, makes discounting different amounts proportionately easier
 2023-03-03 13:21:38 +05:30
Deepesh Garg
c089c4156c chore: Minor fixes 2023-03-02 16:46:56 +05:30
Deepesh Garg
790f0aac12
Merge branch 'develop' into finance_book_read_only 2023-03-02 10:01:12 +05:30
Suraj Shetty
6cd2ba5c66 fix: Resolve conflicts 
(cherry picked from commit f6469d83981386a7bb57b41178055eae5cda30bf)
 2023-03-01 10:59:21 +00:00
Suraj Shetty
46a722d51c fix: Wrap unexpectedly long text in remark 
(cherry picked from commit ba66a6714c495f9d70dad79344342779c8011c6e)

# Conflicts:
#	erpnext/accounts/report/general_ledger/general_ledger.html
(cherry picked from commit b13bf1ebc517ccd9c5b6b079208ca3883e7418fd)
 2023-03-01 10:59:20 +00:00
Deepesh Garg
28dd1a25cb chore: Make finance book read only 2023-03-01 15:00:24 +05:30
Deepesh Garg
e5f603c9d9 perf: Apply closing balance in Trial Balance report 2023-03-01 14:48:06 +05:30
Deepesh Garg
436fc03eda fix: Closing balance entries for period closing voucher 2023-03-01 14:43:49 +05:30
rohitwaghchaure
2942cee31e
Merge pull request #34235 from rohitwaghchaure/feat-adjust-valuation-rate 
feat: adjust purchase receipt valuation rate as per purchase invoice rate
 2023-02-28 17:34:53 +05:30
Rohit Waghchaure
a8445da02a fix: labels name 2023-02-28 15:47:45 +05:30
Rohit Waghchaure
8e86553717 test: added test cases 2023-02-28 14:57:04 +05:30
Rohit Waghchaure
eab775ef32 feat: adjust purchase receipt valuation rate as per purchase invoice rate 2023-02-28 14:11:55 +05:30
Vishal
a51bec0269 chore: minor change 2023-02-28 11:03:26 +05:30
Vishal
3ebe7d861d chore: minor changes added to code 2023-02-28 11:03:26 +05:30
Vishal
1de531e56e fix: multiple pos conversion issue resolved 2023-02-28 11:03:25 +05:30
Deepesh Garg
81651beaef
Merge pull request #34174 from Vishnu7025/coa-import-currency 
fix: currency in coa import
 2023-02-27 11:48:44 +05:30
Deepesh Garg
6607c8bd82 fix: Order by issue in aggregation query 2023-02-26 16:05:26 +05:30
Deepesh Garg
f92c63fb10 feat: Add validations against period closing voucher 2023-02-26 15:53:33 +05:30
Deepesh Garg
7fa7d6b5e4 chore: Rewrite query using query builder 2023-02-26 15:52:30 +05:30
Deepesh Garg
e18336ebe7 feat: Add views in standard filter 2023-02-26 15:47:29 +05:30
Deepesh Garg
c3f39c3f32 feat: Cascade closing balances on PCV submit 2023-02-23 16:48:54 +05:30
ruthra kumar
a9920715ab
Merge pull request #34022 from ruthra-kumar/gross_profit_memory_and_performance_issue 
perf: Gross Profit report will fetch SLE's on demand and memoize
 2023-02-23 11:55:08 +05:30
ruthra kumar
88d888d9d0 refactor: use docstatus from Delivery Note Item 2023-02-23 11:15:56 +05:30
vishnu
e3c000d0be chore: change column label 2023-02-22 10:53:11 +00:00
vishnu
19c0b7a523 fix: currency in coa import 2023-02-22 10:24:45 +00:00
Deepesh Garg
b44a19bd1a feat: Introduce opening entry for reporting 2023-02-21 23:20:28 +05:30
ruthra kumar
dde5bbc9a7
Merge pull request #34102 from ruthra-kumar/pos_validate_for_duplicate_pos_invoices 
fix: check for duplicate pos invoices in closing entry
 2023-02-21 18:45:39 +05:30
ruthra kumar
47add0b751 fix: check for duplicate in pos closing and pos merge log entry 2023-02-21 17:50:57 +05:30
Deepesh Garg
9739d8b52a feat: Introduce opening entry for reporting 2023-02-21 15:23:29 +05:30
Deepesh Garg
35cdd996a9
fix: Use normal rounding for Tax Withholding Category (#34114) 2023-02-21 12:57:49 +05:30
rohitwaghchaure
3871cf7110
Merge pull request #33722 from rohitwaghchaure/purchase-invoice-performance-issue 
fix: purchase invoice performance issue
 2023-02-20 12:47:07 +05:30
Alirio Castro
183e42af1a
fix: differency entry journal debit/credit missing (#34104) 
* fix: difference entry journal is wrong

* fix: difference entry journal is wrong
 2023-02-19 19:40:13 +05:30
ruthra kumar
c722f2819c
fix: ignore repost payment ledger on basic documents cancellation (#34054) 
fix: ignore repost payment ledger on cancel/delete of Inv/Pay/JE's

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-19 12:09:10 +05:30
Richard Case
5b7d23de15
feat: bank reconciliation and plaid changes (#33986) 
fix: plaid link refresh: update account ids
fix: plaid transactions for credit cards & add accounts on link refresh if they don't exist
fix: bank reconciliation amount matching
fix: bank reconciliation dialog usability
feat: rewrite bank transaction reconciliation to allow multiple transactions to reconcile against vouchers before clearance
fix: matching transaction amounts and race condition bug
fix: ensure there is a reference number in plaid transactions and other tweaks
feat: add references to Payroll Entry Bank Journal Entry
feat: only clear Voucher once all Bank GLEs are allocated to Bank Transactions
fix: strange type error
feat: add payment method field to bank and plaid transactions and prepopulate relevant bank reconciliation new voucher fields
feat: bank reconciliation - allow bank transactions to reconcile against themselves for when there are banking amendments
fix: bank transaction self-reconcile bug and tidy
fix: bank reconciliation datatable index update
 2023-02-19 11:50:17 +05:30
ruthra kumar
9c6466f15b
fix: consider rounded total amount while making payment request (#34110) 2023-02-19 11:41:41 +05:30
rohitwaghchaure
47264481ad
Merge branch 'develop' into purchase-invoice-performance-issue 2023-02-17 16:41:30 +05:30
anandbaburajan
e50bd52162 fix: asset repair status after deletion and asset status after manual depr entry 2023-02-17 15:32:24 +05:30
HENRY Florian
4d79ffe3c6
fix: rename duplicate field name with same type into a DocType to avoid import Error (#34053) 
* fix: Delivery Note field label set

* fix: Item field label de-duplicate name

* fix: Payment Entry field label de-duplicate name

* fix: Pruicing Rule field label de-duplicate name

* fix: Project field label de-duplicate name

* fix: Timesheet field label de-duplicate name

* Update erpnext/accounts/doctype/pricing_rule/pricing_rule.json

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>

* Update erpnext/stock/doctype/item/item.json

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>

---------

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2023-02-16 13:46:19 +05:30
Anand Baburajan
b0cfb0b9ef
Merge branch 'develop' into more_asset_bug_fixes 2023-02-14 18:09:55 +05:30
anandbaburajan
a58f2e6c03 fix: asset_depreciation_and_balances report doesn't reflect manual depr entries 2023-02-14 17:59:16 +05:30
Deepesh Garg
ce748cec3a
fix: Amount validation in Payment Request against Purchase Order (#34042) 2023-02-13 20:56:24 +05:30
Deepesh Garg
ff4ae69408
Merge branch 'develop' into gross_profit_memory_and_performance_issue 2023-02-13 15:38:26 +05:30
ruthra kumar
4f2553e7b6
Merge pull request #34021 from ruthra-kumar/handle_rare_cases_of_null_in_outstanding_calculation 
fix: rare instances of IntegrityError while cancelling journals against cr note
 2023-02-13 14:14:27 +05:30
ruthra kumar
e5a2b15fba
fix: unwanted difference amount calculation on cr note and invoice with same currency (#34020) 
* fix: incorrect difference amount while reconiling cr/dr notes

* fix(test): catch incorrect difference amount calculation

Fixed issues where difference amount was calculated for Cr Notes and Invoices of
the same currency.

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-13 12:08:42 +05:30
Deepesh Garg
ce3f9622cb
Merge branch 'develop' into handle_rare_cases_of_null_in_outstanding_calculation 2023-02-13 09:42:41 +05:30
Deepesh Garg
48bb2c942b
fix: Ignore Payment Ledger Entry on dunning cancel (#34025) 
* fix: Ignore Payment Ledger Entry on dunning cancel

* chore: fix translation issue
 2023-02-13 09:42:01 +05:30
ruthra kumar
3e5691072a perf: fetch SLE's on demand and memoize 2023-02-12 14:49:17 +05:30
ruthra kumar
b9a7ff7c3d fix: IntegrityError while cancelling journals against cr note 2023-02-12 14:06:40 +05:30
Anand Baburajan
f8270f093d
Merge branch 'develop' into manual_depr_entries_develop 2023-02-05 12:19:17 +05:30
Anand Baburajan
2d54bf7199
Merge branch 'develop' into manual_depr_entries_develop 2023-02-03 22:25:27 +05:30
anandbaburajan
8ea9e4576f fix: asset value for manual depr entries 2023-02-03 21:43:18 +05:30
developsessions
ce8a1086a7 fix: default due_date was wrong calculated on template "_Test Payment Term Template 1" (last day of next month) 2023-02-03 11:30:29 +01:00
ruthra kumar
cb1d33880c
Merge pull request #33502 from ruthra-kumar/toggle_account_balances_in_coa 
feat: Toggle display of Account Balance in Chart of Accounts
 2023-02-02 09:20:53 +05:30
Gokulnath
2884738864
feat: adding warehouse filter for gross profit report (#33397) 
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2023-02-01 18:44:15 +05:30
Raffael Meyer
3c7b460fd8
fix: german chart of accounts "SKR03" (#33909) 
* fix: german chart of accounts "SKR03"

- Added some missing account types and tax rates
- Added some missing accounts

* style: convert indentation to tabs

* fix: space before percentage sign

* feat: add some expense accounts

* refactor: replace unicode characters with utf-8

for better readability

* revert: add back groups for Bank and Cash accounts

Removed in 7d0d9c690068481a9730e0132c7aff34c1f56100
 2023-02-01 12:16:58 +05:30
Deepesh Garg
b3dc22de29
fix: Fetch commission rate from sales partner (#33851) 2023-01-31 09:33:33 +05:30
ruthra kumar
5f38859a04
Merge pull request #33736 from rtdany10/gp-report-fix 
fix(gp): fetch buying amount from dn related to so
 2023-01-30 19:04:36 +05:30
Dany Robert
d69c839369 chore: linting issues 2023-01-30 10:45:08 +00:00
Dany Robert
1f6ab86a65 feat(gp): test for inv and dn related via so 2023-01-30 10:35:43 +00:00
Deepesh Garg
a34a1f8fd2
fix: Amount validation in Payment Request against Purchase Order (#33855) 
fix: Amount validation in Payment Request againt Purchase Order
 2023-01-29 21:34:28 +05:30
Deepesh Garg
6674edface
chore: Resize numeric and date columns (#33858) 2023-01-29 21:25:26 +05:30
Deepesh Garg
428b099f63
fix: Ignore linked JE on JE cancellation (#33852) 2023-01-29 17:27:17 +05:30
Deepesh Garg
8abe0ce0ec
fix: Currency symbol for tax withholding net total field (#33850) 
* fix: Currency symbol for tax withholding net total field

* chore: Update display depends on property
 2023-01-29 17:08:11 +05:30
ruthra kumar
9dd6b3c950
Merge pull request #33835 from ruthra-kumar/skip_validation_on_migration 
fix(patch): validation error on cost center allocation migration
 2023-01-27 13:40:57 +05:30
ruthra kumar
de10f2dc00 fix(patch): validation error on cost center allocation migration 
If Distributed cost centers have GL postings on patch run date,
patch failes with valiation error.
 2023-01-27 12:08:18 +05:30
ruthra kumar
b31b850db8
fix: disfuctional cost center filter on Journal Entries (#33815) 
* fix: missing cost_center filter for journal entries

* test: cost center filter on invoices, journals and payments
 2023-01-26 20:26:21 +05:30
Vishal Dhayagude
c5ca8d74c4
fix: GST Category validation broken for pos unregistered customer who dont have address. (#33800) 
* fix: GST Category validation is given for pos customer
 2023-01-26 15:45:51 +05:30
Rohit Waghchaure
92d857d49c fix: purchase invoice performance issue 2023-01-24 22:32:07 +05:30
Deepesh Garg
a3c89dbc10
fix: TDS deduction in payment entry (#33747) 
* fix: TDS deduction in payment entry
 2023-01-22 23:31:19 +05:30
Xeanth
ad437fd5ba
fix: use stock qty to calculate POS reserved stock (#33735) 2023-01-22 18:06:01 +05:30
Deepesh Garg
2f03dcb5b6
fix: Better budget exceeding validation messages (#33713) 
* fix: Better budget exceeding validation messages

* chore: remove unwanted changes
 2023-01-21 19:33:14 +05:30
ruthra kumar
4cbd63edbf
Merge pull request #33710 from openrefactory/patch-2 
Removed an unnecessary check in code which always evaluates to true
 2023-01-21 09:41:04 +05:30
OpenRefactory, Inc
49aed7ff69 fix: removed an unnecessary check which always evaluates to true 2023-01-21 06:15:51 +05:30
rohitwaghchaure
b5d2eedfa6
Merge pull request #33759 from rohitwaghchaure/fix-incorrect-actual-qty-for-packed-item 
fix: incorrect actual qty for the packed item
 2023-01-20 23:38:55 +05:30
Rohit Waghchaure
02566a02a8 fix: incorrect actual qty for the packed item 2023-01-20 22:38:56 +05:30
Dany Robert
1e607cd4c7
fix(pricing rule): free item duplication (#33746) 
* fix(pricing rule): free item duplication

* chore: linting issues
 2023-01-20 20:07:37 +05:30
Ritwik Puri
17045f88a1
fix: use hash based naming for tax withheld vouchers child table (#33643) 2023-01-20 18:53:39 +05:30
Dany Robert
ef90e24931 chore: linting issue 2023-01-19 10:25:05 +00:00
Dany Robert
e8e20da78e fix(gp): fetch buying amount from dn related to so 2023-01-19 09:39:43 +00:00
Deepesh Garg
6b31c27ed6
fix: Missing constructor args in Bank Reco Tool (#33705) 2023-01-17 21:03:39 +05:30
Deepesh Garg
db9beb3cdd
fix: Rate from LDC in TDS reports (#33699) 2023-01-17 14:53:24 +05:30
Deepesh Garg
0639d9e32a
chore: Typo in payment reconciliation (#33686) 2023-01-17 08:06:30 +05:30
Devin Slauenwhite
179a31ed5e
feat: disable currency exchange api. (#33593) 2023-01-16 21:00:10 +05:30
Deepesh Garg
adaeba1554
fix(minor): Label updates in Statement of Accounts (#33639) 
fix(minor): Label updates in Satement of Accounts
 2023-01-16 14:03:54 +05:30
ruthra kumar
9627b46ee7
Merge pull request #33661 from ruthra-kumar/performance_tuning_payment_reconciliation 
perf: improve reconciliation performance for JE with 100s of accounts
 2023-01-16 09:41:17 +05:30
ruthra kumar
56aa1866da
Merge pull request #33663 from ruthra-kumar/attribute_error_on_repost_ple_tool 
fix: attribute error while submitting Repost PLE
 2023-01-16 09:36:22 +05:30
ruthra kumar
2c50f43cdd fix: attribute error while submitting Repost PLE 2023-01-15 20:51:54 +05:30
ruthra kumar
828eaf0930 fix: minor filter issue while reconciliation tool from bench console 2023-01-15 18:09:51 +05:30
ruthra kumar
11cf694d9a perf: improve reconciliation speed on JE's with 1000's of rows 
1. No need to keep old PLE's on reconciliation.
2. Added Validation to catch debit-credit mismatch on JE's
3. Only update outstanding amount for newly reconciled invoices
 2023-01-15 17:51:46 +05:30
Raffael Meyer
67cf7e1728
refactor: use DocStatus (#33594) 2023-01-15 17:34:16 +05:30
Deepesh Garg
afb33f2049
Merge pull request #33271 from sonali8848/filters-on-bank-reconciliation 
feat: Date filters on bank reconciliation tool
 2023-01-12 18:25:05 +05:30
Deepesh Garg
232726288a chore: fix fieldnames and order 2023-01-12 17:44:07 +05:30
Deepesh Garg
0ed938a490
fix: Incorrect exchange rate in payment entries (#33481) 
* fix: Incorrect exchange rate in payment entries

* test: Update failing tests
 2023-01-10 20:12:43 +05:30
Gughan Ravikumar
4d5067d6d4
fix(accounts): currency fields no longer read as strings by validation function in Payment Entry (#33535) 
explicitly cast paid_amount and received_amount to float in the Payment Entry set_unallocated_amount validation function
 2023-01-09 23:26:51 +05:30
ruthra kumar
bbe5e5d9d6
fix: incorrect warehouse and selling amount on bundled products (#33549) 2023-01-09 22:45:43 +05:30
Deepesh Garg
57a6c37833
Merge pull request #32933 from AnandBaburajan/asset_depreciation_schedule 
feat: separating depreciation schedule from assets into a new doc
 2023-01-09 20:47:21 +05:30
sonali
917b2190aa fix: remove comments 2023-01-09 20:07:24 +05:30
ruthra kumar
51b082b43c
Merge pull request #33537 from ruthra-kumar/sales_partner_in_ar_report 
refactor: Sales Partner column in AR and AR Summary Report
 2023-01-06 12:07:50 +05:30
ruthra kumar
ee94127974 refactor: Sales Partner column in AR and AR Summary Report 2023-01-04 12:41:02 +05:30
Anand Baburajan
3ae47ab32c
Merge branch 'develop' into asset_depreciation_schedule 2023-01-04 01:34:08 +05:30
Deepesh Garg
c78399c618
fix: Missing opening entry in general ledger (#33519) 2023-01-03 21:35:03 +05:30
Deepesh Garg
1a83a67d41
fix: Get payment entry button not visible in Bank Clearance doc (#33518) 2023-01-03 21:34:49 +05:30
Deepesh Garg
a3ab8f973a
fix: Deferred revenue date comparison (#33515) 2023-01-03 17:51:41 +05:30
Deepesh Garg
9a3d947e89
fix: Exchange gain and loss booking on multi-currency invoice reconciliation (#32900) 
* fix: Exchange gain and loss booking on multi-curreny invoice reconciliation

* test: Update test cases

* chore: Ignore SQL linting rule

* chore: Joural Entry for exchange gainand loss booking

* chore: Journal entry for exchange gain loss booking

* test: Update test case

* chore: Default exchange gain and loss account
 2023-01-03 16:55:15 +05:30
anandbaburajan
312e51e8b2 chore: more refactoring and adding test for duplicate asset_depr_schedule 2023-01-03 15:09:04 +05:30
Anand Baburajan
72c2e77a5d
Merge branch 'develop' into asset_depreciation_schedule 2023-01-02 17:07:58 +05:30
anandbaburajan
7c5168eeac chore: allow manually submitting and cancelling asset depr schedule 2023-01-02 17:07:28 +05:30
ruthra kumar
914b23038c
refactor: Exchange rate revaluation to handle accounts with zero account balance (#33165) 
* refactor: new type for JE - Exchange Gain or Loss

* refactor: skip few validations for Exchanage Gain Or Loss type Jour

* refactor: ERR create 2 journals for handling zero and non-zero compa

1. Additional check box accounts table to identify accounts with zero balance
2. Accounts with zero balance only in either of the 2 currencies will be handled on separate Journal

* refactor: skips few validation for allowing 0 debit/credit

* fix: General Ledger presentaion currency

* test: fix test case in general ledger

* test: fix failing test case in AR report
 2023-01-02 14:33:14 +05:30
ruthra kumar
23fbe86d51 refactor: Show Balance in COA based on Accounts Settings 2023-01-02 13:32:01 +05:30
ruthra kumar
1b78fae6fc refactor: show balance checkbox in Accounts Settings 2023-01-02 13:31:56 +05:30
Devin Slauenwhite
98c39c4f5f
fix: update payment entry references (#33274) 
* fix: set_amounts after deductions and losses are set

* test: difference_amount changes after update_references_in_payment_entry

* chore: linter

* fix: use kwargs instad of destructing a dict

[skip ci]

* fix(test): test payment entry difference_amount after payment reconciliation.
 2023-01-02 08:55:12 +05:30
sonali
12822f7c36 fix: data format 2022-12-30 14:06:19 +05:30
Deepesh Garg
ad53ecf2b4 fix: Multi-currency issues in Bank Recociliation Tool 2022-12-30 13:37:41 +05:30
sonali
d65243eb65 feat: consolidated auto bank reconciliation 
Added a button of Auto Reconcile, to reconcile the bank entries as per the matching reference number with the bank transaction and count of transactions reconciled message will be pop up on clicking the auto reconcile button.
 2022-12-29 16:12:25 +05:30
sonali
c764f14f53 fix: pre-commit 2022-12-29 13:58:06 +05:30
sonali
35c29e0226 fix: pre-commit 2022-12-29 13:45:15 +05:30
sonali
f1810803e1 fix: passing from_date and to_date filters in test cases 
passing from_date and to_date filters in  test_linked_payments and test_debit_credit_output  for unit testing
 2022-12-29 13:07:06 +05:30
sonali
e2614b8a21 fix: pre-commit 2022-12-29 12:21:45 +05:30
sonali
3aaa2f5326 fix: filtered as per reference date 
On bank reconciliation, transactions will be filtered as per date selected in 'from_date' and 'to_date' fields , In dialog, all the bank entries will  be fetched as per the posting date selected and if filtered by reference date checkbox is tick then then there will be two fields 'from_reference_date' and 'to_reference_date' then all bank entries in dialog box came as per reference date, selected. And by default journal entry checkbox is tick.
Also sorted the bank transactions and bank entries as per ascending order date wise.
 2022-12-29 12:05:22 +05:30
Deepesh Garg
617518389a
fix: Conversion factor error for invoices without item code (petty expenses) (#32714) 
* fix: Set default uom conversion factor to 1 for invoices

* chore: set default conversion_factor as 1

* chore: remove print statements
 2022-12-29 10:41:36 +05:30
ruthra kumar
e3a0ce5d63
fix: use base_net_amount in case of missing stock qty (#33457) 2022-12-29 09:34:51 +05:30
Dany Robert
cabaed9ed2
fix(pricing rule): consider child tables in condition (#33469) 2022-12-28 18:05:55 +05:30
Anand Baburajan
6f4e6fafa9
Merge branch 'develop' into asset_depreciation_schedule 2022-12-27 07:36:32 +05:30
anandbaburajan
6d791cabd1 chore: more refactoring 2022-12-26 22:13:11 +05:30
Deepesh Garg
8a79efab4b
feat: Accounting Dimension updation in Payment Request and Entry (#33411) 2022-12-26 10:17:55 +05:30
anandbaburajan
03662be150 chore: have different functions for draft. active and cancelled depr schedules 2022-12-25 18:05:19 +05:30
ruthra kumar
a0484793c3 refactor: remove unrelated filters from Supplier Ledger Summary 
Territory, Sales Partner and Sales Person doesn't belong in Supplier Ledger
 2022-12-24 11:20:39 +05:30
ruthra kumar
bfa511cb65 refactor: hidden columns to help framework handle user permissions 
'territory', 'supplier_group', 'customer_group' have been added as
hidden columns to handle 'user permission' based access control.
 2022-12-24 10:30:30 +05:30
Anand Baburajan
b17ef34042
Merge branch 'develop' into asset_depreciation_schedule 2022-12-23 11:02:17 +05:30