nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-05 14:38:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

[minor] fixed conflict while merging with master

Browse Source
This commit is contained in:
Nabin Hait
2013-09-05 10:56:44 +05:30
parent 4e8216696f 2162fee396
commit a653cd3608
67 changed files with 872 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/user/docs.user.md
View File

@@ -50,6 +50,8 @@ Contents
1. [Setting up Taxes](docs.user.setup.taxes.html)
1. [Price Lists](docs.user.setup.price_lists.html)
1. [Adding Opening Entries](docs.user.setup.opening.html)
1. [POS Setting](docs.user.setup.pos_setting.html)
1. [Third Party Backups](docs.user.setup.third_party_backups.html)
1. [Selling](docs.user.selling.html)
1. Selling Setup
1. [Customer Group](docs.user.selling.customer_groups.html)
@@ -74,7 +76,7 @@ Contents
1. [Price Lists](docs.user.setup.price_lists.html)
1. [Sub Contracting](docs.user.stock.sub_contracting.html)
1. [Stock (Inventory)](docs.user.stock.html)
1. [Warehouse](docs.user.stock.item.html)
1. [Warehouse](docs.user.stock.warehouse.html)
1. [Item Group](docs.user.stock.item_group.html)
1. [Item](docs.user.stock.item.html)
1. [Serialized Inventory](docs.user.stock.serialized.html)
@@ -82,10 +84,11 @@ Contents
1. [Delivery Note](docs.user.stock.delivery_note.html)
1. [Stock Entry / Material Transfer](docs.user.stock.stock_entry.html)
1. [Material Issue](docs.user.stock.material_issue.html)
1. [Material Issue](docs.user.stock.material_issue.html)
1. [Sales Return](docs.user.stock.sales_return.html)
1. [Purchase Return](docs.user.stock.sales_return.html)
1. [Purchase Return](docs.user.stock.purchase_return.html)
1. [Projected Quantity](docs.user.stock.projected_quantity.html)
1. [Accounting for Stock](docs.user.stock.accounting_for_stock.html)
1. [Perpetual Inventory](docs.user.stock.perpetual_inventory.html)
1. [Accounting](docs.user.accounting.html)
1. [Chart of Accounts](docs.user.setup.accounting.html)
1. [Chart of Cost Centers](docs.user.setup.cost_centers.html)
@@ -97,6 +100,7 @@ Contents
1. [Period Closing](docs.user.accounts.closing.html)
1. [Accounting Reports](docs.user.accounts.reports.html)
1. [Upload Journal Entries in Bulk](docs.user.accounts.voucher_import.html)
1. [Point of Sale (POS) Invoice](docs.user.accounts.pos.html)
1. [Human Resources (HR)](docs.user.hr.html)
1. [HR Setup](docs.user.hr.setup.html)
1. [Employee](docs.user.hr.employee.html)