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

368 Commits

Author SHA1 Message Date
mergify[bot]
e76f59803c
fix: Percentage handling in queries (#39692) 
fix: Percentage handling in queries (#39692)

* fix: Percentage handling in queries

* test: Account with percent sign

* chore: add test records

(cherry picked from commit 6d87cfeb8d87b6faed8a7238cd8cf97df2acd99d)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-02-02 20:27:36 +05:30
mergify[bot]
a118417645
refactor: provision to filter on dimensions in reconciliation tool (#39054) 
* refactor: dimensions section in allocation table in reconciliation

(cherry picked from commit 1cde804c773de41520a6148e7d99ab0c23c39ae1)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json

* refactor: update dimension doctypes in hooks

(cherry picked from commit cfb3d872673844f04f5c9dd3f7d7f56288e5dd22)

* refactor: dimensions filter section in payment reconciliation

(cherry picked from commit 20e0acc20a218029d7101a1ba6ff3c1ae03fac02)

* refactor: column break in dimension section

(cherry picked from commit 20576e0f47ba3c4937121bfab1e0d8d395a590ce)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json

* refactor: handle dimension filters

(cherry picked from commit c1fe4bcc64775507a3bd8e02b61274d8dc2d6447)

* refactor: pass dimension filters to query

(cherry picked from commit ff60ec85b85d5548886e247b72cf1262587feba3)

* refactor: set query filters for dimensions

(cherry picked from commit ad8475cb8b24d40b04f86903feee08ecac6aa1f1)

* refactor: pass dimension details to query

(cherry picked from commit 5dc22e1811bb1841bb8c790cc3a1e1315cef6074)

* refactor: replace sql with query builder for Jourals query

(cherry picked from commit 9c5a79209eb014c90aac46a5dd5ed0d9b7cb8f87)

* refactor: partial change on outstanding invoice popup

(cherry picked from commit 2154502955166243e354897d7dcb22d1987c4693)

* fix: typo's and parameter changes

(cherry picked from commit 0ec17590ae062fbda0c14a2806ec1ac07c638593)

* refactor: Credit Note and its Exc gain/loss JE inherits dimensions

(cherry picked from commit ab939cc6e8ab3669f1e9b0f007e9459be180ac32)

* refactor: apply dimension filters on cr/dr notes

(cherry picked from commit 188ff8cde794bb1ef1043f0e47469d65944aac1e)

* chore: test dimension filter output

(cherry picked from commit e3c44231abbbe389a1f815ab77f2d6ff0c614e1b)

* test: dimension inheritance for cr note reconciliation

(cherry picked from commit ba5a7c8cd8ee6fc09b0d81ffbe8b364e584f1f1b)

* refactor: pass dimension values to Gain/Loss journal

(cherry picked from commit c44eb432a59fb3ffb3748e47356068499f1129b1)

# Conflicts:
#	erpnext/accounts/utils.py

* test: dimension inheritance in PE reconciliation

(cherry picked from commit 6148fb024b7157d637aa2308e7c856969858468d)

* refactor: pass dimensions on advance allocation

(cherry picked from commit cbd443a78afbc7c58055881e534a8aa56ca4bea6)

* test: dimension inheritance on adv allocation

(cherry picked from commit fcf4687c523202436234814af3da4c4d84f5eba9)

* refactor: dynamic dimension filters in pop up

(cherry picked from commit f8bbb0619cbbbaace8f54a9f8758c3962ebe4725)

* refactor: update dimensions, only if provided

(cherry picked from commit ec0f17ca8bd810e41ae73f5a45f304ba38c63d0a)

* refactor: handle dynamic dimension in order query

(cherry picked from commit 7c2cb70387d7dbb7f976d28919ce21f25a0b6acd)

* chore: resolve conflicts

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2024-01-28 13:50:08 +05:30
Dany Robert
ed032b3224 chore: avoid explicit escaping for precision 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit a8949174c878499e14228517abe66050f9b9ddb9)
 2024-01-25 07:00:45 +00:00
Dany Robert
8b7900e6a7 chore: change f-string to sql params 
(cherry picked from commit 383a4b132ed5cc3383b035de8c22ba759b1e1241)
 2024-01-25 07:00:45 +00:00
Dany Robert
e0a38207f6 fix: honour currency precision while fetching balance 
(cherry picked from commit bfaa93b0ca641352917be16a50e602a7fe458386)
 2024-01-25 07:00:45 +00:00
Gursheen Anand
9aae439b1f fix: date in master document for dictionary condition 
(cherry picked from commit d96a777edd9cad698b9d9bb90863c1080eacb36f)
 2024-01-11 13:27:02 +00:00
Gursheen Anand
53208dfb3e fix: fetch name for fy 
(cherry picked from commit d0ea598cdfb203882fca887d2ba34938c4c75b8e)
 2024-01-08 16:22:58 +00:00
ruthra kumar
aa5e16e681 fix: validation error on reconciling PE to Journals as Invoice 
With the same exchange rate on Journal Entry and Payment Entry,
reconcilition should not post exc gain/loss journal and should not
throw validation error

(cherry picked from commit 5eeb650dfd3ab4b20f49bacefc43d98cb856c3f3)
 2023-12-15 07:44:08 +00:00
ruthra kumar
65b4dbab2a refactor: return the newly added reference upon reconciliation 
(cherry picked from commit ecb533c4d1971d5963f9d8ff4b038fa4b62cf516)
 2023-12-01 07:07:55 +00:00
ruthra kumar
58d04e1f42 refactor: use different GL build logic for advance as liability 
(cherry picked from commit 58114e7b24788f0244b89401235a6a20721b9603)
 2023-12-01 07:07:55 +00:00
ruthra kumar
aaef9d68c0 refactor: post to GL and Payment Ledger on advance as liability 
(cherry picked from commit 78ab11f9914725266eb8cf8b98dd81a5f544d79d)
 2023-12-01 07:07:54 +00:00
ruthra kumar
7a1744691f refactor: pass on filter to upfront outstanding query as well 
(cherry picked from commit cfd3230c75b5e549b98b2362947ee8744c98e920)
 2023-11-30 07:26:32 +00:00
Gursheen Anand
ca2ad175d3 fix: annual income and expenses in digest 
(cherry picked from commit 52305e3000decb84aad1a99557e13a0bb2b68ec4)
 2023-11-24 09:51:30 +00:00
ruthra kumar
d01a480149 refactor: optimize outstanding vouchers query 
(cherry picked from commit 8b04c1d4f6356bc332c5dd8f6f8711d778e030cd)
 2023-11-23 10:14:25 +05:30
ruthra kumar
337707b9cc fix: overallocation on Payment with PO/SO 
(cherry picked from commit 23df4205f8abfca6764d84665cb9877703c1a470)
 2023-11-21 07:03:05 +00:00
ruthra kumar
e2dd414793 refactor: use 'boolean' parameter while fetching FY year 
(cherry picked from commit c31ee8ea33afcc8128270f098c40cc0b0e3f1a49)
 2023-11-16 04:18:34 +00:00
Gursheen Anand
2a5b3bdfd9 fix: use get_all instead of get_list 
(cherry picked from commit 2984a86f37e72bbdefd0348d7c456bd6ada540bb)
 2023-11-09 06:46:33 +00:00
Gursheen Anand
9781f9b7b1 fix: credit note receive payment entry 
(cherry picked from commit 40157235916578ae88d2ec9a85f481c92fec9278)
 2023-11-09 06:46:31 +00:00
ruthra kumar
d4773872aa
Merge pull request #37069 from marination/advance-unlink-impact 
fix: Recalculate `advance_paid` in SO/PO after unlinking from advance entry
 2023-09-22 08:35:27 +05:30
ruthra kumar
85ebaa3aed
Merge pull request #36879 from ruthra-kumar/unreconcile_feature 
feat: Unreconcile Payments
 2023-09-14 12:17:46 +05:30
Deepesh Garg
6664bc98a0
Merge pull request #37041 from vorasmit/fix-advances 
fix: multiple fixes for booking advances in seperate account
 2023-09-13 20:24:57 +05:30
Deepesh Garg
7bfd487b25
Merge pull request #36364 from SvbZ3r0/develop 
fix: Naming Series preview when no previous transaction present
 2023-09-13 15:17:51 +05:30
marination
426350eee6 fix: Update advance_paid in SO/PO after unlinking from advance entry 2023-09-13 14:24:56 +05:30
ruthra kumar
5dbcf7d2b9 refactor: only cancel specific gain/loss je 2023-09-05 09:52:36 +05:30
ruthra kumar
9a1588f1cc fix: typo in doctype name and qb 2023-09-05 08:34:26 +05:30
ruthra kumar
9b6eac23b6 refactor: unlink individual vouchers from payments 2023-09-05 08:34:26 +05:30
ruthra kumar
0130aea2aa refactor: convert raw sql to query_builder 2023-09-05 08:34:26 +05:30
ruthra kumar
f7865da4d2 refactor: gain/loss should use same posting date as payment 2023-09-04 21:40:40 +05:30
ruthra kumar
27e0dd9fdc
Merge pull request #36911 from ruthra-kumar/deduplicate_gain_loss_journal_creation 
fix: deduplicate gain/loss JE creation for journals as payment
 2023-09-03 10:11:43 +05:30
ruthra kumar
d6a3b9a5c7 refactor: use payment's CC for gain/loss if company default is unset 2023-09-03 09:21:23 +05:30
Deepesh Garg
2e7548462d
Merge pull request #36895 from blaggacao/fix-coa-dill-down-on-startup 
fix(startup): coa drill down
 2023-09-02 17:12:18 +05:30
ruthra kumar
79c6f0165b fix: deduplicate gain/loss JE creation for journals as payment 2023-09-02 13:29:31 +05:30
Deepesh Garg
299e32befd chore: Linting Issues 2023-08-24 18:02:06 +05:30
ruthra kumar
7a381affce refactor: limit output to 50 in reconciliation tool 2023-08-21 20:50:32 +05:30
Smit Vora
c47adcfdd9 fix: advance in seperate account 2023-08-21 15:12:11 +05:30
Gughan Ravikumar
cdf100d552
fix: Naming Series preview when no previous transaction present 2023-08-15 09:38:29 +05:30
ruthra kumar
deb0d71294 perf: pull latest details only for referenced vouchers 2023-08-15 05:26:26 +05:30
RitvikSardana
b86afb2964
feat: Financial Ratio Report (#36130) 
* feat: Financial Ratio report added

* fix: Made columns dynamic

* fix: Changed fieldtype of year column

* fix: Added Financial Ratios for all Fiscal Years

* fix: Added Validation of only Parent Having account_type of Direct Income, Indirect Income, Current Asset and Current Liability

* fix: Added 4 more ratios

* fix: added a function for repeated code

* fix: added account_type in accounts utils and cleaned report code

* fix: created function for avg_ratio_values

* fix: cleaning code

* fix: basic ratios completed

* fix: cleaned the code

* chore: code cleanup

* chore: remove comments

* chore: code cleanup

* chore: cleanup account query

* chore: Remove unused variables

---------

Co-authored-by: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-08-04 22:05:30 +05:30
Deepesh Garg
04820b14da
Merge pull request #35644 from ruthra-kumar/book_gain_loss_in_je 
refactor: booking exchange gain/loss amount through journal
 2023-08-04 09:53:26 +05:30
ruthra kumar
50d294fd1e
Merge pull request #36126 from ruthra-kumar/idx_issue_upon_journal_reconciliation 
fix: incorrect `idx` on Journals after reconciliation
 2023-07-28 09:33:29 +05:30
Gughan Ravikumar
89d109e8d2 fix: Naming Series preview when no previous transaction present 2023-07-27 23:12:11 +05:30
ruthra kumar
d9d6856153 chore: rename some internal variables 2023-07-27 08:02:46 +05:30
ruthra kumar
1ea1bfebc4 refactor: convert class method to standalone function 2023-07-26 22:33:58 +05:30
ruthra kumar
6e18bb6456 refactor: cancel gain/loss JE on Journal as payment cancellation 2023-07-26 22:33:58 +05:30
ruthra kumar
1bcb728c85 refactor: remove call for setting deductions in payment entry 2023-07-26 22:33:58 +05:30
ruthra kumar
7b516f8463 refactor: exc booking logic for Journal Entry 2023-07-26 22:33:58 +05:30
ruthra kumar
81cd7873d3 refactor: book exchange gain/loss through journal 2023-07-26 22:33:58 +05:30
David Arnold
d066b5cd04
fix(startup): coa drill down 2023-07-23 22:44:19 -05:00
Deepesh Garg
7a7d32db81 fix: FY in naming series variable for orders 2023-07-21 16:03:17 +05:30
Deepesh Garg
6270607c6d
fix: Remove current fiscal year from Global Defaults (#35960) 
* fix: Remove current fiscal year from Global Defaults

* fix: Remove button to set default

* fix: Add utils to get fiscal year

* fix: Incorrect import

* feat: Add hook for naming series parser
 2023-07-16 12:58:42 +05:30