-
Notifications
You must be signed in to change notification settings - Fork 7.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Accounts, Selling & Assets Onboarding cleanup (#27112)
* 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
- Loading branch information
1 parent
b6b45c6
commit 144e108
Showing
37 changed files
with
1,073 additions
and
143 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
113 changes: 113 additions & 0 deletions
113
erpnext/accounts/form_tour/accounts_settings/accounts_settings.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| { | ||
| "creation": "2021-06-29 17:00:18.273054", | ||
| "docstatus": 0, | ||
| "doctype": "Form Tour", | ||
| "idx": 0, | ||
| "is_standard": 1, | ||
| "modified": "2021-06-29 17:00:26.145996", | ||
| "modified_by": "Administrator", | ||
| "module": "Accounts", | ||
| "name": "Accounts Settings", | ||
| "owner": "Administrator", | ||
| "reference_doctype": "Accounts Settings", | ||
| "save_on_complete": 0, | ||
| "steps": [ | ||
| { | ||
| "description": "The percentage by which you can overbill transactions. For example, if the order value is $100 for an Item and percentage here is set as 10% then you are allowed to bill for $110.", | ||
| "field": "", | ||
| "fieldname": "over_billing_allowance", | ||
| "fieldtype": "Currency", | ||
| "has_next_condition": 0, | ||
| "is_table_field": 0, | ||
| "label": "Over Billing Allowance (%)", | ||
| "parent_field": "", | ||
| "position": "Right", | ||
| "title": "Over Billing Allowance Percentage" | ||
| }, | ||
| { | ||
| "description": "Select the role that is allowed to overbill a transactions.", | ||
| "field": "", | ||
| "fieldname": "role_allowed_to_over_bill", | ||
| "fieldtype": "Link", | ||
| "has_next_condition": 0, | ||
| "is_table_field": 0, | ||
| "label": "Role Allowed to Over Bill ", | ||
| "parent_field": "", | ||
| "position": "Right", | ||
| "title": "Role Allowed to Over Bill" | ||
| }, | ||
| { | ||
| "description": "If checked, system will unlink the payment against the respective invoice.", | ||
| "field": "", | ||
| "fieldname": "unlink_payment_on_cancellation_of_invoice", | ||
| "fieldtype": "Check", | ||
| "has_next_condition": 0, | ||
| "is_table_field": 0, | ||
| "label": "Unlink Payment on Cancellation of Invoice", | ||
| "parent_field": "", | ||
| "position": "Bottom", | ||
| "title": "Unlink Payment on Cancellation of Invoice" | ||
| }, | ||
| { | ||
| "description": "Similar to the previous option, this unlinks any advance payments made against Purchase/Sales Orders.", | ||
| "field": "", | ||
| "fieldname": "unlink_advance_payment_on_cancelation_of_order", | ||
| "fieldtype": "Check", | ||
| "has_next_condition": 0, | ||
| "is_table_field": 0, | ||
| "label": "Unlink Advance Payment on Cancellation of Order", | ||
| "parent_field": "", | ||
| "position": "Bottom", | ||
| "title": "Unlink Advance Payment on Cancellation of Order" | ||
| }, | ||
| { | ||
| "description": "Tax category can be set on Addresses. An address can be Shipping or Billing address. Set which addres to select when applying Tax Category.", | ||
| "field": "", | ||
| "fieldname": "determine_address_tax_category_from", | ||
| "fieldtype": "Select", | ||
| "has_next_condition": 0, | ||
| "is_table_field": 0, | ||
| "label": "Determine Address Tax Category From", | ||
| "parent_field": "", | ||
| "position": "Right", | ||
| "title": "Determine Address Tax Category From" | ||
| }, | ||
| { | ||
| "description": "Freeze accounting transactions up to specified date, nobody can make/modify entry except the specified Role.", | ||
| "field": "", | ||
| "fieldname": "acc_frozen_upto", | ||
| "fieldtype": "Date", | ||
| "has_next_condition": 0, | ||
| "is_table_field": 0, | ||
| "label": "Accounts Frozen Till Date", | ||
| "parent_field": "", | ||
| "position": "Right", | ||
| "title": "Accounts Frozen Upto" | ||
| }, | ||
| { | ||
| "description": "Users with this Role are allowed to set frozen accounts and create/modify accounting entries against frozen accounts.", | ||
| "field": "", | ||
| "fieldname": "frozen_accounts_modifier", | ||
| "fieldtype": "Link", | ||
| "has_next_condition": 0, | ||
| "is_table_field": 0, | ||
| "label": "Role Allowed to Set Frozen Accounts and Edit Frozen Entries", | ||
| "parent_field": "", | ||
| "position": "Right", | ||
| "title": "Role Allowed to Set Frozen Accounts & Edit Frozen Entries" | ||
| }, | ||
| { | ||
| "description": "Select the role that is allowed to submit transactions that exceed credit limits set. The credit limit can be set in the Customer form.", | ||
| "field": "", | ||
| "fieldname": "credit_controller", | ||
| "fieldtype": "Link", | ||
| "has_next_condition": 0, | ||
| "is_table_field": 0, | ||
| "label": "Credit Controller", | ||
| "parent_field": "", | ||
| "position": "Left", | ||
| "title": "Credit Controller" | ||
| } | ||
| ], | ||
| "title": "Accounts Settings" | ||
| } |
96 changes: 96 additions & 0 deletions
96
erpnext/accounts/form_tour/purchase_invoice/purchase_invoice.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| { | ||
| "creation": "2021-06-29 16:31:48.558826", | ||
| "docstatus": 0, | ||
| "doctype": "Form Tour", | ||
| "idx": 0, | ||
| "is_standard": 1, | ||
| "modified": "2021-06-29 16:31:48.558826", | ||
| "modified_by": "Administrator", | ||
| "module": "Accounts", | ||
| "name": "Purchase Invoice", | ||
| "owner": "Administrator", | ||
| "reference_doctype": "Purchase Invoice", | ||
| "save_on_complete": 1, | ||
| "steps": [ | ||
| { | ||
| "description": "Select Supplier", | ||
| "field": "", | ||
| "fieldname": "supplier", | ||
| "fieldtype": "Link", | ||
| "has_next_condition": 1, | ||
| "is_table_field": 0, | ||
| "label": "Supplier", | ||
| "next_step_condition": "supplier", | ||
| "parent_field": "", | ||
| "position": "Right", | ||
| "title": "Select Supplier" | ||
| }, | ||
| { | ||
| "description": "Add items in the table", | ||
| "field": "", | ||
| "fieldname": "items", | ||
| "fieldtype": "Table", | ||
| "has_next_condition": 0, | ||
| "is_table_field": 0, | ||
| "label": "Items", | ||
| "parent_field": "", | ||
| "position": "Bottom", | ||
| "title": "List of Items" | ||
| }, | ||
| { | ||
| "child_doctype": "Purchase Invoice Item", | ||
| "description": "Select an item", | ||
| "field": "", | ||
| "fieldname": "item_code", | ||
| "fieldtype": "Link", | ||
| "has_next_condition": 0, | ||
| "is_table_field": 1, | ||
| "label": "Item", | ||
| "parent_field": "", | ||
| "parent_fieldname": "items", | ||
| "position": "Right", | ||
| "title": "Select Item" | ||
| }, | ||
| { | ||
| "child_doctype": "Purchase Invoice Item", | ||
| "description": "Enter the quantity", | ||
| "field": "", | ||
| "fieldname": "qty", | ||
| "fieldtype": "Float", | ||
| "has_next_condition": 0, | ||
| "is_table_field": 1, | ||
| "label": "Accepted Qty", | ||
| "parent_field": "", | ||
| "parent_fieldname": "items", | ||
| "position": "Right", | ||
| "title": "Enter Quantity" | ||
| }, | ||
| { | ||
| "child_doctype": "Purchase Invoice Item", | ||
| "description": "Enter rate of the item", | ||
| "field": "", | ||
| "fieldname": "rate", | ||
| "fieldtype": "Currency", | ||
| "has_next_condition": 0, | ||
| "is_table_field": 1, | ||
| "label": "Rate", | ||
| "parent_field": "", | ||
| "parent_fieldname": "items", | ||
| "position": "Right", | ||
| "title": "Enter Rate" | ||
| }, | ||
| { | ||
| "description": "You can add taxes here", | ||
| "field": "", | ||
| "fieldname": "taxes", | ||
| "fieldtype": "Table", | ||
| "has_next_condition": 0, | ||
| "is_table_field": 0, | ||
| "label": "Purchase Taxes and Charges", | ||
| "parent_field": "", | ||
| "position": "Bottom", | ||
| "title": "Select taxes" | ||
| } | ||
| ], | ||
| "title": "Purchase Invoice" | ||
| } |
65 changes: 65 additions & 0 deletions
65
...accounts/form_tour/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| { | ||
| "creation": "2021-08-24 12:28:18.044902", | ||
| "docstatus": 0, | ||
| "doctype": "Form Tour", | ||
| "idx": 0, | ||
| "is_standard": 1, | ||
| "modified": "2021-08-24 12:28:18.044902", | ||
| "modified_by": "Administrator", | ||
| "module": "Accounts", | ||
| "name": "Sales Taxes and Charges Template", | ||
| "owner": "Administrator", | ||
| "reference_doctype": "Sales Taxes and Charges Template", | ||
| "save_on_complete": 0, | ||
| "steps": [ | ||
| { | ||
| "description": "A name by which you will identify this template. You can change this later.", | ||
| "field": "", | ||
| "fieldname": "title", | ||
| "fieldtype": "Data", | ||
| "has_next_condition": 0, | ||
| "is_table_field": 0, | ||
| "label": "Title", | ||
| "parent_field": "", | ||
| "position": "Bottom", | ||
| "title": "Title" | ||
| }, | ||
| { | ||
| "description": "Company for which this tax template will be applicable", | ||
| "field": "", | ||
| "fieldname": "company", | ||
| "fieldtype": "Link", | ||
| "has_next_condition": 0, | ||
| "is_table_field": 0, | ||
| "label": "Company", | ||
| "parent_field": "", | ||
| "position": "Bottom", | ||
| "title": "Company" | ||
| }, | ||
| { | ||
| "description": "Set this template as the default for all sales transactions", | ||
| "field": "", | ||
| "fieldname": "is_default", | ||
| "fieldtype": "Check", | ||
| "has_next_condition": 0, | ||
| "is_table_field": 0, | ||
| "label": "Default", | ||
| "parent_field": "", | ||
| "position": "Bottom", | ||
| "title": "Is this Default Tax Template?" | ||
| }, | ||
| { | ||
| "description": "You can add a row for a tax rule here. These rules can be applied on the net total, or can be a flat amount.", | ||
| "field": "", | ||
| "fieldname": "taxes", | ||
| "fieldtype": "Table", | ||
| "has_next_condition": 0, | ||
| "is_table_field": 0, | ||
| "label": "Sales Taxes and Charges", | ||
| "parent_field": "", | ||
| "position": "Bottom", | ||
| "title": "Taxes Table" | ||
| } | ||
| ], | ||
| "title": "Sales Taxes and Charges Template" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.