diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 891439c0252..d6310b871e4 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
from __future__ import unicode_literals
import frappe
-__version__ = '7.0.15'
+__version__ = '7.0.16'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/docs/assets/img/accounts/asset-item.png b/erpnext/docs/assets/img/accounts/asset-item.png
new file mode 100644
index 00000000000..4889214dc93
Binary files /dev/null and b/erpnext/docs/assets/img/accounts/asset-item.png differ
diff --git a/erpnext/docs/assets/img/accounts/pos-customer.png b/erpnext/docs/assets/img/accounts/pos-customer.png
new file mode 100644
index 00000000000..ffb058ae0f0
Binary files /dev/null and b/erpnext/docs/assets/img/accounts/pos-customer.png differ
diff --git a/erpnext/docs/assets/img/accounts/pos-item.png b/erpnext/docs/assets/img/accounts/pos-item.png
new file mode 100644
index 00000000000..fb6c1f87dde
Binary files /dev/null and b/erpnext/docs/assets/img/accounts/pos-item.png differ
diff --git a/erpnext/docs/assets/img/accounts/pos-payment.png b/erpnext/docs/assets/img/accounts/pos-payment.png
new file mode 100644
index 00000000000..0a0d37f5517
Binary files /dev/null and b/erpnext/docs/assets/img/accounts/pos-payment.png differ
diff --git a/erpnext/docs/assets/img/setup/print/cheque-1.png b/erpnext/docs/assets/img/setup/print/cheque-1.png
new file mode 100644
index 00000000000..5134e93ac0b
Binary files /dev/null and b/erpnext/docs/assets/img/setup/print/cheque-1.png differ
diff --git a/erpnext/docs/assets/img/setup/print/cheque-2.png b/erpnext/docs/assets/img/setup/print/cheque-2.png
new file mode 100644
index 00000000000..a11fa973e69
Binary files /dev/null and b/erpnext/docs/assets/img/setup/print/cheque-2.png differ
diff --git a/erpnext/docs/assets/img/setup/print/cheque-3.png b/erpnext/docs/assets/img/setup/print/cheque-3.png
new file mode 100644
index 00000000000..40337063bdf
Binary files /dev/null and b/erpnext/docs/assets/img/setup/print/cheque-3.png differ
diff --git a/erpnext/docs/assets/img/setup/print/cheque-4.png b/erpnext/docs/assets/img/setup/print/cheque-4.png
new file mode 100644
index 00000000000..b623505354f
Binary files /dev/null and b/erpnext/docs/assets/img/setup/print/cheque-4.png differ
diff --git a/erpnext/docs/assets/img/setup/print/cheque-5.gif b/erpnext/docs/assets/img/setup/print/cheque-5.gif
new file mode 100644
index 00000000000..f4ccda4e24d
Binary files /dev/null and b/erpnext/docs/assets/img/setup/print/cheque-5.gif differ
diff --git a/erpnext/docs/assets/img/setup/print/sample-cheque.jpg b/erpnext/docs/assets/img/setup/print/sample-cheque.jpg
new file mode 100644
index 00000000000..2bd3d7d092a
Binary files /dev/null and b/erpnext/docs/assets/img/setup/print/sample-cheque.jpg differ
diff --git a/erpnext/docs/assets/old_images/erpnext/pos-add-item.png b/erpnext/docs/assets/old_images/erpnext/pos-add-item.png
deleted file mode 100644
index 96e64d43153..00000000000
Binary files a/erpnext/docs/assets/old_images/erpnext/pos-add-item.png and /dev/null differ
diff --git a/erpnext/docs/assets/old_images/erpnext/pos-make-payment.png b/erpnext/docs/assets/old_images/erpnext/pos-make-payment.png
deleted file mode 100644
index c4ef00f1898..00000000000
Binary files a/erpnext/docs/assets/old_images/erpnext/pos-make-payment.png and /dev/null differ
diff --git a/erpnext/docs/assets/old_images/erpnext/pos-remove-item.png b/erpnext/docs/assets/old_images/erpnext/pos-remove-item.png
deleted file mode 100644
index 46ffc2b8fdf..00000000000
Binary files a/erpnext/docs/assets/old_images/erpnext/pos-remove-item.png and /dev/null differ
diff --git a/erpnext/docs/user/manual/en/accounts/managing-fixed-assets.md b/erpnext/docs/user/manual/en/accounts/managing-fixed-assets.md
index 5fc8a0b71b2..f8dbe1db95b 100644
--- a/erpnext/docs/user/manual/en/accounts/managing-fixed-assets.md
+++ b/erpnext/docs/user/manual/en/accounts/managing-fixed-assets.md
@@ -2,30 +2,33 @@ In ERPNext, you can maintain fixed asset records like Computers, Furnitures, Car
## Asset Category
-To start first you should create an Asset Category, depending on the type of assets. For example, all your desktops and laptops can be part of an Asset Category named "Computers". Here, you can set default depreciation method, periodicity and depreciation related accounts, which will be applicable to all the assets under the category.
+Based on the type of assets, create Asset Category. For example, all your desktops and laptops can be part of an Asset Category named "Computers". Here you can set default depreciation method, periodicity and depreciation related accounts, which will be applicable to all the assets under the category.
-> **Note:** You can also set default depreciation related Accounts and Cost Centers in Company.
-
+> **Note:** You can also set default depreciation related Accounts and Cost Centers in Company master.
## Asset
-Next step will be creating the fixed asset record. Asset record is the heart of fixed asset management, all the activities like purchasing, depreciation, scrapping or sales are managed against it.
+Asset master is the heart of fixed asset management feature. All the transactions related to Asset like purchasing, sales, depreciation, scrapping will be managed from the Asset master.
Explanation of the fields:
-1. Asset Category: The category of assets it belongs to.
-2. Is Existing Asset: Check if the asset is being carried forward from the previous Fiscal Year. The existing assets which are partially / fully depreciated can also be created/maintained for the future reference.
-3. Status: The options are - Draft, Submitted, Partially Depreciated, Fully Depreciated, Sold and Scrapped.
-4. Warehouse: Set the location of the asset.
-5. Gross Purchase Amount: The purchase cost of the asset
-6. Expected Value After Useful Life: Useful Life is the time period over in which the company expects that the asset will be productive. After that period, either the asset is scrapped or sold. In case it is sold, mention the estimated value here. This value is also known as Salvage Value, Scrap Value or Residual Value.
-7. Opening Accumulated Depreciation: The accumulated depreciation amount which has already been booked for an existing asset.
-8. Current Value (After Depreciation): In case you are creating record of an existing asset which has already been partially/fully depreciated, mention the currect value of the asset. In case of new asset, mention the purchase amount or leave it blank.
-9. Depreciation Method: There are two options: Straight Line and Double Declining Balance.
+1. Item Code: An Item for the Asset must be a non-stock item, with "Is Asset" field checked.
+
+
+
+2. Asset Category: The category of assets it belongs to.
+3. Is Existing Asset: Check if the asset is being carried forward from the previous Fiscal Year. The existing assets which are partially / fully depreciated can also be created/maintained for the future reference.
+4. Status: The options are - Draft, Submitted, Partially Depreciated, Fully Depreciated, Sold and Scrapped.
+5. Warehouse: Set the location of the asset.
+6. Gross Purchase Amount: The purchase cost of the asset.
+7. Expected Value After Useful Life: Useful Life is the time period over in which the company expects that the asset will be productive. After that period, either the asset is scrapped or sold. In case it is sold, mention the estimated value here. This value is also known as Salvage Value, Scrap Value or Residual Value.
+8. Opening Accumulated Depreciation: The accumulated depreciation amount which has already been booked for an existing asset.
+9. Current Value (After Depreciation): In case you are creating record of an existing asset which has already been partially/fully depreciated, mention the current value of the asset. In case of new asset, mention the purchase amount or leave it blank.
+10. Depreciation Method: There are two options: Straight Line and Double Declining Balance.
- Straight Line: This method spreads the cost of the fixed asset evenly over its useful life.
- Double Declining Method: An accelerated method of depreciation, it results in higher depreciation expense in the earlier years of ownership.
10. Total Number of Depreciations: The total number of depreciations during the useful life. In case of existing assets which are partially depreciated, mention the number of pending depreciations.
@@ -52,16 +55,16 @@ For better visibility, net value of the asset on different depreciation dates ar
## Purchase an Asset
-For purchasing a new asset, create and submit the asset record with all the depreciation settings. Then create a Purchase Invoice via "Make Purchase Invoice" button. On clicking the button, system will load a new Purchase Invoice form with pre-loaded items table. It will also set proper fixed asset account (defined in teh Asset Category) in the Expense Account field. You need to select Supplier and other necessary details and submit the Purchase Invoice.
+For purchasing a new asset, create and submit the asset record with all the depreciation settings. Then create a Purchase Invoice via "Make Purchase Invoice" button. On clicking the button, system will load a new Purchase Invoice form with pre-loaded items table. It will also set proper fixed asset account (defined in the Asset Category) in the Expense Account field. You need to select Supplier and other necessary details and submit the Purchase Invoice.
-On submission of the invoice, the "Fixed Asset Account" will be debited and payable account will be credited. It also updates purchase date, supplier and Purchase Invoice no in the Asset record.
+On submission of the invoice, the "Fixed Asset Account" will be debited and payable account will be credited. It also updates purchase date, supplier and Purchase Invoice no. in the Asset master.
## Sale an Asset
-To sale an asset, open the asset record and create a Sales Invoice using "Sale Asset" button. On submission of the Sales Invoice, following entries will take place:
+To sale an asset, open the asset record and create a Sales Invoice by clicking on "Sale Asset". On submission of the Sales Invoice, following entries will take place:
- "Receivable Account" (Debtors) will be debited by the sales amount.
- "Fixed Asset Account" will be credited by the purchase amount of asset.
diff --git a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
index 8f646f723ce..b0b6bcc1351 100644
--- a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
@@ -1,30 +1,22 @@
# Point of Sale Invoice
-Point of Sale (POS) is the place where a retail transaction is completed. It
-is the point at which a customer makes a payment to the merchant in exchange
-for goods or services. For retail operations, the delivery of goods, accrual
-of sale and payment all happens in one event, that is usually called the
-“Point of Sale”.
+For retail operations, the delivery of goods, accrual of sale and payment all happens in one event, that is usually called the “Point of Sale” (POS).
-You can make a Sales Invoice of type POS by checking on “Is POS”. When you
-check this, you will notice that some fields get hidden and some new ones
-emerge.
+
-> Tip: In retail, you may not create a separate Customer record for each
-customer. You can create a general Customer called “Walk-in Customer” and make
-all your transactions against this Customer record.
+###Offline POS
-#### Setting Up POS
+POS transactions are generally quick, hence should have as less dependency as possible. In ERPNext, you can create POS Invoices even when not connected to the internet.
+
+POS Invoices created in the offline mode will be saved locally in the browser. If internet connection is lost which creating POS Invoice, you will still be able can proceed forward. Once internet connection is available again, offline invoices will be synced, and pushed onto your ERPNext account. To learn more on how POS Invoices can be created when offline, [check here.](https://frappe.io/blog/blog/erpnext-features/offline-pos-in-erpnext-7)
+
+#### POS Profile
In ERPNext all Sales and Purchase transactions, like Sales Invoice, Quotation, Sales Order, Purchase Order etc. can be edited via the POS. There two steps to Setup POS:
1. Enable POS View via (Setup > Customize > Feature Setup)
2. Create a [POS Setting]({{docs_base_url}}/user/manual/en/setting-up/pos-setting.html) record
-#### Switch to POS View
-
-Open any sales / purchase transaction. Click on the Computer Icon.
-
#### Different sections of the POS
* Update Stock: If this is checked, Stock Ledger Entries will be made when you “Submit” this Sales Invoice thereby eliminating the need for a separate Delivery Note.
@@ -32,17 +24,22 @@ Open any sales / purchase transaction. Click on the Computer
+
### Adding an Item
-At the billing counter, the retailer needs to select Items which the consumer
-buys. In the POS interface you can select an Item by two methods. One, is by
-clicking on the Item image and the other, is through the Barcode / Serial No.
+At the billing counter, the retailer needs to select Items which the consumer buys. In the POS interface you can select an Item by two methods. One, is by clicking on the Item image and the other, is through the Barcode / Serial No.
**Select Item** \- To select a product click on the Item image and add it into the cart. A cart is an area that prepares a customer for checkout by allowing to edit product information, adjust taxes and add discounts.
**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.
@@ -52,18 +49,11 @@ in Search box.
### Removing an Item
-There are two ways to remove an Item.
+Set Qty as zero to remove Item from the POS invoice. There are two ways to remove an Item.
- * Select an Item by clicking on the row of that Item from Item cart. Then click on “Del” button. OR
+ * If Item's Qty is 1, click on a minus sign to make it zero.
- * Enter 0(zero) quantity of any item to delete that item.
-
-To remove multiple Items together, select multiple rows & click on “Del”
-button.
-
-> Delete button appears only when Items are selected.
-
-
+ * Manually enter 0(zero) quantity.
### Make Payment
@@ -73,8 +63,8 @@ ready to make the Payment. Payment process is divided into 3 steps -
1. Click on “Make Payment” to get the Payment window.
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/manual/en/setting-up/print/cheque-print-template.md b/erpnext/docs/user/manual/en/setting-up/print/cheque-print-template.md
new file mode 100644
index 00000000000..44dd412f125
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/print/cheque-print-template.md
@@ -0,0 +1,45 @@
+#Cheque Print Template
+
+Business involves making payment to various parties like suppliers and employees. Payment can be made in various modes like cash, NEFT or cheque. If you are making a payment via cheque, you can also create a Print Format for printing Cheque from ERPNext based on the Payment Entry.
+
+
+
+Using the Cheque Print Template you can generate a new Print Format based. It will be created based the cheque format provided by your bank.
+
+####Create New
+
+To create a new Print Format based on the specific cheque’s format, go to:
+
+`Account > Tools > Cheque Printing Template > New`
+
+In the Cheque Print Template, for each value (say Payee, Date), exact co-ordinates are provided based on where that value should be printed on a cheque. Co-ordinates are provided in centi-meter.
+
+
+
+####New Format via Scanning
+
+To speed up creation of a new cheque printing format, you can upload scanned image of the cheque. Considering the scanned image for the cheque, system automatically updates co-ordinates for each value like party name, amount, date, amount in words etc.
+
+
+
+####New format by manual entry
+You can manually provide the co-ordinate for each value based on where you want to to be printed on the cheque.
+
+####Preview
+Based on co-ordinates provided for all the values, a preview be shown as to how the values will be printed on the cheque.
+
+
+
+####New Print Format
+
+If the preview looks promising, click on the button to create a new Print Format for printing cheque. Based on the values provided in the Cheque Print Template, the system will auto-generate an HTML script for the cheque’s Print Format.
+
+
+
+####Printing Cheque
+
+New print format generated for the cheque will be visible in the Payment Entry form. After creating the payment entry, you will be able to print transaction details on the cheque.
+
+
+
+
diff --git a/erpnext/docs/user/manual/en/setting-up/print/index.txt b/erpnext/docs/user/manual/en/setting-up/print/index.txt
index 0ddb2170cb2..59aedee9ffe 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/print/index.txt
@@ -4,3 +4,4 @@ print-headings
letter-head
address-template
terms-and-conditions
+cheque-print-template
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/make_guardian.py b/erpnext/patches/v7_0/make_guardian.py
index f2d0cf7c8b0..15b9bd15b20 100644
--- a/erpnext/patches/v7_0/make_guardian.py
+++ b/erpnext/patches/v7_0/make_guardian.py
@@ -5,6 +5,7 @@ def execute():
if frappe.db.exists("DocType", "Student") and "father_name" in frappe.db.get_table_columns("Student"):
frappe.reload_doc("schools", "doctype", "student")
frappe.reload_doc("schools", "doctype", "guardian")
+ frappe.reload_doc("schools", "doctype", "guardian_interest")
students = frappe.get_all("Student", fields=["name", "father_name", "father_email_id",
"mother_name", "mother_email_id"])
-> **Note:** You can also set default depreciation related Accounts and Cost Centers in Company.
-
+> **Note:** You can also set default depreciation related Accounts and Cost Centers in Company master.
## Asset
-Next step will be creating the fixed asset record. Asset record is the heart of fixed asset management, all the activities like purchasing, depreciation, scrapping or sales are managed against it.
+Asset master is the heart of fixed asset management feature. All the transactions related to Asset like purchasing, sales, depreciation, scrapping will be managed from the Asset master.
Explanation of the fields:
-1. Asset Category: The category of assets it belongs to.
-2. Is Existing Asset: Check if the asset is being carried forward from the previous Fiscal Year. The existing assets which are partially / fully depreciated can also be created/maintained for the future reference.
-3. Status: The options are - Draft, Submitted, Partially Depreciated, Fully Depreciated, Sold and Scrapped.
-4. Warehouse: Set the location of the asset.
-5. Gross Purchase Amount: The purchase cost of the asset
-6. Expected Value After Useful Life: Useful Life is the time period over in which the company expects that the asset will be productive. After that period, either the asset is scrapped or sold. In case it is sold, mention the estimated value here. This value is also known as Salvage Value, Scrap Value or Residual Value.
-7. Opening Accumulated Depreciation: The accumulated depreciation amount which has already been booked for an existing asset.
-8. Current Value (After Depreciation): In case you are creating record of an existing asset which has already been partially/fully depreciated, mention the currect value of the asset. In case of new asset, mention the purchase amount or leave it blank.
-9. Depreciation Method: There are two options: Straight Line and Double Declining Balance.
+1. Item Code: An Item for the Asset must be a non-stock item, with "Is Asset" field checked.
+
+ 
+
+2. Asset Category: The category of assets it belongs to.
+3. Is Existing Asset: Check if the asset is being carried forward from the previous Fiscal Year. The existing assets which are partially / fully depreciated can also be created/maintained for the future reference.
+4. Status: The options are - Draft, Submitted, Partially Depreciated, Fully Depreciated, Sold and Scrapped.
+5. Warehouse: Set the location of the asset.
+6. Gross Purchase Amount: The purchase cost of the asset.
+7. Expected Value After Useful Life: Useful Life is the time period over in which the company expects that the asset will be productive. After that period, either the asset is scrapped or sold. In case it is sold, mention the estimated value here. This value is also known as Salvage Value, Scrap Value or Residual Value.
+8. Opening Accumulated Depreciation: The accumulated depreciation amount which has already been booked for an existing asset.
+9. Current Value (After Depreciation): In case you are creating record of an existing asset which has already been partially/fully depreciated, mention the current value of the asset. In case of new asset, mention the purchase amount or leave it blank.
+10. Depreciation Method: There are two options: Straight Line and Double Declining Balance.
- Straight Line: This method spreads the cost of the fixed asset evenly over its useful life.
- Double Declining Method: An accelerated method of depreciation, it results in higher depreciation expense in the earlier years of ownership.
10. Total Number of Depreciations: The total number of depreciations during the useful life. In case of existing assets which are partially depreciated, mention the number of pending depreciations.
@@ -52,16 +55,16 @@ For better visibility, net value of the asset on different depreciation dates ar
## Purchase an Asset
-For purchasing a new asset, create and submit the asset record with all the depreciation settings. Then create a Purchase Invoice via "Make Purchase Invoice" button. On clicking the button, system will load a new Purchase Invoice form with pre-loaded items table. It will also set proper fixed asset account (defined in teh Asset Category) in the Expense Account field. You need to select Supplier and other necessary details and submit the Purchase Invoice.
+For purchasing a new asset, create and submit the asset record with all the depreciation settings. Then create a Purchase Invoice via "Make Purchase Invoice" button. On clicking the button, system will load a new Purchase Invoice form with pre-loaded items table. It will also set proper fixed asset account (defined in the Asset Category) in the Expense Account field. You need to select Supplier and other necessary details and submit the Purchase Invoice.
-On submission of the invoice, the "Fixed Asset Account" will be debited and payable account will be credited. It also updates purchase date, supplier and Purchase Invoice no in the Asset record.
+On submission of the invoice, the "Fixed Asset Account" will be debited and payable account will be credited. It also updates purchase date, supplier and Purchase Invoice no. in the Asset master.
## Sale an Asset
-To sale an asset, open the asset record and create a Sales Invoice using "Sale Asset" button. On submission of the Sales Invoice, following entries will take place:
+To sale an asset, open the asset record and create a Sales Invoice by clicking on "Sale Asset". On submission of the Sales Invoice, following entries will take place:
- "Receivable Account" (Debtors) will be debited by the sales amount.
- "Fixed Asset Account" will be credited by the purchase amount of asset.
diff --git a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
index 8f646f723ce..b0b6bcc1351 100644
--- a/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/point-of-sale-pos-invoice.md
@@ -1,30 +1,22 @@
# Point of Sale Invoice
-Point of Sale (POS) is the place where a retail transaction is completed. It
-is the point at which a customer makes a payment to the merchant in exchange
-for goods or services. For retail operations, the delivery of goods, accrual
-of sale and payment all happens in one event, that is usually called the
-“Point of Sale”.
+For retail operations, the delivery of goods, accrual of sale and payment all happens in one event, that is usually called the “Point of Sale” (POS).
-You can make a Sales Invoice of type POS by checking on “Is POS”. When you
-check this, you will notice that some fields get hidden and some new ones
-emerge.
+
-> Tip: In retail, you may not create a separate Customer record for each
-customer. You can create a general Customer called “Walk-in Customer” and make
-all your transactions against this Customer record.
+###Offline POS
-#### Setting Up POS
+POS transactions are generally quick, hence should have as less dependency as possible. In ERPNext, you can create POS Invoices even when not connected to the internet.
+
+POS Invoices created in the offline mode will be saved locally in the browser. If internet connection is lost which creating POS Invoice, you will still be able can proceed forward. Once internet connection is available again, offline invoices will be synced, and pushed onto your ERPNext account. To learn more on how POS Invoices can be created when offline, [check here.](https://frappe.io/blog/blog/erpnext-features/offline-pos-in-erpnext-7)
+
+#### POS Profile
In ERPNext all Sales and Purchase transactions, like Sales Invoice, Quotation, Sales Order, Purchase Order etc. can be edited via the POS. There two steps to Setup POS:
1. Enable POS View via (Setup > Customize > Feature Setup)
2. Create a [POS Setting]({{docs_base_url}}/user/manual/en/setting-up/pos-setting.html) record
-#### Switch to POS View
-
-Open any sales / purchase transaction. Click on the Computer Icon.
-
#### Different sections of the POS
* Update Stock: If this is checked, Stock Ledger Entries will be made when you “Submit” this Sales Invoice thereby eliminating the need for a separate Delivery Note.
@@ -32,17 +24,22 @@ Open any sales / purchase transaction. Click on the Computer
+
### Adding an Item
-At the billing counter, the retailer needs to select Items which the consumer
-buys. In the POS interface you can select an Item by two methods. One, is by
-clicking on the Item image and the other, is through the Barcode / Serial No.
+At the billing counter, the retailer needs to select Items which the consumer buys. In the POS interface you can select an Item by two methods. One, is by clicking on the Item image and the other, is through the Barcode / Serial No.
**Select Item** \- To select a product click on the Item image and add it into the cart. A cart is an area that prepares a customer for checkout by allowing to edit product information, adjust taxes and add discounts.
**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.
@@ -52,18 +49,11 @@ in Search box.
### Removing an Item
-There are two ways to remove an Item.
+Set Qty as zero to remove Item from the POS invoice. There are two ways to remove an Item.
- * Select an Item by clicking on the row of that Item from Item cart. Then click on “Del” button. OR
+ * If Item's Qty is 1, click on a minus sign to make it zero.
- * Enter 0(zero) quantity of any item to delete that item.
-
-To remove multiple Items together, select multiple rows & click on “Del”
-button.
-
-> Delete button appears only when Items are selected.
-
-
+ * Manually enter 0(zero) quantity.
### Make Payment
@@ -73,8 +63,8 @@ ready to make the Payment. Payment process is divided into 3 steps -
1. Click on “Make Payment” to get the Payment window.
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/manual/en/setting-up/print/cheque-print-template.md b/erpnext/docs/user/manual/en/setting-up/print/cheque-print-template.md
new file mode 100644
index 00000000000..44dd412f125
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/print/cheque-print-template.md
@@ -0,0 +1,45 @@
+#Cheque Print Template
+
+Business involves making payment to various parties like suppliers and employees. Payment can be made in various modes like cash, NEFT or cheque. If you are making a payment via cheque, you can also create a Print Format for printing Cheque from ERPNext based on the Payment Entry.
+
+
+
+Using the Cheque Print Template you can generate a new Print Format based. It will be created based the cheque format provided by your bank.
+
+####Create New
+
+To create a new Print Format based on the specific cheque’s format, go to:
+
+`Account > Tools > Cheque Printing Template > New`
+
+In the Cheque Print Template, for each value (say Payee, Date), exact co-ordinates are provided based on where that value should be printed on a cheque. Co-ordinates are provided in centi-meter.
+
+
+
+####New Format via Scanning
+
+To speed up creation of a new cheque printing format, you can upload scanned image of the cheque. Considering the scanned image for the cheque, system automatically updates co-ordinates for each value like party name, amount, date, amount in words etc.
+
+
+
+####New format by manual entry
+You can manually provide the co-ordinate for each value based on where you want to to be printed on the cheque.
+
+####Preview
+Based on co-ordinates provided for all the values, a preview be shown as to how the values will be printed on the cheque.
+
+
+
+####New Print Format
+
+If the preview looks promising, click on the button to create a new Print Format for printing cheque. Based on the values provided in the Cheque Print Template, the system will auto-generate an HTML script for the cheque’s Print Format.
+
+
+
+####Printing Cheque
+
+New print format generated for the cheque will be visible in the Payment Entry form. After creating the payment entry, you will be able to print transaction details on the cheque.
+
+
+
+
diff --git a/erpnext/docs/user/manual/en/setting-up/print/index.txt b/erpnext/docs/user/manual/en/setting-up/print/index.txt
index 0ddb2170cb2..59aedee9ffe 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/print/index.txt
@@ -4,3 +4,4 @@ print-headings
letter-head
address-template
terms-and-conditions
+cheque-print-template
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/make_guardian.py b/erpnext/patches/v7_0/make_guardian.py
index f2d0cf7c8b0..15b9bd15b20 100644
--- a/erpnext/patches/v7_0/make_guardian.py
+++ b/erpnext/patches/v7_0/make_guardian.py
@@ -5,6 +5,7 @@ def execute():
if frappe.db.exists("DocType", "Student") and "father_name" in frappe.db.get_table_columns("Student"):
frappe.reload_doc("schools", "doctype", "student")
frappe.reload_doc("schools", "doctype", "guardian")
+ frappe.reload_doc("schools", "doctype", "guardian_interest")
students = frappe.get_all("Student", fields=["name", "father_name", "father_email_id",
"mother_name", "mother_email_id"])