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

46916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
mergify[bot]
71361f7673
fix: standard submit perm in repost ledger for editable invoices (backport #37826) (#37855) 
fix: standard submit perm in repost ledger for editable invoices (#37826)

* fix: ignore perm while reposting ledger

* fix: use flag in save

* fix: remove unnecessary save

(cherry picked from commit 1b808e1d7c2c2d1ad51bd18acf6a45e9b5cfc605)

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
 2023-11-02 14:33:47 +05:30
Rohit Waghchaure
b96be67a1f fix: remove voucher type and no for Item and Warehouse based reposting 
(cherry picked from commit 0104897d693ca98796536eac7a9edadc58c64fff)
 2023-11-02 07:57:52 +00:00
ruthra kumar
7bc02c49ba
Merge pull request #37847 from frappe/mergify/copy/version-15-hotfix/pr-37845 
chore: add std permissions for Process Payment Reconciilation log (copy #37845)
 2023-11-02 12:10:36 +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
39a178d27a
Merge pull request #37844 from frappe/mergify/bp/version-15-hotfix/pr-37838 
refactor: pass limits to JE and PE queries in reconciliation tool (backport #37838)
 2023-11-02 11:08:36 +05:30
mergify[bot]
fad8228a67
feat(Stock Balance): add filters from route (backport #37836) (#37840) 
feat(Stock Balance): add filters from route

(cherry picked from commit 38e5e4a8930714c08471308ba47b9f063802a4b3)

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2023-11-02 10:46:28 +05:30
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
0ab63f91f8
Merge pull request #37834 from frappe/mergify/bp/version-15-hotfix/pr-37832 
refactor: checkbox to toggle remarks in General Ledger (backport #37832)
 2023-11-02 07:27:07 +05:30
ruthra kumar
e9bf48df9c refactor: checkbox to toggle remarks in General Ledger 
(cherry picked from commit 8fa677b8e8c6e4e65193ad0be7c0a6d5b4f1769e)
 2023-11-01 15:50:12 +00:00
mergify[bot]
c8791108de
refactor: update fields label and remove unused fields from BIN (backport #37827) (#37830) 
* refactor: rearrange fields and update label

(cherry picked from commit ec1a7869f82c9bb3d5e12e8a9dc695823e502a4a)

* refactor: remove unused fields `fcfs_rate` and `ma_rate` from Bin

(cherry picked from commit f0a1f4ac7cb9362e8dfe05179533fe4ad00d061e)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-01 16:41:16 +05:30
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
Deepesh Garg
c8c8c6533b
Merge pull request #37822 from frappe/mergify/bp/version-15-hotfix/pr-37635 
fix: validate sales order item with quotation (#37635)
 2023-11-01 15:14:03 +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
6df125a05f feat: proprietorship & partnership options in entity type 
(cherry picked from commit ed2457bddfaedc83301a96f9d77b093b36d15a72)
 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
Gursheen Anand
71538cfab1 fix: validate so item with qtn 
(cherry picked from commit 17ebc1ea8096a83e882bedd00f358a4bd799eff4)
 2023-11-01 08:34:49 +00:00
Deepesh Garg
9675da6f38
Merge pull request #37816 from frappe/mergify/bp/version-15-hotfix/pr-37680 
fix: status when over delivery or billing in SO (#37680)
 2023-11-01 14:04:19 +05:30
Gursheen Anand
95d6742587 fix: status for over delivery or billing 
(cherry picked from commit d69b0d76dd2d89fe0c1b9a634923cf8716a37c11)
 2023-11-01 07:00:27 +00:00
ruthra kumar
7a5bfe0009
Merge pull request #37805 from frappe/mergify/bp/version-15-hotfix/pr-37793 
refactor: pull remarks only if needed on AR/AP report (backport #37793)
 2023-10-31 20:37:53 +05:30
ruthra kumar
c8243ec8e5
Merge pull request #37807 from frappe/mergify/bp/version-15-hotfix/pr-37795 
chore: update default limit values in reconciliation tool (backport #37795)
 2023-10-31 20:37:26 +05:30
ruthra kumar
a72988a514 chore: update default limit values in reconciliation tool 
(cherry picked from commit 1fd888175f2f224bcebba3e9a958d672ab09bcd5)
 2023-10-31 14:23:08 +00:00
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
mergify[bot]
59e67cd384
fix: make project page translatable (backport #37743) (#37801) 
fix: make project page translatable

(cherry picked from commit e72afd0bd6c0b6100834888329f5bf985a826b65)

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2023-10-31 19:49:45 +05:30
mergify[bot]
254ec2cfd1
fix: In-Transit Warehouse company filter (backport #37796) (#37798) 
fix: In-Transit Warehouse company filter (#37796)

(cherry picked from commit daf2ec063c4b0313e32e247459d0cb8dc6958833)

Co-authored-by: hyaray <hyaray@vip.qq.com>
 2023-10-31 18:53:08 +05:30
mergify[bot]
9aa29f55d9
fix(packed_item): ensure proper names for ref integrity (backport #37597) (#37794) 
fix(packed_item): ensure proper names for ref integrity (#37597)

(cherry picked from commit fb0ec74d086085160fbcca9ccfffb6966673e0cb)

Co-authored-by: David Arnold <dgx.arnold@gmail.com>
 2023-10-31 18:06:40 +05:30