diff --git a/foundation/www/docs/assets/img/accounts/item-subscriber.png b/foundation/www/docs/assets/img/accounts/item-subscriber.png new file mode 100644 index 00000000..e480cced Binary files /dev/null and b/foundation/www/docs/assets/img/accounts/item-subscriber.png differ diff --git a/foundation/www/docs/assets/img/accounts/subscription.gif b/foundation/www/docs/assets/img/accounts/subscription.gif deleted file mode 100755 index 68488053..00000000 Binary files a/foundation/www/docs/assets/img/accounts/subscription.gif and /dev/null differ diff --git a/foundation/www/docs/assets/img/accounts/subscription.png b/foundation/www/docs/assets/img/accounts/subscription.png deleted file mode 100755 index 8b2cdc30..00000000 Binary files a/foundation/www/docs/assets/img/accounts/subscription.png and /dev/null differ diff --git a/foundation/www/docs/user/manual/en/accounts/auto_repeat.md b/foundation/www/docs/user/manual/en/accounts/auto_repeat.md new file mode 100644 index 00000000..a78cd23e --- /dev/null +++ b/foundation/www/docs/user/manual/en/accounts/auto_repeat.md @@ -0,0 +1,29 @@ + +# Auto Repeat + +Auto Repeat feature helps you create certain transaction automatically in a given time period. + +## Use Case + +Assuming that you follow deferred expense system for some items. It requires you to create same Journal Entry each month to Cr. Deferred Expense a/c to Dr. Expense Account. You can create first Journal Entry manually for it, and then create auto-repeat transaction for it. + +Subscription + +#### Auto Repeat + +To set the subscription for the sales invoice Go to Subscription > select base doctype "Sales Invoice" > select base docname "Invoice No" > Save + +Subscription + +**From Date and To Date**: This defines contract period with the customer. + +**Repeat on Day**: If frequency is set as Monthly, then it will be day of the month on which recurring invoice will be generated. + +**Notify By Email**: If you want to notify the user about auto recurring invoice. + +**Print Format**: Select a print format to define document view which should be emailed to customer. + +**Disabled**: It will stop to make auto recurring documents against the subscription. + +### Difference between Subscription and Auto Repeat + diff --git a/foundation/www/docs/user/manual/en/accounts/index.txt b/foundation/www/docs/user/manual/en/accounts/index.txt index cc680c27..9e12ea3f 100755 --- a/foundation/www/docs/user/manual/en/accounts/index.txt +++ b/foundation/www/docs/user/manual/en/accounts/index.txt @@ -13,6 +13,7 @@ inter-company-journal-entry payment-entry deferred-revenue subscription +auto-repeat multi-currency-accounting advance-payment-entry payment-request diff --git a/foundation/www/docs/user/manual/en/accounts/subscription.md b/foundation/www/docs/user/manual/en/accounts/subscription.md index 477989ad..7e78c708 100755 --- a/foundation/www/docs/user/manual/en/accounts/subscription.md +++ b/foundation/www/docs/user/manual/en/accounts/subscription.md @@ -1,25 +1,35 @@ - # Subscription -If you have a contract with the Customer where your organization gives bill to the Customer on a monthly, quarterly, half-yearly or annual basis, you can use subscription feature to make auto invoicing. +If you offer a service which requires renewal in the certain time period (yearly, monthly, quarterly etc.), you can use Subscription feature to track them. Subscription master captures all the details required for the auto-creation of Sales Invoice on subscription expiry. -Subscription +Let's consider a use-case of ERPNext subscription itself. Our hosting plans are available on yearly basis. Each customer's account has subscription expiry date, after which customer must renew their subscription with us. -#### Scenario +To manage client's subscription expiry and auto-generation of Sales Invoice for the renewal, we use Subscription feature. -Subscription for your hosted ERPNext account requires yearly renewal. We use Sales Invoice for generating proforma invoices. To automate proforma invoicing for renewal, we set original Sales Invoice on the subscription form. Recurring proforma invoice is created automatically just before customer's account is about to expire, and requires renewal. This recurring Proforma Invoice is also emailed automatically to the customer. +### Subcription Validity -To set the subscription for the sales invoice -Goto Subscription > select base doctype "Sales Invoice" > select base docname "Invoice No" > Save +**Start Date:** Day from when the subscription will be valid. -Subscription +**Days Until Due:** Enter no. of days for which subscription will be valid. -**From Date and To Date**: This defines contract period with the customer. +Based on the subscription start and end date, actual dates for invoices will be calculated. -**Repeat on Day**: If frequency is set as Monthly, then it will be day of the month on which recurring invoice will be generated. +### Subscription Plan -**Notify By Email**: If you want to notify the user about auto recurring invoice. +The subscription plan is linked to an Item, for which Sales Invoice is created. -**Print Format**: Select a print format to define document view which should be emailed to customer. +Subscription -**Disabled**: It will stop to make auto recurring documents against the subscription \ No newline at end of file +### Taxes + +Select Taxes and Charges which will be applicable in the Sales Invoice created agains this Subscription. + +### Discounts + +Mention discounts if any which will be applied on this particular subscription. + +### Difference Between Recurring and Subscription + +Before Subscription feature was added in ERPNext, the current Auto-Repeat feature was available as subscription only. + +The Auto-Repeat feature which is applicable for multiple transactions like Sales Order, Purchase Order, Invoices, Journal Entry etc. Whereas based on Subscription, only Sales Invoices are auto-created. \ No newline at end of file diff --git a/foundation/www/docs/user/manual/en/selling/setup/sales-person-target-allocation.md b/foundation/www/docs/user/manual/en/selling/setup/sales-person-target-allocation.md index 7d89469f..f4050e7e 100755 --- a/foundation/www/docs/user/manual/en/selling/setup/sales-person-target-allocation.md +++ b/foundation/www/docs/user/manual/en/selling/setup/sales-person-target-allocation.md @@ -25,8 +25,7 @@ In this table, you should select Item Group, Fiscal Year, Target Qty and Amount. If you wish to spread allocated target across months, then you should setup Monthly Distribution master, and select it in the Sales Person master. Considering our example, target for the month of December will be set as 5 qty (10% of total allocation). - -Target Distribution +Target Distribution ####Report - Sales Person Target Variance Item Groupwise @@ -79,7 +78,7 @@ To create new Monthly Distriibution, go to: `Accounts > Monthly Distributon` -Target Distribution +Target Distribution You can link Monthly Distribution while allocating targets in Sales Person as well as in Territory master.