CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-16 00:37:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,847 Commits 417 Branches 1,718 Tags
ced6d004fb2d04469879a80092f5d58b383d2343
Commit Graph

46847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gursheen Anand
ced6d004fb refactor: move common util for fetching party types using account type 
(cherry picked from commit 4867ca353c)
 2023-11-09 06:46:32 +00:00
Gursheen Anand
9781f9b7b1 fix: credit note receive payment entry 
(cherry picked from commit 4015723591)
 2023-11-09 06:46:31 +00:00
Gursheen Anand
46c86de093 test: receive payments from payable party 
(cherry picked from commit cd1e016163)
 2023-11-09 06:46:31 +00:00
Gursheen Anand
a89af589e8 fix: test for invoice returns 
(cherry picked from commit 1f4b381748)
 2023-11-09 06:46:31 +00:00
Gursheen Anand
8602a3eab1 fix: remove validation for negative outstanding invoices 
(cherry picked from commit 3d9938221a)
 2023-11-09 06:46:31 +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 6e3e094c95)
 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 9a171db97f)

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 33eedb97dc)

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 416bd400bb)
 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 ee60fa940c)

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 10b9570429)
 2023-11-07 10:15:24 +00:00
ruthra kumar
b48b858752 refactor(test): repost test case for purchase invoice 
(cherry picked from commit 11c8d9fcf1)
 2023-11-07 10:15:13 +00:00
ruthra kumar
85d255c8a2 refactor: select distinct types 
(cherry picked from commit 61705047b0)
 2023-11-07 10:15:11 +00:00
ruthra kumar
3abee937f9 refactor(test): update repost settings for test cases 
(cherry picked from commit ac79b8483f)
 2023-11-07 10:15:09 +00:00
ruthra kumar
37dbb4d3f9 refactor: support for expense claim repost 
(cherry picked from commit b651b36fff)
 2023-11-07 10:15:08 +00:00
ruthra kumar
1b83a91246 refactor: configurable repost settings 
(cherry picked from commit 5a068410c6)
 2023-11-07 10:15:07 +00:00
ruthra kumar
156d995ad8 chore: patch to update default repost settings value 
(cherry picked from commit ebb186c8df)
 2023-11-07 10:15:06 +00:00
ruthra kumar
c047fd7ac5 feat: settings page for repost 
(cherry picked from commit d582a73795)
 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 adff287160)
 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 67e74d03ed)
 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 8722318081)

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 05f24ede96)

* chore: add missing filters for `Parent Procedure`

(cherry picked from commit 8fbd4cea5b)

* test: add test case for Quality Procedure`

(cherry picked from commit 30c6b83a10)

---------

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 5cce522ecd)

* fix(test): `test_gl_entries_for_standalone_debit_note`

(cherry picked from commit f9fc6c9c9d)

---------

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 a9d91189b0)

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 34d3eb88b3)

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 0c5bdbdcf3)
 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 a3191f1c8c)
 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 2b02ef0066)

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 e5bc8fccb1)

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 b099590b2c)

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 d9e284366d)

* fix: consider reserved batches while cancelling a stock transaction

(cherry picked from commit e1a87a802d)

* feat: add field `reserved_stock` in Bin

(cherry picked from commit 98d6cdd53c)

* feat: maintain `Reserved Stock` in Bin

(cherry picked from commit f52916a2c3)

* fix: consider reserved stock while cancelling a stock transaction

(cherry picked from commit 73b65ac82e)

* fix(test): `test_stock_reservation_against_sales_order`

(cherry picked from commit 10242235bc)

* chore: patch to set reserved stock in Bin

(cherry picked from commit 1f88b1ef84)

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

(cherry picked from commit 9231706227)

* test: add test case for stock stock reservation

(cherry picked from commit 54b323e557)

---------

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 f14d1eb871)
 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 7c49b277ef)

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 568d5bfbe8)

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 469ae2c7f1)

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 e019d43d0b)

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 639f427d6d)
 2023-11-03 07:23:25 +00:00
ruthra kumar
8d66848f9d refactor: better output on gl and pl comparison report 
(cherry picked from commit 539f0251d9)
 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 23beb46d15)
 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 028b3e2fbf)

# 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 c37e374fdd)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-11-03 11:52:32 +05:30