Commit Graph

6417 Commits

Author SHA1 Message Date
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
mergify[bot]
27a1e3bf83
feat: validate negative stock for inventory dimension (backport #37373) (#37383)
* feat: validate negative stock for inventory dimension (#37373)

* feat: validate negative stock for inventory dimension

* test: test case for validate negative stock for inv dimension

(cherry picked from commit 1480acabb0faeae61c7c055bb7d1e81877b87cfb)

# Conflicts:
#	erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
#	erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
#	erpnext/stock/stock_ledger.py

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

* chore: fix linter issue

* chore: fix linter issue

* chore: fix linter issue

* chore: fix linter issue

* chore: fix linter issue

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-10-16 19:15:18 +05:30
s-aga-r
f59066c185
Merge pull request #37528 from s-aga-r/FIX-4360
perf: index `dn_detail` in `Delivery Note Item`
2023-10-16 16:42:32 +05:30
s-aga-r
5b4528e614 perf: index dn_detail in Delivery Note Item 2023-10-16 16:26:03 +05:30
s-aga-r
240b161e81 fix: purchase return test case 2023-10-16 01:08:42 +05:30
s-aga-r
0f6d67d8d4
Merge pull request #37513 from s-aga-r/FIX-4388
fix: GL Entries not getting created for PR Return
2023-10-16 00:33:21 +05:30
s-aga-r
253d4782c6 test: add test case for PR return with zero rate 2023-10-15 23:34:58 +05:30
Deepesh Garg
bd2d04e222
Merge pull request #37312 from blaggacao/feat/add-delivery-roles
fix(stock): add delivery user and manager role
2023-10-15 20:28:42 +05:30
s-aga-r
46add06a29 fix: GL Entries not getting created for PR Return 2023-10-15 15:46:29 +05:30
s-aga-r
0d7a0f393d fix(ux): allow MR to Stop until fully received 2023-10-11 10:51:40 +05:30
David Arnold
fb7c5f6d91
fix(sales): add sales user to read stock settings for js refresh code path (#37317) 2023-10-10 07:56:54 +05:30
Bernd Oliver Sünderhauf
2d6f1f8598
fix(UX): Un-require description fields on items (#37354)
fix(UX): Un-require description fields on items.
2023-10-10 07:26:37 +05:30
mergify[bot]
10c666bf69
fix: incorrect status of the returned purchase receipt (backport #37300) (#37380)
fix: incorrect status of the returned purchase receipt (#37300)

(cherry picked from commit 63f45739e05d728e8844320ff0c7dbafa8660acf)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-10-06 14:43:13 +05:30
mergify[bot]
f4f40cc776
feat: composite WIP asset (copy #37352) (#37353)
* feat: wip composite asset

(cherry picked from commit 4907e7acd4ff549f34f6c9d0144af83db0ad9cc1)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
#	erpnext/assets/doctype/asset/asset.json
#	erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json

* chore: resolving conflicts

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
2023-10-04 10:29:18 +05:30
s-aga-r
e7f4b7b190
fix: ignore user permissions for Source Warehouse (#37313) 2023-10-01 21:25:01 +05:30
David Arnold
d3f94a03fc
fix(stock): add delivery user and manager role 2023-10-01 15:13:54 +02:00
Akhil Narang
dd911aa521
chore(stock_ledger): drop redundant check
Commit c2d7461d3c dropped a usage of
`last_valuation_rate` around this code block. After that, it was always checked
although the value would be None as it was being explicitly set above.

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2023-09-26 14:07:01 +05:30
Raffael Meyer
7c4ebe2733
fix(Material Request): consider project for item details (#37215)
fix(Material Request): project in item details
2023-09-24 21:10:53 +05:30
s-aga-r
c679d54852
Merge pull request #37185 from s-aga-r/REFACTOR-SRE
refactor(minor): Stock Reservation Entry
2023-09-21 21:46:09 +05:30
s-aga-r
b6437e387f fix: Item Dashboard 2023-09-21 18:23:20 +05:30
s-aga-r
8b6430c886 refactor(minor): Stock Reservation Entry 2023-09-21 18:23:18 +05:30
s-aga-r
acda72d616
feat: Stock Ledger Variance report (#37165)
* feat: `Stock Ledger Variance` report

* refactor: `get_data()`
2023-09-21 12:51:28 +05:30
s-aga-r
f0859ecc60
fix: labels for Stock Ledger Invariant Check report (#37150)
refactor: `Stock Ledger Invariant Check` report
2023-09-20 18:36:24 +05:30
rohitwaghchaure
dd4769ecf1
feat: allow to edit Stock Quantity in the Sales and Purchase Transactions (#36600)
feat: allow to edit Stock Quantity in the Sales and Purchase transactions
2023-09-20 18:09:03 +05:30
rohitwaghchaure
e6199dc802
fix: allow to select parent warehouse in the website item (#37047) 2023-09-20 17:27:35 +05:30
s-aga-r
9c9d0ecb73
feat: provision to create RIV from Stock Ledger Invariant Check report (#37115)
* feat: provision to create RIV from `Stock Ledger Invariant Check` report

* fix: `linter`
2023-09-19 13:00:44 +05:30
Ankush Menat
d0eac47483 fix: stock summary page 2023-09-18 21:49:52 +05:30
Gursheen Kaur Anand
099468e3cf
fix: company wise deferred accounting fields in item (#37023)
* fix: move deferred accounts in accounting section

* fix: move deferred check boxes in item accounting

* fix: show company wise acc in filters

* fix: fetch item deferred account from child table

* fix: tests using deferred acc

* refactor: use cached value

* fix: cached value call

* feat: patch to migrate deferred acc

* fix: hardcode education module doctypes in patch

* chore: resolve conflicts

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-09-16 21:25:31 +05:30
HENRY Florian
34bb64e41a
fix(ux): move get_route_options_for_new_doc to refresh (#37096)
fix: move `get_route_options_for_new_doc` to `refresh`
2023-09-16 15:59:09 +05:30
s-aga-r
fc016680c9
fix: ignore user permissions for Source Warehouse in MR (#37102)
fix: ignore user permissions for Source Warehouse in MR
2023-09-15 21:45:43 +05:30
Deepesh Garg
1d014122c1
Merge pull request #36980 from anandbaburajan/SI_DI_internal_and_external_links
fix: + btn not appearing for delivery note connection
2023-09-13 15:16:11 +05:30
s-aga-r
b83d880d66
Merge pull request #37046 from s-aga-r/FIX-1081
fix: Purchase Receipt Provisional Accounting GL Entries
2023-09-13 14:21:59 +05:30
rohitwaghchaure
0e83190c19
fix: incorrect stock ledger entries in DN (#36944) 2023-09-13 13:34:40 +05:30
s-aga-r
1c78a5a9aa test: Purchase Receipt Provisional Accounting GL Entries 2023-09-13 12:28:18 +05:30
s-aga-r
6bab0eeaa1 fix: Purchase Receipt Provisional Accounting GL Entries 2023-09-13 11:24:10 +05:30
ruthra kumar
5898a6f48e
Merge pull request #37057 from ruthra-kumar/packed_item_picking_expired_price
fix: Packed item incorrectly picks expired price on Sales Order
2023-09-13 08:18:47 +05:30
ruthra kumar
47ffa4983c fix: packed item using expired price 2023-09-13 06:03:12 +05:30
s-aga-r
d739ab6ee3
fix(ux): docstatus filter for Reference Name in QI (#37024) 2023-09-11 18:52:31 +05:30
Devin Slauenwhite
8ce6b8179e
fix: use primary key for link lookup (#36919) 2023-09-06 11:44:45 +05:30
anandbaburajan
e1a94a9ba1 fix: move SI and DI connected links to internal_and_external_links 2023-09-05 21:38:06 +05:30
s-aga-r
f809e12747
fix: ignore mandatory fields while saving WO (#36954) 2023-09-05 16:27:17 +05:30
HENRY Florian
24e1144de5
fix: when create doc from item dashboard default uom (buying or selling) is not correctly selected (#36892)
fix: when create doc from item dashboard defaut uom is not correctly selected
2023-09-03 16:37:52 +05:30
s-aga-r
2d8363a983
feat: Serial and Batch reservation (#35946)
* feat: add `Has Serial No` and `Has Batch No` fields in SRE

* chore: set `Has Serial No` and `Has Batch No` while creating SRE

* feat: add field `Reserved Serial and Batch` in SRE

* fix(ux): hide `Amend` button on cancelled SRE

* fix: add validation for SRE amended doc

* fix(ux): hide `Reserved Serial and Batch` Table for non-serial/batch item

* fix(ux): set `Display Depends On` for `Has Serial No` and `Has Batch No` in SRE

* fix(ux): make `serial_no` and `batch_no` fields read-only based on `has_serial_no` and `has_batch_no`

* chore: remove table `Serial and Batch Entry` fieldlabel

* fix(ux): set warehouse for new row

* fix(ux): make qty field read-only for serial item

* fix(ux): set rows qty to `1` before making the field read-only

* chore: add filters for serial no

* chore: add filters for batch no

* chore: don't show Serial NO if already selected

* chore: hide rate related fields

* feat: add field `Reservation Based On` in SRE

* chore: make `Reserved Qty` field editable in SCR

* chore: add method to get total reserved qty against a voucher

* fix: add validation for `Reserved Qty`

* fix: update SRE status and Voucher's Reserved Qty

* chore: enable `Track Changes` in SRE

* fix: add validation to prevent delivered SRE to get updated

* fix(ux): make fields `Reserved Qty` and `Reservation Based On` read-only for delivered SRE

* fix: consider voucher's delivered qty while calculating max reserved qty

* fix: add UOM validation for SRE Reserved Qty

* fix: SRE warehouse mismatch error in DN

* fix: auto cancel SRE on update if item is fully delivered for the SO

* fix: skip SRE creation for group warehouse

* feat: add `Set Warehouse` field in SO stock reservation dialog

* fix(ux): hide `Add Row` button in SO stock reservation dialog

* fix: group warehouse validation in SO

* fix(ux): don't show Batch No if already selected

* feat: add field `Auto Reserve Serial and Batch Nos` in `Stock Settings`

* refactor: SRE reserved qty validation

* feat: auto serial and batch reservation

* chore: add section for `Serial and Batch Reservation` in `Stock Settings`

* fix: make SRE sb_entries warehouse mandatory

* fix(ux): unreserved qty calculation

* fix: add validation for `Reserved Qty` against `Batch`

* refactor: combine `get_available_qty_to_reserve()` and `get_available_qty_to_reserve_batch()`

* fix: validate disabled batch

* fix: add validation to validate serial nos availability

* fix: update row qty if `Partial Reservation` is enabled

* fix: ignore reserved serial nos while getting available serial nos

* fix: add validation to prevent repeat batches

* fix(ux): add validation for duplicate Serial No

* fix: don't allow to update SRE with delivered stock

* fix: ignore reserved serial and batch if reservation based on is not Serial and Batch

* fix(ux): stock un-reservation confirmation before `Update Items`

* chore: return list instead os set

* feat: add field `Delivered Qty` in `Serial and Batch Entry`

* feat: option to get SO reserved stock in Delivery Note

* fix: ignore reserved batches while getting available batches

* chore: `conflicts`

* fix: incorrect available qty

* fix: 'str' object has no attribute 'nodes_'

* fix: `linter`

* fix(ux): hide `Get Items From > Stock Reservation` if Stock Reservation is disabled

* fix(ux): add `depends_on` for `Auto Reserve Serial and Batch Nos`

* fix(ux): hide Stock Reservation field description in submitted SO

* fix(ux): confirm before unreserve stock

* feat: option to create DN for reserved stock from SO

* fix: update delivered qty in SRE sb_entries

* fix: Delivery Note (Reserved Stock) based on Delivery Date

* fix(ux): SO `Update Items` confirmation on `Update` button click

* feat: add dialog box to select SRE to unreserve

* fix: `ZeroDivisionError` while saving the DN (Reserved Stock)

* fix: don't allow to create Pick List if stock is reserved against SO

* fix(ux): hide Create > Pick List button for SO with reserved stock

* refactor: map reserved stock by default in DN

* refactor: code cleanup and comments

* fix: don't allow Stock Reservation against SO having Pick List

* refactor: `create_stock_reservation_entries()`

* feat: add fields to hold Pick List ref in SRE

* feat: add field `Stock Reserved Qty` in Pick List Item

* feat: provision to reserve stock from Pick List against Sales Order

* fix: don't allow to update SRE if created against a Pick List

* fix(ux): confirm before unreserve stock in Pick List

* fix: don't allow to update Pick List having reserved stock

* fix: circular dependency while cancelling the DN created from Pick List with Reserved Stock

* chore: update `Max Reserve Qty` err msg to be more descriptive

* refactor: rename field `Reserve Stock on Sales Order Submission`

* fix: msg on partial reservation if disabled in stock settings

* chore: add field description for `Enable Stock Reservation`

* fix(test): `test_stock_reservation_against_sales_order`

* fix(test): `test_stock_reservation_against_sales_order`

* test: add test cases for serial and batch reservation

* fix: batch stock levels qty

* refactor: method `get_sre_reserved_qty_for_item_and_warehouse`

* feat: show `Reserved Stock` in item master stock levels

* feat: Reserved Stock Report

* fix(ux): SO stock reservation dialogs width

* refactor: get previous values from `_doc_before_save` instead of db

* fix(ux): make `Reservation Based On` read-only if created against Pick List

* feat: option to open `Reserved Stock` report from Sales Order

* fix(ux): Sales Order - Reserve and Unreserve dialog box

* fix: decrease SRE Delivered Qty on DN cancel

* fix(ux): hide `Unreserve` button once reserved stock is delivered

* chore: `linter`

* fix(test): `test_reserved_stock_report`

* test: add test case for DN cancellation

* chore: rename field `Auto Reserve Stock on Sales Order Submission`

* fix: `Insufficient Stock` error msg
2023-09-02 11:02:24 +05:30
Ankush Menat
e75b72ae2d
Merge pull request #36856 from frappe/desk_user
refactor!: Lower all perm to `Desk User`
2023-08-29 20:55:55 +05:30
rohitwaghchaure
dea802dc41
fix: added valuation field type (Float/Currency) in the filter (#36866) 2023-08-29 16:53:00 +05:30
Gursheen Kaur Anand
26e8b8f959
fix: create entries for only PR items present in LCV (#36852)
* fix: check if item code exists in lcv before creating gle

* refactor: use qb to fetch lcv items
2023-08-29 09:03:31 +05:30
Ankush Menat
0d22fe02be refactor!: Lower all perm to Desk User 2023-08-28 22:42:14 +05:30
s-aga-r
49be1190d9
Merge pull request #36786 from s-aga-r/SCR-QI
feat: `Quality Inspection` for Subcontracting Receipt
2023-08-24 11:06:51 +05:30
Raffael Meyer
54ffe41b54
feat(MR): Project and Cost Center in Connections (#36794) 2023-08-24 10:12:18 +05:30
s-aga-r
3fdcd33b92 feat: Quality Inspection in Subcontracting Receipt 2023-08-23 12:15:35 +05:30