Commit Graph

50042 Commits

Author SHA1 Message Date
Khushi Rawat
1eb9cc33fc feat: added 'cost of new capitalized asset' column 2024-09-26 16:49:01 +05:30
rohitwaghchaure
e4e96d2a44 fix: serial and batch no selector (#43387) 2024-09-25 22:15:10 +05:30
Frappe PR Bot
9998aa2deb fix: sync translations from crowdin (#43350) 2024-09-25 01:31:42 +02:00
rohitwaghchaure
a63dca0984 fix: Cannot read properties of undefined (reading 'price_list_rate') (#43376) 2024-09-25 00:02:33 +05:30
rohitwaghchaure
8c32ebee68 fix: not able to cancel Quality Inspection (#43374) 2024-09-24 22:05:23 +05:30
Frappe PR Bot
05102a887f chore: update POT file (#43373) 2024-09-24 15:38:04 +00:00
Khushi Rawat
0dd9fd3ded Merge pull request #43348 from khushi8112/missing-condition-in-asset-depreciation-report
fix: asset depreciation and balances report correction
2024-09-24 17:59:17 +05:30
Khushi Rawat
07d40d29a7 style: added comment 2024-09-24 17:40:33 +05:30
Khushi Rawat
bdfbec4de8 chore: Merge branch 'develop' 2024-09-24 17:28:21 +05:30
Raffael Meyer
5172629e06 fix(Bank Account): dashboard connections (#43365)
* refactor(Bank Account): move dashboard links to DocType definition

* fix(Bank Account): rearrange dashboard links

* fix(Bank Account): add Bank Transaction to connections
2024-09-24 17:03:22 +05:30
jabir-elat
9974b7c4ae fix: closing amount reset to expected amount on save (#43358) 2024-09-24 16:04:30 +05:30
ruthra kumar
59071f1cd4 Merge pull request #43356 from ruthra-kumar/ignore_0_outstanding_on_ar_report
fix: AR / AP report to ignore 0.0 outstanding
2024-09-24 15:43:29 +05:30
ruthra kumar
6954bfcb10 Merge pull request #43235 from vishakhdesai/general-ledger-duplicate-rows-issue
fix: set group_by condition to "Group by Voucher (Consolidated)" if `None` and voucher_no is set
2024-09-24 14:53:12 +05:30
ruthra kumar
6e2cf79e2c fix: AR / AP report to ignore 0.0 outstanding 2024-09-24 12:14:36 +05:30
ruthra kumar
c671a6c42f Merge pull request #43310 from aerele/pos-bank-clearance
fix: update clearance date in invoice payment table
2024-09-24 10:58:43 +05:30
Khushi Rawat
9f4ed22368 Merge branch 'develop' of https://github.com/frappe/erpnext into missing-condition-in-asset-depreciation-report 2024-09-24 01:42:13 +05:30
Khushi Rawat
c06039028c fix(minor): include condition to check docstatus 2024-09-24 01:41:54 +05:30
rohitwaghchaure
9e8be8db51 fix: stock dashboard (#43347) 2024-09-24 00:05:18 +05:30
Khushi Rawat
4242ac527d fix: added date condition 2024-09-23 23:47:48 +05:30
ruthra kumar
2f6003c360 Merge pull request #43283 from barredterra/shipping-rule-query
fix: shipping rule must match the company
2024-09-23 20:10:26 +05:30
ruthra kumar
c202be6d2e Merge pull request #43257 from ljain112/fix-pos-invoice
fix: item_query in pos_invoice
2024-09-23 19:58:47 +05:30
ruthra kumar
3e13a43278 Merge pull request #43253 from Nihantra-Patel/pos_return_v15
fix: partial return on POS invoice
2024-09-23 19:54:51 +05:30
ruthra kumar
8e7659ea0e Merge pull request #43307 from aerele/gl-ple-column
fix: change dynamic link doctype fieldtype to data
2024-09-23 17:51:29 +05:30
ruthra kumar
8fccc70136 Merge pull request #43308 from aerele/report-chart-currency
fix: show chart tool tip in report currency
2024-09-23 17:39:46 +05:30
ruthra kumar
fc9b1ef7a3 Merge pull request #43316 from ruthra-kumar/fix_incorrect_outstanding_on_non_pos_with_write_off_account
fix: incorrect outstanding on non-pos invoice with write_off_account
2024-09-23 17:35:53 +05:30
ruthra kumar
3fb4d8fbf1 Merge pull request #43331 from ruthra-kumar/incorrect_transaction_currency_val_in_gl_entry
fix: transaction exchange rate on GL's for Multi currency Journals
2024-09-23 17:32:00 +05:30
ruthra kumar
4be6878e58 Merge pull request #43321 from ljain112/fix-payment-advance
fix: handle missing liability account scenario in `set_liability_account`
2024-09-23 17:29:45 +05:30
ruthra kumar
0db382123c Merge pull request #43328 from aerele/tax-rule-filter
fix: allow tax rule filter on tax category name with %
2024-09-23 17:16:07 +05:30
ruthra kumar
c524825d2d test: transaction exchange rate on multi-currency journals 2024-09-23 17:12:31 +05:30
ruthra kumar
8cd9ad5361 fix: transaction exchange rate on GL's for Multi currency Journals 2024-09-23 17:02:00 +05:30
Frappe PR Bot
8e3b84ff5c fix: sync translations from crowdin (#43313) 2024-09-23 10:02:27 +02:00
venkat102
3aaa13cb29 fix: make to tax category on tax rule to filter with percent 2024-09-23 12:45:14 +05:30
Frappe PR Bot
621f0f343a chore: update POT file (#43324) 2024-09-22 12:51:08 +02:00
HENRY Florian
6e34d52506 fix: bump pycountry version in ERPNext to be compatible with the frappe one (#43317)
* fix: pycountry dependency is now in frappe develop branch with 24.6.1 version

* fix: bump pycountry version in ERPNext to be compatible with the frappe one
2024-09-21 12:19:42 +02:00
ljain112
ee7ab4b065 fix: handle missing liability account scenario in set_liability_account 2024-09-21 15:02:40 +05:30
ruthra kumar
d5e2906e59 fix: incorrect outstanding on non-pos invoice with write_off_account 2024-09-21 12:37:16 +05:30
Abdeali Chharchhodawala
93f867570f fix: multiple issues in Payment Request (#42427)
* fix: multiple issues in Payment Request

* chore: minor changes

* fix: remove  bug

* fix: replace `round` with `flt`

* fix: update `set_advance_payment_status()` logic

* fix: removed bug of `set_advance_payment_status`

* fix: changes as per review

* refactor: replace sql query of `matched_payment_requests` to query builder

* fix: replace `locals` with `get_doc` in set_query

* fix: changes during review

* fix: minor review changes

* fix: remove unnecessary code for setting payment entry received amount

* fix: logic for ser payment_request if PE made from transaction

* fix: Use rounded total to make Payment Request from `Sales Invoice` or `Purchase Invoice`

* refactor: enhance logic of `set_open_payment_requests_to_references`

* fix: added one optional arg `created_from_payment_request`

* fix: handle multiple allocation of PR at PE's reference

* fix: logic for PR if outstanding docs fetch

* fix: formatted Link field for `Payment Request` for PE's references

* fix: replace `get_all()` with `get_list()` for getting Payment Request for Link field

* fix: replace `get_all()` with `get_list()` for getting Payment Request for Link field

* chore: format `payment_entry.js` file

* style: Show preview popup of `Payment Request`

* fix: remove minor bug

* fix: add virtual field for Payment Term and Request `outstanding_amount` in PE's reference

* fix: get outstanding amount in PE's reference on realtime

* fix: move allocation of allocated_amount to server side (no change)

* fix: some minor changes to allocation

* fix: Split `Payment Request` if PE is created from PR and there are `Payment Terms`

* fix: minor logic changes

* fix: Allocation of allocated_amount if `paid_amount` is changes

* fix: improve logic of allocation

* fix: set matched payment request if unset

* fix: minor changes

* fix: Allocate single Payment Request if PE created from PR

* fix: improve code logic

* fix: Removed duplication code

* fix: proper message title

* refactor: Rename method of Allocation Amount to References

* refactor: Changing `grand_total` description based on `party_type`

* refactor: update Payment Request

* fix: Remove virtual property of payment_term_oustanding from references

* fix: fetch party account currency for creating payment request

* fix: use transaction currency as base in payment request

* fix: party amount for creating payment entry

* fix: allow for proportional amount paid by bank

* fix: Changed field order in Payment Request

* fix: Minor refactor in Payment Entry Reference table data

* test: Added test cases for allow Payment at `Partially Paid` status for PR

* test: Update partial paid status test case

* test: Update test case for same currency PR

* refactor: Wider the `msgprint` dialog for after save PE

* test: Update PR test cases

* chore: Remove dirty lines

* test: Checking `Advance Payment Status`

* fix: formatting update

* fix: Use `flt` where doing subtraction

* test: PR test case with Payment Term for same currency

* fix: remove redundant `flt`

* test: Add test cases for PR

---------

Co-authored-by: Sagar Vora <sagar@resilient.tech>
2024-09-21 07:04:46 +05:30
HENRY Florian
40d97f4fe9 refactor: use common functionality to validate account number (#42842)
feat: Allow unique Account number by root type (not unique for accros all Accounts)
2024-09-21 06:46:57 +05:30
Kavin
c218f7527f refactor: update clearance date in payment entry 2024-09-20 18:24:00 +05:30
rohitwaghchaure
b127a0c8b7 fix: ui clean-up (#43305)
fix: ui cleanup
2024-09-20 15:42:17 +05:30
Frappe PR Bot
b05bee4d53 fix: sync translations from crowdin (#43263) 2024-09-20 11:14:14 +02:00
Kavin
ce8600520f test: add test case for updating clearance date on pos invoice 2024-09-20 14:33:03 +05:30
Kavin
487c2a29a6 fix: update clearance date in invoice payment table 2024-09-20 14:29:10 +05:30
venkat102
91a27bda84 fix: add currency in financial statement 2024-09-20 12:22:03 +05:30
venkat102
827b3f4542 fix: show chart tool tip in report currency 2024-09-20 11:43:00 +05:30
venkat102
1e46f7344a fix: change dynamic link doctype fieldtype to data 2024-09-20 10:53:45 +05:30
David Arnold
3e54ad55ac Merge pull request #43301 from blaggacao/fix/undue-db-write-on-payment-entry
chore: cant write in (potential) read-only mode
2024-09-19 16:49:31 +02:00
David
87d7c4f70e chore: cant write in (potential) read-only mode 2024-09-19 16:30:26 +02:00
ruthra kumar
444f085fc5 Merge pull request #43291 from frappe/mergify/copy/develop/pr-43213
fix: Payment Ledger Report currency fieldtype fix (copy #43213)
2024-09-19 09:17:48 +05:30
ruthra kumar
729c3c6344 Merge pull request #43274 from doancan/translate-fix
fix: translate in js
2024-09-19 08:55:34 +05:30