diff --git a/erpnext/docs/assets/img/articles/discount-on-grand-total.png b/erpnext/docs/assets/img/articles/discount-on-grand-total.png new file mode 100644 index 0000000000..8c93145bfe Binary files /dev/null and b/erpnext/docs/assets/img/articles/discount-on-grand-total.png differ diff --git a/erpnext/docs/assets/img/articles/discount-on-net-total.png b/erpnext/docs/assets/img/articles/discount-on-net-total.png new file mode 100644 index 0000000000..406d7535ac Binary files /dev/null and b/erpnext/docs/assets/img/articles/discount-on-net-total.png differ diff --git a/erpnext/docs/assets/img/articles/services-1.gif b/erpnext/docs/assets/img/articles/services-1.gif deleted file mode 100644 index 8f6b658603..0000000000 Binary files a/erpnext/docs/assets/img/articles/services-1.gif and /dev/null differ diff --git a/erpnext/docs/assets/img/articles/services-1.png b/erpnext/docs/assets/img/articles/services-1.png new file mode 100644 index 0000000000..974bcf65ea Binary files /dev/null and b/erpnext/docs/assets/img/articles/services-1.png differ diff --git a/erpnext/docs/user/manual/en/selling/articles/applying-discount.md b/erpnext/docs/user/manual/en/selling/articles/applying-discount.md index a023e87604..31a12661f8 100644 --- a/erpnext/docs/user/manual/en/selling/articles/applying-discount.md +++ b/erpnext/docs/user/manual/en/selling/articles/applying-discount.md @@ -1,25 +1,29 @@ #Applying Discount -There are several ways Discount can be applied on an items in the sales transactions. +There are several ways Discount can be applied on an item in the sales transactions. #### 1. Discount on "Price List Rate" of an item -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. +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. Discount Percentage -The feature of % Discount is available in all the sales and purchase transactions. +The feature of Discount (%) is available in all sales and purchase transactions. -You can also %Discount applied based on **Pricing Rule** as well. [Click here to learn how Pricing Rule functions.]({{docs_base_url}}/user/manual/en/accounts/pricing-rule.html) +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) #### 2. Discount on Net Total and Grand Total -From the "Additional Discount" section, you can apply flat discount, as amount or as percentage. +In the "Additional Discount" section, you can apply flat discount, as amount or as percentage. Discount Percentage 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. -If Discount Amount is applied based on the **Grand Total**, then with item's Net Rate, Net Amount and taxes are also re-calculated as per Discount Amount. +Discount Percentage + +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. + +Discount Percentage \ No newline at end of file diff --git a/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md b/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md index cd312ce00a..4b69334d5d 100644 --- a/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md +++ b/erpnext/docs/user/manual/en/selling/articles/erpnext-for-services-organization.md @@ -10,33 +10,33 @@ About 30% of ERPNext customers are companies into services. These are companies ###Master Setup -Between the service and trading company, the differentiating master is an **Item** master. Service companies items are non-stock and service items. They don't have stock and warehouse to them. +The setup for a Service company differs primarily for Items. They don't maintain the Stock for Items and thus, don't have Warehouses. -To create a services (non-stock) Item, in the item master, uncheck "Maintain Stock" field. +To create a Service (non-stock) Item, in the item master, uncheck "Maintain Stock" field. -Service Item +Service Item 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. -However, they can still add stock items to mantain their fixed assets etc. +Service company can still add stock items to mantain their fixed assets like computers, furniture and other office equipments. ###Hiding Non-required Features -Since many modules like Manufacturing and stock will not be required for the services company, you can hide those modules from: +Since many modules like Manufacturing and Stock will not be required for the services company, you can hide those modules from: `Setup > Permissions > Show/Hide Modules` -Modules uncheck here will be hidden from every user in the Commpany. +Modules unchecked here will be hidden from all the User. ####Feature Setup -Within the form, there are many fields only needed for companies into trading and manufacturing business. These fields can be hidden for the service Companies. Feature Setup is a tool where you can enable/disable specific feature. If specific feature is disabled, then fields relevant to that feature is hidden from all the forms. For example, if Serial No. feature is disabled from the Featue Setup, then Serial. No. field from Item master and all the sales and purchase transaction will be hidden. +Within the form, there are many fields only needed for companies into trading and manufacturing businesses. These fields can be hidden for the service company. Feature Setup is a tool where you can enable/disable specific feature. If a feature is disabled, then fields relevant to that feature is hidden from all the forms. For example, if Serial No. feature is disabled, then Serial. No. field from Item as well as from all the sales and purchase transaction will be hidden. [To learn more about Feature Setup, click here.]({{docs_base_url}}/user/manual/en/customize-erpnext/hiding-modules-and-features.html). ####Permissions -ERPNext is the permission driven system. Users access system based on permissions assigned to them. So, if user is not assigned Role related to Stock and Manufacturing module, it will be hidden from user. [Click here to learn more about permission management.]({{docs_base_url}}/user/manual/en/setting-up/users-and-permissions.html). +ERPNext is the permission controlled system. Users access system based on permissions assigned to them. So, if user is not assigned Role related to Stock and Manufacturing module, it will be hidden from that User. [Click here to learn more about permission management.]({{docs_base_url}}/user/manual/en/setting-up/users-and-permissions.html). You can also refer to help video on User and Permissions setting in ERPNext. diff --git a/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md b/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md index 1acf7f019b..eda09375f1 100644 --- a/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md +++ b/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md @@ -1,43 +1,45 @@ #Sales Persons in the Sale 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 table is available in all the Sales transactions where you can select Sales Person who worked on that specific sales transaction. +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, default Sales Persons for that Customer will be auto-fetched. +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. Sales Person Customer ####Sales Person Contribution -If more than one sales persons are working together on an order, then contribution % should also for each Sales Person, based on their effort. +If more than one sales persons are working together on an order, then contribution (%) should be set for each Sales Person. Sales Person Order -On saving transaction, based on the Net Total and %Contriution, Contribution to Net Total will be calculated for each Sales Person. +On saving transaction, based on the Net Total and Contriution (%), `Contribution to Net Total` will be calculated for each Sales Person.
Total % Contribution for all Sales Person must be 100%. If only one Sales Person is selected, then % Contribution will be 100.
####Sales Person Transaction Report -You can check Sales Person Transaction Report from: +Check Sales Person's Transaction report from: `Selling > Standard Reports > Sales Personwise Transaction Summary` -This report can be generated based on Sales Order, Delivery Note and Sales Invoice. It will give you total amount of sales made by an employee over a period. +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. Sales Person Report ####Sales Person wise Commission -ERPNext doesn't calculate commission payable to an Employee, but only provide total amount of sales made by him/her. As a work around, you can add your Sales Person as Sales Partner, as commission calculation feature is readily available in ERPNext. You can check Sales Partner's Commission report from +ERPNext only provide total amount of sale made by a Sales Person. If you offer commission to Sales Person, you should add Sales Person as Sales Partners in ERPNext. For Sales Partners, you can define Commission (%). On selected on Sales Partner in a sales transction, based on Net Total, Commission Amount is calculated as well. You can check Sales Partner's commission report from: `Accounts > Standard Reports > Sales Partners Commission` ####Disable Sales Person Feature -If you don't track sales person wise performance, and doesn't wish to use this feature, you can disable it from: +If you don't track Sales Person wise performance, and doesn't wish to use this feature, you can disable it from: -`Setup > Customize > Features Setup` +`Setup > Customize > Features Setup` Disable Sales Person +On disabling this feature, fields and tables related to Sales Person will become hidden from masters and transcations. + \ No newline at end of file