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
f04676aaed
test: test cases to test clash timestamp entries
2024-02-17 15:01:18 +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
David Arnold
9fc5c0cc58
Merge remote-tracking branch 'origin/develop' into feat/so-po-advance-payment-status
2024-01-21 15:16:13 +01:00
Rushabh Mehta
d319caa2ee
fix(minor): remove Homepage patch
2024-01-08 15:51:09 +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
Ankush Menat
787333896c
perf: Drop unused/duplicate/sub-optimal indexes ( #38884 )
...
* ci: enable more checks
* perf: Drop unused/duplicate indexes
2023-12-21 20:09:10 +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
Ankush Menat
8d79365e0d
perf: index return_against on delivery note ( #38827 )
...
There's a multi-column index but that's useful IFF all parts of column
are part of query.
return against on it's own is VERY unique because it's a primary key, we
don't need a multi-column index here.
2023-12-18 18:06:44 +05:30
David Arnold
e824cd012b
Merge remote-tracking branch 'upstream/develop' into feat/so-po-advance-payment-status
2023-12-04 13:35:32 +01:00
barredterra
b6957ddac2
fix: set date format from system settings
2023-12-03 17:21:48 +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
ruthra kumar
9d6a06aec5
Merge pull request #38298 from ruthra-kumar/simplied_purchase_cost_update
...
perf: optimize update_purchase_cost method
2023-11-24 11:48:36 +05:30
ruthra kumar
dd016e6ced
refactor: update project costing based on frequency
2023-11-24 11:18:51 +05:30
ruthra kumar
f258ab5e98
chore: move reconciliation cleanup patch to pre-model
2023-11-23 10:39:41 +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
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
ruthra kumar
b5dd0c8630
chore: remove reconciliation defaults from patch
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
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
ruthra kumar
1fd888175f
chore: update default limit values in reconciliation tool
2023-10-31 17:47:55 +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
787fc8737f
Merge pull request #37669 from s-aga-r/FIX-37664
...
refactor: rename field `Over Order Allowance` to `Blanket Order Allowance`
2023-10-25 14:53:25 +05:30
s-aga-r
fcfcf6957e
chore: patch to rename field over_order_allowance
2023-10-25 14:03:53 +05:30
Ankush Menat
7be578485e
fix: force delete removed report ( #37668 )
2023-10-25 07:12:35 +00:00
s-aga-r
6942ab1012
chore: patch to update From Voucher details
2023-10-23 19:12:55 +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
David Arnold
e97af14ff4
fixup! feat(payment): add advance payment status to advance payment doctypes to better track advance payments
2023-10-10 23:50:57 +02:00
s-aga-r
296b233659
chore: patch to delete Payment Gateways
2023-09-27 15:27:29 +05:30
Deepesh Garg
e19e04b050
feat: Add a process document for Subscription ( #37126 )
...
* feat: Add a process document for Subscription
* chore: Remove print statements
* feat: Input for generating invoice before currenc invoice date
* chore: patch for backward compatability
* refactor: Unit tests for subscription
* chore: set status on insert
2023-09-19 18:39:44 +05:30
Ankush Menat
dd24a1b36e
chore: remove obsolete welcome page ( #37143 )
2023-09-18 16:43:13 +00:00
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
