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

47684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gursheen Anand
5084b9bd4b fix: check for pricing rules on item 
(cherry picked from commit ecd83b12abb19e0e41a50e914a89b320e1f577eb)
(cherry picked from commit 32d96423795c99ed2cc46cf1cc04fbf636dac5c7)
 2024-02-22 05:36:43 +00:00
Frappe PR Bot
3d7e87185c chore(release): Bumped to Version 15.14.4 
## [15.14.4](https://github.com/frappe/erpnext/compare/v15.14.3...v15.14.4) (2024-02-21)

### Bug Fixes

* 'NoneType' object is not iterable (backport [#39977](https://github.com/frappe/erpnext/issues/39977)) ([#39981](https://github.com/frappe/erpnext/issues/39981)) ([0f87ec1](0f87ec15ad))
* **Bank Transaction:** precision for `(un)allocated_amount` ([bf5d2f5](bf5d2f5fe4))
* batch filter not working in stock ledger report (backport [#39934](https://github.com/frappe/erpnext/issues/39934)) ([#39935](https://github.com/frappe/erpnext/issues/39935)) ([1513595](15135952fc))
* do not empty serial batch fields (backport [#39948](https://github.com/frappe/erpnext/issues/39948)) ([#39956](https://github.com/frappe/erpnext/issues/39956)) ([acd2e93](acd2e93f8c))
* fetch company terms ([14fe0af](14fe0af887))
* float division by zero ([b954bdf](b954bdfdf9))
* group node in warehouse filter in Item-wise Sales Register ([74819b8](74819b8e70))
* **Issue:** create communication ([f5d7fbd](f5d7fbdaf8))
* no need call for company method in sales invoice js ([bef38f7](bef38f74fe))
* not able to make purchase receipt ([3732946](37329469c3))
* party item code in Blanket Order ([518b22b](518b22bffc))
* reposting failed status not updated (backport [#39970](https://github.com/frappe/erpnext/issues/39970)) ([#39972](https://github.com/frappe/erpnext/issues/39972)) ([46f7569](46f7569a54))
* set batch created from bundle to batch field in stock transaction (backport [#39966](https://github.com/frappe/erpnext/issues/39966)) ([#39987](https://github.com/frappe/erpnext/issues/39987)) ([2ee51d3](2ee51d36ff))
* show active bom in the dropdown while making stock entry and MR (backport [#39974](https://github.com/frappe/erpnext/issues/39974)) ([#39976](https://github.com/frappe/erpnext/issues/39976)) ([7201448](720144898f))
* update_dimension is required and not need party account method ([a56d5b8](a56d5b805c))
* use serial batch fields not enabled for new stock entry ([40d4e32](40d4e3261e))
 2024-02-21 05:29:45 +00:00
rohitwaghchaure
177110349d
Merge pull request #39979 from frappe/version-15-hotfix 
chore: release v15
 2024-02-21 10:58:33 +05:30
rohitwaghchaure
ed553b89a4
Merge branch 'version-15' into version-15-hotfix 2024-02-21 09:34:20 +05:30
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]
0f87ec15ad
fix: 'NoneType' object is not iterable (backport #39977) (#39981) 
fix: 'NoneType' object is not iterable (#39977)

(cherry picked from commit 8e7d47b3a7453ce7ded83c4205c556716f2afa19)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-20 15:53:12 +05:30
mergify[bot]
720144898f
fix: show active bom in the dropdown while making stock entry and MR (backport #39974) (#39976) 
fix: show active bom in the dropdown while making stock entry and MR (#39974)

(cherry picked from commit 133f8bd92a33fb15d1ababf8b5f1d4f061426538)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-20 13:13:00 +05:30
mergify[bot]
46f7569a54
fix: reposting failed status not updated (backport #39970) (#39972) 
fix: reposting failed status not updated (#39970)

(cherry picked from commit d4264f7ba12322f05f7f8128fd5a1cd8bc6eb231)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-20 12:35:46 +05:30
rohitwaghchaure
a102172982
Merge pull request #39968 from frappe/mergify/bp/version-15-hotfix/pr-39967 
fix: float division by zero (backport #39967)
 2024-02-20 12:07:38 +05:30
Rohit Waghchaure
b954bdfdf9 fix: float division by zero 
(cherry picked from commit e8ae4ed61d3a5bc6913825f0da15dd630331a5af)
 2024-02-20 01:02:35 +00:00
Frappe PR Bot
9c01a5f7ed chore(release): Bumped to Version 15.14.3 
## [15.14.3](https://github.com/frappe/erpnext/compare/v15.14.2...v15.14.3) (2024-02-19)

### Bug Fixes

* do not empty serial batch fields (backport [#39948](https://github.com/frappe/erpnext/issues/39948)) ([#39956](https://github.com/frappe/erpnext/issues/39956)) ([2db79cd](2db79cdf3b))
 2024-02-19 05:33:59 +00:00
rohitwaghchaure
0c9d7434f9
Merge pull request #39957 from frappe/mergify/bp/version-15/pr-39956 
fix: do not empty serial batch fields (backport #39948) (backport #39956)
 2024-02-19 11:02:11 +05:30
mergify[bot]
2db79cdf3b 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>
(cherry picked from commit acd2e93f8cd4873f6e6f88b620f3308801e8f31a)
 2024-02-19 05:16:58 +00:00
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
c81a15eac3
Merge pull request #39955 from frappe/mergify/bp/version-15-hotfix/pr-39914 
refactor: add total row if only one party is being filtered (backport #39914)
 2024-02-19 09:16:34 +05:30
ruthra kumar
18fcbb6f97
Merge pull request #39953 from frappe/mergify/bp/version-15-hotfix/pr-39942 
fix: group node in warehouse filter in Item-wise Sales Register (backport #39942)
 2024-02-19 09:15:09 +05:30
ruthra kumar
baa83ece21 refactor: add total row if only one party is being filtered 
(cherry picked from commit b1dfa2537bee220e8bb915b8152e4aa3014befa9)
 2024-02-19 02:57:35 +00:00
ruthra kumar
74819b8e70 fix: group node in warehouse filter in Item-wise Sales Register 
(cherry picked from commit 44538bd02aa150844135d21934bf403ff5244e68)
 2024-02-19 02:56:17 +00:00
ruthra kumar
a2a5b34099
Merge pull request #39950 from frappe/mergify/bp/version-15-hotfix/pr-39943 
refactor: use popup to inform on additional reconciliation step for Cr/Dr Notes (backport #39943)
 2024-02-19 07:48:27 +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
Raffael Meyer
0b7a95351a
Merge pull request #39907 from frappe/mergify/bp/version-15-hotfix/pr-39857 
fix: fetch company terms (backport #39857)
 2024-02-17 01:11:09 +01:00
Raffael Meyer
d225508ab1
Merge pull request #39928 from frappe/mergify/bp/version-15-hotfix/pr-39926 
fix(Bank Transaction): precision for `(un)allocated_amount` (backport #39926)
 2024-02-17 00:33:24 +01:00
Raffael Meyer
d213db90af
Merge pull request #39940 from frappe/mergify/bp/version-15-hotfix/pr-39938 
fix(Issue): create communication (backport #39938)
 2024-02-16 20:47:30 +01:00
barredterra
f5d7fbdaf8 fix(Issue): create communication 
Ignore permisions and mandatory. Required, for example, when Issue is created by Customer via portal.

(cherry picked from commit 3f1d008741e1255b2b9c0d31aa489d9b427ab5c7)
 2024-02-16 19:15:39 +00:00
Frappe PR Bot
fd76847cfa chore(release): Bumped to Version 15.14.2 
## [15.14.2](https://github.com/frappe/erpnext/compare/v15.14.1...v15.14.2) (2024-02-16)

### Bug Fixes

* batch filter not working in stock ledger report (backport [#39934](https://github.com/frappe/erpnext/issues/39934)) ([#39935](https://github.com/frappe/erpnext/issues/39935)) ([3cd3159](3cd315973c))
 2024-02-16 16:20:27 +00:00
rohitwaghchaure
709faaac69
Merge pull request #39937 from frappe/mergify/bp/version-15/pr-39935 
fix: batch filter not working in stock ledger report (backport #39934) (backport #39935)
 2024-02-16 21:48:52 +05:30
mergify[bot]
3cd315973c fix: batch filter not working in stock ledger report (backport #39934) (#39935) 
fix: batch filter not working in stock ledger report

(cherry picked from commit a995e87567609ba4808e7bf2632b76004750aff0)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
(cherry picked from commit 15135952fcc259469b2c90cbc63aad20444a993b)
 2024-02-16 15:19:21 +00:00
mergify[bot]
15135952fc
fix: batch filter not working in stock ledger report (backport #39934) (#39935) 
fix: batch filter not working in stock ledger report

(cherry picked from commit a995e87567609ba4808e7bf2632b76004750aff0)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2024-02-16 20:47:20 +05:30
Frappe PR Bot
6d6a3a10fb chore(release): Bumped to Version 15.14.1 
## [15.14.1](https://github.com/frappe/erpnext/compare/v15.14.0...v15.14.1) (2024-02-16)

### Bug Fixes

* use serial batch fields not enabled for new stock entry ([72ff56b](72ff56be13))
 2024-02-16 10:29:29 +00:00
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