Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed articles

Browse Source
This commit is contained in:
Umair Sayyed 2016-01-27 18:19:06 +05:30
parent 694edbc89a
commit bf225c11b4
5 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/docs/user/manual/en/selling/articles/applying-discount.md
View File

@ -6,24 +6,28 @@ There are several ways Discount can be applied on an item in the sales transacti
You can find the Discount (%) field in the Item table. Discount (%) is applied on the Price List Rate to get the selling Rate of the Item.
<img alt="Discount Percentage" class="screenshot" src="{{docs_base_url}}/assets/image/articles/discount-1.png">
<img alt="Discount Percentage" class="screenshot" src="{{docs_base_url}}/assets/img/articles/discount-1.png">
The feature of Discount (%) is available in all sales and purchase transactions.
You can use Pricing Rule to automatically apply Discount (%). [Click here to learn how Pricing Rule functions.]({{docs_base_url}}/user/manual/en/accounts/pricing-rule.html)
You can use Pricing Rule for auto-application of Discount (%). [Click here to learn how Pricing Rule functions.]({{docs_base_url}}/user/manual/en/accounts/pricing-rule.html)
#### 2. Discount on Net Total and Grand Total
In the "Additional Discount" section, you can apply flat discount, as amount or as percentage.
In the "Additional Discount" section, you can apply discount as amount or as percentage.
<img alt="Discount Percentage" class="screenshot" src="{{docs_base_url}}/assets/image/articles/discount-2.png">
<img alt="Discount Percentage" class="screenshot" src="{{docs_base_url}}/assets/img/articles/discount-2.png">
If Discount Amount is applied based on the **Net Total**, then item's Net Rate and Net Amount is reduced as per the Discount Amount.
##### Discount on Net Total
<img alt="Discount Percentage" class="screenshot" src="{{docs_base_url}}/assets/image/articles/discount-on-net-total.png">
If Discount Amount is applied on **Net Total**, then item's Net Rate and Net Amount is calculated as per the Discount Amount. Net Rate and Amount field will be visible only if Discount is applied using this feature.
<img alt="Discount Percentage" class="screenshot" src="{{docs_base_url}}/assets/img/articles/discount-on-net-total.png">
##### Discount on Grand Total
If Discount Amount is applied based on the **Grand Total**, then with item's Net Rate, Net Amount as well as taxes are also re-calculated as per Discount Amount.
<img alt="Discount Percentage" class="screenshot" src="{{docs_base_url}}/assets/image/articles/discount-on-grand-total.png">
<img alt="Discount Percentage" class="screenshot" src="{{docs_base_url}}/assets/img/articles/discount-on-grand-total.png">
<!-- markdown -->

6
erpnext/docs/user/manual/en/selling/articles/close-sales-order.md
View File

@ -2,9 +2,7 @@
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.
<img alt="Close SO" class="screenshot" src="{{docs_base_url}}/assets/image/articles/close-1.png">
![stop Sales Order]({{docs_base_url}}/assets/img/articles/$SGrab_439.png)
<img alt="Close SO" class="screenshot" src="{{docs_base_url}}/assets/img/articles/close-1.png">
####Scenario
@ -12,7 +10,7 @@ An order is received for ten Wind Turbines. Sales Order is also created for ten
In this case, create Delivery Note and Sales Invoice will be created only for the seven units. And the Sales Order should be set as stopped.
![Sales Order Stopped]({{docs_base_url}}/assets/img/articles/$SGrab_440.png)
<img alt="Closed SO" class="screenshot" src="{{docs_base_url}}/assets/img/articles/close-2.png">
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.

4
erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md
View File

@ -1,4 +1,4 @@
#ERPNext for Service Organizations
#ERPNext for Service Organization
**Question:** ERPNext looks primarily designed for the traders and manufacturers. Is ERPNext used by companies offering servies?
@ -14,7 +14,7 @@ The setup for a Service company differs primarily for Items. They don't maintain
To create a Service (non-stock) Item, in the item master, uncheck "Maintain Stock" field.
<img alt="Service Item" class="screenshot" src="{{docs_base_url}}/assets/image/articles/services-1.png">
<img alt="Service Item" class="screenshot" src="{{docs_base_url}}/assets/img/articles/services-1.png">
When creating Sales Order for the services, select Order Type as **Maintenance**. Sales Order of Maintenance Type needs lesser details compared to stock item's order like Delivery Note, item warehouse etc.

10
erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md
View File

@ -1,16 +1,16 @@
#Sales Persons in the Sale Transactions
#Sales Persons in the Sales Transactions
In ERPNext, Sales Person master is maintained in [tree structure]({{docs_base_url}}/user/manual/en/setting-up/articles/managing-tree-structure-masters.html). Sales Person is selectable in all the sales transactions.
Sales Persons can be updated in the Customer master as well. On selection of Customer in the transactions, Sales Persons as updated in the Customer will fetch into sales transaction.
<img class="screenshot" alt="Sales Person Customer" src="{{docs_base_url}}/assets/img/selling/sales-person-transaction-1.png">
<img class="screenshot" alt="Sales Person Customer" src="{{docs_base_url}}/assets/img/articles/sales-person-transaction-1.png">
####Sales Person Contribution
If more than one sales persons are working together on an order, then contribution (%) should be set for each Sales Person.
<img class="screenshot" alt="Sales Person Order" src="{{docs_base_url}}/assets/img/selling/sales-person-transaction-2.png">
<img class="screenshot" alt="Sales Person Order" src="{{docs_base_url}}/assets/img/articles/sales-person-transaction-2.png">
On saving transaction, based on the Net Total and Contriution (%), `Contribution to Net Total` will be calculated for each Sales Person.
@ -24,7 +24,7 @@ Check Sales Person's Transaction report from:
This report can be generated based on Sales Order, Delivery Note and Sales Invoice. It will give you total amount of sale made by an employe.
<img class="screenshot" alt="Sales Person Report" src="{{docs_base_url}}/assets/img/selling/sales-person-transaction-3.png">
<img class="screenshot" alt="Sales Person Report" src="{{docs_base_url}}/assets/img/articles/sales-person-transaction-3.png">
####Sales Person wise Commission
@ -38,7 +38,7 @@ If you don't track Sales Person wise performance, and doesn't wish to use this f
`Setup > Customize > Features Setup`
<img class="screenshot" alt="Disable Sales Person" src="{{docs_base_url}}/assets/img/selling/sales-person-transaction-4.png">
<img class="screenshot" alt="Disable Sales Person" src="{{docs_base_url}}/assets/img/articles/sales-person-transaction-4.png">
On disabling this feature, fields and tables related to Sales Person will become hidden from masters and transcations.

8
erpnext/docs/user/manual/en/selling/articles/shipping-rule.md
View File

@ -10,7 +10,7 @@ To setup Shipping Rule, go to:
####Shipping Rule Conditions
<img alt="Shipping Rule Prices" class="screenshot" src="{{docs_base_url}}/assets/image/articles/shipping-charges-1.png">
<img alt="Shipping Rule Prices" class="screenshot" src="{{docs_base_url}}/assets/img/articles/shipping-charges-1.png">
Referring above, you will notice that shipping charges are reducing as valye is increasing. This shipping charge will only be applied if transaction total falls under one of the above range.
@ -18,16 +18,16 @@ Referring above, you will notice that shipping charges are reducing as valye is
You can set Shipping Charges valid for all the countries, or specify specific Country. If specific countries mentioned, then Shipping Charges will be applied only if Customer's country matches Country mentioned in the Shipping Rule.
<img alt="Shipping Rule " class="screenshot" src="{{docs_base_url}}/assets/image/articles/shipping-charges-2.gif">
<img alt="Shipping Rule " class="screenshot" src="{{docs_base_url}}/assets/img/articles/shipping-charges-2.gif">
####Shipping Account
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 transaction. Hence these details are tracked as well in the Shipping Rule.
<img alt="Shipping Account" class="screenshot" src="{{docs_base_url}}/assets/image/articles/shipping-charges-3.png">
<img alt="Shipping Account" class="screenshot" src="{{docs_base_url}}/assets/img/articles/shipping-charges-3.png">
####Shipping Rule Application
Following is an example of how shipping charges is auto-applied on Sales Order based on Shipping Rule.
<img alt="Shipping Rule Application" class="screenshot" src="{{docs_base_url}}/assets/image/articles/shipping-charges-4.gif">
<img alt="Shipping Rule Application" class="screenshot" src="{{docs_base_url}}/assets/img/articles/shipping-charges-4.gif">