[docs] fixed links

erpnext/config/docs.py

@@ -16,8 +16,10 @@ listed as one of the Best Open Source Softwares in the world by my online
 blogs."""
 
 docs_version = "6.x.x"
+splash_light_background = True
 
 def get_context(context):
+	context.app.splash_light_background = True
 	context.top_bar_items = [
 		{"label": "User Manual", "url": context.docs_base_url + "/user/manual", "right": 1},
 		{"label": "Videos", "url": context.docs_base_url + "/user/videos", "right": 1},

erpnext/docs/index.html

@@ -1,20 +1,21 @@
 <!-- title: ERPNext: Documentation -->
+<!-- description: ERPNext Documentation -->
 <!-- no-breadcrumbs -->
 <style>
- nav.navbar .navbar-header .navbar-brand,
- nav.navbar ul.navbar-nav a,
- nav.navbar ul.navbar-nav a:visited {
-   color:#fff;
-  opacity:0.8;
+
+ .splash {
+  border-bottom: 1px solid #d1d8dd;
  }
- nav.navbar .navbar-header a:hover,
- nav.navbar ul.navbar-nav a:hover {
-  color:#fff;
-  opacity:1;
+ .browser-image { border-bottom: 0px; }
+ .splash {
+  background: none;
+  background-color: #fff !important;
  }
- nav.navbar.navbar-main {
-  border-bottom:1px solid rgba(225,233,240,0.25);
+ .splash .jumbotron h1, .splash .jumbotron p {
+  color: #36414C !important;
+  text-shadow: none;
  }
+
  
 
 </style>

erpnext/docs/temp.py

@@ -0,0 +1,10 @@
+import os, re
+
+for basepath, folders, files in os.walk("."):
+	for f in files:
+		if f.endswith(".html") or f.endswith(".md"):
+			with open(os.path.join(basepath, f), "r") as c:
+				content = c.read()
+
+			for path in re.findall("""{{.?docs_base_url.?}}([^'"\)]*)""", content):
+				print path

erpnext/docs/user/index.txt

@@ -1,2 +1,2 @@
-guides
+manual
 videos

erpnext/docs/user/manual/en/CRM/customer.md

@@ -21,9 +21,9 @@ have multiple Contacts and Addresses.
 Contacts and Addresses in ERPNext are stored separately so that you can
 attach multiple Contacts or Addresses to Customers and Suppliers.
 
-Read [Contact]({{docs_base_url}}/user/guides/crm/contact.html) to know more.
+Read [Contact]({{docs_base_url}}/user/manual/en/crm/contact.html) to know more.
 
-Thus we may have identical Customer Names that are uniquely identified by the ID. Since the email address is not part of the customer information the linking of customer and User is through [Contacts]({{docs_base_url}}/user/guides/crm/contact.html)
+Thus we may have identical Customer Names that are uniquely identified by the ID. Since the email address is not part of the customer information the linking of customer and User is through [Contacts]({{docs_base_url}}/user/manual/en/crm/contact.html)
 
 ### Integration with Accounts
 
@@ -52,12 +52,12 @@ You can set how much credit you want to allow for a Customer by adding the
 “Credit Limit”. You can also set a global “Credit Limit” in the Company
 master. Classifying Customers
 
-ERPNext allows you to group your Customers using [Customer Group]({{docs_base_url}}/user/guides/crm/setup/customer-group.html) 
-and also divide them into [Territories]({{docs_base_url}}/user/guides/crm/setup/territory.html)
+ERPNext allows you to group your Customers using [Customer Group]({{docs_base_url}}/user/manual/en/crm/setup/customer-group.html) 
+and also divide them into [Territories]({{docs_base_url}}/user/manual/en/crm/setup/territory.html)
 Grouping will help you get better analysis of your data and
 identify which Customers are profitable and which are not. Territories will
 help you set sales targets for the respective territories.
-You can also mention [Sales Person]({{docs_base_url}}/user/guides/crm/setup/sales-person.html) against a customer.
+You can also mention [Sales Person]({{docs_base_url}}/user/manual/en/crm/setup/sales-person.html) against a customer.
 
 ### Sales Partner
 

erpnext/docs/user/manual/en/CRM/setup/campaign.md

@@ -4,7 +4,7 @@ geographical area, to achieve specified objectives.
 
 <img class="screenshot" alt="Campaign" src="{{docs_base_url}}/assets/img/crm/campaign.png">
 
-You can track [Lead]({{docs_base_url}}/user/guides/crm/lead.html), [Opportunity]({{docs_base_url}}/user/guides/crm/opportunity.html), [Quotation]({{docs_base_url}}/user/guides/selling/quotation.html) against a campaign.
+You can track [Lead]({{docs_base_url}}/user/manual/en/crm/lead.html), [Opportunity]({{docs_base_url}}/user/manual/en/crm/opportunity.html), [Quotation]({{docs_base_url}}/user/manual/en/selling/quotation.html) against a campaign.
 
 ###Track Leads against Campaign
 

erpnext/docs/user/manual/en/accounts/articles/index.txt

@@ -1,4 +1,3 @@
-
 accounting-for-projects
 c-form
 changing-parent-account
@@ -19,4 +18,4 @@ recurring-order-and-invoices
 update-stock-option-in-sales-invoice
 updating-opening-balance-in-accounts-using-temporary-account
 what-is-the-differences-of-total-and-valuation-in-tax-and-charges
-withdrawing-salary-from-owners-equity-account
+withdrawing-salary-from-owners-equity-account

erpnext/docs/user/manual/en/accounts/opening-entry.md

@@ -2,6 +2,6 @@ If you are a new company you can start using ERPNext accounting module by
 going to chart of accounts.
 
 However, if you are migrating from a legacy accounting system like Tally or a
-Fox Pro based software, please visit [Opening Entry.]({{docs_base_url}}/user/guides/accounts/opening-accounts.html)
+Fox Pro based software, please visit [Opening Entry.]({{docs_base_url}}/user/manual/en/accounts/opening-accounts.html)
 
 {next}

erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md

@@ -19,7 +19,7 @@ all your transactions against this Customer record.
 In ERPNext all Sales and Purchase transactions, like Sales Invoice, Quotation, Sales Order, Purchase Order etc. can be edited via the POS. There two steps to Setup POS:
 
 1. Enable POS View via (Setup > Customize > Feature Setup)
-2. Create a [POS Setting]({{docs_base_url}}/user/guides/setting-up/pos-setting.html) record
+2. Create a [POS Setting]({{docs_base_url}}/user/manual/en/setting-up/pos-setting.html) record
 
 #### Switch to POS View
 

erpnext/docs/user/manual/en/accounts/setup/tax-rule.md

@@ -1,4 +1,4 @@
-You can define which [Tax Template]({{docs_base_url}}/user/guides/setting-up/setting-up-taxes.html) must be applied on a Sales / Purchase transaction using Tax Rule.
+You can define which [Tax Template]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html) must be applied on a Sales / Purchase transaction using Tax Rule.
 
 <img class="screenshot" alt="Tax Rule" src="{{docs_base_url}}/assets/img/accounts/tax-rule.png">
 

erpnext/docs/user/manual/en/buying/setup/buying-settings.md

@@ -14,7 +14,7 @@ You can define or select the Naming Series pattern from:
 
 > Setup > Settings > Naming Series
 
-[Click here to know more about defining a Naming Series.]({{docs_base_url}}/user/guides/setting-up/settings/naming-series.html)
+[Click here to know more about defining a Naming Series.]({{docs_base_url}}/user/manual/en/setting-up/settings/naming-series.html)
 
 ### 2. Default Supplier Type
 

erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md

@@ -20,6 +20,6 @@ Then in the Sales Invoice Custom Script, add this line:
 
 * * *
 
-See: [How to create a custom script]({{docs_base_url}}/user/guides/customize-erpnext/custom-scripts.html)
+See: [How to create a custom script]({{docs_base_url}}/user/manual/en/customize-erpnext/custom-scripts.html)
 
 {next}

erpnext/docs/user/manual/en/human-resources/attendance.md

@@ -8,7 +8,7 @@ day can be created manually by:
 You can get a monthly report of your Attendance data by going to the “Monthly
 Attendance Details” report.
 
-You can also bulk uppload attendence using the [Upload Attendence Tool ]({{docs_base_url}}/user/guides/human-resources/tools/upload-attendance.html)
+You can also bulk uppload attendence using the [Upload Attendence Tool ]({{docs_base_url}}/user/manual/en/human-resources/tools/upload-attendance.html)
 
 {next}
 

erpnext/docs/user/manual/en/human-resources/job-applicant.md

@@ -1,4 +1,4 @@
-You can mantain a list of People who have applied for a [Job Opening]({{docs_base_url}}/user/guides/human-resources/job-opening.html).
+You can mantain a list of People who have applied for a [Job Opening]({{docs_base_url}}/user/manual/en/human-resources/job-opening.html).
 
 To create a new Job Applicant go to 
 

erpnext/docs/user/manual/en/human-resources/leave-application.md

@@ -17,8 +17,8 @@ Type and the period for which the leave is taken.
 
 > Tip : If you want all users to create their own Leave Applications, you can set
 their “Employee ID” as a match rule in the Leave Application Permission
-settings. See the earlier discussion on [Setting Up Permissions]({{docs_base_url}}/user/guides/setting-up/users-and-permissions.html)
+settings. See the earlier discussion on [Setting Up Permissions]({{docs_base_url}}/user/manual/en/setting-up/users-and-permissions.html)
 for more info.
 
-You assign Leaves aginast an Employee check [Leave Allocation]({{docs_base_url}}/user/guides/human-resources/setup/leave-allocation.html)
+You assign Leaves aginast an Employee check [Leave Allocation]({{docs_base_url}}/user/manual/en/human-resources/setup/leave-allocation.html)
 {next}

erpnext/docs/user/manual/en/human-resources/offer-letter.md

@@ -7,7 +7,7 @@ In ERPNext you can make a record of the Offer Letters that you can given to cand
 
 <img class="screenshot" alt="Offer Letter" src="{{docs_base_url}}/assets/img/human-resources/offer-letter.png">
 
-> Note: An offer letter can be made only against a [Job Applicant]({{docs_base_url}}/user/guides/human-resources/job-applicant.html)
+> Note: An offer letter can be made only against a [Job Applicant]({{docs_base_url}}/user/manual/en/human-resources/job-applicant.html)
 
 There is a pre-designed print format to print you offer letter.
 

erpnext/docs/user/manual/en/human-resources/setup/leave-allocation.md

@@ -2,6 +2,6 @@ Helps you allocate Leaves to a particular Employee
 
 <img class="screenshot" alt="Leave Allocation" src="{{docs_base_url}}/assets/img/human-resources/leave-allocation.png">
 
-To assign leaves to multiple employees use the [Leave Allocation Tool]({{docs_base_url}}/user/guides/human-resources/tools/leave-allocation-tool.html)
+To assign leaves to multiple employees use the [Leave Allocation Tool]({{docs_base_url}}/user/manual/en/human-resources/tools/leave-allocation-tool.html)
 
 {next}

erpnext/docs/user/manual/en/manufacturing/production-order.md

@@ -63,7 +63,7 @@ by:
 
 ### Making Time Logs
 
-* Progress in the Production Order can be tracked using [Time Log]({{docs_base_url}}/user/guides/projects/time-log.html)
+* Progress in the Production Order can be tracked using [Time Log]({{docs_base_url}}/user/manual/en/projects/time-log.html)
 * Time Logs are created against Production Order Operations.
 * Drafts of Time Logs are also created based on the scheduled operations when an Production Order is Submitted.
 * To create more Time Logs against an operation select 'Make TIme Log' in the respective operation.

erpnext/docs/user/manual/en/manufacturing/workstation.md

@@ -14,6 +14,6 @@ In workstation specify the workstation working hours under the 'working hour' se
 You can also specify the working hours based on shifts.
 While scheduling Production Order, system will check for the availability of the workstation based on the working hours specified.	
 
-> Note : You can enable overtime for your workstation in [Manufacturing Settings]({{docs_base_url}}/user/guides/manufacturing/setup/manufacturing-settings.html)
+> Note : You can enable overtime for your workstation in [Manufacturing Settings]({{docs_base_url}}/user/manual/en/manufacturing/setup/manufacturing-settings.html)
 
 {next}

erpnext/docs/user/manual/en/projects/project.md

@@ -4,7 +4,7 @@ Project management in ERPNext is Task driven. You can create Project and assign
 
 ### Managing tasks
 Project can be divided into multiple Tasks.
-Task can be created via Project document itself or can be created via  [Task]({{docs_base_url}}/user/guides/projects/tasks.html)
+Task can be created via Project document itself or can be created via  [Task]({{docs_base_url}}/user/manual/en/projects/tasks.html)
 
 <img class="screenshot" alt="Project" src="{{docs_base_url}}/assets/img/project/project_task.png">
 
@@ -20,7 +20,7 @@ Task can be created via Project document itself or can be created via  [Task]({{
 
 ### Managing time
 
-ERPNext uses [Time Log]({{docs_base_url}}/user/guides/projects/time-log.html) to track the progress of a Project.
+ERPNext uses [Time Log]({{docs_base_url}}/user/manual/en/projects/time-log.html) to track the progress of a Project.
 You can create Time Logs against each task.
 The Actual Start and End Time along with the costing shall then be updated based on the Time Log.
 
@@ -36,7 +36,7 @@ The Actual Start and End Time along with the costing shall then be updated based
 
 ### Managing expenses
 
-You can book [Expense Claim]({{docs_base_url}}/user/guides/human-resources/expense-claim.html) against a project task.
+You can book [Expense Claim]({{docs_base_url}}/user/manual/en/human-resources/expense-claim.html) against a project task.
 The system shall update the total amount from expense claims in the project costing section.
 
 * To view Expense Claims made against a Project click on 'Expense Claims'
@@ -53,7 +53,7 @@ The system shall update the total amount from expense claims in the project cost
 
 ### Cost Center
 
-You can make a [Cost Center]({{docs_base_url}}/user/guides/accounts/setup/cost-center.html) against a Project or use an existing cost center to track all expenses made against that project.
+You can make a [Cost Center]({{docs_base_url}}/user/manual/en/accounts/setup/cost-center.html) against a Project or use an existing cost center to track all expenses made against that project.
 
 <img class="screenshot" alt="Project - Cost Center" src="{{docs_base_url}}/assets/img/project/project_cost_center.png">
 
@@ -69,7 +69,7 @@ The Project Costing section helps you track the time and expenses incurred again
 
 ###Billing
 
-You can make/link a [Sales Order]({{docs_base_url}}/user/guides/selling/sales-order.html) against a project. Once linked you can use the standard sales module to bill your customer against the Project.
+You can make/link a [Sales Order]({{docs_base_url}}/user/manual/en/selling/sales-order.html) against a project. Once linked you can use the standard sales module to bill your customer against the Project.
 
 <img class="screenshot" alt="Project - Sales Order" src="{{docs_base_url}}/assets/img/project/project_sales_order.png">
 

erpnext/docs/user/manual/en/projects/tasks.md

@@ -25,7 +25,7 @@ You can specify a list of dependent task under the 'Depends On' section.
 
 ### Managing Time
 
-ERPNext uses [Time Log]({{docs_base_url}}/user/guides/projects/time-log.html) to track the progress of a Task.
+ERPNext uses [Time Log]({{docs_base_url}}/user/manual/en/projects/time-log.html) to track the progress of a Task.
 You can create multiple Time Logs against each task.
 The Actual Start and End Time along with the costing shall then be updated based on the Time Log.
 
@@ -41,7 +41,7 @@ The Actual Start and End Time along with the costing shall then be updated based
 
 ### Managing Expenses
 
-You can book [Expense Claim]({{docs_base_url}}/user/guides/human-resource-management/expense-claim.html) against a task.
+You can book [Expense Claim]({{docs_base_url}}/user/manual/en/human-resource-management/expense-claim.html) against a task.
 The system shall update the total amount from expense claims in the costing section.
 
 * To view Expense Claims made against a Task click on 'Expense Claims'

erpnext/docs/user/manual/en/projects/time-log.md

@@ -35,7 +35,7 @@ To create Time Logs via Calender, go to Time Log and select Calendar.
 
 * If you wish to bill against a Time Log you need to select the 'Billable' option.
 
-* In the costing section, the system will pull up the Costing & Billing rate from [Activity Cost]({{docs_base_url}}/user/guides/projects/activity-cost.html) 
+* In the costing section, the system will pull up the Costing & Billing rate from [Activity Cost]({{docs_base_url}}/user/manual/en/projects/activity-cost.html) 
 	based on the Employee and Activity Type specified.
 
 * The system shall then calculate the Costing and Billing amount based on the Hours mentioned in the Time Log.
@@ -44,6 +44,6 @@ To create Time Logs via Calender, go to Time Log and select Calendar.
 
 <img class="screenshot" alt="Time Log - Costing" src="{{docs_base_url}}/assets/img/project/time_log_costing.png">
 
-* After submitting the Time Log, you need to create [Time Log batch]({{docs_base_url}}/user/guides/projects/time-log-batch.html) to further bill the Time Log.
+* After submitting the Time Log, you need to create [Time Log batch]({{docs_base_url}}/user/manual/en/projects/time-log-batch.html) to further bill the Time Log.
 
 {next}

erpnext/docs/user/manual/en/selling/index.txt

@@ -1,5 +1,4 @@
 quotation
 sales-order
-drop-shipping
 setup
 articles

erpnext/docs/user/manual/en/selling/quotation.md

@@ -35,7 +35,7 @@ attach the corresponding image in the Item master.
 
 The rates you quote may depend on two things.
 
-  * The Price List: If you have multiple Price Lists, you can select a Price List or tag it to the Customer (so that it is auto-selected). Your Item prices will automatically be updated from the Price List.For details refer [Price List]({{docs_base_url}}/user/guides/setting-up/price-lists.html)
+  * The Price List: If you have multiple Price Lists, you can select a Price List or tag it to the Customer (so that it is auto-selected). Your Item prices will automatically be updated from the Price List.For details refer [Price List]({{docs_base_url}}/user/manual/en/setting-up/price-lists.html)
 
   * The Currency: If you are quoting to a Customer in a different currency, you will have to update the conversion rates to enable ERPNext to save the information in your standard Currency. This will help you to analyze the value of your Quotations in standard Currency.
 
@@ -43,7 +43,7 @@ The rates you quote may depend on two things.
 
 To add taxes to your Quotation, you can either select a tax template, Sales
 Taxes and Charges Template or add the taxes on your own. To understand taxes in
-detail visit [Taxes]({{docs_base_url}}/user/guides/setting-up/setting-up-taxes.html)
+detail visit [Taxes]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html)
 
 You can add taxes in the same manner as the Sales Taxes and Charges Template.
 

erpnext/docs/user/manual/en/selling/setup/index.txt

@@ -2,7 +2,5 @@ selling-settings
 sales-partner
 shipping-rule
 product-bundle
-item-price.md
-sales-person-target-allocation.md
-item-price.md
-sales-person-target-allocation.md
+item-price
+sales-person-target-allocation

erpnext/docs/user/manual/en/setting-up/email/index.txt

@@ -2,5 +2,4 @@ email-account
 email-alerts
 email-digest
 sending-email
-setting-up-email.md
-setting-up-email.md
+setting-up-email

erpnext/docs/user/manual/en/setting-up/email/sending-email.md

@@ -4,6 +4,6 @@ In ERPNext you can send any document as email (with a PDF attachment) by clickin
 
 <img class="screenshot" alt="Send Email" src="{{docs_base_url}}/assets/img/setup/email/send-email.gif">
 
-**Note:** You must have outgoing [email accounts]({{docs_base_url}}/user/guides/setting-up/email/email-account.html) setup for this.
+**Note:** You must have outgoing [email accounts]({{docs_base_url}}/user/manual/en/setting-up/email/email-account.html) setup for this.
 
 {next}

erpnext/docs/user/manual/en/setting-up/pos-setting.md

@@ -18,6 +18,6 @@ Set default values as defined.
 
 > Important : If you specify a particular User, the POS setting will be
 applied only to that User. If the User option is left blank, the setting will
-be set for all users. To understand POS in detail visit [Point of Sale]({{docs_base_url}}/user/guides/accounts/point-of-sale-pos-invoice.html)
+be set for all users. To understand POS in detail visit [Point of Sale]({{docs_base_url}}/user/manual/en/accounts/point-of-sale-pos-invoice.html)
 
 {next}

erpnext/docs/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.md

@@ -15,7 +15,7 @@ Click on the box ‘Attach Letterhead’ . Select the image file from the place
 
 You may choose to skip this step if your letterhead is not ready.
 
-To select letterhead later through the setup module, read [Letter-head]({{docs_base_url}}/user/guides/setting-up/print/letter-head.html)
+To select letterhead later through the setup module, read [Letter-head]({{docs_base_url}}/user/manual/en/setting-up/print/letter-head.html)
 
 #### To "attach as web-link"
 

erpnext/docs/user/manual/en/setting-up/setup-wizard/step-7-tax-details.md

@@ -17,6 +17,6 @@ A value added tax (VAT) is a form of consumption tax. From the perspective of th
 
 The purpose of VAT is to generate tax revenues to the government similar to the corporate income tax or the personal income tax. For Example: When you shop at a departmental store and avail discount on the products, the store charges you 5% extra on the total bill as the VAT.
 
-To setup VAT in the setup wizard , simply enter the percentage amount levied by your government. To setup VAT at a later stage read [setting-up-taxes]({{docs_base_url}}/user/guides/setting-up/setting-up-taxes.html)
+To setup VAT in the setup wizard , simply enter the percentage amount levied by your government. To setup VAT at a later stage read [setting-up-taxes]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html)
 
 {next}

erpnext/docs/user/manual/en/setting-up/setup-wizard/step-8-customer-names.md

@@ -18,6 +18,6 @@ Customer Name: American Power Mills
 
 Contact Name:  Shiv Agarwal
 
-To understand Customer in detail visit [Customer Details]({{docs_base_url}}/user/guides/CRM/customer.html)
+To understand Customer in detail visit [Customer Details]({{docs_base_url}}/user/manual/en/CRM/customer.html)
 
 {next}

erpnext/docs/user/manual/en/setting-up/setup-wizard/step-9-suppliers.md

@@ -7,6 +7,6 @@ src="{{docs_base_url}}/assets/img/setup-wizard/step-9.png">
 
 ---
 
-To understand Suppliers in detail visit [Supplier Master]({{docs_base_url}}/user/guides/buying/supplier-master.html)
+To understand Suppliers in detail visit [Supplier Master]({{docs_base_url}}/user/manual/en/buying/supplier-master.html)
 
 {next}

erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md

@@ -28,7 +28,7 @@ Permissions are applied on a combination of:
 	If enabled, a user with that role will be able to access only specific Documents for that Document Type. Such specific Document access is defined in the list of User Permissions. Additionally, User Permissions defined for other Document Types also get applied if they are related to the current Document Type through Link Fields.
 
 	To set, User Permissions go to:
-    > Setup > Permissions > [User Permissions Manager]({{docs_base_url}}/user/guides/setting-up/users-and-permissions/user-permissions.html)
+    > Setup > Permissions > [User Permissions Manager]({{docs_base_url}}/user/manual/en/setting-up/users-and-permissions/user-permissions.html)
 
 ---
 

erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.md

@@ -19,7 +19,7 @@ balance. This improves accuracy of Balance Sheet and Profit and Loss
 statement.
 
 To check accounting entries for a particular stock transaction, please check
-[examples]({{docs_base_url}}/user/guides/stock/accounting-of-inventory-stock/perpetual-inventory.html)
+[examples]({{docs_base_url}}/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.html)
 
 #### **Advantages**
 
@@ -64,6 +64,6 @@ This complete process is called Periodic Inventory.
 
 If you are an existing user using Periodic Inventory and want to use Perpetual
 Inventory, you have to follow some steps to migrate. For details, check
-[Migration From Periodic Inventory]({{docs_base_url}}/user/guides/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.html).
+[Migration From Periodic Inventory]({{docs_base_url}}/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.html).
 
 {next}

erpnext/docs/user/manual/en/stock/delivery-note.md

@@ -22,7 +22,7 @@ details are carried over from your Sales Order.
 
 ### Shipping Packets or Items with Product Bundle
 
-If you are shipping Items that have a [Product Bundle]({{docs_base_url}}/user/guides/selling/setup/sales-bom.html), ERPNext will automatically
+If you are shipping Items that have a [Product Bundle]({{docs_base_url}}/user/manual/en/selling/setup/sales-bom.html), ERPNext will automatically
 create a “Packing List” table for you based on the sub-Items in that Item.
 
 If your Items are serialized, then for Product Bundle type of Items, you will have

erpnext/docs/user/manual/en/stock/index.txt

@@ -14,7 +14,5 @@ setup
 sales-return
 purchase-return
 articles
-item-price
-item-valuation-fifo-and-moving-average
 opening-stock
 stock-how-to

erpnext/docs/user/manual/en/stock/item/index.md

@@ -5,11 +5,11 @@ ERPNext is optimized for itemized management of your sales and purchase. If you
 ## Item Properties
 
   * **Item Name:** Item name is the actual name of your product or service.
-  * **Item Code:** Item Code is a short-form to denote your Item. If you have very few Items, it is advisable to keep the Item Name and the Item Code same. This helps new users to recognise and update Item details in all transactions. In case you have lot of Items with long names and the list runs in hundreds, it is advisable to code. To understand naming Item codes see [Item Codification]({{docs_base_url}}/user/guides/stock/item/item-codification.html)
-  * **Item Group:** Item Group is used to categorize an Item under various criterias like products, raw materials, services, sub-assemblies, consumables or all Item groups. Create your default Item Group list under Setup> Item Group and pre-select the option while filling your New Item details under [Item Group]({{docs_base_url}}/user/guides/stock/setup/item-group.html)
+  * **Item Code:** Item Code is a short-form to denote your Item. If you have very few Items, it is advisable to keep the Item Name and the Item Code same. This helps new users to recognise and update Item details in all transactions. In case you have lot of Items with long names and the list runs in hundreds, it is advisable to code. To understand naming Item codes see [Item Codification]({{docs_base_url}}/user/manual/en/stock/item/item-codification.html)
+  * **Item Group:** Item Group is used to categorize an Item under various criterias like products, raw materials, services, sub-assemblies, consumables or all Item groups. Create your default Item Group list under Setup> Item Group and pre-select the option while filling your New Item details under [Item Group]({{docs_base_url}}/user/manual/en/stock/setup/item-group.html)
   * **Default Unit of Measure:** This is the default measuring unit that you will use for your product. It could be in nos, kgs, meters, etc. You can store all the UOM’s that your product will require under Set Up> Master Data > UOM. These can be preselected while filling New Item by using % sign to get a pop up of the UOM list.
   * **Brand:** If you have more than one brand save them under Set Up> Master Data> Brand and pre-select them while filling a New Item.
-  * **Variant:** A Item Variant is a different version of a Item.To learn more about managing varaints see [Item Variants]({{docs_base_url}}/user/guides/stock/item/item-variants.html)
+  * **Variant:** A Item Variant is a different version of a Item.To learn more about managing varaints see [Item Variants]({{docs_base_url}}/user/manual/en/stock/item/item-variants.html)
   
 ### Upload an Image
 
@@ -34,7 +34,7 @@ These numbers help to track individual units or batches of Items which you sell.
 
 > Important: Once you mark an item as serialized or batched or neither, you cannot change it after you have made any stock entry.
 
-  * [Discussion on Serialized Inventory]({{docs_base_url}}/user/guides/setting-up/stock-reconciliation-for-non-serialized-item.html)  
+  * [Discussion on Serialized Inventory]({{docs_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html)  
 
 ### Re Ordering
 
@@ -50,7 +50,7 @@ tax Account, “VAT 10%” and this particular Item is exempted from tax, then y
 select “VAT 10%” in the first column, and set “0” as the tax rate in the
 second column.
 
-Go to [Setting Up Taxes]({{docs_base_url}}/user/guides/setting-up/setting-up-taxes.html) to understand this topic in detail.
+Go to [Setting Up Taxes]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html) to understand this topic in detail.
 
 ### Inspection
 
@@ -86,6 +86,8 @@ Length, Finish etc.
 
 ![Manufacturing]({{docs_base_url}}/assets/old_images/erpnext/item-manufacturing-website.png)
 
-Visit [Manufacturing]({{docs_base_url}}/user/guides/manufacturing.html) and [Website ]({{docs_base_url}}/user/guides/website.html)to understand these topics in detail.
+Visit [Manufacturing]({{docs_base_url}}/user/manual/en/manufacturing.html) and [Website ]({{docs_base_url}}/user/manual/en/website.html)to understand these topics in detail.
 
-{next}
+### Learn more about Item
+
+{index}

erpnext/docs/user/manual/en/stock/item/index.txt

@@ -1,6 +1,6 @@
+item-price
 item-codification
 item-variants
-purchase-details.md
-reorder.md
-purchase-details.md
-reorder.md
+purchase-details
+reorder
+item-valuation-fifo-and-moving-average

erpnext/docs/user/manual/en/stock/item/item-variants.md

@@ -21,4 +21,4 @@ To create 'Item Variants' against a 'Template' select 'Make Variants'
 
 <img class="screenshot" alt="Make Variants" src="{{docs_base_url}}/assets/img/stock/make-variant-1.png">
 
-To learn more about setting Attributes Master check [Item Attributes]({{docs_base_url}}/user/guides/stock/setup/item-attribute.html)
+To learn more about setting Attributes Master check [Item Attributes]({{docs_base_url}}/user/manual/en/stock/setup/item-attribute.html)

erpnext/docs/user/manual/en/stock/material-request.md

@@ -16,7 +16,7 @@ A Material Request can be generated:
   * Automatically from a Sales Order.
   * Automatically when the Projected Quantity of an Item in stores reaches a particular level.
   * Automatically from your Bill of Materials if you use Production Plan to plan your manufacturing activities.
-  * If your Items are inventory items, you must also mention the Warehouse where you expect these Items to be delivered. This helps to keep track of the [Projected Quantity]({{docs_base_url}}/user/guides/stock/projected-quantity.html) for this Item.
+  * If your Items are inventory items, you must also mention the Warehouse where you expect these Items to be delivered. This helps to keep track of the [Projected Quantity]({{docs_base_url}}/user/manual/en/stock/projected-quantity.html) for this Item.
 
 A Material Request can be of type:
 

erpnext/docs/user/manual/en/stock/opening-stock.md

@@ -10,6 +10,6 @@ In both cases, you should enter "Difference/Expense Account" as **Temporary Open
 
 If you are not making opening Stock Entry, you can select "Stock Adjustment" account in Difference/Expense Account field which is an expense account.
 
-To understand Opening Stock for serialzed Items visit [Stock Reconciliation]({{docs_base_url}}/user/guides/setting-up/stock-reconciliation-for-non-serialized-item.html)
+To understand Opening Stock for serialzed Items visit [Stock Reconciliation]({{docs_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html)
 
 {next}

erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md

@@ -14,6 +14,6 @@ be added in the right sidebar.
 
 ### Tags
 
-[Read more about Tags]({{docs_base_url}}/user/guides/collaboration-tools/tags.html)  
+[Read more about Tags]({{docs_base_url}}/user/manual/en/collaboration-tools/tags.html)  
 
 {next}

erpnext/docs/user/manual/en/website/setup/website-settings.md

@@ -4,7 +4,7 @@ Most of the website related settings can be defined here.
 
 ####Landing Page
 
-* Home Page: You can specify which [Web Page]({{docs_base_url}}/user/guides/website/web-page.html) must be the homepage of the website
+* Home Page: You can specify which [Web Page]({{docs_base_url}}/user/manual/en/website/web-page.html) must be the homepage of the website
 
 * Home Page is Products: if Checked, the Home page will be the default Item Group for the website.