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
mergify[bot]
ae2a8db0d7
fix: set rate for PO created against BO (backport #39765 ) (backport #39767 ) ( #39775 )
...
fix: set rate for PO created against BO (backport #39765 ) (#39767 )
* fix: set rate for PO created against BO
(cherry picked from commit 0e5b4e5f07d15fe04855f1c836c5412d3644035a)
# Conflicts:
# erpnext/manufacturing/doctype/blanket_order/blanket_order.py
* chore: `conflicts`
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
(cherry picked from commit 22138867f5906dc8808890d78ab7071bc59e92bc)
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
2024-02-07 11:35:55 +05:30
mergify[bot]
22138867f5
fix: set rate for PO created against BO (backport #39765 ) ( #39767 )
...
* fix: set rate for PO created against BO
(cherry picked from commit 0e5b4e5f07d15fe04855f1c836c5412d3644035a)
# Conflicts:
# erpnext/manufacturing/doctype/blanket_order/blanket_order.py
* chore: `conflicts`
---------
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2024-02-07 10:48:58 +05:30
Frappe PR Bot
2ba283d138
chore(release): Bumped to Version 15.12.0
...
# [15.12.0](https://github.com/frappe/erpnext/compare/v15.11.1...v15.12.0 ) (2024-02-06)
### Bug Fixes
* Blanket Order Ordered Quantity (backport [#39725 ](https://github.com/frappe/erpnext/issues/39725 )) ([#39739 ](https://github.com/frappe/erpnext/issues/39739 )) ([b126720](b126720826
))
* conditionally display show btn setting ([e931432](e9314325cc
))
* correctly calculate diff amount for included taxes ([#39655 ](https://github.com/frappe/erpnext/issues/39655 )) ([7f4cd3c](7f4cd3cd15
))
* do not throw validation for cancelled sle ([02f56ee](02f56ee20e
))
* don't overwrite existing terms in transaction ([dcdd3e8](dcdd3e8cc4
))
* Exchange rate on MR to PO creation for muticurrency POs ([#39646 ](https://github.com/frappe/erpnext/issues/39646 )) ([29eb090](29eb090528
))
* fetch/change tax template on basis of base_net_rate instead of net_rate ([#39448 ](https://github.com/frappe/erpnext/issues/39448 )) ([d7c7748](d7c7748c03
))
* incorrect landed cost voucher amount ([a40864d](a40864dede
))
* out of range for valuation_rate column in SE (backport [#39687 ](https://github.com/frappe/erpnext/issues/39687 )) ([#39691 ](https://github.com/frappe/erpnext/issues/39691 )) ([41e4632](41e46326c0
))
* Percentage handling in queries ([#39692 ](https://github.com/frappe/erpnext/issues/39692 )) ([e76f598](e76f59803c
))
* **portal:** show PO pay button if payments installed ([cea4ed6](cea4ed6f88
))
* Pricing rule application/removal on qty change ([#39084 ](https://github.com/frappe/erpnext/issues/39084 )) ([f310707](f31070741a
))
* production plan date filters for orders (backport [#39702 ](https://github.com/frappe/erpnext/issues/39702 )) ([#39720 ](https://github.com/frappe/erpnext/issues/39720 )) ([3eac436](3eac436e7b
))
* remove applied pricing rule on qty change (backport [#39688 ](https://github.com/frappe/erpnext/issues/39688 )) ([#39737 ](https://github.com/frappe/erpnext/issues/39737 )) ([f246684](f246684694
))
* remove file from the disk after the completion of reposting ([b582e9c](b582e9c42c
))
* show warehouse title field in sales docs (backport [#39746 ](https://github.com/frappe/erpnext/issues/39746 )) ([#39755 ](https://github.com/frappe/erpnext/issues/39755 )) ([53992de](53992deb10
))
* update company in serial no doc (backport [#39733 ](https://github.com/frappe/erpnext/issues/39733 )) ([#39747 ](https://github.com/frappe/erpnext/issues/39747 )) ([00e86bf](00e86bf318
))
* use old serial / batch fields to make serial batch bundle ([282c19e](282c19e7e1
))
* **work order:** resolve type error during job card creation (backport [#39713 ](https://github.com/frappe/erpnext/issues/39713 )) ([#39714 ](https://github.com/frappe/erpnext/issues/39714 )) ([5fe40ac](5fe40ac085
))
### Features
* copy emails from lead to customer ([#38647 ](https://github.com/frappe/erpnext/issues/38647 )) ([986273b](986273b6d3
))
* make material request for job card from workstation dashboard ([3bef12c](3bef12cb55
))
* Period-wise closing entries for TB ([#39712 ](https://github.com/frappe/erpnext/issues/39712 )) ([1822325](1822325f34
))
* reference for POS SI payments ([#39523 ](https://github.com/frappe/erpnext/issues/39523 )) ([4ee8cf3](4ee8cf3907
))
* visual plant floor ([75bd1e6](75bd1e6b65
))
### Performance Improvements
* memory consumption for the stock balance report ([#39626 ](https://github.com/frappe/erpnext/issues/39626 )) ([5e29aab](5e29aab83b
))
* Move dimension validation out of GL Entry doctype ([#39730 ](https://github.com/frappe/erpnext/issues/39730 )) ([451c288](451c288011
))
* timeout for auto material request through reorder level ([1b2831b](1b2831bdfe
))
* timeout while submitting the purchase receipt entry ([55a8326](55a8326d06
))
2024-02-06 18:44:29 +00:00
rohitwaghchaure
af8af2b36e
Merge pull request #39758 from frappe/version-15-hotfix
...
chore: release v15
2024-02-07 00:13:18 +05:30
rohitwaghchaure
789aee4544
Merge pull request #39770 from frappe/mergify/bp/version-15-hotfix/pr-39769
...
fix: do not throw validation for canceled SLE (backport #39769 )
2024-02-06 23:46:00 +05:30
Rohit Waghchaure
02f56ee20e
fix: do not throw validation for cancelled sle
...
(cherry picked from commit 32ccf3524ad973b1bc8c5c7eefa4c79f5d8b4444)
2024-02-06 17:43:17 +00:00
rohitwaghchaure
c78d4c15d3
Merge pull request #39768 from frappe/mergify/bp/version-15-hotfix/pr-39764
...
fix: remove file from the disk after the completion of reposting (backport #39764 )
2024-02-06 22:22:46 +05:30
Rohit Waghchaure
7833138c57
test: test case to check removed attached file
...
(cherry picked from commit 76b57a433886c3a38b9c4883db8652aabe8d32d8)
2024-02-06 15:58:17 +00:00
Rohit Waghchaure
b582e9c42c
fix: remove file from the disk after the completion of reposting
...
(cherry picked from commit fb330d1b5a8b2620d23c5a899c26ea240966b20c)
2024-02-06 15:58:16 +00:00
rohitwaghchaure
faf79f4d2a
Merge pull request #39761 from frappe/mergify/bp/version-15-hotfix/pr-39718
...
fix: use old serial / batch fields to make serial batch bundle (backport #39718 )
2024-02-06 16:26:33 +05:30
ruthra kumar
47c2bd7335
Merge pull request #39751 from frappe/mergify/bp/version-15-hotfix/pr-39694
...
refactor: enforce unique GL Account for each 'Bank Account' (backport #39694 )
2024-02-06 15:48:31 +05:30
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
ruthra kumar
4235e08668
refactor(test): make use of test fixtures in Payment Order
...
(cherry picked from commit 322cdbaccf0b8697000aae4e56efa659a34fa8e5)
2024-02-06 04:00:23 +00:00
ruthra kumar
949f4c3790
refactor(test): generate uniq GL acc and Bank acc for each test case
...
(cherry picked from commit a9a2ec81de73cde0995c837e12cd5dc79a584841)
2024-02-06 04:00:23 +00:00
ruthra kumar
11d4382e19
refactor: ensure unique accounts for each Bank Account's
...
(cherry picked from commit 2caa2d677c09793f7097c3e76ebb4180a3f2a336)
2024-02-06 04:00:23 +00:00