Fixed merge conflict

foundation/www/docs/user/manual/en/accounts/auto_repeat.md

@@ -0,0 +1,29 @@
+<!-- add-breadcrumbs -->
+# 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.
+
+<img class="screenshot" alt="Subscription" src="{{docs_base_url}}/assets/img/accounts/subscription.png">
+
+#### Auto Repeat
+
+To set the subscription for the sales invoice Go to Subscription > select base doctype "Sales Invoice" > select base docname "Invoice No" > Save
+
+<img class="screenshot" alt="Subscription" src="{{docs_base_url}}/assets/img/accounts/subscription.gif">
+
+**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
+

foundation/www/docs/user/manual/en/accounts/index.md

@@ -1,13 +1,15 @@
-<!-- add-breadcrumbs -->
 # Accounts
 
 Whether you have an accountant in your internal team OR you do it yourself OR you have chosen to outsourced it,
 the financial accounting process is almost always at the center any business management system (aka an ERP system).
 
-In ERPNext, your accounting operations consists of 3 main types of transactions:
-  * Sales Invoice: Which is a record of the bills that you raise to your Customers for the products or services you provide.
-  * Purchase Invoice: Which is a record of the bills that your Suppliers give you for their products or services provided to you.
-  * Journal Entries: For accounting entries, like payments, credit and other types of adjustments you want to record.
+In ERPNext, your accounting operations consists of 3 main transactions:
+
+  * Sales Invoice: The bills that you raise to your Customers for the products or services you provide.
+
+  * Purchase Invoice: Bills that your Suppliers give you for their products or services.
+  
+  * Journal Entries: For accounting entries, like payments, credit and other types.
 
 <div class="embed-container">
   <iframe src="https://www.youtube.com/embed/5wjollWN0OA?rel=0" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen>

foundation/www/docs/user/manual/en/accounts/index.txt

@@ -9,10 +9,12 @@ debit-note
 inter-company-invoices
 payments
 journal-entry
+mode-of-payment
 inter-company-journal-entry
 payment-entry
 deferred-revenue
 subscription
+auto-repeat
 multi-currency-accounting
 advance-payment-entry
 payment-request

foundation/www/docs/user/manual/en/accounts/subscription.md

@@ -1,26 +1,38 @@
-<!-- add-breadcrumbs -->
 # 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.
 
-<img class="screenshot" alt="Subscription" src="{{docs_base_url}}/assets/img/accounts/subscription.png">
+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.
+### Subscription 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.
 
-<img class="screenshot" alt="Subscription" src="{{docs_base_url}}/assets/img/accounts/subscription.gif">
+**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.
+<img class="screenshot" alt="Subscription" src="{{docs_base_url}}/assets/img/accounts/item-subscriber.png">
+
+### Taxes
+
+Select Taxes and Charges which will be applicable in the Sales Invoice created against this Subscription.
+
+### Discounts
+
+Mention discounts if any which will be applied on this particular subscription.
+
+### Difference Between Subscription and Auto-Repeat
+
+Before Subscription feature was added in ERPNext, the current Auto-Repeat feature was available as a 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.
 
 **Disabled**: It will stop to make auto recurring documents against the subscription