+ +#### Step 4: Attach the uploaded file. + + + + + +After reviewing saved Reconciliation Data, submit the Stock Reconciliation. On successful submission, the data will be updated in the system. To check the uploaded data go to Stock and view Stock Level Report. \ No newline at end of file diff --git a/docs/user/buying/docs.user.buying.supplier.md b/docs/user/buying/docs.user.buying.supplier.md index e477fa2beda..3707fbe8523 100644 --- a/docs/user/buying/docs.user.buying.supplier.md +++ b/docs/user/buying/docs.user.buying.supplier.md @@ -20,7 +20,15 @@ You can create a new Supplier via: > Tip: When you select a Supplier in any transaction, one Contact and Address gets pre-selected. This is the “Default Contact or Address”. So make sure you set your defaults correctly! +### Integration with Accounts +In ERPNext, there is a separate Account record for each Supplier, of Each company. + +When you create a new Supplier, ERPNext will automatically create an Account Ledger for the Supplier under “Accounts Receivable” in the Company set in the Supplier record. + +> Advanced Tip: If you want to change the Account Group under which the Supplier Account is created, you can set it in the Company master. + +If you want to create an Account in another Company, just change the Company value and “Save” the Supplier again. > Buying > Contact > New Contact diff --git a/docs/user/buying/docs.user.buying.supplier_type.md b/docs/user/buying/docs.user.buying.supplier_type.md index deaf01fcfcd..3871991d638 100644 --- a/docs/user/buying/docs.user.buying.supplier_type.md +++ b/docs/user/buying/docs.user.buying.supplier_type.md @@ -3,9 +3,11 @@ "_label": "Supplier Type" } --- +A supplier may be distinguished from a contractor or subcontractor, who commonly adds specialized input to deliverables. A supplier is also known as a vendor. There are different types of suppliers based on their goods and products. -Based on what the suppliers supply, they are classified into different categories called Supplier Type. -There can be different types of suppliers. You can create your own category of Supplier Type. +ERPNext allows you to create your own categories of suppliers. These categories are known as Supplier Type. For Example, if your suppliers are mainly pharmaceutical companies and FMCG distributors, You can create a new Type for them and name them accordingly. + +Based on what the suppliers supply, they are classified into different categories called Supplier Type. There can be different types of suppliers. You can create your own category of Supplier Type. > Buying > Supplier Type > New Supplier Type diff --git a/docs/user/docs.user.md b/docs/user/docs.user.md index d15a573e1a2..c45ca30a221 100644 --- a/docs/user/docs.user.md +++ b/docs/user/docs.user.md @@ -85,6 +85,7 @@ Contents 1. [Purchase Receipt](docs.user.stock.purchase_receipt.html) 1. [Delivery Note](docs.user.stock.delivery_note.html) 1. [Stock Entry / Material Transfer](docs.user.stock.stock_entry.html) + 1. [Opening Stock](docs.user.accounts.opening_stock.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.purchase_return.html) @@ -100,7 +101,6 @@ Contents 1. [Payment Entry](docs.user.accounts.payments.html) 1. [Journal Voucher](docs.user.accounts.journal_voucher.html) 1. [Opening Entry](docs.user.accounts.opening_entry.html) - 1. [Opening Stock](docs.user.accounts.opening_stock.html) 1. [Period Closing](docs.user.accounts.closing.html) 1. [Accounting Reports](docs.user.accounts.reports.html) 1. [Point of Sale (POS) Invoice](docs.user.accounts.pos.html) @@ -151,3 +151,7 @@ Contents 1. [Fiscal Year](docs.user.knowledge.fiscal_year.html) 1. [Accounting Knowledge](docs.user.knowledge.accounting.html) 1. [Accounting Entries](docs.user.knowledge.accounting_entries.html) + 1. [DocType Definitions](docs.user.knowledge.doctype.html) + 1. [Attachment and CSV Files](docs.user.knowledge.attachment_csv.html) + 1. [Format using Markdown](docs.user.knowledge.markdown.html) + diff --git a/docs/user/knowledge/docs.user.knowledge.accounting.md b/docs/user/knowledge/docs.user.knowledge.accounting.md index 17304984cb0..995d38cfe97 100644 --- a/docs/user/knowledge/docs.user.knowledge.accounting.md +++ b/docs/user/knowledge/docs.user.knowledge.accounting.md @@ -22,34 +22,34 @@ Accounting Entries The balance of account can be increased / decreased, depending on account type and transaction type. -
| Account Type | -Transaction Type | -Effect on account balance | +Account Type | +Transaction Type | +Effect on account balance |
| Debit | -Debit | -Increases | +Debit | +Debit | +Increases |
| Debit | -Credit | -Decreases | +Debit | +Credit | +Decreases |
| Credit | -Credit | -Increases | +Credit | +Credit | +Increases |
| Credit | -Debit | -Decreases | +Credit | +Debit | +Decreases |
| Account | -Debit | -Credit | +Account | +Debit | +Credit |
| Customer A | -50000 | -+ | Customer A | +50000 | +|
| Sales of Laptop | -- | 50000 | +Sales of Laptop | ++ | 50000 |
| Account | -Debit | -Credit | +Account | +Debit | +Credit |
| Customer A | -- | 50000 | +Customer A | ++ | 50000 |
| Cash | -50000 | -+ | Cash | +50000 | +
| Column | +Description | +
| Name | +Name of the record | + +
| Owner | +Creator and Owner of the record | + +
| Created on | +Date and Time of Creation | + +
| Modified On | +Date and Time of Modification | +
| Docstatus | +Status of the record + 0 = Saved/Draft + 1 = Submitted + 2 = Cancelled/Deleted + |
+
| Parent | +Name of the Parent | +
| Parent Type | +Type of Parent | +
| Parent Field | +Specifying the relationship with the parent (there can be multiple child relationships with the same DocType). | +
| Index(idx) | +Index (sequence) of the record in the child table. | + +
| Column | +Description | +|
| Label | +Field Label (that appears in the form). | +|
| Type | +Field Type | +|
| Name | +Column name in the database, must be code friendly with no white spaces, special characters and capital letters. | +|
| options | +Field settings: + For Select: List of options (each on a new line). + For Link: DocType that is “linked”. + For HTML: HTML Content + | |
| Perm Level | +Permission level (number) of the field. You can group fields by numbers, called levels, and apply rules on the levels. | +|
| Width | +Width of the field (in pixels) - useful for “Table” types. | +|
| Reqd | +Checked if field is mandatory (required). | +|
| In Filter | +Checked if field appears as a standard filter in old style reports. | +|
| Hidden | +Checked if field is hidden. | +|
| Print Hide | +Checked if field is hidden in Print Formats. | +|
| Report Hide | +Checked if field is hidden in old style reports. | +|
| Allow on Submit | +Checked if this field can be edited after the document is “Submitted”. | +|
| Depends On | +The fieldname of the field that will decide whether this field will be shown or hidden. It is useful to hide un-necessary fields. | +|
| Description | +Description of the field | +|
| Default | +Default value when a new record is created. + Note: “user” will set the current user as default and “today” will set today’s date (if the field is a Date field). |
+ |
| Type | +Description | +Options/Setting | +
| Data | +Single line text field with 180 characters | ++ |
| Select | +Select from a pre-determined items in a drop-down. | +The “Options” contains the drop-down items, each on a new row | +
| Link | +Link an existing document / record | +Options contains the name of the type of document (DocType) | +
| Currency | +Number with 2 decimal places, that will be shown separated by commas for thousands etc. in Print. | +e.g. 1,000,000.00 | +
| Float | +Number with 6 decimal places. | +e.g. 3.141593 | +
| Int | +Integer (no decimals) | +e.g. 100 | +
| Date | +Date | +Format can be selected in Global Defaults | +
| Time | +Time | ++ |
| Text | +||
| Text | +Multi-line text box without formatting features | ++ |
| Text editor | +Multi-line text box with formatting toolbar etc | ++ |
| Code | +Code Editor | +Options can include the type of language for syntax formatting. + Eg JS / Python / HTML | +
| Table (Grid) | +||
| Table | +Table of child items linked to the record. | +Options contains the name of the DocType of the child table. For example “Sales Invoice Item” for “Sales Invoice” | +
| Layout | +||
| Section Break | +Break into a new horizontal section. | +The layout in ERPNext is evaluated from top to bottom. | +
| Column Break | +Break into a new vertical column. | ++ |
| HTML | +Add a static text / help / link etc in HTML | +Options contains the HTML. | +
| Action | +||
| Button | +Button | +[for developers only] | +