Commit Graph

49997 Commits

Author SHA1 Message Date
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
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
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
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
sameer Chauhan
67c6010273 fix: Payment Ledger Report currency fieldtype fix
(cherry picked from commit ad2d6a1625)
2024-09-19 03:21:29 +00:00
rohitwaghchaure
3e7a7a54bf fix: incorrect stock balance for inventory dimension (#43284) 2024-09-19 08:47:27 +05:30
Shariq Ansari
256d0208d7 Merge pull request #43279 from shariquerik/crm-erpnext-2
fix: create_address is failing while creating customer
2024-09-18 22:15:08 +05:30
Shariq Ansari
acc1d52ac8 fix: create_address is failing 2024-09-18 21:56:53 +05:30
Nihantra C. Patel
16177f277c Merge pull request #43276 from Nihantra-Patel/fix_tran_so_to_po
fix: Translation for button SO to PO
2024-09-18 21:43:05 +05:30
Nihantra C. Patel
a5275e9f28 fix: Translation for button SO to PO 2024-09-18 21:36:02 +05:30
Doğancan
25faec5662 fix: translate in js 2024-09-18 17:06:07 +03:00
ruthra kumar
6d59039955 Merge pull request #43239 from aerele/pricing-rule-list-currency
fix: add currency in options for rate field in pricing rule
2024-09-18 11:58:18 +05:30
ruthra kumar
f388f8682f Merge pull request #43216 from aerele/cc-allocation
fix: get cost center allocation percentage only from the applicable allocation
2024-09-18 11:18:22 +05:30
Khushi Rawat
a5e9af3f4d Merge pull request #43210 from khushi8112/finance-book-filter
fix: updated filtering in depreciation and balances report
2024-09-18 01:55:50 +05:30
ruthra kumar
063348434c Merge pull request #43226 from aerele/reconcile-after-period-closing
fix: map rows on journal entry by validating account, party, debit and credit value
2024-09-17 20:03:51 +05:30
Navin-S-R
720a330617 fix: create fiscal year without overlapping existing Fiscal Years 2024-09-17 18:55:28 +05:30
Navin-S-R
768bb0312a refactor: update formatting changes 2024-09-17 17:21:26 +05:30
ruthra kumar
f45638015f refactor(test): make use existing test data and dynamic fy creation 2024-09-17 16:49:23 +05:30
ruthra kumar
75babd4c18 fix: ignore repost logic on Payment Reconciliation 2024-09-17 14:40:04 +05:30
ruthra kumar
e29e1e45c4 Merge pull request #43188 from rtdany10/gp_so_issue
fix: invalid gp calculation
2024-09-17 12:02:13 +05:30
Sumit Bhanushali
891d383d09 Merge pull request #43247 from frappe/revert-43236-fix-app-route
Revert "fix: dont hardcode workspace in app route"
2024-09-17 11:11:54 +05:30
Sumit Bhanushali
ea8912b916 Revert "fix: dont hardcode workspace in app route" 2024-09-17 10:37:06 +05:30
ruthra kumar
fdd62f7400 Merge pull request #42969 from lbrandh/project_completion
fix: A project without tasks should be able to complete
2024-09-17 10:18:26 +05:30
ruthra kumar
d228ac325e Merge pull request #43225 from aerele/jv-fx-amount
fix(ux): set amount based on account currency while adding new row
2024-09-17 10:17:48 +05:30
Sumit Bhanushali
5ef81f2ef1 Merge pull request #43236 from frappe/fix-app-route
fix: dont hardcode workspace in app route
2024-09-17 10:01:42 +05:30
Frappe PR Bot
b36569938d fix: sync translations from crowdin (#43219) 2024-09-16 20:27:22 +00:00
Khushi Rawat
cd484c5f50 Merge pull request #43233 from khushi8112/gl-entry-for-capitalized-asset
fix: do not validate purchase document for composite asset
2024-09-17 00:17:15 +05:30
Shariq Ansari
614f6489e7 Merge pull request #43238 from shariquerik/crm-erpnext-1
fix: create and link address while creating prospect & customer
2024-09-16 22:14:17 +05:30
Smit Vora
d9d8404217 Merge pull request #43176 from ljain112/fix-pos-discount
fix: hide and reset discount control on new POS order
2024-09-16 19:53:04 +05:30
Shariq Ansari
035c15794c fix: create and link address while creating prospect & customer 2024-09-16 18:53:42 +05:30
krishna
636c0131fa fix: add currency in options for rate field in pricing rule 2024-09-16 18:44:58 +05:30
Smit Vora
705d3dec53 Merge pull request #42849 from ljain112/fix-tds-po
fix: TDS workflow consistency in Purchase Order
2024-09-16 18:44:48 +05:30
Sumit Bhanushali
26774ebd78 fix: dont hardcode workspace in app route 2024-09-16 18:21:48 +05:30
Khushi Rawat
5fd058dde9 fix: do not validate purchase document for composite asset 2024-09-16 12:35:35 +05:30
ruthra kumar
902ce9c46d Merge pull request #43224 from aerele/journal-last-row-fx-amount
fix(ux): set amount on foreign currency when foreign currency account…
2024-09-16 11:44:54 +05:30
ruthra kumar
4eeae8011e refactor(test): fix linter 2024-09-16 11:14:54 +05:30
ruthra kumar
309f74cafb Merge pull request #42809 from Vishnu7025/fix_so
fix: warehouse not mapping correctly during Delivery Note creation.
2024-09-16 11:01:12 +05:30
ruthra kumar
e5b699821f refactor(test): set valuation rate for stocked item 2024-09-16 10:18:51 +05:30
ruthra kumar
44767e9baa Merge pull request #43212 from ljain112/fix-patch
fix: prevent KeyError by checking `report_filter` existence
2024-09-16 09:17:14 +05:30
Frappe PR Bot
42f01d4302 chore: update POT file (#43227) 2024-09-15 12:45:46 +02:00
Navin-S-R
0ff04f774d fix(ux): set amount based on account currency while adding new row 2024-09-14 17:39:50 +05:30
Navin-S-R
f47ea46806 test: reconcile payment jv from closed fiscal year 2024-09-14 17:31:53 +05:30
venkat102
2b66842d34 fix(ux): set amount on foreign currency when foreign currency account is selected on last row of journal 2024-09-14 16:00:53 +05:30
Navin-S-R
b634aa9cfb fix: map rows on journal entry by validating account, party, debit and credit value 2024-09-14 15:58:02 +05:30