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

47792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gursheen Kaur Anand
43c218c673
Merge pull request #40019 from frappe/mergify/bp/version-15-hotfix/pr-39999 
fix: TypeError for item pricing rules (backport #39999)
 2024-02-22 09:10:17 +05:30
Gursheen Anand
32d9642379 fix: check for pricing rules on item 
(cherry picked from commit ecd83b12ab)
 2024-02-22 03:37:17 +00:00
mergify[bot]
b9181e85dc
perf: new column Posting Datetime in SLE to optimize stock ledger related queries (backport #39800) (#40004) 
* perf: new column posting datetime in SLE to optimize stock ledger related queries

(cherry picked from commit d80ca523a4)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py

* test: test cases to test clash timestamp entries

(cherry picked from commit f04676aaed)

* chore: remove microsecond from posting_datetime

(cherry picked from commit a73ba2c0d2)

* chore: fix conflicts

---------

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2024-02-21 21:14:28 +05:30
rohitwaghchaure
66a05087b8
Merge pull request #40001 from frappe/mergify/bp/version-15-hotfix/pr-39998 
fix: Completed Work Orders report not working (backport #39998)
 2024-02-21 17:44:44 +05:30
Rohit Waghchaure
ca03e9cfd3 fix: Completed Work Orders report not working 
(cherry picked from commit 11f4cb914a)
 2024-02-21 11:21:04 +00:00
Nabin Hait
692867427c
fix: resolved conflict 2024-02-21 11:38:21 +05:30
Nabin Hait
a0c0ab7709
fix: resolved conflict 2024-02-21 11:37:47 +05:30
Nabin Hait
ee2d108bef fix: removed unwanted patch 
(cherry picked from commit 85471533e9)
 2024-02-21 05:45:27 +00:00
Nabin Hait
8eb2f67910 fix: Issues regarding asset cancellation and deletion 
(cherry picked from commit 17f85de6fb)

# Conflicts:
#	erpnext/assets/doctype/asset/depreciation.py
#	erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
 2024-02-21 05:45:27 +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 4b24fcd221)

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 8e7d47b3a7)

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 133f8bd92a)

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

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 e8ae4ed61d)
 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 a4cbfabe0e)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit acd2e93f8c)
 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 a4cbfabe0e)

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 b1dfa2537b)
 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 44538bd02a)
 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 0d260faa00)
 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 3f1d008741)
 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 a995e87567)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
(cherry picked from commit 15135952fc)
 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 a995e87567)

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 dc9115a586)
(cherry picked from commit 40d4e3261e)
 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 dc9115a586)
 2024-02-16 10:20:35 +00:00
barredterra
bf5d2f5fe4 fix(Bank Transaction): precision for (un)allocated_amount 
(cherry picked from commit 8a702a6338)
 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 2fb0499923)
 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 230a7d8d53)
 2024-02-15 09:33:40 +00:00
Rohit Waghchaure
518b22bffc fix: party item code in Blanket Order 
(cherry picked from commit 1a8f7f9403)
 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 e6949d71f6)
 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 e3bd8d10b0)
 2024-02-14 14:54:54 +00:00
kunhi
14fe0af887 fix: fetch company terms 
(cherry picked from commit d97b6d38ef)
 2024-02-14 14:54:54 +00:00