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

46845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vishal
848efe8047 feat(accounts_receivable): test_case added for multi-select customer group 
(cherry picked from commit de445b32f5a13d115ce3f49c190f23b1efdf6632)
 2023-11-09 07:35:38 +00:00
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
ruthra kumar
4eb80ea804
Merge pull request #38002 from frappe/mergify/bp/version-15-hotfix/pr-37860 
refactor: ignore disabled account while selecting Income Accounts (backport #37860)
 2023-11-09 10:41:20 +05:30
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
mergify[bot]
d74f0ef586
fix: ignore Stock Reservation for future dated PR (backport #37979) (#37990) 
fix: ignore Stock Reservation for future dated PR

(cherry picked from commit 33eedb97dcb531cc8e14813d742266f2c5168fac)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-08 22:20:51 +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
cbf8a1405a
Merge pull request #37976 from frappe/mergify/bp/version-15-hotfix/pr-37971 
refactor: optimize bulk transaction for speed (backport #37971)
 2023-11-08 07:08:58 +05:30
ruthra kumar
3d97a98fd7 refactor: optimize for speed 
(cherry picked from commit 416bd400bb94c1fe115f6929e9252c4ce9f3cd40)
 2023-11-08 01:04:08 +00:00
mergify[bot]
3c843c7261
chore: typo in Stock Entry enqueue msg (backport #37970) (#37973) 
chore: typo in `Stock Entry` enqueue msg

(cherry picked from commit ee60fa940cdcd6c2bd6c47d875e055275535d216)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-07 21:18:01 +05:30
ruthra kumar
3f25614e54
Merge pull request #37968 from frappe/mergify/bp/version-15-hotfix/pr-37954 
refactor: expand repost to `Expense Claim` and make it configurable (backport #37954)
 2023-11-07 16:09:10 +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
156d995ad8 chore: patch to update default repost settings value 
(cherry picked from commit ebb186c8df6cd713800475d490962e75ea6ab6a6)
 2023-11-07 10:15:06 +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
dc10a721ab
Merge pull request #37958 from frappe/mergify/bp/version-15-hotfix/pr-37956 
fix: type error on new payment entry (backport #37956)
 2023-11-07 12:38:15 +05:30
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
442c484258
Merge pull request #37950 from frappe/mergify/bp/version-15-hotfix/pr-37948 
fix: typo in AR report (backport #37948)
 2023-11-06 20:47:54 +05:30
ruthra kumar
fc3d303b82 fix: typo in AR report 
(cherry picked from commit 67e74d03edb5bd3190a44df811a30b2b130eeb39)
 2023-11-06 14:57:21 +00:00
mergify[bot]
915ca47515
fix: add translation wrapper (backport #37911) (#37947) 
fix: add translation wrapper

(cherry picked from commit 8722318081e30544b4cc76c97bdd1fe3362373d6)

Co-authored-by: hyaray <hyaray@vip.qq.com>
 2023-11-06 19:52:04 +05:30
mergify[bot]
a065f22a4c
fix: link between parent and child procedure (backport #37903) (#37944) 
* fix: link between parent and child procedure

(cherry picked from commit 05f24ede96a30d194db9334a55706689f63462cb)

* chore: add missing filters for `Parent Procedure`

(cherry picked from commit 8fbd4cea5b374ddbd611f1c0ada26d9998d82b27)

* test: add test case for Quality Procedure`

(cherry picked from commit 30c6b83a103b262e7bd80601076fdb78a358c068)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-06 19:28:42 +05:30
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
mergify[bot]
7ad08179f2
fix: make Material Request Item required if Material Request is set in PO (backport #37928) (#37937) 
fix: make `Material Request Item` required if `Material Request` is set in PO

(cherry picked from commit a9d91189b0e23ccb860e9f954e882ee0ebebbc2c)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-06 17:26:18 +05:30
mergify[bot]
df90fd7b35
feat: reserved production plan sub assembly items (backport #37884) (#37927) 
feat: reserved production plan sub assembly items (#37884)

(cherry picked from commit 34d3eb88b39ffb437fc111ed03527f2c3c4baf9b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-06 11:33:12 +05:30
ruthra kumar
21195343d5
Merge pull request #37925 from frappe/mergify/bp/version-15-hotfix/pr-37879 
refactor: flag to toggle billed amy update in DN for Credit Note (backport #37879)
 2023-11-06 11:24:26 +05:30
ruthra kumar
61573f2645 refactor(test): enable billed amt update on Sales Return(Cr Note) 
(cherry picked from commit 0c5bdbdcf3fd408b793c755900ba7e3bf958d482)
 2023-11-06 03:11:52 +00:00
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
mergify[bot]
e71ef10ca9
fix: list index out of range (backport #37890) (#37920) 
fix: list index out of range (#37890)

* fix: list index out of range

* fix: solve linter test failing

(cherry picked from commit e5bc8fccb17d96df81e10d3b4b565b430c1b5374)

Co-authored-by: viralkansodiya15 <98073516+viralpatel15@users.noreply.github.com>
 2023-11-05 12:33:58 +05:30
mergify[bot]
7d0f1f4235
fix: Quality Inspection Parameter migration - DuplicateEntryError due to case sensitivity (backport #37499) (#37917) 
fix: Quality Inspection Parameter migration - DuplicateEntryError due to case sensitivity (#37499)

* fix: account for case-insensitive database primary key for parameter names

* chore: linting

(cherry picked from commit b099590b2c1dcd041b833af50e99eb3e7988c595)

Co-authored-by: Richard Case <110036763+casesolved-co-uk@users.noreply.github.com>
 2023-11-05 11:29:38 +05:30
mergify[bot]
e0b0b6bb7d
fix: consider reserved stock while cancelling a stock transaction (backport #37754) (#37906) 
* fix: consider reserved serial nos while cancelling a stock transaction

(cherry picked from commit d9e284366d6c67ebd41b914b248c6ac94e973b7e)

* fix: consider reserved batches while cancelling a stock transaction

(cherry picked from commit e1a87a802d18f1fb33c3d9f1066da0cb7b3d4210)

* feat: add field `reserved_stock` in Bin

(cherry picked from commit 98d6cdd53c98b2244031f6b55a7658f1b21b7337)

* feat: maintain `Reserved Stock` in Bin

(cherry picked from commit f52916a2c360dd6befdd1f3dcc6c184cc181662b)

* fix: consider reserved stock while cancelling a stock transaction

(cherry picked from commit 73b65ac82ec11698605720bf37437fab853f3120)

* fix(test): `test_stock_reservation_against_sales_order`

(cherry picked from commit 10242235bc6bb9081abd4b8c48c23541e33ae646)

* chore: patch to set reserved stock in Bin

(cherry picked from commit 1f88b1ef84c826fc35ce3d60a562a3fe8a75b9f2)

* fix: qty based check for stock reservation of serial-batch items based on qty

(cherry picked from commit 9231706227977951cb69d765f77793f47a6f5c77)

* test: add test case for stock stock reservation

(cherry picked from commit 54b323e557f605294e8bcdd9eddf2fd4dd66ab38)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-04 17:02:43 +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]
5171e3238d
chore: rename depreciation_amount_based_on_num_days_in_month to daily_prorata_based [dev] (copy #37897) (#37899) 
chore: rename depreciation_amount_based_on_num_days_in_month to daily_prorata_based

(cherry picked from commit 7c49b277efe9df871a03d997bb82ed3473829ac8)

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-11-04 02:02:25 +05:30
mergify[bot]
fc4bcc0965
chore: rename daily_depreciation in asset to depreciation_amount_based_on_num_days_in_month [dev] (backport #37893) (#37896) 
chore: rename daily_depreciation in asset to depreciation_amount_based_on_num_days_in_month [dev] (#37893)

* chore: rename daily_depreciation to depreciation_based_on_num_days_in_month

* chore: add patch

* chore: remove unnecessary files

* chore: add amount in field name

* chore: add amount in label

(cherry picked from commit 568d5bfbe82088bb1aea52b4541d16f23ccec931)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-03 23:26:32 +05:30
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
mergify[bot]
be8399f52e
fix: permission error while creating Supplier Quotation from Portal (backport #37864) (#37871) 
fix: permission error while creating Supplier Quotation from Portal

(cherry picked from commit e019d43d0b3fa6faa241a7b9885f65f6fccc9459)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-03 16:21:20 +05:30
ruthra kumar
c29e22b3d1
Merge pull request #37876 from frappe/mergify/bp/version-15-hotfix/pr-37852 
refactor: better ledger comparision report (backport #37852)
 2023-11-03 13:25:12 +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
9dae84feba
Merge pull request #37874 from frappe/mergify/bp/version-15-hotfix/pr-37869 
refactor: 'group only by voucher' flag in AR/AP report (backport #37869)
 2023-11-03 12:51:07 +05:30
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]
847dd9e671
fix: TypeError in PR for non-stock item (backport #37819) (#37842) 
* fix: `TypeError` in PR for non-stock item

(cherry picked from commit 028b3e2fbf52cdb7561e8d63b54d5918b5bc8af4)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/purchase_receipt.py

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-03 11:56:12 +05:30
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
rohitwaghchaure
e52291506e
Merge pull request #37851 from frappe/mergify/bp/version-15-hotfix/pr-37849 
fix: remove voucher type and no for Item and Warehouse based reposting (backport #37849)
 2023-11-02 15:14:50 +05:30
Rohit Waghchaure
618a9ee49b chore: fix test cases 2023-11-02 14:45:28 +05:30