Merge pull request #4694 from umairsy/21-jan
Updated articles
diff --git a/erpnext/docs/assets/img/articles/$SGrab_258.png b/erpnext/docs/assets/img/articles/$SGrab_258.png
deleted file mode 100644
index c5d59f8..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_258.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_260.png b/erpnext/docs/assets/img/articles/$SGrab_260.png
deleted file mode 100644
index 4ba692b..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_260.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_261.png b/erpnext/docs/assets/img/articles/$SGrab_261.png
deleted file mode 100644
index a8a9fa4..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_261.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_439.png b/erpnext/docs/assets/img/articles/$SGrab_439.png
deleted file mode 100644
index 2afa5fd..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_439.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_440.png b/erpnext/docs/assets/img/articles/$SGrab_440.png
deleted file mode 100644
index 6f62d34..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_440.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-01 at 5.32.57 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-04-01 at 5.32.57 pm.png
deleted file mode 100644
index 44fa23f..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-04-01 at 5.32.57 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_00616c670.png b/erpnext/docs/assets/img/articles/Selection_00616c670.png
deleted file mode 100644
index a9b5d45..0000000
--- a/erpnext/docs/assets/img/articles/Selection_00616c670.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_010496ae2.png b/erpnext/docs/assets/img/articles/Selection_010496ae2.png
deleted file mode 100644
index f2e2326..0000000
--- a/erpnext/docs/assets/img/articles/Selection_010496ae2.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_01087d575.png b/erpnext/docs/assets/img/articles/Selection_01087d575.png
deleted file mode 100644
index 52c6e2d..0000000
--- a/erpnext/docs/assets/img/articles/Selection_01087d575.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_011.png b/erpnext/docs/assets/img/articles/Selection_011.png
deleted file mode 100644
index 8bf4cfa..0000000
--- a/erpnext/docs/assets/img/articles/Selection_011.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_01244aec7.png b/erpnext/docs/assets/img/articles/Selection_01244aec7.png
deleted file mode 100644
index 3a1c50c..0000000
--- a/erpnext/docs/assets/img/articles/Selection_01244aec7.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/close-1.png b/erpnext/docs/assets/img/articles/close-1.png
new file mode 100644
index 0000000..3975f71
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/close-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/close-2.png b/erpnext/docs/assets/img/articles/close-2.png
new file mode 100644
index 0000000..f9e63f2
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/close-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/discount-1.png b/erpnext/docs/assets/img/articles/discount-1.png
new file mode 100644
index 0000000..32afa1f
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/discount-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/discount-2.png b/erpnext/docs/assets/img/articles/discount-2.png
new file mode 100644
index 0000000..0db98ae
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/discount-2.png
Binary files differ
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 0000000..8c93145
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/discount-on-grand-total.png
Binary files 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 0000000..406d753
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/discount-on-net-total.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/sales-person-transaction-1.png b/erpnext/docs/assets/img/articles/sales-person-transaction-1.png
new file mode 100644
index 0000000..c9aa23e
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/sales-person-transaction-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/sales-person-transaction-2.png b/erpnext/docs/assets/img/articles/sales-person-transaction-2.png
new file mode 100644
index 0000000..39bafae
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/sales-person-transaction-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/sales-person-transaction-3.png b/erpnext/docs/assets/img/articles/sales-person-transaction-3.png
new file mode 100644
index 0000000..420beba
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/sales-person-transaction-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/sales-person-transaction-4.png b/erpnext/docs/assets/img/articles/sales-person-transaction-4.png
new file mode 100644
index 0000000..5883c76
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/sales-person-transaction-4.png
Binary files 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 0000000..974bcf6
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/services-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/shipping-charges-1.png b/erpnext/docs/assets/img/articles/shipping-charges-1.png
new file mode 100644
index 0000000..31c5c18
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/shipping-charges-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/shipping-charges-2.gif b/erpnext/docs/assets/img/articles/shipping-charges-2.gif
new file mode 100644
index 0000000..7eedbdc
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/shipping-charges-2.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/shipping-charges-3.png b/erpnext/docs/assets/img/articles/shipping-charges-3.png
new file mode 100644
index 0000000..864c5b0
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/shipping-charges-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/shipping-charges-4.gif b/erpnext/docs/assets/img/articles/shipping-charges-4.gif
new file mode 100644
index 0000000..5890bb6
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/shipping-charges-4.gif
Binary files differ
diff --git a/erpnext/docs/current/api/accounts/erpnext.accounts.party.html b/erpnext/docs/current/api/accounts/erpnext.accounts.party.html
index e5c8d31..3ad5432 100644
--- a/erpnext/docs/current/api/accounts/erpnext.accounts.party.html
+++ b/erpnext/docs/current/api/accounts/erpnext.accounts.party.html
@@ -316,6 +316,22 @@
<p class="docs-attr-name">
+ <a name="erpnext.accounts.party.validate_party_frozen_disabled" href="#erpnext.accounts.party.validate_party_frozen_disabled" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ erpnext.accounts.party.<b>validate_party_frozen_disabled</b>
+ <i class="text-muted">(party_type, party_name)</i>
+ </p>
+ <div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+ <br>
+
+
+
+
+
+
+
+ <p class="docs-attr-name">
<a name="erpnext.accounts.party.validate_party_gle_currency" href="#erpnext.accounts.party.validate_party_gle_currency" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
erpnext.accounts.party.<b>validate_party_gle_currency</b>
diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.accounts_controller.html b/erpnext/docs/current/api/controllers/erpnext.controllers.accounts_controller.html
index 78705e3..79e4c04 100644
--- a/erpnext/docs/current/api/controllers/erpnext.controllers.accounts_controller.html
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.accounts_controller.html
@@ -55,20 +55,6 @@
<p class="docs-attr-name">
- <a name="before_recurring" href="#before_recurring" class="text-muted small">
- <i class="icon-link small" style="color: #ccc;"></i></a>
- <b>before_recurring</b>
- <i class="text-muted">(self)</i>
- </p>
- <div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
-</div>
- <br>
-
-
-
-
-
- <p class="docs-attr-name">
<a name="calculate_taxes_and_totals" href="#calculate_taxes_and_totals" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>calculate_taxes_and_totals</b>
diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.recurring_document.html b/erpnext/docs/current/api/controllers/erpnext.controllers.recurring_document.html
index b6ac163..172e191 100644
--- a/erpnext/docs/current/api/controllers/erpnext.controllers.recurring_document.html
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.recurring_document.html
@@ -85,7 +85,7 @@
<a name="erpnext.controllers.recurring_document.make_new_document" href="#erpnext.controllers.recurring_document.make_new_document" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
erpnext.controllers.recurring_document.<b>make_new_document</b>
- <i class="text-muted">(ref_wrapper, date_field, posting_date)</i>
+ <i class="text-muted">(reference_doc, date_field, posting_date)</i>
</p>
<div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
</div>
diff --git a/erpnext/docs/current/api/erpnext.exceptions.html b/erpnext/docs/current/api/erpnext.exceptions.html
index 7c91646..e8f5ee1 100644
--- a/erpnext/docs/current/api/erpnext.exceptions.html
+++ b/erpnext/docs/current/api/erpnext.exceptions.html
@@ -15,21 +15,6 @@
- <h3 style="font-weight: normal;">Class <b>CustomerFrozen</b></h3>
-
- <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
-
- <div class="docs-attr-desc"><p></p>
-</div>
- <div style="padding-left: 30px;">
-
- </div>
- <hr>
-
-
-
-
-
<h3 style="font-weight: normal;">Class <b>InvalidAccountCurrency</b></h3>
<p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
@@ -58,6 +43,36 @@
+
+
+ <h3 style="font-weight: normal;">Class <b>PartyDisabled</b></h3>
+
+ <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+
+ <div class="docs-attr-desc"><p></p>
+</div>
+ <div style="padding-left: 30px;">
+
+ </div>
+ <hr>
+
+
+
+
+
+ <h3 style="font-weight: normal;">Class <b>PartyFrozen</b></h3>
+
+ <p style="padding-left: 30px;"><i>Inherits from frappe.exceptions.ValidationError</i></h4>
+
+ <div class="docs-attr-desc"><p></p>
+</div>
+ <div style="padding-left: 30px;">
+
+ </div>
+ <hr>
+
+
+
<!-- autodoc -->
\ No newline at end of file
diff --git a/erpnext/docs/current/index.html b/erpnext/docs/current/index.html
index 01071ee..ec8d954 100644
--- a/erpnext/docs/current/index.html
+++ b/erpnext/docs/current/index.html
@@ -35,7 +35,7 @@
Version
</td>
<td>
- <code>6.17.0</code>
+ <code>6.18.4</code>
</td>
</tr>
</table>
diff --git a/erpnext/docs/current/models/accounts/period_closing_voucher.html b/erpnext/docs/current/models/accounts/period_closing_voucher.html
index 1a3aac1..c14226e 100644
--- a/erpnext/docs/current/models/accounts/period_closing_voucher.html
+++ b/erpnext/docs/current/models/accounts/period_closing_voucher.html
@@ -157,7 +157,7 @@
<td >
Closing Account Head
<p class="text-muted small">
- The account head under Liability or Equity, in which Profit/Loss will be booked</p>
+ The account head under Liability, in which Profit/Loss will be booked</p>
</td>
<td>
diff --git a/erpnext/docs/current/models/accounts/purchase_invoice.html b/erpnext/docs/current/models/accounts/purchase_invoice.html
index 1bdbcbf..b75f10a 100644
--- a/erpnext/docs/current/models/accounts/purchase_invoice.html
+++ b/erpnext/docs/current/models/accounts/purchase_invoice.html
@@ -1664,6 +1664,20 @@
<p class="docs-attr-name">
+ <a name="on_recurring" href="#on_recurring" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>on_recurring</b>
+ <i class="text-muted">(self, reference_doc)</i>
+ </p>
+ <div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+ <br>
+
+
+
+
+
+ <p class="docs-attr-name">
<a name="on_submit" href="#on_submit" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>on_submit</b>
diff --git a/erpnext/docs/current/models/accounts/sales_invoice.html b/erpnext/docs/current/models/accounts/sales_invoice.html
index 07e3212..8e62c40 100644
--- a/erpnext/docs/current/models/accounts/sales_invoice.html
+++ b/erpnext/docs/current/models/accounts/sales_invoice.html
@@ -2247,6 +2247,20 @@
<p class="docs-attr-name">
+ <a name="on_recurring" href="#on_recurring" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>on_recurring</b>
+ <i class="text-muted">(self, reference_doc)</i>
+ </p>
+ <div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+ <br>
+
+
+
+
+
+ <p class="docs-attr-name">
<a name="on_submit" href="#on_submit" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>on_submit</b>
diff --git a/erpnext/docs/current/models/buying/purchase_order.html b/erpnext/docs/current/models/buying/purchase_order.html
index c627191..bafaa2e 100644
--- a/erpnext/docs/current/models/buying/purchase_order.html
+++ b/erpnext/docs/current/models/buying/purchase_order.html
@@ -1538,20 +1538,6 @@
<p class="docs-attr-name">
- <a name="before_recurring" href="#before_recurring" class="text-muted small">
- <i class="icon-link small" style="color: #ccc;"></i></a>
- <b>before_recurring</b>
- <i class="text-muted">(self)</i>
- </p>
- <div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
-</div>
- <br>
-
-
-
-
-
- <p class="docs-attr-name">
<a name="check_for_stopped_or_closed_status" href="#check_for_stopped_or_closed_status" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>check_for_stopped_or_closed_status</b>
diff --git a/erpnext/docs/current/models/buying/supplier.html b/erpnext/docs/current/models/buying/supplier.html
index a4e2cd4..9cabf70 100644
--- a/erpnext/docs/current/models/buying/supplier.html
+++ b/erpnext/docs/current/models/buying/supplier.html
@@ -113,11 +113,11 @@
<tr >
<td>6</td>
- <td ><code>is_frozen</code></td>
+ <td ><code>disabled</code></td>
<td >
Check</td>
<td >
- Is Frozen
+ Disabled
</td>
<td></td>
@@ -177,8 +177,36 @@
</td>
</tr>
- <tr >
+ <tr class="info">
<td>10</td>
+ <td ><code>section_credit_limit</code></td>
+ <td >
+ Section Break</td>
+ <td >
+ Credit Limit
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>11</td>
+ <td ><code>credit_days_based_on</code></td>
+ <td >
+ Select</td>
+ <td >
+ Credit Days Based On
+
+ </td>
+ <td>
+ <pre>
+Fixed Days
+Last Day of the Next Month</pre>
+ </td>
+ </tr>
+
+ <tr >
+ <td>12</td>
<td ><code>credit_days</code></td>
<td >
Int</td>
@@ -190,7 +218,7 @@
</tr>
<tr class="info">
- <td>11</td>
+ <td>13</td>
<td ><code>address_contacts</code></td>
<td >
Section Break</td>
@@ -204,7 +232,7 @@
</tr>
<tr >
- <td>12</td>
+ <td>14</td>
<td ><code>address_html</code></td>
<td >
HTML</td>
@@ -216,7 +244,7 @@
</tr>
<tr >
- <td>13</td>
+ <td>15</td>
<td ><code>column_break1</code></td>
<td class="info">
Column Break</td>
@@ -228,7 +256,7 @@
</tr>
<tr >
- <td>14</td>
+ <td>16</td>
<td ><code>contact_html</code></td>
<td >
HTML</td>
@@ -240,7 +268,7 @@
</tr>
<tr class="info">
- <td>15</td>
+ <td>17</td>
<td ><code>default_payable_accounts</code></td>
<td >
Section Break</td>
@@ -252,7 +280,7 @@
</tr>
<tr >
- <td>16</td>
+ <td>18</td>
<td ><code>accounts</code></td>
<td >
Table</td>
@@ -274,19 +302,19 @@
</tr>
<tr class="info">
- <td>17</td>
+ <td>19</td>
<td ><code>column_break2</code></td>
<td >
Section Break</td>
<td >
- Supplier Details
+ More Information
</td>
<td></td>
</tr>
<tr >
- <td>18</td>
+ <td>20</td>
<td ><code>website</code></td>
<td >
Data</td>
@@ -298,7 +326,7 @@
</tr>
<tr >
- <td>19</td>
+ <td>21</td>
<td ><code>supplier_details</code></td>
<td >
Text</td>
@@ -310,6 +338,18 @@
<td></td>
</tr>
+ <tr >
+ <td>22</td>
+ <td ><code>is_frozen</code></td>
+ <td >
+ Check</td>
+ <td >
+ Is Frozen
+
+ </td>
+ <td></td>
+ </tr>
+
</tbody>
</table>
diff --git a/erpnext/docs/current/models/selling/customer.html b/erpnext/docs/current/models/selling/customer.html
index d171796..c73547a 100644
--- a/erpnext/docs/current/models/selling/customer.html
+++ b/erpnext/docs/current/models/selling/customer.html
@@ -183,11 +183,11 @@
<tr >
<td>10</td>
- <td ><code>is_frozen</code></td>
+ <td ><code>disabled</code></td>
<td >
Check</td>
<td >
- Is Frozen
+ Disabled
</td>
<td></td>
@@ -389,7 +389,7 @@
<td >
Section Break</td>
<td >
- Customer Details
+ More Information
</td>
<td>
@@ -422,8 +422,20 @@
<td></td>
</tr>
- <tr class="info">
+ <tr >
<td>27</td>
+ <td ><code>is_frozen</code></td>
+ <td >
+ Check</td>
+ <td >
+ Is Frozen
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr class="info">
+ <td>28</td>
<td ><code>sales_team_section_break</code></td>
<td >
Section Break</td>
@@ -437,7 +449,7 @@
</tr>
<tr >
- <td>28</td>
+ <td>29</td>
<td ><code>default_sales_partner</code></td>
<td >
Link</td>
@@ -458,7 +470,7 @@
</tr>
<tr >
- <td>29</td>
+ <td>30</td>
<td ><code>default_commission_rate</code></td>
<td >
Float</td>
@@ -470,7 +482,7 @@
</tr>
<tr class="info">
- <td>30</td>
+ <td>31</td>
<td ><code>sales_team_section</code></td>
<td >
Section Break</td>
@@ -482,7 +494,7 @@
</tr>
<tr >
- <td>31</td>
+ <td>32</td>
<td ><code>sales_team</code></td>
<td >
Table</td>
diff --git a/erpnext/docs/current/models/selling/sales_order.html b/erpnext/docs/current/models/selling/sales_order.html
index aadc664..229e847 100644
--- a/erpnext/docs/current/models/selling/sales_order.html
+++ b/erpnext/docs/current/models/selling/sales_order.html
@@ -1804,6 +1804,20 @@
<p class="docs-attr-name">
+ <a name="on_recurring" href="#on_recurring" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>on_recurring</b>
+ <i class="text-muted">(self, reference_doc)</i>
+ </p>
+ <div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+ <br>
+
+
+
+
+
+ <p class="docs-attr-name">
<a name="on_submit" href="#on_submit" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>on_submit</b>
diff --git a/erpnext/docs/current/models/setup/supplier_type.html b/erpnext/docs/current/models/setup/supplier_type.html
index ee53252..fc7bf9c 100644
--- a/erpnext/docs/current/models/setup/supplier_type.html
+++ b/erpnext/docs/current/models/setup/supplier_type.html
@@ -50,8 +50,36 @@
<td></td>
</tr>
- <tr >
+ <tr class="info">
<td>2</td>
+ <td ><code>section_credit_limit</code></td>
+ <td >
+ Section Break</td>
+ <td >
+ Credit Limit
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>3</td>
+ <td ><code>credit_days_based_on</code></td>
+ <td >
+ Select</td>
+ <td >
+ Credit Days Based On
+
+ </td>
+ <td>
+ <pre>
+Fixed Days
+Last Day of the Next Month</pre>
+ </td>
+ </tr>
+
+ <tr >
+ <td>4</td>
<td ><code>credit_days</code></td>
<td >
Int</td>
@@ -63,7 +91,7 @@
</tr>
<tr class="info">
- <td>3</td>
+ <td>5</td>
<td ><code>default_payable_account</code></td>
<td >
Section Break</td>
@@ -75,7 +103,7 @@
</tr>
<tr >
- <td>4</td>
+ <td>6</td>
<td ><code>accounts</code></td>
<td >
Table</td>
diff --git a/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md b/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md
index ccb89da..e4a33e0 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/changing-parent-account.md
@@ -14,17 +14,17 @@
####2. Edit Account
-<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-parent-2.png">
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-parent-1.png">
####3. Change Parent Account
Search and select preferred Parent Account and save.
-<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-parent-3.png">
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-parent-2.png">
Refresh system from Help menu to experience the change.
-<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-parent-4.png">
+<img alt="Project Default Cost Center" class="screenshot" src="{{docs_base_url}}/assets/img/articles/change-parent-3.png">
<div class="well"> Note: Parent cannot be customized for the Root Accounts, like Asset, Liability, Income, Expense, Equity.</div>
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 9dfc730..ad66ccc 100644
--- a/erpnext/docs/user/manual/en/selling/articles/applying-discount.md
+++ b/erpnext/docs/user/manual/en/selling/articles/applying-discount.md
@@ -1,31 +1,33 @@
-<h1>Applying Discount</h1>
+#Applying Discount
-There are two 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
-In the Item table of transaction, after Price List Rate field, you will find Discount (%) field. Discount Rate applied in this field will be applicable on the 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.
-Before applying Discount (%).
+<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.
-After applying Discount (%) under Discount on Price List Rate (%) field.
+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)
-
-
-You can apply percent discount in all sales and purchase transactions.
+#### 2. Discount on Net Total and Grand Total
-#### 2. Discount on Grand Total
+In the "Additional Discount" section, you can apply discount as amount or as percentage.
-In transactions, after Taxes and Charges table, you will find option to enter "Additional Discount Amount". Based on Amount entered in this field, item's Basic Rate and Taxes will be recalculated.
+<img alt="Discount Percentage" class="screenshot" src="{{docs_base_url}}/assets/img/articles/discount-2.png">
-Before applying Additional Discount Amount,
+##### Discount on Net Total
-
+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.
-After applying Additional Discount Amount.
+<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/img/articles/discount-on-grand-total.png">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/close-sales-order.md b/erpnext/docs/user/manual/en/selling/articles/close-sales-order.md
new file mode 100644
index 0000000..3990e7d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/close-sales-order.md
@@ -0,0 +1,19 @@
+#Close Sales Order
+
+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/img/articles/close-1.png">
+
+####Scenario
+
+An order is received for ten Wind Turbines. Sales Order is also created for ten units. Due to scarcity of stock, only seven units are delivered to the customer. Pending three units are to be delivered soon. Customer informs that they don't need to deliver pending item, as they have purchased it from other vendor.
+
+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.
+
+<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.
+
+You will find same funtionality in the Purchase Order as well.
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md b/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
index 8c3af05..6d58e2c 100644
--- a/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
+++ b/erpnext/docs/user/manual/en/selling/articles/drop-shipping.md
@@ -1,3 +1,5 @@
+#Drop Ship
+
**Drop shipping** is a supply chain management technique in which the retailer does not keep goods in stock. Instead they transfer customer orders and shipment details to either the manufacturer, another retailer, or a wholesaler, who then ships the goods directly to the customer
In ERPNext, you can create a Drop Shipping by creating Purchase Order against Sales Order.
@@ -7,16 +9,19 @@
#### Setup on Item Master
Set **_Delivered by Supplier (Drop Ship)_** and **_Default Supplier_** in Item Master.
+
<img class="screenshot" alt="Setup Item Master" src="{{docs_base_url}}/assets/img/selling/setup-drop-ship-on-item-master.png">
#### Setup on Sales Order
If Drop Shipping has set on Item master, it will automatically set **Supplier delivers to Customer** and **Supplier** on Salse Order Item.
You can setup Drop Shipping, on Sales Order Item. Under **Drop Ship** section, set **Supplier delivers to Customer** and select **Supplier** agaist which Purchase Order will get created.
+
<img class="screenshot" alt="Setup Drop Shipping on Sales Order Item" src="{{docs_base_url}}/assets/img/selling/setup-drop-ship-on-sales-order-item.png">
#### Create Purchase Order
-After submitting a Sales Order, create Puchase Order.<br>
+After submitting a Sales Order, create Puchase Order.
+
<img class="screenshot" alt="Setup Drop Shipping on Sales Order Item" src="{{docs_base_url}}/assets/img/selling/drop-ship-sales-order.png">
From Sales Order, all items, having **Supplier delivers to Customer** checked or **Supplier**(matching with supplier selected on For Supplier popup) mentioned, will get mapped onto Purchase Order.
@@ -24,11 +29,18 @@
It will automatically set Customer, Customer Address and Contact Person.
After submitting Purchase Order, to update delivery status, use **Mark as Delivered** button on Purchase Order. It will update delivery percetage and delivered quantity on Sales Order.
+
<img class="screenshot" alt="Purchase Order for Drop Shipping" src="{{docs_base_url}}/assets/img/selling/drop-ship-purchase-order.png">
<span style="color:#18B52D">**_Close_**</span>, is a new feature introduced on **Purchase Order** and **Sales Order**, to close or to mark fulfillment.
+
<img class="screenshot" alt="Close Sales Order" src="{{docs_base_url}}/assets/img/selling/close-sales-order.png">
###Drop Shipping Print Format
You can notify, Suppliers by sending a email after submitting Purchase Order by attaching Drop Shipping print format.
-<img class="screenshot" alt="Drop Dhip Print Format" src="{{docs_base_url}}/assets/img/selling/drop-ship-print-format.png">
\ No newline at end of file
+
+<img class="screenshot" alt="Drop Dhip Print Format" src="{{docs_base_url}}/assets/img/selling/drop-ship-print-format.png">
+
+###Video Help on Drop Ship
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/hUc0hu_XLdo" frameborder="0" allowfullscreen></iframe>
\ 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 2fafa68..f905dfd 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
@@ -1,28 +1,45 @@
-<h1>ERPNext for Service Organizations</h1>
+#ERPNext for Service Organization
-**Question:** At first look, ERPNext looks primarily designed for the traders and manufacturers. Is ERPNext used by service companies as well?
+**Question:** ERPNext looks primarily designed for the traders and manufacturers. Is ERPNext used by companies offering servies?
**Answer:**
-About 30% of ERPNext customers comes from services background. These are companies into software development, certification services, individual consultants and many more. Being into services business ourselves, we use ERPNext to manage our sales, accounting, support and HR operations.
-https://conf.erpnext.com/2014/videos/umair-sayyed
+About 30% of ERPNext customers are companies into services. These are companies into software development, certification services, individual consultants and many more. Being into service business ourselves, we use ERPNext to manage our sales, accounting, support and HR operations. Check following video to learn how ERPNext uses ERPNext.
+
+<iframe width="640" height="360" src="//www.youtube.com/embed/b6r7WxJMfFA" frameborder="0" allowfullscreen=""></iframe>
###Master Setup
-Between the service and trading company, the most differentiating master is an item master. While trading and manufacturing business has stock item, with warehouse and other stock details, service items will have none of these details.
+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 item, which will be non-stock item, in the Item master, you should set "Is Stock Item" field as "No".
+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/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.
+
+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:
+
+`Setup > Permissions > Show/Hide Modules`
+
+Modules unchecked here will be hidden from all the User.
+
####Feature Setup
-In Feature Setup, you can activate specific functionalities, and disable others. Based on this setting, forms and fields not required for your business will be hidden. [More on feature setup here](https://manual.erpnext.com/customize-erpnext/hiding-modules-and-features).
+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. User will be able to access system based on permissions assigned to him/her. So, if user is not assigned Role related to Stock and Manufacturing module, it will be hidden from user. [More on permission management in ERPNext here](https://manual.erpnext.com/setting-up/users-and-permissions).
+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.
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/fnBoRhBrwR4" frameborder="0" allowfullscreen></iframe>
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/index.txt b/erpnext/docs/user/manual/en/selling/articles/index.txt
index 70b4ac2..5d51607 100644
--- a/erpnext/docs/user/manual/en/selling/articles/index.txt
+++ b/erpnext/docs/user/manual/en/selling/articles/index.txt
@@ -1,6 +1,6 @@
applying-discount
drop-shipping
erpnext-for-services-organization
-manage-shipping-rule
-managing-sales-persons-in-sales-transactions
-stopping-sales-order
\ No newline at end of file
+shipping-rule
+sales-persons-in-the-sales-transactions
+close-sales-order
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/manage-shipping-rule.md b/erpnext/docs/user/manual/en/selling/articles/manage-shipping-rule.md
deleted file mode 100644
index c9c4f91..0000000
--- a/erpnext/docs/user/manual/en/selling/articles/manage-shipping-rule.md
+++ /dev/null
@@ -1,25 +0,0 @@
-<h1>Manage Shipping Rule</h1>
-
-Shipping Rule master help you define rules based on which shipping charge will be applied on sales transactions.
-
-Most of the companies (mainly retail) have shipping charge applied based on invoice total. If invoice value is above certain range, then shipping charge applied will be lesser. If invoice total is less, then shipping charges applied will be higher. You can setup Shipping Rule to address the requirement of varying shipping charge based on total.
-
-To setup Shipping Rule, go to:
-
-Selling/Accounts >> Setup >> Shipping Rule
-
-Here is an example of Shipping Rule master:
-
-
-
-Referring above, you will notice that shipping charges are reducing as range of total is increasing. This shipping charge will only be applied if transaction total falls under one of the above range, else not.
-
-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 sales transaction. Hence these details are tracked as well in the Shipping Rule itself.
-
-
-
-Apart from price range, Shipping Rule will also validate if its territory and company matches with that of Customer's territory and company.
-
-Following is an example of how shipping charges are auto-applied on sales order based on Shipping Rule.
-
-
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/managing-sales-persons-in-sales-transactions.md b/erpnext/docs/user/manual/en/selling/articles/managing-sales-persons-in-sales-transactions.md
deleted file mode 100644
index ae92e63..0000000
--- a/erpnext/docs/user/manual/en/selling/articles/managing-sales-persons-in-sales-transactions.md
+++ /dev/null
@@ -1,43 +0,0 @@
-<h1>Managing Sales Persons In Sales Transactions</h1>
-
-In ERPNext, Sales Person master is maintained in [tree structure](https://erpnext.com/kb/setup/managing-tree-structure-masters). Sales Person table is available in all the Sales transactions, at the bottom of transactions form.
-
-If you have specific Sales Person attached to Customer, you can mention Sales Person details in the Customer master itself. On selection of Customer in the transactions, you will have Sales Person details auto-fetched in that transaction.
-
-####Sales Person Contribution
-
-If you have more than one sales person working together on an order, then with listing all the sales person for that order, you will also need to define contribution based on their effort. For example, Sales Person Aasif, Harish and Jivan are working on order. While Aasif and Harish followed this order throughout, Jivan got involved just in the end. Accordingly you should define % Contribution in the sales transaction as:
-
-
-
-Where Sales Order Net Total is 30,000.
-
-<div class=well>Total % Contribution for all Sales Person must be 100%. If only one Sales Person is selected, then enter % Contribution as 100% for him/her.</div>
-
-####Sales Person Transaction Report
-
-You can check Sales Person Transaction Report from
-
-`Selling > Standard Reports > Sales Person-wise Transaction Summary`
-
-This report will be generated based on Sales Order, Delivery Note and Sales Invoice. This report will give you total amount of sales made by an employee over a period. Based on data provided from this report, you can determine incentives and plan appraisal for an employee.
-
-
-
-####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
-
-`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:
-
-`Setup > Customize > Features Setup`
-
-
-
-After uncheck Sales Extras from Sales and Purchase section, refresh your ERPNext account's tab, so that forms will take effect based on your setting.
-
-<!-- markdown -->
\ No newline at end of file
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
new file mode 100644
index 0000000..c270e13
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md
@@ -0,0 +1,45 @@
+#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/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/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.
+
+<div class=well>Total % Contribution for all Sales Person must be 100%. If only one Sales Person is selected, then % Contribution will be 100.</div>
+
+####Sales Person Transaction Report
+
+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 sale made by an employe.
+
+<img class="screenshot" alt="Sales Person Report" src="{{docs_base_url}}/assets/img/articles/sales-person-transaction-3.png">
+
+####Sales Person wise Commission
+
+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:
+
+`Setup > Customize > Features Setup`
+
+<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.
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/shipping-rule.md b/erpnext/docs/user/manual/en/selling/articles/shipping-rule.md
new file mode 100644
index 0000000..d87ba36
--- /dev/null
+++ b/erpnext/docs/user/manual/en/selling/articles/shipping-rule.md
@@ -0,0 +1,33 @@
+#Shipping Rule
+
+Shipping Rule master helps in defining a rule based on which shipping charge is applied on a sales transactions.
+
+Most of the companies (mainly retail) have shipping charge applied based on the invoice total. If invoice value is above certain value, then shipping charge applied are lesser. If invoice value is less, then shipping charges applied are bit more than high shipping charges applied on a high value invoice. You can setup Shipping Rule to address the requirement of varying shipping charge based on the Net Total of sales transaction.
+
+To setup Shipping Rule, go to:
+
+`Selling > Setup > Shipping Rule` or `Accounts > Setup > Shipping Rule`
+
+####Shipping Rule Conditions
+
+<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.
+
+####Valid for Countries
+
+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/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/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/img/articles/shipping-charges-4.gif">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/articles/stopping-sales-order.md b/erpnext/docs/user/manual/en/selling/articles/stopping-sales-order.md
deleted file mode 100644
index 96a15de..0000000
--- a/erpnext/docs/user/manual/en/selling/articles/stopping-sales-order.md
+++ /dev/null
@@ -1,17 +0,0 @@
-<h1>Stopping a Sales Order</h1>
-
-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.
-
-
-
-####Scenario
-
-East Wind receives an order for ten laptops. Sales Order is also created for ten units. Due to scarcity of stock, only seven units are delivered to customer. Pending three units are to be delivered soon. Customer inform East Wind need not deliver pending item, as they have purchased it from other vendor.
-
-In this case, after East Wind will create Delivery Note and Sales Invoice only for the seven units of Laptop, and set Sales Order as stopped.
-
-
-
-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.
-
-<!-- markdown -->
\ No newline at end of file
