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

9433 Commits

Author SHA1 Message Date
vishal
24be04427c fix: minor issue 
(cherry picked from commit b60c57a97dee1ab1a2b1654d4cc2d146e0141ff2)
 2023-11-09 07:35:38 +00:00
vishal
fff294fb37 feat: multi-select customer group in AR Report 
(cherry picked from commit 8903c1bc6f24c4e0187f05739887ac6f4af6a7b6)
 2023-11-09 07:35:38 +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
74983910bc chore: linting issues 
(cherry picked from commit 84f0d1ff1ff231f0388033d2304d977b07411253)
 2023-11-09 06:46:32 +00:00
Gursheen Anand
6e463b1953 fix: handle gle for standalone credit and debit notes 
(cherry picked from commit 98a8288da2e2516153e30a2e028104f220df3644)
 2023-11-09 06:46:32 +00:00
Gursheen Anand
22e58e0ee0 fix: skip check for removed validation 
(cherry picked from commit 0e100cd451892f3024d031ca7b45964c533cdc26)
 2023-11-09 06:46:32 +00:00
Gursheen Anand
ced6d004fb refactor: move common util for fetching party types using account type 
(cherry picked from commit 4867ca353c1ba199844830eb539d9dca5455949b)
 2023-11-09 06:46:32 +00:00
Gursheen Anand
9781f9b7b1 fix: credit note receive payment entry 
(cherry picked from commit 40157235916578ae88d2ec9a85f481c92fec9278)
 2023-11-09 06:46:31 +00:00
Gursheen Anand
46c86de093 test: receive payments from payable party 
(cherry picked from commit cd1e016163141a4851b9128a2ff008809942482e)
 2023-11-09 06:46:31 +00:00
Gursheen Anand
a89af589e8 fix: test for invoice returns 
(cherry picked from commit 1f4b38174899d99be2a3ac894a328c6b7ae7475f)
 2023-11-09 06:46:31 +00:00
Gursheen Anand
8602a3eab1 fix: remove validation for negative outstanding invoices 
(cherry picked from commit 3d9938221a7fef7e08c0072364d8ebb855933d11)
 2023-11-09 06:46:31 +00:00
ruthra kumar
ef9e8406eb refactor: ignore disabled account while selecting Income Accounts 
(cherry picked from commit 6e3e094c957d8c2b71ed522e9a8034364345e5a7)
 2023-11-09 04:45:59 +00:00
mergify[bot]
b3562bdb87
fix: asset depreciation ledger (backport #37991) (#37993) 
fix: asset depreciation ledger (#37991)

* fix: include opening acc depr while calculating asset depr ledger report

* chore: include opening acc depr properly in acc depr amt

* chore: add cost_center in asset depr ledger report

* fix: handle finance books properly in asset depr ledger report

* chore: rename 'include default book entries' to 'include default FB entries'

(cherry picked from commit 9a171db97f67f88fad1589016afb4e808571d04c)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-08 22:52:16 +05:30
ruthra kumar
0e979b6c5b
Merge pull request #37902 from frappe/mergify/bp/version-15-hotfix/pr-37887 
chore: performance optimization on payment ledger entry doctype (backport #37887)
 2023-11-08 10:13:55 +05:30
ruthra kumar
463e71664c refactor: update permissions for repost settings 
(cherry picked from commit 10b9570429e16906f3f879228c065b668f63882b)
 2023-11-07 10:15:24 +00:00
ruthra kumar
b48b858752 refactor(test): repost test case for purchase invoice 
(cherry picked from commit 11c8d9fcf1e7eef1890b719b37c823822b6a108d)
 2023-11-07 10:15:13 +00:00
ruthra kumar
85d255c8a2 refactor: select distinct types 
(cherry picked from commit 61705047b037f91a735207d18635de6263af804d)
 2023-11-07 10:15:11 +00:00
ruthra kumar
3abee937f9 refactor(test): update repost settings for test cases 
(cherry picked from commit ac79b8483f0769ab7fd3dc4975b7be34e15b32b2)
 2023-11-07 10:15:09 +00:00
ruthra kumar
37dbb4d3f9 refactor: support for expense claim repost 
(cherry picked from commit b651b36fff496a92713f634868a63a4ebe24f8c9)
 2023-11-07 10:15:08 +00:00
ruthra kumar
1b83a91246 refactor: configurable repost settings 
(cherry picked from commit 5a068410c6ff4bc4ac100098c712d09bb70854df)
 2023-11-07 10:15:07 +00:00
ruthra kumar
c047fd7ac5 feat: settings page for repost 
(cherry picked from commit d582a7379580367e7d81bed58ed02773bd15d00c)
 2023-11-07 10:15:05 +00:00
ruthra kumar
59371358ae fix: type error on new payment entry 
(cherry picked from commit adff2871606c8f0ed51971cd65db355d38032fb9)
 2023-11-07 06:53:27 +00:00
ruthra kumar
fc3d303b82 fix: typo in AR report 
(cherry picked from commit 67e74d03edb5bd3190a44df811a30b2b130eeb39)
 2023-11-06 14:57:21 +00:00
mergify[bot]
e156564ea4
fix: don't reset rate if greater than zero in standalone debit note (backport #37935) (#37941) 
* fix: don't reset rate if greater than zero in standalone debit note

(cherry picked from commit 5cce522ecdb7f13a001d4abbf6c3682088edb1b6)

* fix(test): `test_gl_entries_for_standalone_debit_note`

(cherry picked from commit f9fc6c9c9d5faef90f345df6e04ea4d2b8b8b69b)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-06 19:27:42 +05:30
ruthra kumar
463accbf04 refactor: flag to toggle billed amy update in DN for Credit Note 
(cherry picked from commit a3191f1c8c08c5723d35f4cf05d44f123ec4ca2e)
 2023-11-06 03:11:52 +00:00
mergify[bot]
fd7a768535
fix: POS change amount gl entry with no amount (#37799) 
fix: POS change amount gl entry with no amount (#37799)

(cherry picked from commit 2b02ef00664b12812a99059bd9a29827231fdd94)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-11-05 17:56:45 +05:30
ruthra kumar
65f23485d3 chore: performance optimization on payment ledger entry doctype 
(cherry picked from commit f14d1eb8716e1a816af4ed69f9dd1f6a4d30f035)
 2023-11-04 03:27:51 +00:00
mergify[bot]
febd20acbc
perf: index return against for purchase invoice (backport #37881) (#37883) 
perf: index return against for purchase invoice (#37881)

(cherry picked from commit 469ae2c7f1edb6dbd2d770b65c48bad5a0293ffe)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-11-03 21:59:49 +05:30
ruthra kumar
796b1aa694 refactor(test): for ledger comparision report 
(cherry picked from commit 639f427d6d31c7d018033c2110c478f8e6ea8ce4)
 2023-11-03 07:23:25 +00:00
ruthra kumar
8d66848f9d refactor: better output on gl and pl comparison report 
(cherry picked from commit 539f0251d95d80055112d72e54af9571bea987dc)
 2023-11-03 07:23:25 +00:00
ruthra kumar
1e218c12a0 refactor: group only by voucher flag in AR/AP report 
(cherry picked from commit 23beb46d15a2b96601e1f20a68dee06d7e5f0c49)
 2023-11-03 07:00:57 +00:00
mergify[bot]
b1982a6961
perf: Add index to supplier invoice field (backport #37861) (#37863) 
fix: Add index to supplier invoice field (#37861)

* fix: Add index to supplier invoice field

* chore: remove unintetional changes

(cherry picked from commit c37e374fdd322c0f0423469ce95faecac15b18e4)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-11-03 11:52:32 +05:30
ruthra kumar
7524e425da chore: std permissions for Process Payment Reconciilation log 
(cherry picked from commit a9fceeb00ff266b181791dc0ca4ca334810fff0a)
 2023-11-02 06:16:07 +00:00
ruthra kumar
8ef48bc6b7 refactor: pass limits to JE and PE queries in reconciliation tool 
(cherry picked from commit 54e8ce1ac5a0d14905050fbb630a1602a560088a)
 2023-11-02 05:13:38 +00:00
ruthra kumar
e9bf48df9c refactor: checkbox to toggle remarks in General Ledger 
(cherry picked from commit 8fa677b8e8c6e4e65193ad0be7c0a6d5b4f1769e)
 2023-11-01 15:50:12 +00:00
Deepesh Garg
964a7a3dbd
Merge pull request #37824 from frappe/mergify/bp/version-15-hotfix/pr-37590 
fix: gov compliance for tax withholding report (#37590)
 2023-11-01 15:22:10 +05:30
Gursheen Anand
e51e5b36e2 feat: add cols for supplier inv details 
(cherry picked from commit 6d5ccde864e373b787d781c583b85a26ed2d40e9)
 2023-11-01 08:40:20 +00:00
Gursheen Anand
80dddb40ae chore: linting issues 
(cherry picked from commit 75441017c6629f81104409b892db56bb9c1bf1dd)
 2023-11-01 08:40:20 +00:00
Gursheen Anand
06bb1a3208 fix: sort by section code 
(cherry picked from commit 4471ad581e1c3d220468f42170a09739a46dcc21)
 2023-11-01 08:40:19 +00:00
Gursheen Anand
aa19055899 chore: change column order 
(cherry picked from commit 7ecc0d5a04b6c8cd8b97256d8c0e4bdb12494d5d)
 2023-11-01 08:40:19 +00:00
Gursheen Anand
7abe5d9905 refactor: avoid relying only on against in tds docs query 
(cherry picked from commit 705dadae8e3b49e751184b14323ba2686e5342cc)
 2023-11-01 08:40:18 +00:00
Deepesh Garg
2ba5bb8abc
Merge pull request #37718 from frappe/mergify/bp/version-15-hotfix/pr-37690 
fix(plaid): Do not sync pending transactions (#37690)
 2023-11-01 14:10:17 +05:30
ruthra kumar
0589232d3b refactor: pull remarks only if needed on AR/AP report 
(cherry picked from commit eb73017798eed964e8f019db4cef3513162855f6)
 2023-10-31 14:22:06 +00:00
ruthra kumar
4f9210541e
Merge pull request #37763 from frappe/mergify/bp/version-15-hotfix/pr-37761 
chore: add index to posting_date in PLE (backport #37761)
 2023-10-30 17:16:54 +05:30
ruthra kumar
9ce123d0b9 refactor: ignore cancelled GLE's while looking for currency 
(cherry picked from commit 8d9b90f3f53083e631444a0d39d86bda0b08f479)
 2023-10-30 11:23:35 +00:00
ruthra kumar
f64fdb6870 chore: add index to posting_date in PLE 
(cherry picked from commit ca698452382eba85bd940dfb6344ff19d1eab4e4)
 2023-10-30 11:20:03 +00:00
mergify[bot]
18e40dd032
refactor: remove extraneous disabled filters (backport #37732) (#37749) 
refactor: remove extraneous disabled filters

(cherry picked from commit f276fbba4f84979e12b8091492be7eddbf0caa56)

Co-authored-by: Bernd Oliver Sünderhauf <46800703+bosue@users.noreply.github.com>
 2023-10-30 09:57:32 +05:30
mergify[bot]
4034c16cde
chore: fixed test cases related to Internal Transfer (backport #37659) (#37733) 
* chore: fixed test cases related to Internal Transfer (#37659)

(cherry picked from commit 72d32a49012329d33fd4ecea70988fbfbfce566f)

* chore: fix test cases

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-28 13:31:29 +05:30
mergify[bot]
b03c65f21d
fix: unsupported operand type(s) for serial and batch bundle in POS Invoice (backport #37721) (#37731) 
fix: unsupported operand type(s) for serial and batch bundle in POS Invoice (#37721)

(cherry picked from commit fd78f868e1aed2bdb3baa47927f37b239e16a174)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-10-28 11:10:46 +05:30
mergify[bot]
a3d3c0024e
chore: allow wip_composite_asset in the MR PO PR PI flow (copy #37723) (#37724) 
* chore: allow wip_composite_asset in the MR PO PR PI flow

(cherry picked from commit 0e5bea33a320497d2de3253ca0e1bb061a07130f)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py

* chore: resolve conflict

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-10-27 18:54:43 +05:30