Merge pull request #4877 from agusputra/patch-18
Update period-closing-voucher.md
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index d770f49..c672c5b 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
from __future__ import unicode_literals
-__version__ = '6.23.3'
+__version__ = '6.23.6'
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index 358cf39..50a50d9 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -28,7 +28,7 @@
this.frm.add_custom_button(__('Payment'), this.make_bank_entry, __("Make"));
cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
}
- if(Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) {
+ if(doc.outstanding_amount >= 0 || Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) {
cur_frm.add_custom_button(__('Debit Note'), this.make_debit_note, __("Make"));
}
}
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 200fca6..d4d00ff 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -57,7 +57,7 @@
return item.is_delivered_by_supplier ? true : false;
})
- if(Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) {
+ if(doc.outstanding_amount >= 0 || Math.abs(flt(doc.outstanding_amount)) < flt(doc.grand_total)) {
cur_frm.add_custom_button(doc.update_stock ? __('Sales Return') : __('Credit Note'),
this.make_sales_return, __("Make"));
cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
diff --git a/erpnext/docs/assets/img/articles/$SGrab_323.png b/erpnext/docs/assets/img/articles/$SGrab_323.png
deleted file mode 100644
index e97f343..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_323.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_327.png b/erpnext/docs/assets/img/articles/$SGrab_327.png
deleted file mode 100644
index 8e63c70..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_327.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_328.png b/erpnext/docs/assets/img/articles/$SGrab_328.png
deleted file mode 100644
index 88882c1..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_328.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_329.png b/erpnext/docs/assets/img/articles/$SGrab_329.png
deleted file mode 100644
index fa3711b..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_329.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_330.png b/erpnext/docs/assets/img/articles/$SGrab_330.png
deleted file mode 100644
index f1fe4f2..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_330.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_331.png b/erpnext/docs/assets/img/articles/$SGrab_331.png
deleted file mode 100644
index 3c4d10d..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_331.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_406.png b/erpnext/docs/assets/img/articles/$SGrab_406.png
deleted file mode 100644
index 022eeb8..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_406.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_407.png b/erpnext/docs/assets/img/articles/$SGrab_407.png
deleted file mode 100644
index bc75a10..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_407.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_408.png b/erpnext/docs/assets/img/articles/$SGrab_408.png
deleted file mode 100644
index bcd3d83..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_408.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/$SGrab_422.png b/erpnext/docs/assets/img/articles/$SGrab_422.png
deleted file mode 100644
index e1eabe9..0000000
--- a/erpnext/docs/assets/img/articles/$SGrab_422.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Order Copy.png b/erpnext/docs/assets/img/articles/Order Copy.png
deleted file mode 100644
index 5f7ede8..0000000
--- a/erpnext/docs/assets/img/articles/Order Copy.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-10 at 5.32.56 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-10 at 5.32.56 pm.png
deleted file mode 100644
index 0b7045b..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-10 at 5.32.56 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-10 at 5.35.44 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-10 at 5.35.44 pm.png
deleted file mode 100644
index 59a2351..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-10 at 5.35.44 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-10 at 5.36.23 pm.png b/erpnext/docs/assets/img/articles/Screen Shot 2015-02-10 at 5.36.23 pm.png
deleted file mode 100644
index ea5bd6a..0000000
--- a/erpnext/docs/assets/img/articles/Screen Shot 2015-02-10 at 5.36.23 pm.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_013.png b/erpnext/docs/assets/img/articles/Selection_013.png
deleted file mode 100644
index 0a76617..0000000
--- a/erpnext/docs/assets/img/articles/Selection_013.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_0149d98bf.png b/erpnext/docs/assets/img/articles/Selection_0149d98bf.png
deleted file mode 100644
index 2a2d8fb..0000000
--- a/erpnext/docs/assets/img/articles/Selection_0149d98bf.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_018ef32b6.png b/erpnext/docs/assets/img/articles/Selection_018ef32b6.png
deleted file mode 100644
index 7513648..0000000
--- a/erpnext/docs/assets/img/articles/Selection_018ef32b6.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_019bf0547.png b/erpnext/docs/assets/img/articles/Selection_019bf0547.png
deleted file mode 100644
index 00ffb87..0000000
--- a/erpnext/docs/assets/img/articles/Selection_019bf0547.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_028.png b/erpnext/docs/assets/img/articles/Selection_028.png
deleted file mode 100644
index cbe0d09..0000000
--- a/erpnext/docs/assets/img/articles/Selection_028.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_029.png b/erpnext/docs/assets/img/articles/Selection_029.png
deleted file mode 100644
index adee68d..0000000
--- a/erpnext/docs/assets/img/articles/Selection_029.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_030.png b/erpnext/docs/assets/img/articles/Selection_030.png
deleted file mode 100644
index ce37124..0000000
--- a/erpnext/docs/assets/img/articles/Selection_030.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_043.png b/erpnext/docs/assets/img/articles/Selection_043.png
deleted file mode 100644
index 55c7c91..0000000
--- a/erpnext/docs/assets/img/articles/Selection_043.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_044.png b/erpnext/docs/assets/img/articles/Selection_044.png
deleted file mode 100644
index cbbbd97..0000000
--- a/erpnext/docs/assets/img/articles/Selection_044.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_064.png b/erpnext/docs/assets/img/articles/Selection_064.png
deleted file mode 100644
index 95a0032..0000000
--- a/erpnext/docs/assets/img/articles/Selection_064.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_066.png b/erpnext/docs/assets/img/articles/Selection_066.png
deleted file mode 100644
index 5a48927..0000000
--- a/erpnext/docs/assets/img/articles/Selection_066.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_069.png b/erpnext/docs/assets/img/articles/Selection_069.png
deleted file mode 100644
index 0e19f82..0000000
--- a/erpnext/docs/assets/img/articles/Selection_069.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/attach-file-1.gif b/erpnext/docs/assets/img/articles/attach-file-1.gif
new file mode 100644
index 0000000..df0f6e4
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/attach-file-1.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/attach-file-2.gif b/erpnext/docs/assets/img/articles/attach-file-2.gif
new file mode 100644
index 0000000..c07e019
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/attach-file-2.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/attach-file-3.gif b/erpnext/docs/assets/img/articles/attach-file-3.gif
new file mode 100644
index 0000000..fdc1095
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/attach-file-3.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/delete-submitted-doc-1.png b/erpnext/docs/assets/img/articles/delete-submitted-doc-1.png
new file mode 100644
index 0000000..d20a9ea
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/delete-submitted-doc-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/delete-submitted-doc-2.png b/erpnext/docs/assets/img/articles/delete-submitted-doc-2.png
new file mode 100644
index 0000000..e3c9333
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/delete-submitted-doc-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/delete-submitted-doc-3.gif b/erpnext/docs/assets/img/articles/delete-submitted-doc-3.gif
new file mode 100644
index 0000000..8d7a8e2
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/delete-submitted-doc-3.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/duplicate.gif b/erpnext/docs/assets/img/articles/duplicate.gif
new file mode 100644
index 0000000..5d76b99
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/duplicate.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/email-file-attachment.gif b/erpnext/docs/assets/img/articles/email-file-attachment.gif
new file mode 100644
index 0000000..4b5e35f
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/email-file-attachment.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/links-1.gif b/erpnext/docs/assets/img/articles/links-1.gif
new file mode 100644
index 0000000..a12dcb5
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/links-1.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/links-2.gif b/erpnext/docs/assets/img/articles/links-2.gif
new file mode 100644
index 0000000..2ffa216
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/links-2.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/merge-docs-1.png b/erpnext/docs/assets/img/articles/merge-docs-1.png
new file mode 100644
index 0000000..186fe1b
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/merge-docs-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/merge-docs-2.gif b/erpnext/docs/assets/img/articles/merge-docs-2.gif
new file mode 100644
index 0000000..3901e02
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/merge-docs-2.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/perm-level-1.gif b/erpnext/docs/assets/img/articles/perm-level-1.gif
new file mode 100644
index 0000000..27d65c7
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/perm-level-1.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/perm-level-2.png b/erpnext/docs/assets/img/articles/perm-level-2.png
new file mode 100644
index 0000000..ecbdfb5
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/perm-level-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/perm-level-3.png b/erpnext/docs/assets/img/articles/perm-level-3.png
new file mode 100644
index 0000000..3f4eefe
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/perm-level-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/rename-a-doc.gif b/erpnext/docs/assets/img/articles/rename-a-doc.gif
new file mode 100644
index 0000000..24c4323
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/rename-a-doc.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/rename-account-2.gif b/erpnext/docs/assets/img/articles/rename-account-2.gif
new file mode 100644
index 0000000..412ad98
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/rename-account-2.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/rename-account.png b/erpnext/docs/assets/img/articles/rename-account.png
new file mode 100644
index 0000000..0f2ec52
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/rename-account.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/rename-docs-1.png b/erpnext/docs/assets/img/articles/rename-docs-1.png
new file mode 100644
index 0000000..3a41d1e
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/rename-docs-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/search-filter-auto.gif b/erpnext/docs/assets/img/articles/search-filter-auto.gif
new file mode 100644
index 0000000..5f0256f2
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/search-filter-auto.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/search-filter-based-on.gif b/erpnext/docs/assets/img/articles/search-filter-based-on.gif
new file mode 100644
index 0000000..d2addda
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/search-filter-based-on.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/search-filter-field.gif b/erpnext/docs/assets/img/articles/search-filter-field.gif
new file mode 100644
index 0000000..e9f4a26
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/search-filter-field.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/search-filter-result.png b/erpnext/docs/assets/img/articles/search-filter-result.png
new file mode 100644
index 0000000..2c5d16d
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/search-filter-result.png
Binary files differ
diff --git a/erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md b/erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md
index cc2a865..9d5f614 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/freeze-accounting-entries.md
@@ -16,6 +16,6 @@
<img alt="Frozen Date Error" class="screenshot" src="{{docs_base_url}}/assets/img/articles/frozen-date-2.png">
-You can still allow user with certain role to create/edit entries beyound accounts frozen date. You can set that Role in the Account Settings itself.
+You can still allow user with certain role to create/edit entries within accounts frozen date. You can set that Role in the Account Settings itself.
-<img alt="Frozen Date Error" class="screenshot" src="{{docs_base_url}}/assets/img/articles/frozen-date-3.png">
\ No newline at end of file
+<img alt="Frozen Date Error" class="screenshot" src="{{docs_base_url}}/assets/img/articles/frozen-date-3.png">
diff --git a/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md b/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md
index fe69ab5..d89c199 100644
--- a/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md
+++ b/erpnext/docs/user/manual/en/accounts/articles/managing-transactions-in-multiple-currency.md
@@ -1,6 +1,6 @@
#Managing Transactions In Multiple Currency
-In ERPNext, transactions can be created in the base currency as well as in parties (customer or supplier) currency. In transaction is created in the parties currency, their currency symbol is updated in the print foramt as well.
+In ERPNext, transactions can be created in the base currency as well as in parties (customer or supplier) currency. If transaction is created in the parties currency, their currency symbol is updated in the print format as well.
Let's consider a Sales Invoice, where your base currency is of a Company is USD and party currency is EUR.
@@ -14,7 +14,7 @@
#### Step 3: Exchange Rate
-Currenct Exchange between between base currency and customer currency will auto-fetch.
+Currency Exchange between base currency and customer currency will auto-fetch.
<img alt="Accounts Frozen Date" class="screenshot" src="{{docs_base_url}}/assets/img/articles/multiple-currency-1.gif">
@@ -34,5 +34,5 @@
`Accounts > Setup > Currency Exchange`
- If system find Exchange Rate master for any cuurrecy, it is given preference over currency exchnage rate.
+ If system find Exchange Rate master for any currency, it is given preference over currency exchange rate.
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md b/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md
index 308a0a7..f79229b 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md
+++ b/erpnext/docs/user/manual/en/setting-up/articles/managing-perm-level.md
@@ -2,7 +2,7 @@
In each document, you can group fields by "levels". Each group of field is denoted by a unique number (0, 1, 2, 3 etc.). A separate set of permission rules can be applied to each field group. By default all fields are of level 0.
-Perm Level for a field can be defined in the [Customize Form](docs_base_url}}/user/manual/en/customize-erpnext/customize-form.html).
+Perm Level for a field can be defined in the [Customize Form]({{docs_base_url}}/user/manual/en/customize-erpnext/customize-form.html).
<img alt="Perm Level Field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/perm-level-1.gif">
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md
index 39fe6d1..75ade17 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-attachments-to-outgoing-messages.md
@@ -1,10 +1,9 @@
#Adding Attachments to Outgoing Messages
-ERPNext has in-built file manage system. Click [here](https://erpnext.com/kb/tools/managing-attachments) to learn more on how attachments are managed in ERPNext.
+ERPNext has in-built file manager. Click [here]({{docs_base_url}}/user/videos/learn/file-manager.html) to learn more on how attachments are managed in ERPNext.
-If you have some files attached in your transaction (say Purchase Order), which needs to be emailed with Purchase Order details. When click on Email option, at the end of the Communication dialog box, you will find all the attachments listed with check-box option. You should check files which needs to be emailed as an attachment to recipient.
+If you have file attached to the document (say Purchase Order), and same file needs to be emailed as attachment, following is how you can achieve it.
-
-
+<img alt="Emailing Attachments" class="screenshot" src="{{docs_base_url}}/assets/img/articles/email-file-attachment.gif">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md
new file mode 100644
index 0000000..e1c4ebd
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/adding-file-as-a-attachment.md
@@ -0,0 +1,36 @@
+#Adding File as a Attachment
+
+ERPNext allows to attach files with documents. User with a read permission on particular document will also be able to access files attached with it.
+
+###Attach New File
+
+There are several ways to attach file to the document.
+
+####From Browser
+
+<img alt="Sales Order File Attachment" class="screenshot" src="{{docs_base_url}}/assets/img/articles/attach-file-1.gif">
+
+####By drag and drop
+
+<img alt="Sales Order File Attachment" class="screenshot" src="{{docs_base_url}}/assets/img/articles/attach-file-2.gif">
+
+Click on Attach to browse and select the file.
+
+####Link
+
+If you use separate server for files, or use online service like Dropbox, you can attach file by providing link of a particular file.
+
+<img alt="Sales Order Select File" class="screenshot" src="{{docs_base_url}}/assets/img/articles/attach-file-3.gif">
+
+`For hosted users, limit of 5 MB is applied on file size.`
+
+To ensure there are not many files attached to a document, which can affect your accounts performance, you can set limit as how many files can be attached to a particular document. Click [here]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/increase-max-attachments.html) to learn more about it.
+
+####File Manager
+
+Check following link to learn how files are managed in ERPNext.
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/4-osLW3E_Rk" frameborder="0" allowfullscreen></iframe>
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md b/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md
new file mode 100644
index 0000000..3378b2d
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md
@@ -0,0 +1,25 @@
+#Bulk Rename
+
+Using renaming tool, you can to rectify/change multiple document ids at once. This tool is only accessible to the User who has System Manager role assigned.
+
+###Rename Tool
+
+You can rename ids of upto 500 records at a time. Following are step to bulk rename bulk records. Let's assume we are renaming Item Codes for the existing items.
+
+#### Step 1: Open Excel File
+
+In a spreadsheet file, enter old Item IDs in the first column, and new Item Ids in the second column. Save spreadsheet file in a CSV format.
+
+<img alt="Data File" class="screenshot" src="{{docs_base_url}}/assets/img/articles/rename-docs-1.png">
+
+#### Step 2: Upload Data File
+
+To upload data file go to,
+
+`Setup > Data > Rename Tool`
+
+Select DocType which you want to rename. Here DocType will be Item. Then Browse and Upload data file.
+
+
+
+<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md
index 92d5547..76cdeb7 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/check-link-between-documents.md
@@ -1,27 +1,23 @@
#Checking Link Between Documents
-Linked With function in ERPNext allows you checking a document is linked with which other documents. You will find Linked With function in the every document.
+Links option shows one document is linked to which other documents. Check Menu for the Links options.
-
+<img alt="Cancel Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/links-1.gif">
####Scenario
-If you need to check which Delivery Note and Sales Invoice has been created against Sales Order, you should open Sales Order document, and click on Linked With in it.
-
-
-
-Since Sales Order is a centralize transaction, using linked-with option in the Sales Order, you can track complete deal, like billing done, purchases made, manufacturing development against this particular order.
+If you need that against Sales Order, which Delivery Note and Sales Invoice has been created, you should open Sales Order document, and check Links. Same way, you can also check Purchase Order, and find which Purchase Receipt and Purchase Ivoice is linked with it.
####How It Works?
-When you check Linked With in for a Sales Order, it lists all the record where this Sales Order ID is updated. It will not show documents where this Sales Order Id is entered as text, and not in the link field.
+When you check Links for a Sales Order, it lists all the record where this Sales Order ID is linked. When Delivery Note is created against Sales Order, then Sales Order link is updated in the Delivery Note Item table.
####Backward Links
-If I check Linked With in the Delivery Note, will it list Sales Order created before this delivery note?
+If I check Links in the Purchase Receipt, will it list Purchase Order from which this Purchase Receipt was created?
-Linked With function works only for the forward linkages. For the backward linkages, you should check current document itself. In the Delivery Note, you can check Item table to see which Sales Order it is linked with.
+Links only shows forward linkages. For the backward links, you should check current document itself. In the Purchase Receipt Item table table, you can check which Purchase Order it is linked to.
-
+<img alt="Cancel Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/links-2.gif">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md b/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md
index 1af8f86..8d7700a 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/delete-submitted-document.md
@@ -1,27 +1,29 @@
#Delete Submitted Document
-ERPNext allows you to assign deletion permission exclusively to User. Only those users will be able to delete records. Click [here](/user-guide/setting-up/permissions/role-based-permissions) to learn more about permissions.
+To be able to delete Submitted document, you should first Cancel. Once canceled, you can delete that document from Menu or from the List View of that Document Type.
-To delete any document from system you should cancel all linked documents. For example if you need to delete Sales Order, but Delivery Note and Sales Invoice has already been created against that Sales Order. Then you should cancel and delete documents in reverse order, i.e. Sales Invoice, Delivery Note and then Sales Order. If payment entry was also made against Sales Invoice, then you should first Cancel and Delete that Journal Voucher, and then come to Sales Invoice.
+If document which needs to be deleted is also linked to other documents, then you should first Cancel document those document as well. For example if you need to delete Sales Order, but Delivery Note and Sales Invoice has already been created against it. Then you should first cancel and delete documents in reverse order, i.e. Sales Invoice, Delivery Note and then Sales Order.
+
+Delete option is only visible to user having related permission. From Role Permission Manager, you can control and define Delete permission and Role for each Document Type.
Following are step to delete submitted documents.
-####1. Cancel Document
+####Step 1: Cancel Document
-To be able to delete Submitted document, it must be cancelled first. After document is cancelled, you will find option to delete it.
+You will find option to Cancel in the submitted document. If document is at draft stage, it can delete directly. Also if document is not submittable, but only save, it can be deleted directly.
-
+<img alt="Cancel Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/delete-submitted-doc-1.png">
-####2. Delete Document
+####Step 2: Delete Document
-After cancellation, go to File menu and click on Delete option.
+After cancellation, go to Menu and click on Delete.
-
+<img alt="Delete Doc" class="screenshot" src="{{docs_base_url}}/assets/img/articles/delete-submitted-doc-2.png">
-#### Deleting from List
+####Step 3: Deleting from List
-For bulk deletion, you can select multiple Cancelled records and delete them at once from the list.
+For bulk deletion, you can select multiple Cancelled records and delete at once from the List View.
-
+<img alt="Delete Doc from List" class="screenshot" src="{{docs_base_url}}/assets/img/articles/delete-submitted-doc-3.gif">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md b/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md
index 0f4e740..69b4ecf 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/duplicate-record.md
@@ -1,17 +1,15 @@
#Duplicate a Record
-ERPNext allows you to duplicate existing record. With this, you get values of existing record into new form, and create entries faster.
+Duplicate feature helps you to copy values of existing document into new document.
####Scenario
-An electronic supplier receives a repeat order from an existing customer. Since new order will have details just like previous order, you can open previous order, and Copy it to create new order faster. On copying, details of the previous transaction will be updated in the new form. You can make changes where needed and submit the transaction.
+An electronic supplier receives a repeat order from an existing customer. Since new order will have details just like previous order, you should open previous order, and Duplciate it to create new order faster. On Duplicating, values of the previous transaction will be updated in a new document. You can make changes where needed and submit the document.
You will find Copy option under:
-File > Copy
+`Menu > Copy`
-
-
-When Copy function is executed, values are mapped field-by-field from existing to new form.
+<img alt="Duplicate" class="screenshot" src="{{docs_base_url}}/assets/img/articles/duplicate.gif">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt b/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt
index 289753d..4ca21aa 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/index.txt
@@ -1,11 +1,11 @@
-adding-attachments-to-outgoing-messages
+adding-attachment-to-outgoing-messages
check-link-between-documents
delete-submitted-document
duplicate-record
-managing-attachments
+adding-file-as-a-attachment
merging-documents
-rename-tool
+bulk-rename
renaming-documents
-search-filters
+search-filter
tree-master-renaming
pos-view
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/managing-attachments.md b/erpnext/docs/user/manual/en/using-erpnext/articles/managing-attachments.md
deleted file mode 100644
index 79a1105..0000000
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/managing-attachments.md
+++ /dev/null
@@ -1,20 +0,0 @@
-#Adding Attachments in a Documents
-
-ERPNext allows to attach files with documents like Order, Invoices, Items etc. User with a read permission on particular document will also be able to access files attached with it. For example, Sales Order can have text file attached detailing item description and specification as decided with customers. Also it can be image file of drawing as per which product is to be manufactured.
-
-Open to attach file is at the footer of a form.
-
-
-
-Click on Attach to browse and select the file.
-
-
-
-If you maintain separate server for the files, or use online service like Dropbox, you can provide link of a particular file in the document in ERPNext.
-
-
-
-`For hosted users, limit of 1 MB is applied on file size.`
-
-To ensure there are not many files attached against the document, which can lead to your system slowing down, you can set limit as how many files can be attached against particular document. Click [here](https://erpnext.com/kb/customize/increase-max-attachments) to learn more about it.
-<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
index d4518ea..15dd117 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
@@ -1,32 +1,31 @@
#Merging Documents
-Document merging feature is available in ERPNext. You can done this via 'Rename' feature in ERPNext.
+For a document, of you have two records which are identical, and meant for common purpose, you can merge them into one record.
-Following are step to merge document in existing document. Let's assume we are merging Account Ledger.
+Following are step to merge documents. Let's assume we are merging two Accounts.
-#### 1: Go to Chart of Account
+#### Step 1: Go to Chart of Account
-`Accounts > Setup > Chart of Accounts`
+`Accounts > Documents > Chart of Accounts`
-#### 2: Go to Account
+#### Step 2: Go to Account
-Click on Rename option of that account, which you want to merge in existing account.
+For an Account to be merge, click on "Rename" option.
-#### 3: Merge Account
+<img alt="Sales Order File Attachment" class="screenshot" src="{{docs_base_url}}/assets/img/articles/merge-docs-1.png">
-Enter existing account name in New Name field and check Mark on "Merge with existing" option. Then press 'Rename' button to merge.
+#### Step 3: Merge Account
-
+In the New Name field, enter another account name with which this account will be merged. Check "Merge with existing" option. Then press 'Rename' button to merge.
Following is how merged account will appear in the Chart of Account master.
-
+<img alt="Sales Order File Attachment" class="screenshot" src="{{docs_base_url}}/assets/img/articles/merge-docs-2.gif">
-###Effect of Merging
+###Effect of Merging
-Merging document affects existing transaction where this record is selected. As well as it will affected on existing document balance.
+After Account is merged, new name is updated in the existing transactions where old account was selected.
-<div class="well"> Note: You can't merge Group into Ledger documents. As well as Ledger into Group documents. Also this feature is applicable for few documents only.</div>
-
+<div class="well"> Note: Group Account cannot be merged into Child Account and vice versa.</div>
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/rename-tool.md b/erpnext/docs/user/manual/en/using-erpnext/articles/rename-tool.md
deleted file mode 100644
index 72e8b4f..0000000
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/rename-tool.md
+++ /dev/null
@@ -1,37 +0,0 @@
-#Rename Tool
-
-ERPNext has Renaming Tool which allows you to rectify/change record id for existing records. This facility can be only performed by User with System Manager's role.
-
-There are two ways you can rename records in your account. You can follow the approach based on how many records needs to be renamed.
-
-###Rename Record via Rename Tool
-
-Using this tool you can correct/rectify primary ids of 500 records at a time.
-
-Following are step to rename bulk records in ERPNext. Let's assume we are renaming Item Codes for existing Items.
-
-#### Step 1: Open Excel File
-
-In new excel file enter old Item Ids in one column and enter new Item Ids in exact next column. Then save data file in .csv format.
-
-
-
-#### Step 2: Upload Data File
-
-To upload data file go to,
-
-`Setup > Data > Rename Tool`
-
-Select DocType which you want to rename. Here DocType will be Item. Then Browse and Upload data file.
-
-
-
-Following are the renamed Item Codes.
-
-
-
-###Rename Individual Document
-
-Click [here](https://erpnext.com/kb/tools/renaming-documents) for detailed steps on how to rename document one by one.
-
-<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md
index da1945f..a6b6696 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/renaming-documents.md
@@ -1,24 +1,14 @@
-#Renaming Documents
+#Renaming a Document
-ERPNext has Renaming feature which allows you to correct primary id of a record.
-
-Following are step to rename document in ERPNext. Let's assume we are renaming Item Code for existing Item.
+Using Renaming feature, you can change ID of a master documents like Item, Warehouse, Accounts etc. Following are the steps to rename Item Code. Following same steps, you can rename other masters as well.
#### 1. Go to Item
-`Stock > Documents > Item List > (Open Item)`
+`Stock > Documents > Item List > (Open Item to be renamed)`
-Open Item for which Item Code needs to be renamed.
+#### 2. Rename
-#### 2. Go to File
-
-
-
-#### 3. Rename
-
-Enter desired Item Code, and click on "Rename".
-
-
+<img alt="Renamed Item" class="screenshot" src="{{docs_base_url}}/assets/img/articles/rename-a-doc.gif">
###Effect of Renaming
@@ -26,8 +16,8 @@
###See Also
-1. [Bulk Renaming](https://erpnext.com/kb/tools/rename-tool)
-2. [Document Merging](https://erpnext.com/kb/tools/merging-documents)
+1. [Bulk Renaming]({{docs_base_url}}/user/manual/en/using-erpnext/articles/bulk-rename.html)
+2. [Document Merging]({{docs_base_url}}/user/manual/en/using-erpnext/articles/merging-documents.html)
**List of Renamable Documents**
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/search-filter.md b/erpnext/docs/user/manual/en/using-erpnext/articles/search-filter.md
new file mode 100644
index 0000000..8a0a67b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/search-filter.md
@@ -0,0 +1,35 @@
+#Search Filter
+
+Search Filter option allow user to filter records based on value in the specific field of that document. Search Filters are available on the List View of Document Type and in the Report Builder.
+
+Each filter option has three fields.
+
+#### Field
+
+Select field of the document based on which you wish to filter records.
+
+<img alt="Search Filter Field" class="screenshot" src="{{docs_base_url}}/assets/img/articles/search-filter-field.gif">
+
+
+#### Based On
+
+With Field, you will provide a value. In the based on field, you can define a criterion that when filter should be applied in record. It will be when value define for the field if filter is:
+
+<img alt="Search Filter Based On" class="screenshot" src="{{docs_base_url}}/assets/img/articles/search-filter-based-on.gif">
+
+#### Value
+
+A value should be entered in this field based on while records will be filtered. After filter is applied, records will be filtered based on it. And filter will shrunk under one field/button.
+
+<img alt="Search Filter Based On" class="screenshot" src="{{docs_base_url}}/assets/img/articles/search-filter-result.png">
+
+
+You can apply multiple filters at a time. To remove specific filter, just click on cancelled (X) sign ahead of it.
+
+#### Ready Filters
+
+From the list views, you can also apply filters by clicking on the Status field.
+
+<img alt="Renamed Item" class="screenshot" src="{{docs_base_url}}/assets/img/articles/search-filter-auto.gif">
+
+<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/search-filters.md b/erpnext/docs/user/manual/en/using-erpnext/articles/search-filters.md
deleted file mode 100644
index 73dbcfb..0000000
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/search-filters.md
+++ /dev/null
@@ -1,39 +0,0 @@
-#Search Filters
-
-Search Filter option allows user to filter records based on value in the specific fields of that form.
-
-Search Filter option is available on the List View page of transactions.
-
-
-
-Each filter option has three fields to select value in.
-
-#### Field
-
-Select field of the form based on which you wish to filter records.
-
-
-
-#### Based On
-
-With Field, you will provide a value. In the based on field, you can define a criterion that when filter should be applied in record. It will be when value define for the field if filter is:
-
-
-
-#### Value
-
-A value should be entered in this field based on while records will be filtered.
-
-
-
-After filter is applied, records will be filtered based on it. And filter will shrunk under one field/button.
-
-
-
-On the transactions, Document Status - Not Equal To - Cancelled is applied by default. With this, Cancelled transactions are hidden from the list.
-
-
-
-You can apply multiple filters on a list of transactions one-by-one. To remove specific filter, just click on cancelled (X) sign ahead of it.
-
-<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md b/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md
index af812c3..44d4e97 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/tree-master-renaming.md
@@ -1,29 +1,23 @@
#Tree Master Renaming
-There are various master which are maintained in tree structure. Click [here](https://erpnext.com/kb/setup/managing-tree-structure-masters) to learn more about tree structured masters in ERPNext.
+There are various master which are maintained in tree structure. Click [here]({{docs_base_url}}/user/manual/en/setting-up/articles/managing-tree-structure-masters.html) to learn more about tree structured masters in ERPNext.
-Following are the steps to be followed for renaming Account/Ledger ID, master which is maintained in tree structure. These steps will be applicable for renaming any master which is maintained in tree structure.
+Following are the steps to be followed for renaming ID of a master which is maintained in tree structure. Let's rename an Account for the instance.
#### Step 1: Go to Chart of Account
`Accounts > Setup > Chart of Accounts`
-#### Step 2: Go to Account
+#### Step 2: Go to Account
-Expand Chart of Accounts and click on that account which you want to rename. When you click on that account, you will find Rename option.
+When click on the Account, you will find Rename option.
-
+<img alt="Account" class="screenshot" src="{{docs_base_url}}/assets/img/articles/rename-account.png">
#### Step 2: Rename Account
-On clicking Rename option, dialog box will give you field to enter New Name for this Account. You should enter new name for the Account/Ledger and click on "Rename" button. On clicking Rename button, existing account will be renamed.
+On clicking Rename, you will get field to enter New Name. After entering new name for the Account, click on the "Rename" button.
-
-
-Following is how renamed account will appear in the Chart of Account master.
-
-
-
-
+<img alt="Renamed Account" class="screenshot" src="{{docs_base_url}}/assets/img/articles/rename-account-2.gif">
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 565f044..958fc83 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -7,7 +7,7 @@
app_description = """ERP made simple"""
app_icon = "icon-th"
app_color = "#e74c3c"
-app_version = "6.23.3"
+app_version = "6.23.6"
app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext"
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 349c778..24a21d9 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -9,6 +9,10 @@
from operator import itemgetter
+form_grid_templates = {
+ "items": "templates/form_grid/item_grid.html"
+}
+
class BOM(Document):
def autoname(self):
last_name = frappe.db.sql("""select max(name) from `tabBOM`
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 2348777..1ecd440 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -246,7 +246,7 @@
erpnext.patches.v6_16.create_manufacturer_records
execute:frappe.db.sql("update `tabPricing Rule` set title=name where title='' or title is null") #2016-01-27
erpnext.patches.v6_20.set_party_account_currency_in_orders
-#erpnext.patches.v6_19.comment_feed_communication
+erpnext.patches.v6_19.comment_feed_communication
erpnext.patches.v6_21.fix_reorder_level
erpnext.patches.v6_21.rename_material_request_fields
erpnext.patches.v6_23.update_stopped_status_to_closed
\ No newline at end of file
diff --git a/erpnext/projects/doctype/time_log/time_log.py b/erpnext/projects/doctype/time_log/time_log.py
index 6763209..5242b2c 100644
--- a/erpnext/projects/doctype/time_log/time_log.py
+++ b/erpnext/projects/doctype/time_log/time_log.py
@@ -88,10 +88,9 @@
existing = frappe.db.sql("""select name, from_time, to_time from `tabTime Log`
where `{0}`=%(val)s and
(
- (from_time > %(from_time)s and from_time < %(to_time)s) or
- (to_time > %(from_time)s and to_time < %(to_time)s) or
- (%(from_time)s > from_time and %(from_time)s < to_time) or
- (%(from_time)s = from_time and %(to_time)s = to_time))
+ (%(from_time)s between from_time and to_time) or
+ (%(to_time)s between from_time and to_time) or
+ (%(from_time)s <= from_time and %(to_time)s >= to_time))
and name!=%(name)s
and docstatus < 2""".format(fieldname),
{
diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json
index e3745da..b58568f 100644
--- a/erpnext/selling/doctype/quotation_item/quotation_item.json
+++ b/erpnext/selling/doctype/quotation_item/quotation_item.json
@@ -724,11 +724,12 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 1,
- "collapsible_depends_on": "eval:doc.actual_qty",
+ "collapsible_depends_on": "eval:doc.warehouse",
"fieldname": "item_balance",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Item Balance",
@@ -753,6 +754,7 @@
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Warehouse",
@@ -778,6 +780,7 @@
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"length": 0,
@@ -797,11 +800,37 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "fieldname": "projected_qty",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Projected Qty",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 1,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
"description": "",
"fieldname": "actual_qty",
"fieldtype": "Float",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Actual Qty",
@@ -826,6 +855,7 @@
"fieldtype": "Button",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Stock Balance",
@@ -1067,7 +1097,7 @@
"istable": 1,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-02-23 18:12:49.939175",
+ "modified": "2016-02-26 18:30:22.286356",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation Item",
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 6860486..e972868 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -168,7 +168,8 @@
})
# if default specified in item is for another company, fetch from company
- for d in [["Account", "income_account", "default_income_account"], ["Account", "expense_account", "default_expense_account"],
+ for d in [["Account", "income_account", "default_income_account"],
+ ["Account", "expense_account", "default_expense_account"],
["Cost Center", "cost_center", "cost_center"], ["Warehouse", "warehouse", ""]]:
company = frappe.db.get_value(d[0], out.get(d[1]), "company")
if not out[d[1]] or (company and args.company != company):
diff --git a/setup.py b/setup.py
index 586fc2c..92e4a92 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
from setuptools import setup, find_packages
from pip.req import parse_requirements
-version = "6.23.3"
+version = "6.23.6"
requirements = parse_requirements("requirements.txt", session="")
setup(
