Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Accounts, Selling & Assets Onboarding cleanup (backport #27112) #28491

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 22, 2021

This is an automatic backport of pull request #27112 done by Mergify.
Cherry-pick of a285b5b has failed:

On branch mergify/bp/version-13-hotfix/pr-27112
Your branch is up to date with 'origin/version-13-hotfix'.

You are currently cherry-picking commit a285b5b78b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/accounts/doctype/accounts_settings/accounts_settings.js
	modified:   erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.js
	new file:   erpnext/accounts/form_tour/accounts_settings/accounts_settings.json
	new file:   erpnext/accounts/form_tour/purchase_invoice/purchase_invoice.json
	new file:   erpnext/accounts/form_tour/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
	modified:   erpnext/accounts/module_onboarding/accounts/accounts.json
	new file:   erpnext/accounts/onboarding_step/accounts_settings/accounts_settings.json
	modified:   erpnext/accounts/onboarding_step/chart_of_accounts/chart_of_accounts.json
	new file:   erpnext/accounts/onboarding_step/company/company.json
	new file:   erpnext/accounts/onboarding_step/cost_centers_for_report_and_budgeting/cost_centers_for_report_and_budgeting.json
	modified:   erpnext/accounts/onboarding_step/create_your_first_purchase_invoice/create_your_first_purchase_invoice.json
	new file:   erpnext/accounts/onboarding_step/financial_statements/financial_statements.json
	modified:   erpnext/accounts/onboarding_step/setup_taxes/setup_taxes.json
	new file:   erpnext/accounts/onboarding_step/updating_opening_balances/updating_opening_balances.json
	new file:   erpnext/assets/form_tour/asset/asset.json
	new file:   erpnext/assets/form_tour/asset_category/asset_category.json
	modified:   erpnext/assets/module_onboarding/assets/assets.json
	new file:   erpnext/assets/onboarding_step/asset_category/asset_category.json
	new file:   erpnext/assets/onboarding_step/asset_item/asset_item.json
	new file:   erpnext/assets/onboarding_step/asset_purchase/asset_purchase.json
	new file:   erpnext/assets/onboarding_step/existing_asset/existing_asset.json
	new file:   erpnext/assets/onboarding_step/fixed_asset_accounts/fixed_asset_accounts.json
	modified:   erpnext/selling/doctype/selling_settings/selling_settings.js
	new file:   erpnext/selling/form_tour/sales_order/sales_order.json
	new file:   erpnext/selling/form_tour/selling_settings/selling_settings.json
	modified:   erpnext/selling/module_onboarding/selling/selling.json
	modified:   erpnext/selling/onboarding_step/create_a_customer/create_a_customer.json
	modified:   erpnext/selling/onboarding_step/create_a_product/create_a_product.json
	modified:   erpnext/selling/onboarding_step/create_a_quotation/create_a_quotation.json
	new file:   erpnext/selling/onboarding_step/create_a_sales_order/create_a_sales_order.json
	modified:   erpnext/selling/onboarding_step/introduction_to_selling/introduction_to_selling.json
	new file:   erpnext/selling/onboarding_step/sales_order/sales_order.json
	modified:   erpnext/selling/onboarding_step/selling_settings/selling_settings.json
	modified:   erpnext/selling/onboarding_step/setup_your_warehouse/setup_your_warehouse.json
	new file:   erpnext/stock/form_tour/item/item.json
	new file:   erpnext/stock/form_tour/purchase_receipt/purchase_receipt.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/setup/doctype/company/company.json

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* refactor: company form fields arrangement

* refactor: accounts onboarding steps

* refactor: re-arrange fields & modify labels in company form

* feat: onbording steps for accounts module

* fix: updated onboarding steps for selling module

* fix: remove unwanted steps from accounts

* feat: add more onboarding steps

* feat: Refactor onboarding-module for accounting workspace

* feat: Add basic asset onboarding steps

* feat: Add basic asset item form tour

* feat: Add basic selling onboarding-steps

* feat: Add basic form tour for purchase recipt

* feat: Add basic form tour for existing asset

* feat: Adding asset category form tour

* feat: Add form tour for asset category

* feat: Refactor sales taxes and charges template form tour with new  method

* refactor: Remove old form tour for accounts settings

* refactor: Change asset category form tour with new tour method

* refactor: Change asset item form tour with new tour method

* refactor: Change purchase receipt form tour with new tour method

* refactor: Change asset form tour with new tour method

* refactor: Remove old form tour for selling settings

* refactor: general fix/typo in onboarding steps

* Apply suggestions from code review

Co-authored-by: Nabin Hait <nabinhait@gmail.com>

* refactor: Remove old form tour method for sales order.

* fix: removed duplicate section break

* fix: Removed duplicate fields

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: Anuja <anuja.pawar20@gmail.com>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
(cherry picked from commit a285b5b)

# Conflicts:
#	erpnext/setup/doctype/company/company.json
@nextchamp-saqib
Copy link
Member

@Mergifyio backport version-13-pre-release

@mergify
Copy link
Contributor Author

mergify bot commented Nov 22, 2021

backport version-13-pre-release

🟠 Waiting for conditions to match

  • merged [:pushpin: backport requirement]

@nextchamp-saqib nextchamp-saqib merged commit 358205b into version-13-hotfix Nov 22, 2021
mergify bot added a commit that referenced this pull request Nov 22, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Nov 22, 2021

backport version-13-pre-release

✅ Backports have been created

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants