schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,912 Commits 322 Branches 1,581 Tags
f9974f9eb068cb389fb582da9ae7bd80c20f8dfe
Commit Graph

356 Commits

Author SHA1 Message Date
ljain112
23fb4f348f fix: payment reco for jv with negative dr or cr amount 
(cherry picked from commit fee79b9445)
 2024-11-20 07:18:19 +00:00
Ahmed Shareef
93243b1d95 fix: remarks field in payment reconciliation 
(cherry picked from commit 2d5b079949)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
#	erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py
 2024-10-30 04:50:23 +00:00
Vishakh Desai
ad04610c94 fix: get stock accounts from the doc instead of db in validate_stock_accounts 
(cherry picked from commit 30954586d8)
 2024-10-22 14:07:06 +00:00
Navin-S-R
62f12861f1 fix: delete exchange gain loss journal entry while deleting payment entry 
(cherry picked from commit 9886cf0d46)
 2024-09-13 05:19:03 +00:00
venkat102
f5069524f3 fix: cancel common party advance jv while canceling the invoice 
(cherry picked from commit 6a928b92df)
 2024-09-06 14:50:04 +00:00
ruthra kumar
c1fd95ac66 refactor: hooks for monthly re-evaluation jobs 
(cherry picked from commit fc4e5f165c)

# Conflicts:
#	erpnext/hooks.py
 2024-07-24 13:15:15 +00:00
Akhil Narang
5b2c13dacf refactor: use json directly instead of using frappe.json (#41609) 
(cherry picked from commit 3f06f1905f)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-05-27 07:26:24 +00:00
Deepesh Garg
42312c5bba Merge pull request #41170 from deepeshgarg007/default_dates_in_reports 
fix: Default dates in report
 2024-05-14 08:21:51 +05:30
Deepesh Garg
7a380f584d fix: default fiscal year 2024-05-11 17:51:53 +05:30
ruthra kumar
8318286865 fix: validation to prevent overallocation 
(cherry picked from commit bf755fab55)
 2024-04-30 17:48:55 +05:30
Akhil Narang
4d34b1ead7 refactor(treewide): formatting and ruff fixes, + manually enabled F401 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2024-04-10 17:13:31 +05:30
ruthra kumar
46c76b166d chore: resolve conflicts 2024-04-09 19:59:09 +05:30
ruthra kumar
6273a31b8c refactor: only run checks on specified companies 
(cherry picked from commit 00eeacd06a)

# Conflicts:
#	erpnext/accounts/utils.py
 2024-04-09 12:25:53 +00:00
ruthra kumar
9981a900b2 refactor: control monitoring through settings page 
(cherry picked from commit a42482ce35)

# Conflicts:
#	erpnext/accounts/utils.py
 2024-04-09 12:25:52 +00:00
ruthra kumar
58698c9aa4 refactor: barebones method to run checks 
(cherry picked from commit 8c8d9be810)

# Conflicts:
#	erpnext/accounts/utils.py
 2024-04-09 12:25:47 +00:00
ruthra kumar
09cda60bdf fix: use reference type name to update exc rate 
(cherry picked from commit c15690e475)
 2024-04-05 05:03:56 +00:00
Rohit Waghchaure
c36a5d1ba3 chore: fix backport issues 2024-03-20 20:09:22 +05:30
Rohit Waghchaure
5e68ebd030 perf: new column posting datetime in SLE to optimize stock ledger related queries 
(cherry picked from commit d80ca523a4)
 2024-03-20 20:07:36 +05:30
ruthra kumar
e25ec4156e fix: don't override reference exchange rate 
(cherry picked from commit eaac02655b)
 2024-03-02 08:22:41 +00:00
ruthra kumar
dcf19c3ed9 fix: reconciliation issue due to notation difference 2024-02-09 16:50:14 +05:30
ruthra kumar
2c431f394e chore: resolve conflicts 2024-01-24 16:11:14 +05:30
ruthra kumar
9a3bde9350 refactor: update dimensions, only if provided 
(cherry picked from commit ec0f17ca8b)
 2024-01-23 11:59:31 +00:00
ruthra kumar
a919702319 refactor: pass dimension values to Gain/Loss journal 
(cherry picked from commit c44eb432a5)

# Conflicts:
#	erpnext/accounts/utils.py
 2024-01-23 11:59:29 +00:00
ruthra kumar
937262b572 refactor: Credit Note and its Exc gain/loss JE inherits dimensions 
(cherry picked from commit ab939cc6e8)
 2024-01-23 11:59:28 +00:00
ruthra kumar
41c074d0bb fix: typo's and parameter changes 
(cherry picked from commit 0ec17590ae)
 2024-01-23 11:59:28 +00:00
ruthra kumar
dac422a0e1 refactor: pass dimension details to query 
(cherry picked from commit 5dc22e1811)

# Conflicts:
#	erpnext/accounts/utils.py
 2024-01-23 11:59:27 +00:00
rohitwaghchaure
5336cd49c9 chore: fix conflicts 2024-01-14 09:41:48 +05:30
Gursheen Anand
670d61547f fix: date in master document for dictionary condition 
(cherry picked from commit d96a777edd)

# Conflicts:
#	erpnext/accounts/utils.py
 2024-01-11 13:26:01 +00:00
ruthra kumar
9836205725 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 5eeb650dfd)
 2023-12-15 13:20:38 +05:30
ruthra kumar
e8ea6022f0 refactor: pass on filter to upfront outstanding query as well 
(cherry picked from commit cfd3230c75)
 2023-11-30 07:26:29 +00:00
Gursheen Kaur Anand
aea169d4d4 chore: resolve conflicts 2023-11-24 15:30:19 +05:30
Gursheen Anand
7dce68bdcc fix: annual income and expenses in digest 
(cherry picked from commit 52305e3000)

# Conflicts:
#	erpnext/accounts/utils.py
 2023-11-24 09:51:29 +00:00
ruthra kumar
ac13e7362c refactor: optimize outstanding vouchers query 
(cherry picked from commit 8b04c1d4f6)
 2023-11-23 04:12:42 +00:00
ruthra kumar
c4e57040b7 Merge pull request #38205 from vorasmit/partial-cancel 
fix: partial cancel of gle and ple (backport #35609)
 2023-11-22 10:27:05 +05:30
Dany Robert
392ee2e0fd fix: round unreconciled_amount before asserting 2023-11-20 14:36:58 +05:30
Smit Vora
80bc235d6e fix: partial cancel of gle and ple (backport #35609) 2023-11-20 10:56:56 +05:30
ruthra kumar
be925d2d33 refactor: avoid precision based validation error on reconciliation 2023-11-05 05:22:09 +05:30
ruthra kumar
d576fc7490 chore: resolve conflict 2023-10-24 08:48:53 +05:30
ruthra kumar
d71b885fb8 fix: overallocation on Payment with PO/SO 
(cherry picked from commit 23df4205f8)

# Conflicts:
#	erpnext/accounts/utils.py
 2023-10-24 03:14:51 +00:00
ruthra kumar
515bed8c80 refactor: pass gain loss posting date to controller 
(cherry picked from commit 7e600a6494)
 2023-10-23 15:57:16 +00:00
ruthra kumar
75d3093aea refactor: only cancel specific gain/loss je 
(cherry picked from commit 5dbcf7d2b9)
 2023-10-09 06:15:09 +00:00
ruthra kumar
606c99e57c fix: typo in doctype name and qb 
(cherry picked from commit 9a1588f1cc)
 2023-10-09 06:15:08 +00:00
ruthra kumar
f5718390b7 refactor: unlink individual vouchers from payments 
(cherry picked from commit 9b6eac23b6)
 2023-10-09 06:15:08 +00:00
ruthra kumar
3cbaea389b refactor: convert raw sql to query_builder 
(cherry picked from commit 0130aea2aa)
 2023-10-09 06:15:07 +00:00
marination
1181dcf521 fix: Update advance_paid in SO/PO after unlinking from advance entry 
(cherry picked from commit 426350eee6)
 2023-09-22 03:06:31 +00:00
ruthra kumar
01eae2b758 refactor: gain/loss should use same posting date as payment 
(cherry picked from commit f7865da4d2)
 2023-09-05 03:00:02 +00:00
ruthra kumar
d24c8b1bbc refactor: use payment's CC for gain/loss if company default is unset 
(cherry picked from commit d6a3b9a5c7)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
 2023-09-03 04:44:16 +00:00
ruthra kumar
9168b3b0e8 fix: deduplicate gain/loss JE creation for journals as payment 
(cherry picked from commit 79c6f0165b)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2023-09-03 04:44:13 +00:00
ruthra kumar
20c45c7975 chore: linter fix 2023-08-23 14:15:35 +05:30
ruthra kumar
4556c36736 refactor: limit output to 50 in reconciliation tool 
(cherry picked from commit 7a381affce)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
 2023-08-23 03:43:28 +00:00