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

47755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
7af62fb6c8
Merge pull request #39932 from frappe/mergify/bp/version-15/pr-39931 
fix: use serial batch fields not enabled for new stock entry (backport #39930) (backport #39931)
 2024-02-16 15:58:17 +05:30
Rohit Waghchaure
72ff56be13 fix: use serial batch fields not enabled for new stock entry 
(cherry picked from commit dc9115a5865c86721863cfbda55bb00ac00cb756)
(cherry picked from commit 40d4e3261efd3eb8f98b05b2b7d35b08e1a50c18)
 2024-02-16 10:25:03 +00:00
rohitwaghchaure
b91f65d4cf
Merge pull request #39931 from frappe/mergify/bp/version-15-hotfix/pr-39930 
fix: use serial batch fields not enabled for new stock entry (backport #39930)
 2024-02-16 15:53:44 +05:30
Rohit Waghchaure
40d4e3261e fix: use serial batch fields not enabled for new stock entry 
(cherry picked from commit dc9115a5865c86721863cfbda55bb00ac00cb756)
 2024-02-16 10:20:35 +00:00
barredterra
bf5d2f5fe4 fix(Bank Transaction): precision for (un)allocated_amount 
(cherry picked from commit 8a702a633883408cd41572c19dd157f8211ea905)
 2024-02-15 19:05:21 +00:00
rohitwaghchaure
bb77f85d89
Merge pull request #39922 from frappe/mergify/bp/version-15-hotfix/pr-39916 
fix: not able to make purchase receipt (backport #39916)
 2024-02-15 17:55:41 +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
rohitwaghchaure
ab03ab388c
Merge pull request #39918 from frappe/mergify/bp/version-15-hotfix/pr-39905 
fix: party item code in Blanket Order (backport #39905)
 2024-02-15 17:31:50 +05:30
rohitwaghchaure
c50639334f chore: fix linter issue 
(cherry picked from commit 230a7d8d537500c0f401f21c742f2a2ad653062a)
 2024-02-15 09:33:40 +00:00
Rohit Waghchaure
518b22bffc fix: party item code in Blanket Order 
(cherry picked from commit 1a8f7f94036e1703ab51f8f591d88688ad2c9f52)
 2024-02-15 09:33:39 +00:00
kunhi
a56d5b805c fix: update_dimension is required and not need party account method 
(cherry picked from commit e6949d71f628a15ea87ee143d09dce47b66f0e02)
 2024-02-14 14:54:55 +00:00
kunhi
bef38f74fe fix: no need call for company method in sales invoice js 
(cherry picked from commit e3bd8d10b0a99fca326c7252063ef11b3665d3cf)
 2024-02-14 14:54:54 +00:00
kunhi
14fe0af887 fix: fetch company terms 
(cherry picked from commit d97b6d38ef732205f8de17dcb01d90ea1f5120fa)
 2024-02-14 14:54:54 +00:00
Frappe PR Bot
c78d085e24 chore(release): Bumped to Version 15.14.0 
# [15.14.0](https://github.com/frappe/erpnext/compare/v15.13.0...v15.14.0) (2024-02-14)

### Bug Fixes

*  production plan issue with sales order (backport [#39901](https://github.com/frappe/erpnext/issues/39901)) ([#39904](https://github.com/frappe/erpnext/issues/39904)) ([88a7248](88a7248888))
* add permissions to SRE (backport [#39780](https://github.com/frappe/erpnext/issues/39780)) ([#39786](https://github.com/frappe/erpnext/issues/39786)) ([ba05648](ba05648741))
* Brazilian COA for demo data creation ([#39839](https://github.com/frappe/erpnext/issues/39839)) ([4daee6d](4daee6d9c7))
* calculate `stock_value_diff` ([5a66c85](5a66c8585c))
* create SBB for `transfer_qty` in SE (backport [#39835](https://github.com/frappe/erpnext/issues/39835)) ([#39863](https://github.com/frappe/erpnext/issues/39863)) ([92e6017](92e6017a29))
* do not consider rejected warehouses in pick list (backport [#39539](https://github.com/frappe/erpnext/issues/39539)) (backport [#39804](https://github.com/frappe/erpnext/issues/39804)) ([#39811](https://github.com/frappe/erpnext/issues/39811)) ([30dacce](30daccecc7))
* incorrect planned qty in PP (backport [#39785](https://github.com/frappe/erpnext/issues/39785)) ([#39793](https://github.com/frappe/erpnext/issues/39793)) ([60e04ab](60e04ab661))
* landed cost voucher not submitting because of incorrect reference (backport [#39898](https://github.com/frappe/erpnext/issues/39898)) ([#39900](https://github.com/frappe/erpnext/issues/39900)) ([a548f12](a548f12941))
* remove duplicates from tax category map ([3c6114a](3c6114ab72))
* set rate for PO created against BO (backport [#39765](https://github.com/frappe/erpnext/issues/39765)) ([#39767](https://github.com/frappe/erpnext/issues/39767)) ([2213886](22138867f5))
* stock entry for use serial batch fields (backport [#39843](https://github.com/frappe/erpnext/issues/39843)) ([#39844](https://github.com/frappe/erpnext/issues/39844)) ([43fce29](43fce29a04))
* use correct field name in accounts controller (backport [#39884](https://github.com/frappe/erpnext/issues/39884)) ([#39897](https://github.com/frappe/erpnext/issues/39897)) ([f08b424](f08b424972))
* **ux:** set rate as price list rate on uom change in MR (backport [#39816](https://github.com/frappe/erpnext/issues/39816)) ([#39818](https://github.com/frappe/erpnext/issues/39818)) ([63b4d20](63b4d20bdf))
* validate duplicate SBB (backport [#39862](https://github.com/frappe/erpnext/issues/39862)) ([#39866](https://github.com/frappe/erpnext/issues/39866)) ([a2f1a96](a2f1a964f1))
* warehouse issue in pick list (backport [#39826](https://github.com/frappe/erpnext/issues/39826)) ([#39827](https://github.com/frappe/erpnext/issues/39827)) ([b625b05](b625b05ddc))

### Features

* get RM costs from consumption entry in manufacture SE (backport [#39822](https://github.com/frappe/erpnext/issues/39822)) ([#39847](https://github.com/frappe/erpnext/issues/39847)) ([2d5f186](2d5f186812))

### Performance Improvements

* cached get_last_purchase_details to fix performance issue (backport [#39854](https://github.com/frappe/erpnext/issues/39854)) ([#39856](https://github.com/frappe/erpnext/issues/39856)) ([c643e70](c643e70e2f))
* production plan submission (backport [#39846](https://github.com/frappe/erpnext/issues/39846)) ([#39860](https://github.com/frappe/erpnext/issues/39860)) ([10f17df](10f17dfcc8))
 2024-02-14 12:06:08 +00:00
rohitwaghchaure
8c12b3dbe0
Merge pull request #39880 from frappe/version-15-hotfix 
chore: release v15
 2024-02-14 17:34:57 +05:30
mergify[bot]
88a7248888
fix: production plan issue with sales order (backport #39901) (#39904) 
fix:  production plan issue with sales order (#39901)

(cherry picked from commit d0df5df4a609a04d98ee97c9e56931672143587d)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-14 16:58:28 +05:30
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
Raffael Meyer
375859a25f
Merge pull request #39894 from frappe/mergify/bp/version-15-hotfix/pr-39868 
fix(Purchase Receipt): calculate `stock_value_diff` (backport #39868)
 2024-02-14 01:21:38 +01:00
barredterra
5a66c8585c fix: calculate stock_value_diff 
`d.item_tax_amount` is already in base currency.

(cherry picked from commit 5df585179812c9f6f4b8f9593c24ef29529c8258)
 2024-02-13 23:52:33 +00:00
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]
92e6017a29
fix: create SBB for transfer_qty in SE (backport #39835) (#39863) 
fix: create SBB for `transfer_qty` in SE

(cherry picked from commit d59caf08e6459c4f378c7bd6b032b84a899f8e20)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-12 19:59:07 +05:30
mergify[bot]
10f17dfcc8
perf: production plan submission (backport #39846) (#39860) 
perf: production plan submission

(cherry picked from commit aa1c69dd7aa7731b699853bafcfc40d19d5ab70a)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-12 18:17:36 +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]
4daee6d9c7
fix: Brazilian COA for demo data creation (#39839) 
fix: Brazilian COA for demo data creation (#39839)

fix: Brazilian COA
(cherry picked from commit 4b1c851da17c2b9dcabb60194fbad6974fc60716)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-02-11 18:12:18 +05:30
Frappe PR Bot
a29468f6fe chore(release): Bumped to Version 15.13.0 
# [15.13.0](https://github.com/frappe/erpnext/compare/v15.12.2...v15.13.0) (2024-02-11)

### Features

* get RM costs from consumption entry in manufacture SE (backport [#39822](https://github.com/frappe/erpnext/issues/39822)) (backport [#39847](https://github.com/frappe/erpnext/issues/39847)) ([#39849](https://github.com/frappe/erpnext/issues/39849)) ([beb4137](beb4137dac))
 2024-02-11 12:20:07 +00:00
mergify[bot]
beb4137dac
feat: get RM costs from consumption entry in manufacture SE (backport #39822) (backport #39847) (#39849) 
feat: get RM costs from consumption entry in manufacture SE (backport #39822) (#39847)

feat: get RM costs from consumption entry in manufacture SE (#39822)

(cherry picked from commit 39067c761427e49c3c5aff5895faaee20de3f672)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
(cherry picked from commit 2d5f1868129812ea1ce2cc8fda012ee66d4e7106)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2024-02-11 17:48:47 +05:30
mergify[bot]
2d5f186812
feat: get RM costs from consumption entry in manufacture SE (backport #39822) (#39847) 
feat: get RM costs from consumption entry in manufacture SE (#39822)

(cherry picked from commit 39067c761427e49c3c5aff5895faaee20de3f672)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-11 17:29:21 +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
mergify[bot]
63b4d20bdf
fix(ux): set rate as price list rate on uom change in MR (backport #39816) (#39818) 
* fix: add price list rate field in MR Item

(cherry picked from commit 61a29eb5fbd0535a4d91f2fd4c4e7fbb0edf6ace)

* fix: set rate as price list rate on uom change

(cherry picked from commit 5cf0759b0c6c41740b19197aa4e13722a806af97)

* chore: linter

(cherry picked from commit 1745371cd67939bf2d8bac9e0aac6478332c17de)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-10 15:58:33 +05:30
mergify[bot]
b625b05ddc
fix: warehouse issue in pick list (backport #39826) (#39827) 
fix: warehouse issue in pick list (#39826)

(cherry picked from commit 159a123dc79cd0a8ed6e6caa1532bc026264058f)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-09 11:32:51 +05:30
mergify[bot]
30daccecc7
fix: do not consider rejected warehouses in pick list (backport #39539) (backport #39804) (#39811) 
* fix: do not consider rejected warehouses in pick list (backport #39539) (#39804)

* fix: do not consider rejected warehouses in pick list (#39539)

* fix: do not picked rejected materials

* test: test case for pick list without rejected materials

(cherry picked from commit f6725e43425043eaba7dcdd3cf3768a857a39ee6)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
#	erpnext/stock/doctype/pick_list/pick_list.json
#	erpnext/stock/doctype/pick_list/pick_list.py

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

* chore: fixed test case

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit 2c8e4c1ab3bde6a9ab37a41d2801c447d76903ef)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py

* chore: fix conflicts

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-08 14:41:58 +05:30
ruthra kumar
db4efd3332
Merge pull request #39803 from frappe/mergify/bp/version-15/pr-39783 
fix: cancelling cr/dr notes should update the linked Invoice status (backport #39783)
 2024-02-08 10:23:53 +05:30
ruthra kumar
7556457e3e refactor(test): Forex Credit Note cancellation against Invoice 
(cherry picked from commit 2f676ced5c712823c5737f40230ec8b1994cd2dd)
 2024-02-08 04:36:15 +00:00
ruthra kumar
5590b04c89 refactor(test): assert Invoice status as well 
(cherry picked from commit 33efe0d12d85484e551dc9ebebf8840d427ecc67)
 2024-02-08 04:36:14 +00:00
ruthra kumar
490cbc53d8 test: Invoice status on Cr/Dr note cancellation 
(cherry picked from commit 31a8c3bdc45f0e32a51e43260db8484e5f17aa75)
 2024-02-08 04:36:14 +00:00
ruthra kumar
592b3ff7b7 refactor: cancel Cr/Dr JE's on Sales/Purchase return cancel 
(cherry picked from commit 0549535603cae6a7afbd3375c8dd62b517af3c6e)
 2024-02-08 04:36:14 +00:00
ruthra kumar
0bde22fe46
Merge pull request #39799 from frappe/mergify/bp/version-15-hotfix/pr-39783 
fix: cancelling cr/dr notes should update the linked Invoice status (backport #39783)
 2024-02-08 10:00:34 +05:30
mergify[bot]
60e04ab661
fix: incorrect planned qty in PP (backport #39785) (#39793) 
fix: incorrect planned qty in PP

(cherry picked from commit a8ebc94a366e8f15e9bbeab3da064cf5f22dd1b9)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-08 09:13:38 +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
a805796c0a refactor(test): assert Invoice status as well 
(cherry picked from commit 33efe0d12d85484e551dc9ebebf8840d427ecc67)
 2024-02-07 15:00:47 +00:00
ruthra kumar
0bff065f0b test: Invoice status on Cr/Dr note cancellation 
(cherry picked from commit 31a8c3bdc45f0e32a51e43260db8484e5f17aa75)
 2024-02-07 15:00:46 +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
Frappe PR Bot
bc9a63497a chore(release): Bumped to Version 15.12.2 
## [15.12.2](https://github.com/frappe/erpnext/compare/v15.12.1...v15.12.2) (2024-02-07)

### Bug Fixes

* remove duplicates from tax category map ([1f21607](1f21607e4f))
 2024-02-07 14:22:43 +00:00
Gursheen Kaur Anand
b9dc0f3896
Merge pull request #39794 from frappe/mergify/bp/version-15/pr-39787 
fix: remove duplicates from tax category map (backport #39787)
 2024-02-07 19:51:02 +05:30
Gursheen Anand
1f21607e4f fix: remove duplicates from tax category map 
(cherry picked from commit 3c6114ab72d21f3c27eb01baf65002d36b3e25fa)
 2024-02-07 13:54:03 +00:00
Gursheen Kaur Anand
a5ad318a37
Merge pull request #39787 from GursheenK/duplicates-in-tax-category-bpv15 
fix: remove duplicates from tax category map
 2024-02-07 19:22:27 +05:30
mergify[bot]
ba05648741
fix: add permissions to SRE (backport #39780) (#39786) 
fix: add permissions to SRE

(cherry picked from commit 50f54d983d5bec92fab13fbd5226fe4cf2e62dd2)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-02-07 19:03:25 +05:30
Gursheen Anand
3c6114ab72 fix: remove duplicates from tax category map 2024-02-07 18:27:08 +05:30
Frappe PR Bot
488e693ed8 chore(release): Bumped to Version 15.12.1 
## [15.12.1](https://github.com/frappe/erpnext/compare/v15.12.0...v15.12.1) (2024-02-07)

### Bug Fixes

* set rate for PO created against BO (backport [#39765](https://github.com/frappe/erpnext/issues/39765)) (backport [#39767](https://github.com/frappe/erpnext/issues/39767)) ([#39775](https://github.com/frappe/erpnext/issues/39775)) ([ae2a8db](ae2a8db0d7))
 2024-02-07 06:07:15 +00:00