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

6525 Commits

Author SHA1 Message Date
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
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
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 c2d7461d3cac639778e7740c4b08e459332a6b14 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