Gursheen Kaur Anand
303433c0ae
Merge branch 'develop' into editable-journal-entries
2024-02-27 12:43:32 +05:30
ruthra kumar
924b08e395
Merge pull request #40113 from ruthra-kumar/patch_for_dimension_creation_in_reconciliation_tool
...
refactor: patch to setup dimensions in Reconciliation tool
2024-02-26 11:58:51 +05:30
ruthra kumar
461fb183fc
refactor: patch to setup dimensions in Reconciliation tool
2024-02-26 11:34:37 +05:30
rohitwaghchaure
0b04d04da3
fix: remove microsecond from posting datetime ( #40017 )
2024-02-22 09:22:05 +05:30
rohitwaghchaure
4c061d61fa
Merge pull request #39800 from rohitwaghchaure/persistent-indexing
...
perf: new column Posting Datetime in SLE to optimize stock ledger related queries
2024-02-21 18:39:27 +05:30
Nabin Hait
85471533e9
fix: removed unwanted patch
2024-02-21 08:44:03 +05:30
Nabin Hait
17f85de6fb
fix: Issues regarding asset cancellation and deletion
2024-02-20 18:10:34 +05:30
Rohit Waghchaure
d80ca523a4
perf: new column posting datetime in SLE to optimize stock ledger related queries
2024-02-13 11:42:39 +05:30
Gursheen Anand
ecdc4c8e9b
feat: add patch for making repostable dimension fields editable
2024-02-08 16:36:30 +05:30
barredterra
806696a003
fix: typos
2024-01-24 02:59:52 +01:00
David Arnold
7d8aa469d7
fix: align with 'Partly/Fully X' nomenclature in so & po
2024-01-23 10:30:08 +01:00
David Arnold
9fc5c0cc58
Merge remote-tracking branch 'origin/develop' into feat/so-po-advance-payment-status
2024-01-21 15:16:13 +01:00
rohitwaghchaure
89623aba57
Merge pull request #39201 from rmehta/remove-homepage
...
fix!(portal): remove Homepage
2024-01-14 09:56:25 +05:30
Raffael Meyer
6f9fe6a792
fix: wrong usage of get_single_value ( #39268 )
...
* fix: wrong usage of get_single_value
* test: fix wrong fieldname
* chore: typo
---------
Co-authored-by: Ankush Menat <ankush@frappe.io>
2024-01-10 12:32:27 +05:30
Ankush Menat
bb18ae82cf
refactor: use db.get_single_value
2024-01-09 21:57:50 +05:30
Rushabh Mehta
f01f6d50b5
fix!(portal): remove Homepage
2024-01-08 15:49:49 +05:30
David Arnold
b73507abe0
Merge remote-tracking branch 'origin/develop' into feat/so-po-advance-payment-status
2024-01-05 21:36:14 +01:00
Raffael Meyer
68c0e188e8
fix: remove parent_field parameter from calls to rebuild_tree ( #39146 )
...
fix: remove parent_field parameter from calls to rebuild_tree
The parent_field parameter became redundant with https://github.com/frappe/frappe/pull/24107
2024-01-04 18:12:41 +05:30
Deepesh Garg
277dade9f9
fix: Subscription update patch
2024-01-04 11:22:42 +05:30
Anand Baburajan
d370c60a6c
feat: total_asset_cost field ( #38879 )
2023-12-20 19:02:32 +05:30
mergify[bot]
a6ab53236e
fix: allow to set rate manually for service item in BOM (backport #38880 ) ( #38882 )
...
fix: allow to set rate manually for service item in BOM (#38880 )
(cherry picked from commit c2f692a4e4f3dd5089fe4949c6cd74574282fdb1)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-20 18:33:26 +05:30
David Arnold
f73685f4f6
Merge remote-tracking branch 'origin/develop' into feat/so-po-advance-payment-status
2023-12-20 12:47:48 +01:00
Anand Baburajan
1704180f38
fix: asset patch failure due to missing shift_based column ( #38776 )
...
* fix: add missing daily_prorata_based in get_asset_finance_books_map
* fix: reload Asset Finance Book doctype
2023-12-15 14:43:33 +05:30
barredterra
eb9ee3f79b
refactor: simplify conditional logic
...
Command: `sourcery review --fix --enable de-morgan .`
2023-12-05 11:22:55 +01:00
David Arnold
e824cd012b
Merge remote-tracking branch 'upstream/develop' into feat/so-po-advance-payment-status
2023-12-04 13:35:32 +01:00
Ankush Menat
1da9087cc4
refactor: Simpler log settings setup ( #38449 )
...
Depends on https://github.com/frappe/frappe/pull/23507
2023-11-30 07:58:55 +00:00
Anand Baburajan
fe5fc5bd3a
feat: shift depreciation for assets ( #38327 )
...
* feat: shift depreciation for assets
* chore: create new asset depr schedule on shift change
* refactor: move create_depr_schedule to after_insert
* fix: args in get_depreciation_amount test
* refactor: rename shift adjustment to shift allocation
* chore: asset shift factor doctype and auto allocate shift diff
* chore: use check instead of depr type, and add tests
* chore: make linter happy
* chore: give permissions to accounts users
2023-11-29 12:14:12 +05:30
ruthra kumar
880a85d2af
Merge pull request #38148 from ruthra-kumar/prevent_lock_on_reconciliation
...
refactor: convert Payment Reconciliation to virtual doctype
2023-11-23 10:16:55 +05:30
rohitwaghchaure
0ca7527f7a
fix: patch - Duplicate entry quality inspection parameter ( #38262 )
2023-11-22 14:02:01 +05:30
Anand Baburajan
9903049c7a
fix: set default asset quantity as 1 [dev] ( #38223 )
...
* fix: make default asset quantity as 1
* fix: get rate_of_depreciation from asset category for asset auto-creation
* chore: create asset depr schedules on PR submit, not asset submit
* fix: set default asset quantity as 1
* chore: move patch from v15 to v14
2023-11-20 22:27:16 +05:30
ruthra kumar
f31002636b
chore: clear singles table and reconciliation related tables
2023-11-18 09:28:02 +05:30
Deepesh Garg
089da459f7
feat: Add accounting dimensions to Supplier Quotation
2023-11-17 12:37:14 +05:30
David Arnold
c2f0fadb6e
Merge remote-tracking branch 'upstream/develop' into feat/so-po-advance-payment-status
2023-11-13 10:06:14 +01:00
David Arnold
4ed9927a30
fix(patch): to migrate properly in post section ( #38045 )
2023-11-11 19:37:23 +05:30
David Arnold
922fffda1f
fix(payments): incoming payment requests aren't supposed to be in 'initiated' state (only outgoing are) ( #37447 )
...
* fix(payments): incoming payment requests aren't supposed to be in 'initiated' state (only outgoing are)
* fixup! fix(payments): incoming payment requests aren't supposed to be in 'initiated' state (only outgoing are)
2023-11-09 22:04:27 +05:30
ruthra kumar
ebb186c8df
chore: patch to update default repost settings value
2023-11-07 11:59:30 +05:30
s-aga-r
1f88b1ef84
chore: patch to set reserved stock in Bin
2023-11-04 14:15:19 +05:30
Anand Baburajan
2ce6bbf291
chore: rename depreciation_amount_based_on_num_days_in_month to daily_prorata_based [dev] ( #37897 )
...
chore: rename depreciation_amount_based_on_num_days_in_month to daily_prorata_based
2023-11-03 20:11:46 +00:00
Anand Baburajan
568d5bfbe8
chore: rename daily_depreciation in asset to depreciation_amount_based_on_num_days_in_month [dev] ( #37893 )
...
* chore: rename daily_depreciation to depreciation_based_on_num_days_in_month
* chore: add patch
* chore: remove unnecessary files
* chore: add amount in field name
* chore: add amount in label
2023-11-03 22:35:08 +05:30
David Arnold
c78fdaae90
Merge remote-tracking branch 'upstream/develop' into feat/so-po-advance-payment-status
2023-10-30 17:25:08 +01:00
David Arnold
681782121c
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
2023-10-26 11:46:50 +00:00
s-aga-r
fcfcf6957e
chore: patch to rename field over_order_allowance
2023-10-25 14:03:53 +05:30
s-aga-r
8e523961dc
fix(patch): update_sre_from_voucher_details ( #37649 )
2023-10-24 14:13:26 +05:30
s-aga-r
cdbe1c87d4
Merge pull request #37603 from s-aga-r/AUTO-RESERVATION
...
feat: auto reserve stock for Sales Order on purchase
2023-10-24 10:14:18 +05:30
s-aga-r
6942ab1012
chore: patch to update From Voucher details
2023-10-23 19:12:55 +05:30
Deepesh Garg
3bfb7b79f2
refactor: Remove expense included in valuation accounts ( #37632 )
...
* refactor: Remove expense included in valuation accounts
* test: Deprecate tests
* test: Depricate tests
* test: Depricate tests
2023-10-23 18:23:45 +05:30
Richard Case
b099590b2c
fix: Quality Inspection Parameter migration - DuplicateEntryError due to case sensitivity ( #37499 )
...
* fix: account for case-insensitive database primary key for parameter names
* chore: linting
2023-10-23 11:40:07 +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
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
