CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-18 09:47:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,240 Commits 423 Branches 1,720 Tags
f92453ae456b2f2f2346c20ec75ccceb2bc61277
Commit Graph

45240 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
f92453ae45 chore: resolve merge conflict in accounts/utils.py and its tests 2023-08-14 10:50:31 +05:30
ruthra kumar
7469018d3e chore: resolve merge conflict 2023-08-14 10:37:56 +05:30
ruthra kumar
61afffc908 chore: cancel gain/loss je while posting reverse gl 
(cherry picked from commit 46ea814400)
 2023-08-14 04:51:46 +00:00
ruthra kumar
ed0881dacb chore: don't make gain/loss journal for base currency transactions 
(cherry picked from commit 567c0ce1e8)
 2023-08-14 04:51:46 +00:00
ruthra kumar
efb293398a chore(test): use existing company for unit test 
(cherry picked from commit 804afaa647)
 2023-08-14 04:51:46 +00:00
ruthra kumar
8d32a1f4b3 chore: rename some internal variables 
(cherry picked from commit d9d6856153)
 2023-08-14 04:51:46 +00:00
ruthra kumar
4c527d6bba chore: add msgprint for exc JE 
(cherry picked from commit acc7322874)
 2023-08-14 04:51:45 +00:00
ruthra kumar
2a61d854d3 chore: use frappetestcase 
(cherry picked from commit 47bbb37291)
 2023-08-14 04:51:45 +00:00
ruthra kumar
052abcb075 refactor(test): assert ledger outstanding 
(cherry picked from commit 025091161e)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
 2023-08-14 04:51:45 +00:00
ruthra kumar
3542df70f6 fix(test): test case breakage in Github Actions 
(cherry picked from commit bfa54d5335)
 2023-08-14 04:51:45 +00:00
ruthra kumar
c5c440b7bc test: assert ledger after cr note cancellation 
(cherry picked from commit ae424fdfed)
 2023-08-14 04:51:45 +00:00
ruthra kumar
349601b4b9 fix: cr/dr note should be posted for exc gain/loss 
(cherry picked from commit 95543225cf)
 2023-08-14 04:51:44 +00:00
ruthra kumar
09e9b16b93 test: cr notes against invoice 
(cherry picked from commit e3d2a2c5bd)
 2023-08-14 04:51:44 +00:00
ruthra kumar
39c439dc4b fix: incorrect gain/loss on allocation change on reconciliation tool 
(cherry picked from commit 506a5775f9)
 2023-08-14 04:51:44 +00:00
ruthra kumar
72a507f888 refactor: create gain/loss on Cr/Dr notes with different exc rates 
(cherry picked from commit ba1f065765)
 2023-08-14 04:51:44 +00:00
ruthra kumar
22dbe52586 refactor: convert class method to standalone function 
(cherry picked from commit 1ea1bfebc4)
 2023-08-14 04:51:44 +00:00
ruthra kumar
1999132c28 refactor: split make_exchage_gain_loss_journal into smaller function 
(cherry picked from commit c0b3b069b5)
 2023-08-14 04:51:43 +00:00
ruthra kumar
57af6d9c21 refactor: cr/dr note will be on single exchange rate 
(cherry picked from commit c87332d5da)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
 2023-08-14 04:51:43 +00:00
ruthra kumar
a9faa92796 chore: type info 
(cherry picked from commit 6628632fbb)
 2023-08-14 04:51:43 +00:00
ruthra kumar
d9219dc7d2 chore(test): fix broken test case 
(cherry picked from commit 37895a361c)
 2023-08-14 04:51:43 +00:00
ruthra kumar
395f87a0f8 chore(test): fix broken unit test 
(cherry picked from commit 70dd9d0671)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
 2023-08-14 04:51:43 +00:00
ruthra kumar
4094fbc3e5 test: journals against sales invoice 
(cherry picked from commit f3363e813a)
 2023-08-14 04:51:42 +00:00
ruthra kumar
513721c338 refactor: handle diff amount in various names 
(cherry picked from commit f4a65cccc4)
 2023-08-14 04:51:42 +00:00
ruthra kumar
077d98e0fa refactor: unit tests for journals 
(cherry picked from commit 5695d6a5a6)
 2023-08-14 04:51:42 +00:00
ruthra kumar
8be312b73e refactor: dr/cr logic for journals as payments 
(cherry picked from commit 0567243772)
 2023-08-14 04:51:42 +00:00
ruthra kumar
197e5881aa refactor: assert payment ledger outstanding in both currencies 
(cherry picked from commit 73cc1ba654)
 2023-08-14 04:51:41 +00:00
ruthra kumar
7c3fc7eb3b refactor: cancel gain/loss JE on Journal as payment cancellation 
(cherry picked from commit 6e18bb6456)
 2023-08-14 04:51:41 +00:00
ruthra kumar
01953bc0e3 refactor: linkage between journal as payment and gain/loss journal 
(cherry picked from commit f119a1e115)

# Conflicts:
#	erpnext/accounts/doctype/gl_entry/gl_entry.py
 2023-08-14 04:51:41 +00:00
ruthra kumar
075a7dfe2e chore: code cleanup 
(cherry picked from commit cd42b26839)
 2023-08-14 04:51:41 +00:00
ruthra kumar
86aead3d45 refactor: remove call for setting deductions in payment entry 
(cherry picked from commit 1bcb728c85)

# Conflicts:
#	erpnext/accounts/utils.py
 2023-08-14 04:51:40 +00:00
ruthra kumar
e20b213737 refactor(test): difference amount no updated for exchange gain/loss 
(cherry picked from commit 72bc5b3a11)

# Conflicts:
#	erpnext/accounts/test/test_utils.py
 2023-08-14 04:51:40 +00:00
ruthra kumar
4025442491 refactor(test): exc gain/loss journal for advance in purchase invoice 
(cherry picked from commit 5b06bd1af4)
 2023-08-14 04:51:40 +00:00
ruthra kumar
f6bb6b78db refactor: only post on base currency for exchange gain/loss 
(cherry picked from commit 78bc712756)
 2023-08-14 04:51:40 +00:00
ruthra kumar
00a26ea6e6 refactor(test): payment will have same exch rate - no gain/loss 
while making payment entry using reference to sales/purchase invoice,
it herits the parent docs exchange rate. so, there will be no exchange
gain/loss

(cherry picked from commit ee2d1fa36e)
 2023-08-14 04:51:39 +00:00
ruthra kumar
e2c35f8c85 refactor(test): assert Exc journal when reconciling Journa to invoic 
(cherry picked from commit 389cadf157)
 2023-08-14 04:51:39 +00:00
ruthra kumar
72e88d22ed chore: remove debugging statements and fixing failing unit tests 
(cherry picked from commit ee3ce82ea8)
 2023-08-14 04:51:39 +00:00
ruthra kumar
220bf24555 refactor: exc booking logic for Journal Entry 
(cherry picked from commit 7b516f8463)
 2023-08-14 04:51:39 +00:00
ruthra kumar
1f76dde025 refactor(test): exc gain/loss booked through journal 
(cherry picked from commit 00a2e42a47)
 2023-08-14 04:51:38 +00:00
ruthra kumar
59b7e96255 refactor: assert exchange gain/loss amount in reference table 
(cherry picked from commit 4ff53e1062)
 2023-08-14 04:51:38 +00:00
ruthra kumar
d030f4a100 refactor: remove unused variable, pe should pull in parent exc rate 
1. 'reference_doc' variable is never set. Hence, removing.
2. set_exchange_rate() relies on ref_doc, which was never
set due to point [1]. Replacing it with 'doc'.
3. Sales/Purchase Invoice has 'conversion_rate' field for tracking
exchange rate. Added a get statement for them as well.

(cherry picked from commit 92ae9c2201)
 2023-08-14 04:51:38 +00:00
ruthra kumar
6c6acef78e refactor: helper method 
(cherry picked from commit c1184585ed)
 2023-08-14 04:51:38 +00:00
ruthra kumar
a9da619903 chore: fix logic for purchase invoice and some typos 
(cherry picked from commit 34b5e849a2)
 2023-08-14 04:51:38 +00:00
ruthra kumar
72005bdb39 refactor: add new reference type in journal entry account 
(cherry picked from commit 13febcac81)
 2023-08-14 04:51:38 +00:00
ruthra kumar
287af687cf chore: patch to update property setter for Journal Entry Accounts 
(cherry picked from commit 0587338435)
 2023-08-14 04:51:37 +00:00
ruthra kumar
db46987d4b refactor: replace with new method in purchase invoice 
(cherry picked from commit 7e94a1c51b)
 2023-08-14 04:51:37 +00:00
ruthra kumar
44110860b4 test: different scenarios for exchange booking 
(cherry picked from commit 5e1cd1f227)
 2023-08-14 04:51:37 +00:00
ruthra kumar
c06a6bfc09 refactor: book exchange gain/loss through journal 
(cherry picked from commit 81cd7873d3)
 2023-08-14 04:51:37 +00:00
mergify[bot]
ac0fff7e94 fix: AR/AP report based on payment terms (#36574) 
fix: AR/AP report based on payment terms (#36574)

* fix: AR/AP report based on payment terms

* fix: AR/AP report based on payment terms

(cherry picked from commit fbb5058531)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-14 09:46:41 +05:30
mergify[bot]
3044f46c52 fix: wrong currency on financial-statement based reports (#36524) 
fix: wrong currency on financial-statement based reports (#36524)

* add missing field options on financial_statement Total field

* format financial statement code

(cherry picked from commit ce25f9e8c9)

Co-authored-by: Naufal Afif <naufalafif58@gmail.com>
 2023-08-13 17:11:47 +05:30
Deepesh Garg
0a832bc979 Merge pull request #36609 from frappe/mergify/bp/version-14-hotfix/pr-36564 
fix: Make default sales update frequency as monthly instead of each transaction (#36564)
 2023-08-13 13:20:27 +05:30