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
ruthra kumar
a72988a514
chore: update default limit values in reconciliation tool
...
(cherry picked from commit 1fd888175f2f224bcebba3e9a958d672ab09bcd5)
2023-10-31 14:23:08 +00:00
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]
a871d955d4
fix: force delete removed report (backport #37668 ) ( #37670 )
...
fix: force delete removed report (#37668 )
(cherry picked from commit 7be578485e2cafd124c98cc8394c67430c2b31b8)
Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-10-25 14:08:10 +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
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
Ankush Menat
61778d5058
ci: restart bench before final migrate ( #37104 )
...
Also remove few patches which are now handled automatically
2023-09-15 16:51:56 +05:30
Ankush Menat
2dbdc402bb
refactor!: remove social media post module
2023-09-14 12:11:23 +05:30
Ankush Menat
2135b0132d
refactor!: remove twitter integration
2023-09-14 11:25:49 +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
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
ruthra kumar
a0fc68538f
refactor: toggle for negative rates in Selling Settings
2023-08-15 07:34:33 +05:30
ruthra kumar
9db8769e65
fix: broken bench update after subscription refactor
2023-08-09 13:54: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
ruthra kumar
0587338435
chore: patch to update property setter for Journal Entry Accounts
2023-07-26 22:33:58 +05:30
Deepesh Garg
e1d6bf364e
Merge branch 'develop' of https://github.com/frappe/erpnext into customer-details-in-tax-withholding-category-report
2023-07-25 14:45:36 +05:30
Gursheen Anand
5224f13db2
fix: add patch for renaming tds payable report
2023-07-24 17:11:05 +05:30
Marica
1c1e7380e3
Merge branch 'develop' into payments-based-dunning
2023-07-17 12:33:19 +05:30
Deepesh Garg
6270607c6d
fix: Remove current fiscal year from Global Defaults ( #35960 )
...
* fix: Remove current fiscal year from Global Defaults
* fix: Remove button to set default
* fix: Add utils to get fiscal year
* fix: Incorrect import
* feat: Add hook for naming series parser
2023-07-16 12:58:42 +05:30
Ankush Menat
d95559a53c
fix: patch for exotel
2023-07-14 17:39:22 +05:30
Deepesh Garg
b4bd978791
fix: Account balance patch and query fixes ( #36117 )
2023-07-14 10:28:36 +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
Gursheen Kaur Anand
5113a417a1
fix!: UX of supplier linking with supplier users on portal pages ( #35836 )
...
* fix: create and add Portal Users child table in Supplier/Customer
Issue #35772
* fix: modify the original permission check hook
* fix: auto-add role for portal users
* fix: added patch for auto-populating portal users
* fix: modify patch to fetch users correctly
* fix: remove unnecessary code for updating naming_series
* fix(UX): show portal user in list view
Also split columns to reduce whitespace.
* refactor: simpler role checking
* fix: consider parenttype while fetching portal user
* refactor: simpler code, rename variable
* test: supplier portal user can access their docs
* refactor: only add role if not added
* refactor: rename and move patch to supplier
* refactor: dont add role if no perm or existing doc
* fix: add role before save
* refactor: run query directly
* refactor: split patch and apply roles
- if role isn't present dont add portal user
- ignore failure as it's not critical
* test: fix permission creation for webform test
---------
Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-06-28 11:22:40 +05:30
Gursheen Anand
555c126eb9
fix: add patch for setting default value of report field
2023-06-23 10:52:25 +05:30
barredterra
0990011e74
feat: add patch for dunning
2023-06-14 13:07:47 +05:30
Deepesh Garg
abc6fe0b06
refactor!: Remove custom cashflow report mapper ( #35523 )
...
* refactor: Remove custom cashflow mapper
* chore: patch to delete docs
* fix: Cleanup defaults during install
* fix: Remove custom cashflow mapper from consolidated financial statement
2023-06-02 17:48:59 +05:30
Nabin Hait
0b28f641ad
fix: Delete Retail and Utilities worspaces amd hide default Settings and Integration workspaces
2023-05-30 13:18:52 +05:30
Sagar Sharma
196e18187f
fix(patch): add patch to set packed_qty in draft DN
2023-05-25 18:03:39 +05:30
Nabin Hait
2b8c39eee9
fix: account closing balance patch
2023-05-17 22:05:46 +05:30
Nabin Hait
f5cc41e182
fix: account closing balance patch
2023-05-10 16:41:47 +05:30
Nabin Hait
713fa67b96
fix: account closing balance patch
2023-05-05 17:54:34 +05:30
Deepesh Garg
b545e3def0
fix: Add company field to lower deduction certificate ( #34914 )
2023-04-25 19:07:45 +05:30
ruthra kumar
3f537d30bd
chore(patch): by default ledger entries of JE's will not be merged
2023-04-18 10:55:49 +05:30
Komal-Saraf0609
ad11934d39
fix: enabling lead even after "Opportunity" created against it ( #34627 )
...
* fix: enabling lead even after "Opportunity" created against it
* chore: Linting Issues
---------
Co-authored-by: Komal Saraf <komal@frappe.io>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-03-30 08:03:55 +05:30
Deepesh Garg
fa991b2dcf
Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry
2023-03-21 17:00:08 +05:30
