46864 Commits

Author SHA1 Message Date
mergify[bot]
e7423109b6
fix: PermissionError while creating DN from SO (backport #37758) (#37768)
fix: ignore permissions while mapping DN Item

(cherry picked from commit afc64ed9eedb1aca2802f5d5e53cc5668359f575)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-10-30 18:39:57 +05:30
ruthra kumar
4f9210541e
Merge pull request #37763 from frappe/mergify/bp/version-15-hotfix/pr-37761
chore: add index to posting_date in PLE (backport #37761)
2023-10-30 17:16:54 +05:30
ruthra kumar
11dd1f14ff
Merge pull request #37764 from frappe/mergify/bp/version-15-hotfix/pr-37720
refactor: ignore cancelled GLE's while looking for currency of existing entries (backport #37720)
2023-10-30 17:16:39 +05:30
ruthra kumar
9ce123d0b9 refactor: ignore cancelled GLE's while looking for currency
(cherry picked from commit 8d9b90f3f53083e631444a0d39d86bda0b08f479)
2023-10-30 11:23:35 +00:00
ruthra kumar
f64fdb6870 chore: add index to posting_date in PLE
(cherry picked from commit ca698452382eba85bd940dfb6344ff19d1eab4e4)
2023-10-30 11:20:03 +00:00
mergify[bot]
f132552968
fix: make changes that enable gantt view for job cards (backport #37661) (#37757)
fix: make changes that enable gantt view for job cards (#37661)

* fix: make changes that enable gantt view for job cards

* fix: add fields on listview and remove from json file

* fix: undo modified date

---------

Co-authored-by: Dietmar Fischer <fischer@kk-software.de>
(cherry picked from commit 500435b856a028bdab7fdbe12647ec0f11287eab)

Co-authored-by: Didiman1998 <118364772+Didiman1998@users.noreply.github.com>
2023-10-30 15:20:40 +05:30
mergify[bot]
18e40dd032
refactor: remove extraneous disabled filters (backport #37732) (#37749)
refactor: remove extraneous disabled filters

(cherry picked from commit f276fbba4f84979e12b8091492be7eddbf0caa56)

Co-authored-by: Bernd Oliver Sünderhauf <46800703+bosue@users.noreply.github.com>
2023-10-30 09:57:32 +05:30
mergify[bot]
4819fde8c5
fix: typo in function name and msg (backport #37722) (#37741)
fix: typo in function name and msg

(cherry picked from commit 48c66b68abe5573c477cbbdc49af22dbde1ea2db)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-10-29 12:28:42 +05:30
mergify[bot]
5c46d7452e
fix(minor): set tax values for item variants (backport #37674) (#37739)
* fix: copy all child fields to item variant

(cherry picked from commit 5deba1b6f9b03ce5d078d624e339f6b0209a1555)

* fix: only update if variant table empty

(cherry picked from commit d436a407390c0e0d89c66445539bbb95784be7eb)

---------

Co-authored-by: Gursheen Anand <gursheen@frappe.io>
2023-10-29 12:16:05 +05:30
mergify[bot]
4034c16cde
chore: fixed test cases related to Internal Transfer (backport #37659) (#37733)
* chore: fixed test cases related to Internal Transfer (#37659)

(cherry picked from commit 72d32a49012329d33fd4ecea70988fbfbfce566f)

* chore: fix test cases

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-10-28 13:31:29 +05:30
mergify[bot]
b03c65f21d
fix: unsupported operand type(s) for serial and batch bundle in POS Invoice (backport #37721) (#37731)
fix: unsupported operand type(s) for serial and batch bundle in POS Invoice (#37721)

(cherry picked from commit fd78f868e1aed2bdb3baa47927f37b239e16a174)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-10-28 11:10:46 +05:30
mergify[bot]
a3d3c0024e
chore: allow wip_composite_asset in the MR PO PR PI flow (copy #37723) (#37724)
* chore: allow wip_composite_asset in the MR PO PR PI flow

(cherry picked from commit 0e5bea33a320497d2de3253ca0e1bb061a07130f)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py

* chore: resolve conflict

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
2023-10-27 18:54:43 +05:30
Deepesh Garg
2149de44b1 fix(plaid): Do not sync pending transactions
(cherry picked from commit 46ea8685590e81266beb1cccbe72925f28bc42ba)
2023-10-27 06:09:09 +00:00
mergify[bot]
f382b1cf61
fix(defaults): apply discount and provisonal defaults from item group and brand if available (backport #37466) (#37704)
fix(defaults): apply discount and provisonal defaults from item group and brand if available (#37466)

(cherry picked from commit 1612d7ba3f353e23ad6ae9ba12b995106cddcb9e)

Co-authored-by: David Arnold <dgx.arnold@gmail.com>
2023-10-26 18:14:57 +05:30
mergify[bot]
bfd240a19d
fix: avoid name clash in delivery stop (backport #37306) (#37702)
fix: avoid name clash in delivery stop (#37306)

* fix(stock): avoid name clash in delivery stop with Document.lock()

* chore(stock): format delivery stop json according to doctype builder

(cherry picked from commit 681782121cd0d723f725e4c1c4c30167eb1622ec)

Co-authored-by: David Arnold <dgx.arnold@gmail.com>
2023-10-26 18:13:23 +05:30
mergify[bot]
08ea62f4e4
feat(delivery): link to delivery notes list view from delivery trip (backport #37604) (#37696)
feat(delivery): link to delivery notes list view from delivery trip

(cherry picked from commit 85488cd0dcac2efe02478ced44349a0cadb3b064)

Co-authored-by: David Arnold <dgx.arnold@gmail.com>
2023-10-26 13:12:55 +05:30
mergify[bot]
40443258cf
feat: allow return of components for SCO that don't have SCR created (backport #37686) (#37693)
* feat: allow return of components for SCO that don't have SCR created

(cherry picked from commit 8e3b9ec87977b54cfdee4b65283723d20e91f274)

* fix: consider returned qty while calculating unsupplied qty

(cherry picked from commit 3290df5593009a4e237e7903feb078961f15ae12)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-10-26 11:56:27 +05:30
mergify[bot]
2f5d991225
refactor: rename field Over Order Allowance to Blanket Order Allowance (backport #37669) (#37682)
* refactor: rename field `Over Order Allowance` to `Blanket Order Allowance`

(cherry picked from commit 8ffa2bfe25d8fae317d77705aec82a92dc269874)

* chore: patch to rename field `over_order_allowance`

(cherry picked from commit fcfcf6957e07ad5afc281e5f43154ca1170e14c4)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-10-25 14:58:01 +05:30
mergify[bot]
a871d955d4
fix: force delete removed report (backport #37668) (#37670)
fix: force delete removed report (#37668)

(cherry picked from commit 7be578485e2cafd124c98cc8394c67430c2b31b8)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-10-25 14:08:10 +05:30
mergify[bot]
882bd8e93a
chore: fixed test case non_internal_transfer_delivery_note (backport #37671) (#37676)
chore: fixed test case non_internal_transfer_delivery_note (#37671)

(cherry picked from commit 2bcff4c7f2264d2408a1f98bddc78041b167a632)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-10-25 13:49:38 +05:30
mergify[bot]
da5bf501eb
feat: auto reserve stock for Sales Order on purchase (backport #37603) (#37648)
* chore: make `Reserve Stock` checkbox visible in SO

(cherry picked from commit 36a996d70499a8bc4cf9c28853c2b5606d73f81d)

* refactor: rename field `Auto Reserve Stock for Sales Order`

(cherry picked from commit 2b4fa98941817966b8a936e4076be84406ad035a)

* feat: add fields to hold SO and SO Item ref in PR Item

(cherry picked from commit 188175be84b5eaa0be73face69f4f2b58b80dd64)

* feat: reserve stock for SO on PR submission

(cherry picked from commit 64497c922892d19ca378b5da75cf6b528f5e52d9)

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

* feat: add field `From Voucher Type` in SRE

(cherry picked from commit 5ae9c2f62b741d64da4ce74b3b251339711e8256)

* refactor: rename field `against_pick_list_item`

(cherry picked from commit 78fe56741931ad2c253bf9acca2896c2411f4ac6)

* refactor: rename field `against_pick_list`

(cherry picked from commit 961d2d9926a1a9c0396c3292d431d3bad6865e62)

* fix: incorrect serial and batch get reserved

(cherry picked from commit 45395027d3b5c51ac3ccdbebb1f0d23d5ffd2ec1)

* fix: partial reservation against SBB

(cherry picked from commit 4f363f5bf3da286999966f10d0cca22264f42199)

* fix: ignore qty msg if From Voucher is set

(cherry picked from commit a432290a828478265a8a463d05aea818c2b75914)

* test: add test case for auto-reservation from PR

(cherry picked from commit adf313a6d3308f957b4876574e455ca750b22106)

* chore: add SRE link in PR Connections

(cherry picked from commit 24788ddcc085fb825d2b14145a82ced02842f512)

* chore: patch to update `From Voucher` details

(cherry picked from commit 6942ab10125cfaf07c526df53a7c88bffcc5b9da)

* chore: `conflicts`

* fix(patch): `update_sre_from_voucher_details`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-10-24 12:39:05 +05:30
mergify[bot]
31557902b8
fix: remove from or target warehouse for non internal transfer entries (backport #37612) (#37627)
fix: remove from or target warehouse for non internal transfer entries (#37612)

(cherry picked from commit 5136fe196b4e3aab6bb18d2edf5effbfacd2b060)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-10-23 12:27:16 +05:30
mergify[bot]
bdb369e2b4
refactor: use gzip library's compress() and decompress() methods directly (backport #37611) (#37621)
refactor: use gzip library's compress() and decompress() methods directly (#37611)

The util methods in framework were added for python2.7 compat, so can be removed

Signed-off-by: Akhil Narang <me@akhilnarang.dev>

[skip ci]

(cherry picked from commit 21c3d9c3712ffca28d763b560ec8dbc9e5512fb0)

Co-authored-by: Akhil Narang <me@akhilnarang.dev>
2023-10-21 11:20:49 +05:30
Ankush Menat
9863ba5fd8
Merge pull request #37616 from frappe/mergify/bp/version-15-hotfix/pr-37614
chore: new erpnext logo as per espresso (backport #37614)
2023-10-20 17:58:13 +05:30
Maharshi Patel
889f84bcb7 chore: new erpnext logo as per espresso
(cherry picked from commit fff97b1cd20305adf6bbd4478adf86d6847cc025)
2023-10-20 12:25:04 +00:00
Ankush Menat
5cca001a58 fix: Correctly extract last message (#37602)
frappe.message_log now contains plain dictionary and not JSON strings,
so no need to load them.
2023-10-20 17:28:55 +05:30
Smit Vora
e76860fae1 fix: update existing doc if possible 2023-10-20 17:28:49 +05:30
Smit Vora
844e6f47df fix: add regional support to extend purchase gl entries 2023-10-20 17:28:42 +05:30
mergify[bot]
62d9de4848
fix: incorrect cost center in the purchase invoice (backport #37591) (#37608)
fix: incorrect cost center in the purchase invoice (#37591)

(cherry picked from commit 14b009b09355f53b1dfcd05d0f7ba918b0b25210)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-10-20 17:03:51 +05:30
mergify[bot]
fa5c75fd0a
fix(delivery): rename dt fetch stop action (backport #37605) (#37607)
fix(delivery): rename dt fetch stop action

(cherry picked from commit 79d51a0a0b685909371e9bda68d9702fb287c53e)

Co-authored-by: David Arnold <dgx.arnold@gmail.com>
2023-10-20 16:52:15 +05:30
Ankush Menat
777c1dd1ea chore: add containers back 2023-10-20 11:53:49 +05:30
Ankush Menat
fca812448e chore: v15 release 2023-10-19 16:04:06 +05:30
rohitwaghchaure
d09618bf05
chore: remove debugger (#37584) 2023-10-19 12:35:36 +05:30
Deepesh Garg
6750af90f7
Merge pull request #37562 from GursheenK/subscription-tax-filters
fix(minor): filter tax template based on company in subscription
2023-10-18 17:49:09 +05:30
rohitwaghchaure
10311ff114
fix: payment entry count on supplier dashboard (#37571) 2023-10-18 17:42:35 +05:30
rohitwaghchaure
2851a41310
fix: Issues related to RFQ and Supplier Quotation on Portal (#37565)
fix: RFQ and Supplier Quotation for Portal
2023-10-18 16:31:35 +05:30
Gursheen Anand
1a2f659de2 fix: filter tax template based on company 2023-10-18 11:42:19 +05:30
Ankush Menat
1d186efaab
Merge pull request #37554 from frappe/e_com_perms
fix: e-commerce permissions for address
2023-10-18 11:08:16 +05:30
s-aga-r
fbd8660403
Merge pull request #37539 from HarryPaulo/fix-purchase-order-analyse-invoiced-qty
fix: billed_qty to show a sum of all invoiced qty from the purchase order item.
2023-10-18 11:07:34 +05:30
ruthra kumar
2bcda494b2
Merge pull request #37549 from ruthra-kumar/use_account_in_key_for_ar_ap_reports
refactor: use account in key while grouping voucher in ar/ap report
2023-10-18 09:09:16 +05:30
Deepesh Garg
14760d9aea
Merge pull request #37550 from deepeshgarg007/sales_order_item_dimensions
chore: Add accounting dimensions to Sales Order Item table
2023-10-17 22:54:04 +05:30
Ankush Menat
c197d37404 Merge branch 'develop' into e_com_perms 2023-10-17 22:29:44 +05:30
Ankush Menat
f4d74990fe fix: E-commerce permissions 2023-10-17 22:28:04 +05:30
ruthra kumar
244cec64b2 test: report output if party is missing 2023-10-17 20:40:50 +05:30
Ankush Menat
0931e93b4c
Merge pull request #37552 from frappe/addr_fetch
fix: Ignore addr permission in internal code
2023-10-17 20:00:44 +05:30
Ankush Menat
7b9cedebf6 fix: Ignore addr permission in internal code 2023-10-17 19:00:52 +05:30
Deepesh Garg
88be7ada33 Merge branch 'develop' of https://github.com/frappe/erpnext into sales_order_item_dimensions 2023-10-17 18:30:49 +05:30
Deepesh Garg
e31db18912 chore: Add accounting dimensions to Sales Order Item table 2023-10-17 18:19:47 +05:30
ruthra kumar
601ab4567e refactor: use account in key while grouping voucher in ar/ap report 2023-10-17 17:48:04 +05:30
Sabu Siyad
f900a78995
refactor!: drop ecommerce in favor of webshop (#33265)
* refactor!: remove ecommerce item group field check

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove `e_commerce` directory

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove `get_context` from `item_group`

https://frappeframework.com/docs/v14/user/en/guides/portal-development/context

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove related `./templates`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(navbar): remove wishlist (ecommerce)

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(js): remove js from scripts

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove `www/all-products`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove pages and js

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove js/customer_reviews

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(portal utils): remove shopping cart debtor account

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove e_commerce events from hooks

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(web): remove e_commerce js from bundle

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(setup): remove shopping cart setup

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove pages

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor(item): remove website item button

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(payment request): remove `on_payment_authorized`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: @staticmethod `get_gateway_details`

to avoid monkey patching, in custom apps
https://discuss.erpnext.com/t/how-to-override-method-in-frappe/28786/36

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(pages): remove product page

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(homepage): do not setup website items

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor(workspace): remove link to ecommerce settings

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(www): remove shop-by-category

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(homepage): remove featured product

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor: remove products in homepage

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor(homepage): remove explore button

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor: remove products fields from homepage

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* Revert "refactor!: @staticmethod `get_gateway_details`"

This reverts commit 561bcd96680a930bb92627869502d9346b10611b.

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: remove payment gateway e_commerce import

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* chore: pre-commit

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!: pass `party` into `get_price`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor: move `get_item_codes_by_attributes` to `utilities/product`

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* refactor!(quotation): input customer group

Signed-off-by: Sabu Siyad <hello@ssiyad.com>

* chore: pre-commit

* refactor: remove custom `navbar_items.html`

* refactor!(item): remove `published_in_website`

* refactor: move `validate_duplicate_website_item` before rename

* test: remove `test_shopping_cart_without_website_item`

* chore: add doctype drop patch

* refactor: removed website item related code

* refactor: removed shopping_cart code

* refactor: removed e-commerce related patches

* refactor: removed website related fields from item group

* fix: patch create_asset_depreciation_schedules_from_assets, KeyError: '0K BU64 AUY'

---------

Signed-off-by: Sabu Siyad <hello@ssiyad.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
2023-10-17 17:05:44 +05:30