+
+{index}
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/CRM/.txt b/erpnext/docs/current/models/home/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/CRM/.txt
rename to erpnext/docs/current/models/home/index.txt
diff --git a/erpnext/docs/current/models/hr/appraisal.html b/erpnext/docs/current/models/hr/appraisal.html
index 73f95788c6..56dc3fcdff 100644
--- a/erpnext/docs/current/models/hr/appraisal.html
+++ b/erpnext/docs/current/models/hr/appraisal.html
@@ -7,7 +7,7 @@
Public API
- /api/method/erpnext.hr.doctype.leave_application.leave_application.get_leave_balance
+ /api/method/erpnext.hr.doctype.leave_application.leave_application.get_leave_balance_on
Public API
- /api/method/erpnext.hr.doctype.leave_application.leave_application.get_total_leave_days
+ /api/method/erpnext.hr.doctype.leave_application.leave_application.get_number_of_leave_days
Detailed explanation for all ERPNext features and developer API
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
ERPNext is a fully featured ERP system designed for Small and Medium Sized
+business. ERPNext covers a wide range of features including Accounting, CRM,
+Inventory management, Selling, Purchasing, Manufacturing, Projects, HR &
+Payroll, Website, E-Commerce and much more.
+
+
ERPNext is based on the Frappe Framework is highly customizable and extendable.
+You can create Custom Form, Fields, Scripts and can also create your own Apps
+to extend ERPNext functionality.
+
+
ERPNext is Open Source under the GNU General Public Licence v3 and has been
+listed as one of the Best Open Source Softwares in the world by my online
+blogs.
+
+
+
+
+
+
+
+
+
+
+
Install
+
From your site
+
To install this app, login to your site and click on "Installer". Search for ERPNext and click on "Install"
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/index.txt b/erpnext/docs/index.txt
index a98dc96889..2ae026e74c 100644
--- a/erpnext/docs/index.txt
+++ b/erpnext/docs/index.txt
@@ -1,6 +1,9 @@
-user
assets
contents
+contents
current
+index
install
-license
\ No newline at end of file
+license
+license
+user
\ No newline at end of file
diff --git a/erpnext/docs/license.md b/erpnext/docs/license.md
new file mode 100644
index 0000000000..b0310f64f2
--- /dev/null
+++ b/erpnext/docs/license.md
@@ -0,0 +1,184 @@
+
+
+
GNU General Public License (v3)
+
+
ERPNext License Info
+
+
(c) 2013 Frappe Technologies Pvt Ltd. Mumbai
+ERPNext is a trademark of Frappe Technologies
+
+
The ERPNext code is licensed under the GNU General Public License (v3) as mentioned below and the Documentation is licensed under Creative Commons (CC-BY-SA-3.0)
+
+
GNU GENERAL PUBLIC LICENSE
+
+
Version 3, 29 June 2007
+
+
http://www.gnu.org/copyleft/gpl.html
+
+
TERMS AND CONDITIONS
+0. Definitions.
+
+
“This License” refers to version 3 of the GNU General Public License.
+
+
“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
+
+
“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations.
+
+
To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work.
+
+
A “covered work” means either the unmodified Program or a work based on the Program.
+
+
To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
+
+
To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
+
+
An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
+1. Source Code.
+
+
The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work.
+
+
A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
+
+
The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
+
+
The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
+
+
The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
+
+
The Corresponding Source for a work in source code form is that same work.
+2. Basic Permissions.
+
+
All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
+
+
You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
+
+
Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
+3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+
No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
+
+
When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
+4. Conveying Verbatim Copies.
+
+
You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
+
+
You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
+5. Conveying Modified Source Versions.
+
+
You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
+
+
a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
+b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”.
+c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
+d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
+
+
+
A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
+6. Conveying Non-Source Forms.
+
+
You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
+
+
a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
+b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
+c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
+d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
+e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
+
+
+
A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
+
+
A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
+
+
“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
+
+
If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
+
+
The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
+
+
Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
+7. Additional Terms.
+
+
“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
+
+
When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
+
+
Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
+
+
a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
+b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
+c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
+d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
+e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
+f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
+
+
+
All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
+
+
If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
+
+
Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
+8. Termination.
+
+
You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
+
+
However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
+
+
Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
+
+
Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
+9. Acceptance Not Required for Having Copies.
+
+
You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
+10. Automatic Licensing of Downstream Recipients.
+
+
Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
+
+
An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
+
+
You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
+11. Patents.
+
+
A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”.
+
+
A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
+
+
Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
+
+
In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
+
+
If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
+
+
If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
+
+
A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
+
+
Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
+12. No Surrender of Others' Freedom.
+
+
If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
+13. Use with the GNU Affero General Public License.
+
+
Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
+14. Revised Versions of this License.
+
+
The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+
Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.
+
+
If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
+
+
Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
+15. Disclaimer of Warranty.
+
+
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+16. Limitation of Liability.
+
+
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+17. Interpretation of Sections 15 and 16.
+
+
If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.
+
+
END OF TERMS AND CONDITIONS
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/temp.py b/erpnext/docs/temp.py
new file mode 100644
index 0000000000..0cddeaa670
--- /dev/null
+++ b/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
diff --git a/erpnext/docs/user/guides/CRM/contact.md b/erpnext/docs/user/guides/CRM/contact.md
deleted file mode 100644
index bedd33248d..0000000000
--- a/erpnext/docs/user/guides/CRM/contact.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Contacts and Addresses in ERPNext are stored separately so that you can
-attach multiple Contacts or Addresses to Customers and Suppliers.
-
-To create a new Contact go to ,
-
-> CRM > Contact > New
-
-
-
-Or you can add a Contact or Address directly from the Customer record, click on “New
-Contact” or “New Address”.
-
-
-
-> Tip: When you select a Customer in any transaction, one Contact and Address
-gets pre-selected. This is the “Default Contact or Address”.
-
-To Import multiple Contacts and Addresses from a spreadsheet, use the Data
-Import Tool.
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/CRM/setup/campaign.md b/erpnext/docs/user/guides/CRM/setup/campaign.md
deleted file mode 100644
index 36b55c3e12..0000000000
--- a/erpnext/docs/user/guides/CRM/setup/campaign.md
+++ /dev/null
@@ -1,20 +0,0 @@
-A Campaign is a full-scale implementation of a sales strategy to promote a
-product or a service. This is done in a market segment of a particular
-geographical area, to achieve specified objectives.
-
-
-
-You can track [Lead]({{url_prefix}}/user/guides/crm/lead.html), [Opportunity]({{url_prefix}}/user/guides/crm/opportunity.html), [Quotation]({{url_prefix}}/user/guides/selling/quotation.html) against a campaign.
-
-###Track Leads against Campaign
-
-* To track a 'Lead' against a campaign select 'View Leads'.
-
-
-
-* You shall get a filtered list of all leads made against that campaign.
-* You can also create new leads by clicking 'New'
-
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/customer-portal/issues.md b/erpnext/docs/user/guides/customer-portal/issues.md
deleted file mode 100644
index 478e1b9e1b..0000000000
--- a/erpnext/docs/user/guides/customer-portal/issues.md
+++ /dev/null
@@ -1,22 +0,0 @@
-The customer portal makes it very easy for a customer to raise concerns. A
-simple and intuitive interface facilitates your customer to report their
-concerns as Issues. They can view the complete thread of their
-conversation.
-
-#### Empty Ticket List
-
-
-
-#### New Issue
-
-
-
-#### Open Issue
-
-
-
-#### Reply on Issue
-
-
-
-{next}
diff --git a/erpnext/docs/user/guides/human-resources/human-resources-reports.md b/erpnext/docs/user/guides/human-resources/human-resources-reports.md
deleted file mode 100644
index 20d792b319..0000000000
--- a/erpnext/docs/user/guides/human-resources/human-resources-reports.md
+++ /dev/null
@@ -1,34 +0,0 @@
-Human Resources Reports
-
-### Employee Leave Balance
-
-Employee Leave Balance Report shows employees and their respective balance leaves under various leave types. Report is generated as per the number of allowed leaves.
-
-
-
-### Employee Birthday
-
-Employee Birthday Report shows Birthdays of your employees.
-
-
-
-### Employee Information
-
-Employee Information Report shows Report View of important information recorded in Employee master.
-
-
-
-### Monthly Salary Register
-
-Monthly Salary Register shows net pay and its components of employee(s) at a glance.
-
-
-
-
-### Monthly Attendance Sheet
-
-Monthly Attendance Sheet shows monthly attendance of selected employee at a glance.
-
-
-
-{next}
diff --git a/erpnext/docs/user/guides/human-resources/introduction-to-human-resources.md b/erpnext/docs/user/guides/human-resources/introduction-to-human-resources.md
deleted file mode 100644
index 8d4da2fedb..0000000000
--- a/erpnext/docs/user/guides/human-resources/introduction-to-human-resources.md
+++ /dev/null
@@ -1,11 +0,0 @@
-The Human Resources (HR) Module covers the processes linked to managing a team
-of co-workers. Most important feature here is processing the payroll by using
-Process Payroll to generate Salary Slips. Most countries have complex tax
-rules stating which expenses the company can make on behalf of the Employees.
-There are a set of rules for the company to deduct taxes and social security
-from employee payroll. ERPNext allows to accomodate all types of taxes and
-their calculation.
-
-It also maintains a complete employee database including contact information,
-salary details, attendance, performance evaluation, and appraisal records.
-
diff --git a/erpnext/docs/user/guides/human-resources/setup/branch.md b/erpnext/docs/user/guides/human-resources/setup/branch.md
deleted file mode 100644
index 9fc71d534d..0000000000
--- a/erpnext/docs/user/guides/human-resources/setup/branch.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Branches of your organization
-
-
-
-{next}
diff --git a/erpnext/docs/user/guides/human-resources/setup/department.md b/erpnext/docs/user/guides/human-resources/setup/department.md
deleted file mode 100644
index 8376626751..0000000000
--- a/erpnext/docs/user/guides/human-resources/setup/department.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Departments in your organization
-
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/setup/designation.md b/erpnext/docs/user/guides/human-resources/setup/designation.md
deleted file mode 100644
index c8af1069b7..0000000000
--- a/erpnext/docs/user/guides/human-resources/setup/designation.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Designations in your organization
-
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/setup/employment-type.md b/erpnext/docs/user/guides/human-resources/setup/employment-type.md
deleted file mode 100644
index 84b6aad470..0000000000
--- a/erpnext/docs/user/guides/human-resources/setup/employment-type.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Various employment contracts you have with your employees.
-
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/setup/holiday-list.md b/erpnext/docs/user/guides/human-resources/setup/holiday-list.md
deleted file mode 100644
index ea64cdfa45..0000000000
--- a/erpnext/docs/user/guides/human-resources/setup/holiday-list.md
+++ /dev/null
@@ -1,5 +0,0 @@
-You can specify the Holidays for a particular year using Holiday List.
-
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/setup/hr-settings.md b/erpnext/docs/user/guides/human-resources/setup/hr-settings.md
deleted file mode 100644
index f349fc74f1..0000000000
--- a/erpnext/docs/user/guides/human-resources/setup/hr-settings.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# HR Settings
-
-GLobal settings for HR related documents
-
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/setup/leave-allocation.md b/erpnext/docs/user/guides/human-resources/setup/leave-allocation.md
deleted file mode 100644
index 985b0c0e61..0000000000
--- a/erpnext/docs/user/guides/human-resources/setup/leave-allocation.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Helps you allocate Leaves to a particular Employee
-
-
-
-To assign leaves to multiple employees use the [Leave Allocation Tool]({{url_prefix}}/user/guides/human-resources/tools/leave-allocation-tool.html)
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/tools/leave-allocation-tool.md b/erpnext/docs/user/guides/human-resources/tools/leave-allocation-tool.md
deleted file mode 100644
index a1fa8018fe..0000000000
--- a/erpnext/docs/user/guides/human-resources/tools/leave-allocation-tool.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Leave Allocation tool helps you allocated a specific number of leaves for your employees.
-
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/index.md b/erpnext/docs/user/guides/index.md
deleted file mode 100644
index 454b4a834f..0000000000
--- a/erpnext/docs/user/guides/index.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# User Manual
-
-{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/projects/introduction-to-projects.md b/erpnext/docs/user/guides/projects/introduction-to-projects.md
deleted file mode 100644
index 85a67b94f7..0000000000
--- a/erpnext/docs/user/guides/projects/introduction-to-projects.md
+++ /dev/null
@@ -1,10 +0,0 @@
-ERPNext helps you manage your Projects by breaking them into Tasks and
-allocating them to different people.
-
-Purchasing and selling can also be tracked against Projects and this can help
-the company keep tabs on its budget, delivery and profitability for a Project.
-
-Projects can be used to manage internal projects, manufacturing jobs or
-service jobs. For service jobs, Time Sheets can also be created that can be
-used to bill Customers if billing is done on a Time & Money basis.
-
diff --git a/erpnext/docs/user/guides/projects/project.md b/erpnext/docs/user/guides/projects/project.md
deleted file mode 100644
index 9b265c0abb..0000000000
--- a/erpnext/docs/user/guides/projects/project.md
+++ /dev/null
@@ -1,87 +0,0 @@
-Project management in ERPNext is Task driven. You can create Project and assign multiple Tasks against it.
-
-
-
-### Managing tasks
-Project can be divided into multiple Tasks.
-Task can be created via Project document itself or can be created via [Task]({{url_prefix}}/user/guides/projects/tasks.html)
-
-
-
-* To view Task made against a Project click on 'Tasks'
-
-
-
-
-
-* You can also view the Tasks from the Project document itself
-
-
-
-### Managing time
-
-ERPNext uses [Time Log]({{url_prefix}}/user/guides/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.
-
-* To view Time Log made against a Project click on 'Time Logs'
-
-
-
-
-
-* You can also create a Time Log directlly and link it to the Project.
-
-
-
-### Managing expenses
-
-You can book [Expense Claim]({{url_prefix}}/user/guides/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'
-
-
-
-* You can also create a Expense Claims directlly and link it to the Project.
-
-
-
-* Total amount of Expense Claims booked against a project is shown under 'Total Expense Claim' in the Project Costing Section
-
-
-
-### Cost Center
-
-You can make a [Cost Center]({{url_prefix}}/user/guides/accounts/setup/cost-center.html) against a Project or use an existing cost center to track all expenses made against that project.
-
-
-
-###Project Costing
-
-The Project Costing section helps you track the time and expenses incurred against the project.
-
-
-
-* The Costing Section is updated based on Time Logs made.
-
-* Gross Margin is the difference between Total Costing Amount and Total Billing Amount
-
-###Billing
-
-You can make/link a [Sales Order]({{url_prefix}}/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.
-
-
-
-###Gantt Chart
-
-A Gantt Chart illustrates a project schedule.
-ERPNext gives you a illustrated view of tasks scheduled against that project in Gantt Chart View.
-
-* To view gantt chart against a project, go to that project and click on 'Gantt Chart'
-
-
-
-
-
-{next}
diff --git a/erpnext/docs/user/guides/selling/setup/index.txt b/erpnext/docs/user/guides/selling/setup/index.txt
deleted file mode 100644
index 245c1a90bd..0000000000
--- a/erpnext/docs/user/guides/selling/setup/index.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-selling-settings
-sales-partner
-shipping-rule
-product-bundle
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/setting-up/email/sending-email.md b/erpnext/docs/user/guides/setting-up/email/sending-email.md
deleted file mode 100644
index 61a76c5807..0000000000
--- a/erpnext/docs/user/guides/setting-up/email/sending-email.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Sending Email from any Document
-
-In ERPNext you can send any document as email (with a PDF attachment) by clicking on `Menu > Email` from any open document.
-
-
-
-**Note:** You must have outgoing [email accounts]({{url_prefix}}/user/guides/setting-up/email/email-account.html) setup for this.
-
-{next}
diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-9-suppliers.md b/erpnext/docs/user/guides/setting-up/setup-wizard/step-9-suppliers.md
deleted file mode 100644
index 48bca9484a..0000000000
--- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-9-suppliers.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Step 8: Suppliers
-
-Enter a few of your Suppliers' names.
-
-
-
----
-
-To understand Suppliers in detail visit [Supplier Master]({{url_prefix}}/user/guides/buying/supplier-master.html)
-
-{next}
diff --git a/erpnext/docs/user/guides/stock/installation-note.md b/erpnext/docs/user/guides/stock/installation-note.md
deleted file mode 100644
index c4e3bc0fae..0000000000
--- a/erpnext/docs/user/guides/stock/installation-note.md
+++ /dev/null
@@ -1,5 +0,0 @@
-You can use installation note to record the instalation of a product having a serial number.
-
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/stock/item/index.txt b/erpnext/docs/user/guides/stock/item/index.txt
deleted file mode 100644
index deaa805147..0000000000
--- a/erpnext/docs/user/guides/stock/item/index.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-item-codification
-item-variants
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/stock/setup/stock-settings.md b/erpnext/docs/user/guides/stock/setup/stock-settings.md
deleted file mode 100644
index 409037a1e8..0000000000
--- a/erpnext/docs/user/guides/stock/setup/stock-settings.md
+++ /dev/null
@@ -1,5 +0,0 @@
-You can set default settings for your stock related transactions here.
-
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/website/index.txt b/erpnext/docs/user/guides/website/index.txt
deleted file mode 100644
index cf794db006..0000000000
--- a/erpnext/docs/user/guides/website/index.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-web-page
-blog-post
-web-form
-blogger
-setup
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/website/introduction-to-website.md b/erpnext/docs/user/guides/website/introduction-to-website.md
deleted file mode 100644
index 82f95cb872..0000000000
--- a/erpnext/docs/user/guides/website/introduction-to-website.md
+++ /dev/null
@@ -1,27 +0,0 @@
-Websites are a core component of any business and having a good website
-usually means:
-
- * Invest lot of money.
- * Difficult to update.
- * Not interactive.
-
-Unless you are a web designer yourself.
-
-Wouldn't it be nice if there was a way to update your product catalog on your
-site automatically from your ERP?
-
-We thought exactly the same and hence built a small Website Development app
-right inside ERPNext! Using ERPNext’s Website module, you can
-
- 1. Create Web Pages
- 2. Write a Blog
- 3. Publish your Product Catalog using the Item master
-
-We will soon be adding a shopping cart facility so that your customers can
-place orders and pay you online!
-
-Though not necessary, to make a good website, you might have to know a bit of
-HTML / CSS or hire the services of a professional. The good part is that once
-this is setup, you can add and edit content, blogs and products directly from
-your ERP.
-
diff --git a/erpnext/docs/user/guides/website/product-listing-on-website.md b/erpnext/docs/user/guides/website/product-listing-on-website.md
deleted file mode 100644
index 0acc8fae93..0000000000
--- a/erpnext/docs/user/guides/website/product-listing-on-website.md
+++ /dev/null
@@ -1,68 +0,0 @@
-### Listing Item on Website
-
-To list your Item on the Website, fill the Item details and save the file.
-Once the file is saved, a plus (+) button will appear next to the Image icon.
-Click on the plus button and add your Item image. The html code will be
-generated automatically.
-
-##### Step 1: Save Image
-
-
-
-
-
-##### Step 2: Check the 'Show in Website' box.
-
-Under the Website section, please check the box that says 'show in Website'.
-Once the box is checked, the page will display other fields for entering
-information.
-
-
-
-
-
-##### Step 3: Enter Website Details
-
-
-
-The page name will be generated automatically. Mention the Item-Group under
-which the Item will be displayed.
-
-#### Item Groups
-
-Mention the Item Group under this column. If you wish to list your Item under
-the broad category products, name your Item Group as Products. In case you
-have various varieties of Item and want to classify them under different
-names, make Item Groups with those names and check the box that says 'show in
-Website'. For Example, if you wish to create a category called 'Bags', create
-a Item Group named Bags.
-
-
-
-Once the Item Group is created go to the Website Settings page under Website.
-Enter the Label, Url, and Parent Label.
-
-
-
-
-
-#### Webpage labels
-
-
-
-Add more Items under a particular Item Group.
-
-To add more Items under a certain Label, mention the Item Group on the Item
-Page. The Items will be added automatically on the Webpage, under the Item
-Group Label. For Example, To add Item-Kiddies Bag and Butterfly Print Bag,
-check the 'Show in Website'box. The Items will be placed under the Label Bags
-on the Webpage.
-
-
-
-
-
-Item Group Display
-
-
-
diff --git a/erpnext/docs/user/guides/website/styling-the-website.md b/erpnext/docs/user/guides/website/styling-the-website.md
deleted file mode 100644
index 60af9bc51a..0000000000
--- a/erpnext/docs/user/guides/website/styling-the-website.md
+++ /dev/null
@@ -1,23 +0,0 @@
-You can set some basic styles to your page using the styles feature.
-
-#### Background
-
-You can either set a solid background by selecting a color. You can attach a
-file and select it in the “Background Image” box.
-
-#### Fonts
-
-Fonts: Font family of your body text (includes some Open Source fonts). Font-
-size: Font-size of your website body text (large is good). Heading Font: Font
-family of your headings.
-
-Apart from this you can also add custom style rules using CSS
-
-#### Custom CSS
-
-There are tons of CSS rules and tricks that fall out of scope of this manual.
-But you could add your own style to certain elements like h1, h2 etc and also
-create your own style classes that you can use in elements in your body
-content.
-
-{next}
diff --git a/erpnext/docs/user/index.txt b/erpnext/docs/user/index.txt
index 8d9bd8a897..f5c0c058f7 100644
--- a/erpnext/docs/user/index.txt
+++ b/erpnext/docs/user/index.txt
@@ -1,2 +1,2 @@
-guides
+manual
videos
diff --git a/erpnext/docs/user/manual/en/CRM/contact.md b/erpnext/docs/user/manual/en/CRM/contact.md
new file mode 100644
index 0000000000..83757e0c29
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/contact.md
@@ -0,0 +1,47 @@
+# Contact and Address
+
+Contacts are not necessarily linked to another document. They can be stand alone, just a Contact with a First Name not linked to any other document or
+Contacts can be linked to a Party, that is either a Customer or a Supplier.
+
+The Contact_ID is automatically created:
+
+1. If only a First Name is entered that First Name defines the ID , thus First name (only)
+2. If a First Name and a Party is linked the ID becomes “FirstName-Party”
+
+Contacts can, but do not have to be linked, to: User, Customer, Supplier, and Sales Partner. Since Customers and Addresses are not directly linked to a User, all links go via Contacts.
+
+A Contact can be linked to the (web) user. If that user is also a Customer, it is linked to the Customer by the Customer ID
+
+Contacts and Addresses in ERPNext are stored separately so that you can
+attach multiple Contacts or Addresses to Customers and Suppliers.
+
+To create a new Contact go to,
+
+> CRM > Contact > New
+
+
+
+Or you can add a Contact or Address directly from the Customer record, click on “New
+Contact” or “New Address”.
+
+
+
+> Tip: When you select a Customer in any transaction, one Contact and Address
+gets pre-selected. This is the “Default Contact or Address”.
+
+To Import multiple Contacts and Addresses from a spreadsheet, use the Data
+Import Tool.
+
+---
+
+### Address Titles
+
+The Address Title (Name of person or organization that this address belongs to) is a free format unlinked field. The ID is automatically created from the Address Title upper score Address Type. (AdressTitle-AddressType).
+
+### Address Linking
+
+Addresses can be entered individually (unlinked) or linked to customers, leads, suppliers or Sales Partners.
+
+Linking is done in the reference section where the links can be established.
+
+(Contributed by Robert Becht)
diff --git a/erpnext/docs/user/guides/CRM/customer.md b/erpnext/docs/user/manual/en/CRM/customer.md
similarity index 73%
rename from erpnext/docs/user/guides/CRM/customer.md
rename to erpnext/docs/user/manual/en/CRM/customer.md
index 82c6ff9746..90a4228c18 100644
--- a/erpnext/docs/user/guides/CRM/customer.md
+++ b/erpnext/docs/user/manual/en/CRM/customer.md
@@ -3,13 +3,15 @@ who receives goods, services, products, or ideas, from a seller for a monetary
consideration. A customer can also receive goods or services from a vendor or
a supplier for other valuable considerations.
+A customer is uniquely identified by the Customer ID. Normally this ID is identical to the customer Full Name, but in case of duplicate Full Name, a Name-1 is created as ID.
+
You can either directly create your Customers via
> Selling > Customer
or upload it via the Data Import Tool.
-
+
> Note: Customers are separate from Contacts and Addresses. A Customer can
have multiple Contacts and Addresses.
@@ -19,7 +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]({{url_prefix}}/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/manual/en/crm/contact.html)
### Integration with Accounts
@@ -48,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]({{url_prefix}}/user/guides/crm/setup/customer-group.html)
-and also divide them into [Territories]({{url_prefix}}/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]({{url_prefix}}/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
diff --git a/erpnext/docs/user/guides/CRM/index.md b/erpnext/docs/user/manual/en/CRM/index.md
similarity index 100%
rename from erpnext/docs/user/guides/CRM/index.md
rename to erpnext/docs/user/manual/en/CRM/index.md
diff --git a/erpnext/docs/user/guides/CRM/index.txt b/erpnext/docs/user/manual/en/CRM/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/CRM/index.txt
rename to erpnext/docs/user/manual/en/CRM/index.txt
diff --git a/erpnext/docs/user/guides/CRM/lead.md b/erpnext/docs/user/manual/en/CRM/lead.md
similarity index 64%
rename from erpnext/docs/user/guides/CRM/lead.md
rename to erpnext/docs/user/manual/en/CRM/lead.md
index f754c549a1..8bcbc0574a 100644
--- a/erpnext/docs/user/guides/CRM/lead.md
+++ b/erpnext/docs/user/manual/en/CRM/lead.md
@@ -16,11 +16,15 @@ this conversation to enable another person who may have to follow-up on that
contact. The new person is then able to know the history of that particular
Lead.
+---
+
+Leads are the entities constituting a first contact. Leads can be created by a system users or by a web-user. When a lead is created minimal info (name,email) is entered and the lead is (default) linked to the active system user, the owner of the lead A user configurable drop list is used to classify Status of the lead (Open, Replied etc)
+
To create a Lead, go to:
> Selling > Lead > New Lead
-
+
ERPNext gives you a lot of options you may want to store about your Leads. For
example what is the source, how likely are they to give you business etc. If
@@ -43,4 +47,14 @@ button. Once the Customer is created, the Lead becomes “Converted” and any
further Opportunities from the same source can be created against the
Customer.
+---
+
+### Creation via Portal
+
+If a someone creates an account through the website interface is Lead is automatically created, status is Open and the Owner is the webuser.
+
+After registration the webform Addresses is called, where the web user can enter address information.The address is linked to the lead using the **Lead Name-Address Type** as ID.
+
+If using the Cart functionality, items are ordered the Lead is Converted and a Customer is created using the Web-User Name. Because a Customer can only be linked to a webuser using the (foreign) ID in Contact, such contact has to be created as well.
+
{next}
diff --git a/erpnext/docs/user/guides/CRM/newsletter.md b/erpnext/docs/user/manual/en/CRM/newsletter.md
similarity index 78%
rename from erpnext/docs/user/guides/CRM/newsletter.md
rename to erpnext/docs/user/manual/en/CRM/newsletter.md
index 25cd2b0ae2..c4d9c9d864 100644
--- a/erpnext/docs/user/guides/CRM/newsletter.md
+++ b/erpnext/docs/user/manual/en/CRM/newsletter.md
@@ -12,8 +12,8 @@ see how it looks to the recepient, you can use the test function. Save the
document before testing. A test email will be sent to your email id. You can
send the email to all the intended receipients by clicking on the send button.
-
+
-
+
{next}
diff --git a/erpnext/docs/user/guides/CRM/opportunity.md b/erpnext/docs/user/manual/en/CRM/opportunity.md
similarity index 82%
rename from erpnext/docs/user/guides/CRM/opportunity.md
rename to erpnext/docs/user/manual/en/CRM/opportunity.md
index d6850c8d5c..9f44fdf04f 100644
--- a/erpnext/docs/user/guides/CRM/opportunity.md
+++ b/erpnext/docs/user/manual/en/CRM/opportunity.md
@@ -9,13 +9,13 @@ or open a “Open” Lead and click on “Create Opportunity” button.
#### Figure 1: Create Opportunity
-
+
You can also open a “Open” Lead and click on “Create Opportunity” button.
#### Figure 2: Create Opportunity from an open Lead
-
+
An Opportunity can also come from an existing Customer. You can create
multiple Opportunities against the same Lead. In Opportunity, apart from the
diff --git a/erpnext/docs/user/manual/en/CRM/setup/campaign.md b/erpnext/docs/user/manual/en/CRM/setup/campaign.md
new file mode 100644
index 0000000000..baf6ba4ec2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/setup/campaign.md
@@ -0,0 +1,20 @@
+A Campaign is a full-scale implementation of a sales strategy to promote a
+product or a service. This is done in a market segment of a particular
+geographical area, to achieve specified objectives.
+
+
+
+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
+
+* To track a 'Lead' against a campaign select 'View Leads'.
+
+
+
+* You shall get a filtered list of all leads made against that campaign.
+* You can also create new leads by clicking 'New'
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/CRM/setup/customer-group.md b/erpnext/docs/user/manual/en/CRM/setup/customer-group.md
similarity index 69%
rename from erpnext/docs/user/guides/CRM/setup/customer-group.md
rename to erpnext/docs/user/manual/en/CRM/setup/customer-group.md
index 6e6e1b95f1..007f44514b 100644
--- a/erpnext/docs/user/guides/CRM/setup/customer-group.md
+++ b/erpnext/docs/user/manual/en/CRM/setup/customer-group.md
@@ -3,12 +3,12 @@ You can also get trend analysis for each
group. Typically Customers are grouped by market segment (that is usually
based on your domain).
-
+
> Tip: If you think all this is too much effort, you can leave it at “Default
Customer Group”. But all this effort, will pay off when you start getting
reports. An example of a sample report is given below:
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/CRM/setup/index.md b/erpnext/docs/user/manual/en/CRM/setup/index.md
similarity index 100%
rename from erpnext/docs/user/guides/CRM/setup/index.md
rename to erpnext/docs/user/manual/en/CRM/setup/index.md
diff --git a/erpnext/docs/user/guides/CRM/setup/index.txt b/erpnext/docs/user/manual/en/CRM/setup/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/CRM/setup/index.txt
rename to erpnext/docs/user/manual/en/CRM/setup/index.txt
diff --git a/erpnext/docs/user/guides/CRM/setup/sales-person.md b/erpnext/docs/user/manual/en/CRM/setup/sales-person.md
similarity index 83%
rename from erpnext/docs/user/guides/CRM/setup/sales-person.md
rename to erpnext/docs/user/manual/en/CRM/setup/sales-person.md
index 4c6c0b6cbe..114003b641 100644
--- a/erpnext/docs/user/guides/CRM/setup/sales-person.md
+++ b/erpnext/docs/user/manual/en/CRM/setup/sales-person.md
@@ -3,7 +3,7 @@ chart of Sales Persons where each Sales Person’s target can be set
individually. Again as in Territory, the target has to be set against Item
Group.
-
+
####Sales Person in Transactions
diff --git a/erpnext/docs/user/guides/accounts/accounting-entries.md b/erpnext/docs/user/manual/en/accounts/accounting-entries.md
similarity index 89%
rename from erpnext/docs/user/guides/accounts/accounting-entries.md
rename to erpnext/docs/user/manual/en/accounts/accounting-entries.md
index e67d999570..7aeff24a4a 100644
--- a/erpnext/docs/user/guides/accounts/accounting-entries.md
+++ b/erpnext/docs/user/manual/en/accounts/accounting-entries.md
@@ -4,7 +4,7 @@ business.
* Mama (The Tea-stall owner) invests Rs 25000 to start the business.
-
+
__Analysis:__ Mama invested 25000 in company, hoping to get some profit. In other
words, company is liable to pay 25000 to Mama in the future. So, account
@@ -14,7 +14,7 @@ will debited.
* The company needs equipments (Stove, teapot, cups etc) and raw materials (tea, sugar, milk etc) immediately. He decides to buy from the nearest general store "Super Bazaar" who is a friend so that he gets some credit. Equipments cost him 2800 and raw materials worth of 2200. He pays 2000 out of total cost 5000.
-
+
__Analysis:__ Equipments are "Fixed Assets" (because they have a long life) of the
company and raw materials "Current Assets" (since they are used for day-to-day
@@ -25,7 +25,7 @@ Bazaar" later, so Super Bazaar will be credited by 3000.
* Mama (who takes care of all entries) decides to book sales at the end of the every day, so that he can analyze daily sales. At the end of the very first day, the tea stall sells 325 cups of tea, which gives net sales of Rs. 1575. The owner happily books his first day sales.
-
+
__Analysis:__ Income has been booked in "Sales of Tea" account which has been
credited to increase the value and the same amount will be debited to "Cash"
@@ -36,7 +36,7 @@ sold" account by same amount.
At the end of the month, the company paid the rent amount of stall (5000) and
salary of one employee (8000), who joined from the very first day.
-
+
### Booking Profit
@@ -47,7 +47,7 @@ its a liability for the company (it has to pay it to Mama). When the Balance
Sheet is not balanced i.e. Debit is not equal to Credit, the profit has not
yet been booked. To book profit, the following entry has to be made:
-
+
Explanation: Company's net sales and expenses are 40000 and 20000
respectively. So, company made a profit of 20000. To make the profit booking
diff --git a/erpnext/docs/user/guides/accounts/accounting-reports.md b/erpnext/docs/user/manual/en/accounts/accounting-reports.md
similarity index 73%
rename from erpnext/docs/user/guides/accounts/accounting-reports.md
rename to erpnext/docs/user/manual/en/accounts/accounting-reports.md
index 5026151860..61470b1579 100644
--- a/erpnext/docs/user/guides/accounts/accounting-reports.md
+++ b/erpnext/docs/user/manual/en/accounts/accounting-reports.md
@@ -7,7 +7,7 @@ and between a period. This will help you to get a full update for all entries
done in that period for that Account.
+ src="{{docs_base_url}}/assets/img/accounts/general-ledger.png">
### Trial Balance
@@ -20,7 +20,7 @@ the:
* Credits
* Closing
-
+
The sum of all closing balances in a Trial Balance must be zero.
@@ -30,7 +30,7 @@ These reports help you to track the outstanding invoices sent to Customer and
Suppliers. In this report, you will get your outstanding amounts period wise.
i.e. between 0-30 days, 30-60 days and so on.
-
+
### Sales and Purchase Register
@@ -38,6 +38,6 @@ In this report, each tax Account is transposed in columns. For each Invoice and
invoice Item, you will get the amount of individual tax that has been paid,
based on the Taxes and Charges table.
-
+
{next}
diff --git a/erpnext/docs/user/guides/accounts/advance-payment-entry.md b/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md
similarity index 86%
rename from erpnext/docs/user/guides/accounts/advance-payment-entry.md
rename to erpnext/docs/user/manual/en/accounts/advance-payment-entry.md
index fa818fbd05..042e800573 100644
--- a/erpnext/docs/user/guides/accounts/advance-payment-entry.md
+++ b/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md
@@ -24,7 +24,7 @@ the row "Is Advance" click 'Yes'.
#### Figure 1 : Journal Entry -Advance Entry
-
+
### Double Entry Accounting
@@ -41,7 +41,7 @@ will be credited because it has given value.
#### Figure 2: Transaction and Difference Entry
-
+
Save and submit the JV. If this document is not saved it will not be pulled in
other accounting documents.
@@ -55,7 +55,7 @@ advance in the advances table. The accounting will be adjusted accordingly.
#### Figure 3: Receive Advance
-
+
Save and submit the Sales Invoice.
diff --git a/erpnext/docs/user/manual/en/accounts/articles/accounting-for-projects.md b/erpnext/docs/user/manual/en/accounts/articles/accounting-for-projects.md
new file mode 100644
index 0000000000..6eba28843c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/accounting-for-projects.md
@@ -0,0 +1,72 @@
+
Accounting for Projects
+
+Accounting for the projects is tracked via Cost Center in ERPNext. This will require you creating separate Cost Center for each Project. Separate Cost Center for each Project all allow:<
+
+- Allocating budget against specific Cost Center.
+- Getting Profitability Report for each Project.
+
+Let's check steps on how Project and Cost Center should be linked, and used in the sales and purchase transactions.
+
+### 1. Linking Project and Cost Center
+
+#### 1.1 Create Project
+
+You should first create new Project from:
+
+`Projects > Project > New`
+
+In the Project, you will find field to set default Cost Center for this Project.
+
+#### 1.2 Create Cost Center
+
+Since budgeting and costing for each Project will be managed separately, you should create separate Cost Center for each Project.
+
+To create new Cost Center, go to:
+
+`Accounts > Setup > Cost Center`
+
+[Click here to learn on how to add new Cost Center](https://erpnext.com/user-guide/accounts/cost-centers-and-budgeting).
+
+#### 1.3 Update Cost Center in the Project
+
+After creating Cost Center, come back to Project master, and select Cost Center creating for this Project under Default Cost Center field.
+
+
+
+With this, you will have Cost Center being fetched automatically in the Sales and Purchase transactions based on selection of Cost Center.
+
+Let's check how this setting will affect your sales and purchase entries.
+
+### 2. Selecting Project and Cost Center in the Sales and Purchase Transactions
+
+#### 2.1 Selecting Project in the Sales Transactions
+
+In the sales transactions (which are Sales Order, Delivery Note and Sales Invoice), Project will be selected in the More Info section. On selection of a Project, respective Cost Center will be updated for all the items in that transaction.
+
+
+
+#### 2.2 Selecting Project in the Purchase Cycle Transactions
+
+In the purchase transactions, Project will be define for each item. This is because you can create a consolidated purchase entry of materials for various projects. Just like it works in sales cycle, same way in the purchase transactions, on selection of Project, its default cost center will be fetched automatically.
+
+
+
+### 3. Accounting Report for a Project
+
+#### 3.1 Projectwise Profitability
+
+Since Project's Cost Center has been updated in both sales and purchase entries made for a specific transaction, system will provide you a projectwise profitability report. Profitability for a Project will be derived based on total value income booked minus total value of expense booked where common Cost Center (of a Project) is tagged.
+
+
+
+#### 3.2 Projectwise Budgeting
+
+If you have also define budgets in the Cost Center of a Project, you will get Budget Variance Report for a Cost Center of a Project.
+
+To check Budget Variance report, go to:
+
+`Accounts > Standard Reports > Budget Variance Report`
+
+[Click here for detailed help on how to do budgeting from Cost Center](https://erpnext.com/user-guide/accounts/budgeting).
+
+
diff --git a/erpnext/docs/user/manual/en/accounts/articles/c-form.md b/erpnext/docs/user/manual/en/accounts/articles/c-form.md
new file mode 100644
index 0000000000..c2f2061475
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/c-form.md
@@ -0,0 +1,47 @@
+
C-Form
+
+C-Form functionality is only applicable for Indian customers.
+
+**What is C-Form?**
+
+C-Form is issued by the Customer. If Customer Issues C-Form, supplier applies discounted CST (central sales tax) in the invoice. C-Form is only applicable on the inter-state transactions.
+
+C-Form functionality in ERPNext allows Supplier to update C-Form No. as received from Customer in the submitted Sales Invoice. Also you can create report on Sales Invoice and track invoices for which C-Form has not yet been received from Customer.
+
+Following are step to manage C-Form related sales in ERPNext.
+
+####Set C-Form Applicability
+
+While creating Sales invoice for the customer, set C-Form applicability in Sales Invoice. In More Info section of Sales Invoice, set field called **Is C-Form Applicable** as **Yes**. Bydefault, this field will have No for a value.
+
+
+
+Updating this field as Yes will allow you to pull this Sales Invoice in the C-Form Tool, and update C-Form No. as received from the Customer.
+
+####Create C-Form Record
+
+After receiving C-Form from your Customer, you should update that C-Form no. in the Sales Invoice by creating C-Form record.
+
+Go to `Accounts > Setup > C-Form > New`
+
+Enter details like C-Form No, Received Date, State and Amount etc. Select Customer and pull related Sales Invoices under provided table.
+
+
+
+####Save & Submit C-Form
+
+After entering details, save and submit C-Form record. On save system will generate C-Form record and on submission update that C-Form No. in the Sales Invoice.
+
+
+
+C-Form serial no will be updated in related invoice under the field 'C-Form No'.
+
+
+
+####Tracking Pending Invoice for C-Form
+
+To track invoices for which C-Form has not yet been received from Customer, you can create custom report on Sales Invoice. In this report, you can filter invoices which doesn't have C-Form updated in them yet, and followup with the customer accordingly.
+
+
+
+
diff --git a/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md b/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md
new file mode 100644
index 0000000000..02cbd66fc9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md
@@ -0,0 +1,28 @@
+
Changing Parent Account
+
+Chart of Account has hierarchical structure. This means each account has a parent account defined for it. You will have few ledger preset, and few ledger (like for Customer, Supplier, Warehouse) will be auto-created based on their master record. These ledger will be placed under pre-defined groups in the Chart of Account. If needed you can place specific account under another group by changing its Parent Account.
+
+Following are the steps to edit Parent for specific Account.
+
+####1. Go to Chart of Account
+
+`Accounts > Setup > Chart of Account`
+
+Click on Account for which Parent Account is to be changed.
+
+####2. Edit Account
+
+
+
+####3. Change Parent Account
+
+Search and select preferred Parent Account and save.
+
+
+
+Refresh system from Help menu to experience the change.
+
+
+
+
Note: Change of Parent Account is not applicable for Root Accounts.
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/customer-for-multiple-company.md b/erpnext/docs/user/manual/en/accounts/articles/customer-for-multiple-company.md
new file mode 100644
index 0000000000..6770fa3dd1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/customer-for-multiple-company.md
@@ -0,0 +1,27 @@
+
Customer for Multiple Company
+
+ERPNext allows you managing multiple companies in one ERPNext account. It is possible that you will have Customer and Supplier which would belong to more than one company of yours. While creating sales and purchase transactions, system shows result of Customer and Suppliers for that Company only.
+
+It means if you have added (say) Wind Mills Limited as a customer for the first company, you will not be able to select it as a customer when creating Sales Order (or any other sales transaction) for another company.
+
+There are two approach to address this scenario.
+
+####Create Another Customer Record
+
+You should create another Customer record for Wind Mills Limited, but for the second company.
+
+If you try adding another customer with exact same name (as Wind Mills Limited), system will throw a validation message that, account already exist for Wind Mills Limited.
+
+
+
+>To be able to track customerwise receivables, ERPNext created accounting ledger for each customer in the Chart of Account, under Accounts Receivable group.
+
+As indicated in the error message, since Account Name already exist for the first customer, you should change customer name for second customer a bit (say Wind Mills Pvt. Limited) to bring uniqueness in it. Then you will be able to save Customer correctly.
+
+####Change Company in Existing Customer
+
+Since creating another Customer record for the same party will be over-load in the system, you can change company in the exist Customer master of Wind Mills Limited, and re-save it. On saving customer again, it will create another accounting ledger for Wind Mills in the Chart of Account of second company.
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/depreciation-for-fixed-asset-items.md b/erpnext/docs/user/manual/en/accounts/articles/depreciation-for-fixed-asset-items.md
new file mode 100644
index 0000000000..026657f408
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/depreciation-for-fixed-asset-items.md
@@ -0,0 +1,30 @@
+
Depreciation for Fixed Asset Items
+
+Depereciation of fixed asset items.
+
+####Separate Group of Depreciation Account
+
+
+
+####Depreciation Entry for Fixed Asset Items
+
+Depreciation is when you write off certain value of your assets as an expense. For example if you have a computer that you will use for say 5 years, you can distribute its expense over the period and pass a
+Journal Voucher at the end of each year reducing its value by a certain percentage.
+
+As per perpetual inventory valuation system (set by default), you should create Stock Reconciliation for depreciating value of fixed asset items. In the Stock Reconciliation template, you should only enter Item's Code, Warehouse and its current value.
+
+Let's assume current value of our computer is $250, and its purchase value was $320.
+
+
+
+In this case, depreciation amount of Computer will be $70 ($320-$250). Depreciation Amount will be booked under Difference (expense) Account selected in the stock reconciliation.
+
+
+
+Following is how general ledger will be posted for fixed this Stock Reconciliation.
+
+
+
+Click [here](https://erpnext.com/user-guide/setting-up/stock-reconciliation-for-non-serialized-item) for steps to be followed when making Stock Reconciliation entry.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.html b/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.html
new file mode 100644
index 0000000000..30cae4e470
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/difference-entry-button.html
@@ -0,0 +1,16 @@
+
Difference Entry Button
+
+As per accounting standards Debit amount must be equal to Credit amount. If these amounts are not equal, then entry will not be executed in system. Also system will through validation message. And difference amount will reflect under Difference (Dr-Cr) field.
+
+
+When you press 'Make Difference Entry' button, one new Row will be added under Journal Entry Accounts table with difference amount. You can edit that row to select appropriate account.
+
+
+
+ On selecting account under new row, you will be able to submit Journal Entry.
+
+
+
If debit and credit amount entered for accounts are already tallying, then you need not click on "Make Difference Entry" button.
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md b/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md
new file mode 100644
index 0000000000..e22a3efccc
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/fiscal-year-error.md
@@ -0,0 +1,32 @@
+
Fixing Fiscal Year's Error
+
+While creating entries in ERPNext, system validates if dates (like Posting Date, Transaction Date etc.) matches with Fiscal Year selected in the entry. If not, system through an error message saying:
+
+`Date ##-##-#### not in fiscal year`
+
+You are more likely to receive this error message if your Fiscal Year has changes, but you still have old Fiscal Year updated. To ensure new Fiscal Year is auto updated in the transactions, you should setup your master as instructed below.
+
+####Create New Fiscal Year
+
+Only User with System Manager's Role Assigned has permission to create new Fiscal Year. To create new Fiscal Year, go to:
+
+`Accounts > Setup > Fiscal Year`
+
+Click [here](https://erpnext.com/user-guide/accounts/fiscal-year) to learn more about Fiscal Year master.
+
+####Set Fiscal Year as Default
+
+After Fiscal Year is saved, you will find option to set that Fiscal year as Default.
+
+
+
+Default Fiscal Year will be updated in the Global Default setting as well. You can manually update Default Fiscal Year from:
+
+`Setup > Settings > Global Default`
+
+
+
+Then Save Global Default, and refresh browser of your ERPNext account. After this, you will have default Fiscal Year auto-updated in your transactions as well.
+
+Note: In transactions, you can manually select required Fiscal Year from More Info section. You might have to click on "View Details" button to access View Details section, and edit Fiscal Year.
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-entries-upto-a-specific-date.html b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-entries-upto-a-specific-date.html
new file mode 100644
index 0000000000..38ecaf5ae3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-entries-upto-a-specific-date.html
@@ -0,0 +1,3 @@
+
How to freeze accounting entries upto a specific date?
+
+To freeze accounting entries upto a certain date, follow these steps:
1. Go to Accounts -> Setup -> Accounts Settings. 2. Set the date in Accounts Frozen Upto field.
Now, the system will not allow to make accounting entries before that date.
But you can allow a specific Role, to make/edit accounting entries before that date. To do that set the desired Role, in Role Allowed to Set Frozen Accounts & Edit Frozen Entries field.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
new file mode 100644
index 0000000000..d76a331b49
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/how-to-freeze-accounting-ledger.md
@@ -0,0 +1,28 @@
+
How To Freeze Accounting Ledger?
+
+You can freeze any accounting ledger in ERPNext. So that frozen accounting ledger became unsearchable in accounting transaction. Follow below step to understand the process.
+
+#### 1. Set Frozen Accounts Modifier
+
+To set frozen accounts modifier go to `Accounts > Setup > Accounts Setting`
+
+Search and select Role under Frozen Accounts Modifier field and save the Account Settings form.
+
+
+
+#### 2. Edit Accounting Ledger.
+
+To edit accounting ledger go to `Accounts > Setup > Chart of Accounts`
+
+
+
+#### 3. Set Frozen Status of Ledger.
+
+
+
+Set Frozen field status of ledger as 'Yes' and save the ledger form. On save this ledger will be frozen and you will became unable to search this ledger in accounting transactions.
+
+
Note: If you want to make accounting transaction against this ledger in the future, then that time again set frozen field status as 'No'.
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/how-to-nullify-balance-from-temporary-accounts.md b/erpnext/docs/user/manual/en/accounts/articles/how-to-nullify-balance-from-temporary-accounts.md
new file mode 100644
index 0000000000..5ba6d17dc0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/how-to-nullify-balance-from-temporary-accounts.md
@@ -0,0 +1,16 @@
+
How to Nullify Balance From Temporary Accounts?
+
+There are two separate temporary accounts in Chart of Accounts. One is Temporary Account (Assets) and other one is Temporary Account (Liabilities). These accounts are available under Application of Funds and Source of Funds in Chart of Accounts respectively.
+
+These temporary accounts only used to update opening balances. [Click here to learn about update Opening balances](https://erpnext.com/kb/accounts/updating-opening-balance-in-accounts-using-temporary-account)
+
+After completing all opening entries against these temporary accounts balances for both accounts will updated. And Debit balance of Temporary Account (Assets) will became equal to Credit balance of Temporary Account (Liabilities).
+
+Since temporary account were used only for balancing purpose, it shall not have any balance in it.
+To nullify balance in these accounts, you should create a new Journal Voucher, where will you update balances against these accounts. To create new Journal Entry go to `Accounts > Documents > Journal Entry
+
+
+
+On submit of this journal entry, balances of these temporary accounts will be set to Zero.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/setup/index.md b/erpnext/docs/user/manual/en/accounts/articles/index.md
similarity index 100%
rename from erpnext/docs/user/guides/human-resources/setup/index.md
rename to erpnext/docs/user/manual/en/accounts/articles/index.md
diff --git a/erpnext/docs/user/manual/en/accounts/articles/index.txt b/erpnext/docs/user/manual/en/accounts/articles/index.txt
new file mode 100644
index 0000000000..08a69e3843
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/index.txt
@@ -0,0 +1,21 @@
+accounting-for-projects
+c-form
+changing-parent-account
+customer-for-multiple-company
+depreciation-for-fixed-asset-items
+difference-entry-button
+fiscal-year-error
+how-to-freeze-accounting-entries-upto-a-specific-date
+how-to-freeze-accounting-ledger
+how-to-nullify-balance-from-temporary-accounts
+manage-foreign-exchange-difference
+managing-transactions-in-multiple-currency
+new-fiscal-year-auto-create-feature
+pos-view
+post-dated-cheque-entry
+pricing-rule
+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
diff --git a/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md b/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md
new file mode 100644
index 0000000000..6e24f86f54
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/manage-foreign-exchange-difference.md
@@ -0,0 +1,25 @@
+
Manage Foreign Exchange Difference
+
+When you book Sales Invoices and Purchase invoices in multiple currencies, you will have to deal with currency difference while booking payment entry. You can easily manage this in ERPNext in following ways.
+
+####Add Expense Account
+
+To mange currency difference, create Account **Foreign Exchange Gain/Loss**.
+
+
+
+####Book Payment Entry
+
+In the payment voucher, update invoice amount against Customer or Supplier account, then update actual payment amount against Bank/ Cash account. Add new row and select Foreign Exchange Gain/Loss to update currency difference amount.
+
+####Scenario
+
+Below is the Sales Invoice for a customer in Europe. The base currency of a Company in USD. Sales Invoice is made at the exchange rate (USD to Eur) of 1.128.
+
+
+
+When receiving payment from the customer, exchange rate changed to 1.20. As per the update in the exchange rate, payment was for $120. Following is how payment entry will be booked to adjust the difference amount.
+
+
+
+
diff --git a/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.html b/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.html
new file mode 100644
index 0000000000..3757a698d7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.html
@@ -0,0 +1,39 @@
+
Managing Transactions In Multiple Currency
+
+You can make transaction in your base currency as well as in customer or supplier currencies. When you make transaction in your customer or supplier currency, the same currency reflects only in print format of that transaction. And system pass back end
+entry in your base currency.
+
+ To understand this scenario will take example of Sales Invoice, where your base currency is INR and your customer currency is USD.
+
+ Following are steps to create Sales Invoice in customer currency.
+
+ Step 1: Go to Selling >> Documents >> Sales Invoice >> (+) New.
+
+ Step 2: Select Customer and Enter other details.
+
+
+
+ Step 3: Select customer currency and related Price List.
+
+
+
+
+
+ On selecting customer currency 'Exchange Rate' field will open under Currency field, where you will enter exchange rate of customer currency to basic currency. In our case for USD to INR. You can check exchange rate online
+for your customer currency to your currency.
+
+ Also you can set default customer currency in customer master. Which will auto fetch in transactions.
+
+
+
+ System has Currency Exchange master, where you can set currency exchange masters for your multiple currencies. To Set this go to Accounts > Setup > Currency Exchange.
Step 4: Select Item details.
+ On selecting Item details Sales invoice Total section will look like below image.
+
+
+
+
+
+
+Step 5: Save and Submit
Enter other details like Taxes and charges, Terms and Condition if there and save and submit the invoice form. After submit click on Printer Icon to check print preview. The same document print or email document will you send to your customer or supplier. For our case it will look as below image.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/new-fiscal-year-auto-create-feature.html b/erpnext/docs/user/manual/en/accounts/articles/new-fiscal-year-auto-create-feature.html
new file mode 100644
index 0000000000..5b6c10f873
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/new-fiscal-year-auto-create-feature.html
@@ -0,0 +1,3 @@
+
New Fiscal Year Auto-Create feature
+
+New Fiscal Year needs to be created each year at the end of the previous fiscal year. This Process however has been automated in ERPNext.
3 days prior to the end of the existing fiscal year; the system shall check if the user has created a new fiscal year for the incoming year. If not the system generates a new fiscal year. All fiscal year Companies are also linked with the new fiscal year as in the previous year.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/pos-view.html b/erpnext/docs/user/manual/en/accounts/articles/pos-view.html
new file mode 100644
index 0000000000..fb3c500c19
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/pos-view.html
@@ -0,0 +1,3 @@
+
POS View
+
+POS view renders form in a different layout, mainly designed for the quick selection of items. This view has primarily been designed for the retail business, who needs to be quick at invoicing.
Using POS View, you can make complete Sales Invoice, without switching to standard form view.
Question: Why do I get error message for missing fields when making Purchase Receipt or other sales/purchase transactions from POS View?
Though POS View is mainly designed for Sales Invoice, but it is also made available in all the sales and purchase transactions. In other transactions, POS View is only meant for quick selection of items. This view will not provide all the fields which are available in the standard form view. Hence, you shall use POS View in other transactions just for Item selection, and revert to form view for enter values in other mandatory fields.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md b/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md
new file mode 100644
index 0000000000..12957d9809
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/post-dated-cheque-entry.md
@@ -0,0 +1,32 @@
+
Post Dated Cheque Entry
+
+Post Dated Cheque is a cheque dated on future date given to another party. This actually works as an advance payment which will could be cleared post cheque date only.
+
+In ERPNext, you can manage post dated cheque entries via journal voucher. Following are step to book payment entry for post dated cheque.
+
+####New Journal Voucher
+
+To open new journal voucher go to
+
+`Accounts > Documents > Journal Voucher > New`
+
+####Set Posting Date and other details
+
+Assuming your Cheque Date is 31st December, 2014 (or any future date) and you need value of this cheque to reflect in the bank balance after cheque date only.
+
+
+
+Note: Journal Voucher Reference Date should equal to or less than Posting Date.
+
+####Step 3: Save and Submit Journal Voucher
+
+After entering required details Save and Submit the Journal Voucher.
+
+####Adjusting Post Dated Cheque Entry
+
+If Post Dated Journal Voucher needs to be adjusted against any invoice, it can be accomplished via [Payment Reconciliation Tool](https://erpnext.com/user-guide/accounts/payment-reconciliation).
+
+When cheque is cleared in the future date, i.e. actual date on the cheque, you can update its Clearance Date via [Bank Reconciliation Tool](https://erpnext.com/user-guide/accounts/bank-reconciliation).
+
+You might find value of this Journal Voucher already reflecting against bank's ledger. You should check **Bank Reconciliation Statement**, a report in the account module to know difference of balance as per system, and balance expected in the bank.
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/pricing-rule.md b/erpnext/docs/user/manual/en/accounts/articles/pricing-rule.md
new file mode 100644
index 0000000000..f1caf62aab
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/pricing-rule.md
@@ -0,0 +1,75 @@
+
Pricing Rule
+
+Pricing Rule allows you to define rules based on which item's price or discount to be applied is determined.
+
+### Scenario:
+
+Following are the few cases which can be addressed using Pricing Rule.
+
+1. As per the promotional sale policy, if customer purchases more than 10 units of an item, he enjoys 20% discount.
+
+2. For Customer "XYZ", selling price for the specific or group of "Products" should be updated as ###.
+
+3. Items categorized under specific Item Group has same selling or buying price.
+
+4. Customers catering to specific Customer Group has same selling price.
+
+5. Supplier's categorized under common Supplier Type should have same buying rate applied.
+
+To have %Discount and Price List Rate for an Item auto-applied, you should set Pricing Rules for it.
+
+Pricing Rule master has two sections:
+
+### 1. Applicability Section:
+
+In this section, conditions are set for the Pricing Rule. When transaction meets condition as specified in the Pricing Rule, Price or Discount as specified in the Item master will be applicable. You can set condition on following values.
+
+####1.1 Applicable On:
+
+
+
+If you want Pricing Rule to be applied on all the items, you should apply rule based on Item Group, and select most Parent Item Group for a value.
+
+####1.2 Applicable For:
+
+Applicability option will updated based on our selection for Selling or Buying or both. You can set applicability on one of the following master.
+
+
+
+####1.3 Quantity:
+
+Specify minimum and maximum qty of an item when this Pricing Rule should be applicable.
+
+
+
+###2. Application:
+
+Using Price List Rule, you can ultimately define price or %discount to be applied on an item.
+
+
+
+####2.1 Price
+
+Price or Discount specified in the Pricing Rule will be applied only if above applicability rules are matched with values in the transaction. Price mentioned in Pricing Rule will be given priority over item's Price List rate.
+
+
+
+####2.2 Discount Percentage
+
+Discount Percentage can be applied for a specific Price List. To have it applied for all the Price List, %Discount field should be left blank.
+
+
+
+#### Validity
+
+Enter From and To date between which this Pricing Rule will be applicable. This will be useful if creating Pricing Rule for sales promotion exercise available for certain days.
+
+
+
+####Disable
+
+Check Disable to inactive specific Pricing Rule.
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/recurring-order-and-invoices.html b/erpnext/docs/user/manual/en/accounts/articles/recurring-order-and-invoices.html
new file mode 100644
index 0000000000..6893761096
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/recurring-order-and-invoices.html
@@ -0,0 +1,3 @@
+
Recurring Orders and Invoices
+
+If you have a contract with a Customer where you bill the Customer on a monthly, quarterly, half-yearly or annual basis, you should use recurring feature in orders and invoices.
Scenario:
Subscription for your hosted ERPNext account requires yearly renewal. We use Sales Order for generating proforma invoices. To automate proforma invoicing for renewal, we set original Sales Order as recurring. 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.
Feature of setting document as recurring is available in Sales Order, Sales Invoice, Purchase Order and Purchase Invoice.
Option to set document as recurring will be visible only after submission. Recurring is last section in document. Check Is Recurring to set document as recurring.
From Date and To Date: This defines contract period with the customer.
Repeat on the Day of Month: If recurring type is set as Monthly, then it will be day of the month on which recurring invoice will be generated.
End Date: Date after which auto-creation of recurring invoice will be stopped.
Notification Email Address: Email Addresses (separated by comma) on which recurring invoice will be emailed when auto-generated.
Recurring ID: Recurring ID will be original document id which will be linked to all corresponding recurring document. For example, original Sales Invoice's id will be updated into all recurring Sales Invoices.
Recurring Print Format: Select a print format to define document view which should be emailed to customer.
Exception Handling:
In a situation where recurring invoice is not created successfully, user with System Manager role is notified about it via email. Also the document on which recurring event failed, "Is Recurring" field is unchecked for it. This means system doesn't try creating recurring invoice for that document again.
Failure in creation of recurring invoice could be due to multiple reasons like wrong email id mentioned in the Email Notification field in Recurring section etc.
On receipt of notification, if cause of failure is fixed (like correcting email id) within 24 hours, then recurring invoice will be generated automatically. If issue is not fixed within the said time, then document should be created for that month/year manually.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.html b/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.html
new file mode 100644
index 0000000000..106f38335e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/update-stock-option-in-sales-invoice.html
@@ -0,0 +1,3 @@
+
Update Stock Option in Sales Invoice
+
+The Update Stock check box is available in the Items section within Sales Invoice form.
Usually the Sales Invoice is a voucher specifying the amount to be paid against Quantity delivered/to be delivered as per a particular Sales Order.
Checking the update Stock option before submitting an Invoice will directly deduct the Stock from the Inventory on submission of the Sales Invoice. In such a case the Sales Invoice also satisfies the function of a Delivery Note.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/updating-opening-balance-in-accounts-using-temporary-account.md b/erpnext/docs/user/manual/en/accounts/articles/updating-opening-balance-in-accounts-using-temporary-account.md
new file mode 100644
index 0000000000..4962b826f8
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/updating-opening-balance-in-accounts-using-temporary-account.md
@@ -0,0 +1,44 @@
+
Updating Opening Balance in Accounts using Temporary Account
+
+For updating opening balances in the Accounts, you will need to use temporary adjustment accounts. In the Chart of Account, two adjustment accounts will be created by default.
+
+1. Temporary Account (Assets)
+2. Temporary Account (Liabilities)
+
+Since ERPNext is a double entry accounting system, it requires balancing on debit side with credit side in an accounting entry. When start working on fresh ERPNext account, you will have to update opening balance in your Balance Sheet accounts. You can update opening balance in account(s), and use Temporary Account for balancing purpose.
+
+Let's consider a scenario of updating opening balance in an Account using temporary account.
+
+#### Identifying Accounts to Update Opening Balance
+
+Say we have following customer's ledger, and have receivable from them. This receivable should be updated as opening balance in their account.
+
+1. Comtek Solutions
+1. Walky Tele Solution
+
+Also we can update opening balance on Bank and Cash account.
+
+1. Bank of Baroda
+1. Cash
+
+All these accounts are located on the Current Asset side, hence will have Debit balance.
+
+#### Identifying Temporary Account
+
+To update debit balance in them, we will have to select Credit account for balancing it. Out of the temporary accounts available, we can use `Temporary Account (Liabilities)`.
+
+##### Opening Balance Entry
+
+For Current Asset account, their current balance will be updated on the Debit side. The total value of Debit will be entered as Credit Balance for the Temporary Account (Liability).
+
+
+
+Same way, you will update opening balance for the liability account. Since Liability accounts will have credit balance, you will have to select Temporary Account (Asset), which is a Debit account for balancing purpose.
+
+After you have updated opening balance in all the Asset and Liability account, you will find that balance in the temporary account will be equal. If balance in temporary accounts is not equal, it must be because opening balance is not updated in some account, or other account was used for balancing purpose.
+
+Since temporary account were used only for balancing purpose, it shall not have any balance in it. To nullify balance in these accounts, you should create a Journal Voucher which will set balance as zero in these account.
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.html b/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.html
new file mode 100644
index 0000000000..3d1c7db04f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/what-is-the-differences-of-total-and-valuation-in-tax-and-charges.html
@@ -0,0 +1,34 @@
+
Purchase Tax or Charges Categories
+
+Consider Tax or Charge field in Purchase Taxes and Charges master has three values.
+
Total
+
Valuation
+
Total and Valuation
+
+
Let's consider an example to understand an effect of value selected in Consider Tax or Charge field.
+
We purchase 10 units of item, at the rate of 800, total purchase amount would be 800. Purchased item has 4% VAT tax and INR 100 transportation charges were incurred.
+
+
Total:
+
+
An amount of tax/charge categorized Total will be accounted in the total of purchase transactions, but not in the value of purchased item.
+
If VAT 4% is applied on item, it will amount to INR 32. Since VAT is the consumption tax, its should be added value of Purchase Order/Invoice, since it will
+ be included in payable towards supplier, but its should not be added to the value of Purchased item.
+
Hence for tax or charge you wish to be added to transaction total but not to the valuation of item, it should be categorized as Total.
+
When Purchase Invoice is submitted, value of tax/charge is booked in respective account.
+
+
+
Valuation:
+
An amount of tax/charge categorized as Valuation will be added in the value of purchased item, but will not be added to the value of purchase transaction.
+
Transportation charge of INR 100 should be categorized as valuation. With this, the value of purchased item will be increased from 800 to 900. Also, it will be not be added to the total of purchase transaction, because it should not be reflected to supplier,
+ as it will be irrelevant for them.
+
+
+
When Purchase Invoice is submitted, value of tax/charge is booked in respective account. Transportation expense will be booked
+
+
+
Total and Valuation:
+
An amount of tax/charge categorized as for Total and Valuation will be added in the value of purchase item, as well as will be included in the totals of purchase transactions.
+
Let's assume that transporter was arranged by our supplier, but we need to pay transportation charges to them. In that case, for transportation charges, category selected should be Total and Valuation. With this INR 100 transportation charges will be
+ added to actual purchase amount of INR 800. Also, INR 100 will reflect in the total, as it will be payable for us towards supplier.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md b/erpnext/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md
new file mode 100644
index 0000000000..860f6eb760
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/withdrawing-salary-from-owners-equity-account.md
@@ -0,0 +1,21 @@
+
WIthdrawing Salary from Owner's Equity Account
+
+### Question
+
+After meeting with my accountant here in the US, I was informed that with my company being a sole member, I should not pay myself a salary that would hit the direct expenses account but instead should take a "draw" that hits the balance sheet and not the expenses. Can you please advise how I should set this up in ERP Next please?
+
+### Answer
+
+1. Create an account for **Owner's Equity** under Liabilities if you already do not have. This account will be your investment in the business and the accumulated profits (or losses). It will have a "Credit" type balance.
+2. In an Version 5, Equity will be a new head (not under Liabilities). (In either case Assets = Owner's Equity + Liabilities, so your balance sheet will be okay [Learn more about owner's equity account](http://www.accountingcoach.com/blog/what-is-owners-equity)).
+3. Create an account for **Owner's Draws** under **Owner's Equity**.
+4. Note that the balance of **Owner's Draws** will always be negative since you are reducing money from your total equity / profits.
+
+### Example
+
+Example journal entry (using Journal Voucher in ERPNext) for a withdrawal of $1000 would be:
+
+1. Credit **Cash** $1000
+2. Debit **Owner's Draws** $1000
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/accounts/budgeting.md b/erpnext/docs/user/manual/en/accounts/budgeting.md
similarity index 77%
rename from erpnext/docs/user/guides/accounts/budgeting.md
rename to erpnext/docs/user/manual/en/accounts/budgeting.md
index 8733aa43e4..a5f35d23d5 100644
--- a/erpnext/docs/user/guides/accounts/budgeting.md
+++ b/erpnext/docs/user/manual/en/accounts/budgeting.md
@@ -16,13 +16,13 @@ Select a Cost Center and click on Open.
#### Step 1: Click on Edit.
-
+
-
+
#### Step 2: Enter Monthly Distribution.
-
+
If you leave the** **distribution ID blank, ERPNext will calculate on a yearly
@@ -32,7 +32,7 @@ basis or in equal proportion for every month.
-
+
@@ -41,13 +41,13 @@ basis or in equal proportion for every month.
ERPNext allows you to take a few budget actions. It signifies whether to stop
, warn or Ignore if you exceed budgets.
-
+
These can be defined from the Company record.
-
+
diff --git a/erpnext/docs/user/guides/accounts/chart-of-accounts.md b/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md
similarity index 91%
rename from erpnext/docs/user/guides/accounts/chart-of-accounts.md
rename to erpnext/docs/user/manual/en/accounts/chart-of-accounts.md
index 148ef02740..99760e7849 100644
--- a/erpnext/docs/user/guides/accounts/chart-of-accounts.md
+++ b/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md
@@ -22,7 +22,7 @@ your Chart of Accounts.
Financial statement of your company is easily viewable in ERPNext. An Example
of a financial statement is given below:
-
+
To edit your Chart of Accounts in ERPNext go to:
@@ -37,7 +37,7 @@ based on statutory (tax, compliance to government regulations) requirements.
Let us understand the main groups of the Chart of Accounts.
-
+
### Balance Sheet Accounts
@@ -75,7 +75,7 @@ beginning and end of your Fiscal Year, they become zero.
In ERPNext it is easy to create a Profit and Loss analysis chart. An example
of a Profit and Loss analysis chart is given below:
-
+
(On the first day of the year you have not made any profit or loss, but you
still have assets, hence balance sheet accounts never become zero at the
@@ -95,7 +95,7 @@ Supplier).
> Note: An Account “Ledger” is also sometimes called as Account “Head”.
-
+
### Other Account Types
@@ -110,7 +110,7 @@ To create new Accounts, explore your Chart of Accounts and click on an Account
group under which you want to create the new Account. On the right side, you
will see an option to “Open” or “Add Child” a new Account.
-
+
Option to create will only appear if you click on a Group (folder) type
Account.
diff --git a/erpnext/docs/user/guides/accounts/credit-limit.md b/erpnext/docs/user/manual/en/accounts/credit-limit.md
similarity index 81%
rename from erpnext/docs/user/guides/accounts/credit-limit.md
rename to erpnext/docs/user/manual/en/accounts/credit-limit.md
index df7f7f6e25..299e67057d 100644
--- a/erpnext/docs/user/guides/accounts/credit-limit.md
+++ b/erpnext/docs/user/manual/en/accounts/credit-limit.md
@@ -12,7 +12,7 @@ To set credit limit go to Customer - Master
#### Figure 1: Credit Limit
-
+
Go to the 'More Info section' and enter the amount in the field Credit Limit.
@@ -27,7 +27,7 @@ accept orders or raise credit limits of customers.
#### Figure 2: Credit Controller
-
+
Save the changes.
diff --git a/erpnext/docs/user/guides/accounts/index.md b/erpnext/docs/user/manual/en/accounts/index.md
similarity index 100%
rename from erpnext/docs/user/guides/accounts/index.md
rename to erpnext/docs/user/manual/en/accounts/index.md
diff --git a/erpnext/docs/user/guides/accounts/index.txt b/erpnext/docs/user/manual/en/accounts/index.txt
similarity index 94%
rename from erpnext/docs/user/guides/accounts/index.txt
rename to erpnext/docs/user/manual/en/accounts/index.txt
index 5a4a391d0e..323764e19e 100644
--- a/erpnext/docs/user/guides/accounts/index.txt
+++ b/erpnext/docs/user/manual/en/accounts/index.txt
@@ -14,4 +14,5 @@ item-wise-tax
point-of-sale-pos-invoice
multi-currency-accounting
tools
-setup
\ No newline at end of file
+setup
+articles
diff --git a/erpnext/docs/user/guides/accounts/item-wise-tax.md b/erpnext/docs/user/manual/en/accounts/item-wise-tax.md
similarity index 84%
rename from erpnext/docs/user/guides/accounts/item-wise-tax.md
rename to erpnext/docs/user/manual/en/accounts/item-wise-tax.md
index fbc5743620..8c1fc8625f 100644
--- a/erpnext/docs/user/guides/accounts/item-wise-tax.md
+++ b/erpnext/docs/user/manual/en/accounts/item-wise-tax.md
@@ -5,7 +5,7 @@ Taxes selected in the Tax and Other Charges in transactions are applied on all t
Item master has tax table where you can list taxes which will be applied on it.
-
+
Tax rate mentioned in the item master gets preference over tax rate entered in the transactions.
@@ -17,7 +17,7 @@ In Taxes and Other Charges master, you should select all the applicable taxes wh
For example, if few items has VAT 5 applied on them, other has Service Tax applied, and some other has Excise Duty applicable, then you tax master should have all these taxes selected.
-
+
####Step 3: Set Tax Rate as Zero in Taxes and Charges Template
@@ -25,6 +25,6 @@ In the Taxes and Other Charges master, tax rate will be updated as ZERO. It mean
Based on the above setting, you will have taxes applied on items as mentioned in the respective item master. Check following for an instance.
-
+
{next}
diff --git a/erpnext/docs/user/guides/accounts/journal-entry.md b/erpnext/docs/user/manual/en/accounts/journal-entry.md
similarity index 96%
rename from erpnext/docs/user/guides/accounts/journal-entry.md
rename to erpnext/docs/user/manual/en/accounts/journal-entry.md
index 9da656d33c..68ba22a863 100644
--- a/erpnext/docs/user/guides/accounts/journal-entry.md
+++ b/erpnext/docs/user/manual/en/accounts/journal-entry.md
@@ -7,7 +7,7 @@ To create a Journal Entry go to:
> Accounts > Documents > Journal Entry > New
-
+
In a Journal Entry, you must select.
diff --git a/erpnext/docs/user/guides/accounts/making-payments.md b/erpnext/docs/user/manual/en/accounts/making-payments.md
similarity index 94%
rename from erpnext/docs/user/guides/accounts/making-payments.md
rename to erpnext/docs/user/manual/en/accounts/making-payments.md
index 3b6209c712..2038e6f9b2 100644
--- a/erpnext/docs/user/guides/accounts/making-payments.md
+++ b/erpnext/docs/user/manual/en/accounts/making-payments.md
@@ -6,7 +6,7 @@ clicking on “Make Payment Entry” button on “Submitted” invoices.
3. Enter the cheque number, cheque date.
4. Save and Submit.
-
+
Payments can also be made independent of invoices by creating a new Journal
Voucher and selecting the type of payment.
@@ -29,7 +29,7 @@ For payments to Suppliers,
### Example Payment Journal Entry
-
+
* * *
diff --git a/erpnext/docs/user/guides/accounts/multi-currency-accounting.md b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
similarity index 86%
rename from erpnext/docs/user/guides/accounts/multi-currency-accounting.md
rename to erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
index 0b01110e26..a674f219e2 100644
--- a/erpnext/docs/user/guides/accounts/multi-currency-accounting.md
+++ b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
@@ -4,15 +4,15 @@ In ERPNext, you can make accounting entries in multiple currency. For example, i
To get started with multi-currency accounting, you need to assign accounting currency in Account record. You can define Currency from Chart of Accounts while creating Account.
-
+
You can also assign / modify the currency by opening specific Account record for existing Accounts.
-
+
For Customer / Supplier (Party), you can also define it's accounting currency in the Party record. If the Party's accounting currency is different from Company Currency, you have to mention Default Receivable / Payable Account in that currency.
-
+
Once you defined Accounting Currency in Party / Account record, you are ready to make transactions against them. If Party's accounting currency is different from Company Currency, system will restrict to make transaction for that party with that currency only. If accounting currency is same as Company Currency, you can make transactions for that Party in any currency. But accounting entries (GL Entries) will always be in Party's Accounting Currency. In any case, currency of Receivable Account will always be same as accounting currency of the Party.
@@ -31,7 +31,7 @@ Now, in POS, Paid Amount will be enetered in transaction currency, instead of ea
Outstanding Amount and Advance Amount will always be calculated and shown in Customer's Account Currency.
-
+
### Purchase Invoice
@@ -41,14 +41,14 @@ Similarly, in Purchase Invoice, accounting entries will be made based on Supplie
In Journal Entry, you can make transactions in different currencies. There is a checkbox "Multi Currency", to enable multi-currency entries. If "Multi Currency" option selected, you will be able to select accounts with different currencies.
-
+
In Accounts table, on selection of foreign currency account, system will show Currency section and fetch Account Currency and Exchange Rate automatically. You can change / modify the Exchange Rate later manually.
In a single Journal Entry, you can select accounts with only one alternate currency, apart from accounts in Company Currency. Debit / Credit amount should be entered in Account Currency, system will calculate and show the Debit / Credit amount in Company Currency automatically.
-
+
#### Example 1: Payment Entry Against Customer With Alternate Currency
@@ -56,7 +56,7 @@ Suppose, default currency of the company is INR and customer's accounting curren
Exchange Rate in the payment entry should always be same as invoice (60), even if exchange rate on the payment date is 62. The bank account will be credited by the amount considering exchange rate as 62. Hence, Exchnage Gain / Loss will be booked based on exchange rate difference.
-
+
#### Example 2: Inter-bank Transfer (USD -> INR)
@@ -101,7 +101,7 @@ Lets say, Paypal account debited by following amounts over the week, which has n
Suppose, Exchange Rate on the payment date is 62 and Bank Transfer Entry will be look like below:
-
+
## Reports
@@ -110,10 +110,10 @@ Suppose, Exchange Rate on the payment date is 62 and Bank Transfer Entry will be
In General Ledger, system shows debit / credit amount in both currency if filtered by an Account and Account Currency is different from Company Currency.
-
+
### Accounts Receivable / Payable
In Accounts Receivable / Payable report, system shows all the amounts in Party / Account Currency.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/accounts/opening-accounts.md b/erpnext/docs/user/manual/en/accounts/opening-accounts.md
similarity index 89%
rename from erpnext/docs/user/guides/accounts/opening-accounts.md
rename to erpnext/docs/user/manual/en/accounts/opening-accounts.md
index 1a39ed6ac4..214642d8d5 100644
--- a/erpnext/docs/user/guides/accounts/opening-accounts.md
+++ b/erpnext/docs/user/manual/en/accounts/opening-accounts.md
@@ -23,7 +23,7 @@ Based on Voucher Type
You can select accounts based on the voucher type. In such a scenario, your balance sheet should be balanced.
-
+
Also, note that if there are more than 300 ledgers, the system will crash. Thus to avoid such a situation, you can open accounts by using temporary accounts.
@@ -46,16 +46,16 @@ Note: Make sure to set “Is Opening” as “Yes” in the More Info section.
Complete Journal Entries on the Debit and Credit side.
-
+
To update opening balance is to make Journal Entry for an individual/group of accounts.
For example, if you want to update balance in three bank accounts, then make Journal Entrys in this manner.
-
+
-
+
Temporary Asset and Liability account is used for balancing purpose. When you update opening balance in Liability Account, you can use Temporary Asset Account for balancing.
@@ -72,7 +72,7 @@ After completing the accounting entries, the trial balance report will look
like the one given below:
-
+
#### Outstanding Invoices
diff --git a/erpnext/docs/user/guides/accounts/opening-entry.md b/erpnext/docs/user/manual/en/accounts/opening-entry.md
similarity index 61%
rename from erpnext/docs/user/guides/accounts/opening-entry.md
rename to erpnext/docs/user/manual/en/accounts/opening-entry.md
index 2f341a1a08..da0b0f9097 100644
--- a/erpnext/docs/user/guides/accounts/opening-entry.md
+++ b/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.]({{url_prefix}}/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}
diff --git a/erpnext/docs/user/guides/accounts/point-of-sale-pos-invoice.md b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
similarity index 92%
rename from erpnext/docs/user/guides/accounts/point-of-sale-pos-invoice.md
rename to erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
index dbcfc00027..8f646f723c 100644
--- a/erpnext/docs/user/guides/accounts/point-of-sale-pos-invoice.md
+++ b/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]({{url_prefix}}/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
@@ -42,7 +42,7 @@ clicking on the Item image and the other, is through the Barcode / Serial No.
**Barcode / Serial No** \- A Barcode / Serial No is an optical machine-readable representation of data relating to the object to which it is attached. Enter Barcode / Serial No in the box as shown in the image below and pause for a second, the item will be automatically added to the cart.
-
+
> Tip: To change the quantity of an Item, enter your desired quantity in the
quantity box. These are mostly used if the same Item is purchased in bulk.
@@ -63,7 +63,7 @@ button.
> Delete button appears only when Items are selected.
-
+
### Make Payment
@@ -74,7 +74,7 @@ ready to make the Payment. Payment process is divided into 3 steps -
2. Select your “Mode of Payment”.
3. Click on “Pay” button to Save the document.
-
+
Submit the document to finalise the record. After the document is submitted,
you can either print or email it directly to the customer.
diff --git a/erpnext/docs/user/guides/accounts/purchase-invoice.md b/erpnext/docs/user/manual/en/accounts/purchase-invoice.md
similarity index 95%
rename from erpnext/docs/user/guides/accounts/purchase-invoice.md
rename to erpnext/docs/user/manual/en/accounts/purchase-invoice.md
index ce1aae882f..433219cf9f 100644
--- a/erpnext/docs/user/guides/accounts/purchase-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/purchase-invoice.md
@@ -9,7 +9,7 @@ To make a new Purchase Invoice, go to:
or click on “Make Purchase Invoice” in Purchase Order or Purchase Receipt.
-
+
The concept of “Posting Date” is again same as Sales Invoice. “Bill No” and
“Bill Date” helps to track the bill number as set by your Supplier for
diff --git a/erpnext/docs/user/guides/accounts/sales-invoice.md b/erpnext/docs/user/manual/en/accounts/sales-invoice.md
similarity index 96%
rename from erpnext/docs/user/guides/accounts/sales-invoice.md
rename to erpnext/docs/user/manual/en/accounts/sales-invoice.md
index 5c95b319aa..f9a453e115 100644
--- a/erpnext/docs/user/guides/accounts/sales-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/sales-invoice.md
@@ -6,7 +6,7 @@ You can create a Sales Invoice directly from
or Click on Make Invoice at the right hand corner of the Delivery Note.
-
+
#### Accounting Impact
diff --git a/erpnext/docs/user/guides/accounts/setup/accounts-settings.md b/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md
similarity index 78%
rename from erpnext/docs/user/guides/accounts/setup/accounts-settings.md
rename to erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md
index 8465679f7f..5242b391c6 100644
--- a/erpnext/docs/user/guides/accounts/setup/accounts-settings.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md
@@ -1,5 +1,5 @@
-
+
* Accounts Frozen Upto: Freeze accounting transactions upto specified date, nobody can make / modify entry except specified role.
diff --git a/erpnext/docs/user/guides/accounts/setup/cost-center.md b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
similarity index 93%
rename from erpnext/docs/user/guides/accounts/setup/cost-center.md
rename to erpnext/docs/user/manual/en/accounts/setup/cost-center.md
index 79f1a3c3a2..8b9fcc1c81 100644
--- a/erpnext/docs/user/guides/accounts/setup/cost-center.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
@@ -32,7 +32,7 @@ To setup your Chart of Cost Centers go to:
> Accounts > Setup > Chart of Cost Centers
-
+
Cost centers help you in one more activity, budgeting.
@@ -53,7 +53,7 @@ define a budget distribution that the budget will follow.
> Accounts > Setup > Budget Distribution > New Budget Distribution
-
+
#### Budget Actions
diff --git a/erpnext/docs/user/guides/accounts/setup/fiscal-year.md b/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md
similarity index 92%
rename from erpnext/docs/user/guides/accounts/setup/fiscal-year.md
rename to erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md
index 5509e2fcdd..618d20b6f9 100644
--- a/erpnext/docs/user/guides/accounts/setup/fiscal-year.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md
@@ -18,6 +18,6 @@ choose to start its fiscal year on October 1. That way, they know what their
income will be for that year, and can adjust their expenses to maintain their
desired profit margins.
-
+
{next}
diff --git a/erpnext/docs/user/guides/accounts/setup/index.md b/erpnext/docs/user/manual/en/accounts/setup/index.md
similarity index 100%
rename from erpnext/docs/user/guides/accounts/setup/index.md
rename to erpnext/docs/user/manual/en/accounts/setup/index.md
diff --git a/erpnext/docs/user/guides/accounts/setup/index.txt b/erpnext/docs/user/manual/en/accounts/setup/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/accounts/setup/index.txt
rename to erpnext/docs/user/manual/en/accounts/setup/index.txt
diff --git a/erpnext/docs/user/guides/accounts/setup/tax-rule.md b/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md
similarity index 58%
rename from erpnext/docs/user/guides/accounts/setup/tax-rule.md
rename to erpnext/docs/user/manual/en/accounts/setup/tax-rule.md
index fdbc704022..bfcf6f0721 100644
--- a/erpnext/docs/user/guides/accounts/setup/tax-rule.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md
@@ -1,6 +1,6 @@
-You can define which [Tax Template]({{url_prefix}}/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.
-
+
You can define Tax Rules for Sales or Purchase Taxes.
While making a Transaction the system will select and apply tax template based on the tax rule defined.
@@ -10,9 +10,9 @@ Let us consider a senario to understand Tax Rule Better.
Suppose we define 2 Tax Rules as below.
-
+
-
+
Here Tax Rule 1 has Billing Country as India and Tax Rule 2 has Billing Country as United Kingdom
diff --git a/erpnext/docs/user/guides/accounts/tools/bank-reconciliation.md b/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md
similarity index 90%
rename from erpnext/docs/user/guides/accounts/tools/bank-reconciliation.md
rename to erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md
index 1fd0b378d7..f2afe76703 100644
--- a/erpnext/docs/user/guides/accounts/tools/bank-reconciliation.md
+++ b/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md
@@ -15,7 +15,7 @@ The Bank Reconciliation statement in ERPNext comes in the form of a report.
#### Figure 1: Bank Reconciliation Statement
-
+
@@ -45,7 +45,7 @@ __Step 4:__ Click on the JV from the table and update clearance date.
#### Figure 2: Bank Reconciliation Tool
-
+
__Step 5:__ Click on the button 'Update Clearance Date'.
diff --git a/erpnext/docs/user/guides/accounts/tools/index.md b/erpnext/docs/user/manual/en/accounts/tools/index.md
similarity index 100%
rename from erpnext/docs/user/guides/accounts/tools/index.md
rename to erpnext/docs/user/manual/en/accounts/tools/index.md
diff --git a/erpnext/docs/user/guides/accounts/tools/index.txt b/erpnext/docs/user/manual/en/accounts/tools/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/accounts/tools/index.txt
rename to erpnext/docs/user/manual/en/accounts/tools/index.txt
diff --git a/erpnext/docs/user/guides/accounts/tools/payment-reconciliation.md b/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md
similarity index 90%
rename from erpnext/docs/user/guides/accounts/tools/payment-reconciliation.md
rename to erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md
index bf4a65f243..c719623781 100644
--- a/erpnext/docs/user/guides/accounts/tools/payment-reconciliation.md
+++ b/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md
@@ -11,7 +11,7 @@ To use Payment Reconciliation Tool go to,
Accounts > Tools > Payment Reconciliation
-
+
__Step 1:__ Select the Account against whom the payments need to be reconciled.
diff --git a/erpnext/docs/user/guides/accounts/tools/payment-tool.md b/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md
similarity index 81%
rename from erpnext/docs/user/guides/accounts/tools/payment-tool.md
rename to erpnext/docs/user/manual/en/accounts/tools/payment-tool.md
index f96ca5b91b..a5d69661a7 100644
--- a/erpnext/docs/user/guides/accounts/tools/payment-tool.md
+++ b/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md
@@ -11,14 +11,14 @@ To go to Payment Tool, click on Accounts > Tools > Payment Tool.
6. Click on Get Outstanding Vouchers to fetch all the valid Vouchers, Invoices and Orders against which a payment can be made/received. These will appear in the Against Voucher section.
* __Note:__ In case User is paying a customer or receiving payment from a supplier, add the details regarding the relevant invoices and orders manually.
-
+
7. Once details have been fetched, click on the detail entry and enter the payment amount made against that Invoice/Order/Voucher
-
+
8. Click on 'Make Journal Entry' to generate a new Journal Entry with the relevant Party Details and Credit/Debit details filled in.
-
+
{next}
diff --git a/erpnext/docs/user/guides/accounts/tools/period-closing-voucher.md b/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md
similarity index 93%
rename from erpnext/docs/user/guides/accounts/tools/period-closing-voucher.md
rename to erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md
index 5c0e203d0d..fbec8d1a63 100644
--- a/erpnext/docs/user/guides/accounts/tools/period-closing-voucher.md
+++ b/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md
@@ -19,7 +19,7 @@ In ERPNext after making all the special entries via Journal Entry for the curren
**Closing Fiscal Year** will be an year for which you are closing your financial statement.
-
+
This voucher will transfer Profit or Loss (availed from P&L statment) to Closing Account Head. You should select a libility account like Reserves and Surplus, or Capital Fund account as Closing Account.
diff --git a/erpnext/docs/user/guides/human-resources/tools/index.md b/erpnext/docs/user/manual/en/buying/articles/index.md
similarity index 100%
rename from erpnext/docs/user/guides/human-resources/tools/index.md
rename to erpnext/docs/user/manual/en/buying/articles/index.md
diff --git a/erpnext/docs/user/manual/en/buying/articles/index.txt b/erpnext/docs/user/manual/en/buying/articles/index.txt
new file mode 100644
index 0000000000..c0ed867e5b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/articles/index.txt
@@ -0,0 +1,3 @@
+maintaining-suppliers-part-no-in-item
+managing-purchase-uom-and-stock-uom
+select-material-requests-based-on-supplier
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md b/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md
new file mode 100644
index 0000000000..52f4c97792
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md
@@ -0,0 +1,20 @@
+
Maintaining Supplier's Item Code in the Item master
+
+Since each company has their own item coding standards, for each item, your item code differ from supplier's Item Code. ERPNext allows you to track Supplier's Item Code in your item master, so that you refer to each others item code while transacting. Also you can fetch Supplier's Item Code in your purchase transactions, so that they can easily recognize item referring to their Item Code.
+
+#### 1. Updating Supplier Item Code In Item
+
+Under Purchase section in the Item master, you will find table to track Item Code for each Supplier.
+
+
+
+#### 2. Supplier's Item Code in Transactions
+
+Each purchase transaction has field in the Item table where Supplier's Item Code is fetched. This field is hidden in form as well as in the Standard print format. You can make it visible by changing property for this field from [Customize Form](https://erpnext.com/user-guide/customize-erpnext/customize-form).
+
+Supplier Item Code will only be fetched in the purchase transaction, if both Supplier and Item Code selected in purchase transaction is mapped with value mentioned in the Item master.
+
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/articles/managing-purchase-uom-and-stock-uom.md b/erpnext/docs/user/manual/en/buying/articles/managing-purchase-uom-and-stock-uom.md
new file mode 100644
index 0000000000..d4d97be99d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/articles/managing-purchase-uom-and-stock-uom.md
@@ -0,0 +1,47 @@
+
Managing Purchase UoM and Stock UoM
+
+When purchasing an item, you can set purchase UoM (Unit of Measurement) which could be different from item's stock UoM.
+
+### Scenario:
+
+Item ABC is stocked in Nos, but purchased in Cartons. Hence in the Purchase Order, you will need to update UoM as Carton.
+
+### 1. Editing Purchase UoM
+
+
+#### Step 1.1: Edit UoM in the Purchase Order
+
+In the Purchase Order, you will find two UoM fied.
+
+- UoM
+- Stock UoM
+
+In both the fields, default UoM of an item will be updated. You should edit UoM field, and select Purchase UoM (Carton in this case).
+
+
+
+#### Step 1.2: Update UoM Conversion Factor
+
+In one Carton, if you get 20 Nos. of item ABC, then UoM Conversion Factor would be 20.
+
+
+
+Based on the Qty and Conversion Factor, qty will be calculated in the Stock UoM of an item. If you purchase just one carton, then Qty in the stock UoM will be set as 20.
+
+
+
+### 2. Stock Ledger Posting
+
+Irrespective of the Purchase UoM selected, stock ledger posting will be done in the Default UoM of an item only. Hence you should ensure that conversion factor is entered correctly while purchasing item in different UoM.
+
+With this, we can conclude that, updating Purchase UoM is mainly for the reference of the supplier. In the print format, you will see item qty in the Purchase UoM.
+
+
+
+### 3. Setting Conversion Factor in the Item master
+
+In the Item master, under Purchase section, you can list all the possible purchase UoM of an item, with its UoM Conversion Factor.
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/articles/select-material-requests-based-on-supplier.md b/erpnext/docs/user/manual/en/buying/articles/select-material-requests-based-on-supplier.md
new file mode 100644
index 0000000000..6b59695046
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/articles/select-material-requests-based-on-supplier.md
@@ -0,0 +1,19 @@
+
Select Material Requests based on Supplier
+
+Question: How to create a single Purchase Order from multiple Material Requests for all Items that are purchased from common Supplier?
+ Answer:
+
+ Material Requests can be individually fetched from Purchase Orders using the 'From Material Request' button. However this procedure becomes tedious when there are multiple Material Requests for items that are purchased from a single supplier.
+ A more efficient way;
+
+ Step 1: When creating a Purchase order use the 'For Supplier' button in the form.
+
+
+ Step 2: In the 'Get From Supplier' pop-up enter the Supplier name and click on 'Get'.
+
+
+ Step 3: All the items associated with a Material Request and having the default Supplier, will be fetched in the Items Table. Any Item that is not required can be deleted.
+
+
+
Note: For this feature to map the Items correctly, the Default Supplier field in the Item Master must be filled.
+
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/buying/index.md b/erpnext/docs/user/manual/en/buying/index.md
similarity index 100%
rename from erpnext/docs/user/guides/buying/index.md
rename to erpnext/docs/user/manual/en/buying/index.md
diff --git a/erpnext/docs/user/guides/buying/index.txt b/erpnext/docs/user/manual/en/buying/index.txt
similarity index 67%
rename from erpnext/docs/user/guides/buying/index.txt
rename to erpnext/docs/user/manual/en/buying/index.txt
index 9c87d09d8e..a12bb06462 100644
--- a/erpnext/docs/user/guides/buying/index.txt
+++ b/erpnext/docs/user/manual/en/buying/index.txt
@@ -2,3 +2,5 @@ supplier
supplier-quotation
purchase-order
setup
+articles
+purchase-taxes
diff --git a/erpnext/docs/user/guides/buying/purchase-order.md b/erpnext/docs/user/manual/en/buying/purchase-order.md
similarity index 90%
rename from erpnext/docs/user/guides/buying/purchase-order.md
rename to erpnext/docs/user/manual/en/buying/purchase-order.md
index b6badf6238..e7f24290fa 100644
--- a/erpnext/docs/user/guides/buying/purchase-order.md
+++ b/erpnext/docs/user/manual/en/buying/purchase-order.md
@@ -7,7 +7,7 @@ Supplier Quotation.
#### Purchase Order Flow Chart
-
+
In ERPNext, you can also make a Purchase Order directly by going to:
@@ -15,7 +15,7 @@ In ERPNext, you can also make a Purchase Order directly by going to:
#### Create Purchase Order
-
+
Entering a Purchase Order is very similar to a Purchase Request, additionally
you will have to set:
@@ -73,7 +73,7 @@ Nos (from the Item form)
#### Figure 3: Conversion of Purchase UOM to stock UOM
-
+
__Step 4:__ Mention the UOM conversion factor. For example, (100);If one box has
100 pieces.
diff --git a/erpnext/docs/user/guides/buying/purchase-taxes.md b/erpnext/docs/user/manual/en/buying/purchase-taxes.md
similarity index 95%
rename from erpnext/docs/user/guides/buying/purchase-taxes.md
rename to erpnext/docs/user/manual/en/buying/purchase-taxes.md
index 0e5ebb3a20..871ff96081 100644
--- a/erpnext/docs/user/guides/buying/purchase-taxes.md
+++ b/erpnext/docs/user/manual/en/buying/purchase-taxes.md
@@ -8,7 +8,7 @@ Orders and Purchase Invoices.
> Buying > Setup > Purchase Taxes and Charges Template > New Purchase Taxes and Charges
Master
-
+
diff --git a/erpnext/docs/user/guides/buying/setup/buying-settings.md b/erpnext/docs/user/manual/en/buying/setup/buying-settings.md
similarity index 89%
rename from erpnext/docs/user/guides/buying/setup/buying-settings.md
rename to erpnext/docs/user/manual/en/buying/setup/buying-settings.md
index dc9fa8e143..d4c390bf7e 100644
--- a/erpnext/docs/user/guides/buying/setup/buying-settings.md
+++ b/erpnext/docs/user/manual/en/buying/setup/buying-settings.md
@@ -1,6 +1,6 @@
Buying Settings is where you can define properties which will be applied in the Buying module's transactions.
-
+
Let us look at the various options that can be configured:
@@ -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.]({{url_prefix}}/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
diff --git a/erpnext/docs/user/guides/buying/setup/index.md b/erpnext/docs/user/manual/en/buying/setup/index.md
similarity index 100%
rename from erpnext/docs/user/guides/buying/setup/index.md
rename to erpnext/docs/user/manual/en/buying/setup/index.md
diff --git a/erpnext/docs/user/guides/buying/setup/index.txt b/erpnext/docs/user/manual/en/buying/setup/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/buying/setup/index.txt
rename to erpnext/docs/user/manual/en/buying/setup/index.txt
diff --git a/erpnext/docs/user/guides/buying/setup/supplier-type.md b/erpnext/docs/user/manual/en/buying/setup/supplier-type.md
similarity index 91%
rename from erpnext/docs/user/guides/buying/setup/supplier-type.md
rename to erpnext/docs/user/manual/en/buying/setup/supplier-type.md
index 9ca8978069..61f65fa689 100644
--- a/erpnext/docs/user/guides/buying/setup/supplier-type.md
+++ b/erpnext/docs/user/manual/en/buying/setup/supplier-type.md
@@ -14,7 +14,7 @@ You can create your own category of Supplier Type.
> Buying > Setup > Supplier Type > New Supplier Type
-
+
You can classify your suppliers from a range of choice available in ERPNext.
Choose from a set of given options like Distributor, Electrical,Hardware,
diff --git a/erpnext/docs/user/guides/buying/supplier-quotation.md b/erpnext/docs/user/manual/en/buying/supplier-quotation.md
similarity index 84%
rename from erpnext/docs/user/guides/buying/supplier-quotation.md
rename to erpnext/docs/user/manual/en/buying/supplier-quotation.md
index a0047e6867..0f1d51aae4 100644
--- a/erpnext/docs/user/guides/buying/supplier-quotation.md
+++ b/erpnext/docs/user/manual/en/buying/supplier-quotation.md
@@ -8,7 +8,7 @@ You can make a supplier quotation from a Material Request
#### Supplier Quotation Flow-Chart
-
+
You can also make a Supplier Quotation directly from:
@@ -16,7 +16,7 @@ You can also make a Supplier Quotation directly from:
#### Create Supplier Quotation
-
+
If you have multiple Suppliers who supply you with the same Item, you
usually send out a message (Request for Quote) to various Suppliers. In
diff --git a/erpnext/docs/user/guides/buying/supplier.md b/erpnext/docs/user/manual/en/buying/supplier.md
similarity index 92%
rename from erpnext/docs/user/guides/buying/supplier.md
rename to erpnext/docs/user/manual/en/buying/supplier.md
index 9e20642c97..455e06020b 100644
--- a/erpnext/docs/user/guides/buying/supplier.md
+++ b/erpnext/docs/user/manual/en/buying/supplier.md
@@ -5,7 +5,7 @@ You can create a new Supplier via:
> Buying > Documents > Supplier > New Supplier
-
+
### Contacts and Addresses
diff --git a/erpnext/docs/user/guides/customer-portal/customer-orders-invoices-and-shipping-status.md b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
similarity index 62%
rename from erpnext/docs/user/guides/customer-portal/customer-orders-invoices-and-shipping-status.md
rename to erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
index b176d10882..83d7bf6494 100644
--- a/erpnext/docs/user/guides/customer-portal/customer-orders-invoices-and-shipping-status.md
+++ b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
@@ -2,21 +2,21 @@ ERPNext Web Portal gives your customers quick access to their Orders, Invoices
and Shipments Customers can check the status of their orders, invoices, and
shipping status by logging on to the web.
-
+
Once an order is raised, either using the Shopping Cart or from within
ERPNext, your customer can view the order and keep an eye on the billing and
shipment status. When the invoice and payment against these orders are
submitted, the customer can see the updated status on the portal, at a glance.
-
+
#### Invoice with paid status.
-
+
#### Invoice with billed status.
-
+
{next}
diff --git a/erpnext/docs/user/guides/customer-portal/index.md b/erpnext/docs/user/manual/en/customer-portal/index.md
similarity index 100%
rename from erpnext/docs/user/guides/customer-portal/index.md
rename to erpnext/docs/user/manual/en/customer-portal/index.md
diff --git a/erpnext/docs/user/guides/customer-portal/index.txt b/erpnext/docs/user/manual/en/customer-portal/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/customer-portal/index.txt
rename to erpnext/docs/user/manual/en/customer-portal/index.txt
diff --git a/erpnext/docs/user/manual/en/customer-portal/issues.md b/erpnext/docs/user/manual/en/customer-portal/issues.md
new file mode 100644
index 0000000000..79ac676f9b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customer-portal/issues.md
@@ -0,0 +1,22 @@
+The customer portal makes it very easy for a customer to raise concerns. A
+simple and intuitive interface facilitates your customer to report their
+concerns as Issues. They can view the complete thread of their
+conversation.
+
+#### Empty Ticket List
+
+
+
+#### New Issue
+
+
+
+#### Open Issue
+
+
+
+#### Reply on Issue
+
+
+
+{next}
diff --git a/erpnext/docs/user/guides/customer-portal/portal-login.md b/erpnext/docs/user/manual/en/customer-portal/portal-login.md
similarity index 65%
rename from erpnext/docs/user/guides/customer-portal/portal-login.md
rename to erpnext/docs/user/manual/en/customer-portal/portal-login.md
index 9d657a827e..4a3b60c9c7 100644
--- a/erpnext/docs/user/guides/customer-portal/portal-login.md
+++ b/erpnext/docs/user/manual/en/customer-portal/portal-login.md
@@ -1,6 +1,6 @@
To login into the customer account, the customer has to use his email id and
the password sent by ERPNext; generated through the sign-up process.
-
+
{next}
diff --git a/erpnext/docs/user/guides/customer-portal/sign-up.md b/erpnext/docs/user/manual/en/customer-portal/sign-up.md
similarity index 54%
rename from erpnext/docs/user/guides/customer-portal/sign-up.md
rename to erpnext/docs/user/manual/en/customer-portal/sign-up.md
index 2e95d494bc..01929ecc0b 100644
--- a/erpnext/docs/user/guides/customer-portal/sign-up.md
+++ b/erpnext/docs/user/manual/en/customer-portal/sign-up.md
@@ -2,19 +2,19 @@ Customers have to log-in to the Company Website, and sign-up as a customer.
#### Step 1: Click on Login Icon
-
+
#### Step 2: Click on Sign Up Icon
-
+
#### Step 3: Enter Customer Name and ID
-
+
After the sign up process, a mail will be sent to the customers email id with
the password details.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md
new file mode 100644
index 0000000000..7460568d67
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md
@@ -0,0 +1,26 @@
+
Allow Fields to be Changed After Submit
+
+In many cases a field may need to be changed even after the document has been submitted to allow flexibility. The _Allow On Submit_ option is available for such a purpose. Certain standard fields in Doctypes are set as Allow On Submit by default (such as _Letterhead_ and _Print Heading_ in Invoices). The user can set Custom Fields as Allow On Submit using Customize Form.
+
+**Note:** Standard Fields cannot be set as Allow On Submit by a User
+
+#### Step 1: Go to Customize Form in Setup Module.
+
+```Setup >> Customize >> Customize Form```
+
+####
+####Step 2: Select the form containing the desired Custom Field in _Enter Form Type_ field.
+
+
+
+#### **Step 3:** In the _Fields_ section, scroll down, click on the Custom field and check the _Allow On Submit._
+
+
+
+_This field can now be changed even after the Document is submitted_.
+
+**Note:** The Custom Fields can also be set as Allow On Submit during the time of creation by checking the Allow On Submit option that is available.
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.html b/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.html
new file mode 100644
index 0000000000..cf27229148
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/creating-custom-link-field.html
@@ -0,0 +1,7 @@
+
Creating Custom Link Fields
+
+Users can create Custom Link Fields within DocTypes by following these steps;
+
+
+
+
Step 1: Go to Customize Form in Setup Module.
Setup >> Customize >> Customize Form
Step 2: Select the desired form in Enter Form Type field.
Step 3: In the Fields section;
Insert a new Field row and set the attributes as;
Label: Desired label that user wishes to display in the form
Type: Set as 'Link'
Name: Desired name for the field
Options: Enter the name of the Doctype to which the field is linked
Note: Please refer to https://frappe.io/kb/customization/form-architecture for more information about the form structure
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md
new file mode 100644
index 0000000000..cc7ac01a04
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/customizing-sorting-order-in-the-list-view.md
@@ -0,0 +1,29 @@
+
Customizing Sorting Order in the List View
+
+**Question:** I want records in my Item List sorted based on Desc Order of Item Code.
+
+**Answers:** Following are the steps to customize Sort Order for the Item master. These steps will be applicable for customizing Sort Order for the other documents as well.
+
+####Step 1: Go to Customize Form
+
+`Setup > Customize > Customize Form`
+
+####Step 2: Select Doctype
+
+Select document for which you Sort Order is to be customized. Considering a scenario, Item should be selected in the Doctype field.
+
+####Step 3: Update Sort Details
+
+In the Customize Form, you will find these fields.
+
+
+
+1. Sort Field
+
+Select field based on which sorting will be done. It will be "Item_Code" field in scenario.
+
+2. Sort Order
+
+Sort Order will be two possible options, **Asc** for ascending, and **Desc** for descending.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md
new file mode 100644
index 0000000000..bb0461ce0c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/deleting-custom-reports.md
@@ -0,0 +1,23 @@
+
Deleting Custom Reports
+
+ERPNext has several [types of reports](https://erpnext.com/kb/report/making-custom-reports-in-erpnext) which can be customize as per the companies/users requirement.
+
+If there is a report custom report which needs to be deleted, it can be achieved by following steps given below. Please note that its applicable only for the Custom Report, and not for the standard reports.
+
+####Report List
+
+In the Awesome Bar, type and select "Report List" for an option.
+
+
+
+####Selecting and Deleting Report
+
+The Report List will have all the standard and custom reports of your account. You can select Custom Report to be deleted from the list itself, and click on Delete icon.
+
+
+
+Or you can open that report, and delete it from File menu option.
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md
new file mode 100644
index 0000000000..2f9655ce72
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/disable-rounded-total.md
@@ -0,0 +1,23 @@
+
Disable Rounded Total
+
+Each transaction in ERPNext has Standard print format. For transactions, Standard print format covers Rounded Total for that transaction by default.
+
+
+
+If you don't wish rounded total to be shown in the Standard Print Format, please complete following settings.
+
+####1. Go to Global Settings
+
+`Setup > Settings > Global Settings`
+
+####2. Set Global Defaults
+
+Check Disable Rounded Total, and Save Global Defaults.
+
+
+
+For system to take effect of this setting, you should clear cache and refresh your ERPNext account. Then your print formats shall not render value for the Rounded Total in the print formats.
+
+
Note: This setting will only affect Standard print formats.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.html b/erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.html
new file mode 100644
index 0000000000..6b1c38b2b9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/field-types.html
@@ -0,0 +1,168 @@
+
Field Types
+
+
Following are the types of fields you can define while creating new ones, or while amend standard ones.
+
+
Attach:
+
+
+ Attach field allows you browsing file from File Manager and attach in the transaction.
+
+
+
+
+
+
+
Button:
+
+
+ This Field Type will generate a Button, on clicking which you can execute some function.
+
+
+
+
Check:
+
+
+ Check will generate a check box field.
+
+
+
+
+
+
+
Column Break:
+
+
+ Since ERPNext has two column layout, using Column Break fields, you can divide set of fields on either side.
+
+
+
+
+
+
+
Currency:
+
+
+ Currency field holds numeric value, upto two decimal place. Also you can have currency symbol being shown for the currency field.
+
+
+
+
+
+
+
+
+
Data:
+
+
+ Data field allows you entering value upto 255 character.
+
+
+
+
+
+
+
Date and Time:
This field will give you date and time picker, with value for current date and time (as provided by your computer) set by default.
+
+
+
+
+
Dynamic Link:
Link field is one which pulls data from another master/table. Dynamic link field is connected with multiple masters at the same time. Its link is determined based on value selected in the previous field.
+
+ Example: Customer will be Dynamic field in the Quotation form. If use selects Quotation made for Customer, then Customer field will be linked to Customer master, and suggest records accordingly. If user selects that Quotation is for Lead, then same Customer
+ field will be linked to Lead master.
+
+
+
+
Float:
+
+
+ Float field carries numeric value, upto six decimal place. Float Precision set in Setup >> Settings >> System Setting will be applicable on all the link field. For float field, decimal places generated will be as define in Float Precision.
+
+
+
+ If you need more than two decimal place in the Currency field, you can change its field type to Float field from Customize Form.
+
+
+
+
Image:
+
+
+ Image field will render an image file selected in another attach field.
+
+
+
+
+ For the Image field, under Option, Attach field name should be provide which this field will refer to for image file, and render that image file.
+
+
+
+
Int (Integer):
+
+
+ Integer field holds numeric value, without decimal place.
+
+
+
+
Link Field:
+
+ Link field is connected with another master from where it fetches data.
+
+
+
+
+
+
+
Password:
Password field will decode value in it. Extra coding will be required for validating password of specific user.
+
+
+
Read Only:
Read Only field will carry data fetched from another form, but they themselves will be non-editable. You should set Read Only as field type if its source for value is predetermined.
+
+
+
+
Section Break:
+
+
+ Section Break can be used to divide form in multiple section.
+
+
+
+
+
+
+
Select:
Select will be the drop-down field, with possible results (separate by row) define in the Option.
+
+
+
+
+
+
+
Small Text:
+
+
+ Small Text field carries general text content, has little more character limit than Data field.
+
+
+
+
+
+
+
Table:
+
+
+ Table will be (sort of) Link field which will render another docytpe within the current form. For example, Item table in the Sales Order form is Table field, which is linked to Sales Order Item doctype.
+
+
+
+
+
+
+
Text Editor:
+
+
+ Text Editor will be large text field, with tools to format text.
+
+
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.html b/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.html
new file mode 100644
index 0000000000..450bfb13be
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/increase-max-attachments.html
@@ -0,0 +1,24 @@
+
Increase Max Attachments
+
+You can increase Number of attachments which can be added to particular documents via Customize Form.
+
+ Let's assume we need to increase Max Attachment limit for Quotation to five. Following will be the steps to achieve this.
+
+
+Step 1: Go to Setup > Customize > Customize Form.
+
+ Step 2: Enter Form Type.
+ In our case, it will be "Quotation".
+
+ Step 3: Increase Numbers under the Max Attachments field.
+
+
+
+
+ After increasing numbers update the Customization Form.
+
+
+
Note: Max limit/size of an attachment is 1MB.
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/index.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.md
new file mode 100644
index 0000000000..0dff60b400
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.md
@@ -0,0 +1 @@
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt
new file mode 100644
index 0000000000..3ac0897283
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/index.txt
@@ -0,0 +1,16 @@
+allow-fields-to-be-changed-after-submit
+creating-custom-link-field
+customizing-sorting-order-in-the-list-view
+deleting-custom-reports
+disable-rounded-total
+field-types
+increase-max-attachments
+make-field-visible-in-print-format
+making-custom-reports-in-erpnext
+managing-dynamic-link-fields
+module-visibility
+perm-level-error-in-permission-manager-1
+search-record-by-specific-field
+set-language
+set-precision-for-float-currency-and-percent-fields
+user-restriction
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.html b/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.html
new file mode 100644
index 0000000000..ffdd9d210f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/make-field-visible-in-print-format.html
@@ -0,0 +1,5 @@
+
Make Fields Visible In Print Format
+
+The standard print formats only display certain fields by default. In case the user prefers more information from fields to be displayed, this can be achieved by using the Customize Form feature.
Step 1: Go to Customize Form in Setup Module.
+
Setup >> Customize >> Customize Form
+Step 2: Select the desired form in Enter Form Type field.
Step 3: In the Fields section, click on the field that must be visible in the Print Format and remove the check on Print Hide field.
The field will now be visible in all print formats for that Document type.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md
new file mode 100644
index 0000000000..540d1cd9eb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/making-custom-reports-in-erpnext.md
@@ -0,0 +1,53 @@
+
Reports in ERPNext
+
+There are three kind of reports in ERPNext.
+
+###1. Query Report
+
+Query Report is written in SQL which pull values from database and fetch in the report. Though SQL queries can be written from front end, like HTML for customer print format, its restricted from hosted users. Because it will allow users with no access to specific report to query data from query report.
+
+Check Purchase Order Item to be Received report in Stock module for example of Query report.
+
+###2. Script Report
+
+Script Reports are written in Python and stored on server side. These are complex reports which involves exception of logic and calculation. Since these reports are written on server side, its not available for hosted users.
+
+Check Financial Analytics report in Accounts module for example of Script Report.
+
+###3. Report Builder
+
+Report Builder is an in-built report customization tool in ERPNext. This allows you to define fields of the form which shall appear as column in the report. Also you can set required filters and do sorting as per your preference.
+
+Each form in ERPNext has Report Builder option in its list view.
+
+
+
+####Adding Column in Report
+
+Go to Menu and click on Pick Column option to select field which should be added as column in the report. You can also select the field from the child table (eg. Item table in Sales Invoice) of the form.
+
+
+
+####Applying Filters
+
+All the fields of the form will be applicable for setting filter as well.
+
+
+
+####Sorting
+
+Select field based on which report will be sorted.
+
+
+
+####Save Report
+
+Go to Menu and click on Save button to have this report saved with selected column, filters and sorting.
+
+
+
+Saved reports appear under Customize section in the module's home page. Customize Report section only appear if you have custom reports being saved for documents of that module.
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md
new file mode 100644
index 0000000000..c14ef394c4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/managing-dynamic-link-fields.md
@@ -0,0 +1,46 @@
+
Managing Dynamic Link Fields
+
+Dynamic Link field is one which can search and hold value of any document/doctype. Let's consider an example to learn how Dynamic Link field can benefit us.
+
+While creating Opportunity or Quotation, we have to explicitly define if it is for Lead or Customer. Based on our selection (Lead/Customer), another link field shows up where we can select actual Lead or Customer for whom we are creating this Quotation.
+
+If you set later field as Dynamic Link, where we select actual Lead or Customer, this field will be able to search Leads as well as Customers. Hence we need not insert separate link fields for Customer and Lead.
+
+Let's check steps to insert Custom Dynamic Field. For an instance, we will insert it under Journal Voucher Form.
+
+####Insert Link Field for Doctype
+
+Firstly we will create a link field which will be linked to the Doctype.
+
+
+
+By **Doctype** mentioned in the Option field, we mean parent Doctype. So, just like Quotation is one Doctype, which has multiple Quotation under it. Same way, Doctype is also a Doctype which has Sales Order Doctype, Purchase Order Doctype and other form's doctype created under it as child Doctype.
+
+-- Doctype
+----- Sales Order
+----- Purchase Invoice
+----- Quotation
+----- Sales Invoice
+----- Employee
+----- Production Order
+and so on, till all the forms/document of ERPNext is covered.
+
+So linking this field with parent Doctype master list all the child doctypes/forms.
+
+
+
+####Insert Dynamic Link Field
+
+It will be "Dynamic Link" for Field Type, and field name of Doctype field mentioned in its Option field.
+
+
+
+This field will allow us to select document id, based on value selected in the Doctype link field. For example, if we select Sales Order in the prior field, this field will list all the Sales Orders id. If we select Purchase Invoice in the prior field, this field will render all the Purchase Order for our selection.
+
+
+
+####Customizing options in the Doctype Link field
+
+Bydefault, Docytpe link field will provide all the forms/doctypes for selection. If you wish this field to show certain specific doctypes in the search result, you will need to write Custom Script for it.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/module-visibility.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/module-visibility.md
new file mode 100644
index 0000000000..837ca92d66
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/module-visibility.md
@@ -0,0 +1,17 @@
+
Module Visibility
+
+If you have permission on specific module, but it is still not visible to you, following is how you should go about checking setting to make it visible again.
+
+As step zero, reassure that you have role assigned which is required for accessing Website and Shopping Cart module. For modules in question, you should have "Website Manager" role assigned. If permissions has been customized in your account, check Role Permission Manager to know which Role has permission on Website and Shopping Cart module.
+
+If modules are hidden in-spite of assignment of required permission, then you should check if Website and Shopping Cart module is not disabled from All Application option on your desk/home page.
+
+
+
+If modules are still not visible, check if it is hidden by System Manager from Show/Hide Modules option in the Setup module.
+
+
Setup >> Settings >> Show / Hide Modules
Ensure required module are checked, and not disabled in this page. If you just enabled/activated it, update Show/Hide Module page, and check your home page after Help >> Clear Cache.
+
+
Note: In this help page, Website and Shopping Cart module is considered as an example. You can troubleshoot visibility issues for other modules following same steps.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager-1.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager-1.md
new file mode 100644
index 0000000000..2fb27b65c3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/perm-level-error-in-permission-manager-1.md
@@ -0,0 +1,19 @@
+
Perm Level Error in Permission Manager
+
+While customizing rules in the [Permission Manager](https://erpnext.com/user-guide/setting-up/permissions/role-based-permissions), you might receive an error message saying:
+
+`For System Manager_ (or other role) _at level 2_ (or other level) _in Customer_ (or document) _in row 8: Permission at level 0 must be set before higher levels are set`.
+
+Error message indicates problem in the existing permission setting for this document.
+
+For any role, before assigning permission at Perm Level 1, 2, permission at Perm Level 0 must be assigned. Error message says that System Manager has been assigned permission at Perm Level 1 and 2, but not at level 0. You should first correct the permission for System Manager's role by:
+
+- Assigning permission to System Manager at level 0.
+
+Or
+
+- By removing permission at level 1 and 2.
+
+After executing one of the above step, you should try adding additional rules in the Role Permission Manager.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md
new file mode 100644
index 0000000000..15059640a1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/search-record-by-specific-field.md
@@ -0,0 +1,21 @@
+
Search Record by Specific Field
+
+While creating any document in ERPNext, you might have to select other record id in it (like selecting Customer in Quotation). For ease in selecting other record, you can search them based on value in various fields of that record. Search By functionality enables you searching and filtering records based on value in the specific fields of that record.
+
+Let's consider an example to learn Search By functionality better. While creating Sales Order, we need to select Customer in it. If we need to filter search result of Customer for specific Customer Group, we should go about following these steps to achieve it.
+
+####Search By in Customize Form
+
+In the Customize Form tool, you will find field called Search Field. You should enter field names based on which we can search and filter result for this document.
+
+Considering our scenario, we should update name of Customer Group field for Customer in the Customize Form.
+
+![Search By in Customize Form]()
+
+####Searching in Another Record.
+
+While creating transaction, to get filtered result for Customer, you should firstly click on search magnifier.
+
+![Search for master]()
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md
new file mode 100644
index 0000000000..91e9e5f815
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-language.md
@@ -0,0 +1,38 @@
+
Change the Language
+
+ERPNext is an multi-lingual application, which means user can select a preferred language for one's ERPNext account.
+
+### 1. Setting Language in User's Account
+
+Following are the steps to set language in your ERPNext account.
+
+#### 1.1 Go to My Setting
+
+
+
+#### 1.2 Select Language
+
+
+
+#### 1.3 Save User
+
+On saving User after selecting language, your ERPNext account will be refresh automatically. Then you will see ERPNext translated in your selected language.
+
+Being a System Manager, you can set language in other user's master as well.
+
+### 2. Set Language Globally for an Account
+
+#### 2.1 Go to Setup
+
+`Setup > Settings > System Settings`
+
+#### Set Language
+
+
+
+#### Save
+
+Save System Settings, and refresh your EPRNext account. On refreshing, you should language in your ERPNext account changed as per your preference.
+
+Note: For now, we have translation available only for few languages. You can contribute to make translation better, and add new languages from [here](https://frappe.io/translator).
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision-for-float-currency-and-percent-fields.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision-for-float-currency-and-percent-fields.md
new file mode 100644
index 0000000000..2cc39e19d4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/set-precision-for-float-currency-and-percent-fields.md
@@ -0,0 +1,26 @@
+
Set Precision for Float, Currency and Percent fields
+
+In ERPNext, default precision for `Float`, `Currency` and `Percent` field is 3. So, you can enter any number up-to 3 decimals in such fields.
+
+You can also change / customize the precision settings globally or for a specific field.
+
+To change the precision globally, go to `Setup > Settings > System Settings`.
+
+
+You can also set field specific precision. To do that go to `Setup > Customize > Customize Form` and select the DocType there. Then go to the specific field row and change precision. Precision field is only visible if field-type is one of the Float, Currency and Percent.
+
+
+**Note:**
+If you are changing precision of a field to a higher number, all the related fields should also be set to the same precision.
+
+For example, if you want to calculate invoice total upto 5 decimals, you need to change the precision of all related fields, which resulted total. In this case you have to change following fields to get correct total.
+
+ Sales Invoice Item: price_list_rate, base_price_list_rate, rate, base_rate, amount and base_amount
+
+ Taxes and Charges: tax_amount, total and tax_amount_after_discount
+
+ Sales Invoice: net_total, other_charges_total, discount_amount and grand_total
+
+And precision should be changed in all related documents as well, to get correct mapping. In this case, same precision should be set for Quotation, Sales order, Delivery Note and Sales Invoice.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.html b/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.html
new file mode 100644
index 0000000000..09f9cb1a5c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/user-restriction.html
@@ -0,0 +1,29 @@
+
Owner Restriction
+
+To restricting user based on Owner (creator of record), form/document should have field linked with User master. If that document is not linked with user, then you should create custom field and link it with User master.
+
+ Following are the steps to restrict User based on Owner.
+
+ Step 1: Go to:
+
+ Setup > Permissions > Role Permissions Manager
+
+ Step 2: Select Document Type for which you want to set user permission. After permissions are loaded for selected document, scroll to role for which you want to set restriction.
+
+
+ Step 3: For Role to be resricted (Sales User in this case), check "Apply User Restriction". On checking Apply User Permission, two links will be show up called:
+
+ - Select Document Type
+ - Select User Permissions
+
+ Click on "Select Document Type".
+
+
+
+
+ Step 4: Check mark on User, and un-check for others. If you want user to be restricted based on some other criteria as well, like territory, customer groups, then that should be checked as well.
+
+
+
+
+
When restricting User based on User master itself, then there is no need to create User Permission Setting.
diff --git a/erpnext/docs/user/guides/customize-erpnext/custom-doctype.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md
similarity index 80%
rename from erpnext/docs/user/guides/customize-erpnext/custom-doctype.md
rename to erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md
index 02b08deef8..fdca8da62d 100644
--- a/erpnext/docs/user/guides/customize-erpnext/custom-doctype.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-doctype.md
@@ -19,7 +19,7 @@ in the Sales Order Doctype, then you should check Is Child Table. Else no.
not be able to re-produce.
1. Custom?: This field will be checked by default when adding Custom Doctype.
-
+
#### Fields
@@ -34,7 +34,7 @@ Fields are much more than database columns, they can be:
1. Actions (button)
1. Attachments or Images
-
+
When you add fields, you need to enter the **Type**. **Label** is optional for Section Break and Column Break. **Name** (`fieldname`) is the name of the database table column.
@@ -44,19 +44,19 @@ You can also set other properties of the field like whether it is mandatory, rea
In this section, you can define criteria based on which document for this doctype will be named. There are multiple criterion based on which document can be named, like naming based on the value in the specific field, or based on Naming Series, or based on value provided by the user in the prompt, which will be shown when saving document. In the following example, we are doing naming based on the value in the field **book_name**.
-
+
#### Permission
In this table, you should select roles and define permission roles for them for this Doctype.
-
+
#### Save Doctype
On saving doctype, you will get pop-up to provide name for this Doctype.
-
+
#### Doctype in System
@@ -65,10 +65,10 @@ Human Resource module, to access this doctype, go to:
`Human Resource > Document > Book`
-
+
#### Book master
Using the fields entered, following is the master one book.
-
+
diff --git a/erpnext/docs/user/guides/customize-erpnext/custom-field.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md
similarity index 80%
rename from erpnext/docs/user/guides/customize-erpnext/custom-field.md
rename to erpnext/docs/user/manual/en/customize-erpnext/custom-field.md
index ed30f529b1..8aefa80544 100644
--- a/erpnext/docs/user/guides/customize-erpnext/custom-field.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-field.md
@@ -13,7 +13,7 @@ You can also insert new Custom Field from [Customize Form](https://erpnext.com/c
In Customize Form, for each field, you will find plus (+) option. When click on it, new row will be inserted above that field. You can enter properties for your Custom Field in the newly added blank row.
-
+
Following are the steps to insert Custom Field in the existing form.
@@ -25,35 +25,35 @@ As mentioned above, you can insert Custom Field from Custom Field form, and also
You should select transaction or master in which you want to insert custom field. Let's assume you need to insert a custom link field in the Quotation form. In this case, Document will be "Quotation".
-
+
####Set Field Label
Custom Field's name will be set based on its Label. If you want to create Custom Field with specific name, but with different label, then you should first set Label as you want Field Name to be set. After Custom Field is saved, you can edit the Field Label again.
-
+
####Select Insert After
This field will have all the existing field of the form/doctype selected. Your Custom Field will be placed after field you select in the Insert After field.
-
+
####Select Field Type
Click [here](https://erpnext.com/kb/customize/field-types) to learn more about types of field you can set for your Custom Field.
-
+
####Set Option
If you are creating a Link field, then Doctype name with which this field will be linked to will be entered in the Option field. Click [here](https://erpnext.com/kb/customize/creating-custom-link-field) to learn more about creating custom link field.
-
+
If field type is set as Select (drop down field), then all he possible result for this field should be listed in the Options field. Each possible result should be separate by row.
-
+
For other field types, like Data, Date, Currency etc., Opton field will be left blank.
@@ -68,7 +68,7 @@ You can set properties as:
1. Read Only: Checking this option will make custom field non-editable.
1. Allow on Submit: Checking this option will allow editing value in the field when in submitted transaction.
-
+
####Deleting Custom Field
diff --git a/erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/custom-button.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-button.md
similarity index 100%
rename from erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/custom-button.md
rename to erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-button.md
diff --git a/erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md
similarity index 81%
rename from erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md
rename to erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md
index 792460af5a..b77c9b8c5e 100644
--- a/erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/custom-script-fetch-values-from-master.md
+++ b/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]({{url_prefix}}/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}
diff --git a/erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md
similarity index 100%
rename from erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md
rename to erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md
diff --git a/erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/generate-item-code-based-on-custom-logic.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/generate-item-code-based-on-custom-logic.md
similarity index 100%
rename from erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/generate-item-code-based-on-custom-logic.md
rename to erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/generate-item-code-based-on-custom-logic.md
diff --git a/erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/index.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.md
similarity index 100%
rename from erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/index.md
rename to erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.md
diff --git a/erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/index.txt b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/index.txt
rename to erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/index.txt
diff --git a/erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/make-read-only-after-saving.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/make-read-only-after-saving.md
similarity index 100%
rename from erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/make-read-only-after-saving.md
rename to erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/make-read-only-after-saving.md
diff --git a/erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md
similarity index 100%
rename from erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md
rename to erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md
diff --git a/erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md
similarity index 100%
rename from erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md
rename to erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md
diff --git a/erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md
similarity index 100%
rename from erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md
rename to erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md
diff --git a/erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/sales-invoice-id-based-on-sales-order-id.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/sales-invoice-id-based-on-sales-order-id.md
similarity index 100%
rename from erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/sales-invoice-id-based-on-sales-order-id.md
rename to erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/sales-invoice-id-based-on-sales-order-id.md
diff --git a/erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/update-date-field-based-on-value-in-other-date-field.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/update-date-field-based-on-value-in-other-date-field.md
similarity index 100%
rename from erpnext/docs/user/guides/customize-erpnext/custom-scripts/custom-script-examples/update-date-field-based-on-value-in-other-date-field.md
rename to erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/update-date-field-based-on-value-in-other-date-field.md
diff --git a/erpnext/docs/user/guides/customize-erpnext/custom-scripts/index.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.md
similarity index 77%
rename from erpnext/docs/user/guides/customize-erpnext/custom-scripts/index.md
rename to erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.md
index 13ba6c6693..e5e9d74159 100644
--- a/erpnext/docs/user/guides/customize-erpnext/custom-scripts/index.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.md
@@ -4,7 +4,7 @@ Lead form, you can do so by creating your own script.
> Setup > Customization > Custom Script
-
+
### Topics
diff --git a/erpnext/docs/user/guides/customize-erpnext/custom-scripts/index.txt b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/customize-erpnext/custom-scripts/index.txt
rename to erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/index.txt
diff --git a/erpnext/docs/user/guides/customize-erpnext/customize-form.md b/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md
similarity index 91%
rename from erpnext/docs/user/guides/customize-erpnext/customize-form.md
rename to erpnext/docs/user/manual/en/customize-erpnext/customize-form.md
index c76d6571a1..232f34b17e 100644
--- a/erpnext/docs/user/guides/customize-erpnext/customize-form.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/customize-form.md
@@ -11,13 +11,13 @@ You can go to Customize Form from:
System Manager will find Customize Form option in the Sales Order list (or any other form for that matter) view as well.
-
+
####Step 2: Select Docytpe/Document
You should select Docytpe/Document which has field-to-be-customized located in it.
-
+
####Step 3:Edit Property
@@ -25,7 +25,7 @@ On selecting Doctype/table, you will have all the fields of the table updated as
On clicking Project Name row, fields to set various property for this field will be shown. To Customize the mandatory property for a field, there is a field called "Mandatory". Checking this field will set Project Name field as mandatory in the Quotation form.
-
+
Like this, you can customize following properties of the field.
@@ -38,7 +38,7 @@ Like this, you can customize following properties of the field.
####Step 4: Update
-
+
Before checking Sales Order form, you should clear cache and refresh browser tab for customization to take effect.
diff --git a/erpnext/docs/user/guides/customize-erpnext/document-title.md b/erpnext/docs/user/manual/en/customize-erpnext/document-title.md
similarity index 91%
rename from erpnext/docs/user/guides/customize-erpnext/document-title.md
rename to erpnext/docs/user/manual/en/customize-erpnext/document-title.md
index 338068adca..639e3580f5 100644
--- a/erpnext/docs/user/guides/customize-erpnext/document-title.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/document-title.md
@@ -21,13 +21,13 @@ You can define the title by setting document properties in braces `{}`. For exam
{customer_name} for {project}
+ src="{{docs_base_url}}/assets/img/customize/customize-title.gif">
#### Fixed or Editable Titles
If your title is generated as a default title, it can be edited by the user by clicking on the heading of the document.
+ src="{{docs_base_url}}/assets/img/customize/editable-title.gif">
If you want a fixed title, you can set the rule in the **Options** property. In this way, the title will be automatically updated everytime the document is updated.
diff --git a/erpnext/docs/user/guides/customize-erpnext/hiding-modules-and-features.md b/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md
similarity index 83%
rename from erpnext/docs/user/guides/customize-erpnext/hiding-modules-and-features.md
rename to erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md
index 57154ad10f..60addc1c2b 100644
--- a/erpnext/docs/user/guides/customize-erpnext/hiding-modules-and-features.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md
@@ -7,7 +7,7 @@ dont require, go to:
> Setup > Tools > Hide/Unhide Features
-
+
Check / uncheck the features you want to use and refresh your page for the
changes to take effect.
@@ -20,7 +20,7 @@ To hide modules (icons) from the home page, go to:
Setup > Tools> Modules Setup
-
+
> Note: Modules are automatically hidden for users that have no permissions on
the documents within that module. For example, if a user has no permissions on
diff --git a/erpnext/docs/user/guides/customize-erpnext/index.md b/erpnext/docs/user/manual/en/customize-erpnext/index.md
similarity index 100%
rename from erpnext/docs/user/guides/customize-erpnext/index.md
rename to erpnext/docs/user/manual/en/customize-erpnext/index.md
diff --git a/erpnext/docs/user/guides/customize-erpnext/index.txt b/erpnext/docs/user/manual/en/customize-erpnext/index.txt
similarity index 92%
rename from erpnext/docs/user/guides/customize-erpnext/index.txt
rename to erpnext/docs/user/manual/en/customize-erpnext/index.txt
index a225d445fe..1113395303 100644
--- a/erpnext/docs/user/guides/customize-erpnext/index.txt
+++ b/erpnext/docs/user/manual/en/customize-erpnext/index.txt
@@ -5,3 +5,4 @@ customize-form
document-title
hiding-modules-and-features
print-format
+articles
diff --git a/erpnext/docs/user/guides/customize-erpnext/print-format.md b/erpnext/docs/user/manual/en/customize-erpnext/print-format.md
similarity index 95%
rename from erpnext/docs/user/guides/customize-erpnext/print-format.md
rename to erpnext/docs/user/manual/en/customize-erpnext/print-format.md
index c373d065de..e3c945005c 100644
--- a/erpnext/docs/user/guides/customize-erpnext/print-format.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/print-format.md
@@ -18,7 +18,7 @@ To create your own versions, open an existing template from:
> Setup > Printing > Print Formats
-
+
Select the type of Print Format you want to edit and click on the “Copy”
button on the right column. A new Print Format will open up with “Is Standard”
@@ -45,7 +45,7 @@ To edit / update your print and PDF settings, go to:
> Setup > Printing and Branding > Print Settings
-
+
#### Example
diff --git a/erpnext/docs/user/guides/human-resources/appraisal.md b/erpnext/docs/user/manual/en/human-resources/appraisal.md
similarity index 75%
rename from erpnext/docs/user/guides/human-resources/appraisal.md
rename to erpnext/docs/user/manual/en/human-resources/appraisal.md
index 021d470c57..d3ec301311 100644
--- a/erpnext/docs/user/guides/human-resources/appraisal.md
+++ b/erpnext/docs/user/manual/en/human-resources/appraisal.md
@@ -6,13 +6,13 @@ giving appropriate weightage to each parameter.
#### Step 1: Select an Appraisal Template
-
+
After you select the template, the remaining form appears.
#### Step 2: Enter Employee Details
-
+
Once the Appraisal Template is completed, you can create Appraisal records for
each period where you track performance. You can give points out of 5 for each
diff --git a/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md b/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md
new file mode 100644
index 0000000000..fddab31e1a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md
@@ -0,0 +1,55 @@
+
Employees Loan Management
+
+Employee Loan is an sum of money paid by Employer to Employee based on certain terms and condition. There are multiple ways accounting for the Employee loan can be managed. Company could collect loan from an employee separately. Or they can choose to deduct loan installment from the employee's salary.
+
+Let's check below how accounting can be managed for Employee Loan in ERPNext.
+
+### 1. Setup Masters
+
+Create following Groups and Ledgers in Chart of Accounts if not there.
+
+#### 1.1 Employee Loan Account
+
+Create Group as 'Employees Loans' under Current Assets and create employee loan A/C (Ledger) under it. [Check this link for new account creation](https://erpnext.com/kb/setup/managing-tree-structure-masters)
+
+
+
+#### 1.2 Salaries Account
+
+Create Group as 'Salaries' under Current Liabilities and create employee salary loan A/C (Ledger) under it.
+
+
+
+#### 1.3 Interest Account
+
+Create Ledger as 'Interest on Loan' under Indirect Income.
+
+### 2. Book Loan Amount
+
+Once loan amount is finalized, make journal voucher to book loan payment entry. You should Credit Loan amount to Bank/Cash account and Debit Loan amount employee loan account.
+
+
+
+### 3. Book Loan Recovery and Interest
+
+#### 3.1 Loan Recovery Entry
+
+If your employee pays separately for his/her loan installment and loan interest, then create journal voucher.
+
+
+
+#### 3.2 Loan Adjustment in Salary
+
+And if you deduct loan installment and interest from employees salary, then book journal entry for the same.
+
+
+
+In the Salary Slip of an employee, then create two Deduction Types in Salary Structure. One as 'Loan Installment' and other one as 'Loan Interest'. So that you can update those values under this deduction heads.
+
+### 4. Loan Account Report
+
+After recovering loan and loan interest, General Ledger report will show the loan account details as follows.
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/articles/index.md b/erpnext/docs/user/manual/en/human-resources/articles/index.md
new file mode 100644
index 0000000000..0dff60b400
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/articles/index.md
@@ -0,0 +1 @@
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/articles/index.txt b/erpnext/docs/user/manual/en/human-resources/articles/index.txt
new file mode 100644
index 0000000000..3fbdc5bb51
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/articles/index.txt
@@ -0,0 +1,2 @@
+employees-loan-management
+leave-calculation-in-salary-slip
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md b/erpnext/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md
new file mode 100644
index 0000000000..715370838a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/articles/leave-calculation-in-salary-slip.md
@@ -0,0 +1,52 @@
+
Leave Calculation In Salary Slip
+
+There are two types of leave which user can apply for.
+
+
+
+
+Paid Leave are firstly allocated by HR manager. As and when Employee creates Leave Application, leaves allocated to him/her are deducted. These leaves doesn't have impact on the employee's Salary Slip.
+
+ When Employee is out of paid leave, he create Leave Application for unpaid leave. The term used for unpaid leave in ERPNext is Leave Without Pay (LWP). These leaves does have impact on the Employee's Salary Slip.
+
+
+
Just marking Absent in the Attendance record do not have impact on salary calculation of an Employee, as that absenteeism could be because of paid leave. Hence creating Leave Application should be created incase of absenteeism.
Let's consider
+a scenario to understand how leaves impact employees Salary Slip.
+
+ Masters:
+
+
+
+
+
Setup Employee
+
Allocate him paid leaves
+
Create Salary Structure for that Employee. In the Earning and Deduction table, select which component of salary should be affected if Employee takes LWP.
+
Create Holiday List (if any), and link it with Employee master.
+
+
When creating Salary Slip for an Employee, following is what you will see:
+
+
+ Working Days: Working Days in Salary Slip are calculated based on number of days selected above. If you don't wish to consider holiday in Working Days, then you should do following setting.
+
+
+
Human Resource >> Setup >> HR Setting
+
+ Uncheck field "Include Holidays in Total No. of Working Days"
+
+
Holidays are counted based on Holiday List attached to the Employee's master.
Leave Without Pay: Leave Without Pay is updated based on Leave Application made for this Employee, in the month for which Salary Slip is created, and which has
+Leave Type as "Leave Without Pay".
+
+ Payment Days: Following is how Payment Days are calculated:
+
+ Payment Days = Working Days - Leave Without Pay
+
+ As indicated above, if you have LWP checked for components in the earning and deducted table, you will notice a reduction in Amount based on no. of LWP of an Employee for that month.
+
+
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/attendance.md b/erpnext/docs/user/manual/en/human-resources/attendance.md
similarity index 63%
rename from erpnext/docs/user/guides/human-resources/attendance.md
rename to erpnext/docs/user/manual/en/human-resources/attendance.md
index 66c3a4c503..7c3b9b6071 100644
--- a/erpnext/docs/user/guides/human-resources/attendance.md
+++ b/erpnext/docs/user/manual/en/human-resources/attendance.md
@@ -3,12 +3,12 @@ day can be created manually by:
> Human Resources > Attendance > New Attendance
-
+
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 ]({{url_prefix}}/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}
diff --git a/erpnext/docs/user/guides/human-resources/employee.md b/erpnext/docs/user/manual/en/human-resources/employee.md
similarity index 56%
rename from erpnext/docs/user/guides/human-resources/employee.md
rename to erpnext/docs/user/manual/en/human-resources/employee.md
index 331fe47396..fd14aa90d3 100644
--- a/erpnext/docs/user/guides/human-resources/employee.md
+++ b/erpnext/docs/user/manual/en/human-resources/employee.md
@@ -4,6 +4,6 @@ To create new Employee go to:
> Human Resources > Employee > New
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/expense-claim.md b/erpnext/docs/user/manual/en/human-resources/expense-claim.md
similarity index 87%
rename from erpnext/docs/user/guides/human-resources/expense-claim.md
rename to erpnext/docs/user/manual/en/human-resources/expense-claim.md
index 0a86f9af87..187bf494ef 100644
--- a/erpnext/docs/user/guides/human-resources/expense-claim.md
+++ b/erpnext/docs/user/manual/en/human-resources/expense-claim.md
@@ -6,7 +6,7 @@ To make a new Expense Claim, go to:
> HR > Expense Claim > New Expense Claim
-
+
Set the Employee ID, date and the list of expenses that are to be claimed and
“Submit” the record.
@@ -34,6 +34,6 @@ because the amount will then be taxable to the Employee.
* To Link Expense Claim with Task or Project specify the Task or the Project while making an Expense Claim
-
+
{next}
diff --git a/erpnext/docs/user/guides/human-resources/holiday-list.md b/erpnext/docs/user/manual/en/human-resources/holiday-list.md
similarity index 91%
rename from erpnext/docs/user/guides/human-resources/holiday-list.md
rename to erpnext/docs/user/manual/en/human-resources/holiday-list.md
index 9676785c91..1a98ad3660 100644
--- a/erpnext/docs/user/guides/human-resources/holiday-list.md
+++ b/erpnext/docs/user/manual/en/human-resources/holiday-list.md
@@ -17,7 +17,7 @@ on Holiday List.
#### Figure 1: Holiday List
-
+
@@ -40,7 +40,7 @@ Mention the holiday reason in the description and select the date from the
#### Figure 2: Adding new holidays to the list
-
+
diff --git a/erpnext/docs/user/guides/human-resources/human-resource-setup.md b/erpnext/docs/user/manual/en/human-resources/human-resource-setup.md
similarity index 100%
rename from erpnext/docs/user/guides/human-resources/human-resource-setup.md
rename to erpnext/docs/user/manual/en/human-resources/human-resource-setup.md
diff --git a/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md b/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md
new file mode 100644
index 0000000000..664c07de0f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md
@@ -0,0 +1,34 @@
+Human Resources Reports
+
+### Employee Leave Balance
+
+Employee Leave Balance Report shows employees and their respective balance leaves under various leave types. Report is generated as per the number of allowed leaves.
+
+
+
+### Employee Birthday
+
+Employee Birthday Report shows Birthdays of your employees.
+
+
+
+### Employee Information
+
+Employee Information Report shows Report View of important information recorded in Employee master.
+
+
+
+### Monthly Salary Register
+
+Monthly Salary Register shows net pay and its components of employee(s) at a glance.
+
+
+
+
+### Monthly Attendance Sheet
+
+Monthly Attendance Sheet shows monthly attendance of selected employee at a glance.
+
+
+
+{next}
diff --git a/erpnext/docs/user/guides/human-resources/index.md b/erpnext/docs/user/manual/en/human-resources/index.md
similarity index 100%
rename from erpnext/docs/user/guides/human-resources/index.md
rename to erpnext/docs/user/manual/en/human-resources/index.md
diff --git a/erpnext/docs/user/guides/human-resources/index.txt b/erpnext/docs/user/manual/en/human-resources/index.txt
similarity index 78%
rename from erpnext/docs/user/guides/human-resources/index.txt
rename to erpnext/docs/user/manual/en/human-resources/index.txt
index eba8accea7..caa3292951 100644
--- a/erpnext/docs/user/guides/human-resources/index.txt
+++ b/erpnext/docs/user/manual/en/human-resources/index.txt
@@ -10,3 +10,6 @@ offer-letter
tools
human-resources-reports
setup
+holiday-list
+human-resource-setup
+articles
diff --git a/erpnext/docs/user/guides/human-resources/job-applicant.md b/erpnext/docs/user/manual/en/human-resources/job-applicant.md
similarity index 65%
rename from erpnext/docs/user/guides/human-resources/job-applicant.md
rename to erpnext/docs/user/manual/en/human-resources/job-applicant.md
index 3fafa95f00..75e6a857a0 100644
--- a/erpnext/docs/user/guides/human-resources/job-applicant.md
+++ b/erpnext/docs/user/manual/en/human-resources/job-applicant.md
@@ -1,10 +1,10 @@
-You can mantain a list of People who have applied for a [Job Opening]({{url_prefix}}/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
> Human Resource > Job Applicant > New
-
+
### Linking with an Email Account
@@ -20,6 +20,6 @@ system shall create a New Job Applicant against each email received on the mailb
* In 'Append To' select 'Job Applicant'
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/job-opening.md b/erpnext/docs/user/manual/en/human-resources/job-opening.md
similarity index 59%
rename from erpnext/docs/user/guides/human-resources/job-opening.md
rename to erpnext/docs/user/manual/en/human-resources/job-opening.md
index bfe914c364..7e4f0c313d 100644
--- a/erpnext/docs/user/guides/human-resources/job-opening.md
+++ b/erpnext/docs/user/manual/en/human-resources/job-opening.md
@@ -4,7 +4,7 @@ To create a new Job Opening go to
> Human Resource > Job Opening > New
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/leave-application.md b/erpnext/docs/user/manual/en/human-resources/leave-application.md
similarity index 68%
rename from erpnext/docs/user/guides/human-resources/leave-application.md
rename to erpnext/docs/user/manual/en/human-resources/leave-application.md
index ecc4677c71..59c963feb3 100644
--- a/erpnext/docs/user/guides/human-resources/leave-application.md
+++ b/erpnext/docs/user/manual/en/human-resources/leave-application.md
@@ -5,7 +5,7 @@ Type and the period for which the leave is taken.
> Human Resources > Leave Application > New Leave Application
-
+
###Setting Leave Approver
@@ -13,12 +13,12 @@ Type and the period for which the leave is taken.
* You need to mention a list of Leave Approvers against an Employee in the Employee Master.
-
+
> 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]({{url_prefix}}/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]({{url_prefix}}/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}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/offer-letter.md b/erpnext/docs/user/manual/en/human-resources/offer-letter.md
similarity index 61%
rename from erpnext/docs/user/guides/human-resources/offer-letter.md
rename to erpnext/docs/user/manual/en/human-resources/offer-letter.md
index 16176f1a0d..9e8c96622d 100644
--- a/erpnext/docs/user/guides/human-resources/offer-letter.md
+++ b/erpnext/docs/user/manual/en/human-resources/offer-letter.md
@@ -5,12 +5,12 @@ In ERPNext you can make a record of the Offer Letters that you can given to cand
> Human Resource > Offer Letter > New
-
+
-> Note: An offer letter can be made only against a [Job Applicant]({{url_prefix}}/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.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/salary-and-payroll.md b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
similarity index 93%
rename from erpnext/docs/user/guides/human-resources/salary-and-payroll.md
rename to erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
index 64c8f3ccde..05e01e1bea 100644
--- a/erpnext/docs/user/guides/human-resources/salary-and-payroll.md
+++ b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
@@ -44,7 +44,7 @@ To create a new Salary Structure go to:
#### Figure 1:Salary Structure
-
+
### In the Salary Structure,
@@ -76,7 +76,7 @@ Slip.
#### Figure 2: Salary Slip
-
+
You can also create salary slip for multiple employees using Process Payroll:
@@ -84,7 +84,7 @@ You can also create salary slip for multiple employees using Process Payroll:
#### Figure 3: Process Payroll
-
+
In Process Payroll,
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/branch.md b/erpnext/docs/user/manual/en/human-resources/setup/branch.md
new file mode 100644
index 0000000000..8116ca4c11
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/branch.md
@@ -0,0 +1,5 @@
+Branches of your organization
+
+
+
+{next}
diff --git a/erpnext/docs/user/guides/human-resources/setup/deduction-type.md b/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md
similarity index 61%
rename from erpnext/docs/user/guides/human-resources/setup/deduction-type.md
rename to erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md
index dde17a303f..4371b624ed 100644
--- a/erpnext/docs/user/guides/human-resources/setup/deduction-type.md
+++ b/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md
@@ -4,7 +4,7 @@ To create a new Deduction Type
> Human Resource > Setup > Deduction Type > New
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/department.md b/erpnext/docs/user/manual/en/human-resources/setup/department.md
new file mode 100644
index 0000000000..1b088b158f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/department.md
@@ -0,0 +1,5 @@
+Departments in your organization
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/designation.md b/erpnext/docs/user/manual/en/human-resources/setup/designation.md
new file mode 100644
index 0000000000..1de779e7b3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/designation.md
@@ -0,0 +1,5 @@
+Designations in your organization
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/setup/earning-type.md b/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md
similarity index 59%
rename from erpnext/docs/user/guides/human-resources/setup/earning-type.md
rename to erpnext/docs/user/manual/en/human-resources/setup/earning-type.md
index ab97634e4d..e5c35c6e1c 100644
--- a/erpnext/docs/user/guides/human-resources/setup/earning-type.md
+++ b/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md
@@ -4,7 +4,7 @@ To create a new Earning Type
> Human Resource > Setup > Earning Type > New
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md b/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md
new file mode 100644
index 0000000000..37d0fd3973
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md
@@ -0,0 +1,5 @@
+Various employment contracts you have with your employees.
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/holiday-list.md b/erpnext/docs/user/manual/en/human-resources/setup/holiday-list.md
new file mode 100644
index 0000000000..31094f72d0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/holiday-list.md
@@ -0,0 +1,5 @@
+You can specify the Holidays for a particular year using Holiday List.
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md b/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md
new file mode 100644
index 0000000000..1741df4a5f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md
@@ -0,0 +1,7 @@
+# HR Settings
+
+GLobal settings for HR related documents
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/index.md b/erpnext/docs/user/manual/en/human-resources/setup/index.md
new file mode 100644
index 0000000000..0dff60b400
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/index.md
@@ -0,0 +1 @@
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/setup/index.txt b/erpnext/docs/user/manual/en/human-resources/setup/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/human-resources/setup/index.txt
rename to erpnext/docs/user/manual/en/human-resources/setup/index.txt
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/leave-allocation.md b/erpnext/docs/user/manual/en/human-resources/setup/leave-allocation.md
new file mode 100644
index 0000000000..0e8ee945b3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/leave-allocation.md
@@ -0,0 +1,7 @@
+Helps you allocate Leaves to a particular Employee
+
+
+
+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}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/setup/leave-type.md b/erpnext/docs/user/manual/en/human-resources/setup/leave-type.md
similarity index 74%
rename from erpnext/docs/user/guides/human-resources/setup/leave-type.md
rename to erpnext/docs/user/manual/en/human-resources/setup/leave-type.md
index 78b3ab660a..d52cb2e8a2 100644
--- a/erpnext/docs/user/guides/human-resources/setup/leave-type.md
+++ b/erpnext/docs/user/manual/en/human-resources/setup/leave-type.md
@@ -1,6 +1,6 @@
Specify the Type of Leave that can be allocated against an Employee
-
+
* 'Max Days Leave Allowed' specifies the maximum number of days this type of leave can be taken at a strech.
* 'Is LWP' specifies if the Leave is without Pay.
diff --git a/erpnext/docs/user/manual/en/human-resources/tools/index.md b/erpnext/docs/user/manual/en/human-resources/tools/index.md
new file mode 100644
index 0000000000..0dff60b400
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/tools/index.md
@@ -0,0 +1 @@
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/tools/index.txt b/erpnext/docs/user/manual/en/human-resources/tools/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/human-resources/tools/index.txt
rename to erpnext/docs/user/manual/en/human-resources/tools/index.txt
diff --git a/erpnext/docs/user/manual/en/human-resources/tools/leave-allocation-tool.md b/erpnext/docs/user/manual/en/human-resources/tools/leave-allocation-tool.md
new file mode 100644
index 0000000000..56e8d3dee0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/tools/leave-allocation-tool.md
@@ -0,0 +1,5 @@
+Leave Allocation tool helps you allocated a specific number of leaves for your employees.
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/tools/upload-attendance.md b/erpnext/docs/user/manual/en/human-resources/tools/upload-attendance.md
similarity index 53%
rename from erpnext/docs/user/guides/human-resources/tools/upload-attendance.md
rename to erpnext/docs/user/manual/en/human-resources/tools/upload-attendance.md
index 5f70933dda..adfc66d116 100644
--- a/erpnext/docs/user/guides/human-resources/tools/upload-attendance.md
+++ b/erpnext/docs/user/manual/en/human-resources/tools/upload-attendance.md
@@ -4,6 +4,6 @@ To upload the attendance go to:
> Human Resources > Upload Attendance
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/index.md b/erpnext/docs/user/manual/en/index.md
new file mode 100644
index 0000000000..21842733a4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/index.md
@@ -0,0 +1,5 @@
+# User Manual (English)
+
+### Contents:
+
+{index}
diff --git a/erpnext/docs/user/guides/index.txt b/erpnext/docs/user/manual/en/index.txt
similarity index 77%
rename from erpnext/docs/user/guides/index.txt
rename to erpnext/docs/user/manual/en/index.txt
index e9e30ed89c..97a8cd8959 100644
--- a/erpnext/docs/user/guides/index.txt
+++ b/erpnext/docs/user/manual/en/index.txt
@@ -11,5 +11,5 @@ support
human-resources
customer-portal
website
-collaboration-tools
-customize-erpnext
\ No newline at end of file
+using-erpnext
+customize-erpnext
diff --git a/erpnext/docs/user/guides/introduction/concepts-and-terms.md b/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
similarity index 100%
rename from erpnext/docs/user/guides/introduction/concepts-and-terms.md
rename to erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
diff --git a/erpnext/docs/user/guides/introduction/do-i-need-an-erp.md b/erpnext/docs/user/manual/en/introduction/do-i-need-an-erp.md
similarity index 100%
rename from erpnext/docs/user/guides/introduction/do-i-need-an-erp.md
rename to erpnext/docs/user/manual/en/introduction/do-i-need-an-erp.md
diff --git a/erpnext/docs/user/guides/introduction/getting-started-with-erpnext.md b/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md
similarity index 100%
rename from erpnext/docs/user/guides/introduction/getting-started-with-erpnext.md
rename to erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md
diff --git a/erpnext/docs/user/guides/introduction/implementation-strategy.md b/erpnext/docs/user/manual/en/introduction/implementation-strategy.md
similarity index 100%
rename from erpnext/docs/user/guides/introduction/implementation-strategy.md
rename to erpnext/docs/user/manual/en/introduction/implementation-strategy.md
diff --git a/erpnext/docs/user/guides/introduction/index.md b/erpnext/docs/user/manual/en/introduction/index.md
similarity index 100%
rename from erpnext/docs/user/guides/introduction/index.md
rename to erpnext/docs/user/manual/en/introduction/index.md
diff --git a/erpnext/docs/user/guides/introduction/index.txt b/erpnext/docs/user/manual/en/introduction/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/introduction/index.txt
rename to erpnext/docs/user/manual/en/introduction/index.txt
diff --git a/erpnext/docs/user/guides/introduction/key-workflows.md b/erpnext/docs/user/manual/en/introduction/key-workflows.md
similarity index 69%
rename from erpnext/docs/user/guides/introduction/key-workflows.md
rename to erpnext/docs/user/manual/en/introduction/key-workflows.md
index f83c8a6108..8c8d6ec055 100644
--- a/erpnext/docs/user/guides/introduction/key-workflows.md
+++ b/erpnext/docs/user/manual/en/introduction/key-workflows.md
@@ -3,10 +3,10 @@
This diagram covers how ERPNext tracks your company information across key
functions. This diagram does not cover all the features of ERPNext.
-
+
-[Full Resolution]({{url_prefix}}/assets/old_images/erpnext/overview.png)
+[Full Resolution]({{docs_base_url}}/assets/old_images/erpnext/overview.png)
_Note: Not all of the steps are mandatory. ERPNext allows you to freely skip
steps if you want to simplify the process._
diff --git a/erpnext/docs/user/guides/introduction/open-source.md b/erpnext/docs/user/manual/en/introduction/open-source.md
similarity index 100%
rename from erpnext/docs/user/guides/introduction/open-source.md
rename to erpnext/docs/user/manual/en/introduction/open-source.md
diff --git a/erpnext/docs/user/guides/introduction/the-champion.md b/erpnext/docs/user/manual/en/introduction/the-champion.md
similarity index 93%
rename from erpnext/docs/user/guides/introduction/the-champion.md
rename to erpnext/docs/user/manual/en/introduction/the-champion.md
index 596ff4b003..21a238343f 100644
--- a/erpnext/docs/user/guides/introduction/the-champion.md
+++ b/erpnext/docs/user/manual/en/introduction/the-champion.md
@@ -2,7 +2,7 @@
The Champion
-
+
We have seen dozens of ERP implementations over the past few years and we
realize that successful implementation is a lot about intangibles and
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/index.md b/erpnext/docs/user/manual/en/manufacturing/articles/index.md
new file mode 100644
index 0000000000..0dff60b400
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/index.md
@@ -0,0 +1 @@
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/index.txt b/erpnext/docs/user/manual/en/manufacturing/articles/index.txt
new file mode 100644
index 0000000000..59f35039b4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/index.txt
@@ -0,0 +1,4 @@
+nested-bom-structure
+partial-production-entry
+production-planning-subassembly
+valuation-based-on-field-in-bom
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md b/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md
new file mode 100644
index 0000000000..266ae12bee
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md
@@ -0,0 +1,30 @@
+
Nested BOM Structure
+
+**Question:** Our manufacturing process involves producing sub-assembly items before final product. How should we manage BOM master in this scenario?
+
+**Answer:** You should create BOM for item in the order of their production. Let's consider an example to understand this better.
+
+If Computer manufacturer assembles Hard Disk and DVD Drive (sub-assemblies) themselves, they should first create BOM for Hard Disk and DVD Drive. After that BOM for Computer will be created, which is finished and saleable item. BOM of computer will have
+Hard Disk and DVD Drive (sub-assemblies) will be selected as raw-material items in it. BOM ID will be fetched for the respective sub-assembly item.
+
+
+
+
+ Following is how the structure of nested BOM will look:
+
+ Computer (FG Item)
+ --- Mother Board
+ --- SMTP
+ --- Accessories and wires
+ ---Hard Disk (sub-assembly)
+ ------ Item A
+ ------ Item B
+ ------ Item C
+ ---DVD Drive (sub-assembly)
+ ------ Item X
+ ------ Item Y
+ ------ Item Z
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/partial-production-entry.md b/erpnext/docs/user/manual/en/manufacturing/articles/partial-production-entry.md
new file mode 100644
index 0000000000..e2a702ebc9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/partial-production-entry.md
@@ -0,0 +1,25 @@
+
Partial Production Entry
+
+If you completed production for few items, then you can make Partial Production Entry for that items in system. For example, your production order is for 15 quantity and you completed production for 10 quantity only. Then you can make production entry for 5 quantity. Following are step to make Partial Production Entry
+
+#### 1. Stock Entry
+
+Click on Update Finish Goods button from submitted Product Order, You will land on new Stock entry form.
+
+#### 2. Edit Manufacturing Quantity
+
+In the Update Finished Goods entry, check "From Bill of Material section", and edit Manufacturing Quantity to actual quantity produced. Production Order quantity will be fetched as Manufacturing Quantity by default.
+
+#### 3. Update Qty of Items
+
+Click on **Get Items**. With this, quantity will be updated for both raw-material as well as finish good item.
+
+
+
+#### 4. Save and Submit
+
+After updating quantity in stock entry form, save and submit the stock entry. On submit stock will update for quantity entered in this stock entry.
+
+When will you create another finish goods entry against this Production Order, system will only fetch pending quantity to be produced.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.html b/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.html
new file mode 100644
index 0000000000..556875042e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/production-planning-subassembly.html
@@ -0,0 +1,8 @@
+
Production Planning & Subassembly
+
+if you need Production Planning Tool to consider raw-materials required for the manufacturing of sub-assembly items selected in the BOM, please check following instructions to achieve the same.
Production Planning Tool has field called "Use Multi-Level BOM", checking which will consider raw-material of sub-assemblies as well in the material planning. If this field is not checked, then it will consider sub-assembly as an item, and won't consider raw-material required for the manufacturing of that sub-assembly.
You will find same field in the Production Order and Stock Entry as well.
This feature is very useful for the companies who create BOM for the
+ sub-assemblies, but Production Order is created only for the finished
+item. They do not create separate Production Order for the
+sub-assemblies, but raw-materials as listed in the BOM of sub-assembly
+items are consumed in the production process, and not sub-assembly item
+directly.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.html b/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.html
new file mode 100644
index 0000000000..4460ce0234
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/valuation-based-on-field-in-bom.html
@@ -0,0 +1,10 @@
+
'Valuation Based On' Field in BOM
+
+
Question: What do the various options in Valuation Based On Field in Bill Of Materials (BOM) Form mean?
Answer: There are 3 available options in the Valuation Based On field;
Valuation Rate:
Item valuation rate is
+defined based on it's purchase/manufacture value + other charges.
For
+Purchase Item, it is defined based on charges entered in the Purchase
+Receipt. If you don't have any Purchase Receipt
+ made for an item or a Stock Reconciliation, then you won't have
+Valuation Rate for that item.
Price List Rate:
Just like you pull item prices in sales and purchase transaction, it can be pulled in BOM via Price List Rate.
Last Purchase Rate:
It will be the last Purchase Rate value of an item. This
+value is updated in the item master as well, based on rate in the
+Purchase Order for this item.
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/manufacturing/bill-of-materials.md b/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
similarity index 75%
rename from erpnext/docs/user/guides/manufacturing/bill-of-materials.md
rename to erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
index 9ddf81ab4b..34d853064d 100644
--- a/erpnext/docs/user/guides/manufacturing/bill-of-materials.md
+++ b/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
@@ -8,11 +8,11 @@ To make a new BOM:
> Manufacturing > Bill of Materials > New BOM
-
+
* To add Operations select 'With Operation'. The Operations table shall appear.
-
+
* Select the Item for which you want to make the BOM.
* Add the operations that you have to go through to make that particular Item in the “Operations” table. For each operation, you will be asked to enter a Workstation. You must create new Workstations as and when necessary.
@@ -25,17 +25,17 @@ To make a new BOM:
* Add the list of Items you require for each operation, with its quantity. This Item could be a purchased Item or a sub-assembly with its own BOM. If the row Item is a manufactured Item and has multiple BOMs, select the appropriate BOM. You can also define if a part of the Item goes into scrap.
-
+
* This cost can be updated on by using the 'Update Cost' button.
-
+
### Materials Required(exploded)
This table lists down all the Material required for the Item to be Manufactured.
It also fetches sub-assemblies along with the quantity.
-
+
{next}
diff --git a/erpnext/docs/user/guides/manufacturing/index.md b/erpnext/docs/user/manual/en/manufacturing/index.md
similarity index 100%
rename from erpnext/docs/user/guides/manufacturing/index.md
rename to erpnext/docs/user/manual/en/manufacturing/index.md
diff --git a/erpnext/docs/user/guides/manufacturing/index.txt b/erpnext/docs/user/manual/en/manufacturing/index.txt
similarity index 85%
rename from erpnext/docs/user/guides/manufacturing/index.txt
rename to erpnext/docs/user/manual/en/manufacturing/index.txt
index 1fe03a6260..3b932a5292 100644
--- a/erpnext/docs/user/guides/manufacturing/index.txt
+++ b/erpnext/docs/user/manual/en/manufacturing/index.txt
@@ -5,4 +5,5 @@ workstation
operation
subcontracting
tools
-setup
\ No newline at end of file
+setup
+articles
diff --git a/erpnext/docs/user/guides/manufacturing/introduction.md b/erpnext/docs/user/manual/en/manufacturing/introduction.md
similarity index 92%
rename from erpnext/docs/user/guides/manufacturing/introduction.md
rename to erpnext/docs/user/manual/en/manufacturing/introduction.md
index 2d60e6780b..f9d827c6d1 100644
--- a/erpnext/docs/user/guides/manufacturing/introduction.md
+++ b/erpnext/docs/user/manual/en/manufacturing/introduction.md
@@ -1,4 +1,4 @@
-
+
### Types of Production Planning
diff --git a/erpnext/docs/user/guides/manufacturing/operation.md b/erpnext/docs/user/manual/en/manufacturing/operation.md
similarity index 67%
rename from erpnext/docs/user/guides/manufacturing/operation.md
rename to erpnext/docs/user/manual/en/manufacturing/operation.md
index 6c77089438..b21304e432 100644
--- a/erpnext/docs/user/guides/manufacturing/operation.md
+++ b/erpnext/docs/user/manual/en/manufacturing/operation.md
@@ -6,6 +6,6 @@ You can also create a Operation by:
> Manufacturing > Documents > Operation > New
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/manufacturing/production-order.md b/erpnext/docs/user/manual/en/manufacturing/production-order.md
similarity index 79%
rename from erpnext/docs/user/guides/manufacturing/production-order.md
rename to erpnext/docs/user/manual/en/manufacturing/production-order.md
index c9729be6f0..5ded4f931f 100644
--- a/erpnext/docs/user/guides/manufacturing/production-order.md
+++ b/erpnext/docs/user/manual/en/manufacturing/production-order.md
@@ -10,7 +10,7 @@ by:
> Manufacturing > Documents > Production Order > New
-
+
### Creating Production Orders
@@ -26,11 +26,11 @@ by:
* By default the system fetchs workstation and duration for Production Order Operations from the selected BOM.
-
+
* If you wish to reassign the wrokstation for a particular opeeration in the Production Order, you can do so before submitting the Production Order.
-
+
* Select the respective operation, and change its workstation.
* You can also change the Operating Time for that operation
@@ -47,28 +47,28 @@ by:
* Click on 'Transfer Materials for Manufacturing'.
-
+
* Mention the quantity of materials to be transfered.
-
+
* Submit the Stock Entry
-
+
* Material Transfered for Manufacturing will be updated in the Production Order based on the Stock Entry.
-
+
### Making Time Logs
-* Progress in the Production Order can be tracked using [Time Log]({{url_prefix}}/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.
-
+
###Updating Finished Goods
@@ -76,11 +76,11 @@ by:
* This will create a Stock Entry that will deduct all the sub-Items from the WIP Warehouse and add them to the Finished Goods Warehouse.
* Click on 'Update Finished Goods'.
-
+
* Mention the quantity of materials to be transfered.
-
+
> Tip : You can also partially complete a Production Order by updating the Finished Goods stock creating a Stock Entry.
@@ -95,7 +95,7 @@ by:
4. Update Finished Goods: This will create a Stock Entry that will deduct all the sub-Items from the WIP Warehouse and add them to the Finished Goods Warehouse.
5. To check all Time Logs made against the Production Order click on 'Show Time Logs'
-
+
* You can Also re-start a stopped Production Order.
diff --git a/erpnext/docs/user/guides/manufacturing/setup/index.md b/erpnext/docs/user/manual/en/manufacturing/setup/index.md
similarity index 100%
rename from erpnext/docs/user/guides/manufacturing/setup/index.md
rename to erpnext/docs/user/manual/en/manufacturing/setup/index.md
diff --git a/erpnext/docs/user/guides/manufacturing/setup/index.txt b/erpnext/docs/user/manual/en/manufacturing/setup/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/manufacturing/setup/index.txt
rename to erpnext/docs/user/manual/en/manufacturing/setup/index.txt
diff --git a/erpnext/docs/user/guides/manufacturing/setup/manufacturing-settings.md b/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
similarity index 79%
rename from erpnext/docs/user/guides/manufacturing/setup/manufacturing-settings.md
rename to erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
index eb0a08c5ff..dc59689f47 100644
--- a/erpnext/docs/user/guides/manufacturing/setup/manufacturing-settings.md
+++ b/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
@@ -2,7 +2,7 @@
> Manufacturing > Production Order > Setup > Manufacturing Settings
-
+
* Allow Overtime - Specify if workstations are to allow overtime.(schedule operations outside working hours)
diff --git a/erpnext/docs/user/guides/manufacturing/subcontracting.md b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md
similarity index 96%
rename from erpnext/docs/user/guides/manufacturing/subcontracting.md
rename to erpnext/docs/user/manual/en/manufacturing/subcontracting.md
index 832e8a2334..6f2b86b40f 100644
--- a/erpnext/docs/user/guides/manufacturing/subcontracting.md
+++ b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md
@@ -15,7 +15,7 @@ sub-contracting feature of ERPNext.
2. Create a Warehouse for your Supplier so that you can keep track of Items supplied. (you may supply a months worth of Items in one go).
3. For the processed Item, in the Item master, set “Is Sub Contracted Item” to “Yes”.
-
+
diff --git a/erpnext/docs/user/guides/manufacturing/tools/bom-replace-tool.md b/erpnext/docs/user/manual/en/manufacturing/tools/bom-replace-tool.md
similarity index 91%
rename from erpnext/docs/user/guides/manufacturing/tools/bom-replace-tool.md
rename to erpnext/docs/user/manual/en/manufacturing/tools/bom-replace-tool.md
index 8722d2645c..794d982c72 100644
--- a/erpnext/docs/user/guides/manufacturing/tools/bom-replace-tool.md
+++ b/erpnext/docs/user/manual/en/manufacturing/tools/bom-replace-tool.md
@@ -33,7 +33,7 @@ If we have more items to be added , or existing items to be edited in the BOM of
To update new BOM updated in the BOM of finished item, where CPU is selected as raw-material, you can use BOM Replace tool.
-
+
In this tool, you should select Current BOM, and New BOM. On clicking Replace button, current BOM of CPU will be replaced with New BOM in the BOM of finished Item (Computer).
diff --git a/erpnext/docs/user/guides/manufacturing/tools/index.md b/erpnext/docs/user/manual/en/manufacturing/tools/index.md
similarity index 100%
rename from erpnext/docs/user/guides/manufacturing/tools/index.md
rename to erpnext/docs/user/manual/en/manufacturing/tools/index.md
diff --git a/erpnext/docs/user/guides/manufacturing/tools/index.txt b/erpnext/docs/user/manual/en/manufacturing/tools/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/manufacturing/tools/index.txt
rename to erpnext/docs/user/manual/en/manufacturing/tools/index.txt
diff --git a/erpnext/docs/user/guides/manufacturing/tools/production-planning-tool.md b/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
similarity index 69%
rename from erpnext/docs/user/guides/manufacturing/tools/production-planning-tool.md
rename to erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
index b966e7a8c9..61ec4c76d9 100644
--- a/erpnext/docs/user/guides/manufacturing/tools/production-planning-tool.md
+++ b/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
@@ -11,7 +11,7 @@ To use the Production Planning Tool, go to:
> Manufacturing > Tools > Production Planning Tool
-
+
@@ -20,7 +20,7 @@ To use the Production Planning Tool, go to:
* Select sales orders for MRP using filters (Time, Item, and Customer)
* Click on Get Sales Order to generate a list.
-
+
@@ -28,11 +28,11 @@ To use the Production Planning Tool, go to:
You can add/remove or change quantity of these Items.
-
+
#### Step 3: Create Production Orders
-
+
@@ -40,7 +40,7 @@ You can add/remove or change quantity of these Items.
Create Material Request for Items with projected shortfall.
-
+
diff --git a/erpnext/docs/user/guides/manufacturing/workstation.md b/erpnext/docs/user/manual/en/manufacturing/workstation.md
similarity index 76%
rename from erpnext/docs/user/guides/manufacturing/workstation.md
rename to erpnext/docs/user/manual/en/manufacturing/workstation.md
index abc8933f41..0ff2a6bba7 100644
--- a/erpnext/docs/user/guides/manufacturing/workstation.md
+++ b/erpnext/docs/user/manual/en/manufacturing/workstation.md
@@ -8,12 +8,12 @@ You can also create a Workstation by:
> Manufacturing > Documents > Workstation > New
-
+
In workstation specify the workstation working hours under the 'working hour' section.
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]({{url_prefix}}/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}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/projects/activity-cost.md b/erpnext/docs/user/manual/en/projects/activity-cost.md
similarity index 65%
rename from erpnext/docs/user/guides/projects/activity-cost.md
rename to erpnext/docs/user/manual/en/projects/activity-cost.md
index 3ad95fc14b..d4e2106a88 100644
--- a/erpnext/docs/user/guides/projects/activity-cost.md
+++ b/erpnext/docs/user/manual/en/projects/activity-cost.md
@@ -1,4 +1,4 @@
Activity Cost records the per-hour billing rate and costing rate of an Employee against an Activity Type.
This rate is pulled by the system while making Time Logs. It is used for Project Costing.
-
+
diff --git a/erpnext/docs/user/guides/projects/activity-type.md b/erpnext/docs/user/manual/en/projects/activity-type.md
similarity index 68%
rename from erpnext/docs/user/guides/projects/activity-type.md
rename to erpnext/docs/user/manual/en/projects/activity-type.md
index a59885378f..7f37f51e54 100644
--- a/erpnext/docs/user/guides/projects/activity-type.md
+++ b/erpnext/docs/user/manual/en/projects/activity-type.md
@@ -1,6 +1,6 @@
Activity Type makes a list of the different types of activities against which a Time Log can be made.
-
+
By default the following Activity Types are created.
diff --git a/erpnext/docs/user/manual/en/projects/articles/index.md b/erpnext/docs/user/manual/en/projects/articles/index.md
new file mode 100644
index 0000000000..0dff60b400
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/articles/index.md
@@ -0,0 +1 @@
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/projects/articles/index.txt b/erpnext/docs/user/manual/en/projects/articles/index.txt
new file mode 100644
index 0000000000..56c193c277
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/articles/index.txt
@@ -0,0 +1 @@
+project-costing
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/projects/articles/project-costing.md b/erpnext/docs/user/manual/en/projects/articles/project-costing.md
new file mode 100644
index 0000000000..e5c59400f1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/articles/project-costing.md
@@ -0,0 +1,39 @@
+
Project Costing
+
+Each project has multiple task associated with it. To track actual costing of a Project, primarily in terms of services, user has to create Time Log based on actual time spent on Project-Task. Following the steps on how you can track actual service cost against Project.
+
+#### Activity Type
+
+Activity Type is a master of service offered by your personnel. You can add new Activity type from:
+
+`Project > Activity Type > New`
+
+#### Activity Cost
+
+Activity Cost is a master where you can track billing and costing rate for each Employee, and for each Activity Type.
+
+
+
+#### Time Log
+
+Based on Actual Time spent on the Project-Task, Employee will create a time log.
+
+
+
+On selection of Activity Type in the Time Log, Billing and Costing Rate will fetched for that Employee from respective Activity Cost master.
+
+
+
+Multiplying these rates with total no. of Hours in the Time Log gives Costing Amount and Billing Amount for the specific Time Log.
+
+#### Costing in Project and Task
+
+Based on total Time Logs created for a specific Task, its costing will be updated in the respective Task master.
+
+
+
+Same way, Project master will have cost updated based on Time Log created against that Projects, and tasks associated with that Project.
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/projects/index.md b/erpnext/docs/user/manual/en/projects/index.md
similarity index 100%
rename from erpnext/docs/user/guides/projects/index.md
rename to erpnext/docs/user/manual/en/projects/index.md
diff --git a/erpnext/docs/user/guides/projects/index.txt b/erpnext/docs/user/manual/en/projects/index.txt
similarity index 69%
rename from erpnext/docs/user/guides/projects/index.txt
rename to erpnext/docs/user/manual/en/projects/index.txt
index e5ef847a5e..f2bae7746b 100644
--- a/erpnext/docs/user/guides/projects/index.txt
+++ b/erpnext/docs/user/manual/en/projects/index.txt
@@ -3,4 +3,5 @@ project
time-log
time-log-batch
activity-type
-activity-cost
\ No newline at end of file
+activity-cost
+articles
diff --git a/erpnext/docs/user/manual/en/projects/project.md b/erpnext/docs/user/manual/en/projects/project.md
new file mode 100644
index 0000000000..e8a0e0eb87
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/project.md
@@ -0,0 +1,87 @@
+Project management in ERPNext is Task driven. You can create Project and assign multiple Tasks against it.
+
+
+
+### 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/manual/en/projects/tasks.html)
+
+
+
+* To view Task made against a Project click on 'Tasks'
+
+
+
+
+
+* You can also view the Tasks from the Project document itself
+
+
+
+### Managing time
+
+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.
+
+* To view Time Log made against a Project click on 'Time Logs'
+
+
+
+
+
+* You can also create a Time Log directlly and link it to the Project.
+
+
+
+### Managing expenses
+
+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'
+
+
+
+* You can also create a Expense Claims directlly and link it to the Project.
+
+
+
+* Total amount of Expense Claims booked against a project is shown under 'Total Expense Claim' in the Project Costing Section
+
+
+
+### Cost Center
+
+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.
+
+
+
+###Project Costing
+
+The Project Costing section helps you track the time and expenses incurred against the project.
+
+
+
+* The Costing Section is updated based on Time Logs made.
+
+* Gross Margin is the difference between Total Costing Amount and Total Billing Amount
+
+###Billing
+
+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.
+
+
+
+###Gantt Chart
+
+A Gantt Chart illustrates a project schedule.
+ERPNext gives you a illustrated view of tasks scheduled against that project in Gantt Chart View.
+
+* To view gantt chart against a project, go to that project and click on 'Gantt Chart'
+
+
+
+
+
+{next}
diff --git a/erpnext/docs/user/guides/projects/tasks.md b/erpnext/docs/user/manual/en/projects/tasks.md
similarity index 54%
rename from erpnext/docs/user/guides/projects/tasks.md
rename to erpnext/docs/user/manual/en/projects/tasks.md
index 6ee97a0e78..f04406fbf0 100644
--- a/erpnext/docs/user/guides/projects/tasks.md
+++ b/erpnext/docs/user/manual/en/projects/tasks.md
@@ -1,13 +1,13 @@
Project is divided into Tasks.
In ERPNext, you can also create a Task independently.
-
+
### Status of the Task
A Task can have either of the following status - Open, Working, Pending Review, Closed, Cancelled.
-
+
* By default each new Task created shall have the status set to 'Open'.
@@ -17,7 +17,7 @@ A Task can have either of the following status - Open, Working, Pending Review,
You can specify a list of dependent task under the 'Depends On' section.
-
+
* You cannot close the parent Task until all 'Dependant Task' are closed.
@@ -25,35 +25,35 @@ You can specify a list of dependent task under the 'Depends On' section.
### Managing Time
-ERPNext uses [Time Log]({{url_prefix}}/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.
* To view Time Log made against a Task click on 'Time Logs'
-
+
-
+
* You can also create a Time Log directlly and link it to the Task.
-
+
### Managing Expenses
-You can book [Expense Claim]({{url_prefix}}/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'
-
+
* You can also create a Expense Claims directlly and link it to the Task.
-
+
* Total amount of Expense Claims booked against a task is shown under 'Total Expense Claim' in the Task Costing Section
-
+
{next}
diff --git a/erpnext/docs/user/guides/projects/time-log-batch.md b/erpnext/docs/user/manual/en/projects/time-log-batch.md
similarity index 66%
rename from erpnext/docs/user/guides/projects/time-log-batch.md
rename to erpnext/docs/user/manual/en/projects/time-log-batch.md
index e16383bb94..d48633ad07 100644
--- a/erpnext/docs/user/guides/projects/time-log-batch.md
+++ b/erpnext/docs/user/manual/en/projects/time-log-batch.md
@@ -6,17 +6,17 @@ OR
Just open your Time Log list and check the Items to you want to add to the Time Log. Then click on "Make Time Log Batch" button and these Time Logs will be selected.
-
+
###Making Sales Invoice
* After submitting the Time Log Batch, "Make Invoice" button shall appear.
-
+
* Click on that button to raise a Sales Invoice against the Time Log Batch.
-
+
* When you "Submit" the Sales Invoice, the Sales Invoice number will get updated in the Time Logs and Time Log Batch and their status will change to "Billed".
diff --git a/erpnext/docs/user/guides/projects/time-log.md b/erpnext/docs/user/manual/en/projects/time-log.md
similarity index 62%
rename from erpnext/docs/user/guides/projects/time-log.md
rename to erpnext/docs/user/manual/en/projects/time-log.md
index c1802089aa..5d4c4a3f12 100644
--- a/erpnext/docs/user/guides/projects/time-log.md
+++ b/erpnext/docs/user/manual/en/projects/time-log.md
@@ -7,7 +7,7 @@ They can be used to track the following
* Project
* Internal References
-
+
###Creating Time Logs
@@ -18,15 +18,15 @@ They can be used to track the following
To create Time Logs via Calender, go to Time Log and select Calendar.
-
+
* To create a Time Log for multiple days, click and drag the cursor across days.
-
+
* You can also create Time Logs from 'week' and 'day' view of the calender.
-
+
* Time Logs for Manufacturing processes needs to be created from the Production Order.
* To create more Time Logs against Operations select the respective operation and click on the 'Make Time Log' button.
@@ -35,15 +35,15 @@ 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]({{url_prefix}}/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.
* If 'Billable' is not selected, the system shall display the 'Billing Amount' as 0.
-
+
-* After submitting the Time Log, you need to create [Time Log batch]({{url_prefix}}/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}
diff --git a/erpnext/docs/user/manual/en/selling/articles/applying-discount.md b/erpnext/docs/user/manual/en/selling/articles/applying-discount.md
new file mode 100644
index 0000000000..9dfc730cf2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/applying-discount.md
@@ -0,0 +1,31 @@
+
Applying Discount
+
+There are two ways Discount can be applied on an items in the sales transactions.
+
+#### 1. Discount on "Price List Rate" of an item
+
+In the Item table of transaction, after Price List Rate field, you will find Discount (%) field. Discount Rate applied in this field will be applicable on the Price List Rate of an item.
+
+Before applying Discount (%).
+
+
+
+After applying Discount (%) under Discount on Price List Rate (%) field.
+
+
+
+You can apply percent discount in all sales and purchase transactions.
+
+#### 2. Discount on Grand Total
+
+In transactions, after Taxes and Charges table, you will find option to enter "Additional Discount Amount". Based on Amount entered in this field, item's Basic Rate and Taxes will be recalculated.
+
+Before applying Additional Discount Amount,
+
+
+
+After applying Additional Discount Amount.
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/selling/drop-shipping.md b/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
similarity index 76%
rename from erpnext/docs/user/guides/selling/drop-shipping.md
rename to erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
index e05fb1bd7e..8c3af05c18 100644
--- a/erpnext/docs/user/guides/selling/drop-shipping.md
+++ b/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
@@ -7,28 +7,28 @@ In ERPNext, you can create a Drop Shipping by creating Purchase Order against Sa
#### Setup on Item Master
Set **_Delivered by Supplier (Drop Ship)_** and **_Default Supplier_** in Item Master.
-
+
#### Setup on Sales Order
If Drop Shipping has set on Item master, it will automatically set **Supplier delivers to Customer** and **Supplier** on Salse Order Item.
You can setup Drop Shipping, on Sales Order Item. Under **Drop Ship** section, set **Supplier delivers to Customer** and select **Supplier** agaist which Purchase Order will get created.
-
+
#### Create Purchase Order
After submitting a Sales Order, create Puchase Order.
-
+
From Sales Order, all items, having **Supplier delivers to Customer** checked or **Supplier**(matching with supplier selected on For Supplier popup) mentioned, will get mapped onto Purchase Order.
It will automatically set Customer, Customer Address and Contact Person.
After submitting Purchase Order, to update delivery status, use **Mark as Delivered** button on Purchase Order. It will update delivery percetage and delivered quantity on Sales Order.
-
+**_Close_**, is a new feature introduced on **Purchase Order** and **Sales Order**, to close or to mark fulfillment.
-
+
###Drop Shipping Print Format
You can notify, Suppliers by sending a email after submitting Purchase Order by attaching Drop Shipping print format.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md b/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md
new file mode 100644
index 0000000000..2fafa6826c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md
@@ -0,0 +1,28 @@
+
ERPNext for Service Organizations
+
+**Question:** At first look, ERPNext looks primarily designed for the traders and manufacturers. Is ERPNext used by service companies as well?
+
+**Answer:**
+About 30% of ERPNext customers comes from services background. These are companies into software development, certification services, individual consultants and many more. Being into services business ourselves, we use ERPNext to manage our sales, accounting, support and HR operations.
+
+https://conf.erpnext.com/2014/videos/umair-sayyed
+
+###Master Setup
+
+Between the service and trading company, the most differentiating master is an item master. While trading and manufacturing business has stock item, with warehouse and other stock details, service items will have none of these details.
+
+To create a services item, which will be non-stock item, in the Item master, you should set "Is Stock Item" field as "No".
+
+
+
+###Hiding Non-required Features
+
+####Feature Setup
+
+In Feature Setup, you can activate specific functionalities, and disable others. Based on this setting, forms and fields not required for your business will be hidden. [More on feature setup here](https://manual.erpnext.com/customize-erpnext/hiding-modules-and-features).
+
+####Permissions
+
+ERPNext is the permission driven system. User will be able to access system based on permissions assigned to him/her. So, if user is not assigned Role related to Stock and Manufacturing module, it will be hidden from user. [More on permission management in ERPNext here](https://manual.erpnext.com/setting-up/users-and-permissions).
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/index.md b/erpnext/docs/user/manual/en/selling/articles/index.md
new file mode 100644
index 0000000000..0dff60b400
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/index.md
@@ -0,0 +1 @@
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/index.txt b/erpnext/docs/user/manual/en/selling/articles/index.txt
new file mode 100644
index 0000000000..70b4ac2c2a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/index.txt
@@ -0,0 +1,6 @@
+applying-discount
+drop-shipping
+erpnext-for-services-organization
+manage-shipping-rule
+managing-sales-persons-in-sales-transactions
+stopping-sales-order
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/manage-shipping-rule.md b/erpnext/docs/user/manual/en/selling/articles/manage-shipping-rule.md
new file mode 100644
index 0000000000..c9c4f91613
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/manage-shipping-rule.md
@@ -0,0 +1,25 @@
+
Manage Shipping Rule
+
+Shipping Rule master help you define rules based on which shipping charge will be applied on sales transactions.
+
+Most of the companies (mainly retail) have shipping charge applied based on invoice total. If invoice value is above certain range, then shipping charge applied will be lesser. If invoice total is less, then shipping charges applied will be higher. You can setup Shipping Rule to address the requirement of varying shipping charge based on total.
+
+To setup Shipping Rule, go to:
+
+Selling/Accounts >> Setup >> Shipping Rule
+
+Here is an example of Shipping Rule master:
+
+
+
+Referring above, you will notice that shipping charges are reducing as range of total is increasing. This shipping charge will only be applied if transaction total falls under one of the above range, else not.
+
+If shipping charges are applied based on Shipping Rule, then more values like Shipping Account, Cost Center will be needed as well to add row in the Taxes and Other Charges table of sales transaction. Hence these details are tracked as well in the Shipping Rule itself.
+
+
+
+Apart from price range, Shipping Rule will also validate if its territory and company matches with that of Customer's territory and company.
+
+Following is an example of how shipping charges are auto-applied on sales order based on Shipping Rule.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/managing-sales-persons-in-sales-transactions.md b/erpnext/docs/user/manual/en/selling/articles/managing-sales-persons-in-sales-transactions.md
new file mode 100644
index 0000000000..ae92e63443
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/managing-sales-persons-in-sales-transactions.md
@@ -0,0 +1,43 @@
+
Managing Sales Persons In Sales Transactions
+
+In ERPNext, Sales Person master is maintained in [tree structure](https://erpnext.com/kb/setup/managing-tree-structure-masters). Sales Person table is available in all the Sales transactions, at the bottom of transactions form.
+
+If you have specific Sales Person attached to Customer, you can mention Sales Person details in the Customer master itself. On selection of Customer in the transactions, you will have Sales Person details auto-fetched in that transaction.
+
+####Sales Person Contribution
+
+If you have more than one sales person working together on an order, then with listing all the sales person for that order, you will also need to define contribution based on their effort. For example, Sales Person Aasif, Harish and Jivan are working on order. While Aasif and Harish followed this order throughout, Jivan got involved just in the end. Accordingly you should define % Contribution in the sales transaction as:
+
+
+
+Where Sales Order Net Total is 30,000.
+
+
Total % Contribution for all Sales Person must be 100%. If only one Sales Person is selected, then enter % Contribution as 100% for him/her.
+
+####Sales Person Transaction Report
+
+You can check Sales Person Transaction Report from
+
+`Selling > Standard Reports > Sales Person-wise Transaction Summary`
+
+This report will be generated based on Sales Order, Delivery Note and Sales Invoice. This report will give you total amount of sales made by an employee over a period. Based on data provided from this report, you can determine incentives and plan appraisal for an employee.
+
+
+
+####Sales Person wise Commission
+
+ERPNext doesn't calculate commission payable to an Employee, but only provide total amount of sales made by him/her. As a work around, you can add your Sales Person as Sales Partner, as commission calculation feature is readily available in ERPNext. You can check Sales Partner's Commission report from
+
+`Accounts > Standard Reports > Sales Partners Commission`
+
+####Disable Sales Person Feature
+
+If you don't track sales person wise performance, and doesn't wish to use this feature, you can disable it from:
+
+`Setup > Customize > Features Setup`
+
+
+
+After uncheck Sales Extras from Sales and Purchase section, refresh your ERPNext account's tab, so that forms will take effect based on your setting.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/stopping-sales-order.md b/erpnext/docs/user/manual/en/selling/articles/stopping-sales-order.md
new file mode 100644
index 0000000000..96a15def96
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/stopping-sales-order.md
@@ -0,0 +1,17 @@
+
Stopping a Sales Order
+
+In the submitted Sales Orders, you will find **Stop** option. Stopping Sales Order will restrict user from creating Delivery Note and Sales Invoice against it.
+
+
+
+####Scenario
+
+East Wind receives an order for ten laptops. Sales Order is also created for ten units. Due to scarcity of stock, only seven units are delivered to customer. Pending three units are to be delivered soon. Customer inform East Wind need not deliver pending item, as they have purchased it from other vendor.
+
+In this case, after East Wind will create Delivery Note and Sales Invoice only for the seven units of Laptop, and set Sales Order as stopped.
+
+
+
+Once Sales Order is set as stopped, you will not have pending quantities (three in this case) reflecting in Pending to Deliver and Pending to Invoice reports. To make further transactions against Stopped Sales Order, you should first Unstop it.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/selling/index.md b/erpnext/docs/user/manual/en/selling/index.md
similarity index 100%
rename from erpnext/docs/user/guides/selling/index.md
rename to erpnext/docs/user/manual/en/selling/index.md
diff --git a/erpnext/docs/user/guides/selling/index.txt b/erpnext/docs/user/manual/en/selling/index.txt
similarity index 53%
rename from erpnext/docs/user/guides/selling/index.txt
rename to erpnext/docs/user/manual/en/selling/index.txt
index 17dba4b572..3f414d12d4 100644
--- a/erpnext/docs/user/guides/selling/index.txt
+++ b/erpnext/docs/user/manual/en/selling/index.txt
@@ -1,4 +1,4 @@
quotation
sales-order
-drop-shipping
-setup
\ No newline at end of file
+setup
+articles
diff --git a/erpnext/docs/user/guides/selling/quotation.md b/erpnext/docs/user/manual/en/selling/quotation.md
similarity index 91%
rename from erpnext/docs/user/guides/selling/quotation.md
rename to erpnext/docs/user/manual/en/selling/quotation.md
index 25590e07ca..027a5154d4 100644
--- a/erpnext/docs/user/guides/selling/quotation.md
+++ b/erpnext/docs/user/manual/en/selling/quotation.md
@@ -11,11 +11,11 @@ To create a new Quotation go to:
You can also create a Quotation from an Opportunity.
-
+
Or You can create a new Quotation and pull details from an Opportunity.
-
+
A Quotation contains details about:
@@ -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]({{url_prefix}}/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]({{url_prefix}}/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.
diff --git a/erpnext/docs/user/guides/selling/sales-order.md b/erpnext/docs/user/manual/en/selling/sales-order.md
similarity index 93%
rename from erpnext/docs/user/guides/selling/sales-order.md
rename to erpnext/docs/user/manual/en/selling/sales-order.md
index b1438eb34b..269473a5be 100644
--- a/erpnext/docs/user/guides/selling/sales-order.md
+++ b/erpnext/docs/user/manual/en/selling/sales-order.md
@@ -11,7 +11,7 @@ a Sales Order.
### Sales Order Flow-Chart
-
+
To create a new Sales Order go to:
@@ -21,11 +21,11 @@ To create a new Sales Order go to:
You can also create a Sales Order from a submitted Quotation.
-
+
Or you can create a new Sales Order and pull details from an Quotation.
-
+
Most of the information in your Sales Order is the same as the Quotation.
There are a few amongst other things that a Sales Order will ask you to
@@ -72,7 +72,7 @@ On updating the Sales Order, a Recurring ID will be generated which will be same
ERPNext will automatically create new Order and mail a notification to the email IDs you set in the 'Notification Email Address'field.
-
+
### Next Steps
diff --git a/erpnext/docs/user/guides/selling/setup/index.md b/erpnext/docs/user/manual/en/selling/setup/index.md
similarity index 100%
rename from erpnext/docs/user/guides/selling/setup/index.md
rename to erpnext/docs/user/manual/en/selling/setup/index.md
diff --git a/erpnext/docs/user/manual/en/selling/setup/index.txt b/erpnext/docs/user/manual/en/selling/setup/index.txt
new file mode 100644
index 0000000000..22a335b056
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/setup/index.txt
@@ -0,0 +1,6 @@
+selling-settings
+sales-partner
+shipping-rule
+product-bundle
+item-price
+sales-person-target-allocation
diff --git a/erpnext/docs/user/guides/selling/setup/item-price.md b/erpnext/docs/user/manual/en/selling/setup/item-price.md
similarity index 83%
rename from erpnext/docs/user/guides/selling/setup/item-price.md
rename to erpnext/docs/user/manual/en/selling/setup/item-price.md
index a235341cef..b877e8dd55 100644
--- a/erpnext/docs/user/guides/selling/setup/item-price.md
+++ b/erpnext/docs/user/manual/en/selling/setup/item-price.md
@@ -14,7 +14,7 @@ Step 1: Select Price List
You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it.
-
+
On selection of Price List, its currency and for selling or buying property will be fetched as well.
@@ -24,13 +24,13 @@ Step 2: Select Item
Select item for which Item Price record is to be created. On selection of Item Code, Item Name and Description will be fetched as well.
-
+
Step 3: Enter Rate
Enter selling/buying rate of an item in Price List currency.
-
+
Step 4: Save Item Price
diff --git a/erpnext/docs/user/guides/selling/setup/product-bundle.md b/erpnext/docs/user/manual/en/selling/setup/product-bundle.md
similarity index 91%
rename from erpnext/docs/user/guides/selling/setup/product-bundle.md
rename to erpnext/docs/user/manual/en/selling/setup/product-bundle.md
index bb11b98051..fa7f948e68 100644
--- a/erpnext/docs/user/guides/selling/setup/product-bundle.md
+++ b/erpnext/docs/user/manual/en/selling/setup/product-bundle.md
@@ -13,7 +13,7 @@ To create new Product Bundle, Go to:
Selling > Setup > Product Bundle > New
-
+
###Select Parent Item
@@ -33,7 +33,7 @@ In Package Item section, you will list all the child items for which we maintain
When making Sales transactions like Sales Invoice, Sales Order and Delivery Note,
Parent Item will be selected in the main item table.
-
+
On selection on Parent Item in the main item table, its child items will be fetched in Packing List
table of the transaction. If child item is the serialized item, you will be able to specify its Serial Mo.
diff --git a/erpnext/docs/user/guides/selling/setup/sales-partner.md b/erpnext/docs/user/manual/en/selling/setup/sales-partner.md
similarity index 74%
rename from erpnext/docs/user/guides/selling/setup/sales-partner.md
rename to erpnext/docs/user/manual/en/selling/setup/sales-partner.md
index 8710972093..1174969af4 100644
--- a/erpnext/docs/user/guides/selling/setup/sales-partner.md
+++ b/erpnext/docs/user/manual/en/selling/setup/sales-partner.md
@@ -10,7 +10,7 @@ To create a sales partner go to:
Sales Partners are saved with Sales Partner name provided by user.
-
+
You can track their address and contact details and also allocate Sales Partner for each Item Group, based on Qty and Amount.
@@ -19,16 +19,16 @@ You can track their address and contact details and also allocate Sales Partner
To include the name of your Partner on your website, check the "Show in
Website" box. When click on "Show in Website", you will see field where you can attach logo of partner's company and enter brief and introduction of partner.
-
+
To see listing of partner, you should go to:
https://example.erpnext.com/partners
-
+
Following is the complete partners details published on the website.
-
+
{next}
diff --git a/erpnext/docs/user/guides/selling/setup/sales-person-target-allocation.md b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
similarity index 84%
rename from erpnext/docs/user/guides/selling/setup/sales-person-target-allocation.md
rename to erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
index 812e7aca04..134a9b42d1 100644
--- a/erpnext/docs/user/guides/selling/setup/sales-person-target-allocation.md
+++ b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
@@ -12,7 +12,7 @@ To allocate target, you should open specific Sales Person master.
In the Sales Person master, you will find table called Sales Person Target.
-
+
In this table, you should select Item Group, Fiscal Year, Target Qty and Amount.
@@ -22,7 +22,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 shoult setup Target 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).
-
+
####Report - Sales Person Target Variance Item Groupwise
@@ -32,7 +32,7 @@ To check this report, go to:
This report will provide you variance between target and actual performance of Sales Person. This report is based on Sales Order report.
-
+
As per the report, allocated target to Sales Person for the month of December was 5 qty. However, Sales Order was made for this employee and Item Group for only 3 qty. Hence, variance of 2 qty is shown in the report.
@@ -48,7 +48,7 @@ To allocate target to Sales Person based on Territory, you can should select spe
In the Territory master, you will find field to select Territory Manager. This field is linked to "Sales Person" master.
-
+
####2.2 Allocating Target
@@ -62,7 +62,7 @@ Using this master, you can divide target Qty or Amount across various months.
This report will provide you variance between target and actual performance of Sales in particular territory. This report is based on Sales Order report. Though Sales Person is defined in the Territory master, its details are not pulled in the report.
-
+
---
@@ -74,7 +74,7 @@ To create new Budget Distriibution master, go to:
`Accounts > Setup > Budget Distributon`
-
+
You can link target distribution while allocation targets in Sales Person as well as in Territory master.
diff --git a/erpnext/docs/user/guides/selling/setup/selling-settings.md b/erpnext/docs/user/manual/en/selling/setup/selling-settings.md
similarity index 96%
rename from erpnext/docs/user/guides/selling/setup/selling-settings.md
rename to erpnext/docs/user/manual/en/selling/setup/selling-settings.md
index 4bf67823dd..d5d71173f2 100644
--- a/erpnext/docs/user/guides/selling/setup/selling-settings.md
+++ b/erpnext/docs/user/manual/en/selling/setup/selling-settings.md
@@ -1,7 +1,7 @@
Selling Setting is where you can define propertiese which will be applied in your selling transactions.
Let's check into each property one by one.
-
+
####1. Customer Naming By
diff --git a/erpnext/docs/user/guides/selling/setup/shipping-rule.md b/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md
similarity index 63%
rename from erpnext/docs/user/guides/selling/setup/shipping-rule.md
rename to erpnext/docs/user/manual/en/selling/setup/shipping-rule.md
index 7fc24f1961..c4369cbf20 100644
--- a/erpnext/docs/user/guides/selling/setup/shipping-rule.md
+++ b/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md
@@ -1,6 +1,6 @@
Using Shipping Rule you can define the cost for delivering the product to the customer.
You can define different shipping rules for the same item across different territories.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/change-password.md b/erpnext/docs/user/manual/en/setting-up/articles/change-password.md
new file mode 100644
index 0000000000..c65cc8bea9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/change-password.md
@@ -0,0 +1,17 @@
+
Change Password
+
+Each ERPNext user can customize password for his/her ERPNext account. Also user with System Manager role will be able to reset password for himself as well as for other users. Following are the steps to go about changing your password.
+
+
+####Step 1: Go to My Setting.
+
+
+
+####Step 2: Set New Password.
+
+
+
+Enter the new password and save the form to save changes.
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md b/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md
new file mode 100644
index 0000000000..04e520385f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions.md
@@ -0,0 +1,20 @@
+
Delete All Related Transactions for a Company
+
+Often, users setup all the master data and then create a few dummy records. Then they want to delete the dummy records and the company and start over again, keeping the other master data like Customers, Items, BOMs intact.
+
+Version 5 onwards, you can now delete all dummy transactions related to a company.
+
+To do that, open the company record.
+
+`Setup > Accounts > Company` or `Accounts > Setup > Company`
+
+In Company master, click on the **Delete Company Transactions** button right at the bottom of the form. Then you must re-type the company name to confirm if you are sure you want to continue with this.
+
+This action will wipe out all the data related to that company like Quotation, Invoices, Purchase Orders etc. So be careful
+
+
+
+
+**Note:** If you want to delete the company record itself, the use the normal "Delete" button from Menu options. It will also delete Chart of Accounts, Chart of Cost Centers and Warehouse records for that company.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.html b/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.html
new file mode 100644
index 0000000000..366d8a3738
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/edit-submitted-document.html
@@ -0,0 +1,28 @@
+
Edit Submitted Document
+
+ To edit submitted document, you need to cancel it first. Followings are steps to edit submitted document.
+
+ Step 1: Cancel Submitted Document
+ You will find Cancel button on upper right corner of submitted document.
+
+
+
+
+ Step 2: Amend the document
+ On cancellation of submitted document, Amend button will be became visible.
+
+
+
+
+ Step 3: Save and Submit the document
+ On clicking Amend button, same document will become editable again. After Making required changes, save and submit the document.
+
+
+
+
+
Note: If your document linked with other documents, then you will need to cancel last document you made on top of this document. Example:
If you have created Delivery Note and Sales Invoice against Sales Order, which you need to amend, then you should first Cancel Delivery Note and Sales Invoice made for that Sales Order. Then amend Sales Order, re-save and re-submit it.
+
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/index.md b/erpnext/docs/user/manual/en/setting-up/articles/index.md
new file mode 100644
index 0000000000..0dff60b400
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/index.md
@@ -0,0 +1 @@
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/index.txt b/erpnext/docs/user/manual/en/setting-up/articles/index.txt
new file mode 100644
index 0000000000..6f99f89b52
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/index.txt
@@ -0,0 +1,13 @@
+change-password
+delete-a-company-and-all-related-transactions
+edit-submitted-document
+integrating-erpnext-with-other-application
+manage-header-and-footer
+managing-multiple-companies
+managing-perm-level
+managing-tree-structure-masters
+naming-series-current-value
+overwriting-data-from-data-import-tool
+rename-user
+setting-up-dropbox-backups
+using-custom-domain-on-erpnext
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md b/erpnext/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md
new file mode 100644
index 0000000000..1b7adf480e
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/integrating-erpnext-with-other-application.md
@@ -0,0 +1,14 @@
+
Integrating ERPNext with other Applications
+
+For now, ERPNext doesn't have out-of-the-box integration available for the third party applications. However, Frappe has REST API using which you can get ERPNext integrated with any other solution.
+
+Learn more about Frappe API here.
+
+[https://frappe.io/help/rest_api](https://frappe.io/help/rest_api)
+
+For experts services on integration, you can connect with our service providers from community portal.
+
+[https://frappe.io/community/service-providers](https://frappe.io/community/service-providers)
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/manage-header-and-footer.html b/erpnext/docs/user/manual/en/setting-up/articles/manage-header-and-footer.html
new file mode 100644
index 0000000000..eee9618508
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/manage-header-and-footer.html
@@ -0,0 +1,4 @@
+
Manage Header And Footer
+
+
Manage Header And Footer
+
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md
new file mode 100644
index 0000000000..dc9f667fce
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-multiple-companies.md
@@ -0,0 +1,42 @@
+
Managing Multiple Companies
+
+
Managing Multiple Companies
+
+ERPNext allows you to create multiple companies in the same/common ERPNext account.
+
+With this, you will find option to select Company in your transactions. While most of the transactions will be separated based on Company, there are few masters like Item, Item Group, Customer Group, Territory etc. which can be used across all the companies.
+
+If you have separate teams working on each company, you can also restrict the access of user to the data of specific company. Click [here](https://manual.erpnext.com/search?txt=user%20permission) to know more about how to set permission to achieve the same.
+
+Following are the steps to create companies in your ERPNext account.
+
+####Go to Setup Module
+
+`Setup > Masters > Company > New`
+
+####Enter Company Details
+
+Company master will be saved with Company Name provided at the time of its creation.
+
+
+
+Also, you can define other properties for new company like:
+
+* Country
+* Currency
+* Default Cash and Bank Account
+* Income/Expense Account
+* Company Registration Details
+
+Value will be auto-filled in most of these field to define company-wise defaults. You can edit/customize it as per your requirement.
+
+
+
+####Chart of Account for New Company
+
+A separate Chart of Account master will be set for each company in the ERPNext. This allows you managing Accounts/Ledger master separately for each company. Also it allows you avail financial statement and reports like Balance Sheet and Profit and Loss Statement separately for each company.
+
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md
new file mode 100644
index 0000000000..c44d1eaaa0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md
@@ -0,0 +1,27 @@
+
Managing Perm Level in Permission Manager
+
+
Managing Perm Level in Permission Manager
+
+In each document, you can group fields by "levels". Each group of field is denoted by a unique number (0, 1, 2, 3 etc.). A separate set of permission rules can be applied to each field group. By default all fields are of level 0.
+
+Perm Level for a field can be defined in the [Customize Form](https://erpnext.com/user-guide/customize-erpnext/customize-form).
+
+
+
+If you need to assign different permission of particular field to different users, you can achieve it via Perm Level. Let's consider an example for better understanding.
+
+Delivery Note is accessible to Stock Manager as well as Stock User. You don't wish Stock User to access Amount related field in Delivery Note, but other field should be visible just like it is visible Stock Manager.
+
+For the amount related fields, you should set Perm Level as (say) 2.
+
+For Stock Manager, they will have permission on fields on Delivery Note as Perm Level 2 whereas a Stock User will not have any permission on Perm Level 2 for Delivery Note.
+
+
+
+Considering the same scenario, if you want a Stock User to access a field at Perm Level 2, but not edit it, the Stock User will be assigned permission on Perm Level 2, but only for read, and not for write/edit.
+
+
+
+Perm Level (1, 2, 3) not need be in order. Perm Level is primarily for grouping number of fields together, and then assigning permission to Roles for that group. Hence, you can set any perm level for an item, and then do permission setting for it.
+
+
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md
new file mode 100644
index 0000000000..0de7869e22
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-tree-structure-masters.md
@@ -0,0 +1,58 @@
+
Managing Tree Structure Masters
+
+
Managing Tree Structure Masters
+
+Some of the masters in ERPNext are maintained in tree structure. Tree structured masters allow you to set Parent masters, and Child masters under those Parents. Setting up this structure allows you creating intelligent report, and track growth at each level in the hierarchy.
+
+Following is the partial list of masters which are maintained in the tree structure.
+
+* Chart of Accounts
+
+* Chart of Cost Centers
+
+* Customer Group
+
+* Territory
+
+* Sales Person
+
+* Item Group
+
+Following are the steps to manage and create record in the tree structured master. Let's consider Territory master to understand managing tree masters.
+
+####Step 1 : Go to Master
+
+`Selling > Setup > Territory`
+
+Also you can type master name in Awesome Bar to go to the related master.
+
+Tree master allows you to set Parent Territories, and Child Territories Groups under those Parents.
+
+####Step 2 : New Parent Territory
+
+
+
+When click on Parent Territory, you will see option to add child territory under it. All default Territory groups will be listed under parent group called "All Territories". You can add further parent or child Territory Groups under it.
+
+####Step 3: Name The Territory Group
+
+When click on Add Child, a dialog box will provide two fields.
+
+**Territory Group Name**
+
+Territory will be saved with Territory Name provided here.
+
+**Group Node**
+
+If Group Node selected as Yes, then this Territory will be created as Parent, which means you can further create sub-territories under it. If select No, then it will become child Territory which you will be able to select in another masters.
+
+
Only child Territory Groups are selectable in another masters and transactions.
+
+
+Following is how Child Territories will be listed under a Parent Territory.
+
+
+
+Following this steps, you can manage other tree masters in ERPNext.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md b/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md
new file mode 100644
index 0000000000..47cf1a46b3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/naming-series-current-value.md
@@ -0,0 +1,63 @@
+
Setting the Current Value for Naming Series
+
+
Setting the Current Value for Naming Series
+
+Naming Series feature allows you to define prefix for number series of documents. For example, if a Sales Order has prefix "SO", then the series will be generated as SO00001, SO00002... and so on. Click [here](https://erpnext.com/user-guide/setting-up/document-naming-series) to learn how you can customize Number Series for a transaction/master in ERPNext.
+
+### 1. Setting the Current Value
+
+Naming Series feature also offers a tool where you can set Current Value for specific prefix. This is generally required if you have recently started using ERPNext, and have old transactions in the previous system, and you want the numbering series to start in from where it ended in the old system. Let's consider a scenario to learn this better.
+
+For example, you have 322 Sales Orders created in your old system with SO00322 as highest Sales Order Id. In ERPNext, you need the first Sales Order to pick up #323 when it is saved. To enable this, you should set Current Value for SO series in following steps.
+
+#### Go to Naming Series Tool
+
+`Setup > System > Naming Series`
+
+#### Update Series Section
+
+
+
+#### Select Prefix
+
+Considering our scenario, prefix for Sales Order will be "SO".
+
+
+
+#### Current Value
+
+If you have currently 12 Sales Orders created in your account, then current value updated will be 12. You can edit Current Value to 322, and then click on Update Series Number.
+
+
+
+With this setting, you will have numbering for the New Sales Orders starting with #323.
+
+### 2. Error Due Series Number
+
+If you receive a Duplicate Name error while saving a transaction, for example, while saving Item Price, you receive an error saying:
+
+`Duplicate name Item Price RFD/00016`
+
+This error message indicates that when you are saving Item Price, system is trying to allocate "RFD/00016" to that Item Price record. But it is finding that Item Price with this ID is already existing in your system.
+
+This error could arise because Current Value for Series/Prefix of Item Price is disturbed and not in sync with actual Current Value. While actual Current Value for Item Price could be 20 (or any number more than 16), someone has set Current Value for this series as 15.
+
+To confirm actual Current Value for particular Series, you should check report for document in question (Item Price in this case), and check for the Item Price ID with highest value.
+
+Let's assume we find that actual Current Value for Item price is 22, then you go Naming Series, and set Current Value for the Prefix/Series of Item Price to 22, and Update Series Number.
+
+These instructions is applicable for all the documents in ERPNext for which user can customize Series and its Current Value.
+
+Let's consider another scenario to learn this better. On assigning a document to another user, error message says:
+
+`Duplicate name ToDo TDI00014286`
+
+This indicate the Current Value for Series/Prefix of ToDo (TDI) has been disturbed. You should follow these steps to correct value for Current Value for TDI prefix.
+
+1. Check ToDo report for the highest ToDo id value.
+1. Setup >> Settings >> Naming Series
+1. Check section B of Update Series
+1. Select Prefix for ToDo "TDI"
+1. Ensure that highest number for ToDo is updated as Current Value in Naming Series. If not, correct Current Value, and click on "Update Series Numbering".
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.html b/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.html
new file mode 100644
index 0000000000..1ae6cb511b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool.html
@@ -0,0 +1,11 @@
+
Overwriting Data from Data Import Tool
+
+
Overwriting Data from Data Import Tool
+
+Data Import Tool allows importing documents (like customers, Suppliers, Orders, Invoices etc.) from spreadsheet file into ERPNext. The very same tool can also be used for overwrite values in the existing documents.
+
+
Over-writing data from Data Import Tool works only for Saved transactions, and not for Submitted ones.
+Let's assume there are no. of items for which we need to overwrite Item Group.
+Following are the steps to go about overwriting Item Groups for existing Items.
Step 1: Download Template
Template Used for overwriting data will be same as one used for importing new items. Hence, you should first download template from.
Setup >> Data >> Import/Export Data
Since items to be over-written will be already available in the system, while downloading template, "Download with data" field should be checked. With this, we will have all the existing items being downloaded with the template.
Step 2: Prepare Data
In the download template, We will only keep rows of the items to be worked on and delete the rest. Then we will enter new value in the Item Group column for an item. Since Item Group is a master in itself, we should ensure that Item Group entered in the excel file is already available in the Item Group master as well.
Since we are overwriting only Item Group, only following columns will be mandatory.
Column A (since it has main values of template)
Name (Column B)
Item Group
Columns of other field which won't have any impact of overwriting can be
+ removed, even if they are mandatory. This is applicable only for
+overwriting, and not when importing new records.
Step 3: Import Data
Once excel file is ready for importing, come back to Data Import Tool in ERPNext. We should first browser and select the File/template which has data to be overwritten. "Overwrite" field should be checked since we are overwriting Item Group in the existing items.
Step 4: Upload
On clicking Upload and Import, if values as provided in the spreadsheet file is validated, it will be successfully updated in the item master.
If validation of values fails, then it will indicate row no. of spreadsheet for which validation failed and needs correction. In that case, you should corrected value in that row, and then try importing/uploading file again. If validation fails for even one row, none of the records are imported/updated.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md b/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md
new file mode 100644
index 0000000000..51fb637b38
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/rename-user.md
@@ -0,0 +1,31 @@
+
Rename User
+
+
Rename User
+
+Renaming functionality allows you to edit id of specific record. User is saved with person's email id. Only User with System Manager's role will be able to rename User IDs.
+
+Following are the steps to rename user id.
+
+#### Step 1: Go to User List
+
+Setup > Users > User
+
+Click to open user id you want to rename.
+
+#### Step 2: Go to Menu and click on Rename option.
+
+When will you click on Rename option, pop up will open on same form.
+
+
+
+
+#### Step 3: Enter new user ID and Press Rename Button.
+
+
+
+
+After successful renaming user can login to their ERPNext account with new ID.
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.html b/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.html
new file mode 100644
index 0000000000..1b7e4f7977
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.html
@@ -0,0 +1,74 @@
+
Setting Up Dropbox Backups
+
+
Setting Up Dropbox Backups
+
+
If you wish to store your backups on a periodic basis,on Dropbox, you can do it directly through ERPNext.
+
+
Setup > Manage 3rd Party Backups
+
+
Step 1: Click on Integrations > Backup Manager
+
+
+
+
+
In the Backup Manager page, enter the email addresses of those people whom you wish to notify about the upload status. Under the topic 'Sync with Dropbox', select whether you wish to upload Daily, Weekly or Never.
+
Step 2 Click on Allow Dropbox Access.
+
+
Tip: In future, if you wish to discontinue uploading backups to dropbox, then select the Never option.
+
+
+
+
+
+
+
+ Step 3
+
+
+
+
You need to login to your dropbox account, with your user id and password.
Step 5: Setup dropbox backups from the backup manager as shown in previous section.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/using-custom-domain-on-erpnext.md b/erpnext/docs/user/manual/en/setting-up/articles/using-custom-domain-on-erpnext.md
new file mode 100644
index 0000000000..ff631b1fc7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/using-custom-domain-on-erpnext.md
@@ -0,0 +1,13 @@
+
+
+If you have subscribed to any of the plans at [ERPNext](https://erpnext.com), you can have us serve your site on your custom domain (for example at http://example.com). This enables your website to be served on a custom domain.
+
+To enable this feature, you will first have to edit DNS settings of your domain as follows.
+
+- Make a CNAME record for a subdomain (www in most cases) to {youraccountname}.erpnext.com
+- If you want serve the website on a naked domain (ie. http://example.com), set a URL redirect to http://www.example.com and not a CNAME record. Making a CNAME record in this case can have unexpected consequences including you not being able to receive emails anymore.
+
+After you've setup the DNS records, you will have to raise a support ticket by sending an email to support@erpnext.com and we'll take it from there.
+
+**Note**: We do not support HTTPS on custom domains. HTTPS enables end to end encryption (from your browser to our server). Although not critical for the website but we strongly recommend against using the ERPNext app over an unencrypted protocol. To be safe always use the ERP at your erpext.com address.
+
diff --git a/erpnext/docs/user/guides/setting-up/authorization-rule.md b/erpnext/docs/user/manual/en/setting-up/authorization-rule.md
similarity index 95%
rename from erpnext/docs/user/guides/setting-up/authorization-rule.md
rename to erpnext/docs/user/manual/en/setting-up/authorization-rule.md
index 3afdd79865..6b79b6dbf5 100644
--- a/erpnext/docs/user/guides/setting-up/authorization-rule.md
+++ b/erpnext/docs/user/manual/en/setting-up/authorization-rule.md
@@ -34,7 +34,7 @@ Select approvers Role. It will be Sales Manager role which if assigned to user,
Set Above Value. Given the exmaple, Above Value will be set as 10000.
-
+
If Sales User tries submitting Sales Order of value higher than 10000, then he will get error message.
diff --git a/erpnext/docs/user/guides/setting-up/bar-code.md b/erpnext/docs/user/manual/en/setting-up/bar-code.md
similarity index 90%
rename from erpnext/docs/user/guides/setting-up/bar-code.md
rename to erpnext/docs/user/manual/en/setting-up/bar-code.md
index 0f54d9784c..2077842379 100644
--- a/erpnext/docs/user/guides/setting-up/bar-code.md
+++ b/erpnext/docs/user/manual/en/setting-up/bar-code.md
@@ -18,7 +18,7 @@ setup, check the box that says Item Barcode.
#### Figure 1: Check the box 'Item Barcode'
-
+
To start scanning with a bar-code, go to
@@ -39,7 +39,7 @@ Then go to Accounts and click on Sales Invoice. Check the box 'Is POS'
#### Figure 2: Check the box 'Is POS'
-
+
Go to Item and click on Add new row.
diff --git a/erpnext/docs/user/guides/setting-up/calculate-incentive-for-sales-team.md b/erpnext/docs/user/manual/en/setting-up/calculate-incentive-for-sales-team.md
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/calculate-incentive-for-sales-team.md
rename to erpnext/docs/user/manual/en/setting-up/calculate-incentive-for-sales-team.md
diff --git a/erpnext/docs/user/guides/setting-up/company-setup.md b/erpnext/docs/user/manual/en/setting-up/company-setup.md
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/company-setup.md
rename to erpnext/docs/user/manual/en/setting-up/company-setup.md
diff --git a/erpnext/docs/user/guides/setting-up/data/bulk-rename.md b/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md
similarity index 82%
rename from erpnext/docs/user/guides/setting-up/data/bulk-rename.md
rename to erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md
index 2aec08be35..499ee3276e 100644
--- a/erpnext/docs/user/guides/setting-up/data/bulk-rename.md
+++ b/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md
@@ -12,6 +12,6 @@ This tool will allow you to rename multiple records at the same time.
To rename multiple records, upload a **.csv** file with the old name in the first column and the new name in the second column and click on **Upload**.
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/data/data-import-tool.md b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
similarity index 88%
rename from erpnext/docs/user/guides/setting-up/data/data-import-tool.md
rename to erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
index 2a7eff11ed..e59ed21761 100644
--- a/erpnext/docs/user/guides/setting-up/data/data-import-tool.md
+++ b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
@@ -4,7 +4,7 @@ master data, into the system.
To Open the data import tool, you either go to Setup or go to the Transaction
you want to Import. If Data Import is allowed, you will see an Import Button:
-
+
The tool has two sections, one to download a template and the second to upload
the data.
@@ -20,7 +20,7 @@ with it too. The child tables are linked to the parent tables and are
implemented where there are multiple values for any property. For example an
Item can have multiple prices, An Invoice has multiple Items and so on.
-
+
* Click on the table you want to download or "All Tables"
* For bulk editing, you can click on "Download With Data"
@@ -30,19 +30,19 @@ Item can have multiple prices, An Invoice has multiple Items and so on.
After downloading the template, open it in a spreadsheet application and fill
in the data below the column headings.
-
+
Then export your template or save it as a **Comma Separated Values** (CSV)
file.
-
+
### 3\. Upload the .csv File
Finally attach the .csv file in the section. Click on the "Upload and Import"
button.
-
+
#### Notes:
diff --git a/erpnext/docs/user/guides/setting-up/data/index.md b/erpnext/docs/user/manual/en/setting-up/data/index.md
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/data/index.md
rename to erpnext/docs/user/manual/en/setting-up/data/index.md
diff --git a/erpnext/docs/user/guides/setting-up/data/index.txt b/erpnext/docs/user/manual/en/setting-up/data/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/data/index.txt
rename to erpnext/docs/user/manual/en/setting-up/data/index.txt
diff --git a/erpnext/docs/user/guides/setting-up/email/setting-up-email.md b/erpnext/docs/user/manual/en/setting-up/email/.md
similarity index 92%
rename from erpnext/docs/user/guides/setting-up/email/setting-up-email.md
rename to erpnext/docs/user/manual/en/setting-up/email/.md
index 0fb4658765..feb724f172 100644
--- a/erpnext/docs/user/guides/setting-up/email/setting-up-email.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/.md
@@ -24,7 +24,7 @@ To setup your outgoing mails, go to
#### Figure 1: Set up outgoing mail server.
-
+
Set your outgoing mail server settings here. These are the same settings you
would use in your Outlook, Thunderbird, Apple Mail or other such email
@@ -51,7 +51,7 @@ To setup your Support integration, go to:
#### Figure 2: Setup support Integration
-
+
To make ERPNext pull emails from your mail box, enter the POP3 settings. (POP3
is a way of extracting emails from your mailbox. It should be fairly easy to
@@ -69,7 +69,7 @@ contact mentioned in the document. To set this up, go to:
#### Figure 3: Set Auto Notification
-
+
Check on the transactions you want to send via email directly on Submission
and add a custom message if you want on these documents.
@@ -91,5 +91,5 @@ To setup Email Digests, go to:
#### Figure 4: Set up Email Digest
-
+
diff --git a/erpnext/docs/user/guides/setting-up/email/email-account.md b/erpnext/docs/user/manual/en/setting-up/email/email-account.md
similarity index 82%
rename from erpnext/docs/user/guides/setting-up/email/email-account.md
rename to erpnext/docs/user/manual/en/setting-up/email/email-account.md
index 37ceddb7c3..4392bf4d54 100644
--- a/erpnext/docs/user/guides/setting-up/email/email-account.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-account.md
@@ -10,7 +10,7 @@ ERPNext will create templates for a bunch of email accounts by default. Not all
There are 2 types of email accounts, outgoing and incoming. Outgoing email accounts use an SMTP service to send emails and emails are retrived from your inbox using a POP service. Most email providers such as GMail, Outlook or Yahoo provide these services.
-
+
### Outgoing Email Accounts
@@ -18,13 +18,13 @@ All emails sent from the system, either by the user to a contact or notification
To setup an outgoing Email Account, check on **Enable Outgoing** and set your SMTP server settings, if you are using a popular email service, these will be preset for you.
-
+
### Incoming Email Accounts
To setup an incoming Email Account, check on **Enable Incoming** and set your POP3 settings, if you are using a popular email service, these will be preset for you.
-
+
### How ERPNext handles replies
@@ -34,6 +34,6 @@ In ERPNext when you send an email to a contact like a customer, the sender will
If you would like ERPNext to notify you if an email is unreplied for a certain amount of time, then you can set **Notify if Unreplied**. Here you can set the number of minutes to wait before notifications are sent and whom the notifications must go to.
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/email/email-alerts.md b/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md
similarity index 85%
rename from erpnext/docs/user/guides/setting-up/email/email-alerts.md
rename to erpnext/docs/user/manual/en/setting-up/email/email-alerts.md
index 4b1dad6ffe..f4cccd3ef3 100644
--- a/erpnext/docs/user/guides/setting-up/email/email-alerts.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md
@@ -33,9 +33,9 @@ To setup an Email Alert:
### Example
1. Defining the Criteria
-
+
1. Setting the Recipients and Message
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/email/email-digest.md b/erpnext/docs/user/manual/en/setting-up/email/email-digest.md
similarity index 83%
rename from erpnext/docs/user/guides/setting-up/email/email-digest.md
rename to erpnext/docs/user/manual/en/setting-up/email/email-digest.md
index 390c566b8a..5fa836e604 100644
--- a/erpnext/docs/user/guides/setting-up/email/email-digest.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-digest.md
@@ -12,6 +12,6 @@ To set up Email Digest, go to:
Set your frequency, check all the items you want to receive in your weekly update and select the user ids whom you want to send the Digest to.
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/email/index.md b/erpnext/docs/user/manual/en/setting-up/email/index.md
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/email/index.md
rename to erpnext/docs/user/manual/en/setting-up/email/index.md
diff --git a/erpnext/docs/user/guides/setting-up/email/index.txt b/erpnext/docs/user/manual/en/setting-up/email/index.txt
similarity index 76%
rename from erpnext/docs/user/guides/setting-up/email/index.txt
rename to erpnext/docs/user/manual/en/setting-up/email/index.txt
index 01061d03f2..86e75c252d 100644
--- a/erpnext/docs/user/guides/setting-up/email/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/email/index.txt
@@ -2,3 +2,4 @@ email-account
email-alerts
email-digest
sending-email
+setting-up-email
diff --git a/erpnext/docs/user/manual/en/setting-up/email/sending-email.md b/erpnext/docs/user/manual/en/setting-up/email/sending-email.md
new file mode 100644
index 0000000000..504c76d8fb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/email/sending-email.md
@@ -0,0 +1,9 @@
+# Sending Email from any Document
+
+In ERPNext you can send any document as email (with a PDF attachment) by clicking on `Menu > Email` from any open document.
+
+
+
+**Note:** You must have outgoing [email accounts]({{docs_base_url}}/user/manual/en/setting-up/email/email-account.html) setup for this.
+
+{next}
diff --git a/erpnext/docs/user/guides/setting-up/index.md b/erpnext/docs/user/manual/en/setting-up/index.md
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/index.md
rename to erpnext/docs/user/manual/en/setting-up/index.md
diff --git a/erpnext/docs/user/guides/setting-up/index.txt b/erpnext/docs/user/manual/en/setting-up/index.txt
similarity index 84%
rename from erpnext/docs/user/guides/setting-up/index.txt
rename to erpnext/docs/user/manual/en/setting-up/index.txt
index cbd14e5dab..92378252e2 100644
--- a/erpnext/docs/user/guides/setting-up/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/index.txt
@@ -15,3 +15,5 @@ third-party-backups
workflows
bar-code
company-setup
+calculate-incentive-for-sales-team
+articles
diff --git a/erpnext/docs/user/guides/setting-up/pos-setting.md b/erpnext/docs/user/manual/en/setting-up/pos-setting.md
similarity index 81%
rename from erpnext/docs/user/guides/setting-up/pos-setting.md
rename to erpnext/docs/user/manual/en/setting-up/pos-setting.md
index 8380877e04..9bfd8198f2 100644
--- a/erpnext/docs/user/guides/setting-up/pos-setting.md
+++ b/erpnext/docs/user/manual/en/setting-up/pos-setting.md
@@ -14,10 +14,10 @@ from:
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]({{url_prefix}}/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}
diff --git a/erpnext/docs/user/guides/setting-up/price-lists.md b/erpnext/docs/user/manual/en/setting-up/price-lists.md
similarity index 92%
rename from erpnext/docs/user/guides/setting-up/price-lists.md
rename to erpnext/docs/user/manual/en/setting-up/price-lists.md
index 2acd83dbb1..156e66de9a 100644
--- a/erpnext/docs/user/guides/setting-up/price-lists.md
+++ b/erpnext/docs/user/manual/en/setting-up/price-lists.md
@@ -8,7 +8,7 @@ You can create new Price List
> Selling/Buying/Stock > Setup > Price List >> New
-
+
* These Price List will be used when creating Item Price record to track selling or buying price of an item. Click here to learn more about Item Price.
diff --git a/erpnext/docs/user/guides/setting-up/print/address-template.md b/erpnext/docs/user/manual/en/setting-up/print/address-template.md
similarity index 91%
rename from erpnext/docs/user/guides/setting-up/print/address-template.md
rename to erpnext/docs/user/manual/en/setting-up/print/address-template.md
index 70682b2e9c..c2b9bb72d7 100644
--- a/erpnext/docs/user/guides/setting-up/print/address-template.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/address-template.md
@@ -26,6 +26,6 @@ Here is the default template:
### Example
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/print/index.md b/erpnext/docs/user/manual/en/setting-up/print/index.md
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/print/index.md
rename to erpnext/docs/user/manual/en/setting-up/print/index.md
diff --git a/erpnext/docs/user/guides/setting-up/print/index.txt b/erpnext/docs/user/manual/en/setting-up/print/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/print/index.txt
rename to erpnext/docs/user/manual/en/setting-up/print/index.txt
diff --git a/erpnext/docs/user/guides/setting-up/print/letter-head.md b/erpnext/docs/user/manual/en/setting-up/print/letter-head.md
similarity index 75%
rename from erpnext/docs/user/guides/setting-up/print/letter-head.md
rename to erpnext/docs/user/manual/en/setting-up/print/letter-head.md
index 1e69540d13..d3c24f2247 100644
--- a/erpnext/docs/user/guides/setting-up/print/letter-head.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/letter-head.md
@@ -14,10 +14,10 @@ You can create / manage Letter Heads from:
### Example
-
+
This is how the letter head looks in a document print:
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/print/print-format-builder.md b/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md
similarity index 70%
rename from erpnext/docs/user/guides/setting-up/print/print-format-builder.md
rename to erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md
index 3af05f5e1a..f9799279af 100644
--- a/erpnext/docs/user/guides/setting-up/print/print-format-builder.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md
@@ -10,19 +10,19 @@ or Open the document for which you want to make a print format. Click the Printe
### Step 1: Make a new Format
-
+
### Step 2: Add a new Field
To add a field, just drag it from the left sidebar and add it in your layout. You can edit the layout by clicking on the settings icon.
-
+
### Step 3
To remove a field, just drag it back into the fields sidebar.
-
+
### Step 4
@@ -30,7 +30,7 @@ You can add customized text, HTML in your print format, just add the **Custom HT
Then click on **Edit HTML** to edit your content.
-
+
To save your format, just click on the **Save** button on the top.
diff --git a/erpnext/docs/user/guides/setting-up/print/print-headings.md b/erpnext/docs/user/manual/en/setting-up/print/print-headings.md
similarity index 61%
rename from erpnext/docs/user/guides/setting-up/print/print-headings.md
rename to erpnext/docs/user/manual/en/setting-up/print/print-headings.md
index 4c492e0835..98fbf53df0 100644
--- a/erpnext/docs/user/guides/setting-up/print/print-headings.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/print-headings.md
@@ -8,10 +8,10 @@ You can create print headings from :
#### Figure 1: Save Print Heading
-
+
Example of a change in print heading is shown below:
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/print/print-settings.md b/erpnext/docs/user/manual/en/setting-up/print/print-settings.md
similarity index 69%
rename from erpnext/docs/user/guides/setting-up/print/print-settings.md
rename to erpnext/docs/user/manual/en/setting-up/print/print-settings.md
index a4788df66e..cdf3c54a37 100644
--- a/erpnext/docs/user/guides/setting-up/print/print-settings.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/print-settings.md
@@ -6,6 +6,6 @@ To edit print settings, go to:
> Setup > Printing and Branding > Print Settings
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/print/terms-and-conditions.md b/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md
similarity index 84%
rename from erpnext/docs/user/guides/setting-up/print/terms-and-conditions.md
rename to erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md
index 383ca48a3c..8c939d0a82 100644
--- a/erpnext/docs/user/guides/setting-up/print/terms-and-conditions.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md
@@ -6,13 +6,13 @@ To setup Terms and Condition master, go to:
`Selling > Terms and Condition > New`
-
+
### 2. Editing in HTML
Content of Terms and Condition can be formatted as per your preference, and also insert images where needed. If you have expertise in HTML, you will also find option to edit the content of Terms and Condition in HTML.
-
+
This also allows you to use Terms and Condition master for footer, which otherwise is not availale in ERPNext as dedicated functionality. Since contents of Terms and Condition is always the last to appear in the print format, details of footer should be inserted at the end of the content, so that it actually appears as footer in the print format.
@@ -20,6 +20,6 @@ This also allows you to use Terms and Condition master for footer, which otherwi
In transactions, you will find section of Terms and Condition where you will be able to search and fetched required Terms and Condition master.
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/setting-up-taxes.md b/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
similarity index 93%
rename from erpnext/docs/user/guides/setting-up/setting-up-taxes.md
rename to erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
index 0c42819868..a3c11ab2f0 100644
--- a/erpnext/docs/user/guides/setting-up/setting-up-taxes.md
+++ b/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
@@ -22,11 +22,11 @@ sales or purchase tax rate specified by you as default rates.
Item Tax table can be found as a section within the Item Master document.
-
+
* **Inclusive and Exclusive Tax**: ERPNext allows you to enter Item rates which are tax inclusive.
-
+
* **Exception to the rule**: Item tax settings are required only if a particular Item has a different tax rate than the rate defined in the standard tax Account
* **Item tax is overwrite-able**: You can overwrite or change the item tax rate by going to the Item master in the Item tax table.
@@ -49,7 +49,7 @@ have to go to:
> Setup > Accounts > Sales Taxes and Charge Master
-
+
When you create a new master, you will have to add a row for each tax type.
diff --git a/erpnext/docs/user/guides/setting-up/settings/global-defaults.md b/erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md
similarity index 63%
rename from erpnext/docs/user/guides/setting-up/settings/global-defaults.md
rename to erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md
index fd3868c9b0..412572a820 100644
--- a/erpnext/docs/user/guides/setting-up/settings/global-defaults.md
+++ b/erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md
@@ -6,6 +6,6 @@ You can set default values for your documents from Global Defaults
Whenever a new document is created, these values will be set as default.
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/settings/index.md b/erpnext/docs/user/manual/en/setting-up/settings/index.md
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/settings/index.md
rename to erpnext/docs/user/manual/en/setting-up/settings/index.md
diff --git a/erpnext/docs/user/guides/setting-up/settings/index.txt b/erpnext/docs/user/manual/en/setting-up/settings/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/settings/index.txt
rename to erpnext/docs/user/manual/en/setting-up/settings/index.txt
diff --git a/erpnext/docs/user/guides/setting-up/settings/module-settings.md b/erpnext/docs/user/manual/en/setting-up/settings/module-settings.md
similarity index 73%
rename from erpnext/docs/user/guides/setting-up/settings/module-settings.md
rename to erpnext/docs/user/manual/en/setting-up/settings/module-settings.md
index db54494c19..ecfb28213d 100644
--- a/erpnext/docs/user/guides/setting-up/settings/module-settings.md
+++ b/erpnext/docs/user/manual/en/setting-up/settings/module-settings.md
@@ -10,6 +10,6 @@ For example if you are in the services business, you want to hide the Manufactur
Check / uncheck the items to show / hide.
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/settings/naming-series.md b/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
similarity index 93%
rename from erpnext/docs/user/guides/setting-up/settings/naming-series.md
rename to erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
index 4c3f2c10de..df7de6d8fe 100644
--- a/erpnext/docs/user/guides/setting-up/settings/naming-series.md
+++ b/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
@@ -42,7 +42,7 @@ name and the starting point in the “Update Series” section.
See how to set the naming series
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/settings/system-settings.md b/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md
similarity index 67%
rename from erpnext/docs/user/guides/setting-up/settings/system-settings.md
rename to erpnext/docs/user/manual/en/setting-up/settings/system-settings.md
index a529171dab..053b4f1a35 100644
--- a/erpnext/docs/user/guides/setting-up/settings/system-settings.md
+++ b/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md
@@ -6,6 +6,6 @@ To open System Settings, go to:
> Setup > Settings > System Settings
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/index.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/setup-wizard/index.md
rename to erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md
diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/index.txt b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/setup-wizard/index.txt
rename to erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt
diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-1-language.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md
similarity index 72%
rename from erpnext/docs/user/guides/setting-up/setup-wizard/step-1-language.md
rename to erpnext/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md
index 4e2ffe8917..00219fd6a0 100644
--- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-1-language.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md
@@ -2,7 +2,7 @@
Select your language. ERPNext is available in more than 20 languages.
-
+
---
diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-10-item.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-item.md
similarity index 86%
rename from erpnext/docs/user/guides/setting-up/setup-wizard/step-10-item.md
rename to erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-item.md
index 61e3c494c9..bc71b9859b 100644
--- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-10-item.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-item.md
@@ -3,7 +3,7 @@
In this final step, please enter the names of the Items you buy or sell.
+src="{{docs_base_url}}/assets/img/setup-wizard/step-10.png">
Please set the group of the item (Product / Service) and unit of measure. Don't worry you will be able to edit all of this later.
diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-2-currency-and-timezone.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md
similarity index 65%
rename from erpnext/docs/user/guides/setting-up/setup-wizard/step-2-currency-and-timezone.md
rename to erpnext/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md
index 17a3821c75..5dc1648197 100644
--- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-2-currency-and-timezone.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-2-currency-and-timezone.md
@@ -2,7 +2,7 @@
Set your country name, currency and timezone.
-
+
---
diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-3-user-details.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md
similarity index 76%
rename from erpnext/docs/user/guides/setting-up/setup-wizard/step-3-user-details.md
rename to erpnext/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md
index 9b20dd0fb4..b9eff18025 100644
--- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-3-user-details.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md
@@ -3,7 +3,7 @@
Enter Users Profile Details like Name, User ID and preferred password.
+src="{{docs_base_url}}/assets/img/setup-wizard/step-3.png">
---
diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-4-company-details.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-4-company-details.md
similarity index 92%
rename from erpnext/docs/user/guides/setting-up/setup-wizard/step-4-company-details.md
rename to erpnext/docs/user/manual/en/setting-up/setup-wizard/step-4-company-details.md
index cb5947bc5a..f88d31c998 100644
--- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-4-company-details.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-4-company-details.md
@@ -3,7 +3,7 @@
Enter Company Details like Name, Abbreviation and Financial Year Details.
+src="{{docs_base_url}}/assets/img/setup-wizard/step-4.png">
---
diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-5-letterhead-and-logo.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.md
similarity index 85%
rename from erpnext/docs/user/guides/setting-up/setup-wizard/step-5-letterhead-and-logo.md
rename to erpnext/docs/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.md
index ad91d244a7..869496066b 100644
--- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-5-letterhead-and-logo.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-5-letterhead-and-logo.md
@@ -3,7 +3,7 @@
Attach Company Letterhead and Company Logo.
+src="{{docs_base_url}}/assets/img/setup-wizard/step-5.png">
---
@@ -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]({{url_prefix}}/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"
diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-6-add-users.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-6-add-users.md
similarity index 70%
rename from erpnext/docs/user/guides/setting-up/setup-wizard/step-6-add-users.md
rename to erpnext/docs/user/manual/en/setting-up/setup-wizard/step-6-add-users.md
index 06cc778c37..7e8f083670 100644
--- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-6-add-users.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-6-add-users.md
@@ -3,6 +3,6 @@
Add other users and assign them roles based on their job responsibilities.
+src="{{docs_base_url}}/assets/img/setup-wizard/step-6.png">
{next}
diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-7-tax-details.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-7-tax-details.md
similarity index 89%
rename from erpnext/docs/user/guides/setting-up/setup-wizard/step-7-tax-details.md
rename to erpnext/docs/user/manual/en/setting-up/setup-wizard/step-7-tax-details.md
index 02148675e3..1d353b633b 100644
--- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-7-tax-details.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-7-tax-details.md
@@ -3,7 +3,7 @@
Enter any three types of taxes which you regularly pay. This wizard will create a tax master which will calculate the taxes as per the tax-type.
+src="{{docs_base_url}}/assets/img/setup-wizard/step-7.png">
Just set the tax name and the standard percentage levied.
@@ -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]({{url_prefix}}/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}
diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-8-customer-names.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-8-customer-names.md
similarity index 76%
rename from erpnext/docs/user/guides/setting-up/setup-wizard/step-8-customer-names.md
rename to erpnext/docs/user/manual/en/setting-up/setup-wizard/step-8-customer-names.md
index 04ac27cc6d..cde4648ae6 100644
--- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-8-customer-names.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-8-customer-names.md
@@ -4,7 +4,7 @@ Enter your Customer names and the contact person from that organisation.
+src="{{docs_base_url}}/assets/img/setup-wizard/step-8.png">
---
@@ -18,6 +18,6 @@ Customer Name: American Power Mills
Contact Name: Shiv Agarwal
-To understand Customer in detail visit [Customer Details]({{url_prefix}}/user/guides/CRM/customer.html)
+To understand Customer in detail visit [Customer Details]({{docs_base_url}}/user/manual/en/CRM/customer.html)
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-9-suppliers.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-9-suppliers.md
new file mode 100644
index 0000000000..0e4b96a91b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-9-suppliers.md
@@ -0,0 +1,12 @@
+# Step 8: Suppliers
+
+Enter a few of your Suppliers' names.
+
+
+
+---
+
+To understand Suppliers in detail visit [Supplier Master]({{docs_base_url}}/user/manual/en/buying/supplier-master.html)
+
+{next}
diff --git a/erpnext/docs/user/guides/setting-up/sms-setting.md b/erpnext/docs/user/manual/en/setting-up/sms-setting.md
similarity index 88%
rename from erpnext/docs/user/guides/setting-up/sms-setting.md
rename to erpnext/docs/user/manual/en/setting-up/sms-setting.md
index f2e21aa31d..4871ed1a95 100644
--- a/erpnext/docs/user/guides/setting-up/sms-setting.md
+++ b/erpnext/docs/user/manual/en/setting-up/sms-setting.md
@@ -17,7 +17,7 @@ Example URL:
http://instant.smses.com/web2sms.php?username=&password;=&to;=&sender;=&message;=
-
+
> Note: the string up to the "?" is the SMS Gateway URL
@@ -35,6 +35,6 @@ Note that some parameters in the URL are static.You will get static values
from your SMS Provider like username, password etc. These static values should
be entered in the Static Parameters table.
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/stock-reconciliation-for-non-serialized-item.md b/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md
similarity index 88%
rename from erpnext/docs/user/guides/setting-up/stock-reconciliation-for-non-serialized-item.md
rename to erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md
index 9bcafe3e26..bd46bf15db 100644
--- a/erpnext/docs/user/guides/setting-up/stock-reconciliation-for-non-serialized-item.md
+++ b/erpnext/docs/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.md
@@ -27,21 +27,17 @@ To perform Stock Reconciliation, go to:
A predefined template of an spreadsheet file should be followed for importing item's stock levels and valuations. Open new Stock Reconciliation form to see download option.
-
+
#### Step 2: Enter Data in csv file.
-
+
-The csv format is case-sensitive. Do not edit the headers which are preset in the template. In the Item Code and Warehouse column, enter exact Item Code and Warehouse as created in your ERPNext account. For quatity, enter stock level you wish to set for that item, in a specific warehouse. If you do not want to change the quantity or valuation rate of an Item, you should leave it blank.
-
-Note: Make sure you do not put zero if you do not want to change the quantity
-amount or valuation amount. The system will calculate zero as zero quantity.
-So leave the field blank.
+The csv format is case-sensitive. Do not edit the headers which are preset in the template. In the Item Code and Warehouse column, enter exact Item Code and Warehouse as created in your ERPNext account. For quatity, enter stock level you wish to set for that item, in a specific warehouse.
#### **Step 3: Upload file and Enter Values in Stock Reconciliation Form
-
+
**Posting Date**
@@ -63,11 +59,11 @@ report. The report will show you all types of rates.
#### Step 4: Review the reconciliation data
-
+
### Stock Ledger Report
-
+
**How Stock Reconciliation Works**
diff --git a/erpnext/docs/user/guides/setting-up/territory.md b/erpnext/docs/user/manual/en/setting-up/territory.md
similarity index 81%
rename from erpnext/docs/user/guides/setting-up/territory.md
rename to erpnext/docs/user/manual/en/setting-up/territory.md
index 89f1d14e27..3a1abfdfdd 100644
--- a/erpnext/docs/user/guides/setting-up/territory.md
+++ b/erpnext/docs/user/manual/en/setting-up/territory.md
@@ -5,6 +5,6 @@ each Item Group and get reports that will show your actual performance in the
territory v/s what you had planned.
You can also set different pricing for the same product sold across different territories.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/setting-up/third-party-backups.md b/erpnext/docs/user/manual/en/setting-up/third-party-backups.md
similarity index 84%
rename from erpnext/docs/user/guides/setting-up/third-party-backups.md
rename to erpnext/docs/user/manual/en/setting-up/third-party-backups.md
index a65c533d49..c4e74ca4a0 100644
--- a/erpnext/docs/user/guides/setting-up/third-party-backups.md
+++ b/erpnext/docs/user/manual/en/setting-up/third-party-backups.md
@@ -9,7 +9,7 @@ __Step 2:__ Click on Manage Third Party Backup
#### Figure 1: Manage Third Party Backup
-
+
On the Backup Manager page, enter the email addresses of those people whom you
wish to notify about the upload status. Under the topic 'Sync with Dropbox',
@@ -22,11 +22,11 @@ then select the Never option.
#### Figure 2: Allow Dropbox Access
-
+
You need to login to your dropbox account, with your user id and password.
-
+
## Open Source Users
diff --git a/erpnext/docs/user/guides/setting-up/users-and-permissions/adding-users.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
similarity index 54%
rename from erpnext/docs/user/guides/setting-up/users-and-permissions/adding-users.md
rename to erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
index 7272178c3e..dfd9ea00d1 100644
--- a/erpnext/docs/user/guides/setting-up/users-and-permissions/adding-users.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
@@ -2,11 +2,16 @@
Users can be added by the System Manager. If you are a System Manager, you can add Users via
+There are two main classes of users: Web Users and System Users. System Users are people using ERPNext in the company. Web users are customers or suppliers (or portal users).
+
+Under User a lot of info can be entered. For the sake of usability the information entered for webs users is minimal: First Name and email.
+Important is to realize that the email address is the unique key (ID) identifying the Users.
+
> Setup > User
### 1. List of Users
-
+
To add a new user, click on "New"
@@ -25,19 +30,19 @@ After saving, you will see a list of roles and a checkbox next to it. Just check
the user to have and save the document. To click on what permissions translate into roles, click on the role
name.
-
+
### 4. Setting Module Access
Users will have access to all modules for which they have role based access. If you want to block certain modules for certain users, un-check the module from the list.
-
+
### 5. Security Settings
If you wish to give the user access to the system only between office hours,
or during weekends, mention it under security settings.
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/users-and-permissions/index.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/users-and-permissions/index.md
rename to erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md
diff --git a/erpnext/docs/user/guides/setting-up/users-and-permissions/index.txt b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/users-and-permissions/index.txt
rename to erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt
diff --git a/erpnext/docs/user/guides/setting-up/users-and-permissions/role-based-permissions.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md
similarity index 80%
rename from erpnext/docs/user/guides/setting-up/users-and-permissions/role-based-permissions.md
rename to erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md
index 87144888e8..0c4042c154 100644
--- a/erpnext/docs/user/guides/setting-up/users-and-permissions/role-based-permissions.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md
@@ -5,7 +5,7 @@ ERPNext has a role-based permission system. It means that you can assign Roles t
To start with, go to:
> Setup > Permissions > Role Permissions Manager
-
+
Permissions are applied on a combination of:
@@ -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]({{url_prefix}}/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)
---
@@ -38,37 +38,37 @@ Permissions are applied on a combination of:
Leave Application is a good **example** that encompasses all areas of Permission System.
-
+
1. **It should be created by an Employee.**
For this, Employee Role should be given Read, Write, Create permissions.
-
+
1. **An Employee should only be able to access his/her Leave Application.**
Hence, Apply User Permissions should be enabled for Employee Role, and a User Permission record should be created for each User Employee combination. (This effort is reduced for Employee Document Type, by programmatically creating User Permission records.)
-
+
1. **HR Manager should be able to see all Leave Applications.**
Create a Permission Rule for HR Manager at Level 0, with Read permissions. Apply User Permissions should be disabled.
-
+
2. **Leave Approver should be able to see and update Leave Applications applicable to him/her.**
Leave Approver is given Read and Write access at Level 0, with Apply User Permissions enabled. Relevant Employee Documents should be enlisted in the User Permissions of Leave Approvers. (This effort is reduced for Leave Approvers mentioned in Employee Documents, by programmatically creating User Permission records.)
-
+
3. **It should be Approved / Rejected only by HR User or Leave Approver.**
The Status field of Leave Application is set at Level 1. HR User and Leave Approver are given Read and Write permissions for Level 1, while everyone else (All) are given Read permission for Level 1.
-
+
4. **HR User should be able to delegate Leave Applications to his/her subordinates**
HR User is given the right to Set User Permissions. A User with HR User role would be able to defined User Permissions on Leave Application for other users.
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/users-and-permissions/sharing.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md
similarity index 74%
rename from erpnext/docs/user/guides/setting-up/users-and-permissions/sharing.md
rename to erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md
index 471efc1c5a..a939e656fe 100644
--- a/erpnext/docs/user/guides/setting-up/users-and-permissions/sharing.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md
@@ -4,6 +4,6 @@ In addition to user and role permissions, you can also Share a document with ano
To share a document, open the document, click on the "+" icon under sharing and select the user
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/users-and-permissions/user-permissions.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
similarity index 80%
rename from erpnext/docs/user/guides/setting-up/users-and-permissions/user-permissions.md
rename to erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
index 2e2220aa2d..c1cefc6037 100644
--- a/erpnext/docs/user/guides/setting-up/users-and-permissions/user-permissions.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
@@ -8,7 +8,7 @@ To start with, go to:
> Setup > Permissions > User Permissions Manager
- User Permissions Manager displaying how users can access only a specific Company.
@@ -19,21 +19,21 @@ User 'aromn@example.com' has Sales User role and we want to limit the user to ac
1. We add a User Permissions row for Company.
- Add User Permissions row for a combination of User 'aromn@example.com' and Company 'Wind Power LLC'.
1. Also Role "All" has only Read permission for Company, with 'Apply User Permissions' checked.
- Read Permission with Apply User Permissions checked for DocType Company.
1. The combined effect of the above two rules lead to User 'aromn@example.com' having only Read access to Company 'Wind Power LLC'.
- Access is limited to Company 'Wind Power LLC'.
@@ -41,29 +41,29 @@ User 'aromn@example.com' has Sales User role and we want to limit the user to ac
1. We want this User Permission on Company to get applied on other documents like Quotation, Sales Order, etc.
These forms have a **Link Field based on Company**. As a result, User Permissions on Company also get applied on these documents, which leads to User 'aromn@example.com' to acces these documents having Company 'Wind Power LLC'.
- Users with Sales User Role can Read, Write, Create, Submit and Cancel Quotations based on their User Permissions, since 'Apply User Permissions' is checked.
- Quotation List is limited to results for Company 'Wind Power LLC' for User 'aromn@example.com'.
1. User Permissions get applied automatically based on Link Fields, just like how it worked for Quotation. But, Lead Form has 4 Link fields: Territory, Company, Lead Owner and Next Contact By. Say, you want Leads to limit access to Users based only on Territory, even though you have defined User Permissions for DocTypes User, Territory and Company. You can do this by setting 'Ignore User Permissions' for Link fields: Company, Lead Owner and Next Contact By.
- Sales User can Read, Write and Create Leads limited by User Permissions.
- Check 'Ingore User Permissions' for Company, Lead Owner and Next Contact By fields using Setup > Customize > Customize Form for Lead.
- Due to the effect of the above combination, User 'aromn@example.com' can only access Leads with Territory 'United States'.
diff --git a/erpnext/docs/user/guides/setting-up/workflows.md b/erpnext/docs/user/manual/en/setting-up/workflows.md
similarity index 79%
rename from erpnext/docs/user/guides/setting-up/workflows.md
rename to erpnext/docs/user/manual/en/setting-up/workflows.md
index 26080973ff..a4ddc3854c 100644
--- a/erpnext/docs/user/guides/setting-up/workflows.md
+++ b/erpnext/docs/user/manual/en/setting-up/workflows.md
@@ -11,7 +11,7 @@ will get an indication that the HR department has Accepted or Rejected. The
Manager, who is the approving authority, will either Approve or Reject this
request. Accordingly,the user will get his Approved or Rejected status.
-
+
To make this Workflow and transition rules go to :
@@ -19,11 +19,11 @@ To make this Workflow and transition rules go to :
#### Step 1: Enter the different states of Leave Approval Process.
-
+
#### Step 2: Enter Transition Rules.
-
+
#### Notes:
@@ -50,17 +50,17 @@ Leave.
When a Leave Application is submitted, the status on the right hand corner of
the page shows as "Applied"
-
+
When the HR User logs in, he can either Approve or Reject. If approved the
status on the right hand corner of the page shows as Approved. However, a blue
band of information is displayed saying approval is pending by leave approver.
-
+
When the leave approver opens the Leave Application page, he should select the
status and convert to Approved or Rejected.
-
+
{next}
diff --git a/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/index.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.md
similarity index 92%
rename from erpnext/docs/user/guides/stock/accounting-of-inventory-stock/index.md
rename to erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.md
index 4907186a67..b758ff7f0e 100644
--- a/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/index.md
+++ b/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]({{url_prefix}}/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]({{url_prefix}}/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}
diff --git a/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/index.txt b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/stock/accounting-of-inventory-stock/index.txt
rename to erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.txt
diff --git a/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
similarity index 95%
rename from erpnext/docs/user/guides/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
rename to erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
index c3d10ed8c3..ffc5f40e43 100644
--- a/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
+++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
@@ -20,7 +20,7 @@ Steps:
> Setup > Accounts Settings > Make Accounting Entry For Every Stock Movement
-
+
* Create Stock Entry (Material Transfer) to transfer available stock from existing warehouse to new warehouse. As stock will be available in the new warehouse, you should select the new warehouse for all the future transactions.
diff --git a/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/perpetual-inventory.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
similarity index 86%
rename from erpnext/docs/user/guides/stock/accounting-of-inventory-stock/perpetual-inventory.md
rename to erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
index ee62942ecd..fbe880fa6d 100644
--- a/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/perpetual-inventory.md
+++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
@@ -143,11 +143,11 @@ details of Purchase Receipt:
Stock Ledger
-
+
**General Ledger**
-
+
As stock balance increases through Purchase Receipt, "Store" and "Fixed Asset
Warehouse" accounts are debited and a temporary account "Stock Receipt But Not
@@ -162,7 +162,7 @@ Purchase Invoice for the same. The general ledger entries are as follows:
**General Ledger**
-
+
Here "Stock Received But Not Billed" account is debited and nullified the
effect of Purchase Receipt.
@@ -220,11 +220,11 @@ at $300. Following are the details of Delivery Note:
**Stock Ledger**
-
+
**General Ledger**
-
+
As item is delivered from "Stores" warehouse, "Stores" account is credited and
equal amount is debited to the expense account "Cost of Goods Sold". The
@@ -254,11 +254,11 @@ of the Sales Invoice are same as the above Delivery Note.
**Stock Ledger**
-
+
**General Ledger**
-
+
Here, apart from normal account entries for invoice, "Stores" and "Cost of
Goods Sold" accounts are also affected based on the valuation amount.
@@ -292,11 +292,11 @@ Goods Sold" accounts are also affected based on the valuation amount.
**Stock Ledger**
-
+
**General Ledger**
-
+
* * *
@@ -327,11 +327,11 @@ Goods Sold" accounts are also affected based on the valuation amount.
**Stock Ledger**
-
+
**General Ledger**
-
+
* * *
@@ -364,8 +364,8 @@ Goods Sold" accounts are also affected based on the valuation amount.
**Stock Ledger**
-
+
**General Ledger**
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md b/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md
new file mode 100644
index 0000000000..bfee143404
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/allow-over-delivery-billing-against-sales-order-upto-certain-limit.md
@@ -0,0 +1,15 @@
+
Allow over delivery / billing against Sales Order upto certain limit
+
+
Allow over delivery / billing against Sales Order upto certain limit
+
+To setup over delivery / receipt / billing against a Sales / Purchase Order upto certain limit:
+
+1. Go to `Stock > Setup > Stock Settings`.
+2. Set `Allowance Percentage` and save the Stock Settings.
+
+For example: If you have ordered 100 units. and your Allowance is 50% then you are allowed to receive 150 units.
+3. To set item-specific limit, set `Allowance Percentage` in `Item` master.
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md b/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md
new file mode 100644
index 0000000000..e95b113f2b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/auto-creation-of-material-request.md
@@ -0,0 +1,25 @@
+
Auto Creation of Material Request
+
+
Auto Creation of Material Request
+
+ERPNext allows you to define item-wise and warehouse-wise reorder level in the item master. Reorder level is the item's stock level at which item should be re-ordered.
+
+With reorder level, you can also define what should be the next action. Either new purchase or transfer from another warehouse. Based on setting in Item master, purpose will be updated in the Material Request as well.
+
+
+
+You can have Material Request automatically created for items whose stock level reaches re-order level. You can enable this feature from:
+
+`Stock > Setup > Stock Settings`
+
+
+
+A separate Material Request will be created for each item. User with Purchase Manager's role will be informed about these Material Request. He can further process this Material Request, and create Supplier Quotation and Purchase Order against it.
+
+If auto creation of Material Request is failed, Purchase Manager will be informed about error message via email. One of the most encountered error message is:
+
+**An error occurred for certain Items while creating Material Requests based on Re-order level.
+Date 01-04-2015 not in any Fiscal Year.**
+
+One of the reason of error could be Fiscal Year as well. Click [here](https://erpnext.com/kb/accounts/fiscal-year-error) to learn more about it.
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.html b/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.html
new file mode 100644
index 0000000000..6115ed5451
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/creating-depreciation-for-item.html
@@ -0,0 +1,27 @@
+
Creating Depreciation For Item
+
+
Creating Depreciation For Item
+
+Question: A Fixed Asset Item has been purchased and stored in a warehouse. How can the user create a depreciation for a Fixed Asset Item?
Answer:
Though there is no direct, automated method to book
+Asset Depreciation. A suitable work around to achieve this is by creating a Stock Reconciliation Entry.
+ Step 1: In the Attachment file, fill in the appropriate columns;
+
+
+
Item Code whose value is to be depreciated
+
Warehouse in which it is stored
+
Qty (Quantity) Leave this column blank
+
Valuation Rate Enter the Value after Depreciation
+
+
+
+
+
+
+
+
Step 2: In the Stock Reconciliation Form, enter the Expense account for depreciation in Difference Account.
+
+
+
+
+
Note: For more information on Stock Reconciliation, see the User Guide.
+
Note: An Automated Asset Depreciation feature in on our To-Do List. See this Github Issue.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/index.md b/erpnext/docs/user/manual/en/stock/articles/index.md
new file mode 100644
index 0000000000..0dff60b400
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/index.md
@@ -0,0 +1 @@
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/index.txt b/erpnext/docs/user/manual/en/stock/articles/index.txt
new file mode 100644
index 0000000000..fc039b1795
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/index.txt
@@ -0,0 +1,15 @@
+allow-over-delivery-billing-against-sales-order-upto-certain-limit
+auto-creation-of-material-request
+creating-depreciation-for-item
+is-stock-item-field-frozen-in-item-master
+manage-rejected-finished-goods-items
+managing-assets
+managing-batch-wise-inventory
+managing-fractions-in-uom
+opening-stock-balance-entry-for-the-serialized-and-batch-item
+repack-entry
+serial-no-naming
+stock-entry-purpose
+stock-level-report
+track-items-using-barcode
+using-batch-feature-in-stock-entry
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/is-stock-item-field-frozen-in-item-master.md b/erpnext/docs/user/manual/en/stock/articles/is-stock-item-field-frozen-in-item-master.md
new file mode 100644
index 0000000000..a0128273f9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/is-stock-item-field-frozen-in-item-master.md
@@ -0,0 +1,19 @@
+
Is Stock Item field Frozen in the Item master
+
+
Is Stock Item field Frozen in the Item master
+
+In the item master, you might witness values in the following fields be frozen.
+
+1. Is Stock Item
+1. Has Batch No.
+1. Has Serial No.
+
+
+
+For an item, once stock ledger entry is created, values in these fields will be froze. This is to prevent user from changing value which can lead to mis-match of actual stock, and stock level in the system of an item.
+
+For the serialized item, since its stock level is calculated based on count of available Serial Nos., setting Item as non-serialized mid-way will break the sync, and item's stock level shown in the report will not be accurate, hence Has Serial No. field is froze.
+
+To make these fields editable once again, you should delete all the stock transactions made for this item. For the Serialized and Batch Item, you should also delete Serial No. and Batch No. record for this item.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md b/erpnext/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md
new file mode 100644
index 0000000000..9bb01036c3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/manage-rejected-finished-goods-items.md
@@ -0,0 +1,32 @@
+
Manage Rejected Finished Goods Items
+
+
Manage Rejected Finished Goods Items
+
+There could be manufactured Items which would not pass quality test, and would be rejected.
+
+Standard manufacturing process in ERPNext doesn't cover managing rejected items separately. Hence you should create finished goods entry for both accepted as well as rejected items. With this, you will have rejected items also received in the finished goods warehouse.
+
+To move rejected items from the finished goods warehouse, you should create Material Transfer entry. Steps below to create Material Transfer entry.
+
+####New Stock Entry
+
+`Stock > Stock Entry > New`
+
+####Entry Purpose
+
+Purpose = Material Transfer
+
+####Warehouse
+
+Source Warehouse = Finished Goods warehouse
+Target Warehouse = Rejected items warehouse
+
+####Items
+
+Select item which failed quality test, and enter total rejected items as Qty.
+
+####Submit Stock Entry
+
+On Saving and Submitting Stock Entry, stock of rejected items will be moved from Finished Goods Warehouse to Rejected Warehouse.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-assets.md b/erpnext/docs/user/manual/en/stock/articles/managing-assets.md
new file mode 100644
index 0000000000..5032dcd86c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/managing-assets.md
@@ -0,0 +1,24 @@
+
Managing Assets
+
+
Managing Assets
+
+Items like machinery, furniture, land and property, patents etc. can be categorized as fixed asset of a company. In ERPNext, you can maintain fixed asset items in a separate Warehouse.
+
+Item can be created for each type of an asset. Whereas unique Serial No. will be created for each unit of that asset item. Maintaining serialized inventory of asset item will have in tracking item's warranty and expiry details.
+
+####Fixed Asset Master
+
+While creating Item Code for the fixed asset item, you should updated field "Is Fixed Asset" as "Yes".
+
+
+
+Other item properties like Stock/Non-stock item can be updated on the nature of asset. Like patent and trademarks will be non-stock assets.
+
+If your asset item is serialized, click [here](https://erpnext.com/user-guide/stock/serialized-inventory) to learn how serialized inventory is managed in ERPNext.
+
+####Warehouse for Fixed Asset
+
+Separate Warehouse should be created for the fixed asset items. All the sales, purchase and stock transactions for asset items will be done in that fixed asset warehouse only.
+
+Also, as per the perpetual inventory valuation system, you will have accounting ledger auto-created for the warehouse. You can move the accounting ledger of warehouse created for fixed asset from Stock Asset group to fixed asset group. This will be helpful while preparing financial statement for a company.
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.html b/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.html
new file mode 100644
index 0000000000..23cd46d518
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/managing-batch-wise-inventory.html
@@ -0,0 +1,5 @@
+
Managing Batch wise Inventory
+
+
Managing Batch wise Inventory
+
+To maintain batches against an Item you need to mention 'has batch no' as yes in the Item Master. You can create a new Batch from
Stock > Documents > Batch > New
To learn more about batch check out the manual page at https://manual.erpnext.com/contents/stock/batch
While making a purchase receipt or delivery note, mention the batch number against the item.
Batch No. in Purchase Receipt
Batch No. in Delivery Note
Batch-wise Stock Balance Report
To check batch-wise stock balance report, go to:
Stock > Standard Reports > Batch-wise Balance History
diff --git a/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md b/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md
new file mode 100644
index 0000000000..75acd387df
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/managing-fractions-in-uom.md
@@ -0,0 +1,34 @@
+
Managing Fractions in UoM
+
+
Managing Fractions in UoM
+
+UoM stands for Unit of Measurement. Few examples of UoM are Numbers (Nos), Kgs, Litre, Meter, Box, Carton etc.
+
+There are few UoMs which cannot have value decimal places. For example, if we have television for an item, with Nos as its UoM, we cannot have 1.5 Nos. of television, or 3.7 Nos. of computer sets. The value of quantity for these items must be whole number.
+
+You can configure if particular UoM can have value in decimal place or no. Bydefault, decimal places will be allowed in all the UoMs. To restrict decimal places or value in fraction for any UoM, you should follow these steps.
+
+####UoM List
+
+For UoM list, go to:
+
+`Stock > Setup > UoM`
+
+For the list of UoM, select one which you want to restrict value in fraction. Let's assume that UoM is Nos.
+
+####Configure
+
+In the UoM form, you will find a field called "Must be whole number". Check this field to restrict user from enter decimal places in quantity field for item with this UoM.
+
+
+
+####While Creating Entry
+
+While creating transaction, if you enter value in fraction for item who's UoM has "Must be whole number" checked, you will get error message stating:
+
+`Quantity cannot be a fraction at row #`
+
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
new file mode 100644
index 0000000000..5251a8e4ef
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/opening-stock-balance-entry-for-the-serialized-and-batch-item.md
@@ -0,0 +1,63 @@
+
Opening Stock Balance Entry for the Serialized and Batch Item
+
+
Opening Stock Balance Entry for the Serialized and Batch Item
+
+Items for which Serial No. and Batch No. is maintained, opening stock balance entry for them will be update via Stock Entry. [Click here to learn how serialized inventory is managed in ERPNext](https://erpnext.com/user-guide/stock/serialized-inventory).
+
+Why Opening Balance entry for the Serialized and Batch Item cannot be updated via Stock Reconciliation?
+
+In the ERPNext, stock level of a serialized items is derived based on the count of Serial Nos for that item. Hence, unless Serial Nos. are created for the serialized item, its stock level will not be updated. In the Stock Reconciliation Tool, you can only update opening quantity of an item, and not their Serial No. and Batch No.
+
+Let's check steps for create opening stock balance entry for the Serialized and Batch item.
+
+#### Step 1: New Stock Entry
+
+`Stock > Stock Entry > New`
+
+#### Step 2: Select Purpose
+
+Stock Entry Purpose should be updated as `Material Receipt`.
+
+#### Step 3: Update Posting Date
+
+Posting Date should be date on which you wish to update opening balance for an item.
+
+#### Step 4: Update Target Warehouse
+
+Target Warehouse will be one in which opening balance of an item will be updated.
+
+#### Step 5: Select Items
+
+Select Items in the Stock Entry table.
+
+#### Step 6: Update Opening Qty
+
+For the serialized item, you should update as many Serial Nos as their Qty. If you have updated Prefix in the Item master, on the submission of Stock Entry Serial Nos. will be auto-created following that prefix.
+
+
+
+For a batch item, you should provide Batch ID in which opening balance will be updated. You should keep batch master ready, and updated it for the Batch Item. To create new Batch, go to:
+
+`Stock > Setup > Batch > New`
+
+[Click here to learn how Batchwise inventory is managed in ERPNext](https://erpnext.com/user-guide/stock/batchwise-inventory).
+
+#### Step 7: Update Valuation Rate an Item
+
+Valuation Rate is the mandatory field, where you should update `per unit value of item`. If you have unit of items having different valuation rates, they should be updated in a separate row, with different Valuation Rate.
+
+#### Step 8: Difference Account
+
+As per perpetual inventory valuation system, accounting entry is created for every stock entry. Accounting system followed in the ERPNext requires Total Debit in an entry matching with Total Credit. On the submission of Stock Entry, system Debits accounting ledger of a Warehouse by total value of items. To balance the same, we use Temporary Liability account in the Difference Account field. [Click here to learn more about use of Temporary Accounts in updating opening balance](https://erpnext.com/kb/accounts/updating-opening-balance-in-accounts-using-temporary-account).
+
+
+
+#### Step 9: Save and Submit Stock Entry
+
+On submission of Stock Entry, stock ledger entry will be posted, and opening balance will be updated for the items on a given posting date.
+
+If Serial Nos. for your items are set to be created based on prefix, then on submission of Stock Entry, Serial Nos. will be created as well.
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/repack-entry.md b/erpnext/docs/user/manual/en/stock/articles/repack-entry.md
new file mode 100644
index 0000000000..59bf9835f7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/repack-entry.md
@@ -0,0 +1,35 @@
+
Repack Entry
+
+
Repack Entry
+
+If you buy items in bulk to be repacked into smaller packs, you can create a **Stock Entry** of type "Repack". For example, item bought in tons can be repacked into Kgs.
+
+Notes:
+1. Separate purchase and repacked Items must be made.
+2. Repack entry can be made with or without BOM (Bill of Material).
+
+Let's check below scenario to understand this better.
+
+Assume you buy crude oil in barrel, and get diesel and gasoline as its output. To create production entry, go to:
+
+#### 1. New Stock Entry
+
+`Stock > Documents > Stock Entry > New Stock Entry`
+
+#### 2. Enter Items
+
+Select Purpose as 'Repack Entry'.
+
+For raw-material/input item, only Source Warehouse will be provided.
+
+For repacked/production item, only Target Warehouse will be entered. You will have to provide valuation for the repacked/production item.
+
+
+
+#### 3. Submit Stock Entry
+
+On submitting Stock Entry, stock of input item will be reduced from Source Warehouse, and stock of repacked/production item will be added in the Target Warehouse.
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md b/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md
new file mode 100644
index 0000000000..c4e8774e40
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/serial-no-naming.md
@@ -0,0 +1,41 @@
+
Serial No. Naming
+
+
Serial No. Naming
+
+Serial Nos. are unique value assigned on each unit of an item. Serial no. helps in locating and tracking item's warranty and expiry details.
+
+To make item Serialized, in the Item master, on selecting **Has Serial No** field should be updated as "Yes".
+
+There are two ways Serial no. can be generated in ERPNext.
+
+###1. Serializing Purchase Items
+
+If purchased items are received with Serial Nos. applied by OEM (original equipment manufacturer), you should follow this approach. While creating Purchase Receipt, you shall scan or manually enter Serial nos. for an item. On submitting Purchase Receipt, Serial Nos. will be created in the backend as per Serial No. entered for an item.
+
+If received items already has its Serial No. barcoded, you can simply scan that barcode for entering Serial No. in the Purchase Receipt. Click [here](https://frappe.io/blog/management/using-barcodes-to-ease-data-entry) to learn more about it.
+
+On submission of Purchase Receipt or Stock entry for the serialized item, Serial Nos. will be auto-generated.
+
+
+
+Generated Serial numbers will be updated for each item.
+
+
+
+###2. Serializing Manufacturing Item
+
+To Serialize Manufacturing Item, you can define Series for Serial No. Generation in the Item master itself. Following that series, system will create Serial Nos. for Item when its Production entry is made.
+
+####2.1 Serial No. Series
+
+When Item is set as serialized, it will allow you to mentioned Series for it.
+
+
+
+####2.2 Production Entry for Serialized Item
+
+On submission of production entry for manufacturing item, system will automatically generate Serial Nos. following Series as specified in the Item master.
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md b/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md
new file mode 100644
index 0000000000..26b6346927
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/stock-entry-purpose.md
@@ -0,0 +1,53 @@
+
Stock Entry Purpose
+
+
Stock Entry Purpose
+
+Stock Entry document records Item movement from a Warehouse, to a Warehouse and between Warehouses. And in stock entry form selection of 'Purpose' belongs to type of item movement. Following are the uses of Stock Entry Purposes in stock entry form.
+
+#### 1.Purpose = Material Issue
+
+This purpose is selected to issue item from a warehouse. In this stock entry, you should define Source Warehouse only. This type of stock entry can be perform for adjustment of serialized inventory.
+
+
+
+#### 2.Purpose = Material Receipt
+
+This purpose is selected to receive item in a warehouse. In this stock entry, you should define Target Warehouse only. This type of stock entry can be perform for adjustment of serialized inventory.
+
+
+
+#### 3.Purpose = Material Transfer
+
+This purpose is selected to transfer item from warehouse to warehouse or to transfer raw material for production. In this stock entry, you should define Source Warehouse and Target Warehouse also.
+
+
+
+#### 4.Purpose = Manufacture
+
+This purpose is selected to perform finished goods entry. This purpose is auto selected in stock entry form, when you Update Finished Goods entry from Submitted Production Order. 
+
+
+
+#### 5.Purpose = Repack
+
+This purpose is selected to perform repack of item. 
+
+#### 6.Purpose = Subcontract
+
+This purpose is selected to transfer row material to supplier for manufacturing subcontracting item.
+
+
+
+#### 6.Purpose = Sales Return
+
+This purpose is selected to receive returned item by customer. 
+
+
+
+#### 6.Purpose = Purchase Return
+
+This purpose is selected to issue purchased item to supplier. 
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md b/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md
new file mode 100644
index 0000000000..fa9261298f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/stock-level-report.md
@@ -0,0 +1,41 @@
+
Stock Level Report
+
+
Stock Level Report
+
+Stock Level report list stock item's quantity available in a particular warehouse.
+
+There are multiple reports available you can check for item's stock level.
+
+####Stock Projected Quantity Report
+
+You can access this report from `Stock > Main Report > Stock Projected Quantity`
+
+This report list item wise - warehouse wise stock level of an item considering all the stock transactions. With Actual Quantity of an item, it also provide other details like:
+
+1. Actual Qty: Quantity available in the warehouse.
+2. Planned Qty: Quantity, for which, Production Order has been raised, but is pending to be manufactured.
+3. Requested Qty: Quantity requested for purchase, but not ordered.
+4. Ordered Qty: Quantity ordered for purchase, but not received.
+5. Reserved Qty: Quantity ordered for sale, but not delivered.
+6. Project Qty: Project Quantity is calculated as
+
+
+
+The projected inventory is used by the planning system to monitor the reorder point and to determine the reorder quantity. The projected Quantity is used by the planning engine to monitor the safety stock levels. These levels are maintained to serve unexpected demands.
+
+Having a tight control of the projected inventory is crucial to determine shortages and to calculate the right order quantity.
+
+####Stock Balance Report
+
+Stock Ledger report helps you check stock balance of an item on a given date.
+
+You can access this report from
+
+`Stock > Main Report > Stock Balance`
+
+This allows you to go back in time, and check what was stock level of an item in a particular warehouse in the near past.
+
+With item's stock levels, you will also get their valuation details in this report.
+
+Based on the date filters, this report provides item's Opening Stock on From Date, and Closing Stock on To From. It will also list the In Quantity and Out Quantity for an item between the date range.
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md b/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md
new file mode 100644
index 0000000000..5b0d99af11
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md
@@ -0,0 +1,20 @@
+
Track items using Barcode
+
+A barcode, is a code using multiple lines and spaces of varying widths, designed to represent some alpha-numeric characters. For example, in retail, it generally represents item code / serial number. Most barcode scanners behave like an external keyboard. When it scans a barcode, the data appears in the computer screens at the point of cursor.
+
+To enable barcode feature in ERPNext go to `Setup –> Customize –> Features Setup` and check "Item Barcode" option.
+
+
+Now, a new field "Barcode" will be appear in Item master, enter barcode while creating a new item. You can update barcode field for existing items using "Data Import Tool".
+
+If you are creating your own barcode, then you should print those same barcodes and attach to your products.
+
+
+
+Once you have updated barcode field in item master, you can fetch items using barcode in Delivery Note, Sales Invoice and Purchase Receipt document.
+
+For example, in Delivery Note Item table, a new field "Barcode" will be appear and if you point your mouse cursor to that field and scan the barcode using Barcode Scanner, the code will appear in that field. At the same time, system will pull item details, based on the barcode.
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/articles/using-batch-feature-in-stock-entry.md b/erpnext/docs/user/manual/en/stock/articles/using-batch-feature-in-stock-entry.md
new file mode 100644
index 0000000000..eeb5cdfdab
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/articles/using-batch-feature-in-stock-entry.md
@@ -0,0 +1,13 @@
+
Using Batch feature in Stock Entry.
+
+1. You need to first create an Item Master Record. You can do so by typing 'new Item' in the Awesome bar.
+
+2. In the Item Master fill in all item related details. In the 'Inventory' section select 'Has Batch No.' as 'YES'
+
+ NOTE: This option can be changed after submit but only as long as there are no Stock Entries created against that Item. Once an Stock Entry is created against that item this field freezes. To modify it again you need to cancel all outstanding 'Stock Entries'
+3. You can then create a batch. To do so you can type 'new Batch' in the Awesome bar.
+4. Fill in the batch related details and save the Doc.
+
+5. Now in Stock Transaction You can associate a batch against that item under the 'Serial No / Batch' Section.
+
diff --git a/erpnext/docs/user/guides/stock/batch.md b/erpnext/docs/user/manual/en/stock/batch.md
similarity index 93%
rename from erpnext/docs/user/guides/stock/batch.md
rename to erpnext/docs/user/manual/en/stock/batch.md
index 4cb7f064e7..e6a1253b72 100644
--- a/erpnext/docs/user/guides/stock/batch.md
+++ b/erpnext/docs/user/manual/en/stock/batch.md
@@ -16,7 +16,7 @@ Batch master is created before creation of Purchase Receipt.
Hence eveytime there is Purchase Receipt or Production entry being made for a batch item,
you will first create its Batch No, and then select it in Purcase order or Production Entry.
-
+
> Note: In stock transactions, Batch IDs will be filtered based on Item Code, Warehouse,
Batch Expiry Date (compared with Posting date of a transaction) and Actual Qty in Warehouse.
diff --git a/erpnext/docs/user/guides/stock/delivery-note.md b/erpnext/docs/user/manual/en/stock/delivery-note.md
similarity index 88%
rename from erpnext/docs/user/guides/stock/delivery-note.md
rename to erpnext/docs/user/manual/en/stock/delivery-note.md
index 1cdf41f547..358f0374e9 100644
--- a/erpnext/docs/user/guides/stock/delivery-note.md
+++ b/erpnext/docs/user/manual/en/stock/delivery-note.md
@@ -13,7 +13,7 @@ create a new Delivery Note from:
or from a “Submitted” Sales Order (that is not already shipped) by clicking on
“Make Delivery Note”.
-
+
You can also “fetch” the details from an unshipped Sales Order.
@@ -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]({{url_prefix}}/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
diff --git a/erpnext/docs/user/guides/stock/index.md b/erpnext/docs/user/manual/en/stock/index.md
similarity index 100%
rename from erpnext/docs/user/guides/stock/index.md
rename to erpnext/docs/user/manual/en/stock/index.md
diff --git a/erpnext/docs/user/guides/stock/index.txt b/erpnext/docs/user/manual/en/stock/index.txt
similarity index 77%
rename from erpnext/docs/user/guides/stock/index.txt
rename to erpnext/docs/user/manual/en/stock/index.txt
index 75e9cbf2f6..b89abe102e 100644
--- a/erpnext/docs/user/guides/stock/index.txt
+++ b/erpnext/docs/user/manual/en/stock/index.txt
@@ -12,4 +12,7 @@ accounting-of-inventory-stock
tools
setup
sales-return
-purchase-return
\ No newline at end of file
+purchase-return
+articles
+opening-stock
+stock-how-to
diff --git a/erpnext/docs/user/manual/en/stock/installation-note.md b/erpnext/docs/user/manual/en/stock/installation-note.md
new file mode 100644
index 0000000000..05196529a9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/installation-note.md
@@ -0,0 +1,5 @@
+You can use installation note to record the instalation of a product having a serial number.
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/stock/item/index.md b/erpnext/docs/user/manual/en/stock/item/index.md
similarity index 84%
rename from erpnext/docs/user/guides/stock/item/index.md
rename to erpnext/docs/user/manual/en/stock/item/index.md
index 89ec5e5c51..4af8eff926 100644
--- a/erpnext/docs/user/guides/stock/item/index.md
+++ b/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]({{url_prefix}}/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]({{url_prefix}}/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]({{url_prefix}}/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]({{url_prefix}}/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]({{url_prefix}}/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
@@ -66,7 +66,7 @@ Length, Finish etc.
### Purchase Details
-
+
**Lead time days:** Lead time days are the number of days required for the Item to reach the warehouse.
@@ -76,7 +76,7 @@ Length, Finish etc.
### Sales Details
-
+
**Default Income Account:** Income account selected here will be fetched automatically in sales invoice for this item.
@@ -84,8 +84,10 @@ Length, Finish etc.
### Manufacturing And Website
-
+
-Visit [Manufacturing]({{url_prefix}}/user/guides/manufacturing.html) and [Website ]({{url_prefix}}/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}
diff --git a/erpnext/docs/user/manual/en/stock/item/index.txt b/erpnext/docs/user/manual/en/stock/item/index.txt
new file mode 100644
index 0000000000..4e66875741
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/item/index.txt
@@ -0,0 +1,6 @@
+item-price
+item-codification
+item-variants
+purchase-details
+reorder
+item-valuation-fifo-and-moving-average
diff --git a/erpnext/docs/user/guides/stock/item/item-codification.md b/erpnext/docs/user/manual/en/stock/item/item-codification.md
similarity index 100%
rename from erpnext/docs/user/guides/stock/item/item-codification.md
rename to erpnext/docs/user/manual/en/stock/item/item-codification.md
diff --git a/erpnext/docs/user/guides/stock/item-price.md b/erpnext/docs/user/manual/en/stock/item/item-price.md
similarity index 83%
rename from erpnext/docs/user/guides/stock/item-price.md
rename to erpnext/docs/user/manual/en/stock/item/item-price.md
index a235341cef..b877e8dd55 100644
--- a/erpnext/docs/user/guides/stock/item-price.md
+++ b/erpnext/docs/user/manual/en/stock/item/item-price.md
@@ -14,7 +14,7 @@ Step 1: Select Price List
You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it.
-
+
On selection of Price List, its currency and for selling or buying property will be fetched as well.
@@ -24,13 +24,13 @@ Step 2: Select Item
Select item for which Item Price record is to be created. On selection of Item Code, Item Name and Description will be fetched as well.
-
+
Step 3: Enter Rate
Enter selling/buying rate of an item in Price List currency.
-
+
Step 4: Save Item Price
diff --git a/erpnext/docs/user/guides/stock/item-valuation-fifo-and-moving-average.md b/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
similarity index 95%
rename from erpnext/docs/user/guides/stock/item-valuation-fifo-and-moving-average.md
rename to erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
index 3cabe3585b..9344870081 100644
--- a/erpnext/docs/user/guides/stock/item-valuation-fifo-and-moving-average.md
+++ b/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
@@ -19,7 +19,7 @@ There are two major ways in which ERPNext values your items.
* **FIFO (First In First Out):** In this system, ERPNext assumes that you will consume / sell those Items first which you bought first. For example, if you buy an Item at price X and then after a few days at price Y, whenever you sell your Item, ERPNext will reduce the quantity of the Item priced at X first and then Y.
-
+
* **Moving Average:** In this method, ERPNext assumes that the value of the item at any point is the average price of the units of that Item in stock. For example, if the value of an Item is X in a Warehouse with quantity Y and another quantity Y1 is added to the Warehouse at cost X1, the new value X2 would be:
diff --git a/erpnext/docs/user/guides/stock/item/item-variants.md b/erpnext/docs/user/manual/en/stock/item/item-variants.md
similarity index 63%
rename from erpnext/docs/user/guides/stock/item/item-variants.md
rename to erpnext/docs/user/manual/en/stock/item/item-variants.md
index 256a37ead8..cee3ab1ec9 100644
--- a/erpnext/docs/user/guides/stock/item/item-variants.md
+++ b/erpnext/docs/user/manual/en/stock/item/item-variants.md
@@ -6,19 +6,19 @@ To use Item Variants in ERPNext, create an Item and check 'Has Variants'
* The Item shall then be referred as a 'Template'
-
+
On selecting 'Has Variants' a table shall appear. Specify the variant attributes for the Item in the table.
In case the attribute has Numeric Values, you can specify the range and increment values here.
-
+
> Note: You cannot make Transactions against a 'Template'
To create 'Item Variants' against a 'Template' select 'Make Variants'
-
+
-
+
-To learn more about setting Attributes Master check [Item Attributes]({{url_prefix}}/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)
diff --git a/erpnext/docs/user/guides/stock/item/purchase-details.md b/erpnext/docs/user/manual/en/stock/item/purchase-details.md
similarity index 89%
rename from erpnext/docs/user/guides/stock/item/purchase-details.md
rename to erpnext/docs/user/manual/en/stock/item/purchase-details.md
index 47f724c1f7..5749178448 100644
--- a/erpnext/docs/user/guides/stock/item/purchase-details.md
+++ b/erpnext/docs/user/manual/en/stock/item/purchase-details.md
@@ -7,7 +7,7 @@ When this Item is delivered, the delivery date and the expiry period is saved in
A warranty means a guarantee or a promise which provides assurance by one party to the other party which allows for a legal remedy if that promise is not true or followed. A warranty period is a time period in which a purchased product may be returned or exchanged.
-
+
# How To Name A Manufacturer Part Number?
@@ -17,6 +17,6 @@ Go to the purchase details section of the Item form, and enter the number on the
A manufacturer part number is a series of numbers and /or letters that has been given to a part by the manufacturer. The manufacturer part number belongs to the manufacturer and helps distinguish the part from other manufacturers. If two parts come from different manufacturers, they will have different MPNs. This allows businesses to identify which company made the part.
-
+
__For Example:__ A refrigerator will have different parts which will have manufacturer part number. Thus, when any part fails and you want to replace it, you can simply order that part based on its part number.
diff --git a/erpnext/docs/user/guides/stock/item/reorder.md b/erpnext/docs/user/manual/en/stock/item/reorder.md
similarity index 88%
rename from erpnext/docs/user/guides/stock/item/reorder.md
rename to erpnext/docs/user/manual/en/stock/item/reorder.md
index 34a079f13e..4537d9519b 100644
--- a/erpnext/docs/user/guides/stock/item/reorder.md
+++ b/erpnext/docs/user/manual/en/stock/item/reorder.md
@@ -8,7 +8,7 @@ Go to the Re-order section of the Item form in the Stock module.
The Re-order level is the point at which stock on a particular item has diminished to a point where it needs to be replenished. To order based on Re-order level can avoid shortages. Re-order level can be determined based on the lead time and the average daily consumption.
-
+
__For example:__ You can set your reorder level of bath towels at 10. When there are only 10 towels remaining in stock, the system will either send a mail or take action depending upon what you have selected in global settings.
@@ -20,7 +20,7 @@ To setup Reorder quantity, go to the Re-order section of the Item form. In the f
Re-order quantity is the quantity to order, so that the sum of ordering cost and holding cost is at its minimum.The re-order quantity is based on the minimum order quantity specified by the supplier and many other factors.
-
+
__For example:__ If reorder level is 100 items, your reorder quantity may not necessarily be 100 items. The Reorder quantity can be greater than or equal to reorder level. It may depend upon lead time, discount, transportation and average daily consumption.
diff --git a/erpnext/docs/user/guides/stock/material-request.md b/erpnext/docs/user/manual/en/stock/material-request.md
similarity index 77%
rename from erpnext/docs/user/guides/stock/material-request.md
rename to erpnext/docs/user/manual/en/stock/material-request.md
index 69ce0ea9b3..a609756d3e 100644
--- a/erpnext/docs/user/guides/stock/material-request.md
+++ b/erpnext/docs/user/manual/en/stock/material-request.md
@@ -1,7 +1,7 @@
A Material Request is a simple document identifying a requirement of a set of
Items (products or services) for a particular reason.
-
+
To generate a Material Request manually go to:
@@ -9,14 +9,14 @@ To generate a Material Request manually go to:
#### Creating Material Request
-
+
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]({{url_prefix}}/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:
diff --git a/erpnext/docs/user/guides/stock/opening-stock.md b/erpnext/docs/user/manual/en/stock/opening-stock.md
similarity index 91%
rename from erpnext/docs/user/guides/stock/opening-stock.md
rename to erpnext/docs/user/manual/en/stock/opening-stock.md
index ef285d20aa..4d2d727b6b 100644
--- a/erpnext/docs/user/guides/stock/opening-stock.md
+++ b/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]({{url_prefix}}/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}
diff --git a/erpnext/docs/user/guides/stock/projected-quantity.md b/erpnext/docs/user/manual/en/stock/projected-quantity.md
similarity index 90%
rename from erpnext/docs/user/guides/stock/projected-quantity.md
rename to erpnext/docs/user/manual/en/stock/projected-quantity.md
index 796d427f4e..9251a1b3c2 100644
--- a/erpnext/docs/user/guides/stock/projected-quantity.md
+++ b/erpnext/docs/user/manual/en/stock/projected-quantity.md
@@ -11,7 +11,7 @@ maintained to serve unexpected demands.
Having a tight control of the projected inventory is crucial to determine
shortages and to calculate the right order quantity.
-
+
> Projected Qty = Actual Qty + Planned Qty + Requested Qty + Ordered Qty -
diff --git a/erpnext/docs/user/guides/stock/purchase-receipt.md b/erpnext/docs/user/manual/en/stock/purchase-receipt.md
similarity index 96%
rename from erpnext/docs/user/guides/stock/purchase-receipt.md
rename to erpnext/docs/user/manual/en/stock/purchase-receipt.md
index 68f29d4760..0f43b5884e 100644
--- a/erpnext/docs/user/guides/stock/purchase-receipt.md
+++ b/erpnext/docs/user/manual/en/stock/purchase-receipt.md
@@ -10,7 +10,7 @@ You can make a Purchase Receipt directly from:
or from a “Submitted” Purchase Order, by clicking on “Make Purchase Receipt”.
-
+
### Rejections
diff --git a/erpnext/docs/user/guides/stock/purchase-return.md b/erpnext/docs/user/manual/en/stock/purchase-return.md
similarity index 67%
rename from erpnext/docs/user/guides/stock/purchase-return.md
rename to erpnext/docs/user/manual/en/stock/purchase-return.md
index 5a924a2c1e..328ed08257 100644
--- a/erpnext/docs/user/guides/stock/purchase-return.md
+++ b/erpnext/docs/user/manual/en/stock/purchase-return.md
@@ -6,16 +6,16 @@ You can create a Purchase Return by simply making a Purchase Receipt with negati
First open the original Purchase Receipt, against which supplier delivered the items.
-
+
Then click on "Make Purchase Return", it will open a new Purchase Receipt with "Is Return" checked, items and taxes with negative amount.
-
+
On submission of Return Purchase Return, system will decrease item qty from the mentioned warehouse. To maintain correct stock valuation, stock balance will also go up according to the original purchase rate of the returned items.
-
+
If Perpetual Inventory enabled, system will also post accounting entry against warehouse account to sync warehouse account balance with stock balance as per Stock Ledger.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/stock/sales-return.md b/erpnext/docs/user/manual/en/stock/sales-return.md
similarity index 71%
rename from erpnext/docs/user/guides/stock/sales-return.md
rename to erpnext/docs/user/manual/en/stock/sales-return.md
index 15b8b11b21..1ce922d5c6 100644
--- a/erpnext/docs/user/guides/stock/sales-return.md
+++ b/erpnext/docs/user/manual/en/stock/sales-return.md
@@ -6,22 +6,22 @@ In ERPNext, you can create a Sales Return by simply making a Delivery Note / Sal
First open the original Delivery Note / Sales Invoice, against which customer returned the items.
-
+
Then click on "Make Sales Return", it will open a new Delivery Note with "Is Return" checked, items and taxes with negative amount.
-
+
You can also create the return entry against original Sales Invoice, to return stock along with credit note, check "Update Stock" option in Return Sales Invoice.
-
+
On submission of Return Delivery Note / Sales Invoice, system will increase stock balance in the mentioned warehouse. To maintain correct stock valuation, stock balance will go up according to the original purchase rate of the returned items.
-
+
In case of Return Sales Invoice, Customer account will be credited and associated income and tax account will be debited.
If Perpetual Inventory enabled, system will also post accounting entry against warehouse account to sync warehouse account balance with stock balance as per Stock Ledger.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/stock/serial-no.md b/erpnext/docs/user/manual/en/stock/serial-no.md
similarity index 94%
rename from erpnext/docs/user/guides/stock/serial-no.md
rename to erpnext/docs/user/manual/en/stock/serial-no.md
index 678bd4d4f7..fbbfb1ae3f 100644
--- a/erpnext/docs/user/guides/stock/serial-no.md
+++ b/erpnext/docs/user/manual/en/stock/serial-no.md
@@ -20,7 +20,7 @@ Stock transaction (Stock Entry, Purchase Receipt, Delivery Note, Sales
Invoice). When a new Serial No is created directly, its warehouse cannot be
set.
-
+
* The Status is set based on Stock Entry.
diff --git a/erpnext/docs/user/guides/stock/setup/index.md b/erpnext/docs/user/manual/en/stock/setup/index.md
similarity index 100%
rename from erpnext/docs/user/guides/stock/setup/index.md
rename to erpnext/docs/user/manual/en/stock/setup/index.md
diff --git a/erpnext/docs/user/guides/stock/setup/index.txt b/erpnext/docs/user/manual/en/stock/setup/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/stock/setup/index.txt
rename to erpnext/docs/user/manual/en/stock/setup/index.txt
diff --git a/erpnext/docs/user/guides/stock/setup/item-attribute.md b/erpnext/docs/user/manual/en/stock/setup/item-attribute.md
similarity index 50%
rename from erpnext/docs/user/guides/stock/setup/item-attribute.md
rename to erpnext/docs/user/manual/en/stock/setup/item-attribute.md
index a39c9ee8fc..0b2ab748a0 100644
--- a/erpnext/docs/user/guides/stock/setup/item-attribute.md
+++ b/erpnext/docs/user/manual/en/stock/setup/item-attribute.md
@@ -1,16 +1,16 @@
You can define Attributes and attribute values for your Item Variants here.
-
+
#### Non Numeric Attributes
* For Non Numeric Attributes, specify attributes values along with its abbreviation in the Attribute Value Table.
-
+
#### Numeric Attributes
* If your attribute is Numeric, select Numeric Values
* Specify the Range and the Increment Value
-
+
diff --git a/erpnext/docs/user/guides/stock/setup/item-group.md b/erpnext/docs/user/manual/en/stock/setup/item-group.md
similarity index 64%
rename from erpnext/docs/user/guides/stock/setup/item-group.md
rename to erpnext/docs/user/manual/en/stock/setup/item-group.md
index 1d2343d485..cf6a75a166 100644
--- a/erpnext/docs/user/guides/stock/setup/item-group.md
+++ b/erpnext/docs/user/manual/en/stock/setup/item-group.md
@@ -5,7 +5,7 @@ product is used as a raw-material, you have to name it under the Raw-material
category. In case, your product is used only in trading, you can categorise it
under Trading.
-
+
### Create a Item Group
@@ -13,7 +13,7 @@ under Trading.
* Select 'Add Child'
-
+
### Delete an Item Group
@@ -21,6 +21,6 @@ under Trading.
* Select 'delete'
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/stock/setup/stock-settings.md b/erpnext/docs/user/manual/en/stock/setup/stock-settings.md
new file mode 100644
index 0000000000..f8cb9eaa9d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/setup/stock-settings.md
@@ -0,0 +1,5 @@
+You can set default settings for your stock related transactions here.
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/stock/stock-entry.md b/erpnext/docs/user/manual/en/stock/stock-entry.md
similarity index 87%
rename from erpnext/docs/user/guides/stock/stock-entry.md
rename to erpnext/docs/user/manual/en/stock/stock-entry.md
index ab8bf12d04..b7e0860d3a 100644
--- a/erpnext/docs/user/guides/stock/stock-entry.md
+++ b/erpnext/docs/user/manual/en/stock/stock-entry.md
@@ -5,7 +5,7 @@ To make a Stock Entry you have to go to:
> Stock > Stock Entry > New
-
+
Stock Entries can be made for the following purposes:
@@ -27,15 +27,15 @@ If the stock entry is an incoming entry i.e any item is receiving at a target wa
To add additional costs, enter the description and amount of the cost in the Additional Costs table.
-
+
The added additional costs will be distributed among the receiving items (where the target warehouse mentioned) proportionately based on Basic Amount of the items. And the distributed additional cost will be added to the basic rate of the item, to calculate valuation rate.
-
+
If perpetual inventory system is enabled, additional costs will be booked in "Expense Included In Valuation" account.
-
+
> **Note:** To update Stock from a spreadsheet, see Stock Reconciliation.
diff --git a/erpnext/docs/user/guides/stock/stock-how-to.md b/erpnext/docs/user/manual/en/stock/stock-how-to.md
similarity index 100%
rename from erpnext/docs/user/guides/stock/stock-how-to.md
rename to erpnext/docs/user/manual/en/stock/stock-how-to.md
diff --git a/erpnext/docs/user/guides/stock/tools/index.md b/erpnext/docs/user/manual/en/stock/tools/index.md
similarity index 100%
rename from erpnext/docs/user/guides/stock/tools/index.md
rename to erpnext/docs/user/manual/en/stock/tools/index.md
diff --git a/erpnext/docs/user/guides/stock/tools/index.txt b/erpnext/docs/user/manual/en/stock/tools/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/stock/tools/index.txt
rename to erpnext/docs/user/manual/en/stock/tools/index.txt
diff --git a/erpnext/docs/user/guides/stock/tools/landed-cost-voucher.md b/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md
similarity index 97%
rename from erpnext/docs/user/guides/stock/tools/landed-cost-voucher.md
rename to erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md
index aa146b47f7..1209aff1fd 100644
--- a/erpnext/docs/user/guides/stock/tools/landed-cost-voucher.md
+++ b/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md
@@ -20,7 +20,7 @@ You can update landed cost any time in the future via Landed Cost Voucher.
In the document, you can select multiple Purchase Receipts and fetch all items from those Purchase Receipts. Then you should add applicable charges in “Taxes and Charges” table. You can easily delete an item if the added charges is not applicable to that item. The added charges are proportionately distributed among all the items based their amount.
-
+
### What happend on submission?
diff --git a/erpnext/docs/user/guides/stock/tools/packing-slip.md b/erpnext/docs/user/manual/en/stock/tools/packing-slip.md
similarity index 70%
rename from erpnext/docs/user/guides/stock/tools/packing-slip.md
rename to erpnext/docs/user/manual/en/stock/tools/packing-slip.md
index 2c133bd9cd..0820959677 100644
--- a/erpnext/docs/user/guides/stock/tools/packing-slip.md
+++ b/erpnext/docs/user/manual/en/stock/tools/packing-slip.md
@@ -2,6 +2,6 @@ A packing slip is a document listing the items in a shipment. Usually attached t
While Shipping a product 'Draft' for Delivery Notes are created.
You can make a Packing Slip from these Delivery Notes (Draft)
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/stock/tools/quality-inspection.md b/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md
similarity index 61%
rename from erpnext/docs/user/guides/stock/tools/quality-inspection.md
rename to erpnext/docs/user/manual/en/stock/tools/quality-inspection.md
index 175fa23553..34bea40dcc 100644
--- a/erpnext/docs/user/guides/stock/tools/quality-inspection.md
+++ b/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md
@@ -3,6 +3,6 @@ Inspection. To enable ERPNext to perform this function, go to :
> Stock > Quality Inspection > New
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/stock/warehouse.md b/erpnext/docs/user/manual/en/stock/warehouse.md
similarity index 94%
rename from erpnext/docs/user/guides/stock/warehouse.md
rename to erpnext/docs/user/manual/en/stock/warehouse.md
index 60dd30cd07..d86f401556 100644
--- a/erpnext/docs/user/guides/stock/warehouse.md
+++ b/erpnext/docs/user/manual/en/stock/warehouse.md
@@ -9,7 +9,7 @@ could also go to the Setup module and click on Warehouse under Master Data.
> Stock > Warehouse > New Warehouse
-
+
In ERPNext, every Warehouse must belong to a specific company, to maintain
company wise stock balance. The Warehouses are saved with their respective
diff --git a/erpnext/docs/user/guides/support/index.md b/erpnext/docs/user/manual/en/support/index.md
similarity index 100%
rename from erpnext/docs/user/guides/support/index.md
rename to erpnext/docs/user/manual/en/support/index.md
diff --git a/erpnext/docs/user/guides/support/index.txt b/erpnext/docs/user/manual/en/support/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/support/index.txt
rename to erpnext/docs/user/manual/en/support/index.txt
diff --git a/erpnext/docs/user/guides/support/issue.md b/erpnext/docs/user/manual/en/support/issue.md
similarity index 94%
rename from erpnext/docs/user/guides/support/issue.md
rename to erpnext/docs/user/manual/en/support/issue.md
index 984a00bac7..246af8dc11 100644
--- a/erpnext/docs/user/guides/support/issue.md
+++ b/erpnext/docs/user/manual/en/support/issue.md
@@ -11,7 +11,7 @@ Frappe system.
> Support > Issue > New Issue
-
+
#### Discussion Thread
diff --git a/erpnext/docs/user/guides/support/maintenance-schedule.md b/erpnext/docs/user/manual/en/support/maintenance-schedule.md
similarity index 90%
rename from erpnext/docs/user/guides/support/maintenance-schedule.md
rename to erpnext/docs/user/manual/en/support/maintenance-schedule.md
index 1ae3a3079c..e211562601 100644
--- a/erpnext/docs/user/guides/support/maintenance-schedule.md
+++ b/erpnext/docs/user/manual/en/support/maintenance-schedule.md
@@ -10,7 +10,7 @@ To create a new Maintenance Schedule go to:
> Support > Maintenance Schedule > New Maintenance Schedule
-
+
In the Maintenance Schedule, there are two sections:
diff --git a/erpnext/docs/user/guides/support/maintenance-visit.md b/erpnext/docs/user/manual/en/support/maintenance-visit.md
similarity index 80%
rename from erpnext/docs/user/guides/support/maintenance-visit.md
rename to erpnext/docs/user/manual/en/support/maintenance-visit.md
index 4f2bdbf332..e93260d9f1 100644
--- a/erpnext/docs/user/guides/support/maintenance-visit.md
+++ b/erpnext/docs/user/manual/en/support/maintenance-visit.md
@@ -4,7 +4,7 @@ Maintenance Visit from:
> Support > Maintenance Visit > New Maintenance Visit
-
+
The Maintenance Visit contains information about the:
diff --git a/erpnext/docs/user/guides/support/warranty-claim.md b/erpnext/docs/user/manual/en/support/warranty-claim.md
similarity index 91%
rename from erpnext/docs/user/guides/support/warranty-claim.md
rename to erpnext/docs/user/manual/en/support/warranty-claim.md
index a9d1b8bb77..0a58e18fd6 100644
--- a/erpnext/docs/user/guides/support/warranty-claim.md
+++ b/erpnext/docs/user/manual/en/support/warranty-claim.md
@@ -15,7 +15,7 @@ To create a new **Warranty Claim**:
> Support > Warranty Claim > New Warranty Claim
-
+
If a Customer visit is required to address the issue, you can create a new
Maintenance Visit record from this.
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md
new file mode 100644
index 0000000000..91f7950414
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md
@@ -0,0 +1,10 @@
+
Adding Attachments to Outgoing Messages
+
+ERPNext has in-built file manage system. Click [here](https://erpnext.com/kb/tools/managing-attachments) to learn more on how attachments are managed in ERPNext.
+
+If you have some files attached in your transaction (say Purchase Order), which needs to be emailed with Purchase Order details. When click on Email option, at the end of the Communication dialog box, you will find all the attachments listed with check-box option. You should check files which needs to be emailed as an attachment to recipient.
+
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md
new file mode 100644
index 0000000000..27ad6503e8
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md
@@ -0,0 +1,27 @@
+
Checking Link Between Documents
+
+Linked With function in ERPNext allows you checking a document is linked with which other documents. You will find Linked With function in the every document.
+
+
+
+####Scenario
+
+If you need to check which Delivery Note and Sales Invoice has been created against Sales Order, you should open Sales Order document, and click on Linked With in it.
+
+
+
+Since Sales Order is a centralize transaction, using linked-with option in the Sales Order, you can track complete deal, like billing done, purchases made, manufacturing development against this particular order.
+
+####How It Works?
+
+When you check Linked With in for a Sales Order, it lists all the record where this Sales Order ID is updated. It will not show documents where this Sales Order Id is entered as text, and not in the link field.
+
+####Backward Links
+
+If I check Linked With in the Delivery Note, will it list Sales Order created before this delivery note?
+
+Linked With function works only for the forward linkages. For the backward linkages, you should check current document itself. In the Delivery Note, you can check Item table to see which Sales Order it is linked with.
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md b/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md
new file mode 100644
index 0000000000..dad85ad2db
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md
@@ -0,0 +1,27 @@
+
Delete Submitted Document
+
+ERPNext allows you to assign deletion permission exclusively to User. Only those users will be able to delete records. Click [here](/user-guide/setting-up/permissions/role-based-permissions) to learn more about permissions.
+
+To delete any document from system you should cancel all linked documents. For example if you need to delete Sales Order, but Delivery Note and Sales Invoice has already been created against that Sales Order. Then you should cancel and delete documents in reverse order, i.e. Sales Invoice, Delivery Note and then Sales Order. If payment entry was also made against Sales Invoice, then you should first Cancel and Delete that Journal Voucher, and then come to Sales Invoice.
+
+Following are step to delete submitted documents.
+
+####1. Cancel Document
+
+To be able to delete Submitted document, it must be cancelled first. After document is cancelled, you will find option to delete it.
+
+
+
+####2. Delete Document
+
+After cancellation, go to File menu and click on Delete option.
+
+
+
+#### Deleting from List
+
+For bulk deletion, you can select multiple Cancelled records and delete them at once from the list.
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md b/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md
new file mode 100644
index 0000000000..2a1c0b48de
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md
@@ -0,0 +1,17 @@
+
Duplicate a Record
+
+ERPNext allows you to duplicate existing record. With this, you get values of existing record into new form, and create entries faster.
+
+####Scenario
+
+An electronic supplier receives a repeat order from an existing customer. Since new order will have details just like previous order, you can open previous order, and Copy it to create new order faster. On copying, details of the previous transaction will be updated in the new form. You can make changes where needed and submit the transaction.
+
+You will find Copy option under:
+
+File > Copy
+
+
+
+When Copy function is executed, values are mapped field-by-field from existing to new form.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/index.md b/erpnext/docs/user/manual/en/using-erpnext/articles/index.md
new file mode 100644
index 0000000000..0dff60b400
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/index.md
@@ -0,0 +1 @@
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt b/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt
new file mode 100644
index 0000000000..460fa1624c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt
@@ -0,0 +1,10 @@
+adding-attachments-to-outgoing-messages
+check-link-between-documents
+delete-submitted-document
+duplicate-record
+managing-attachments
+merging-documents
+rename-tool
+renaming-documents
+search-filters
+tree-master-renaming
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/managing-attachments.md b/erpnext/docs/user/manual/en/using-erpnext/articles/managing-attachments.md
new file mode 100644
index 0000000000..e7420b7bf0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/managing-attachments.md
@@ -0,0 +1,20 @@
+
Adding Attachments in a Documents
+
+ERPNext allows to attach files with documents like Order, Invoices, Items etc. User with a read permission on particular document will also be able to access files attached with it. For example, Sales Order can have text file attached detailing item description and specification as decided with customers. Also it can be image file of drawing as per which product is to be manufactured.
+
+Open to attach file is at the footer of a form.
+
+
+
+Click on Attach to browse and select the file.
+
+
+
+If you maintain separate server for the files, or use online service like Dropbox, you can provide link of a particular file in the document in ERPNext.
+
+
+
+`For hosted users, limit of 1 MB is applied on file size.`
+
+To ensure there are not many files attached against the document, which can lead to your system slowing down, you can set limit as how many files can be attached against particular document. Click [here](https://erpnext.com/kb/customize/increase-max-attachments) to learn more about it.
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
new file mode 100644
index 0000000000..08a262037d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
@@ -0,0 +1,32 @@
+
Merging Documents
+
+Document merging feature is available in ERPNext. You can done this via 'Rename' feature in ERPNext.
+
+Following are step to merge document in existing document. Let's assume we are merging Account Ledger.
+
+#### 1: Go to Chart of Account
+
+`Accounts > Setup > Chart of Accounts`
+
+#### 2: Go to Account
+
+Click on Rename option of that account, which you want to merge in existing account.
+
+#### 3: Merge Account
+
+Enter existing account name in New Name field and check Mark on "Merge with existing" option. Then press 'Rename' button to merge.
+
+
+
+Following is how merged account will appear in the Chart of Account master.
+
+
+
+###Effect of Merging
+
+Merging document affects existing transaction where this record is selected. As well as it will affected on existing document balance.
+
+
Note: You can't merge Group into Ledger documents. As well as Ledger into Group documents. Also this feature is applicable for few documents only.
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/rename-tool.md b/erpnext/docs/user/manual/en/using-erpnext/articles/rename-tool.md
new file mode 100644
index 0000000000..3bae21d768
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/rename-tool.md
@@ -0,0 +1,37 @@
+
Rename Tool
+
+ERPNext has Renaming Tool which allows you to rectify/change record id for existing records. This facility can be only performed by User with System Manager's role.
+
+There are two ways you can rename records in your account. You can follow the approach based on how many records needs to be renamed.
+
+###Rename Record via Rename Tool
+
+Using this tool you can correct/rectify primary ids of 500 records at a time.
+
+Following are step to rename bulk records in ERPNext. Let's assume we are renaming Item Codes for existing Items.
+
+#### Step 1: Open Excel File
+
+In new excel file enter old Item Ids in one column and enter new Item Ids in exact next column. Then save data file in .csv format.
+
+
+
+#### Step 2: Upload Data File
+
+To upload data file go to,
+
+`Setup > Data > Rename Tool`
+
+Select DocType which you want to rename. Here DocType will be Item. Then Browse and Upload data file.
+
+
+
+Following are the renamed Item Codes.
+
+
+
+###Rename Individual Document
+
+Click [here](https://erpnext.com/kb/tools/renaming-documents) for detailed steps on how to rename document one by one.
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md
new file mode 100644
index 0000000000..064f41d1b9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md
@@ -0,0 +1,69 @@
+
Renaming Documents
+
+ERPNext has Renaming feature which allows you to correct primary id of a record.
+
+Following are step to rename document in ERPNext. Let's assume we are renaming Item Code for existing Item.
+
+#### 1. Go to Item
+
+`Stock > Documents > Item List > (Open Item)`
+
+Open Item for which Item Code needs to be renamed.
+
+#### 2. Go to File
+
+
+
+#### 3. Rename
+
+Enter desired Item Code, and click on "Rename".
+
+
+
+###Effect of Renaming
+
+Renaming document affects existing transaction where this record is selected. Consider given example, Item Code for a given item will be updated in the existing transaction as well.
+
+###See Also
+
+1. [Bulk Renaming](https://erpnext.com/kb/tools/rename-tool)
+2. [Document Merging](https://erpnext.com/kb/tools/merging-documents)
+
+**List of Renamable Documents**
+
+1. Contact
+2. Address
+3. Warehouse
+4. Supplier
+5. Customer
+6. User
+7. Sales Partner
+8. Project
+9. Cost Center
+10. Item Group
+11. Item
+12. Company
+13. Role
+14. Earning Type
+15. Note
+16. Serial No
+17. Account
+18. Territory
+19. Terms and Conditions
+20. Supplier Type
+21. Workstation
+22. Employee
+23. Sales Taxes and Charges Master
+24. Purchase Taxes and Charges Master
+25. Price List
+26. Party Type
+27. Mode of Payment
+28. Designation
+29. Department
+30. Deduction Type
+31. Customer Group
+32. Brand
+33. Branch
+34. Sales Person
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/search-filters.md b/erpnext/docs/user/manual/en/using-erpnext/articles/search-filters.md
new file mode 100644
index 0000000000..0853ab1de7
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/search-filters.md
@@ -0,0 +1,39 @@
+
Search Filters
+
+Search Filter option allows user to filter records based on value in the specific fields of that form.
+
+Search Filter option is available on the List View page of transactions.
+
+
+
+Each filter option has three fields to select value in.
+
+#### Field
+
+Select field of the form based on which you wish to filter records.
+
+
+
+#### Based On
+
+With Field, you will provide a value. In the based on field, you can define a criterion that when filter should be applied in record. It will be when value define for the field if filter is:
+
+
+
+#### Value
+
+A value should be entered in this field based on while records will be filtered.
+
+
+
+After filter is applied, records will be filtered based on it. And filter will shrunk under one field/button.
+
+
+
+On the transactions, Document Status - Not Equal To - Cancelled is applied by default. With this, Cancelled transactions are hidden from the list.
+
+
+
+You can apply multiple filters on a list of transactions one-by-one. To remove specific filter, just click on cancelled (X) sign ahead of it.
+
+
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md b/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md
new file mode 100644
index 0000000000..30aa979dd5
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md
@@ -0,0 +1,29 @@
+
Tree Master Renaming
+
+There are various master which are maintained in tree structure. Click [here](https://erpnext.com/kb/setup/managing-tree-structure-masters) to learn more about tree structured masters in ERPNext.
+
+Following are the steps to be followed for renaming Account/Ledger ID, master which is maintained in tree structure. These steps will be applicable for renaming any master which is maintained in tree structure.
+
+#### Step 1: Go to Chart of Account
+
+`Accounts > Setup > Chart of Accounts`
+
+#### Step 2: Go to Account
+
+Expand Chart of Accounts and click on that account which you want to rename. When you click on that account, you will find Rename option.
+
+
+
+#### Step 2: Rename Account
+
+On clicking Rename option, dialog box will give you field to enter New Name for this Account. You should enter new name for the Account/Ledger and click on "Rename" button. On clicking Rename button, existing account will be renamed.
+
+
+
+Following is how renamed account will appear in the Chart of Account master.
+
+
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/collaboration-tools/assignment.md b/erpnext/docs/user/manual/en/using-erpnext/assignment.md
similarity index 78%
rename from erpnext/docs/user/guides/collaboration-tools/assignment.md
rename to erpnext/docs/user/manual/en/using-erpnext/assignment.md
index d78cf0c7ad..6ecd377ae5 100644
--- a/erpnext/docs/user/guides/collaboration-tools/assignment.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/assignment.md
@@ -10,16 +10,16 @@ Following are the steps to assign document to another user.
Assign to option is located at the footer of document. Clicking on Assignment Icon on the tool bar will fast-forward you to footer of same document.
-
+
-
+
#### Step 2: Assign to User
In the Assign To section, you will find option to select User to whom this document will be assigned to. You can assign one document to multiple people at a time.
-
+
With assignment, you can also leave a comment for the review of asignee.
@@ -27,13 +27,13 @@ With assignment, you can also leave a comment for the review of asignee.
This transaction will appear in the To-do list of the ser in “Todo” section.
-
+
####Removing Assignment
User will be able to remove assignment by clicking on "Assignment Completed" button in the document.
-
+
Once assignment is set as completed, Status of its ToDo record will be set as Closed.
diff --git a/erpnext/docs/user/guides/collaboration-tools/calendar.md b/erpnext/docs/user/manual/en/using-erpnext/calendar.md
similarity index 75%
rename from erpnext/docs/user/guides/collaboration-tools/calendar.md
rename to erpnext/docs/user/manual/en/using-erpnext/calendar.md
index 5750777025..de564be67a 100644
--- a/erpnext/docs/user/guides/collaboration-tools/calendar.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/calendar.md
@@ -11,7 +11,7 @@ To create event manually, you should first determine Calender View. If Event's s
This view will 24 hours of a day broken in various slots. You should click on slot for Event Start Time, and drag it down till you reach event end time.
-
+
Based on the selection of time slot, Start Time and End Time will be updated in the Event master. Then you can set subject for an event, and save it.
@@ -19,7 +19,7 @@ Based on the selection of time slot, Start Time and End Time will be updated in
In the Lead form, you will find a field called Next Contact By and Next Contact Date. Event will be auto created for date and person person specified in this field.
-
+
####Birthday Event
@@ -30,7 +30,7 @@ Birthday Event is created based on Date of Birth specified in the Employee maste
You can set events as recurring in specific interval by Checking the "Repeat This
Event".
-
+
###Permission for Event
@@ -38,7 +38,7 @@ You can set Event as Private or Public. Private Events will be visible only to y
Public Event, like Birthday will be visible to all.
-
+
###Event Reminders
@@ -48,7 +48,7 @@ There are two ways you can receive email reminder for an event.
In the Event master, checking "Send an email reminder in the morning" will trigger notifcation email to all the participants for this event.
-
+
####Create Email Digest
@@ -58,6 +58,6 @@ Email Digest can be set from:
`Setup > Email > Email Digest`
-
+
{next}
diff --git a/erpnext/docs/user/guides/collaboration-tools/collaborating-around-forms.md b/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md
similarity index 73%
rename from erpnext/docs/user/guides/collaboration-tools/collaborating-around-forms.md
rename to erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md
index 11c7b818e6..8ce9b68c1b 100644
--- a/erpnext/docs/user/guides/collaboration-tools/collaborating-around-forms.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/collaborating-around-forms.md
@@ -4,7 +4,7 @@ You can email any transaction from the system by clicking on the “Assigned to
button in the right sidebar. A log of all your sent emails will be maintained
in Communication.
-
+
### Comments
@@ -14,6 +14,6 @@ be added in the right sidebar.
### Tags
-[Read more about Tags]({{url_prefix}}/user/guides/collaboration-tools/tags.html)
+[Read more about Tags]({{docs_base_url}}/user/manual/en/collaboration-tools/tags.html)
{next}
diff --git a/erpnext/docs/user/guides/collaboration-tools/index.md b/erpnext/docs/user/manual/en/using-erpnext/index.md
similarity index 100%
rename from erpnext/docs/user/guides/collaboration-tools/index.md
rename to erpnext/docs/user/manual/en/using-erpnext/index.md
diff --git a/erpnext/docs/user/guides/collaboration-tools/index.txt b/erpnext/docs/user/manual/en/using-erpnext/index.txt
similarity index 89%
rename from erpnext/docs/user/guides/collaboration-tools/index.txt
rename to erpnext/docs/user/manual/en/using-erpnext/index.txt
index d02b6d94d6..259835e38c 100644
--- a/erpnext/docs/user/guides/collaboration-tools/index.txt
+++ b/erpnext/docs/user/manual/en/using-erpnext/index.txt
@@ -5,3 +5,4 @@ notes
calendar
assignment
tags
+articles
diff --git a/erpnext/docs/user/guides/collaboration-tools/messages.md b/erpnext/docs/user/manual/en/using-erpnext/messages.md
similarity index 67%
rename from erpnext/docs/user/guides/collaboration-tools/messages.md
rename to erpnext/docs/user/manual/en/using-erpnext/messages.md
index a905aeb546..dfa052625a 100644
--- a/erpnext/docs/user/guides/collaboration-tools/messages.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/messages.md
@@ -3,10 +3,10 @@ If you send a message to a user, and the user is logged in, it will appear as
a popup message and the unread messages counter in the top toolbar will be
updated.
-
+
You can choose to send message to all the users, or to specific user.
-
+
{next}
diff --git a/erpnext/docs/user/guides/collaboration-tools/notes.md b/erpnext/docs/user/manual/en/using-erpnext/notes.md
similarity index 82%
rename from erpnext/docs/user/guides/collaboration-tools/notes.md
rename to erpnext/docs/user/manual/en/using-erpnext/notes.md
index a9abc4069f..cc88aec765 100644
--- a/erpnext/docs/user/guides/collaboration-tools/notes.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/notes.md
@@ -8,13 +8,13 @@ You can store your long notes under this section. It can contain your partner li
Enter Title and Context.
-
+
####Set Permissions to select Users
To make Note accessible for all, check "Public" under links section. If specific Note is to be made accessible to specific user, they shall be selected in the Share With table.
-
+
Notes can also be used as a knowledge base internally. You can also attach file in the Notes, and make it accessible to specific set of users only.
diff --git a/erpnext/docs/user/guides/collaboration-tools/tags.md b/erpnext/docs/user/manual/en/using-erpnext/tags.md
similarity index 77%
rename from erpnext/docs/user/guides/collaboration-tools/tags.md
rename to erpnext/docs/user/manual/en/using-erpnext/tags.md
index 7ada9f517d..6f6c9834ac 100644
--- a/erpnext/docs/user/guides/collaboration-tools/tags.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/tags.md
@@ -1,5 +1,5 @@
Like Assignments and Comments, you can also add your own tags to each type of transactions. These tags can help you search a document and also classify it. ERPNext will also show you all the important tags in the document list.
-
+
{next}
diff --git a/erpnext/docs/user/guides/collaboration-tools/to-do.md b/erpnext/docs/user/manual/en/using-erpnext/to-do.md
similarity index 76%
rename from erpnext/docs/user/guides/collaboration-tools/to-do.md
rename to erpnext/docs/user/manual/en/using-erpnext/to-do.md
index af1c5ac1fc..03f84d5822 100644
--- a/erpnext/docs/user/guides/collaboration-tools/to-do.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/to-do.md
@@ -1,10 +1,10 @@
To Do is a simple tool where all the activities [assigned](https://erpnext.com/collaboration-tools/assignment) to you and assigned
by you are listed. You can also add your own to-do items in the list.
-
+
When task is completed, you should simply remove assignment from the assigned document. With this, task will be removed from your Todo list as well. For Todo which are not assigned via document, you can set their status as Closed from the Todo record itself.
-
+
{next}
diff --git a/erpnext/docs/user/guides/website/add-products-to-website.md b/erpnext/docs/user/manual/en/website/add-products-to-website.md
similarity index 71%
rename from erpnext/docs/user/guides/website/add-products-to-website.md
rename to erpnext/docs/user/manual/en/website/add-products-to-website.md
index 55b7900b22..3bad0df674 100644
--- a/erpnext/docs/user/guides/website/add-products-to-website.md
+++ b/erpnext/docs/user/manual/en/website/add-products-to-website.md
@@ -7,7 +7,7 @@ generated automatically.
##### Step 1: Save Image
-
+
@@ -17,13 +17,13 @@ Under the Website section, please check the box that says 'show in Website'.
Once the box is checked, the page will display other fields for entering
information.
-
+
##### Step 3: Enter Website Details
-
+
The page name will be generated automatically. Mention the Item-Group under
which the Item will be displayed.
@@ -37,18 +37,18 @@ names, make Item Groups with those names and check the box that says 'show in
Website'. For Example, if you wish to create a category called 'Bags', create
a Item Group named Bags.
-
+
Once the Item Group is created go to the Website Settings page under Website.
Enter the Label, Url, and Parent Label.
-
+
#### Webpage labels
-
+
Add more Items under a particular Item Group.
@@ -58,12 +58,12 @@ Group Label. For Example, To add Item-Kiddies Bag and Butterfly Print Bag,
check the 'Show in Website'box. The Items will be placed under the Label Bags
on the Webpage.
-
+
Item Group Display
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/website/articles/index.md b/erpnext/docs/user/manual/en/website/articles/index.md
new file mode 100644
index 0000000000..0dff60b400
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/articles/index.md
@@ -0,0 +1 @@
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/articles/index.txt b/erpnext/docs/user/manual/en/website/articles/index.txt
new file mode 100644
index 0000000000..a89040a906
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/articles/index.txt
@@ -0,0 +1,3 @@
+managing-user-sign-up-via-website
+website-security
+wesite-home-page
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.html b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.html
new file mode 100644
index 0000000000..cef6b7a5ff
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.html
@@ -0,0 +1,6 @@
+
Managing User Sign Up via Website
+
+Users can sign up for ERPNext account via the ERPNext Website.
As seen above the login / sign-up button appears on the homepage of the website generated using ERPNext.
One might want to disable this feature to prevent anonymous users from signing up via the web.
To do so -
1. Go to ` Website > Setup > Website Settings `
2. In website settings doctype navigate to the misc section.
3. Check the disable SignUp check-box and save the doc.
Now only the login button shall appear and there shall be no option to sign-up via the website. You can always revert back by following the same steps.
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/articles/website-security.html b/erpnext/docs/user/manual/en/website/articles/website-security.html
new file mode 100644
index 0000000000..1371ca5a7c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/articles/website-security.html
@@ -0,0 +1,3 @@
+
Website Security
+
+
One can easily generate a website using erpnext. We can list out Products on the website and also create blogs. Products are directly fetched from the Item Master records of your erpnext account. some people would like to limit the access of the website generated by ERPNext to certain people. This is because some of the items may not be available to public.
Well at the moment this feature is not available. You cannot limit the access of the website generated by ERPNext to certain people. If you publish the website it will be publicly visible.
However while you cannot control who can view the website, you can always choose which items to display on the website.
To show or not show an Item on your website go to 'Item Master' and in the Item form check the 'show in website' checkbox.
You can also fill in the details of the product as to be shown on the website here.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/articles/wesite-home-page.md b/erpnext/docs/user/manual/en/website/articles/wesite-home-page.md
new file mode 100644
index 0000000000..363926eec3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/articles/wesite-home-page.md
@@ -0,0 +1,23 @@
+
Wesite Home Page
+
+It is very much possible in ERPNext to setup certain standard page as default website Home Page. Following are steps to setup default website home page.
+
+#### **Step 1: Open Website Settings Page.**
+To Open website settings page go to:
+
+`Website > Setup > Website Settings`
+
+
+#### **Step 2: Set Home page.**
+
+Enter standard page like, index, login, products, blog, about, contact etc. as Home Page in Landing Page section of Website Settings page. For e.g consider you want login page as your default website home page.
+
+
+
+#### **Step 3: Save Website Settings Form.**
+
+After setting up Home Page Press 'Save' button from website settings page and refresh the system from Help menu.Like this you can set any standard page as your default website home page. When some one visited to your website, he/she will see home page as default landing page on your website.
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/website/blog-post.md b/erpnext/docs/user/manual/en/website/blog-post.md
similarity index 72%
rename from erpnext/docs/user/guides/website/blog-post.md
rename to erpnext/docs/user/manual/en/website/blog-post.md
index e0b88627a7..dbf7b171ae 100644
--- a/erpnext/docs/user/guides/website/blog-post.md
+++ b/erpnext/docs/user/manual/en/website/blog-post.md
@@ -8,13 +8,13 @@ To create a new blog, just create a new Blog from:
> Website > Blog > New Blog
-
+
You can format a blog using the Markdown format.You can also access your blog
by going to the page “blog.html”.
#### A sample blog-page.
-
+
{next}
diff --git a/erpnext/docs/user/guides/website/blogger.md b/erpnext/docs/user/manual/en/website/blogger.md
similarity index 56%
rename from erpnext/docs/user/guides/website/blogger.md
rename to erpnext/docs/user/manual/en/website/blogger.md
index c548817a61..cb39f80a81 100644
--- a/erpnext/docs/user/guides/website/blogger.md
+++ b/erpnext/docs/user/manual/en/website/blogger.md
@@ -1,6 +1,6 @@
Blogger is a user who can post blogs.
You can mention a shori bio about the blogger and also set a avatar here.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/website/index.md b/erpnext/docs/user/manual/en/website/index.md
similarity index 100%
rename from erpnext/docs/user/guides/website/index.md
rename to erpnext/docs/user/manual/en/website/index.md
diff --git a/erpnext/docs/user/manual/en/website/index.txt b/erpnext/docs/user/manual/en/website/index.txt
new file mode 100644
index 0000000000..846011d2c8
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/index.txt
@@ -0,0 +1,8 @@
+web-page
+blog-post
+web-form
+blogger
+setup
+add-products-to-website
+shopping-cart
+articles
diff --git a/erpnext/docs/user/guides/website/setup/index.md b/erpnext/docs/user/manual/en/website/setup/index.md
similarity index 100%
rename from erpnext/docs/user/guides/website/setup/index.md
rename to erpnext/docs/user/manual/en/website/setup/index.md
diff --git a/erpnext/docs/user/guides/website/setup/index.txt b/erpnext/docs/user/manual/en/website/setup/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/website/setup/index.txt
rename to erpnext/docs/user/manual/en/website/setup/index.txt
diff --git a/erpnext/docs/user/guides/website/setup/social-login-keys.md b/erpnext/docs/user/manual/en/website/setup/social-login-keys.md
similarity index 100%
rename from erpnext/docs/user/guides/website/setup/social-login-keys.md
rename to erpnext/docs/user/manual/en/website/setup/social-login-keys.md
diff --git a/erpnext/docs/user/guides/website/setup/website-settings.md b/erpnext/docs/user/manual/en/website/setup/website-settings.md
similarity index 60%
rename from erpnext/docs/user/guides/website/setup/website-settings.md
rename to erpnext/docs/user/manual/en/website/setup/website-settings.md
index 95d705a2a0..2415589f41 100644
--- a/erpnext/docs/user/guides/website/setup/website-settings.md
+++ b/erpnext/docs/user/manual/en/website/setup/website-settings.md
@@ -1,10 +1,10 @@
Most of the website related settings can be defined here.
-
+
####Landing Page
-* Home Page: You can specify which [Web Page]({{url_prefix}}/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.
@@ -14,7 +14,7 @@ Most of the website related settings can be defined here.
Select the theme for the website. You can create new Theme for you website also.
-
+
* Select 'create new website theme' if you wish to customize the default website theme.
@@ -23,13 +23,13 @@ Select the theme for the website. You can create new Theme for you website also.
You can add a banner/ logo to your website here. Attach the image and click on set banner from Image.
An HTML code will be generated by the system under Banner HTML.
-
+
####Top Bar
You can set the menus items in the Top Bar here.
-
+
* Similarlly you can also set sidebar and footer links.
@@ -37,7 +37,7 @@ You can set the menus items in the Top Bar here.
You can integrate the website using Google Analytics and enable social media sharing for post shared on the website.
-
+
* You can disable public signup to your ERPNext account by checking 'disable signup'
diff --git a/erpnext/docs/user/guides/website/shopping-cart.md b/erpnext/docs/user/manual/en/website/shopping-cart.md
similarity index 74%
rename from erpnext/docs/user/guides/website/shopping-cart.md
rename to erpnext/docs/user/manual/en/website/shopping-cart.md
index 0c27f4bb7a..773e1628df 100644
--- a/erpnext/docs/user/guides/website/shopping-cart.md
+++ b/erpnext/docs/user/manual/en/website/shopping-cart.md
@@ -12,13 +12,13 @@ To set up a shopping cart, go to the selling module.
#### Step 1: Enter Company Details and Default Territory.
-
+
#### Step 2: Enter Price List, Tax Master and Shipping Rule.
-
+
@@ -29,13 +29,13 @@ Customers can click on the cart and enter the amount of quantity they wish to
buy. The Item number will be stored on the right hand corner of the page, next
to the flower sign.
-
+
Click on the flower sign on the right hand side to see the cart details. Click
on the cart to get the final amount details.
-
+
{next}
diff --git a/erpnext/docs/user/guides/website/web-form.md b/erpnext/docs/user/manual/en/website/web-form.md
similarity index 81%
rename from erpnext/docs/user/guides/website/web-form.md
rename to erpnext/docs/user/manual/en/website/web-form.md
index 9fa8a1b5a1..1668ac06a7 100644
--- a/erpnext/docs/user/guides/website/web-form.md
+++ b/erpnext/docs/user/manual/en/website/web-form.md
@@ -17,7 +17,7 @@ To create a new **Web Form** go to:
1. Select if you require the user to login, edit records, manage multiple records etc.
1. Add the fields you want in the record.
-
+
---
@@ -25,7 +25,7 @@ To create a new **Web Form** go to:
Once you create the web form, you can view it on the url and test it out!
-
+
---
diff --git a/erpnext/docs/user/guides/website/web-page.md b/erpnext/docs/user/manual/en/website/web-page.md
similarity index 91%
rename from erpnext/docs/user/guides/website/web-page.md
rename to erpnext/docs/user/manual/en/website/web-page.md
index 2a4c616235..947891e30f 100644
--- a/erpnext/docs/user/guides/website/web-page.md
+++ b/erpnext/docs/user/manual/en/website/web-page.md
@@ -4,7 +4,7 @@ To create a new Web Page, go to:
> Website > Web Page > New
-
+
#### Title
diff --git a/erpnext/docs/user/manual/index.md b/erpnext/docs/user/manual/index.md
new file mode 100644
index 0000000000..47fc2c2630
--- /dev/null
+++ b/erpnext/docs/user/manual/index.md
@@ -0,0 +1,5 @@
+# ERPNext User Manual
+
+Select your language
+
+1. [English](en)
diff --git a/erpnext/docs/user/manual/index.txt b/erpnext/docs/user/manual/index.txt
new file mode 100644
index 0000000000..c574d073d1
--- /dev/null
+++ b/erpnext/docs/user/manual/index.txt
@@ -0,0 +1 @@
+en
diff --git a/erpnext/docs/user/videos/index.md b/erpnext/docs/user/videos/index.md
index 9976dd4bad..dcefe84092 100644
--- a/erpnext/docs/user/videos/index.md
+++ b/erpnext/docs/user/videos/index.md
@@ -1,13 +1,13 @@
# ERPNext Videos
diff --git a/erpnext/docs/user/videos/index.txt b/erpnext/docs/user/videos/index.txt
new file mode 100644
index 0000000000..b2d525b292
--- /dev/null
+++ b/erpnext/docs/user/videos/index.txt
@@ -0,0 +1 @@
+index
\ No newline at end of file
diff --git a/erpnext/docs/user/videos/learn/index.html b/erpnext/docs/user/videos/learn/index.md
similarity index 64%
rename from erpnext/docs/user/videos/learn/index.html
rename to erpnext/docs/user/videos/learn/index.md
index 2dceecf9f6..35e1ad733b 100644
--- a/erpnext/docs/user/videos/learn/index.html
+++ b/erpnext/docs/user/videos/learn/index.md
@@ -12,7 +12,7 @@
+ 
+
> Note: In stock transactions, Batch IDs will be filtered based on Item Code, Warehouse,
Batch Expiry Date (compared with Posting date of a transaction) and Actual Qty in Warehouse.
diff --git a/erpnext/docs/user/guides/stock/delivery-note.md b/erpnext/docs/user/manual/en/stock/delivery-note.md
similarity index 88%
rename from erpnext/docs/user/guides/stock/delivery-note.md
rename to erpnext/docs/user/manual/en/stock/delivery-note.md
index 1cdf41f547..358f0374e9 100644
--- a/erpnext/docs/user/guides/stock/delivery-note.md
+++ b/erpnext/docs/user/manual/en/stock/delivery-note.md
@@ -13,7 +13,7 @@ create a new Delivery Note from:
or from a “Submitted” Sales Order (that is not already shipped) by clicking on
“Make Delivery Note”.
-
+
You can also “fetch” the details from an unshipped Sales Order.
@@ -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]({{url_prefix}}/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
diff --git a/erpnext/docs/user/guides/stock/index.md b/erpnext/docs/user/manual/en/stock/index.md
similarity index 100%
rename from erpnext/docs/user/guides/stock/index.md
rename to erpnext/docs/user/manual/en/stock/index.md
diff --git a/erpnext/docs/user/guides/stock/index.txt b/erpnext/docs/user/manual/en/stock/index.txt
similarity index 77%
rename from erpnext/docs/user/guides/stock/index.txt
rename to erpnext/docs/user/manual/en/stock/index.txt
index 75e9cbf2f6..b89abe102e 100644
--- a/erpnext/docs/user/guides/stock/index.txt
+++ b/erpnext/docs/user/manual/en/stock/index.txt
@@ -12,4 +12,7 @@ accounting-of-inventory-stock
tools
setup
sales-return
-purchase-return
\ No newline at end of file
+purchase-return
+articles
+opening-stock
+stock-how-to
diff --git a/erpnext/docs/user/manual/en/stock/installation-note.md b/erpnext/docs/user/manual/en/stock/installation-note.md
new file mode 100644
index 0000000000..05196529a9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/installation-note.md
@@ -0,0 +1,5 @@
+You can use installation note to record the instalation of a product having a serial number.
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/stock/item/index.md b/erpnext/docs/user/manual/en/stock/item/index.md
similarity index 84%
rename from erpnext/docs/user/guides/stock/item/index.md
rename to erpnext/docs/user/manual/en/stock/item/index.md
index 89ec5e5c51..4af8eff926 100644
--- a/erpnext/docs/user/guides/stock/item/index.md
+++ b/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]({{url_prefix}}/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]({{url_prefix}}/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]({{url_prefix}}/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]({{url_prefix}}/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]({{url_prefix}}/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
@@ -66,7 +66,7 @@ Length, Finish etc.
### Purchase Details
-
+
**Lead time days:** Lead time days are the number of days required for the Item to reach the warehouse.
@@ -76,7 +76,7 @@ Length, Finish etc.
### Sales Details
-
+
**Default Income Account:** Income account selected here will be fetched automatically in sales invoice for this item.
@@ -84,8 +84,10 @@ Length, Finish etc.
### Manufacturing And Website
-
+
-Visit [Manufacturing]({{url_prefix}}/user/guides/manufacturing.html) and [Website ]({{url_prefix}}/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}
diff --git a/erpnext/docs/user/manual/en/stock/item/index.txt b/erpnext/docs/user/manual/en/stock/item/index.txt
new file mode 100644
index 0000000000..4e66875741
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/item/index.txt
@@ -0,0 +1,6 @@
+item-price
+item-codification
+item-variants
+purchase-details
+reorder
+item-valuation-fifo-and-moving-average
diff --git a/erpnext/docs/user/guides/stock/item/item-codification.md b/erpnext/docs/user/manual/en/stock/item/item-codification.md
similarity index 100%
rename from erpnext/docs/user/guides/stock/item/item-codification.md
rename to erpnext/docs/user/manual/en/stock/item/item-codification.md
diff --git a/erpnext/docs/user/guides/stock/item-price.md b/erpnext/docs/user/manual/en/stock/item/item-price.md
similarity index 83%
rename from erpnext/docs/user/guides/stock/item-price.md
rename to erpnext/docs/user/manual/en/stock/item/item-price.md
index a235341cef..b877e8dd55 100644
--- a/erpnext/docs/user/guides/stock/item-price.md
+++ b/erpnext/docs/user/manual/en/stock/item/item-price.md
@@ -14,7 +14,7 @@ Step 1: Select Price List
You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it.
-
+
On selection of Price List, its currency and for selling or buying property will be fetched as well.
@@ -24,13 +24,13 @@ Step 2: Select Item
Select item for which Item Price record is to be created. On selection of Item Code, Item Name and Description will be fetched as well.
-
+
Step 3: Enter Rate
Enter selling/buying rate of an item in Price List currency.
-
+
Step 4: Save Item Price
diff --git a/erpnext/docs/user/guides/stock/item-valuation-fifo-and-moving-average.md b/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
similarity index 95%
rename from erpnext/docs/user/guides/stock/item-valuation-fifo-and-moving-average.md
rename to erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
index 3cabe3585b..9344870081 100644
--- a/erpnext/docs/user/guides/stock/item-valuation-fifo-and-moving-average.md
+++ b/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
@@ -19,7 +19,7 @@ There are two major ways in which ERPNext values your items.
* **FIFO (First In First Out):** In this system, ERPNext assumes that you will consume / sell those Items first which you bought first. For example, if you buy an Item at price X and then after a few days at price Y, whenever you sell your Item, ERPNext will reduce the quantity of the Item priced at X first and then Y.
-
+
* **Moving Average:** In this method, ERPNext assumes that the value of the item at any point is the average price of the units of that Item in stock. For example, if the value of an Item is X in a Warehouse with quantity Y and another quantity Y1 is added to the Warehouse at cost X1, the new value X2 would be:
diff --git a/erpnext/docs/user/guides/stock/item/item-variants.md b/erpnext/docs/user/manual/en/stock/item/item-variants.md
similarity index 63%
rename from erpnext/docs/user/guides/stock/item/item-variants.md
rename to erpnext/docs/user/manual/en/stock/item/item-variants.md
index 256a37ead8..cee3ab1ec9 100644
--- a/erpnext/docs/user/guides/stock/item/item-variants.md
+++ b/erpnext/docs/user/manual/en/stock/item/item-variants.md
@@ -6,19 +6,19 @@ To use Item Variants in ERPNext, create an Item and check 'Has Variants'
* The Item shall then be referred as a 'Template'
-
+
On selecting 'Has Variants' a table shall appear. Specify the variant attributes for the Item in the table.
In case the attribute has Numeric Values, you can specify the range and increment values here.
-
+
> Note: You cannot make Transactions against a 'Template'
To create 'Item Variants' against a 'Template' select 'Make Variants'
-
+
-
+
-To learn more about setting Attributes Master check [Item Attributes]({{url_prefix}}/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)
diff --git a/erpnext/docs/user/guides/stock/item/purchase-details.md b/erpnext/docs/user/manual/en/stock/item/purchase-details.md
similarity index 89%
rename from erpnext/docs/user/guides/stock/item/purchase-details.md
rename to erpnext/docs/user/manual/en/stock/item/purchase-details.md
index 47f724c1f7..5749178448 100644
--- a/erpnext/docs/user/guides/stock/item/purchase-details.md
+++ b/erpnext/docs/user/manual/en/stock/item/purchase-details.md
@@ -7,7 +7,7 @@ When this Item is delivered, the delivery date and the expiry period is saved in
A warranty means a guarantee or a promise which provides assurance by one party to the other party which allows for a legal remedy if that promise is not true or followed. A warranty period is a time period in which a purchased product may be returned or exchanged.
-
+
# How To Name A Manufacturer Part Number?
@@ -17,6 +17,6 @@ Go to the purchase details section of the Item form, and enter the number on the
A manufacturer part number is a series of numbers and /or letters that has been given to a part by the manufacturer. The manufacturer part number belongs to the manufacturer and helps distinguish the part from other manufacturers. If two parts come from different manufacturers, they will have different MPNs. This allows businesses to identify which company made the part.
-
+
__For Example:__ A refrigerator will have different parts which will have manufacturer part number. Thus, when any part fails and you want to replace it, you can simply order that part based on its part number.
diff --git a/erpnext/docs/user/guides/stock/item/reorder.md b/erpnext/docs/user/manual/en/stock/item/reorder.md
similarity index 88%
rename from erpnext/docs/user/guides/stock/item/reorder.md
rename to erpnext/docs/user/manual/en/stock/item/reorder.md
index 34a079f13e..4537d9519b 100644
--- a/erpnext/docs/user/guides/stock/item/reorder.md
+++ b/erpnext/docs/user/manual/en/stock/item/reorder.md
@@ -8,7 +8,7 @@ Go to the Re-order section of the Item form in the Stock module.
The Re-order level is the point at which stock on a particular item has diminished to a point where it needs to be replenished. To order based on Re-order level can avoid shortages. Re-order level can be determined based on the lead time and the average daily consumption.
-
+
__For example:__ You can set your reorder level of bath towels at 10. When there are only 10 towels remaining in stock, the system will either send a mail or take action depending upon what you have selected in global settings.
@@ -20,7 +20,7 @@ To setup Reorder quantity, go to the Re-order section of the Item form. In the f
Re-order quantity is the quantity to order, so that the sum of ordering cost and holding cost is at its minimum.The re-order quantity is based on the minimum order quantity specified by the supplier and many other factors.
-
+
__For example:__ If reorder level is 100 items, your reorder quantity may not necessarily be 100 items. The Reorder quantity can be greater than or equal to reorder level. It may depend upon lead time, discount, transportation and average daily consumption.
diff --git a/erpnext/docs/user/guides/stock/material-request.md b/erpnext/docs/user/manual/en/stock/material-request.md
similarity index 77%
rename from erpnext/docs/user/guides/stock/material-request.md
rename to erpnext/docs/user/manual/en/stock/material-request.md
index 69ce0ea9b3..a609756d3e 100644
--- a/erpnext/docs/user/guides/stock/material-request.md
+++ b/erpnext/docs/user/manual/en/stock/material-request.md
@@ -1,7 +1,7 @@
A Material Request is a simple document identifying a requirement of a set of
Items (products or services) for a particular reason.
-
+
To generate a Material Request manually go to:
@@ -9,14 +9,14 @@ To generate a Material Request manually go to:
#### Creating Material Request
-
+
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]({{url_prefix}}/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:
diff --git a/erpnext/docs/user/guides/stock/opening-stock.md b/erpnext/docs/user/manual/en/stock/opening-stock.md
similarity index 91%
rename from erpnext/docs/user/guides/stock/opening-stock.md
rename to erpnext/docs/user/manual/en/stock/opening-stock.md
index ef285d20aa..4d2d727b6b 100644
--- a/erpnext/docs/user/guides/stock/opening-stock.md
+++ b/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]({{url_prefix}}/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}
diff --git a/erpnext/docs/user/guides/stock/projected-quantity.md b/erpnext/docs/user/manual/en/stock/projected-quantity.md
similarity index 90%
rename from erpnext/docs/user/guides/stock/projected-quantity.md
rename to erpnext/docs/user/manual/en/stock/projected-quantity.md
index 796d427f4e..9251a1b3c2 100644
--- a/erpnext/docs/user/guides/stock/projected-quantity.md
+++ b/erpnext/docs/user/manual/en/stock/projected-quantity.md
@@ -11,7 +11,7 @@ maintained to serve unexpected demands.
Having a tight control of the projected inventory is crucial to determine
shortages and to calculate the right order quantity.
-
+
> Projected Qty = Actual Qty + Planned Qty + Requested Qty + Ordered Qty -
diff --git a/erpnext/docs/user/guides/stock/purchase-receipt.md b/erpnext/docs/user/manual/en/stock/purchase-receipt.md
similarity index 96%
rename from erpnext/docs/user/guides/stock/purchase-receipt.md
rename to erpnext/docs/user/manual/en/stock/purchase-receipt.md
index 68f29d4760..0f43b5884e 100644
--- a/erpnext/docs/user/guides/stock/purchase-receipt.md
+++ b/erpnext/docs/user/manual/en/stock/purchase-receipt.md
@@ -10,7 +10,7 @@ You can make a Purchase Receipt directly from:
or from a “Submitted” Purchase Order, by clicking on “Make Purchase Receipt”.
-
+
### Rejections
diff --git a/erpnext/docs/user/guides/stock/purchase-return.md b/erpnext/docs/user/manual/en/stock/purchase-return.md
similarity index 67%
rename from erpnext/docs/user/guides/stock/purchase-return.md
rename to erpnext/docs/user/manual/en/stock/purchase-return.md
index 5a924a2c1e..328ed08257 100644
--- a/erpnext/docs/user/guides/stock/purchase-return.md
+++ b/erpnext/docs/user/manual/en/stock/purchase-return.md
@@ -6,16 +6,16 @@ You can create a Purchase Return by simply making a Purchase Receipt with negati
First open the original Purchase Receipt, against which supplier delivered the items.
-
+
Then click on "Make Purchase Return", it will open a new Purchase Receipt with "Is Return" checked, items and taxes with negative amount.
-
+
On submission of Return Purchase Return, system will decrease item qty from the mentioned warehouse. To maintain correct stock valuation, stock balance will also go up according to the original purchase rate of the returned items.
-
+
If Perpetual Inventory enabled, system will also post accounting entry against warehouse account to sync warehouse account balance with stock balance as per Stock Ledger.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/stock/sales-return.md b/erpnext/docs/user/manual/en/stock/sales-return.md
similarity index 71%
rename from erpnext/docs/user/guides/stock/sales-return.md
rename to erpnext/docs/user/manual/en/stock/sales-return.md
index 15b8b11b21..1ce922d5c6 100644
--- a/erpnext/docs/user/guides/stock/sales-return.md
+++ b/erpnext/docs/user/manual/en/stock/sales-return.md
@@ -6,22 +6,22 @@ In ERPNext, you can create a Sales Return by simply making a Delivery Note / Sal
First open the original Delivery Note / Sales Invoice, against which customer returned the items.
-
+
Then click on "Make Sales Return", it will open a new Delivery Note with "Is Return" checked, items and taxes with negative amount.
-
+
You can also create the return entry against original Sales Invoice, to return stock along with credit note, check "Update Stock" option in Return Sales Invoice.
-
+
On submission of Return Delivery Note / Sales Invoice, system will increase stock balance in the mentioned warehouse. To maintain correct stock valuation, stock balance will go up according to the original purchase rate of the returned items.
-
+
In case of Return Sales Invoice, Customer account will be credited and associated income and tax account will be debited.
If Perpetual Inventory enabled, system will also post accounting entry against warehouse account to sync warehouse account balance with stock balance as per Stock Ledger.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/stock/serial-no.md b/erpnext/docs/user/manual/en/stock/serial-no.md
similarity index 94%
rename from erpnext/docs/user/guides/stock/serial-no.md
rename to erpnext/docs/user/manual/en/stock/serial-no.md
index 678bd4d4f7..fbbfb1ae3f 100644
--- a/erpnext/docs/user/guides/stock/serial-no.md
+++ b/erpnext/docs/user/manual/en/stock/serial-no.md
@@ -20,7 +20,7 @@ Stock transaction (Stock Entry, Purchase Receipt, Delivery Note, Sales
Invoice). When a new Serial No is created directly, its warehouse cannot be
set.
-
+
* The Status is set based on Stock Entry.
diff --git a/erpnext/docs/user/guides/stock/setup/index.md b/erpnext/docs/user/manual/en/stock/setup/index.md
similarity index 100%
rename from erpnext/docs/user/guides/stock/setup/index.md
rename to erpnext/docs/user/manual/en/stock/setup/index.md
diff --git a/erpnext/docs/user/guides/stock/setup/index.txt b/erpnext/docs/user/manual/en/stock/setup/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/stock/setup/index.txt
rename to erpnext/docs/user/manual/en/stock/setup/index.txt
diff --git a/erpnext/docs/user/guides/stock/setup/item-attribute.md b/erpnext/docs/user/manual/en/stock/setup/item-attribute.md
similarity index 50%
rename from erpnext/docs/user/guides/stock/setup/item-attribute.md
rename to erpnext/docs/user/manual/en/stock/setup/item-attribute.md
index a39c9ee8fc..0b2ab748a0 100644
--- a/erpnext/docs/user/guides/stock/setup/item-attribute.md
+++ b/erpnext/docs/user/manual/en/stock/setup/item-attribute.md
@@ -1,16 +1,16 @@
You can define Attributes and attribute values for your Item Variants here.
-
+
#### Non Numeric Attributes
* For Non Numeric Attributes, specify attributes values along with its abbreviation in the Attribute Value Table.
-
+
#### Numeric Attributes
* If your attribute is Numeric, select Numeric Values
* Specify the Range and the Increment Value
-
+
diff --git a/erpnext/docs/user/guides/stock/setup/item-group.md b/erpnext/docs/user/manual/en/stock/setup/item-group.md
similarity index 64%
rename from erpnext/docs/user/guides/stock/setup/item-group.md
rename to erpnext/docs/user/manual/en/stock/setup/item-group.md
index 1d2343d485..cf6a75a166 100644
--- a/erpnext/docs/user/guides/stock/setup/item-group.md
+++ b/erpnext/docs/user/manual/en/stock/setup/item-group.md
@@ -5,7 +5,7 @@ product is used as a raw-material, you have to name it under the Raw-material
category. In case, your product is used only in trading, you can categorise it
under Trading.
-
+
### Create a Item Group
@@ -13,7 +13,7 @@ under Trading.
* Select 'Add Child'
-
+
### Delete an Item Group
@@ -21,6 +21,6 @@ under Trading.
* Select 'delete'
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/stock/setup/stock-settings.md b/erpnext/docs/user/manual/en/stock/setup/stock-settings.md
new file mode 100644
index 0000000000..f8cb9eaa9d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/stock/setup/stock-settings.md
@@ -0,0 +1,5 @@
+You can set default settings for your stock related transactions here.
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/stock/stock-entry.md b/erpnext/docs/user/manual/en/stock/stock-entry.md
similarity index 87%
rename from erpnext/docs/user/guides/stock/stock-entry.md
rename to erpnext/docs/user/manual/en/stock/stock-entry.md
index ab8bf12d04..b7e0860d3a 100644
--- a/erpnext/docs/user/guides/stock/stock-entry.md
+++ b/erpnext/docs/user/manual/en/stock/stock-entry.md
@@ -5,7 +5,7 @@ To make a Stock Entry you have to go to:
> Stock > Stock Entry > New
-
+
Stock Entries can be made for the following purposes:
@@ -27,15 +27,15 @@ If the stock entry is an incoming entry i.e any item is receiving at a target wa
To add additional costs, enter the description and amount of the cost in the Additional Costs table.
-
+
The added additional costs will be distributed among the receiving items (where the target warehouse mentioned) proportionately based on Basic Amount of the items. And the distributed additional cost will be added to the basic rate of the item, to calculate valuation rate.
-
+
If perpetual inventory system is enabled, additional costs will be booked in "Expense Included In Valuation" account.
-
+
> **Note:** To update Stock from a spreadsheet, see Stock Reconciliation.
diff --git a/erpnext/docs/user/guides/stock/stock-how-to.md b/erpnext/docs/user/manual/en/stock/stock-how-to.md
similarity index 100%
rename from erpnext/docs/user/guides/stock/stock-how-to.md
rename to erpnext/docs/user/manual/en/stock/stock-how-to.md
diff --git a/erpnext/docs/user/guides/stock/tools/index.md b/erpnext/docs/user/manual/en/stock/tools/index.md
similarity index 100%
rename from erpnext/docs/user/guides/stock/tools/index.md
rename to erpnext/docs/user/manual/en/stock/tools/index.md
diff --git a/erpnext/docs/user/guides/stock/tools/index.txt b/erpnext/docs/user/manual/en/stock/tools/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/stock/tools/index.txt
rename to erpnext/docs/user/manual/en/stock/tools/index.txt
diff --git a/erpnext/docs/user/guides/stock/tools/landed-cost-voucher.md b/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md
similarity index 97%
rename from erpnext/docs/user/guides/stock/tools/landed-cost-voucher.md
rename to erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md
index aa146b47f7..1209aff1fd 100644
--- a/erpnext/docs/user/guides/stock/tools/landed-cost-voucher.md
+++ b/erpnext/docs/user/manual/en/stock/tools/landed-cost-voucher.md
@@ -20,7 +20,7 @@ You can update landed cost any time in the future via Landed Cost Voucher.
In the document, you can select multiple Purchase Receipts and fetch all items from those Purchase Receipts. Then you should add applicable charges in “Taxes and Charges” table. You can easily delete an item if the added charges is not applicable to that item. The added charges are proportionately distributed among all the items based their amount.
-
+
### What happend on submission?
diff --git a/erpnext/docs/user/guides/stock/tools/packing-slip.md b/erpnext/docs/user/manual/en/stock/tools/packing-slip.md
similarity index 70%
rename from erpnext/docs/user/guides/stock/tools/packing-slip.md
rename to erpnext/docs/user/manual/en/stock/tools/packing-slip.md
index 2c133bd9cd..0820959677 100644
--- a/erpnext/docs/user/guides/stock/tools/packing-slip.md
+++ b/erpnext/docs/user/manual/en/stock/tools/packing-slip.md
@@ -2,6 +2,6 @@ A packing slip is a document listing the items in a shipment. Usually attached t
While Shipping a product 'Draft' for Delivery Notes are created.
You can make a Packing Slip from these Delivery Notes (Draft)
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/stock/tools/quality-inspection.md b/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md
similarity index 61%
rename from erpnext/docs/user/guides/stock/tools/quality-inspection.md
rename to erpnext/docs/user/manual/en/stock/tools/quality-inspection.md
index 175fa23553..34bea40dcc 100644
--- a/erpnext/docs/user/guides/stock/tools/quality-inspection.md
+++ b/erpnext/docs/user/manual/en/stock/tools/quality-inspection.md
@@ -3,6 +3,6 @@ Inspection. To enable ERPNext to perform this function, go to :
> Stock > Quality Inspection > New
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/stock/warehouse.md b/erpnext/docs/user/manual/en/stock/warehouse.md
similarity index 94%
rename from erpnext/docs/user/guides/stock/warehouse.md
rename to erpnext/docs/user/manual/en/stock/warehouse.md
index 60dd30cd07..d86f401556 100644
--- a/erpnext/docs/user/guides/stock/warehouse.md
+++ b/erpnext/docs/user/manual/en/stock/warehouse.md
@@ -9,7 +9,7 @@ could also go to the Setup module and click on Warehouse under Master Data.
> Stock > Warehouse > New Warehouse
-
+
In ERPNext, every Warehouse must belong to a specific company, to maintain
company wise stock balance. The Warehouses are saved with their respective
diff --git a/erpnext/docs/user/guides/support/index.md b/erpnext/docs/user/manual/en/support/index.md
similarity index 100%
rename from erpnext/docs/user/guides/support/index.md
rename to erpnext/docs/user/manual/en/support/index.md
diff --git a/erpnext/docs/user/guides/support/index.txt b/erpnext/docs/user/manual/en/support/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/support/index.txt
rename to erpnext/docs/user/manual/en/support/index.txt
diff --git a/erpnext/docs/user/guides/support/issue.md b/erpnext/docs/user/manual/en/support/issue.md
similarity index 94%
rename from erpnext/docs/user/guides/support/issue.md
rename to erpnext/docs/user/manual/en/support/issue.md
index 984a00bac7..246af8dc11 100644
--- a/erpnext/docs/user/guides/support/issue.md
+++ b/erpnext/docs/user/manual/en/support/issue.md
@@ -11,7 +11,7 @@ Frappe system.
> Support > Issue > New Issue
-
+
#### Discussion Thread
diff --git a/erpnext/docs/user/guides/support/maintenance-schedule.md b/erpnext/docs/user/manual/en/support/maintenance-schedule.md
similarity index 90%
rename from erpnext/docs/user/guides/support/maintenance-schedule.md
rename to erpnext/docs/user/manual/en/support/maintenance-schedule.md
index 1ae3a3079c..e211562601 100644
--- a/erpnext/docs/user/guides/support/maintenance-schedule.md
+++ b/erpnext/docs/user/manual/en/support/maintenance-schedule.md
@@ -10,7 +10,7 @@ To create a new Maintenance Schedule go to:
> Support > Maintenance Schedule > New Maintenance Schedule
-
+
In the Maintenance Schedule, there are two sections:
diff --git a/erpnext/docs/user/guides/support/maintenance-visit.md b/erpnext/docs/user/manual/en/support/maintenance-visit.md
similarity index 80%
rename from erpnext/docs/user/guides/support/maintenance-visit.md
rename to erpnext/docs/user/manual/en/support/maintenance-visit.md
index 4f2bdbf332..e93260d9f1 100644
--- a/erpnext/docs/user/guides/support/maintenance-visit.md
+++ b/erpnext/docs/user/manual/en/support/maintenance-visit.md
@@ -4,7 +4,7 @@ Maintenance Visit from:
> Support > Maintenance Visit > New Maintenance Visit
-
+
The Maintenance Visit contains information about the:
diff --git a/erpnext/docs/user/guides/support/warranty-claim.md b/erpnext/docs/user/manual/en/support/warranty-claim.md
similarity index 91%
rename from erpnext/docs/user/guides/support/warranty-claim.md
rename to erpnext/docs/user/manual/en/support/warranty-claim.md
index a9d1b8bb77..0a58e18fd6 100644
--- a/erpnext/docs/user/guides/support/warranty-claim.md
+++ b/erpnext/docs/user/manual/en/support/warranty-claim.md
@@ -15,7 +15,7 @@ To create a new **Warranty Claim**:
> Support > Warranty Claim > New Warranty Claim
-
+
If a Customer visit is required to address the issue, you can create a new
Maintenance Visit record from this.
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md
new file mode 100644
index 0000000000..91f7950414
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md
@@ -0,0 +1,10 @@
+
+
You can format a blog using the Markdown format.You can also access your blog
by going to the page “blog.html”.
#### A sample blog-page.
-
+
{next}
diff --git a/erpnext/docs/user/guides/website/blogger.md b/erpnext/docs/user/manual/en/website/blogger.md
similarity index 56%
rename from erpnext/docs/user/guides/website/blogger.md
rename to erpnext/docs/user/manual/en/website/blogger.md
index c548817a61..cb39f80a81 100644
--- a/erpnext/docs/user/guides/website/blogger.md
+++ b/erpnext/docs/user/manual/en/website/blogger.md
@@ -1,6 +1,6 @@
Blogger is a user who can post blogs.
You can mention a shori bio about the blogger and also set a avatar here.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/website/index.md b/erpnext/docs/user/manual/en/website/index.md
similarity index 100%
rename from erpnext/docs/user/guides/website/index.md
rename to erpnext/docs/user/manual/en/website/index.md
diff --git a/erpnext/docs/user/manual/en/website/index.txt b/erpnext/docs/user/manual/en/website/index.txt
new file mode 100644
index 0000000000..846011d2c8
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/index.txt
@@ -0,0 +1,8 @@
+web-page
+blog-post
+web-form
+blogger
+setup
+add-products-to-website
+shopping-cart
+articles
diff --git a/erpnext/docs/user/guides/website/setup/index.md b/erpnext/docs/user/manual/en/website/setup/index.md
similarity index 100%
rename from erpnext/docs/user/guides/website/setup/index.md
rename to erpnext/docs/user/manual/en/website/setup/index.md
diff --git a/erpnext/docs/user/guides/website/setup/index.txt b/erpnext/docs/user/manual/en/website/setup/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/website/setup/index.txt
rename to erpnext/docs/user/manual/en/website/setup/index.txt
diff --git a/erpnext/docs/user/guides/website/setup/social-login-keys.md b/erpnext/docs/user/manual/en/website/setup/social-login-keys.md
similarity index 100%
rename from erpnext/docs/user/guides/website/setup/social-login-keys.md
rename to erpnext/docs/user/manual/en/website/setup/social-login-keys.md
diff --git a/erpnext/docs/user/guides/website/setup/website-settings.md b/erpnext/docs/user/manual/en/website/setup/website-settings.md
similarity index 60%
rename from erpnext/docs/user/guides/website/setup/website-settings.md
rename to erpnext/docs/user/manual/en/website/setup/website-settings.md
index 95d705a2a0..2415589f41 100644
--- a/erpnext/docs/user/guides/website/setup/website-settings.md
+++ b/erpnext/docs/user/manual/en/website/setup/website-settings.md
@@ -1,10 +1,10 @@
Most of the website related settings can be defined here.
-
+
####Landing Page
-* Home Page: You can specify which [Web Page]({{url_prefix}}/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.
@@ -14,7 +14,7 @@ Most of the website related settings can be defined here.
Select the theme for the website. You can create new Theme for you website also.
-
+
* Select 'create new website theme' if you wish to customize the default website theme.
@@ -23,13 +23,13 @@ Select the theme for the website. You can create new Theme for you website also.
You can add a banner/ logo to your website here. Attach the image and click on set banner from Image.
An HTML code will be generated by the system under Banner HTML.
-
+
####Top Bar
You can set the menus items in the Top Bar here.
-
+
* Similarlly you can also set sidebar and footer links.
@@ -37,7 +37,7 @@ You can set the menus items in the Top Bar here.
You can integrate the website using Google Analytics and enable social media sharing for post shared on the website.
-
+
* You can disable public signup to your ERPNext account by checking 'disable signup'
diff --git a/erpnext/docs/user/guides/website/shopping-cart.md b/erpnext/docs/user/manual/en/website/shopping-cart.md
similarity index 74%
rename from erpnext/docs/user/guides/website/shopping-cart.md
rename to erpnext/docs/user/manual/en/website/shopping-cart.md
index 0c27f4bb7a..773e1628df 100644
--- a/erpnext/docs/user/guides/website/shopping-cart.md
+++ b/erpnext/docs/user/manual/en/website/shopping-cart.md
@@ -12,13 +12,13 @@ To set up a shopping cart, go to the selling module.
#### Step 1: Enter Company Details and Default Territory.
-
+
#### Step 2: Enter Price List, Tax Master and Shipping Rule.
-
+
@@ -29,13 +29,13 @@ Customers can click on the cart and enter the amount of quantity they wish to
buy. The Item number will be stored on the right hand corner of the page, next
to the flower sign.
-
+
Click on the flower sign on the right hand side to see the cart details. Click
on the cart to get the final amount details.
-
+
{next}
diff --git a/erpnext/docs/user/guides/website/web-form.md b/erpnext/docs/user/manual/en/website/web-form.md
similarity index 81%
rename from erpnext/docs/user/guides/website/web-form.md
rename to erpnext/docs/user/manual/en/website/web-form.md
index 9fa8a1b5a1..1668ac06a7 100644
--- a/erpnext/docs/user/guides/website/web-form.md
+++ b/erpnext/docs/user/manual/en/website/web-form.md
@@ -17,7 +17,7 @@ To create a new **Web Form** go to:
1. Select if you require the user to login, edit records, manage multiple records etc.
1. Add the fields you want in the record.
-
+
---
@@ -25,7 +25,7 @@ To create a new **Web Form** go to:
Once you create the web form, you can view it on the url and test it out!
-
+
---
diff --git a/erpnext/docs/user/guides/website/web-page.md b/erpnext/docs/user/manual/en/website/web-page.md
similarity index 91%
rename from erpnext/docs/user/guides/website/web-page.md
rename to erpnext/docs/user/manual/en/website/web-page.md
index 2a4c616235..947891e30f 100644
--- a/erpnext/docs/user/guides/website/web-page.md
+++ b/erpnext/docs/user/manual/en/website/web-page.md
@@ -4,7 +4,7 @@ To create a new Web Page, go to:
> Website > Web Page > New
-
+
#### Title
diff --git a/erpnext/docs/user/manual/index.md b/erpnext/docs/user/manual/index.md
new file mode 100644
index 0000000000..47fc2c2630
--- /dev/null
+++ b/erpnext/docs/user/manual/index.md
@@ -0,0 +1,5 @@
+# ERPNext User Manual
+
+Select your language
+
+1. [English](en)
diff --git a/erpnext/docs/user/manual/index.txt b/erpnext/docs/user/manual/index.txt
new file mode 100644
index 0000000000..c574d073d1
--- /dev/null
+++ b/erpnext/docs/user/manual/index.txt
@@ -0,0 +1 @@
+en
diff --git a/erpnext/docs/user/videos/index.md b/erpnext/docs/user/videos/index.md
index 9976dd4bad..dcefe84092 100644
--- a/erpnext/docs/user/videos/index.md
+++ b/erpnext/docs/user/videos/index.md
@@ -1,13 +1,13 @@
# ERPNext Videos
-
-Or you can add a Contact or Address directly from the Customer record, click on “New
-Contact” or “New Address”.
-
-
-
-> Tip: When you select a Customer in any transaction, one Contact and Address
-gets pre-selected. This is the “Default Contact or Address”.
-
-To Import multiple Contacts and Addresses from a spreadsheet, use the Data
-Import Tool.
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/CRM/setup/campaign.md b/erpnext/docs/user/guides/CRM/setup/campaign.md
deleted file mode 100644
index 36b55c3e12..0000000000
--- a/erpnext/docs/user/guides/CRM/setup/campaign.md
+++ /dev/null
@@ -1,20 +0,0 @@
-A Campaign is a full-scale implementation of a sales strategy to promote a
-product or a service. This is done in a market segment of a particular
-geographical area, to achieve specified objectives.
-
-
-
-You can track [Lead]({{url_prefix}}/user/guides/crm/lead.html), [Opportunity]({{url_prefix}}/user/guides/crm/opportunity.html), [Quotation]({{url_prefix}}/user/guides/selling/quotation.html) against a campaign.
-
-###Track Leads against Campaign
-
-* To track a 'Lead' against a campaign select 'View Leads'.
-
-
-
-* You shall get a filtered list of all leads made against that campaign.
-* You can also create new leads by clicking 'New'
-
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/customer-portal/issues.md b/erpnext/docs/user/guides/customer-portal/issues.md
deleted file mode 100644
index 478e1b9e1b..0000000000
--- a/erpnext/docs/user/guides/customer-portal/issues.md
+++ /dev/null
@@ -1,22 +0,0 @@
-The customer portal makes it very easy for a customer to raise concerns. A
-simple and intuitive interface facilitates your customer to report their
-concerns as Issues. They can view the complete thread of their
-conversation.
-
-#### Empty Ticket List
-
-
-
-#### New Issue
-
-
-
-#### Open Issue
-
-
-
-#### Reply on Issue
-
-
-
-{next}
diff --git a/erpnext/docs/user/guides/human-resources/human-resources-reports.md b/erpnext/docs/user/guides/human-resources/human-resources-reports.md
deleted file mode 100644
index 20d792b319..0000000000
--- a/erpnext/docs/user/guides/human-resources/human-resources-reports.md
+++ /dev/null
@@ -1,34 +0,0 @@
-Human Resources Reports
-
-### Employee Leave Balance
-
-Employee Leave Balance Report shows employees and their respective balance leaves under various leave types. Report is generated as per the number of allowed leaves.
-
-
-
-### Employee Birthday
-
-Employee Birthday Report shows Birthdays of your employees.
-
-
-
-### Employee Information
-
-Employee Information Report shows Report View of important information recorded in Employee master.
-
-
-
-### Monthly Salary Register
-
-Monthly Salary Register shows net pay and its components of employee(s) at a glance.
-
-
-
-
-### Monthly Attendance Sheet
-
-Monthly Attendance Sheet shows monthly attendance of selected employee at a glance.
-
-
-
-{next}
diff --git a/erpnext/docs/user/guides/human-resources/introduction-to-human-resources.md b/erpnext/docs/user/guides/human-resources/introduction-to-human-resources.md
deleted file mode 100644
index 8d4da2fedb..0000000000
--- a/erpnext/docs/user/guides/human-resources/introduction-to-human-resources.md
+++ /dev/null
@@ -1,11 +0,0 @@
-The Human Resources (HR) Module covers the processes linked to managing a team
-of co-workers. Most important feature here is processing the payroll by using
-Process Payroll to generate Salary Slips. Most countries have complex tax
-rules stating which expenses the company can make on behalf of the Employees.
-There are a set of rules for the company to deduct taxes and social security
-from employee payroll. ERPNext allows to accomodate all types of taxes and
-their calculation.
-
-It also maintains a complete employee database including contact information,
-salary details, attendance, performance evaluation, and appraisal records.
-
diff --git a/erpnext/docs/user/guides/human-resources/setup/branch.md b/erpnext/docs/user/guides/human-resources/setup/branch.md
deleted file mode 100644
index 9fc71d534d..0000000000
--- a/erpnext/docs/user/guides/human-resources/setup/branch.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Branches of your organization
-
-
-
-{next}
diff --git a/erpnext/docs/user/guides/human-resources/setup/department.md b/erpnext/docs/user/guides/human-resources/setup/department.md
deleted file mode 100644
index 8376626751..0000000000
--- a/erpnext/docs/user/guides/human-resources/setup/department.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Departments in your organization
-
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/setup/designation.md b/erpnext/docs/user/guides/human-resources/setup/designation.md
deleted file mode 100644
index c8af1069b7..0000000000
--- a/erpnext/docs/user/guides/human-resources/setup/designation.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Designations in your organization
-
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/setup/employment-type.md b/erpnext/docs/user/guides/human-resources/setup/employment-type.md
deleted file mode 100644
index 84b6aad470..0000000000
--- a/erpnext/docs/user/guides/human-resources/setup/employment-type.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Various employment contracts you have with your employees.
-
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/setup/holiday-list.md b/erpnext/docs/user/guides/human-resources/setup/holiday-list.md
deleted file mode 100644
index ea64cdfa45..0000000000
--- a/erpnext/docs/user/guides/human-resources/setup/holiday-list.md
+++ /dev/null
@@ -1,5 +0,0 @@
-You can specify the Holidays for a particular year using Holiday List.
-
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/setup/hr-settings.md b/erpnext/docs/user/guides/human-resources/setup/hr-settings.md
deleted file mode 100644
index f349fc74f1..0000000000
--- a/erpnext/docs/user/guides/human-resources/setup/hr-settings.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# HR Settings
-
-GLobal settings for HR related documents
-
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/setup/leave-allocation.md b/erpnext/docs/user/guides/human-resources/setup/leave-allocation.md
deleted file mode 100644
index 985b0c0e61..0000000000
--- a/erpnext/docs/user/guides/human-resources/setup/leave-allocation.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Helps you allocate Leaves to a particular Employee
-
-
-
-To assign leaves to multiple employees use the [Leave Allocation Tool]({{url_prefix}}/user/guides/human-resources/tools/leave-allocation-tool.html)
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/tools/leave-allocation-tool.md b/erpnext/docs/user/guides/human-resources/tools/leave-allocation-tool.md
deleted file mode 100644
index a1fa8018fe..0000000000
--- a/erpnext/docs/user/guides/human-resources/tools/leave-allocation-tool.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Leave Allocation tool helps you allocated a specific number of leaves for your employees.
-
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/index.md b/erpnext/docs/user/guides/index.md
deleted file mode 100644
index 454b4a834f..0000000000
--- a/erpnext/docs/user/guides/index.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# User Manual
-
-{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/projects/introduction-to-projects.md b/erpnext/docs/user/guides/projects/introduction-to-projects.md
deleted file mode 100644
index 85a67b94f7..0000000000
--- a/erpnext/docs/user/guides/projects/introduction-to-projects.md
+++ /dev/null
@@ -1,10 +0,0 @@
-ERPNext helps you manage your Projects by breaking them into Tasks and
-allocating them to different people.
-
-Purchasing and selling can also be tracked against Projects and this can help
-the company keep tabs on its budget, delivery and profitability for a Project.
-
-Projects can be used to manage internal projects, manufacturing jobs or
-service jobs. For service jobs, Time Sheets can also be created that can be
-used to bill Customers if billing is done on a Time & Money basis.
-
diff --git a/erpnext/docs/user/guides/projects/project.md b/erpnext/docs/user/guides/projects/project.md
deleted file mode 100644
index 9b265c0abb..0000000000
--- a/erpnext/docs/user/guides/projects/project.md
+++ /dev/null
@@ -1,87 +0,0 @@
-Project management in ERPNext is Task driven. You can create Project and assign multiple Tasks against it.
-
-
-
-### Managing tasks
-Project can be divided into multiple Tasks.
-Task can be created via Project document itself or can be created via [Task]({{url_prefix}}/user/guides/projects/tasks.html)
-
-
-
-* To view Task made against a Project click on 'Tasks'
-
-
-
-
-
-* You can also view the Tasks from the Project document itself
-
-
-
-### Managing time
-
-ERPNext uses [Time Log]({{url_prefix}}/user/guides/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.
-
-* To view Time Log made against a Project click on 'Time Logs'
-
-
-
-
-
-* You can also create a Time Log directlly and link it to the Project.
-
-
-
-### Managing expenses
-
-You can book [Expense Claim]({{url_prefix}}/user/guides/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'
-
-
-
-* You can also create a Expense Claims directlly and link it to the Project.
-
-
-
-* Total amount of Expense Claims booked against a project is shown under 'Total Expense Claim' in the Project Costing Section
-
-
-
-### Cost Center
-
-You can make a [Cost Center]({{url_prefix}}/user/guides/accounts/setup/cost-center.html) against a Project or use an existing cost center to track all expenses made against that project.
-
-
-
-###Project Costing
-
-The Project Costing section helps you track the time and expenses incurred against the project.
-
-
-
-* The Costing Section is updated based on Time Logs made.
-
-* Gross Margin is the difference between Total Costing Amount and Total Billing Amount
-
-###Billing
-
-You can make/link a [Sales Order]({{url_prefix}}/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.
-
-
-
-###Gantt Chart
-
-A Gantt Chart illustrates a project schedule.
-ERPNext gives you a illustrated view of tasks scheduled against that project in Gantt Chart View.
-
-* To view gantt chart against a project, go to that project and click on 'Gantt Chart'
-
-
-
-
-
-{next}
diff --git a/erpnext/docs/user/guides/selling/setup/index.txt b/erpnext/docs/user/guides/selling/setup/index.txt
deleted file mode 100644
index 245c1a90bd..0000000000
--- a/erpnext/docs/user/guides/selling/setup/index.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-selling-settings
-sales-partner
-shipping-rule
-product-bundle
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/setting-up/email/sending-email.md b/erpnext/docs/user/guides/setting-up/email/sending-email.md
deleted file mode 100644
index 61a76c5807..0000000000
--- a/erpnext/docs/user/guides/setting-up/email/sending-email.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Sending Email from any Document
-
-In ERPNext you can send any document as email (with a PDF attachment) by clicking on `Menu > Email` from any open document.
-
-
-
-**Note:** You must have outgoing [email accounts]({{url_prefix}}/user/guides/setting-up/email/email-account.html) setup for this.
-
-{next}
diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-9-suppliers.md b/erpnext/docs/user/guides/setting-up/setup-wizard/step-9-suppliers.md
deleted file mode 100644
index 48bca9484a..0000000000
--- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-9-suppliers.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Step 8: Suppliers
-
-Enter a few of your Suppliers' names.
-
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/stock/item/index.txt b/erpnext/docs/user/guides/stock/item/index.txt
deleted file mode 100644
index deaa805147..0000000000
--- a/erpnext/docs/user/guides/stock/item/index.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-item-codification
-item-variants
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/stock/setup/stock-settings.md b/erpnext/docs/user/guides/stock/setup/stock-settings.md
deleted file mode 100644
index 409037a1e8..0000000000
--- a/erpnext/docs/user/guides/stock/setup/stock-settings.md
+++ /dev/null
@@ -1,5 +0,0 @@
-You can set default settings for your stock related transactions here.
-
-
-
-{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/website/index.txt b/erpnext/docs/user/guides/website/index.txt
deleted file mode 100644
index cf794db006..0000000000
--- a/erpnext/docs/user/guides/website/index.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-web-page
-blog-post
-web-form
-blogger
-setup
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/website/introduction-to-website.md b/erpnext/docs/user/guides/website/introduction-to-website.md
deleted file mode 100644
index 82f95cb872..0000000000
--- a/erpnext/docs/user/guides/website/introduction-to-website.md
+++ /dev/null
@@ -1,27 +0,0 @@
-Websites are a core component of any business and having a good website
-usually means:
-
- * Invest lot of money.
- * Difficult to update.
- * Not interactive.
-
-Unless you are a web designer yourself.
-
-Wouldn't it be nice if there was a way to update your product catalog on your
-site automatically from your ERP?
-
-We thought exactly the same and hence built a small Website Development app
-right inside ERPNext! Using ERPNext’s Website module, you can
-
- 1. Create Web Pages
- 2. Write a Blog
- 3. Publish your Product Catalog using the Item master
-
-We will soon be adding a shopping cart facility so that your customers can
-place orders and pay you online!
-
-Though not necessary, to make a good website, you might have to know a bit of
-HTML / CSS or hire the services of a professional. The good part is that once
-this is setup, you can add and edit content, blogs and products directly from
-your ERP.
-
diff --git a/erpnext/docs/user/guides/website/product-listing-on-website.md b/erpnext/docs/user/guides/website/product-listing-on-website.md
deleted file mode 100644
index 0acc8fae93..0000000000
--- a/erpnext/docs/user/guides/website/product-listing-on-website.md
+++ /dev/null
@@ -1,68 +0,0 @@
-### Listing Item on Website
-
-To list your Item on the Website, fill the Item details and save the file.
-Once the file is saved, a plus (+) button will appear next to the Image icon.
-Click on the plus button and add your Item image. The html code will be
-generated automatically.
-
-##### Step 1: Save Image
-
-
-
-
-
-##### Step 2: Check the 'Show in Website' box.
-
-Under the Website section, please check the box that says 'show in Website'.
-Once the box is checked, the page will display other fields for entering
-information.
-
-
-
-
-
-##### Step 3: Enter Website Details
-
-
-
-The page name will be generated automatically. Mention the Item-Group under
-which the Item will be displayed.
-
-#### Item Groups
-
-Mention the Item Group under this column. If you wish to list your Item under
-the broad category products, name your Item Group as Products. In case you
-have various varieties of Item and want to classify them under different
-names, make Item Groups with those names and check the box that says 'show in
-Website'. For Example, if you wish to create a category called 'Bags', create
-a Item Group named Bags.
-
-
-
-Once the Item Group is created go to the Website Settings page under Website.
-Enter the Label, Url, and Parent Label.
-
-
-
-
-
-#### Webpage labels
-
-
-
-Add more Items under a particular Item Group.
-
-To add more Items under a certain Label, mention the Item Group on the Item
-Page. The Items will be added automatically on the Webpage, under the Item
-Group Label. For Example, To add Item-Kiddies Bag and Butterfly Print Bag,
-check the 'Show in Website'box. The Items will be placed under the Label Bags
-on the Webpage.
-
-
-
-
-
-Item Group Display
-
-
-
diff --git a/erpnext/docs/user/guides/website/styling-the-website.md b/erpnext/docs/user/guides/website/styling-the-website.md
deleted file mode 100644
index 60af9bc51a..0000000000
--- a/erpnext/docs/user/guides/website/styling-the-website.md
+++ /dev/null
@@ -1,23 +0,0 @@
-You can set some basic styles to your page using the styles feature.
-
-#### Background
-
-You can either set a solid background by selecting a color. You can attach a
-file and select it in the “Background Image” box.
-
-#### Fonts
-
-Fonts: Font family of your body text (includes some Open Source fonts). Font-
-size: Font-size of your website body text (large is good). Heading Font: Font
-family of your headings.
-
-Apart from this you can also add custom style rules using CSS
-
-#### Custom CSS
-
-There are tons of CSS rules and tricks that fall out of scope of this manual.
-But you could add your own style to certain elements like h1, h2 etc and also
-create your own style classes that you can use in elements in your body
-content.
-
-{next}
diff --git a/erpnext/docs/user/index.txt b/erpnext/docs/user/index.txt
index 8d9bd8a897..f5c0c058f7 100644
--- a/erpnext/docs/user/index.txt
+++ b/erpnext/docs/user/index.txt
@@ -1,2 +1,2 @@
-guides
+manual
videos
diff --git a/erpnext/docs/user/manual/en/CRM/contact.md b/erpnext/docs/user/manual/en/CRM/contact.md
new file mode 100644
index 0000000000..83757e0c29
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/contact.md
@@ -0,0 +1,47 @@
+# Contact and Address
+
+Contacts are not necessarily linked to another document. They can be stand alone, just a Contact with a First Name not linked to any other document or
+Contacts can be linked to a Party, that is either a Customer or a Supplier.
+
+The Contact_ID is automatically created:
+
+1. If only a First Name is entered that First Name defines the ID , thus First name (only)
+2. If a First Name and a Party is linked the ID becomes “FirstName-Party”
+
+Contacts can, but do not have to be linked, to: User, Customer, Supplier, and Sales Partner. Since Customers and Addresses are not directly linked to a User, all links go via Contacts.
+
+A Contact can be linked to the (web) user. If that user is also a Customer, it is linked to the Customer by the Customer ID
+
+Contacts and Addresses in ERPNext are stored separately so that you can
+attach multiple Contacts or Addresses to Customers and Suppliers.
+
+To create a new Contact go to,
+
+> CRM > Contact > New
+
+
+
+Or you can add a Contact or Address directly from the Customer record, click on “New
+Contact” or “New Address”.
+
+
+
+> Tip: When you select a Customer in any transaction, one Contact and Address
+gets pre-selected. This is the “Default Contact or Address”.
+
+To Import multiple Contacts and Addresses from a spreadsheet, use the Data
+Import Tool.
+
+---
+
+### Address Titles
+
+The Address Title (Name of person or organization that this address belongs to) is a free format unlinked field. The ID is automatically created from the Address Title upper score Address Type. (AdressTitle-AddressType).
+
+### Address Linking
+
+Addresses can be entered individually (unlinked) or linked to customers, leads, suppliers or Sales Partners.
+
+Linking is done in the reference section where the links can be established.
+
+(Contributed by Robert Becht)
diff --git a/erpnext/docs/user/guides/CRM/customer.md b/erpnext/docs/user/manual/en/CRM/customer.md
similarity index 73%
rename from erpnext/docs/user/guides/CRM/customer.md
rename to erpnext/docs/user/manual/en/CRM/customer.md
index 82c6ff9746..90a4228c18 100644
--- a/erpnext/docs/user/guides/CRM/customer.md
+++ b/erpnext/docs/user/manual/en/CRM/customer.md
@@ -3,13 +3,15 @@ who receives goods, services, products, or ideas, from a seller for a monetary
consideration. A customer can also receive goods or services from a vendor or
a supplier for other valuable considerations.
+A customer is uniquely identified by the Customer ID. Normally this ID is identical to the customer Full Name, but in case of duplicate Full Name, a Name-1 is created as ID.
+
You can either directly create your Customers via
> Selling > Customer
or upload it via the Data Import Tool.
-
+
> Note: Customers are separate from Contacts and Addresses. A Customer can
have multiple Contacts and Addresses.
@@ -19,7 +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]({{url_prefix}}/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/manual/en/crm/contact.html)
### Integration with Accounts
@@ -48,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]({{url_prefix}}/user/guides/crm/setup/customer-group.html)
-and also divide them into [Territories]({{url_prefix}}/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]({{url_prefix}}/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
diff --git a/erpnext/docs/user/guides/CRM/index.md b/erpnext/docs/user/manual/en/CRM/index.md
similarity index 100%
rename from erpnext/docs/user/guides/CRM/index.md
rename to erpnext/docs/user/manual/en/CRM/index.md
diff --git a/erpnext/docs/user/guides/CRM/index.txt b/erpnext/docs/user/manual/en/CRM/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/CRM/index.txt
rename to erpnext/docs/user/manual/en/CRM/index.txt
diff --git a/erpnext/docs/user/guides/CRM/lead.md b/erpnext/docs/user/manual/en/CRM/lead.md
similarity index 64%
rename from erpnext/docs/user/guides/CRM/lead.md
rename to erpnext/docs/user/manual/en/CRM/lead.md
index f754c549a1..8bcbc0574a 100644
--- a/erpnext/docs/user/guides/CRM/lead.md
+++ b/erpnext/docs/user/manual/en/CRM/lead.md
@@ -16,11 +16,15 @@ this conversation to enable another person who may have to follow-up on that
contact. The new person is then able to know the history of that particular
Lead.
+---
+
+Leads are the entities constituting a first contact. Leads can be created by a system users or by a web-user. When a lead is created minimal info (name,email) is entered and the lead is (default) linked to the active system user, the owner of the lead A user configurable drop list is used to classify Status of the lead (Open, Replied etc)
+
To create a Lead, go to:
> Selling > Lead > New Lead
-
+
ERPNext gives you a lot of options you may want to store about your Leads. For
example what is the source, how likely are they to give you business etc. If
@@ -43,4 +47,14 @@ button. Once the Customer is created, the Lead becomes “Converted” and any
further Opportunities from the same source can be created against the
Customer.
+---
+
+### Creation via Portal
+
+If a someone creates an account through the website interface is Lead is automatically created, status is Open and the Owner is the webuser.
+
+After registration the webform Addresses is called, where the web user can enter address information.The address is linked to the lead using the **Lead Name-Address Type** as ID.
+
+If using the Cart functionality, items are ordered the Lead is Converted and a Customer is created using the Web-User Name. Because a Customer can only be linked to a webuser using the (foreign) ID in Contact, such contact has to be created as well.
+
{next}
diff --git a/erpnext/docs/user/guides/CRM/newsletter.md b/erpnext/docs/user/manual/en/CRM/newsletter.md
similarity index 78%
rename from erpnext/docs/user/guides/CRM/newsletter.md
rename to erpnext/docs/user/manual/en/CRM/newsletter.md
index 25cd2b0ae2..c4d9c9d864 100644
--- a/erpnext/docs/user/guides/CRM/newsletter.md
+++ b/erpnext/docs/user/manual/en/CRM/newsletter.md
@@ -12,8 +12,8 @@ see how it looks to the recepient, you can use the test function. Save the
document before testing. A test email will be sent to your email id. You can
send the email to all the intended receipients by clicking on the send button.
-
+
-
+
{next}
diff --git a/erpnext/docs/user/guides/CRM/opportunity.md b/erpnext/docs/user/manual/en/CRM/opportunity.md
similarity index 82%
rename from erpnext/docs/user/guides/CRM/opportunity.md
rename to erpnext/docs/user/manual/en/CRM/opportunity.md
index d6850c8d5c..9f44fdf04f 100644
--- a/erpnext/docs/user/guides/CRM/opportunity.md
+++ b/erpnext/docs/user/manual/en/CRM/opportunity.md
@@ -9,13 +9,13 @@ or open a “Open” Lead and click on “Create Opportunity” button.
#### Figure 1: Create Opportunity
-
+
You can also open a “Open” Lead and click on “Create Opportunity” button.
#### Figure 2: Create Opportunity from an open Lead
-
+
An Opportunity can also come from an existing Customer. You can create
multiple Opportunities against the same Lead. In Opportunity, apart from the
diff --git a/erpnext/docs/user/manual/en/CRM/setup/campaign.md b/erpnext/docs/user/manual/en/CRM/setup/campaign.md
new file mode 100644
index 0000000000..baf6ba4ec2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/CRM/setup/campaign.md
@@ -0,0 +1,20 @@
+A Campaign is a full-scale implementation of a sales strategy to promote a
+product or a service. This is done in a market segment of a particular
+geographical area, to achieve specified objectives.
+
+
+
+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
+
+* To track a 'Lead' against a campaign select 'View Leads'.
+
+
+
+* You shall get a filtered list of all leads made against that campaign.
+* You can also create new leads by clicking 'New'
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/CRM/setup/customer-group.md b/erpnext/docs/user/manual/en/CRM/setup/customer-group.md
similarity index 69%
rename from erpnext/docs/user/guides/CRM/setup/customer-group.md
rename to erpnext/docs/user/manual/en/CRM/setup/customer-group.md
index 6e6e1b95f1..007f44514b 100644
--- a/erpnext/docs/user/guides/CRM/setup/customer-group.md
+++ b/erpnext/docs/user/manual/en/CRM/setup/customer-group.md
@@ -3,12 +3,12 @@ You can also get trend analysis for each
group. Typically Customers are grouped by market segment (that is usually
based on your domain).
-
+
> Tip: If you think all this is too much effort, you can leave it at “Default
Customer Group”. But all this effort, will pay off when you start getting
reports. An example of a sample report is given below:
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/CRM/setup/index.md b/erpnext/docs/user/manual/en/CRM/setup/index.md
similarity index 100%
rename from erpnext/docs/user/guides/CRM/setup/index.md
rename to erpnext/docs/user/manual/en/CRM/setup/index.md
diff --git a/erpnext/docs/user/guides/CRM/setup/index.txt b/erpnext/docs/user/manual/en/CRM/setup/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/CRM/setup/index.txt
rename to erpnext/docs/user/manual/en/CRM/setup/index.txt
diff --git a/erpnext/docs/user/guides/CRM/setup/sales-person.md b/erpnext/docs/user/manual/en/CRM/setup/sales-person.md
similarity index 83%
rename from erpnext/docs/user/guides/CRM/setup/sales-person.md
rename to erpnext/docs/user/manual/en/CRM/setup/sales-person.md
index 4c6c0b6cbe..114003b641 100644
--- a/erpnext/docs/user/guides/CRM/setup/sales-person.md
+++ b/erpnext/docs/user/manual/en/CRM/setup/sales-person.md
@@ -3,7 +3,7 @@ chart of Sales Persons where each Sales Person’s target can be set
individually. Again as in Territory, the target has to be set against Item
Group.
-
+
####Sales Person in Transactions
diff --git a/erpnext/docs/user/guides/accounts/accounting-entries.md b/erpnext/docs/user/manual/en/accounts/accounting-entries.md
similarity index 89%
rename from erpnext/docs/user/guides/accounts/accounting-entries.md
rename to erpnext/docs/user/manual/en/accounts/accounting-entries.md
index e67d999570..7aeff24a4a 100644
--- a/erpnext/docs/user/guides/accounts/accounting-entries.md
+++ b/erpnext/docs/user/manual/en/accounts/accounting-entries.md
@@ -4,7 +4,7 @@ business.
* Mama (The Tea-stall owner) invests Rs 25000 to start the business.
-
+
__Analysis:__ Mama invested 25000 in company, hoping to get some profit. In other
words, company is liable to pay 25000 to Mama in the future. So, account
@@ -14,7 +14,7 @@ will debited.
* The company needs equipments (Stove, teapot, cups etc) and raw materials (tea, sugar, milk etc) immediately. He decides to buy from the nearest general store "Super Bazaar" who is a friend so that he gets some credit. Equipments cost him 2800 and raw materials worth of 2200. He pays 2000 out of total cost 5000.
-
+
__Analysis:__ Equipments are "Fixed Assets" (because they have a long life) of the
company and raw materials "Current Assets" (since they are used for day-to-day
@@ -25,7 +25,7 @@ Bazaar" later, so Super Bazaar will be credited by 3000.
* Mama (who takes care of all entries) decides to book sales at the end of the every day, so that he can analyze daily sales. At the end of the very first day, the tea stall sells 325 cups of tea, which gives net sales of Rs. 1575. The owner happily books his first day sales.
-
+
__Analysis:__ Income has been booked in "Sales of Tea" account which has been
credited to increase the value and the same amount will be debited to "Cash"
@@ -36,7 +36,7 @@ sold" account by same amount.
At the end of the month, the company paid the rent amount of stall (5000) and
salary of one employee (8000), who joined from the very first day.
-
+
### Booking Profit
@@ -47,7 +47,7 @@ its a liability for the company (it has to pay it to Mama). When the Balance
Sheet is not balanced i.e. Debit is not equal to Credit, the profit has not
yet been booked. To book profit, the following entry has to be made:
-
+
Explanation: Company's net sales and expenses are 40000 and 20000
respectively. So, company made a profit of 20000. To make the profit booking
diff --git a/erpnext/docs/user/guides/accounts/accounting-reports.md b/erpnext/docs/user/manual/en/accounts/accounting-reports.md
similarity index 73%
rename from erpnext/docs/user/guides/accounts/accounting-reports.md
rename to erpnext/docs/user/manual/en/accounts/accounting-reports.md
index 5026151860..61470b1579 100644
--- a/erpnext/docs/user/guides/accounts/accounting-reports.md
+++ b/erpnext/docs/user/manual/en/accounts/accounting-reports.md
@@ -7,7 +7,7 @@ and between a period. This will help you to get a full update for all entries
done in that period for that Account.
+ src="{{docs_base_url}}/assets/img/accounts/general-ledger.png">
### Trial Balance
@@ -20,7 +20,7 @@ the:
* Credits
* Closing
-
+
The sum of all closing balances in a Trial Balance must be zero.
@@ -30,7 +30,7 @@ These reports help you to track the outstanding invoices sent to Customer and
Suppliers. In this report, you will get your outstanding amounts period wise.
i.e. between 0-30 days, 30-60 days and so on.
-
+
### Sales and Purchase Register
@@ -38,6 +38,6 @@ In this report, each tax Account is transposed in columns. For each Invoice and
invoice Item, you will get the amount of individual tax that has been paid,
based on the Taxes and Charges table.
-
+
{next}
diff --git a/erpnext/docs/user/guides/accounts/advance-payment-entry.md b/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md
similarity index 86%
rename from erpnext/docs/user/guides/accounts/advance-payment-entry.md
rename to erpnext/docs/user/manual/en/accounts/advance-payment-entry.md
index fa818fbd05..042e800573 100644
--- a/erpnext/docs/user/guides/accounts/advance-payment-entry.md
+++ b/erpnext/docs/user/manual/en/accounts/advance-payment-entry.md
@@ -24,7 +24,7 @@ the row "Is Advance" click 'Yes'.
#### Figure 1 : Journal Entry -Advance Entry
-
+
### Double Entry Accounting
@@ -41,7 +41,7 @@ will be credited because it has given value.
#### Figure 2: Transaction and Difference Entry
-
+
Save and submit the JV. If this document is not saved it will not be pulled in
other accounting documents.
@@ -55,7 +55,7 @@ advance in the advances table. The accounting will be adjusted accordingly.
#### Figure 3: Receive Advance
-
+
Save and submit the Sales Invoice.
diff --git a/erpnext/docs/user/manual/en/accounts/articles/accounting-for-projects.md b/erpnext/docs/user/manual/en/accounts/articles/accounting-for-projects.md
new file mode 100644
index 0000000000..6eba28843c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/accounts/articles/accounting-for-projects.md
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
To edit your Chart of Accounts in ERPNext go to:
@@ -37,7 +37,7 @@ based on statutory (tax, compliance to government regulations) requirements.
Let us understand the main groups of the Chart of Accounts.
-
+
### Balance Sheet Accounts
@@ -75,7 +75,7 @@ beginning and end of your Fiscal Year, they become zero.
In ERPNext it is easy to create a Profit and Loss analysis chart. An example
of a Profit and Loss analysis chart is given below:
-
+
(On the first day of the year you have not made any profit or loss, but you
still have assets, hence balance sheet accounts never become zero at the
@@ -95,7 +95,7 @@ Supplier).
> Note: An Account “Ledger” is also sometimes called as Account “Head”.
-
+
### Other Account Types
@@ -110,7 +110,7 @@ To create new Accounts, explore your Chart of Accounts and click on an Account
group under which you want to create the new Account. On the right side, you
will see an option to “Open” or “Add Child” a new Account.
-
+
Option to create will only appear if you click on a Group (folder) type
Account.
diff --git a/erpnext/docs/user/guides/accounts/credit-limit.md b/erpnext/docs/user/manual/en/accounts/credit-limit.md
similarity index 81%
rename from erpnext/docs/user/guides/accounts/credit-limit.md
rename to erpnext/docs/user/manual/en/accounts/credit-limit.md
index df7f7f6e25..299e67057d 100644
--- a/erpnext/docs/user/guides/accounts/credit-limit.md
+++ b/erpnext/docs/user/manual/en/accounts/credit-limit.md
@@ -12,7 +12,7 @@ To set credit limit go to Customer - Master
#### Figure 1: Credit Limit
-
+
Go to the 'More Info section' and enter the amount in the field Credit Limit.
@@ -27,7 +27,7 @@ accept orders or raise credit limits of customers.
#### Figure 2: Credit Controller
-
+
Save the changes.
diff --git a/erpnext/docs/user/guides/accounts/index.md b/erpnext/docs/user/manual/en/accounts/index.md
similarity index 100%
rename from erpnext/docs/user/guides/accounts/index.md
rename to erpnext/docs/user/manual/en/accounts/index.md
diff --git a/erpnext/docs/user/guides/accounts/index.txt b/erpnext/docs/user/manual/en/accounts/index.txt
similarity index 94%
rename from erpnext/docs/user/guides/accounts/index.txt
rename to erpnext/docs/user/manual/en/accounts/index.txt
index 5a4a391d0e..323764e19e 100644
--- a/erpnext/docs/user/guides/accounts/index.txt
+++ b/erpnext/docs/user/manual/en/accounts/index.txt
@@ -14,4 +14,5 @@ item-wise-tax
point-of-sale-pos-invoice
multi-currency-accounting
tools
-setup
\ No newline at end of file
+setup
+articles
diff --git a/erpnext/docs/user/guides/accounts/item-wise-tax.md b/erpnext/docs/user/manual/en/accounts/item-wise-tax.md
similarity index 84%
rename from erpnext/docs/user/guides/accounts/item-wise-tax.md
rename to erpnext/docs/user/manual/en/accounts/item-wise-tax.md
index fbc5743620..8c1fc8625f 100644
--- a/erpnext/docs/user/guides/accounts/item-wise-tax.md
+++ b/erpnext/docs/user/manual/en/accounts/item-wise-tax.md
@@ -5,7 +5,7 @@ Taxes selected in the Tax and Other Charges in transactions are applied on all t
Item master has tax table where you can list taxes which will be applied on it.
-
+
Tax rate mentioned in the item master gets preference over tax rate entered in the transactions.
@@ -17,7 +17,7 @@ In Taxes and Other Charges master, you should select all the applicable taxes wh
For example, if few items has VAT 5 applied on them, other has Service Tax applied, and some other has Excise Duty applicable, then you tax master should have all these taxes selected.
-
+
####Step 3: Set Tax Rate as Zero in Taxes and Charges Template
@@ -25,6 +25,6 @@ In the Taxes and Other Charges master, tax rate will be updated as ZERO. It mean
Based on the above setting, you will have taxes applied on items as mentioned in the respective item master. Check following for an instance.
-
+
{next}
diff --git a/erpnext/docs/user/guides/accounts/journal-entry.md b/erpnext/docs/user/manual/en/accounts/journal-entry.md
similarity index 96%
rename from erpnext/docs/user/guides/accounts/journal-entry.md
rename to erpnext/docs/user/manual/en/accounts/journal-entry.md
index 9da656d33c..68ba22a863 100644
--- a/erpnext/docs/user/guides/accounts/journal-entry.md
+++ b/erpnext/docs/user/manual/en/accounts/journal-entry.md
@@ -7,7 +7,7 @@ To create a Journal Entry go to:
> Accounts > Documents > Journal Entry > New
-
+
In a Journal Entry, you must select.
diff --git a/erpnext/docs/user/guides/accounts/making-payments.md b/erpnext/docs/user/manual/en/accounts/making-payments.md
similarity index 94%
rename from erpnext/docs/user/guides/accounts/making-payments.md
rename to erpnext/docs/user/manual/en/accounts/making-payments.md
index 3b6209c712..2038e6f9b2 100644
--- a/erpnext/docs/user/guides/accounts/making-payments.md
+++ b/erpnext/docs/user/manual/en/accounts/making-payments.md
@@ -6,7 +6,7 @@ clicking on “Make Payment Entry” button on “Submitted” invoices.
3. Enter the cheque number, cheque date.
4. Save and Submit.
-
+
Payments can also be made independent of invoices by creating a new Journal
Voucher and selecting the type of payment.
@@ -29,7 +29,7 @@ For payments to Suppliers,
### Example Payment Journal Entry
-
+
* * *
diff --git a/erpnext/docs/user/guides/accounts/multi-currency-accounting.md b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
similarity index 86%
rename from erpnext/docs/user/guides/accounts/multi-currency-accounting.md
rename to erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
index 0b01110e26..a674f219e2 100644
--- a/erpnext/docs/user/guides/accounts/multi-currency-accounting.md
+++ b/erpnext/docs/user/manual/en/accounts/multi-currency-accounting.md
@@ -4,15 +4,15 @@ In ERPNext, you can make accounting entries in multiple currency. For example, i
To get started with multi-currency accounting, you need to assign accounting currency in Account record. You can define Currency from Chart of Accounts while creating Account.
-
+
You can also assign / modify the currency by opening specific Account record for existing Accounts.
-
+
For Customer / Supplier (Party), you can also define it's accounting currency in the Party record. If the Party's accounting currency is different from Company Currency, you have to mention Default Receivable / Payable Account in that currency.
-
+
Once you defined Accounting Currency in Party / Account record, you are ready to make transactions against them. If Party's accounting currency is different from Company Currency, system will restrict to make transaction for that party with that currency only. If accounting currency is same as Company Currency, you can make transactions for that Party in any currency. But accounting entries (GL Entries) will always be in Party's Accounting Currency. In any case, currency of Receivable Account will always be same as accounting currency of the Party.
@@ -31,7 +31,7 @@ Now, in POS, Paid Amount will be enetered in transaction currency, instead of ea
Outstanding Amount and Advance Amount will always be calculated and shown in Customer's Account Currency.
-
+
### Purchase Invoice
@@ -41,14 +41,14 @@ Similarly, in Purchase Invoice, accounting entries will be made based on Supplie
In Journal Entry, you can make transactions in different currencies. There is a checkbox "Multi Currency", to enable multi-currency entries. If "Multi Currency" option selected, you will be able to select accounts with different currencies.
-
+
In Accounts table, on selection of foreign currency account, system will show Currency section and fetch Account Currency and Exchange Rate automatically. You can change / modify the Exchange Rate later manually.
In a single Journal Entry, you can select accounts with only one alternate currency, apart from accounts in Company Currency. Debit / Credit amount should be entered in Account Currency, system will calculate and show the Debit / Credit amount in Company Currency automatically.
-
+
#### Example 1: Payment Entry Against Customer With Alternate Currency
@@ -56,7 +56,7 @@ Suppose, default currency of the company is INR and customer's accounting curren
Exchange Rate in the payment entry should always be same as invoice (60), even if exchange rate on the payment date is 62. The bank account will be credited by the amount considering exchange rate as 62. Hence, Exchnage Gain / Loss will be booked based on exchange rate difference.
-
+
#### Example 2: Inter-bank Transfer (USD -> INR)
@@ -101,7 +101,7 @@ Lets say, Paypal account debited by following amounts over the week, which has n
Suppose, Exchange Rate on the payment date is 62 and Bank Transfer Entry will be look like below:
-
+
## Reports
@@ -110,10 +110,10 @@ Suppose, Exchange Rate on the payment date is 62 and Bank Transfer Entry will be
In General Ledger, system shows debit / credit amount in both currency if filtered by an Account and Account Currency is different from Company Currency.
-
+
### Accounts Receivable / Payable
In Accounts Receivable / Payable report, system shows all the amounts in Party / Account Currency.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/accounts/opening-accounts.md b/erpnext/docs/user/manual/en/accounts/opening-accounts.md
similarity index 89%
rename from erpnext/docs/user/guides/accounts/opening-accounts.md
rename to erpnext/docs/user/manual/en/accounts/opening-accounts.md
index 1a39ed6ac4..214642d8d5 100644
--- a/erpnext/docs/user/guides/accounts/opening-accounts.md
+++ b/erpnext/docs/user/manual/en/accounts/opening-accounts.md
@@ -23,7 +23,7 @@ Based on Voucher Type
You can select accounts based on the voucher type. In such a scenario, your balance sheet should be balanced.
-
+
Also, note that if there are more than 300 ledgers, the system will crash. Thus to avoid such a situation, you can open accounts by using temporary accounts.
@@ -46,16 +46,16 @@ Note: Make sure to set “Is Opening” as “Yes” in the More Info section.
Complete Journal Entries on the Debit and Credit side.
-
+
To update opening balance is to make Journal Entry for an individual/group of accounts.
For example, if you want to update balance in three bank accounts, then make Journal Entrys in this manner.
-
+
-
+
Temporary Asset and Liability account is used for balancing purpose. When you update opening balance in Liability Account, you can use Temporary Asset Account for balancing.
@@ -72,7 +72,7 @@ After completing the accounting entries, the trial balance report will look
like the one given below:
-
+
#### Outstanding Invoices
diff --git a/erpnext/docs/user/guides/accounts/opening-entry.md b/erpnext/docs/user/manual/en/accounts/opening-entry.md
similarity index 61%
rename from erpnext/docs/user/guides/accounts/opening-entry.md
rename to erpnext/docs/user/manual/en/accounts/opening-entry.md
index 2f341a1a08..da0b0f9097 100644
--- a/erpnext/docs/user/guides/accounts/opening-entry.md
+++ b/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.]({{url_prefix}}/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}
diff --git a/erpnext/docs/user/guides/accounts/point-of-sale-pos-invoice.md b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
similarity index 92%
rename from erpnext/docs/user/guides/accounts/point-of-sale-pos-invoice.md
rename to erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
index dbcfc00027..8f646f723c 100644
--- a/erpnext/docs/user/guides/accounts/point-of-sale-pos-invoice.md
+++ b/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]({{url_prefix}}/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
@@ -42,7 +42,7 @@ clicking on the Item image and the other, is through the Barcode / Serial No.
**Barcode / Serial No** \- A Barcode / Serial No is an optical machine-readable representation of data relating to the object to which it is attached. Enter Barcode / Serial No in the box as shown in the image below and pause for a second, the item will be automatically added to the cart.
-
+
> Tip: To change the quantity of an Item, enter your desired quantity in the
quantity box. These are mostly used if the same Item is purchased in bulk.
@@ -63,7 +63,7 @@ button.
> Delete button appears only when Items are selected.
-
+
### Make Payment
@@ -74,7 +74,7 @@ ready to make the Payment. Payment process is divided into 3 steps -
2. Select your “Mode of Payment”.
3. Click on “Pay” button to Save the document.
-
+
Submit the document to finalise the record. After the document is submitted,
you can either print or email it directly to the customer.
diff --git a/erpnext/docs/user/guides/accounts/purchase-invoice.md b/erpnext/docs/user/manual/en/accounts/purchase-invoice.md
similarity index 95%
rename from erpnext/docs/user/guides/accounts/purchase-invoice.md
rename to erpnext/docs/user/manual/en/accounts/purchase-invoice.md
index ce1aae882f..433219cf9f 100644
--- a/erpnext/docs/user/guides/accounts/purchase-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/purchase-invoice.md
@@ -9,7 +9,7 @@ To make a new Purchase Invoice, go to:
or click on “Make Purchase Invoice” in Purchase Order or Purchase Receipt.
-
+
The concept of “Posting Date” is again same as Sales Invoice. “Bill No” and
“Bill Date” helps to track the bill number as set by your Supplier for
diff --git a/erpnext/docs/user/guides/accounts/sales-invoice.md b/erpnext/docs/user/manual/en/accounts/sales-invoice.md
similarity index 96%
rename from erpnext/docs/user/guides/accounts/sales-invoice.md
rename to erpnext/docs/user/manual/en/accounts/sales-invoice.md
index 5c95b319aa..f9a453e115 100644
--- a/erpnext/docs/user/guides/accounts/sales-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/sales-invoice.md
@@ -6,7 +6,7 @@ You can create a Sales Invoice directly from
or Click on Make Invoice at the right hand corner of the Delivery Note.
-
+
#### Accounting Impact
diff --git a/erpnext/docs/user/guides/accounts/setup/accounts-settings.md b/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md
similarity index 78%
rename from erpnext/docs/user/guides/accounts/setup/accounts-settings.md
rename to erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md
index 8465679f7f..5242b391c6 100644
--- a/erpnext/docs/user/guides/accounts/setup/accounts-settings.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/accounts-settings.md
@@ -1,5 +1,5 @@
-
+
* Accounts Frozen Upto: Freeze accounting transactions upto specified date, nobody can make / modify entry except specified role.
diff --git a/erpnext/docs/user/guides/accounts/setup/cost-center.md b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
similarity index 93%
rename from erpnext/docs/user/guides/accounts/setup/cost-center.md
rename to erpnext/docs/user/manual/en/accounts/setup/cost-center.md
index 79f1a3c3a2..8b9fcc1c81 100644
--- a/erpnext/docs/user/guides/accounts/setup/cost-center.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
@@ -32,7 +32,7 @@ To setup your Chart of Cost Centers go to:
> Accounts > Setup > Chart of Cost Centers
-
+
Cost centers help you in one more activity, budgeting.
@@ -53,7 +53,7 @@ define a budget distribution that the budget will follow.
> Accounts > Setup > Budget Distribution > New Budget Distribution
-
+
#### Budget Actions
diff --git a/erpnext/docs/user/guides/accounts/setup/fiscal-year.md b/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md
similarity index 92%
rename from erpnext/docs/user/guides/accounts/setup/fiscal-year.md
rename to erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md
index 5509e2fcdd..618d20b6f9 100644
--- a/erpnext/docs/user/guides/accounts/setup/fiscal-year.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/fiscal-year.md
@@ -18,6 +18,6 @@ choose to start its fiscal year on October 1. That way, they know what their
income will be for that year, and can adjust their expenses to maintain their
desired profit margins.
-
+
{next}
diff --git a/erpnext/docs/user/guides/accounts/setup/index.md b/erpnext/docs/user/manual/en/accounts/setup/index.md
similarity index 100%
rename from erpnext/docs/user/guides/accounts/setup/index.md
rename to erpnext/docs/user/manual/en/accounts/setup/index.md
diff --git a/erpnext/docs/user/guides/accounts/setup/index.txt b/erpnext/docs/user/manual/en/accounts/setup/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/accounts/setup/index.txt
rename to erpnext/docs/user/manual/en/accounts/setup/index.txt
diff --git a/erpnext/docs/user/guides/accounts/setup/tax-rule.md b/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md
similarity index 58%
rename from erpnext/docs/user/guides/accounts/setup/tax-rule.md
rename to erpnext/docs/user/manual/en/accounts/setup/tax-rule.md
index fdbc704022..bfcf6f0721 100644
--- a/erpnext/docs/user/guides/accounts/setup/tax-rule.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/tax-rule.md
@@ -1,6 +1,6 @@
-You can define which [Tax Template]({{url_prefix}}/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.
-
+
You can define Tax Rules for Sales or Purchase Taxes.
While making a Transaction the system will select and apply tax template based on the tax rule defined.
@@ -10,9 +10,9 @@ Let us consider a senario to understand Tax Rule Better.
Suppose we define 2 Tax Rules as below.
-
+
-
+
Here Tax Rule 1 has Billing Country as India and Tax Rule 2 has Billing Country as United Kingdom
diff --git a/erpnext/docs/user/guides/accounts/tools/bank-reconciliation.md b/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md
similarity index 90%
rename from erpnext/docs/user/guides/accounts/tools/bank-reconciliation.md
rename to erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md
index 1fd0b378d7..f2afe76703 100644
--- a/erpnext/docs/user/guides/accounts/tools/bank-reconciliation.md
+++ b/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md
@@ -15,7 +15,7 @@ The Bank Reconciliation statement in ERPNext comes in the form of a report.
#### Figure 1: Bank Reconciliation Statement
-
+
@@ -45,7 +45,7 @@ __Step 4:__ Click on the JV from the table and update clearance date.
#### Figure 2: Bank Reconciliation Tool
-
+
__Step 5:__ Click on the button 'Update Clearance Date'.
diff --git a/erpnext/docs/user/guides/accounts/tools/index.md b/erpnext/docs/user/manual/en/accounts/tools/index.md
similarity index 100%
rename from erpnext/docs/user/guides/accounts/tools/index.md
rename to erpnext/docs/user/manual/en/accounts/tools/index.md
diff --git a/erpnext/docs/user/guides/accounts/tools/index.txt b/erpnext/docs/user/manual/en/accounts/tools/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/accounts/tools/index.txt
rename to erpnext/docs/user/manual/en/accounts/tools/index.txt
diff --git a/erpnext/docs/user/guides/accounts/tools/payment-reconciliation.md b/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md
similarity index 90%
rename from erpnext/docs/user/guides/accounts/tools/payment-reconciliation.md
rename to erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md
index bf4a65f243..c719623781 100644
--- a/erpnext/docs/user/guides/accounts/tools/payment-reconciliation.md
+++ b/erpnext/docs/user/manual/en/accounts/tools/payment-reconciliation.md
@@ -11,7 +11,7 @@ To use Payment Reconciliation Tool go to,
Accounts > Tools > Payment Reconciliation
-
+
__Step 1:__ Select the Account against whom the payments need to be reconciled.
diff --git a/erpnext/docs/user/guides/accounts/tools/payment-tool.md b/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md
similarity index 81%
rename from erpnext/docs/user/guides/accounts/tools/payment-tool.md
rename to erpnext/docs/user/manual/en/accounts/tools/payment-tool.md
index f96ca5b91b..a5d69661a7 100644
--- a/erpnext/docs/user/guides/accounts/tools/payment-tool.md
+++ b/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md
@@ -11,14 +11,14 @@ To go to Payment Tool, click on Accounts > Tools > Payment Tool.
6. Click on Get Outstanding Vouchers to fetch all the valid Vouchers, Invoices and Orders against which a payment can be made/received. These will appear in the Against Voucher section.
* __Note:__ In case User is paying a customer or receiving payment from a supplier, add the details regarding the relevant invoices and orders manually.
-
+
7. Once details have been fetched, click on the detail entry and enter the payment amount made against that Invoice/Order/Voucher
-
+
8. Click on 'Make Journal Entry' to generate a new Journal Entry with the relevant Party Details and Credit/Debit details filled in.
-
+
{next}
diff --git a/erpnext/docs/user/guides/accounts/tools/period-closing-voucher.md b/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md
similarity index 93%
rename from erpnext/docs/user/guides/accounts/tools/period-closing-voucher.md
rename to erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md
index 5c0e203d0d..fbec8d1a63 100644
--- a/erpnext/docs/user/guides/accounts/tools/period-closing-voucher.md
+++ b/erpnext/docs/user/manual/en/accounts/tools/period-closing-voucher.md
@@ -19,7 +19,7 @@ In ERPNext after making all the special entries via Journal Entry for the curren
**Closing Fiscal Year** will be an year for which you are closing your financial statement.
-
+
This voucher will transfer Profit or Loss (availed from P&L statment) to Closing Account Head. You should select a libility account like Reserves and Surplus, or Capital Fund account as Closing Account.
diff --git a/erpnext/docs/user/guides/human-resources/tools/index.md b/erpnext/docs/user/manual/en/buying/articles/index.md
similarity index 100%
rename from erpnext/docs/user/guides/human-resources/tools/index.md
rename to erpnext/docs/user/manual/en/buying/articles/index.md
diff --git a/erpnext/docs/user/manual/en/buying/articles/index.txt b/erpnext/docs/user/manual/en/buying/articles/index.txt
new file mode 100644
index 0000000000..c0ed867e5b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/articles/index.txt
@@ -0,0 +1,3 @@
+maintaining-suppliers-part-no-in-item
+managing-purchase-uom-and-stock-uom
+select-material-requests-based-on-supplier
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md b/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md
new file mode 100644
index 0000000000..52f4c97792
--- /dev/null
+++ b/erpnext/docs/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item.md
@@ -0,0 +1,20 @@
+
+
Entering a Purchase Order is very similar to a Purchase Request, additionally
you will have to set:
@@ -73,7 +73,7 @@ Nos (from the Item form)
#### Figure 3: Conversion of Purchase UOM to stock UOM
-
+
__Step 4:__ Mention the UOM conversion factor. For example, (100);If one box has
100 pieces.
diff --git a/erpnext/docs/user/guides/buying/purchase-taxes.md b/erpnext/docs/user/manual/en/buying/purchase-taxes.md
similarity index 95%
rename from erpnext/docs/user/guides/buying/purchase-taxes.md
rename to erpnext/docs/user/manual/en/buying/purchase-taxes.md
index 0e5ebb3a20..871ff96081 100644
--- a/erpnext/docs/user/guides/buying/purchase-taxes.md
+++ b/erpnext/docs/user/manual/en/buying/purchase-taxes.md
@@ -8,7 +8,7 @@ Orders and Purchase Invoices.
> Buying > Setup > Purchase Taxes and Charges Template > New Purchase Taxes and Charges
Master
-
+
diff --git a/erpnext/docs/user/guides/buying/setup/buying-settings.md b/erpnext/docs/user/manual/en/buying/setup/buying-settings.md
similarity index 89%
rename from erpnext/docs/user/guides/buying/setup/buying-settings.md
rename to erpnext/docs/user/manual/en/buying/setup/buying-settings.md
index dc9fa8e143..d4c390bf7e 100644
--- a/erpnext/docs/user/guides/buying/setup/buying-settings.md
+++ b/erpnext/docs/user/manual/en/buying/setup/buying-settings.md
@@ -1,6 +1,6 @@
Buying Settings is where you can define properties which will be applied in the Buying module's transactions.
-
+
Let us look at the various options that can be configured:
@@ -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.]({{url_prefix}}/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
diff --git a/erpnext/docs/user/guides/buying/setup/index.md b/erpnext/docs/user/manual/en/buying/setup/index.md
similarity index 100%
rename from erpnext/docs/user/guides/buying/setup/index.md
rename to erpnext/docs/user/manual/en/buying/setup/index.md
diff --git a/erpnext/docs/user/guides/buying/setup/index.txt b/erpnext/docs/user/manual/en/buying/setup/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/buying/setup/index.txt
rename to erpnext/docs/user/manual/en/buying/setup/index.txt
diff --git a/erpnext/docs/user/guides/buying/setup/supplier-type.md b/erpnext/docs/user/manual/en/buying/setup/supplier-type.md
similarity index 91%
rename from erpnext/docs/user/guides/buying/setup/supplier-type.md
rename to erpnext/docs/user/manual/en/buying/setup/supplier-type.md
index 9ca8978069..61f65fa689 100644
--- a/erpnext/docs/user/guides/buying/setup/supplier-type.md
+++ b/erpnext/docs/user/manual/en/buying/setup/supplier-type.md
@@ -14,7 +14,7 @@ You can create your own category of Supplier Type.
> Buying > Setup > Supplier Type > New Supplier Type
-
+
You can classify your suppliers from a range of choice available in ERPNext.
Choose from a set of given options like Distributor, Electrical,Hardware,
diff --git a/erpnext/docs/user/guides/buying/supplier-quotation.md b/erpnext/docs/user/manual/en/buying/supplier-quotation.md
similarity index 84%
rename from erpnext/docs/user/guides/buying/supplier-quotation.md
rename to erpnext/docs/user/manual/en/buying/supplier-quotation.md
index a0047e6867..0f1d51aae4 100644
--- a/erpnext/docs/user/guides/buying/supplier-quotation.md
+++ b/erpnext/docs/user/manual/en/buying/supplier-quotation.md
@@ -8,7 +8,7 @@ You can make a supplier quotation from a Material Request
#### Supplier Quotation Flow-Chart
-
+
You can also make a Supplier Quotation directly from:
@@ -16,7 +16,7 @@ You can also make a Supplier Quotation directly from:
#### Create Supplier Quotation
-
+
If you have multiple Suppliers who supply you with the same Item, you
usually send out a message (Request for Quote) to various Suppliers. In
diff --git a/erpnext/docs/user/guides/buying/supplier.md b/erpnext/docs/user/manual/en/buying/supplier.md
similarity index 92%
rename from erpnext/docs/user/guides/buying/supplier.md
rename to erpnext/docs/user/manual/en/buying/supplier.md
index 9e20642c97..455e06020b 100644
--- a/erpnext/docs/user/guides/buying/supplier.md
+++ b/erpnext/docs/user/manual/en/buying/supplier.md
@@ -5,7 +5,7 @@ You can create a new Supplier via:
> Buying > Documents > Supplier > New Supplier
-
+
### Contacts and Addresses
diff --git a/erpnext/docs/user/guides/customer-portal/customer-orders-invoices-and-shipping-status.md b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
similarity index 62%
rename from erpnext/docs/user/guides/customer-portal/customer-orders-invoices-and-shipping-status.md
rename to erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
index b176d10882..83d7bf6494 100644
--- a/erpnext/docs/user/guides/customer-portal/customer-orders-invoices-and-shipping-status.md
+++ b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
@@ -2,21 +2,21 @@ ERPNext Web Portal gives your customers quick access to their Orders, Invoices
and Shipments Customers can check the status of their orders, invoices, and
shipping status by logging on to the web.
-
+
Once an order is raised, either using the Shopping Cart or from within
ERPNext, your customer can view the order and keep an eye on the billing and
shipment status. When the invoice and payment against these orders are
submitted, the customer can see the updated status on the portal, at a glance.
-
+
#### Invoice with paid status.
-
+
#### Invoice with billed status.
-
+
{next}
diff --git a/erpnext/docs/user/guides/customer-portal/index.md b/erpnext/docs/user/manual/en/customer-portal/index.md
similarity index 100%
rename from erpnext/docs/user/guides/customer-portal/index.md
rename to erpnext/docs/user/manual/en/customer-portal/index.md
diff --git a/erpnext/docs/user/guides/customer-portal/index.txt b/erpnext/docs/user/manual/en/customer-portal/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/customer-portal/index.txt
rename to erpnext/docs/user/manual/en/customer-portal/index.txt
diff --git a/erpnext/docs/user/manual/en/customer-portal/issues.md b/erpnext/docs/user/manual/en/customer-portal/issues.md
new file mode 100644
index 0000000000..79ac676f9b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customer-portal/issues.md
@@ -0,0 +1,22 @@
+The customer portal makes it very easy for a customer to raise concerns. A
+simple and intuitive interface facilitates your customer to report their
+concerns as Issues. They can view the complete thread of their
+conversation.
+
+#### Empty Ticket List
+
+
+
+#### New Issue
+
+
+
+#### Open Issue
+
+
+
+#### Reply on Issue
+
+
+
+{next}
diff --git a/erpnext/docs/user/guides/customer-portal/portal-login.md b/erpnext/docs/user/manual/en/customer-portal/portal-login.md
similarity index 65%
rename from erpnext/docs/user/guides/customer-portal/portal-login.md
rename to erpnext/docs/user/manual/en/customer-portal/portal-login.md
index 9d657a827e..4a3b60c9c7 100644
--- a/erpnext/docs/user/guides/customer-portal/portal-login.md
+++ b/erpnext/docs/user/manual/en/customer-portal/portal-login.md
@@ -1,6 +1,6 @@
To login into the customer account, the customer has to use his email id and
the password sent by ERPNext; generated through the sign-up process.
-
+
{next}
diff --git a/erpnext/docs/user/guides/customer-portal/sign-up.md b/erpnext/docs/user/manual/en/customer-portal/sign-up.md
similarity index 54%
rename from erpnext/docs/user/guides/customer-portal/sign-up.md
rename to erpnext/docs/user/manual/en/customer-portal/sign-up.md
index 2e95d494bc..01929ecc0b 100644
--- a/erpnext/docs/user/guides/customer-portal/sign-up.md
+++ b/erpnext/docs/user/manual/en/customer-portal/sign-up.md
@@ -2,19 +2,19 @@ Customers have to log-in to the Company Website, and sign-up as a customer.
#### Step 1: Click on Login Icon
-
+
#### Step 2: Click on Sign Up Icon
-
+
#### Step 3: Enter Customer Name and ID
-
+
After the sign up process, a mail will be sent to the customers email id with
the password details.
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md b/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md
new file mode 100644
index 0000000000..7460568d67
--- /dev/null
+++ b/erpnext/docs/user/manual/en/customize-erpnext/articles/allow-fields-to-be-changed-after-submit.md
@@ -0,0 +1,26 @@
+
+ 
+
+
+ src="{{docs_base_url}}/assets/img/customize/customize-title.gif">
#### Fixed or Editable Titles
If your title is generated as a default title, it can be edited by the user by clicking on the heading of the document.
+ src="{{docs_base_url}}/assets/img/customize/editable-title.gif">
If you want a fixed title, you can set the rule in the **Options** property. In this way, the title will be automatically updated everytime the document is updated.
diff --git a/erpnext/docs/user/guides/customize-erpnext/hiding-modules-and-features.md b/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md
similarity index 83%
rename from erpnext/docs/user/guides/customize-erpnext/hiding-modules-and-features.md
rename to erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md
index 57154ad10f..60addc1c2b 100644
--- a/erpnext/docs/user/guides/customize-erpnext/hiding-modules-and-features.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md
@@ -7,7 +7,7 @@ dont require, go to:
> Setup > Tools > Hide/Unhide Features
-
+
Check / uncheck the features you want to use and refresh your page for the
changes to take effect.
@@ -20,7 +20,7 @@ To hide modules (icons) from the home page, go to:
Setup > Tools> Modules Setup
-
+
> Note: Modules are automatically hidden for users that have no permissions on
the documents within that module. For example, if a user has no permissions on
diff --git a/erpnext/docs/user/guides/customize-erpnext/index.md b/erpnext/docs/user/manual/en/customize-erpnext/index.md
similarity index 100%
rename from erpnext/docs/user/guides/customize-erpnext/index.md
rename to erpnext/docs/user/manual/en/customize-erpnext/index.md
diff --git a/erpnext/docs/user/guides/customize-erpnext/index.txt b/erpnext/docs/user/manual/en/customize-erpnext/index.txt
similarity index 92%
rename from erpnext/docs/user/guides/customize-erpnext/index.txt
rename to erpnext/docs/user/manual/en/customize-erpnext/index.txt
index a225d445fe..1113395303 100644
--- a/erpnext/docs/user/guides/customize-erpnext/index.txt
+++ b/erpnext/docs/user/manual/en/customize-erpnext/index.txt
@@ -5,3 +5,4 @@ customize-form
document-title
hiding-modules-and-features
print-format
+articles
diff --git a/erpnext/docs/user/guides/customize-erpnext/print-format.md b/erpnext/docs/user/manual/en/customize-erpnext/print-format.md
similarity index 95%
rename from erpnext/docs/user/guides/customize-erpnext/print-format.md
rename to erpnext/docs/user/manual/en/customize-erpnext/print-format.md
index c373d065de..e3c945005c 100644
--- a/erpnext/docs/user/guides/customize-erpnext/print-format.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/print-format.md
@@ -18,7 +18,7 @@ To create your own versions, open an existing template from:
> Setup > Printing > Print Formats
-
+
Select the type of Print Format you want to edit and click on the “Copy”
button on the right column. A new Print Format will open up with “Is Standard”
@@ -45,7 +45,7 @@ To edit / update your print and PDF settings, go to:
> Setup > Printing and Branding > Print Settings
-
+
#### Example
diff --git a/erpnext/docs/user/guides/human-resources/appraisal.md b/erpnext/docs/user/manual/en/human-resources/appraisal.md
similarity index 75%
rename from erpnext/docs/user/guides/human-resources/appraisal.md
rename to erpnext/docs/user/manual/en/human-resources/appraisal.md
index 021d470c57..d3ec301311 100644
--- a/erpnext/docs/user/guides/human-resources/appraisal.md
+++ b/erpnext/docs/user/manual/en/human-resources/appraisal.md
@@ -6,13 +6,13 @@ giving appropriate weightage to each parameter.
#### Step 1: Select an Appraisal Template
-
+
After you select the template, the remaining form appears.
#### Step 2: Enter Employee Details
-
+
Once the Appraisal Template is completed, you can create Appraisal records for
each period where you track performance. You can give points out of 5 for each
diff --git a/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md b/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md
new file mode 100644
index 0000000000..fddab31e1a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md
@@ -0,0 +1,55 @@
+
+
+
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 ]({{url_prefix}}/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}
diff --git a/erpnext/docs/user/guides/human-resources/employee.md b/erpnext/docs/user/manual/en/human-resources/employee.md
similarity index 56%
rename from erpnext/docs/user/guides/human-resources/employee.md
rename to erpnext/docs/user/manual/en/human-resources/employee.md
index 331fe47396..fd14aa90d3 100644
--- a/erpnext/docs/user/guides/human-resources/employee.md
+++ b/erpnext/docs/user/manual/en/human-resources/employee.md
@@ -4,6 +4,6 @@ To create new Employee go to:
> Human Resources > Employee > New
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/expense-claim.md b/erpnext/docs/user/manual/en/human-resources/expense-claim.md
similarity index 87%
rename from erpnext/docs/user/guides/human-resources/expense-claim.md
rename to erpnext/docs/user/manual/en/human-resources/expense-claim.md
index 0a86f9af87..187bf494ef 100644
--- a/erpnext/docs/user/guides/human-resources/expense-claim.md
+++ b/erpnext/docs/user/manual/en/human-resources/expense-claim.md
@@ -6,7 +6,7 @@ To make a new Expense Claim, go to:
> HR > Expense Claim > New Expense Claim
-
+
Set the Employee ID, date and the list of expenses that are to be claimed and
“Submit” the record.
@@ -34,6 +34,6 @@ because the amount will then be taxable to the Employee.
* To Link Expense Claim with Task or Project specify the Task or the Project while making an Expense Claim
-
{next}
diff --git a/erpnext/docs/user/guides/human-resources/holiday-list.md b/erpnext/docs/user/manual/en/human-resources/holiday-list.md
similarity index 91%
rename from erpnext/docs/user/guides/human-resources/holiday-list.md
rename to erpnext/docs/user/manual/en/human-resources/holiday-list.md
index 9676785c91..1a98ad3660 100644
--- a/erpnext/docs/user/guides/human-resources/holiday-list.md
+++ b/erpnext/docs/user/manual/en/human-resources/holiday-list.md
@@ -17,7 +17,7 @@ on Holiday List.
#### Figure 1: Holiday List
-
+
@@ -40,7 +40,7 @@ Mention the holiday reason in the description and select the date from the
#### Figure 2: Adding new holidays to the list
-
+
diff --git a/erpnext/docs/user/guides/human-resources/human-resource-setup.md b/erpnext/docs/user/manual/en/human-resources/human-resource-setup.md
similarity index 100%
rename from erpnext/docs/user/guides/human-resources/human-resource-setup.md
rename to erpnext/docs/user/manual/en/human-resources/human-resource-setup.md
diff --git a/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md b/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md
new file mode 100644
index 0000000000..664c07de0f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/human-resources-reports.md
@@ -0,0 +1,34 @@
+Human Resources Reports
+
+### Employee Leave Balance
+
+Employee Leave Balance Report shows employees and their respective balance leaves under various leave types. Report is generated as per the number of allowed leaves.
+
+
+
+### Employee Birthday
+
+Employee Birthday Report shows Birthdays of your employees.
+
+
+
+### Employee Information
+
+Employee Information Report shows Report View of important information recorded in Employee master.
+
+
+
+### Monthly Salary Register
+
+Monthly Salary Register shows net pay and its components of employee(s) at a glance.
+
+
+
+
+### Monthly Attendance Sheet
+
+Monthly Attendance Sheet shows monthly attendance of selected employee at a glance.
+
+
+
+{next}
diff --git a/erpnext/docs/user/guides/human-resources/index.md b/erpnext/docs/user/manual/en/human-resources/index.md
similarity index 100%
rename from erpnext/docs/user/guides/human-resources/index.md
rename to erpnext/docs/user/manual/en/human-resources/index.md
diff --git a/erpnext/docs/user/guides/human-resources/index.txt b/erpnext/docs/user/manual/en/human-resources/index.txt
similarity index 78%
rename from erpnext/docs/user/guides/human-resources/index.txt
rename to erpnext/docs/user/manual/en/human-resources/index.txt
index eba8accea7..caa3292951 100644
--- a/erpnext/docs/user/guides/human-resources/index.txt
+++ b/erpnext/docs/user/manual/en/human-resources/index.txt
@@ -10,3 +10,6 @@ offer-letter
tools
human-resources-reports
setup
+holiday-list
+human-resource-setup
+articles
diff --git a/erpnext/docs/user/guides/human-resources/job-applicant.md b/erpnext/docs/user/manual/en/human-resources/job-applicant.md
similarity index 65%
rename from erpnext/docs/user/guides/human-resources/job-applicant.md
rename to erpnext/docs/user/manual/en/human-resources/job-applicant.md
index 3fafa95f00..75e6a857a0 100644
--- a/erpnext/docs/user/guides/human-resources/job-applicant.md
+++ b/erpnext/docs/user/manual/en/human-resources/job-applicant.md
@@ -1,10 +1,10 @@
-You can mantain a list of People who have applied for a [Job Opening]({{url_prefix}}/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
> Human Resource > Job Applicant > New
-
+
### Linking with an Email Account
@@ -20,6 +20,6 @@ system shall create a New Job Applicant against each email received on the mailb
* In 'Append To' select 'Job Applicant'
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/job-opening.md b/erpnext/docs/user/manual/en/human-resources/job-opening.md
similarity index 59%
rename from erpnext/docs/user/guides/human-resources/job-opening.md
rename to erpnext/docs/user/manual/en/human-resources/job-opening.md
index bfe914c364..7e4f0c313d 100644
--- a/erpnext/docs/user/guides/human-resources/job-opening.md
+++ b/erpnext/docs/user/manual/en/human-resources/job-opening.md
@@ -4,7 +4,7 @@ To create a new Job Opening go to
> Human Resource > Job Opening > New
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/leave-application.md b/erpnext/docs/user/manual/en/human-resources/leave-application.md
similarity index 68%
rename from erpnext/docs/user/guides/human-resources/leave-application.md
rename to erpnext/docs/user/manual/en/human-resources/leave-application.md
index ecc4677c71..59c963feb3 100644
--- a/erpnext/docs/user/guides/human-resources/leave-application.md
+++ b/erpnext/docs/user/manual/en/human-resources/leave-application.md
@@ -5,7 +5,7 @@ Type and the period for which the leave is taken.
> Human Resources > Leave Application > New Leave Application
-
###Setting Leave Approver
@@ -13,12 +13,12 @@ Type and the period for which the leave is taken.
* You need to mention a list of Leave Approvers against an Employee in the Employee Master.
-
+
> 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]({{url_prefix}}/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]({{url_prefix}}/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}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/offer-letter.md b/erpnext/docs/user/manual/en/human-resources/offer-letter.md
similarity index 61%
rename from erpnext/docs/user/guides/human-resources/offer-letter.md
rename to erpnext/docs/user/manual/en/human-resources/offer-letter.md
index 16176f1a0d..9e8c96622d 100644
--- a/erpnext/docs/user/guides/human-resources/offer-letter.md
+++ b/erpnext/docs/user/manual/en/human-resources/offer-letter.md
@@ -5,12 +5,12 @@ In ERPNext you can make a record of the Offer Letters that you can given to cand
> Human Resource > Offer Letter > New
-
+
-> Note: An offer letter can be made only against a [Job Applicant]({{url_prefix}}/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.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/salary-and-payroll.md b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
similarity index 93%
rename from erpnext/docs/user/guides/human-resources/salary-and-payroll.md
rename to erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
index 64c8f3ccde..05e01e1bea 100644
--- a/erpnext/docs/user/guides/human-resources/salary-and-payroll.md
+++ b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
@@ -44,7 +44,7 @@ To create a new Salary Structure go to:
#### Figure 1:Salary Structure
-
+
### In the Salary Structure,
@@ -76,7 +76,7 @@ Slip.
#### Figure 2: Salary Slip
-
+
You can also create salary slip for multiple employees using Process Payroll:
@@ -84,7 +84,7 @@ You can also create salary slip for multiple employees using Process Payroll:
#### Figure 3: Process Payroll
-
+
In Process Payroll,
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/branch.md b/erpnext/docs/user/manual/en/human-resources/setup/branch.md
new file mode 100644
index 0000000000..8116ca4c11
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/branch.md
@@ -0,0 +1,5 @@
+Branches of your organization
+
+
+
+{next}
diff --git a/erpnext/docs/user/guides/human-resources/setup/deduction-type.md b/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md
similarity index 61%
rename from erpnext/docs/user/guides/human-resources/setup/deduction-type.md
rename to erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md
index dde17a303f..4371b624ed 100644
--- a/erpnext/docs/user/guides/human-resources/setup/deduction-type.md
+++ b/erpnext/docs/user/manual/en/human-resources/setup/deduction-type.md
@@ -4,7 +4,7 @@ To create a new Deduction Type
> Human Resource > Setup > Deduction Type > New
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/department.md b/erpnext/docs/user/manual/en/human-resources/setup/department.md
new file mode 100644
index 0000000000..1b088b158f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/department.md
@@ -0,0 +1,5 @@
+Departments in your organization
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/designation.md b/erpnext/docs/user/manual/en/human-resources/setup/designation.md
new file mode 100644
index 0000000000..1de779e7b3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/designation.md
@@ -0,0 +1,5 @@
+Designations in your organization
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/setup/earning-type.md b/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md
similarity index 59%
rename from erpnext/docs/user/guides/human-resources/setup/earning-type.md
rename to erpnext/docs/user/manual/en/human-resources/setup/earning-type.md
index ab97634e4d..e5c35c6e1c 100644
--- a/erpnext/docs/user/guides/human-resources/setup/earning-type.md
+++ b/erpnext/docs/user/manual/en/human-resources/setup/earning-type.md
@@ -4,7 +4,7 @@ To create a new Earning Type
> Human Resource > Setup > Earning Type > New
-
+
{next}
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md b/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md
new file mode 100644
index 0000000000..37d0fd3973
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/employment-type.md
@@ -0,0 +1,5 @@
+Various employment contracts you have with your employees.
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/holiday-list.md b/erpnext/docs/user/manual/en/human-resources/setup/holiday-list.md
new file mode 100644
index 0000000000..31094f72d0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/holiday-list.md
@@ -0,0 +1,5 @@
+You can specify the Holidays for a particular year using Holiday List.
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md b/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md
new file mode 100644
index 0000000000..1741df4a5f
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/hr-settings.md
@@ -0,0 +1,7 @@
+# HR Settings
+
+GLobal settings for HR related documents
+
+
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/index.md b/erpnext/docs/user/manual/en/human-resources/setup/index.md
new file mode 100644
index 0000000000..0dff60b400
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/index.md
@@ -0,0 +1 @@
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/setup/index.txt b/erpnext/docs/user/manual/en/human-resources/setup/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/human-resources/setup/index.txt
rename to erpnext/docs/user/manual/en/human-resources/setup/index.txt
diff --git a/erpnext/docs/user/manual/en/human-resources/setup/leave-allocation.md b/erpnext/docs/user/manual/en/human-resources/setup/leave-allocation.md
new file mode 100644
index 0000000000..0e8ee945b3
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/setup/leave-allocation.md
@@ -0,0 +1,7 @@
+Helps you allocate Leaves to a particular Employee
+
+
+
+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}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/setup/leave-type.md b/erpnext/docs/user/manual/en/human-resources/setup/leave-type.md
similarity index 74%
rename from erpnext/docs/user/guides/human-resources/setup/leave-type.md
rename to erpnext/docs/user/manual/en/human-resources/setup/leave-type.md
index 78b3ab660a..d52cb2e8a2 100644
--- a/erpnext/docs/user/guides/human-resources/setup/leave-type.md
+++ b/erpnext/docs/user/manual/en/human-resources/setup/leave-type.md
@@ -1,6 +1,6 @@
Specify the Type of Leave that can be allocated against an Employee
-
+
* 'Max Days Leave Allowed' specifies the maximum number of days this type of leave can be taken at a strech.
* 'Is LWP' specifies if the Leave is without Pay.
diff --git a/erpnext/docs/user/manual/en/human-resources/tools/index.md b/erpnext/docs/user/manual/en/human-resources/tools/index.md
new file mode 100644
index 0000000000..0dff60b400
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/tools/index.md
@@ -0,0 +1 @@
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/human-resources/tools/index.txt b/erpnext/docs/user/manual/en/human-resources/tools/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/human-resources/tools/index.txt
rename to erpnext/docs/user/manual/en/human-resources/tools/index.txt
diff --git a/erpnext/docs/user/manual/en/human-resources/tools/leave-allocation-tool.md b/erpnext/docs/user/manual/en/human-resources/tools/leave-allocation-tool.md
new file mode 100644
index 0000000000..56e8d3dee0
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/tools/leave-allocation-tool.md
@@ -0,0 +1,5 @@
+Leave Allocation tool helps you allocated a specific number of leaves for your employees.
+
+
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/index.md b/erpnext/docs/user/manual/en/index.md
new file mode 100644
index 0000000000..21842733a4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/index.md
@@ -0,0 +1,5 @@
+# User Manual (English)
+
+### Contents:
+
+{index}
diff --git a/erpnext/docs/user/guides/index.txt b/erpnext/docs/user/manual/en/index.txt
similarity index 77%
rename from erpnext/docs/user/guides/index.txt
rename to erpnext/docs/user/manual/en/index.txt
index e9e30ed89c..97a8cd8959 100644
--- a/erpnext/docs/user/guides/index.txt
+++ b/erpnext/docs/user/manual/en/index.txt
@@ -11,5 +11,5 @@ support
human-resources
customer-portal
website
-collaboration-tools
-customize-erpnext
\ No newline at end of file
+using-erpnext
+customize-erpnext
diff --git a/erpnext/docs/user/guides/introduction/concepts-and-terms.md b/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
similarity index 100%
rename from erpnext/docs/user/guides/introduction/concepts-and-terms.md
rename to erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
diff --git a/erpnext/docs/user/guides/introduction/do-i-need-an-erp.md b/erpnext/docs/user/manual/en/introduction/do-i-need-an-erp.md
similarity index 100%
rename from erpnext/docs/user/guides/introduction/do-i-need-an-erp.md
rename to erpnext/docs/user/manual/en/introduction/do-i-need-an-erp.md
diff --git a/erpnext/docs/user/guides/introduction/getting-started-with-erpnext.md b/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md
similarity index 100%
rename from erpnext/docs/user/guides/introduction/getting-started-with-erpnext.md
rename to erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md
diff --git a/erpnext/docs/user/guides/introduction/implementation-strategy.md b/erpnext/docs/user/manual/en/introduction/implementation-strategy.md
similarity index 100%
rename from erpnext/docs/user/guides/introduction/implementation-strategy.md
rename to erpnext/docs/user/manual/en/introduction/implementation-strategy.md
diff --git a/erpnext/docs/user/guides/introduction/index.md b/erpnext/docs/user/manual/en/introduction/index.md
similarity index 100%
rename from erpnext/docs/user/guides/introduction/index.md
rename to erpnext/docs/user/manual/en/introduction/index.md
diff --git a/erpnext/docs/user/guides/introduction/index.txt b/erpnext/docs/user/manual/en/introduction/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/introduction/index.txt
rename to erpnext/docs/user/manual/en/introduction/index.txt
diff --git a/erpnext/docs/user/guides/introduction/key-workflows.md b/erpnext/docs/user/manual/en/introduction/key-workflows.md
similarity index 69%
rename from erpnext/docs/user/guides/introduction/key-workflows.md
rename to erpnext/docs/user/manual/en/introduction/key-workflows.md
index f83c8a6108..8c8d6ec055 100644
--- a/erpnext/docs/user/guides/introduction/key-workflows.md
+++ b/erpnext/docs/user/manual/en/introduction/key-workflows.md
@@ -3,10 +3,10 @@
This diagram covers how ERPNext tracks your company information across key
functions. This diagram does not cover all the features of ERPNext.
-
+
-[Full Resolution]({{url_prefix}}/assets/old_images/erpnext/overview.png)
+[Full Resolution]({{docs_base_url}}/assets/old_images/erpnext/overview.png)
_Note: Not all of the steps are mandatory. ERPNext allows you to freely skip
steps if you want to simplify the process._
diff --git a/erpnext/docs/user/guides/introduction/open-source.md b/erpnext/docs/user/manual/en/introduction/open-source.md
similarity index 100%
rename from erpnext/docs/user/guides/introduction/open-source.md
rename to erpnext/docs/user/manual/en/introduction/open-source.md
diff --git a/erpnext/docs/user/guides/introduction/the-champion.md b/erpnext/docs/user/manual/en/introduction/the-champion.md
similarity index 93%
rename from erpnext/docs/user/guides/introduction/the-champion.md
rename to erpnext/docs/user/manual/en/introduction/the-champion.md
index 596ff4b003..21a238343f 100644
--- a/erpnext/docs/user/guides/introduction/the-champion.md
+++ b/erpnext/docs/user/manual/en/introduction/the-champion.md
@@ -2,7 +2,7 @@
+
We have seen dozens of ERP implementations over the past few years and we
realize that successful implementation is a lot about intangibles and
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/index.md b/erpnext/docs/user/manual/en/manufacturing/articles/index.md
new file mode 100644
index 0000000000..0dff60b400
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/index.md
@@ -0,0 +1 @@
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/index.txt b/erpnext/docs/user/manual/en/manufacturing/articles/index.txt
new file mode 100644
index 0000000000..59f35039b4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/index.txt
@@ -0,0 +1,4 @@
+nested-bom-structure
+partial-production-entry
+production-planning-subassembly
+valuation-based-on-field-in-bom
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md b/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md
new file mode 100644
index 0000000000..266ae12bee
--- /dev/null
+++ b/erpnext/docs/user/manual/en/manufacturing/articles/nested-bom-structure.md
@@ -0,0 +1,30 @@
+
+
+
+
* To add Operations select 'With Operation'. The Operations table shall appear.
-
+
* Select the Item for which you want to make the BOM.
* Add the operations that you have to go through to make that particular Item in the “Operations” table. For each operation, you will be asked to enter a Workstation. You must create new Workstations as and when necessary.
@@ -25,17 +25,17 @@ To make a new BOM:
* Add the list of Items you require for each operation, with its quantity. This Item could be a purchased Item or a sub-assembly with its own BOM. If the row Item is a manufactured Item and has multiple BOMs, select the appropriate BOM. You can also define if a part of the Item goes into scrap.
-
+
* This cost can be updated on by using the 'Update Cost' button.
-
+
### Materials Required(exploded)
This table lists down all the Material required for the Item to be Manufactured.
It also fetches sub-assemblies along with the quantity.
-
+
{next}
diff --git a/erpnext/docs/user/guides/manufacturing/index.md b/erpnext/docs/user/manual/en/manufacturing/index.md
similarity index 100%
rename from erpnext/docs/user/guides/manufacturing/index.md
rename to erpnext/docs/user/manual/en/manufacturing/index.md
diff --git a/erpnext/docs/user/guides/manufacturing/index.txt b/erpnext/docs/user/manual/en/manufacturing/index.txt
similarity index 85%
rename from erpnext/docs/user/guides/manufacturing/index.txt
rename to erpnext/docs/user/manual/en/manufacturing/index.txt
index 1fe03a6260..3b932a5292 100644
--- a/erpnext/docs/user/guides/manufacturing/index.txt
+++ b/erpnext/docs/user/manual/en/manufacturing/index.txt
@@ -5,4 +5,5 @@ workstation
operation
subcontracting
tools
-setup
\ No newline at end of file
+setup
+articles
diff --git a/erpnext/docs/user/guides/manufacturing/introduction.md b/erpnext/docs/user/manual/en/manufacturing/introduction.md
similarity index 92%
rename from erpnext/docs/user/guides/manufacturing/introduction.md
rename to erpnext/docs/user/manual/en/manufacturing/introduction.md
index 2d60e6780b..f9d827c6d1 100644
--- a/erpnext/docs/user/guides/manufacturing/introduction.md
+++ b/erpnext/docs/user/manual/en/manufacturing/introduction.md
@@ -1,4 +1,4 @@
-
+
### Types of Production Planning
diff --git a/erpnext/docs/user/guides/manufacturing/operation.md b/erpnext/docs/user/manual/en/manufacturing/operation.md
similarity index 67%
rename from erpnext/docs/user/guides/manufacturing/operation.md
rename to erpnext/docs/user/manual/en/manufacturing/operation.md
index 6c77089438..b21304e432 100644
--- a/erpnext/docs/user/guides/manufacturing/operation.md
+++ b/erpnext/docs/user/manual/en/manufacturing/operation.md
@@ -6,6 +6,6 @@ You can also create a Operation by:
> Manufacturing > Documents > Operation > New
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/manufacturing/production-order.md b/erpnext/docs/user/manual/en/manufacturing/production-order.md
similarity index 79%
rename from erpnext/docs/user/guides/manufacturing/production-order.md
rename to erpnext/docs/user/manual/en/manufacturing/production-order.md
index c9729be6f0..5ded4f931f 100644
--- a/erpnext/docs/user/guides/manufacturing/production-order.md
+++ b/erpnext/docs/user/manual/en/manufacturing/production-order.md
@@ -10,7 +10,7 @@ by:
> Manufacturing > Documents > Production Order > New
-
+
### Creating Production Orders
@@ -26,11 +26,11 @@ by:
* By default the system fetchs workstation and duration for Production Order Operations from the selected BOM.
-
+
* If you wish to reassign the wrokstation for a particular opeeration in the Production Order, you can do so before submitting the Production Order.
-
+
* Select the respective operation, and change its workstation.
* You can also change the Operating Time for that operation
@@ -47,28 +47,28 @@ by:
* Click on 'Transfer Materials for Manufacturing'.
-
+
* Mention the quantity of materials to be transfered.
-
+
* Submit the Stock Entry
-
+
* Material Transfered for Manufacturing will be updated in the Production Order based on the Stock Entry.
-
+
### Making Time Logs
-* Progress in the Production Order can be tracked using [Time Log]({{url_prefix}}/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.
-
+
###Updating Finished Goods
@@ -76,11 +76,11 @@ by:
* This will create a Stock Entry that will deduct all the sub-Items from the WIP Warehouse and add them to the Finished Goods Warehouse.
* Click on 'Update Finished Goods'.
-
+
* Mention the quantity of materials to be transfered.
-
+
> Tip : You can also partially complete a Production Order by updating the Finished Goods stock creating a Stock Entry.
@@ -95,7 +95,7 @@ by:
4. Update Finished Goods: This will create a Stock Entry that will deduct all the sub-Items from the WIP Warehouse and add them to the Finished Goods Warehouse.
5. To check all Time Logs made against the Production Order click on 'Show Time Logs'
-
+
* You can Also re-start a stopped Production Order.
diff --git a/erpnext/docs/user/guides/manufacturing/setup/index.md b/erpnext/docs/user/manual/en/manufacturing/setup/index.md
similarity index 100%
rename from erpnext/docs/user/guides/manufacturing/setup/index.md
rename to erpnext/docs/user/manual/en/manufacturing/setup/index.md
diff --git a/erpnext/docs/user/guides/manufacturing/setup/index.txt b/erpnext/docs/user/manual/en/manufacturing/setup/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/manufacturing/setup/index.txt
rename to erpnext/docs/user/manual/en/manufacturing/setup/index.txt
diff --git a/erpnext/docs/user/guides/manufacturing/setup/manufacturing-settings.md b/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
similarity index 79%
rename from erpnext/docs/user/guides/manufacturing/setup/manufacturing-settings.md
rename to erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
index eb0a08c5ff..dc59689f47 100644
--- a/erpnext/docs/user/guides/manufacturing/setup/manufacturing-settings.md
+++ b/erpnext/docs/user/manual/en/manufacturing/setup/manufacturing-settings.md
@@ -2,7 +2,7 @@
> Manufacturing > Production Order > Setup > Manufacturing Settings
-
+
* Allow Overtime - Specify if workstations are to allow overtime.(schedule operations outside working hours)
diff --git a/erpnext/docs/user/guides/manufacturing/subcontracting.md b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md
similarity index 96%
rename from erpnext/docs/user/guides/manufacturing/subcontracting.md
rename to erpnext/docs/user/manual/en/manufacturing/subcontracting.md
index 832e8a2334..6f2b86b40f 100644
--- a/erpnext/docs/user/guides/manufacturing/subcontracting.md
+++ b/erpnext/docs/user/manual/en/manufacturing/subcontracting.md
@@ -15,7 +15,7 @@ sub-contracting feature of ERPNext.
2. Create a Warehouse for your Supplier so that you can keep track of Items supplied. (you may supply a months worth of Items in one go).
3. For the processed Item, in the Item master, set “Is Sub Contracted Item” to “Yes”.
-
+
diff --git a/erpnext/docs/user/guides/manufacturing/tools/bom-replace-tool.md b/erpnext/docs/user/manual/en/manufacturing/tools/bom-replace-tool.md
similarity index 91%
rename from erpnext/docs/user/guides/manufacturing/tools/bom-replace-tool.md
rename to erpnext/docs/user/manual/en/manufacturing/tools/bom-replace-tool.md
index 8722d2645c..794d982c72 100644
--- a/erpnext/docs/user/guides/manufacturing/tools/bom-replace-tool.md
+++ b/erpnext/docs/user/manual/en/manufacturing/tools/bom-replace-tool.md
@@ -33,7 +33,7 @@ If we have more items to be added , or existing items to be edited in the BOM of
To update new BOM updated in the BOM of finished item, where CPU is selected as raw-material, you can use BOM Replace tool.
-
+
In this tool, you should select Current BOM, and New BOM. On clicking Replace button, current BOM of CPU will be replaced with New BOM in the BOM of finished Item (Computer).
diff --git a/erpnext/docs/user/guides/manufacturing/tools/index.md b/erpnext/docs/user/manual/en/manufacturing/tools/index.md
similarity index 100%
rename from erpnext/docs/user/guides/manufacturing/tools/index.md
rename to erpnext/docs/user/manual/en/manufacturing/tools/index.md
diff --git a/erpnext/docs/user/guides/manufacturing/tools/index.txt b/erpnext/docs/user/manual/en/manufacturing/tools/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/manufacturing/tools/index.txt
rename to erpnext/docs/user/manual/en/manufacturing/tools/index.txt
diff --git a/erpnext/docs/user/guides/manufacturing/tools/production-planning-tool.md b/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
similarity index 69%
rename from erpnext/docs/user/guides/manufacturing/tools/production-planning-tool.md
rename to erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
index b966e7a8c9..61ec4c76d9 100644
--- a/erpnext/docs/user/guides/manufacturing/tools/production-planning-tool.md
+++ b/erpnext/docs/user/manual/en/manufacturing/tools/production-planning-tool.md
@@ -11,7 +11,7 @@ To use the Production Planning Tool, go to:
> Manufacturing > Tools > Production Planning Tool
-
+
@@ -20,7 +20,7 @@ To use the Production Planning Tool, go to:
* Select sales orders for MRP using filters (Time, Item, and Customer)
* Click on Get Sales Order to generate a list.
-
+
@@ -28,11 +28,11 @@ To use the Production Planning Tool, go to:
You can add/remove or change quantity of these Items.
-
+
#### Step 3: Create Production Orders
-
+
@@ -40,7 +40,7 @@ You can add/remove or change quantity of these Items.
Create Material Request for Items with projected shortfall.
-
+
diff --git a/erpnext/docs/user/guides/manufacturing/workstation.md b/erpnext/docs/user/manual/en/manufacturing/workstation.md
similarity index 76%
rename from erpnext/docs/user/guides/manufacturing/workstation.md
rename to erpnext/docs/user/manual/en/manufacturing/workstation.md
index abc8933f41..0ff2a6bba7 100644
--- a/erpnext/docs/user/guides/manufacturing/workstation.md
+++ b/erpnext/docs/user/manual/en/manufacturing/workstation.md
@@ -8,12 +8,12 @@ You can also create a Workstation by:
> Manufacturing > Documents > Workstation > New
-
+
In workstation specify the workstation working hours under the 'working hour' section.
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]({{url_prefix}}/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}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/projects/activity-cost.md b/erpnext/docs/user/manual/en/projects/activity-cost.md
similarity index 65%
rename from erpnext/docs/user/guides/projects/activity-cost.md
rename to erpnext/docs/user/manual/en/projects/activity-cost.md
index 3ad95fc14b..d4e2106a88 100644
--- a/erpnext/docs/user/guides/projects/activity-cost.md
+++ b/erpnext/docs/user/manual/en/projects/activity-cost.md
@@ -1,4 +1,4 @@
Activity Cost records the per-hour billing rate and costing rate of an Employee against an Activity Type.
This rate is pulled by the system while making Time Logs. It is used for Project Costing.
-
+
diff --git a/erpnext/docs/user/guides/projects/activity-type.md b/erpnext/docs/user/manual/en/projects/activity-type.md
similarity index 68%
rename from erpnext/docs/user/guides/projects/activity-type.md
rename to erpnext/docs/user/manual/en/projects/activity-type.md
index a59885378f..7f37f51e54 100644
--- a/erpnext/docs/user/guides/projects/activity-type.md
+++ b/erpnext/docs/user/manual/en/projects/activity-type.md
@@ -1,6 +1,6 @@
Activity Type makes a list of the different types of activities against which a Time Log can be made.
-
+
By default the following Activity Types are created.
diff --git a/erpnext/docs/user/manual/en/projects/articles/index.md b/erpnext/docs/user/manual/en/projects/articles/index.md
new file mode 100644
index 0000000000..0dff60b400
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/articles/index.md
@@ -0,0 +1 @@
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/projects/articles/index.txt b/erpnext/docs/user/manual/en/projects/articles/index.txt
new file mode 100644
index 0000000000..56c193c277
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/articles/index.txt
@@ -0,0 +1 @@
+project-costing
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/projects/articles/project-costing.md b/erpnext/docs/user/manual/en/projects/articles/project-costing.md
new file mode 100644
index 0000000000..e5c59400f1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/projects/articles/project-costing.md
@@ -0,0 +1,39 @@
+
+
+### 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/manual/en/projects/tasks.html)
+
+
+
+* To view Task made against a Project click on 'Tasks'
+
+
+
+
+
+* You can also view the Tasks from the Project document itself
+
+
+
+### Managing time
+
+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.
+
+* To view Time Log made against a Project click on 'Time Logs'
+
+
+
+
+
+* You can also create a Time Log directlly and link it to the Project.
+
+
+
+### Managing expenses
+
+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'
+
+
+
+* You can also create a Expense Claims directlly and link it to the Project.
+
+
+
+### Cost Center
+
+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.
+
+
+
+###Project Costing
+
+The Project Costing section helps you track the time and expenses incurred against the project.
+
+
+
+* The Costing Section is updated based on Time Logs made.
+
+* Gross Margin is the difference between Total Costing Amount and Total Billing Amount
+
+###Billing
+
+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.
+
+
+
+###Gantt Chart
+
+A Gantt Chart illustrates a project schedule.
+ERPNext gives you a illustrated view of tasks scheduled against that project in Gantt Chart View.
+
+* To view gantt chart against a project, go to that project and click on 'Gantt Chart'
+
+
+
+
+
+{next}
diff --git a/erpnext/docs/user/guides/projects/tasks.md b/erpnext/docs/user/manual/en/projects/tasks.md
similarity index 54%
rename from erpnext/docs/user/guides/projects/tasks.md
rename to erpnext/docs/user/manual/en/projects/tasks.md
index 6ee97a0e78..f04406fbf0 100644
--- a/erpnext/docs/user/guides/projects/tasks.md
+++ b/erpnext/docs/user/manual/en/projects/tasks.md
@@ -1,13 +1,13 @@
Project is divided into Tasks.
In ERPNext, you can also create a Task independently.
-
+
### Status of the Task
A Task can have either of the following status - Open, Working, Pending Review, Closed, Cancelled.
-
+
* By default each new Task created shall have the status set to 'Open'.
@@ -17,7 +17,7 @@ A Task can have either of the following status - Open, Working, Pending Review,
You can specify a list of dependent task under the 'Depends On' section.
-
+
* You cannot close the parent Task until all 'Dependant Task' are closed.
@@ -25,35 +25,35 @@ You can specify a list of dependent task under the 'Depends On' section.
### Managing Time
-ERPNext uses [Time Log]({{url_prefix}}/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.
* To view Time Log made against a Task click on 'Time Logs'
-
+
-
+
* You can also create a Time Log directlly and link it to the Task.
-
+
### Managing Expenses
-You can book [Expense Claim]({{url_prefix}}/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'
-
+
* You can also create a Expense Claims directlly and link it to the Task.
-
+
* Total amount of Expense Claims booked against a task is shown under 'Total Expense Claim' in the Task Costing Section
-
+
{next}
diff --git a/erpnext/docs/user/guides/projects/time-log-batch.md b/erpnext/docs/user/manual/en/projects/time-log-batch.md
similarity index 66%
rename from erpnext/docs/user/guides/projects/time-log-batch.md
rename to erpnext/docs/user/manual/en/projects/time-log-batch.md
index e16383bb94..d48633ad07 100644
--- a/erpnext/docs/user/guides/projects/time-log-batch.md
+++ b/erpnext/docs/user/manual/en/projects/time-log-batch.md
@@ -6,17 +6,17 @@ OR
Just open your Time Log list and check the Items to you want to add to the Time Log. Then click on "Make Time Log Batch" button and these Time Logs will be selected.
-
+
###Making Sales Invoice
* After submitting the Time Log Batch, "Make Invoice" button shall appear.
-
+
* Click on that button to raise a Sales Invoice against the Time Log Batch.
-
+
* When you "Submit" the Sales Invoice, the Sales Invoice number will get updated in the Time Logs and Time Log Batch and their status will change to "Billed".
diff --git a/erpnext/docs/user/guides/projects/time-log.md b/erpnext/docs/user/manual/en/projects/time-log.md
similarity index 62%
rename from erpnext/docs/user/guides/projects/time-log.md
rename to erpnext/docs/user/manual/en/projects/time-log.md
index c1802089aa..5d4c4a3f12 100644
--- a/erpnext/docs/user/guides/projects/time-log.md
+++ b/erpnext/docs/user/manual/en/projects/time-log.md
@@ -7,7 +7,7 @@ They can be used to track the following
* Project
* Internal References
-
+
###Creating Time Logs
@@ -18,15 +18,15 @@ They can be used to track the following
To create Time Logs via Calender, go to Time Log and select Calendar.
-
+
* To create a Time Log for multiple days, click and drag the cursor across days.
-
+
* You can also create Time Logs from 'week' and 'day' view of the calender.
-
+
* Time Logs for Manufacturing processes needs to be created from the Production Order.
* To create more Time Logs against Operations select the respective operation and click on the 'Make Time Log' button.
@@ -35,15 +35,15 @@ 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]({{url_prefix}}/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.
* If 'Billable' is not selected, the system shall display the 'Billing Amount' as 0.
-
+
-* After submitting the Time Log, you need to create [Time Log batch]({{url_prefix}}/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}
diff --git a/erpnext/docs/user/manual/en/selling/articles/applying-discount.md b/erpnext/docs/user/manual/en/selling/articles/applying-discount.md
new file mode 100644
index 0000000000..9dfc730cf2
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/applying-discount.md
@@ -0,0 +1,31 @@
+
+
#### Setup on Sales Order
If Drop Shipping has set on Item master, it will automatically set **Supplier delivers to Customer** and **Supplier** on Salse Order Item.
You can setup Drop Shipping, on Sales Order Item. Under **Drop Ship** section, set **Supplier delivers to Customer** and select **Supplier** agaist which Purchase Order will get created.
-
+
#### Create Purchase Order
After submitting a Sales Order, create Puchase Order.
+
From Sales Order, all items, having **Supplier delivers to Customer** checked or **Supplier**(matching with supplier selected on For Supplier popup) mentioned, will get mapped onto Purchase Order.
It will automatically set Customer, Customer Address and Contact Person.
After submitting Purchase Order, to update delivery status, use **Mark as Delivered** button on Purchase Order. It will update delivery percetage and delivered quantity on Sales Order.
-
+
**_Close_**, is a new feature introduced on **Purchase Order** and **Sales Order**, to close or to mark fulfillment.
-
+
###Drop Shipping Print Format
You can notify, Suppliers by sending a email after submitting Purchase Order by attaching Drop Shipping print format.
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md b/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md
new file mode 100644
index 0000000000..2fafa6826c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md
@@ -0,0 +1,28 @@
+
+
Or You can create a new Quotation and pull details from an Opportunity.
-
+
A Quotation contains details about:
@@ -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]({{url_prefix}}/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]({{url_prefix}}/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.
diff --git a/erpnext/docs/user/guides/selling/sales-order.md b/erpnext/docs/user/manual/en/selling/sales-order.md
similarity index 93%
rename from erpnext/docs/user/guides/selling/sales-order.md
rename to erpnext/docs/user/manual/en/selling/sales-order.md
index b1438eb34b..269473a5be 100644
--- a/erpnext/docs/user/guides/selling/sales-order.md
+++ b/erpnext/docs/user/manual/en/selling/sales-order.md
@@ -11,7 +11,7 @@ a Sales Order.
### Sales Order Flow-Chart
-
+
To create a new Sales Order go to:
@@ -21,11 +21,11 @@ To create a new Sales Order go to:
You can also create a Sales Order from a submitted Quotation.
-
+
Or you can create a new Sales Order and pull details from an Quotation.
-
+
Most of the information in your Sales Order is the same as the Quotation.
There are a few amongst other things that a Sales Order will ask you to
@@ -72,7 +72,7 @@ On updating the Sales Order, a Recurring ID will be generated which will be same
ERPNext will automatically create new Order and mail a notification to the email IDs you set in the 'Notification Email Address'field.
-
+
### Next Steps
diff --git a/erpnext/docs/user/guides/selling/setup/index.md b/erpnext/docs/user/manual/en/selling/setup/index.md
similarity index 100%
rename from erpnext/docs/user/guides/selling/setup/index.md
rename to erpnext/docs/user/manual/en/selling/setup/index.md
diff --git a/erpnext/docs/user/manual/en/selling/setup/index.txt b/erpnext/docs/user/manual/en/selling/setup/index.txt
new file mode 100644
index 0000000000..22a335b056
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/setup/index.txt
@@ -0,0 +1,6 @@
+selling-settings
+sales-partner
+shipping-rule
+product-bundle
+item-price
+sales-person-target-allocation
diff --git a/erpnext/docs/user/guides/selling/setup/item-price.md b/erpnext/docs/user/manual/en/selling/setup/item-price.md
similarity index 83%
rename from erpnext/docs/user/guides/selling/setup/item-price.md
rename to erpnext/docs/user/manual/en/selling/setup/item-price.md
index a235341cef..b877e8dd55 100644
--- a/erpnext/docs/user/guides/selling/setup/item-price.md
+++ b/erpnext/docs/user/manual/en/selling/setup/item-price.md
@@ -14,7 +14,7 @@ Step 1: Select Price List
You can create multiple Price List in ERPNext to track Selling and Buying Price List of an item separtely. Also if item's selling prices id changing based on territory, or due to other criteria, you can create multiple selling Price List for it.
-
+
On selection of Price List, its currency and for selling or buying property will be fetched as well.
@@ -24,13 +24,13 @@ Step 2: Select Item
Select item for which Item Price record is to be created. On selection of Item Code, Item Name and Description will be fetched as well.
-
+
Step 3: Enter Rate
Enter selling/buying rate of an item in Price List currency.
-
+
Step 4: Save Item Price
diff --git a/erpnext/docs/user/guides/selling/setup/product-bundle.md b/erpnext/docs/user/manual/en/selling/setup/product-bundle.md
similarity index 91%
rename from erpnext/docs/user/guides/selling/setup/product-bundle.md
rename to erpnext/docs/user/manual/en/selling/setup/product-bundle.md
index bb11b98051..fa7f948e68 100644
--- a/erpnext/docs/user/guides/selling/setup/product-bundle.md
+++ b/erpnext/docs/user/manual/en/selling/setup/product-bundle.md
@@ -13,7 +13,7 @@ To create new Product Bundle, Go to:
Selling > Setup > Product Bundle > New
-
+
###Select Parent Item
@@ -33,7 +33,7 @@ In Package Item section, you will list all the child items for which we maintain
When making Sales transactions like Sales Invoice, Sales Order and Delivery Note,
Parent Item will be selected in the main item table.
-
+
On selection on Parent Item in the main item table, its child items will be fetched in Packing List
table of the transaction. If child item is the serialized item, you will be able to specify its Serial Mo.
diff --git a/erpnext/docs/user/guides/selling/setup/sales-partner.md b/erpnext/docs/user/manual/en/selling/setup/sales-partner.md
similarity index 74%
rename from erpnext/docs/user/guides/selling/setup/sales-partner.md
rename to erpnext/docs/user/manual/en/selling/setup/sales-partner.md
index 8710972093..1174969af4 100644
--- a/erpnext/docs/user/guides/selling/setup/sales-partner.md
+++ b/erpnext/docs/user/manual/en/selling/setup/sales-partner.md
@@ -10,7 +10,7 @@ To create a sales partner go to:
Sales Partners are saved with Sales Partner name provided by user.
-
+
You can track their address and contact details and also allocate Sales Partner for each Item Group, based on Qty and Amount.
@@ -19,16 +19,16 @@ You can track their address and contact details and also allocate Sales Partner
To include the name of your Partner on your website, check the "Show in
Website" box. When click on "Show in Website", you will see field where you can attach logo of partner's company and enter brief and introduction of partner.
-
+
To see listing of partner, you should go to:
https://example.erpnext.com/partners
-
+
Following is the complete partners details published on the website.
-
+
{next}
diff --git a/erpnext/docs/user/guides/selling/setup/sales-person-target-allocation.md b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
similarity index 84%
rename from erpnext/docs/user/guides/selling/setup/sales-person-target-allocation.md
rename to erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
index 812e7aca04..134a9b42d1 100644
--- a/erpnext/docs/user/guides/selling/setup/sales-person-target-allocation.md
+++ b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
@@ -12,7 +12,7 @@ To allocate target, you should open specific Sales Person master.
In the Sales Person master, you will find table called Sales Person Target.
-
+
In this table, you should select Item Group, Fiscal Year, Target Qty and Amount.
@@ -22,7 +22,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 shoult setup Target 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).
-
+
####Report - Sales Person Target Variance Item Groupwise
@@ -32,7 +32,7 @@ To check this report, go to:
This report will provide you variance between target and actual performance of Sales Person. This report is based on Sales Order report.
-
+
As per the report, allocated target to Sales Person for the month of December was 5 qty. However, Sales Order was made for this employee and Item Group for only 3 qty. Hence, variance of 2 qty is shown in the report.
@@ -48,7 +48,7 @@ To allocate target to Sales Person based on Territory, you can should select spe
In the Territory master, you will find field to select Territory Manager. This field is linked to "Sales Person" master.
-
+
####2.2 Allocating Target
@@ -62,7 +62,7 @@ Using this master, you can divide target Qty or Amount across various months.
This report will provide you variance between target and actual performance of Sales in particular territory. This report is based on Sales Order report. Though Sales Person is defined in the Territory master, its details are not pulled in the report.
-
+
---
@@ -74,7 +74,7 @@ To create new Budget Distriibution master, go to:
`Accounts > Setup > Budget Distributon`
-
+
You can link target distribution while allocation targets in Sales Person as well as in Territory master.
diff --git a/erpnext/docs/user/guides/selling/setup/selling-settings.md b/erpnext/docs/user/manual/en/selling/setup/selling-settings.md
similarity index 96%
rename from erpnext/docs/user/guides/selling/setup/selling-settings.md
rename to erpnext/docs/user/manual/en/selling/setup/selling-settings.md
index 4bf67823dd..d5d71173f2 100644
--- a/erpnext/docs/user/guides/selling/setup/selling-settings.md
+++ b/erpnext/docs/user/manual/en/selling/setup/selling-settings.md
@@ -1,7 +1,7 @@
Selling Setting is where you can define propertiese which will be applied in your selling transactions.
Let's check into each property one by one.
-
+
####1. Customer Naming By
diff --git a/erpnext/docs/user/guides/selling/setup/shipping-rule.md b/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md
similarity index 63%
rename from erpnext/docs/user/guides/selling/setup/shipping-rule.md
rename to erpnext/docs/user/manual/en/selling/setup/shipping-rule.md
index 7fc24f1961..c4369cbf20 100644
--- a/erpnext/docs/user/guides/selling/setup/shipping-rule.md
+++ b/erpnext/docs/user/manual/en/selling/setup/shipping-rule.md
@@ -1,6 +1,6 @@
Using Shipping Rule you can define the cost for delivering the product to the customer.
You can define different shipping rules for the same item across different territories.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/change-password.md b/erpnext/docs/user/manual/en/setting-up/articles/change-password.md
new file mode 100644
index 0000000000..c65cc8bea9
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/change-password.md
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+#### Step 3: Enter new user ID and Press Rename Button.
+
+
+
+
+After successful renaming user can login to their ERPNext account with new ID.
+
+
+
+
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.html b/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.html
new file mode 100644
index 0000000000..1b7e4f7977
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.html
@@ -0,0 +1,74 @@
+
+
If Sales User tries submitting Sales Order of value higher than 10000, then he will get error message.
diff --git a/erpnext/docs/user/guides/setting-up/bar-code.md b/erpnext/docs/user/manual/en/setting-up/bar-code.md
similarity index 90%
rename from erpnext/docs/user/guides/setting-up/bar-code.md
rename to erpnext/docs/user/manual/en/setting-up/bar-code.md
index 0f54d9784c..2077842379 100644
--- a/erpnext/docs/user/guides/setting-up/bar-code.md
+++ b/erpnext/docs/user/manual/en/setting-up/bar-code.md
@@ -18,7 +18,7 @@ setup, check the box that says Item Barcode.
#### Figure 1: Check the box 'Item Barcode'
-
+
To start scanning with a bar-code, go to
@@ -39,7 +39,7 @@ Then go to Accounts and click on Sales Invoice. Check the box 'Is POS'
#### Figure 2: Check the box 'Is POS'
-
+
Go to Item and click on Add new row.
diff --git a/erpnext/docs/user/guides/setting-up/calculate-incentive-for-sales-team.md b/erpnext/docs/user/manual/en/setting-up/calculate-incentive-for-sales-team.md
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/calculate-incentive-for-sales-team.md
rename to erpnext/docs/user/manual/en/setting-up/calculate-incentive-for-sales-team.md
diff --git a/erpnext/docs/user/guides/setting-up/company-setup.md b/erpnext/docs/user/manual/en/setting-up/company-setup.md
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/company-setup.md
rename to erpnext/docs/user/manual/en/setting-up/company-setup.md
diff --git a/erpnext/docs/user/guides/setting-up/data/bulk-rename.md b/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md
similarity index 82%
rename from erpnext/docs/user/guides/setting-up/data/bulk-rename.md
rename to erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md
index 2aec08be35..499ee3276e 100644
--- a/erpnext/docs/user/guides/setting-up/data/bulk-rename.md
+++ b/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md
@@ -12,6 +12,6 @@ This tool will allow you to rename multiple records at the same time.
To rename multiple records, upload a **.csv** file with the old name in the first column and the new name in the second column and click on **Upload**.
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/data/data-import-tool.md b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
similarity index 88%
rename from erpnext/docs/user/guides/setting-up/data/data-import-tool.md
rename to erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
index 2a7eff11ed..e59ed21761 100644
--- a/erpnext/docs/user/guides/setting-up/data/data-import-tool.md
+++ b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
@@ -4,7 +4,7 @@ master data, into the system.
To Open the data import tool, you either go to Setup or go to the Transaction
you want to Import. If Data Import is allowed, you will see an Import Button:
-
+
The tool has two sections, one to download a template and the second to upload
the data.
@@ -20,7 +20,7 @@ with it too. The child tables are linked to the parent tables and are
implemented where there are multiple values for any property. For example an
Item can have multiple prices, An Invoice has multiple Items and so on.
-
+
* Click on the table you want to download or "All Tables"
* For bulk editing, you can click on "Download With Data"
@@ -30,19 +30,19 @@ Item can have multiple prices, An Invoice has multiple Items and so on.
After downloading the template, open it in a spreadsheet application and fill
in the data below the column headings.
-
+
Then export your template or save it as a **Comma Separated Values** (CSV)
file.
-
+
### 3\. Upload the .csv File
Finally attach the .csv file in the section. Click on the "Upload and Import"
button.
-
+
#### Notes:
diff --git a/erpnext/docs/user/guides/setting-up/data/index.md b/erpnext/docs/user/manual/en/setting-up/data/index.md
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/data/index.md
rename to erpnext/docs/user/manual/en/setting-up/data/index.md
diff --git a/erpnext/docs/user/guides/setting-up/data/index.txt b/erpnext/docs/user/manual/en/setting-up/data/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/data/index.txt
rename to erpnext/docs/user/manual/en/setting-up/data/index.txt
diff --git a/erpnext/docs/user/guides/setting-up/email/setting-up-email.md b/erpnext/docs/user/manual/en/setting-up/email/.md
similarity index 92%
rename from erpnext/docs/user/guides/setting-up/email/setting-up-email.md
rename to erpnext/docs/user/manual/en/setting-up/email/.md
index 0fb4658765..feb724f172 100644
--- a/erpnext/docs/user/guides/setting-up/email/setting-up-email.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/.md
@@ -24,7 +24,7 @@ To setup your outgoing mails, go to
#### Figure 1: Set up outgoing mail server.
-
+
Set your outgoing mail server settings here. These are the same settings you
would use in your Outlook, Thunderbird, Apple Mail or other such email
@@ -51,7 +51,7 @@ To setup your Support integration, go to:
#### Figure 2: Setup support Integration
-
+
To make ERPNext pull emails from your mail box, enter the POP3 settings. (POP3
is a way of extracting emails from your mailbox. It should be fairly easy to
@@ -69,7 +69,7 @@ contact mentioned in the document. To set this up, go to:
#### Figure 3: Set Auto Notification
-
+
Check on the transactions you want to send via email directly on Submission
and add a custom message if you want on these documents.
@@ -91,5 +91,5 @@ To setup Email Digests, go to:
#### Figure 4: Set up Email Digest
-
+
diff --git a/erpnext/docs/user/guides/setting-up/email/email-account.md b/erpnext/docs/user/manual/en/setting-up/email/email-account.md
similarity index 82%
rename from erpnext/docs/user/guides/setting-up/email/email-account.md
rename to erpnext/docs/user/manual/en/setting-up/email/email-account.md
index 37ceddb7c3..4392bf4d54 100644
--- a/erpnext/docs/user/guides/setting-up/email/email-account.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-account.md
@@ -10,7 +10,7 @@ ERPNext will create templates for a bunch of email accounts by default. Not all
There are 2 types of email accounts, outgoing and incoming. Outgoing email accounts use an SMTP service to send emails and emails are retrived from your inbox using a POP service. Most email providers such as GMail, Outlook or Yahoo provide these services.
-
+
### Outgoing Email Accounts
@@ -18,13 +18,13 @@ All emails sent from the system, either by the user to a contact or notification
To setup an outgoing Email Account, check on **Enable Outgoing** and set your SMTP server settings, if you are using a popular email service, these will be preset for you.
-
+
### Incoming Email Accounts
To setup an incoming Email Account, check on **Enable Incoming** and set your POP3 settings, if you are using a popular email service, these will be preset for you.
-
+
### How ERPNext handles replies
@@ -34,6 +34,6 @@ In ERPNext when you send an email to a contact like a customer, the sender will
If you would like ERPNext to notify you if an email is unreplied for a certain amount of time, then you can set **Notify if Unreplied**. Here you can set the number of minutes to wait before notifications are sent and whom the notifications must go to.
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/email/email-alerts.md b/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md
similarity index 85%
rename from erpnext/docs/user/guides/setting-up/email/email-alerts.md
rename to erpnext/docs/user/manual/en/setting-up/email/email-alerts.md
index 4b1dad6ffe..f4cccd3ef3 100644
--- a/erpnext/docs/user/guides/setting-up/email/email-alerts.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-alerts.md
@@ -33,9 +33,9 @@ To setup an Email Alert:
### Example
1. Defining the Criteria
- 
+ 
1. Setting the Recipients and Message
- 
+ 
{next}
diff --git a/erpnext/docs/user/guides/setting-up/email/email-digest.md b/erpnext/docs/user/manual/en/setting-up/email/email-digest.md
similarity index 83%
rename from erpnext/docs/user/guides/setting-up/email/email-digest.md
rename to erpnext/docs/user/manual/en/setting-up/email/email-digest.md
index 390c566b8a..5fa836e604 100644
--- a/erpnext/docs/user/guides/setting-up/email/email-digest.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-digest.md
@@ -12,6 +12,6 @@ To set up Email Digest, go to:
Set your frequency, check all the items you want to receive in your weekly update and select the user ids whom you want to send the Digest to.
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/email/index.md b/erpnext/docs/user/manual/en/setting-up/email/index.md
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/email/index.md
rename to erpnext/docs/user/manual/en/setting-up/email/index.md
diff --git a/erpnext/docs/user/guides/setting-up/email/index.txt b/erpnext/docs/user/manual/en/setting-up/email/index.txt
similarity index 76%
rename from erpnext/docs/user/guides/setting-up/email/index.txt
rename to erpnext/docs/user/manual/en/setting-up/email/index.txt
index 01061d03f2..86e75c252d 100644
--- a/erpnext/docs/user/guides/setting-up/email/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/email/index.txt
@@ -2,3 +2,4 @@ email-account
email-alerts
email-digest
sending-email
+setting-up-email
diff --git a/erpnext/docs/user/manual/en/setting-up/email/sending-email.md b/erpnext/docs/user/manual/en/setting-up/email/sending-email.md
new file mode 100644
index 0000000000..504c76d8fb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/email/sending-email.md
@@ -0,0 +1,9 @@
+# Sending Email from any Document
+
+In ERPNext you can send any document as email (with a PDF attachment) by clicking on `Menu > Email` from any open document.
+
+
+
+**Note:** You must have outgoing [email accounts]({{docs_base_url}}/user/manual/en/setting-up/email/email-account.html) setup for this.
+
+{next}
diff --git a/erpnext/docs/user/guides/setting-up/index.md b/erpnext/docs/user/manual/en/setting-up/index.md
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/index.md
rename to erpnext/docs/user/manual/en/setting-up/index.md
diff --git a/erpnext/docs/user/guides/setting-up/index.txt b/erpnext/docs/user/manual/en/setting-up/index.txt
similarity index 84%
rename from erpnext/docs/user/guides/setting-up/index.txt
rename to erpnext/docs/user/manual/en/setting-up/index.txt
index cbd14e5dab..92378252e2 100644
--- a/erpnext/docs/user/guides/setting-up/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/index.txt
@@ -15,3 +15,5 @@ third-party-backups
workflows
bar-code
company-setup
+calculate-incentive-for-sales-team
+articles
diff --git a/erpnext/docs/user/guides/setting-up/pos-setting.md b/erpnext/docs/user/manual/en/setting-up/pos-setting.md
similarity index 81%
rename from erpnext/docs/user/guides/setting-up/pos-setting.md
rename to erpnext/docs/user/manual/en/setting-up/pos-setting.md
index 8380877e04..9bfd8198f2 100644
--- a/erpnext/docs/user/guides/setting-up/pos-setting.md
+++ b/erpnext/docs/user/manual/en/setting-up/pos-setting.md
@@ -14,10 +14,10 @@ from:
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]({{url_prefix}}/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}
diff --git a/erpnext/docs/user/guides/setting-up/price-lists.md b/erpnext/docs/user/manual/en/setting-up/price-lists.md
similarity index 92%
rename from erpnext/docs/user/guides/setting-up/price-lists.md
rename to erpnext/docs/user/manual/en/setting-up/price-lists.md
index 2acd83dbb1..156e66de9a 100644
--- a/erpnext/docs/user/guides/setting-up/price-lists.md
+++ b/erpnext/docs/user/manual/en/setting-up/price-lists.md
@@ -8,7 +8,7 @@ You can create new Price List
> Selling/Buying/Stock > Setup > Price List >> New
-
+
* These Price List will be used when creating Item Price record to track selling or buying price of an item. Click here to learn more about Item Price.
diff --git a/erpnext/docs/user/guides/setting-up/print/address-template.md b/erpnext/docs/user/manual/en/setting-up/print/address-template.md
similarity index 91%
rename from erpnext/docs/user/guides/setting-up/print/address-template.md
rename to erpnext/docs/user/manual/en/setting-up/print/address-template.md
index 70682b2e9c..c2b9bb72d7 100644
--- a/erpnext/docs/user/guides/setting-up/print/address-template.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/address-template.md
@@ -26,6 +26,6 @@ Here is the default template:
### Example
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/print/index.md b/erpnext/docs/user/manual/en/setting-up/print/index.md
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/print/index.md
rename to erpnext/docs/user/manual/en/setting-up/print/index.md
diff --git a/erpnext/docs/user/guides/setting-up/print/index.txt b/erpnext/docs/user/manual/en/setting-up/print/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/print/index.txt
rename to erpnext/docs/user/manual/en/setting-up/print/index.txt
diff --git a/erpnext/docs/user/guides/setting-up/print/letter-head.md b/erpnext/docs/user/manual/en/setting-up/print/letter-head.md
similarity index 75%
rename from erpnext/docs/user/guides/setting-up/print/letter-head.md
rename to erpnext/docs/user/manual/en/setting-up/print/letter-head.md
index 1e69540d13..d3c24f2247 100644
--- a/erpnext/docs/user/guides/setting-up/print/letter-head.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/letter-head.md
@@ -14,10 +14,10 @@ You can create / manage Letter Heads from:
### Example
-
+
This is how the letter head looks in a document print:
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/print/print-format-builder.md b/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md
similarity index 70%
rename from erpnext/docs/user/guides/setting-up/print/print-format-builder.md
rename to erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md
index 3af05f5e1a..f9799279af 100644
--- a/erpnext/docs/user/guides/setting-up/print/print-format-builder.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/print-format-builder.md
@@ -10,19 +10,19 @@ or Open the document for which you want to make a print format. Click the Printe
### Step 1: Make a new Format
-
+
### Step 2: Add a new Field
To add a field, just drag it from the left sidebar and add it in your layout. You can edit the layout by clicking on the settings icon.
-
+
### Step 3
To remove a field, just drag it back into the fields sidebar.
-
+
### Step 4
@@ -30,7 +30,7 @@ You can add customized text, HTML in your print format, just add the **Custom HT
Then click on **Edit HTML** to edit your content.
-
+
To save your format, just click on the **Save** button on the top.
diff --git a/erpnext/docs/user/guides/setting-up/print/print-headings.md b/erpnext/docs/user/manual/en/setting-up/print/print-headings.md
similarity index 61%
rename from erpnext/docs/user/guides/setting-up/print/print-headings.md
rename to erpnext/docs/user/manual/en/setting-up/print/print-headings.md
index 4c492e0835..98fbf53df0 100644
--- a/erpnext/docs/user/guides/setting-up/print/print-headings.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/print-headings.md
@@ -8,10 +8,10 @@ You can create print headings from :
#### Figure 1: Save Print Heading
-
+
Example of a change in print heading is shown below:
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/print/print-settings.md b/erpnext/docs/user/manual/en/setting-up/print/print-settings.md
similarity index 69%
rename from erpnext/docs/user/guides/setting-up/print/print-settings.md
rename to erpnext/docs/user/manual/en/setting-up/print/print-settings.md
index a4788df66e..cdf3c54a37 100644
--- a/erpnext/docs/user/guides/setting-up/print/print-settings.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/print-settings.md
@@ -6,6 +6,6 @@ To edit print settings, go to:
> Setup > Printing and Branding > Print Settings
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/print/terms-and-conditions.md b/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md
similarity index 84%
rename from erpnext/docs/user/guides/setting-up/print/terms-and-conditions.md
rename to erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md
index 383ca48a3c..8c939d0a82 100644
--- a/erpnext/docs/user/guides/setting-up/print/terms-and-conditions.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/terms-and-conditions.md
@@ -6,13 +6,13 @@ To setup Terms and Condition master, go to:
`Selling > Terms and Condition > New`
-
+
### 2. Editing in HTML
Content of Terms and Condition can be formatted as per your preference, and also insert images where needed. If you have expertise in HTML, you will also find option to edit the content of Terms and Condition in HTML.
-
+
This also allows you to use Terms and Condition master for footer, which otherwise is not availale in ERPNext as dedicated functionality. Since contents of Terms and Condition is always the last to appear in the print format, details of footer should be inserted at the end of the content, so that it actually appears as footer in the print format.
@@ -20,6 +20,6 @@ This also allows you to use Terms and Condition master for footer, which otherwi
In transactions, you will find section of Terms and Condition where you will be able to search and fetched required Terms and Condition master.
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/setting-up-taxes.md b/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
similarity index 93%
rename from erpnext/docs/user/guides/setting-up/setting-up-taxes.md
rename to erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
index 0c42819868..a3c11ab2f0 100644
--- a/erpnext/docs/user/guides/setting-up/setting-up-taxes.md
+++ b/erpnext/docs/user/manual/en/setting-up/setting-up-taxes.md
@@ -22,11 +22,11 @@ sales or purchase tax rate specified by you as default rates.
Item Tax table can be found as a section within the Item Master document.
-
+
* **Inclusive and Exclusive Tax**: ERPNext allows you to enter Item rates which are tax inclusive.
-
+
* **Exception to the rule**: Item tax settings are required only if a particular Item has a different tax rate than the rate defined in the standard tax Account
* **Item tax is overwrite-able**: You can overwrite or change the item tax rate by going to the Item master in the Item tax table.
@@ -49,7 +49,7 @@ have to go to:
> Setup > Accounts > Sales Taxes and Charge Master
-
+
When you create a new master, you will have to add a row for each tax type.
diff --git a/erpnext/docs/user/guides/setting-up/settings/global-defaults.md b/erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md
similarity index 63%
rename from erpnext/docs/user/guides/setting-up/settings/global-defaults.md
rename to erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md
index fd3868c9b0..412572a820 100644
--- a/erpnext/docs/user/guides/setting-up/settings/global-defaults.md
+++ b/erpnext/docs/user/manual/en/setting-up/settings/global-defaults.md
@@ -6,6 +6,6 @@ You can set default values for your documents from Global Defaults
Whenever a new document is created, these values will be set as default.
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/settings/index.md b/erpnext/docs/user/manual/en/setting-up/settings/index.md
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/settings/index.md
rename to erpnext/docs/user/manual/en/setting-up/settings/index.md
diff --git a/erpnext/docs/user/guides/setting-up/settings/index.txt b/erpnext/docs/user/manual/en/setting-up/settings/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/settings/index.txt
rename to erpnext/docs/user/manual/en/setting-up/settings/index.txt
diff --git a/erpnext/docs/user/guides/setting-up/settings/module-settings.md b/erpnext/docs/user/manual/en/setting-up/settings/module-settings.md
similarity index 73%
rename from erpnext/docs/user/guides/setting-up/settings/module-settings.md
rename to erpnext/docs/user/manual/en/setting-up/settings/module-settings.md
index db54494c19..ecfb28213d 100644
--- a/erpnext/docs/user/guides/setting-up/settings/module-settings.md
+++ b/erpnext/docs/user/manual/en/setting-up/settings/module-settings.md
@@ -10,6 +10,6 @@ For example if you are in the services business, you want to hide the Manufactur
Check / uncheck the items to show / hide.
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/settings/naming-series.md b/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
similarity index 93%
rename from erpnext/docs/user/guides/setting-up/settings/naming-series.md
rename to erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
index 4c3f2c10de..df7de6d8fe 100644
--- a/erpnext/docs/user/guides/setting-up/settings/naming-series.md
+++ b/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
@@ -42,7 +42,7 @@ name and the starting point in the “Update Series” section.
See how to set the naming series
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/settings/system-settings.md b/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md
similarity index 67%
rename from erpnext/docs/user/guides/setting-up/settings/system-settings.md
rename to erpnext/docs/user/manual/en/setting-up/settings/system-settings.md
index a529171dab..053b4f1a35 100644
--- a/erpnext/docs/user/guides/setting-up/settings/system-settings.md
+++ b/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md
@@ -6,6 +6,6 @@ To open System Settings, go to:
> Setup > Settings > System Settings
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/index.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/setup-wizard/index.md
rename to erpnext/docs/user/manual/en/setting-up/setup-wizard/index.md
diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/index.txt b/erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/setup-wizard/index.txt
rename to erpnext/docs/user/manual/en/setting-up/setup-wizard/index.txt
diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-1-language.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md
similarity index 72%
rename from erpnext/docs/user/guides/setting-up/setup-wizard/step-1-language.md
rename to erpnext/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md
index 4e2ffe8917..00219fd6a0 100644
--- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-1-language.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-1-language.md
@@ -2,7 +2,7 @@
Select your language. ERPNext is available in more than 20 languages.
-
+
---
diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-10-item.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-item.md
similarity index 86%
rename from erpnext/docs/user/guides/setting-up/setup-wizard/step-10-item.md
rename to erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-item.md
index 61e3c494c9..bc71b9859b 100644
--- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-10-item.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-10-item.md
@@ -3,7 +3,7 @@
In this final step, please enter the names of the Items you buy or sell.
+
---
diff --git a/erpnext/docs/user/guides/setting-up/setup-wizard/step-3-user-details.md b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md
similarity index 76%
rename from erpnext/docs/user/guides/setting-up/setup-wizard/step-3-user-details.md
rename to erpnext/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md
index 9b20dd0fb4..b9eff18025 100644
--- a/erpnext/docs/user/guides/setting-up/setup-wizard/step-3-user-details.md
+++ b/erpnext/docs/user/manual/en/setting-up/setup-wizard/step-3-user-details.md
@@ -3,7 +3,7 @@
Enter Users Profile Details like Name, User ID and preferred password.
+
#### Step 2: Enter Data in csv file.
-
+
-The csv format is case-sensitive. Do not edit the headers which are preset in the template. In the Item Code and Warehouse column, enter exact Item Code and Warehouse as created in your ERPNext account. For quatity, enter stock level you wish to set for that item, in a specific warehouse. If you do not want to change the quantity or valuation rate of an Item, you should leave it blank.
-
-Note: Make sure you do not put zero if you do not want to change the quantity
-amount or valuation amount. The system will calculate zero as zero quantity.
-So leave the field blank.
+The csv format is case-sensitive. Do not edit the headers which are preset in the template. In the Item Code and Warehouse column, enter exact Item Code and Warehouse as created in your ERPNext account. For quatity, enter stock level you wish to set for that item, in a specific warehouse.
#### **Step 3: Upload file and Enter Values in Stock Reconciliation Form
-
+
**Posting Date**
@@ -63,11 +59,11 @@ report. The report will show you all types of rates.
#### Step 4: Review the reconciliation data
-
+
### Stock Ledger Report
-
+
**How Stock Reconciliation Works**
diff --git a/erpnext/docs/user/guides/setting-up/territory.md b/erpnext/docs/user/manual/en/setting-up/territory.md
similarity index 81%
rename from erpnext/docs/user/guides/setting-up/territory.md
rename to erpnext/docs/user/manual/en/setting-up/territory.md
index 89f1d14e27..3a1abfdfdd 100644
--- a/erpnext/docs/user/guides/setting-up/territory.md
+++ b/erpnext/docs/user/manual/en/setting-up/territory.md
@@ -5,6 +5,6 @@ each Item Group and get reports that will show your actual performance in the
territory v/s what you had planned.
You can also set different pricing for the same product sold across different territories.
-
+
{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/guides/setting-up/third-party-backups.md b/erpnext/docs/user/manual/en/setting-up/third-party-backups.md
similarity index 84%
rename from erpnext/docs/user/guides/setting-up/third-party-backups.md
rename to erpnext/docs/user/manual/en/setting-up/third-party-backups.md
index a65c533d49..c4e74ca4a0 100644
--- a/erpnext/docs/user/guides/setting-up/third-party-backups.md
+++ b/erpnext/docs/user/manual/en/setting-up/third-party-backups.md
@@ -9,7 +9,7 @@ __Step 2:__ Click on Manage Third Party Backup
#### Figure 1: Manage Third Party Backup
-
+
On the Backup Manager page, enter the email addresses of those people whom you
wish to notify about the upload status. Under the topic 'Sync with Dropbox',
@@ -22,11 +22,11 @@ then select the Never option.
#### Figure 2: Allow Dropbox Access
-
+
You need to login to your dropbox account, with your user id and password.
-
+
## Open Source Users
diff --git a/erpnext/docs/user/guides/setting-up/users-and-permissions/adding-users.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
similarity index 54%
rename from erpnext/docs/user/guides/setting-up/users-and-permissions/adding-users.md
rename to erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
index 7272178c3e..dfd9ea00d1 100644
--- a/erpnext/docs/user/guides/setting-up/users-and-permissions/adding-users.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/adding-users.md
@@ -2,11 +2,16 @@
Users can be added by the System Manager. If you are a System Manager, you can add Users via
+There are two main classes of users: Web Users and System Users. System Users are people using ERPNext in the company. Web users are customers or suppliers (or portal users).
+
+Under User a lot of info can be entered. For the sake of usability the information entered for webs users is minimal: First Name and email.
+Important is to realize that the email address is the unique key (ID) identifying the Users.
+
> Setup > User
### 1. List of Users
-
+
To add a new user, click on "New"
@@ -25,19 +30,19 @@ After saving, you will see a list of roles and a checkbox next to it. Just check
the user to have and save the document. To click on what permissions translate into roles, click on the role
name.
-
+
### 4. Setting Module Access
Users will have access to all modules for which they have role based access. If you want to block certain modules for certain users, un-check the module from the list.
-
+
### 5. Security Settings
If you wish to give the user access to the system only between office hours,
or during weekends, mention it under security settings.
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/users-and-permissions/index.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/users-and-permissions/index.md
rename to erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.md
diff --git a/erpnext/docs/user/guides/setting-up/users-and-permissions/index.txt b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/setting-up/users-and-permissions/index.txt
rename to erpnext/docs/user/manual/en/setting-up/users-and-permissions/index.txt
diff --git a/erpnext/docs/user/guides/setting-up/users-and-permissions/role-based-permissions.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md
similarity index 80%
rename from erpnext/docs/user/guides/setting-up/users-and-permissions/role-based-permissions.md
rename to erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md
index 87144888e8..0c4042c154 100644
--- a/erpnext/docs/user/guides/setting-up/users-and-permissions/role-based-permissions.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/role-based-permissions.md
@@ -5,7 +5,7 @@ ERPNext has a role-based permission system. It means that you can assign Roles t
To start with, go to:
> Setup > Permissions > Role Permissions Manager
-
+
Permissions are applied on a combination of:
@@ -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]({{url_prefix}}/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)
---
@@ -38,37 +38,37 @@ Permissions are applied on a combination of:
Leave Application is a good **example** that encompasses all areas of Permission System.
-
+
1. **It should be created by an Employee.**
For this, Employee Role should be given Read, Write, Create permissions.
-
+
1. **An Employee should only be able to access his/her Leave Application.**
Hence, Apply User Permissions should be enabled for Employee Role, and a User Permission record should be created for each User Employee combination. (This effort is reduced for Employee Document Type, by programmatically creating User Permission records.)
-
+
1. **HR Manager should be able to see all Leave Applications.**
Create a Permission Rule for HR Manager at Level 0, with Read permissions. Apply User Permissions should be disabled.
-
+
2. **Leave Approver should be able to see and update Leave Applications applicable to him/her.**
Leave Approver is given Read and Write access at Level 0, with Apply User Permissions enabled. Relevant Employee Documents should be enlisted in the User Permissions of Leave Approvers. (This effort is reduced for Leave Approvers mentioned in Employee Documents, by programmatically creating User Permission records.)
-
+
3. **It should be Approved / Rejected only by HR User or Leave Approver.**
The Status field of Leave Application is set at Level 1. HR User and Leave Approver are given Read and Write permissions for Level 1, while everyone else (All) are given Read permission for Level 1.
-
+
4. **HR User should be able to delegate Leave Applications to his/her subordinates**
HR User is given the right to Set User Permissions. A User with HR User role would be able to defined User Permissions on Leave Application for other users.
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/users-and-permissions/sharing.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md
similarity index 74%
rename from erpnext/docs/user/guides/setting-up/users-and-permissions/sharing.md
rename to erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md
index 471efc1c5a..a939e656fe 100644
--- a/erpnext/docs/user/guides/setting-up/users-and-permissions/sharing.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/sharing.md
@@ -4,6 +4,6 @@ In addition to user and role permissions, you can also Share a document with ano
To share a document, open the document, click on the "+" icon under sharing and select the user
-
+
{next}
diff --git a/erpnext/docs/user/guides/setting-up/users-and-permissions/user-permissions.md b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
similarity index 80%
rename from erpnext/docs/user/guides/setting-up/users-and-permissions/user-permissions.md
rename to erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
index 2e2220aa2d..c1cefc6037 100644
--- a/erpnext/docs/user/guides/setting-up/users-and-permissions/user-permissions.md
+++ b/erpnext/docs/user/manual/en/setting-up/users-and-permissions/user-permissions.md
@@ -8,7 +8,7 @@ To start with, go to:
> Setup > Permissions > User Permissions Manager
+
#### Step 2: Enter Transition Rules.
-
+
#### Notes:
@@ -50,17 +50,17 @@ Leave.
When a Leave Application is submitted, the status on the right hand corner of
the page shows as "Applied"
-
+
When the HR User logs in, he can either Approve or Reject. If approved the
status on the right hand corner of the page shows as Approved. However, a blue
band of information is displayed saying approval is pending by leave approver.
-
+
When the leave approver opens the Leave Application page, he should select the
status and convert to Approved or Rejected.
-
+
{next}
diff --git a/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/index.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.md
similarity index 92%
rename from erpnext/docs/user/guides/stock/accounting-of-inventory-stock/index.md
rename to erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.md
index 4907186a67..b758ff7f0e 100644
--- a/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/index.md
+++ b/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]({{url_prefix}}/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]({{url_prefix}}/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}
diff --git a/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/index.txt b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.txt
similarity index 100%
rename from erpnext/docs/user/guides/stock/accounting-of-inventory-stock/index.txt
rename to erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/index.txt
diff --git a/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
similarity index 95%
rename from erpnext/docs/user/guides/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
rename to erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
index c3d10ed8c3..ffc5f40e43 100644
--- a/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
+++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/migrate-to-perpetual-inventory.md
@@ -20,7 +20,7 @@ Steps:
> Setup > Accounts Settings > Make Accounting Entry For Every Stock Movement
-
+
* Create Stock Entry (Material Transfer) to transfer available stock from existing warehouse to new warehouse. As stock will be available in the new warehouse, you should select the new warehouse for all the future transactions.
diff --git a/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/perpetual-inventory.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
similarity index 86%
rename from erpnext/docs/user/guides/stock/accounting-of-inventory-stock/perpetual-inventory.md
rename to erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
index ee62942ecd..fbe880fa6d 100644
--- a/erpnext/docs/user/guides/stock/accounting-of-inventory-stock/perpetual-inventory.md
+++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
@@ -143,11 +143,11 @@ details of Purchase Receipt:
+2. In the Item Master fill in all item related details. In the 'Inventory' section select 'Has Batch No.' as 'YES'
+ 
+ NOTE: This option can be changed after submit but only as long as there are no Stock Entries created against that Item. Once an Stock Entry is created against that item this field freezes. To modify it again you need to cancel all outstanding 'Stock Entries'
+3. You can then create a batch. To do so you can type 'new Batch' in the Awesome bar.
+4. Fill in the batch related details and save the Doc.
+ 
+5. Now in Stock Transaction You can associate a batch against that item under the 'Serial No / Batch' Section.
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+ 
+ 
+ 
+ 