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

2477 Commits

Author SHA1 Message Date
ljain112
7e43f6b7e0 fix: default taxable value for item not found in item list 
(cherry picked from commit 5885978fc2f829b064568e8e2b6a28143f69218c)
 2024-02-27 16:40:19 +00:00
mergify[bot]
1860399ccb
fix: use serial batch fields for packed items (backport #40140) (#40142) 
fix: use serial batch fields for packed items (#40140)

(cherry picked from commit bc9c48024632198f726bd78fa6368ea9d0c26dce)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-27 07:57:37 +05:30
Gursheen Kaur Anand
e4baacd79e
Merge pull request #40066 from frappe/mergify/bp/version-15-hotfix/pr-40040 
fix: skip max discount validation for rate adjustment (backport #40040)
 2024-02-23 15:10:38 +05:30
Gursheen Anand
3b96aaeead fix: skip max discount validation for rate adjustment 
(cherry picked from commit 5a3b133d6520661fe28e4c2d73c17ef4eb48be1e)
 2024-02-23 07:28:37 +00:00
Gursheen Anand
a75a69a01e fix: only check for delinked PLEs 
(cherry picked from commit 146c5b3e16b0521f0590aa6dfa957979fc6f3d9a)
 2024-02-23 07:10:08 +00:00
Gursheen Anand
190bd45bd7 fix: delete PLE containing invoice in against 
(cherry picked from commit c1e1fd882950352c61e5881076c34fe3436142c6)
 2024-02-23 07:10:08 +00:00
ruthra kumar
b40baf5e63 refactor: skip popup for POS invoices 
(cherry picked from commit 3634c4c284061ecd2fe5576467238532f748b07a)
 2024-02-23 00:33:08 +00:00
Nabin Hait
8eb2f67910 fix: Issues regarding asset cancellation and deletion 
(cherry picked from commit 17f85de6fb6fbcd26993768b9fd29822189626d2)

# Conflicts:
#	erpnext/assets/doctype/asset/depreciation.py
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
 2024-02-21 05:45:27 +00:00
mergify[bot]
2ee51d36ff
fix: set batch created from bundle to batch field in stock transaction (backport #39966) (#39987) 
fix: set batch created from bundle to batch field in stock transaction (#39966)

* fix: set batch created from bundle to batch field in stock transaction

* fix: validation for serial and batch no

(cherry picked from commit 4b24fcd2216caadbec402fc7d1e412bdcc662dad)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-21 00:04:01 +05:30
mergify[bot]
acd2e93f8c
fix: do not empty serial batch fields (backport #39948) (#39956) 
fix: do not empty serial batch fields (#39948)

(cherry picked from commit a4cbfabe0ee4c8fca3ac654e6b3fe3db8b551334)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-19 10:45:28 +05:30
ruthra kumar
ce11180793 refactor: use popup to inform on additional reconciliation step 
(cherry picked from commit 0d260faa0070f767220ba724dd42b0f2d2cc922d)
 2024-02-19 07:31:33 +05:30
Rohit Waghchaure
37329469c3 fix: not able to make purchase receipt 
(cherry picked from commit 2fb0499923d36d5d1e0efe520ab432edaf1e6bb6)
 2024-02-15 12:04:49 +00:00
mergify[bot]
a548f12941
fix: landed cost voucher not submitting because of incorrect reference (backport #39898) (#39900) 
fix: landed cost voucher not submitting because of incorrect reference (#39898)

(cherry picked from commit 6239fd704b7d7a60c54b8042a8cc83b5c9e75eab)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-14 15:57:40 +05:30
mergify[bot]
f08b424972
fix: use correct field name in accounts controller (backport #39884) (#39897) 
fix: use correct field name in accounts controller (#39884)

Changes to get advance payments in SI or PI from JV's

(cherry picked from commit b124081065d475c5b042eaf898773b35f1ac5dc6)

Co-authored-by: Rohit Gunjegaonkar <135806454+rohitg-pbspl@users.noreply.github.com>
 2024-02-14 13:21:55 +05:30
mergify[bot]
a2f1a964f1
fix: validate duplicate SBB (backport #39862) (#39866) 
* fix: validate duplicate SBB

(cherry picked from commit 094ecc1f62a97d6580a72c9a9fdf176a6d7dc959)

* test: duplicate SBB

(cherry picked from commit 55e66db315518bda82e4eb77d8fc74f5b2c7d14d)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-13 09:09:03 +05:30
mergify[bot]
c643e70e2f
perf: cached get_last_purchase_details to fix performance issue (backport #39854) (#39856) 
perf: cached get_last_purchase_details to fix performance issue (#39854)

(cherry picked from commit b966c06a4f7ec1d64e475a626ee934695c77a2a4)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-12 15:53:50 +05:30
mergify[bot]
43fce29a04
fix: stock entry for use serial batch fields (backport #39843) (#39844) 
fix: stock entry for use serial batch fields (#39843)

(cherry picked from commit e5824fc3f1f862ab625eea19f27f61ab74e0708d)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-11 11:28:48 +05:30
ruthra kumar
83bf2c17e0 refactor(test): Forex Credit Note cancellation against Invoice 
(cherry picked from commit 2f676ced5c712823c5737f40230ec8b1994cd2dd)
 2024-02-07 15:00:48 +00:00
ruthra kumar
5fd4ca56f5 refactor: cancel Cr/Dr JE's on Sales/Purchase return cancel 
(cherry picked from commit 0549535603cae6a7afbd3375c8dd62b517af3c6e)
 2024-02-07 15:00:45 +00:00
Rohit Waghchaure
73618f0605 test: test case to check use serial / batch fields feature 
(cherry picked from commit 01650120d40babc0992a0673498b1eda689fd615)
 2024-02-06 10:18:06 +00:00
Rohit Waghchaure
a08b97e886 test: fixed test cases 
(cherry picked from commit c1e869f040fd4c6ec2e234db71c3f80be50e4524)
 2024-02-06 10:18:05 +00:00
Rohit Waghchaure
282c19e7e1 fix: use old serial / batch fields to make serial batch bundle 
(cherry picked from commit 9fafc83632c4e5c73186bda038b892b7a43d16b8)
 2024-02-06 10:18:05 +00:00
mergify[bot]
53992deb10
fix: show warehouse title field in sales docs (backport #39746) (#39755) 
fix: show warehouse title field in sales docs

(cherry picked from commit ee14faaa39bcb0fb8d813aee7e00eedc8d3a38c1)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-06 12:45:37 +05:30
mergify[bot]
f246684694
fix: remove applied pricing rule on qty change (backport #39688) (#39737) 
fix: remove pricing rule

(cherry picked from commit 7c6a5a0f23b948953815870b726c30b0fd076338)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-05 16:09:00 +05:30
Rohit Waghchaure
1b2831bdfe perf: timeout for auto material request through reorder level 
(cherry picked from commit 951023f434a36ef03f874b3dcbd4f995168b7b5a)
 2024-02-05 06:10:56 +00:00
mergify[bot]
d7c7748c03
fix: fetch/change tax template on basis of base_net_rate instead of net_rate (#39448) 
fix: fetch/change tax template on basis of base_net_rate instead of net_rate (#39448)

fix: change tax template on basis of base_net_rate instead of net_rate

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit e9fe10c6f13424630a2bfc7cfef1e1faeebab30d)

Co-authored-by: Divyam Mistry <73271406+divyam-mistry@users.noreply.github.com>
 2024-02-03 09:09:59 +05:30
ruthra kumar
10fcf5af5f refactor: prevent '{debit/credit}_to' account mismatch 
(cherry picked from commit 6f2fae1b6133286ab882e421e69f6a87ecb97d4a)
 2024-01-30 05:31:52 +00:00
mergify[bot]
e4230cf6d9
feat: Partly billed status in Purchase Receipt (#39543) 
feat: Partly billed status in Purchase Receipt (#39543)

(cherry picked from commit a673220feb91419f7d9949926fa4b3dd67d63682)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-01-29 22:41:09 +05:30
mergify[bot]
960443d268
fix: not able to submit subcontracting pr (old flow) (backport #39622) (#39625) 
fix: not able to submit subcontracting pr (old flow) (#39622)

(cherry picked from commit 5cf47ae5f991218ed74efeb2cce7f00a54475e6b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-29 21:22:21 +05:30
mergify[bot]
a118417645
refactor: provision to filter on dimensions in reconciliation tool (#39054) 
* refactor: dimensions section in allocation table in reconciliation

(cherry picked from commit 1cde804c773de41520a6148e7d99ab0c23c39ae1)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json

* refactor: update dimension doctypes in hooks

(cherry picked from commit cfb3d872673844f04f5c9dd3f7d7f56288e5dd22)

* refactor: dimensions filter section in payment reconciliation

(cherry picked from commit 20e0acc20a218029d7101a1ba6ff3c1ae03fac02)

* refactor: column break in dimension section

(cherry picked from commit 20576e0f47ba3c4937121bfab1e0d8d395a590ce)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json

* refactor: handle dimension filters

(cherry picked from commit c1fe4bcc64775507a3bd8e02b61274d8dc2d6447)

* refactor: pass dimension filters to query

(cherry picked from commit ff60ec85b85d5548886e247b72cf1262587feba3)

* refactor: set query filters for dimensions

(cherry picked from commit ad8475cb8b24d40b04f86903feee08ecac6aa1f1)

* refactor: pass dimension details to query

(cherry picked from commit 5dc22e1811bb1841bb8c790cc3a1e1315cef6074)

* refactor: replace sql with query builder for Jourals query

(cherry picked from commit 9c5a79209eb014c90aac46a5dd5ed0d9b7cb8f87)

* refactor: partial change on outstanding invoice popup

(cherry picked from commit 2154502955166243e354897d7dcb22d1987c4693)

* fix: typo's and parameter changes

(cherry picked from commit 0ec17590ae062fbda0c14a2806ec1ac07c638593)

* refactor: Credit Note and its Exc gain/loss JE inherits dimensions

(cherry picked from commit ab939cc6e8ab3669f1e9b0f007e9459be180ac32)

* refactor: apply dimension filters on cr/dr notes

(cherry picked from commit 188ff8cde794bb1ef1043f0e47469d65944aac1e)

* chore: test dimension filter output

(cherry picked from commit e3c44231abbbe389a1f815ab77f2d6ff0c614e1b)

* test: dimension inheritance for cr note reconciliation

(cherry picked from commit ba5a7c8cd8ee6fc09b0d81ffbe8b364e584f1f1b)

* refactor: pass dimension values to Gain/Loss journal

(cherry picked from commit c44eb432a59fb3ffb3748e47356068499f1129b1)

# Conflicts:
#	erpnext/accounts/utils.py

* test: dimension inheritance in PE reconciliation

(cherry picked from commit 6148fb024b7157d637aa2308e7c856969858468d)

* refactor: pass dimensions on advance allocation

(cherry picked from commit cbd443a78afbc7c58055881e534a8aa56ca4bea6)

* test: dimension inheritance on adv allocation

(cherry picked from commit fcf4687c523202436234814af3da4c4d84f5eba9)

* refactor: dynamic dimension filters in pop up

(cherry picked from commit f8bbb0619cbbbaace8f54a9f8758c3962ebe4725)

* refactor: update dimensions, only if provided

(cherry picked from commit ec0f17ca8bd810e41ae73f5a45f304ba38c63d0a)

* refactor: handle dynamic dimension in order query

(cherry picked from commit 7c2cb70387d7dbb7f976d28919ce21f25a0b6acd)

* chore: resolve conflicts

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2024-01-28 13:50:08 +05:30
mergify[bot]
6d4ca6a1ee
fix: prevent extra transfer against inter transfer transaction (backport #39213) (#39596) 
fix: prevent extra transfer against inter transfer transaction (#39213)

* fix: prevent extra transfer against inter transfer transaction

* fix: internal transfer dashboard

(cherry picked from commit 8fdc244e16c26a74944a3a67613f8b64009a69b0)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-27 23:25:13 +05:30
mergify[bot]
63eef680d0
fix: not able to save subcontracting purchase receipt (old flow) (backport #39590) (#39592) 
fix: not able to save subcontracting purchase receipt (old flow) (#39590)

(cherry picked from commit 67d828dab36d6f64fdb41e5f2cd203d508d2998c)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-27 12:15:11 +05:30
Rohit Waghchaure
2905db19e5 fix: Item Tax template is not working for e-commerce 
(cherry picked from commit 7d3240ae3a2e8fc761d460793fbddfb2b5cffc09)
 2024-01-25 06:07:23 +00:00
Rohit Waghchaure
b649c50ecc fix: duplicate name error while making variant 
(cherry picked from commit d7e6b83e6432a6c46ce6e374252d25c0438c2205)
 2024-01-18 01:21:52 +00:00
ruthra kumar
5a65a10dba refactor: better ordering of query result 
(cherry picked from commit bfe42fdccb13ab797ac7252ada58df49af43ad54)
 2024-01-16 10:55:36 +00:00
ruthra kumar
1b8f572e80 fix(test): test case for project query 
(cherry picked from commit 3349dde5e2914bd9e2dbe0ce4de94023bfee2e7f)
 2024-01-16 10:55:36 +00:00
ruthra kumar
07e2901e4b fix: project query controller logic 
(cherry picked from commit 4eefb445a748100f3c36094188e38c127ad80051)
 2024-01-16 10:55:35 +00:00
Rohit Waghchaure
1394a1c5e9 fix: batches not coming correctly in the batch selector 
(cherry picked from commit 114f2b432628b55201dfbfcac8c4e6a65c577cc7)
 2024-01-14 18:19:30 +00:00
Deepesh Garg
7ca9ffbaa7
Merge pull request #39329 from frappe/mergify/bp/version-15-hotfix/pr-38974 
fix: unreconciled Bank Transaction on cancel of payment voucher (#38974)
 2024-01-14 17:55:32 +05:30
s-aga-r
ca18853785 fix: SBB Total Qty validation for SE 
(cherry picked from commit c20241fcb5d7269c08c38f51c92bf73289650708)
 2024-01-12 15:30:36 +00:00
barredterra
16860c228d fix: unreconcile Bank Transaction on cancel of payment voucher 
(cherry picked from commit 0a95b38166e36946f89286d39081b0f529e88cb6)

# Conflicts:
#	erpnext/accounts/doctype/bank_transaction/bank_transaction.py
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.js
 2024-01-11 13:37:48 +00:00
Deepesh Garg
5dc2e80987 fix: Ignore default payment terms template for opening invoices 
(cherry picked from commit 53bf44d2b870aad620c07fc72007c1a51e4eca9f)
 2024-01-10 10:37:45 +00:00
Nabin Hait
f0070b4046 fix: Set asset purchase amount based on qty and valuation_rate 
(cherry picked from commit 135e19d0aab3b1f4ae2361b327c579468d71d6d6)
 2024-01-10 06:03:01 +00:00
mergify[bot]
f00a6f6c59
fix: skip rate validation for return DN Items with Moving Average valuation (backport #39242) (#39266) 
fix: skip rate validation for return `DN Items` with `Moving Average` valuation

(cherry picked from commit e0ad52b50036e689247f23090a5de89a7fb4abfa)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-09 22:02:20 +05:30
ruthra kumar
53eb6129ea refactor: remove 'Bank Trasaction' logic from status_update 
(cherry picked from commit cf988434e9e4fd7f7c6df2b024902f8df9942ca3)
 2024-01-09 05:51:38 +00:00
mergify[bot]
3caf462c6b
fix: flaky demo test case (backport #39135) (#39198) 
fix: flaky demo test case

(cherry picked from commit 5b1571879cdb7859725bda2b0d32d9a4f57676e8)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-01-08 17:44:24 +05:30
mergify[bot]
f3882a854f
fix: don't set rate for non-stock item in Internal Transfer (backport #39140) (#39169) 
* fix: don't set rate for non-stock item in Internal Transfer

(cherry picked from commit e1b0fffd0c934d376562e3ba8707b38426ea09a1)

* test: internal transfer for non-stock item

(cherry picked from commit 57b6a987034522266caca853d4ee26316526e526)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-06 11:03:24 +05:30
mergify[bot]
2db1e1a737
fix: serial / batch barcode scanner (backport #39114) (#39143) 
fix: serial / batch barcode scanner (#39114)

(cherry picked from commit f09e2130a1a3ca999247f89f76c20efcc003b450)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-04 16:02:29 +05:30
Deepesh Garg
458064f8a1
feat: Against voucher filter in General Ledger (#39102) 2024-01-03 10:51:34 +05:30
mergify[bot]
e5d73c780b
feat: voucher subtype for general ledger (#38822) 
* feat: voucher subtype for general ledger (#38822)

* feat: add voucher subtype column to gle

* feat: add logic to set voucher subtypes

* feat: fetch voucher subtype in ledger report

* fix: order of conditions

(cherry picked from commit 47f7b65058e860e91c58dd12da6e48bd70ae60f6)

# Conflicts:
#	erpnext/accounts/doctype/gl_entry/gl_entry.json

* chore: resolve conflicts

---------

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-01-01 13:30:29 +05:30