diff --git a/erpnext/docs/assets/img/accounts/change-amount.png b/erpnext/docs/assets/img/accounts/change-amount.png new file mode 100644 index 00000000000..33f9c88991c Binary files /dev/null and b/erpnext/docs/assets/img/accounts/change-amount.png differ diff --git a/erpnext/docs/assets/img/accounts/offline-records.png b/erpnext/docs/assets/img/accounts/offline-records.png new file mode 100644 index 00000000000..78bb730b091 Binary files /dev/null and b/erpnext/docs/assets/img/accounts/offline-records.png differ diff --git a/erpnext/docs/assets/img/accounts/pos-item.png b/erpnext/docs/assets/img/accounts/pos-item.png index fb6c1f87dde..321e8dc392a 100644 Binary files a/erpnext/docs/assets/img/accounts/pos-item.png 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 index 0a0d37f5517..187e82c4020 100644 Binary files a/erpnext/docs/assets/img/accounts/pos-payment.png and b/erpnext/docs/assets/img/accounts/pos-payment.png differ diff --git a/erpnext/docs/assets/img/accounts/write-off.png b/erpnext/docs/assets/img/accounts/write-off.png new file mode 100644 index 00000000000..c6896ea8232 Binary files /dev/null and b/erpnext/docs/assets/img/accounts/write-off.png differ diff --git a/erpnext/docs/assets/img/articles/price-list.png b/erpnext/docs/assets/img/articles/price-list.png new file mode 100644 index 00000000000..a6982f9eb5c Binary files /dev/null and b/erpnext/docs/assets/img/articles/price-list.png differ diff --git a/erpnext/docs/assets/img/articles/pricing-rule-invoice.png b/erpnext/docs/assets/img/articles/pricing-rule-invoice.png new file mode 100644 index 00000000000..79d7fa7b9b9 Binary files /dev/null and b/erpnext/docs/assets/img/articles/pricing-rule-invoice.png differ diff --git a/erpnext/docs/assets/img/articles/pricing-rule-margin.png b/erpnext/docs/assets/img/articles/pricing-rule-margin.png new file mode 100644 index 00000000000..66f6050c334 Binary files /dev/null and b/erpnext/docs/assets/img/articles/pricing-rule-margin.png differ 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 6a697b1d85d..64fa22c5b84 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 @@ -69,6 +69,25 @@ ready to make the Payment. Payment process is divided into 3 steps - Submit the document to finalise the record. After the document is submitted, you can either print or email it directly to the customer. +### Write off Amount + +Outstanding amount can be write off from the POS, user has to enter the amount under write off field on the payment screen. + +POS Payment + +System books the write off amount into the ledger which has selected on the POS Profile. + +### Change Amount + +POS calculate the extra amount paid by the customer, which user can return from the cash account. User has to set the account for the change amount on the POS profile. + +POS Payment + +### Offline Records +All the records from the POS stores into the browser's local storegae and sync submitted records after every minute of the interval if system is connected to internet. User can view the offline records by clicking on Menu > View Offline Records + +POS Payment + #### Accounting entries (GL Entry) for a Point of Sale: Debits: @@ -82,6 +101,7 @@ Credits: * Taxes (liabilities to be paid to the government) * Customer (payment) * Write Off (optional) + * Account for Change Amount (optional) To see entries after “Submit”, click on “View Ledger”. diff --git a/erpnext/docs/user/manual/en/accounts/pricing-rule.md b/erpnext/docs/user/manual/en/accounts/pricing-rule.md index 7afcbea0a1d..bd3c51a8346 100644 --- a/erpnext/docs/user/manual/en/accounts/pricing-rule.md +++ b/erpnext/docs/user/manual/en/accounts/pricing-rule.md @@ -79,4 +79,31 @@ Check to Disable Pricing Rule. Disable +### Add Margin + +Using pricing rule user can add margin on the sales transactions + +For example : User want to add 10% margin on the supplier price list at the time of sales + +####1. Make Price List + +Create price list for supllier and create item price against the price list. + +Disable + + +####2. Make Pricing Rule + +Create pricing rule for the item against which supplier rate has created + +Disable + +####2. Make Invoice + +System apply the margin rate on the item price on selection of an item. + +Disable + +For more details about pricing rule [Click Here]({{docs_base_url}}/user/manual/en/selling/articles/adding-margin.html) + \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/selling/articles/adding-margin.md b/erpnext/docs/user/manual/en/selling/articles/adding-margin.md index 2a9ddfa25ec..2b2fb093506 100644 --- a/erpnext/docs/user/manual/en/selling/articles/adding-margin.md +++ b/erpnext/docs/user/manual/en/selling/articles/adding-margin.md @@ -9,7 +9,7 @@ To setup Pricing Rule, go to: ####Adding Margin in Pricing Rule -Adding Margin in Pricing Rule +Adding Margin in Pricing Rule Total Margin is calculated as follows: `Rate = Price List Rate + Margin Rate` @@ -22,7 +22,7 @@ To add Price List, go to: ####Adding Item Price -Adding Margin in Pricing Rule +Adding Margin in Pricing Rule 2) Apply margin direct on Item: If user wants to apply the margin without pricing rule, they can use this option. In Quotation Item and Sales Order Item, user can select the margin type and rate or amount. The system will calculate the margin and apply it on price list rate to calculate the rate of the product. @@ -34,4 +34,4 @@ add item and scroll down to section where you can find the Margin Type ####Adding Margin in Quotation -Adding Margin in Quotation +Adding Margin in Quotation