Skip to content

Commit

Permalink
revert: "feat: Accounts, Selling & Assets Onboarding cleanup (#28491)" (
Browse files Browse the repository at this point in the history
  • Loading branch information
nextchamp-saqib authored Nov 25, 2021
1 parent 5589e18 commit 80d0b6d
Show file tree
Hide file tree
Showing 37 changed files with 143 additions and 1,056 deletions.
43 changes: 43 additions & 0 deletions erpnext/accounts/doctype/accounts_settings/accounts_settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,46 @@ frappe.ui.form.on('Accounts Settings', {

}
});

frappe.tour['Accounts Settings'] = [
{
fieldname: "acc_frozen_upto",
title: "Accounts Frozen Upto",
description: __("Freeze accounting transactions up to specified date, nobody can make/modify entry except the specified Role."),
},
{
fieldname: "frozen_accounts_modifier",
title: "Role Allowed to Set Frozen Accounts & Edit Frozen Entries",
description: __("Users with this Role are allowed to set frozen accounts and create/modify accounting entries against frozen accounts.")
},
{
fieldname: "determine_address_tax_category_from",
title: "Determine Address Tax Category From",
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.")
},
{
fieldname: "over_billing_allowance",
title: "Over Billing Allowance Percentage",
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.")
},
{
fieldname: "credit_controller",
title: "Credit Controller",
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.")
},
{
fieldname: "make_payment_via_journal_entry",
title: "Make Payment via Journal Entry",
description: __("When checked, if user proceeds to make payment from an invoice, the system will open a Journal Entry instead of a Payment Entry.")
},
{
fieldname: "unlink_payment_on_cancellation_of_invoice",
title: "Unlink Payment on Cancellation of Invoice",
description: __("If checked, system will unlink the payment against the respective invoice.")
},
{
fieldname: "unlink_advance_payment_on_cancelation_of_order",
title: "Unlink Advance Payment on Cancellation of Order",
description: __("Similar to the previous option, this unlinks any advance payments made against Purchase/Sales Orders.")
}
];
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,25 @@ cur_frm.cscript.tax_table = "Sales Taxes and Charges";

{% include "erpnext/public/js/controllers/accounts.js" %}

frappe.tour['Sales Taxes and Charges Template'] = [
{
fieldname: "title",
title: __("Title"),
description: __("A name by which you will identify this template. You can change this later."),
},
{
fieldname: "company",
title: __("Company"),
description: __("Company for which this tax template will be applicable"),
},
{
fieldname: "is_default",
title: __("Is this Default?"),
description: __("Set this template as the default for all sales transactions"),
},
{
fieldname: "taxes",
title: __("Taxes Table"),
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."),
}
];
113 changes: 0 additions & 113 deletions erpnext/accounts/form_tour/accounts_settings/accounts_settings.json

This file was deleted.

96 changes: 0 additions & 96 deletions erpnext/accounts/form_tour/purchase_invoice/purchase_invoice.json

This file was deleted.

This file was deleted.

16 changes: 8 additions & 8 deletions erpnext/accounts/module_onboarding/accounts/accounts.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,35 +13,35 @@
"documentation_url": "https://docs.erpnext.com/docs/user/manual/en/accounts",
"idx": 0,
"is_complete": 0,
"modified": "2021-08-13 11:59:35.690443",
"modified": "2020-10-30 15:41:15.547225",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Accounts",
"owner": "Administrator",
"steps": [
{
"step": "Company"
},
{
"step": "Chart of Accounts"
},
{
"step": "Setup Taxes"
},
{
"step": "Accounts Settings"
"step": "Create a Product"
},
{
"step": "Cost Centers for Report and Budgeting"
"step": "Create a Supplier"
},
{
"step": "Create Your First Purchase Invoice"
},
{
"step": "Updating Opening Balances"
"step": "Create a Customer"
},
{
"step": "Create Your First Sales Invoice"
},
{
"step": "Financial Statements"
"step": "Configure Account Settings"
}
],
"subtitle": "Accounts, Invoices, Taxation, and more.",
Expand Down
Loading

0 comments on commit 80d0b6d

Please sign in to comment.