3422 Commits

Author SHA1 Message Date
ruthra kumar
156d995ad8 chore: patch to update default repost settings value
(cherry picked from commit ebb186c8df6cd713800475d490962e75ea6ab6a6)
2023-11-07 10:15:06 +00:00
mergify[bot]
7d0f1f4235
fix: Quality Inspection Parameter migration - DuplicateEntryError due to case sensitivity (backport #37499) (#37917)
fix: Quality Inspection Parameter migration - DuplicateEntryError due to case sensitivity (#37499)

* fix: account for case-insensitive database primary key for parameter names

* chore: linting

(cherry picked from commit b099590b2c1dcd041b833af50e99eb3e7988c595)

Co-authored-by: Richard Case <110036763+casesolved-co-uk@users.noreply.github.com>
2023-11-05 11:29:38 +05:30
mergify[bot]
e0b0b6bb7d
fix: consider reserved stock while cancelling a stock transaction (backport #37754) (#37906)
* fix: consider reserved serial nos while cancelling a stock transaction

(cherry picked from commit d9e284366d6c67ebd41b914b248c6ac94e973b7e)

* fix: consider reserved batches while cancelling a stock transaction

(cherry picked from commit e1a87a802d18f1fb33c3d9f1066da0cb7b3d4210)

* feat: add field `reserved_stock` in Bin

(cherry picked from commit 98d6cdd53c98b2244031f6b55a7658f1b21b7337)

* feat: maintain `Reserved Stock` in Bin

(cherry picked from commit f52916a2c360dd6befdd1f3dcc6c184cc181662b)

* fix: consider reserved stock while cancelling a stock transaction

(cherry picked from commit 73b65ac82ec11698605720bf37437fab853f3120)

* fix(test): `test_stock_reservation_against_sales_order`

(cherry picked from commit 10242235bc6bb9081abd4b8c48c23541e33ae646)

* chore: patch to set reserved stock in Bin

(cherry picked from commit 1f88b1ef84c826fc35ce3d60a562a3fe8a75b9f2)

* fix: qty based check for stock reservation of serial-batch items based on qty

(cherry picked from commit 9231706227977951cb69d765f77793f47a6f5c77)

* test: add test case for stock stock reservation

(cherry picked from commit 54b323e557f605294e8bcdd9eddf2fd4dd66ab38)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-04 17:02:43 +05:30
mergify[bot]
5171e3238d
chore: rename depreciation_amount_based_on_num_days_in_month to daily_prorata_based [dev] (copy #37897) (#37899)
chore: rename depreciation_amount_based_on_num_days_in_month to daily_prorata_based

(cherry picked from commit 7c49b277efe9df871a03d997bb82ed3473829ac8)

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
2023-11-04 02:02:25 +05:30
mergify[bot]
fc4bcc0965
chore: rename daily_depreciation in asset to depreciation_amount_based_on_num_days_in_month [dev] (backport #37893) (#37896)
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

(cherry picked from commit 568d5bfbe82088bb1aea52b4541d16f23ccec931)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-11-03 23:26:32 +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]
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]
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
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
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
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
s-aga-r
74272a2e28 fix: patch to delete Woocommerce Settings DocType 2023-09-13 12:02:27 +05:30
Anand Baburajan
4f0bb45a8b
chore: patch to correct asset values if je has workflow [dev] (#36914)
chore: patch to correct asset values if je has workflow
2023-09-02 18:31:32 +05:30
Deepesh Garg
283c0a1c0f chore: remove patch 2023-08-30 19:43:32 +05:30
Deepesh Garg
a7137514b6 chore: Update patch 2023-08-25 21:05:49 +05:30
Gursheen Kaur Anand
6a7b45f689
Merge branch 'develop' into view-projects-in-customer-portal 2023-08-18 13:32:08 +05:30
Gursheen Anand
e8f6c286d1 fix: remove portal menu items in pre-model sync patch 2023-08-18 13:21:37 +05:30
Gursheen Anand
d119d2ec32 fix: delete doc without filters 2023-08-16 17:35:07 +05:30
Gursheen Anand
c071523e35 fix: delete portal settings for education doctypes 2023-08-16 12:23:10 +05:30
Ankush Menat
5740942de9 fix: lowercase fieldnames 2023-08-09 15:32:26 +05:30
Himanshu
38805603db
feat: subscription refactor (#30963)
* feat: subscription refactor

* fix: linter changes

* chore: linter changes

* chore: linter changes

* chore: Update tests

* chore: Remove commits

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-08-07 08:33:47 +05:30
Deepesh Garg
04820b14da
Merge pull request #35644 from ruthra-kumar/book_gain_loss_in_je
refactor: booking exchange gain/loss amount through journal
2023-08-04 09:53:26 +05:30
Deepesh Garg
c6b024c34b
Merge pull request #36167 from barredterra/percentage-rounding
fix: rounding of percentage fields
2023-07-30 14:41:30 +05:30
ruthra kumar
0587338435 chore: patch to update property setter for Journal Entry Accounts 2023-07-26 22:33:58 +05:30
marination
17ff395f9a fix: Reverse GL entries only for submitted Dunnings 2023-07-20 20:54:43 +05:30
marination
aeae8d646a fix: Patch dunnings made after accounts were frozen
- Consider "Accounts Frozen Until" and Period Closing Voucher
2023-07-20 19:55:57 +05:30
Deepesh Garg
3bc79eebe3
Merge pull request #35689 from marination/payments-based-dunning
feat: Payments based dunning
2023-07-20 12:06:36 +05:30
Deepesh Garg
fbea61bbc6
fix: Trailing opening entries in Accounts closing balance (#36175) 2023-07-18 15:16:52 +05:30
Ankush Menat
07d2b896c1 fix: log error during exotel migration 2023-07-18 13:01:33 +05:30
barredterra
ecaf0aba3c fix: rounding of percentage fields
Always round with precision of 2
2023-07-17 16:45:11 +02:00
Marica
1c1e7380e3
Merge branch 'develop' into payments-based-dunning 2023-07-17 12:33:19 +05:30
Ankush Menat
d95559a53c fix: patch for exotel 2023-07-14 17:39:22 +05:30
Suraj Shetty
23bc87f2aa Merge branch 'develop' of https://github.com/frappe/erpnext into move-exotel-to-separate-app 2023-07-14 16:21:48 +05:30
Deepesh Garg
ac9ad8ec36
fix: Handle multi-company in patch (#36127)
fix: Handle multi-compnay in patch
2023-07-14 15:56:59 +05:30
Deepesh Garg
b4bd978791
fix: Account balance patch and query fixes (#36117) 2023-07-14 10:28:36 +05:30
Deepesh Garg
d631c7dffa
fix: Accounts closing balance patch (#36113) 2023-07-13 16:10:05 +05:30
barredterra
e686bb0739 Merge remote-tracking branch 'upstream/develop' into payments-based-dunning 2023-07-03 19:56:42 +02:00
Anand Baburajan
dedb5e23f7
fix: delete loan module workspace properly after separation (#35971)
* fix: delete loan module workspace properly after separation

* chore: run remove_loan_management_module patch again
2023-07-03 13:06:46 +05:30
Marica
0a67a3a9c4
Merge branch 'develop' into payments-based-dunning 2023-06-30 13:32:50 +05:30
Anand Baburajan
988d755906
refactor!: removing loan management module (#35522)
* chore: resolving conflicts

* refactor: bank_clearance and add hook for get_payment_entries_for_bank_clearance

* refactor: bank_reconciliation_tool and add hook for get_matching_vouchers_for_bank_reconciliation

* fix: remove sales invoice from bank_reconciliation_doctypes and use hook for voucher clearance

* refactor: remove loan tests from test_bank_transaction

* refactor: bank_clearance_summary and add hook for get_entries_for_bank_clearance_summary

* refactor: removed test_bank_reconciliation_statement

* refactor: bank_reconciliation_statement and add hook for get_amounts_not_reflected_in_system_for_bank_reconciliation_statement

* refactor: add missing hook and patches for module removal and deprecation warning

* refactor: remove loan management translations

* chore: add erpnext tests dependent on lending
2023-06-30 11:02:49 +05:30
Marica
0498a31c42
Merge branch 'develop' into payments-based-dunning 2023-06-28 16:48:22 +05:30
Anand Baburajan
36d26d40a0
perf: improve asset depr schedule creation patch (#35867) 2023-06-26 10:58:36 +05:30
Deepesh Garg
4de7a4c571 chore: update typo in patch 2023-06-24 16:31:19 +05:30
Gursheen Anand
cde82bc0cc fix: modify patch 2023-06-23 12:12:32 +05:30
Gursheen Anand
555c126eb9 fix: add patch for setting default value of report field 2023-06-23 10:52:25 +05:30
marination
772f6ffd21 fix: Linter and incorrect cost center in test records 2023-06-14 16:48:18 +05:30
barredterra
8bfe865759 fix: ignore cancelled dunnings 2023-06-14 13:40:50 +05:30