Merge pull request #4607 from saurabh6790/group_custom_buttons
[enhance] merge customize buttons under groups
diff --git a/erpnext/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py
index a8ebbea..1f9c74d 100644
--- a/erpnext/accounts/doctype/account/account.py
+++ b/erpnext/accounts/doctype/account/account.py
@@ -27,6 +27,7 @@
return
self.validate_parent()
self.validate_root_details()
+ self.validate_group_or_ledger()
self.set_root_and_report_type()
self.validate_mandatory()
self.validate_warehouse_account()
@@ -80,6 +81,20 @@
if not self.parent_account and not self.is_group:
frappe.throw(_("Root Account must be a group"))
+
+ def validate_group_or_ledger(self):
+ if self.get("__islocal"):
+ return
+
+ existing_is_group = frappe.db.get_value("Account", self.name, "is_group")
+ if self.is_group != existing_is_group:
+ if self.check_gle_exists():
+ throw(_("Account with existing transaction cannot be converted to ledger"))
+ elif self.is_group:
+ if self.account_type:
+ throw(_("Cannot covert to Group because Account Type is selected."))
+ elif self.check_if_child_exists():
+ throw(_("Account with child nodes cannot be set as ledger"))
def validate_frozen_accounts_modifier(self):
old_value = frappe.db.get_value("Account", self.name, "freeze_account")
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py
index 23fd5a8..9e29697 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.py
+++ b/erpnext/accounts/doctype/payment_request/payment_request.py
@@ -40,7 +40,6 @@
if not frappe.conf.paypal_username:
frappe.throw(_("PayPal Settings missing"))
-
def on_submit(self):
if not self.mute_email:
self.send_payment_request()
@@ -227,11 +226,8 @@
@frappe.whitelist(allow_guest=True)
def generate_payment_request(name):
- payment_url = frappe.get_doc("Payment Request", name).run_method("get_payment_url")
- if payment_url:
- frappe.local.response["type"] = "redirect"
- frappe.local.response["location"] = payment_url
-
+ frappe.get_doc("Payment Request", name).run_method("get_payment_url")
+
@frappe.whitelist(allow_guest=True)
def resend_payment_email(docname):
return frappe.get_doc("Payment Request", docname).send_email()
diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py
index a8ce6a7..863ad6d 100644
--- a/erpnext/config/desktop.py
+++ b/erpnext/config/desktop.py
@@ -2,32 +2,50 @@
from frappe import _
def get_data():
- return {
- "Accounts": {
+ return [
+ {
+ "module_name": "Accounts",
"color": "#3498db",
"icon": "octicon octicon-repo",
"type": "module"
},
- "Buying": {
+ {
+ "module_name": "CRM",
+ "color": "#EF4DB6",
+ "icon": "octicon octicon-broadcast",
+ "type": "module"
+ },
+ {
+ "module_name": "Selling",
+ "color": "#1abc9c",
+ "icon": "icon-tag",
+ "icon": "octicon octicon-tag",
+ "type": "module"
+ },
+ {
+ "module_name": "Buying",
"color": "#c0392b",
"icon": "icon-shopping-cart",
"icon": "octicon octicon-briefcase",
"type": "module"
},
- "HR": {
+ {
+ "module_name": "HR",
"color": "#2ecc71",
"icon": "icon-group",
"icon": "octicon octicon-organization",
"label": _("Human Resources"),
"type": "module"
},
- "Manufacturing": {
+ {
+ "module_name": "Manufacturing",
"color": "#7f8c8d",
"icon": "icon-cogs",
"icon": "octicon octicon-tools",
"type": "module"
},
- "POS": {
+ {
+ "module_name": "POS",
"color": "#589494",
"icon": "icon-th",
"icon": "octicon octicon-credit-card",
@@ -35,41 +53,33 @@
"link": "pos",
"label": _("POS")
},
- "Projects": {
+ {
+ "module_name": "Projects",
"color": "#8e44ad",
"icon": "icon-puzzle-piece",
"icon": "octicon octicon-rocket",
"type": "module"
},
- "Selling": {
- "color": "#1abc9c",
- "icon": "icon-tag",
- "icon": "octicon octicon-tag",
- "type": "module"
- },
- "CRM": {
- "color": "#EF4DB6",
- "icon": "octicon octicon-broadcast",
- "type": "module"
- },
- "Stock": {
+ {
+ "module_name": "Stock",
"color": "#f39c12",
"icon": "icon-truck",
"icon": "octicon octicon-package",
"type": "module"
},
- "Support": {
+ {
+ "module_name": "Support",
"color": "#2c3e50",
"icon": "icon-phone",
"icon": "octicon octicon-issue-opened",
"type": "module"
},
- "Learn": {
+ {
+ "module_name": "Learn",
"color": "#FF888B",
- "force_show": True,
"icon": "octicon octicon-device-camera-video",
"type": "module",
"is_help": True,
"label": _("Learn")
}
- }
+ ]
diff --git a/erpnext/controllers/js/contact_address_common.js b/erpnext/controllers/js/contact_address_common.js
index df3323f..c51ff46 100644
--- a/erpnext/controllers/js/contact_address_common.js
+++ b/erpnext/controllers/js/contact_address_common.js
@@ -33,7 +33,7 @@
cur_frm.set_value("address_title", cur_frm.doc.customer_name);
}
}
- if(["Supplier", "Supplier Quotation", "Purchase Order", "Purchase Invoice", "Purchase Receipt"]
+ else if(["Supplier", "Supplier Quotation", "Purchase Order", "Purchase Invoice", "Purchase Receipt"]
.indexOf(doctype)!==-1) {
var refdoc = frappe.get_doc(doctype, docname);
cur_frm.set_value("supplier", refdoc.supplier || refdoc.name);
@@ -41,7 +41,7 @@
if(cur_frm.doc.doctype==="Address")
cur_frm.set_value("address_title", cur_frm.doc.supplier_name);
}
- if(["Lead", "Opportunity", "Quotation"]
+ else if(["Lead", "Opportunity", "Quotation"]
.indexOf(doctype)!==-1) {
var refdoc = frappe.get_doc(doctype, docname);
@@ -53,6 +53,9 @@
cur_frm.set_value("address_title", cur_frm.doc.lead_name);
}
}
+ else if(doctype == "Sales Partner") {
+ cur_frm.set_value("sales_partner", docname);
+ }
}
}
}
diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.status_updater.html b/erpnext/docs/current/api/controllers/erpnext.controllers.status_updater.html
index eb34f9b..fddc5d7 100644
--- a/erpnext/docs/current/api/controllers/erpnext.controllers.status_updater.html
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.status_updater.html
@@ -33,7 +33,7 @@
<a name="_update_children" href="#_update_children" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>_update_children</b>
- <i class="text-muted">(self, args)</i>
+ <i class="text-muted">(self, args, update_modified)</i>
</p>
<div class="docs-attr-desc"><p>Update quantities or amount in child table</p>
</div>
@@ -44,10 +44,38 @@
<p class="docs-attr-name">
+ <a name="_update_modified" href="#_update_modified" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>_update_modified</b>
+ <i class="text-muted">(self, args, update_modified)</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="_update_percent_field" href="#_update_percent_field" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>_update_percent_field</b>
- <i class="text-muted">(self, args)</i>
+ <i class="text-muted">(self, args, update_modified=True)</i>
+ </p>
+ <div class="docs-attr-desc"><p>Update percent field in parent transaction</p>
+</div>
+ <br>
+
+
+
+
+
+ <p class="docs-attr-name">
+ <a name="_update_percent_field_in_targets" href="#_update_percent_field_in_targets" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>_update_percent_field_in_targets</b>
+ <i class="text-muted">(self, args, update_modified=True)</i>
</p>
<div class="docs-attr-desc"><p>Update percent field in parent transaction</p>
</div>
@@ -131,14 +159,14 @@
<a name="update_qty" href="#update_qty" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>update_qty</b>
- <i class="text-muted">(self, change_modified=True)</i>
+ <i class="text-muted">(self, update_modified=True)</i>
</p>
<div class="docs-attr-desc"><p>Updates qty or amount at row level</p>
<p><strong>Parameters:</strong></p>
<ul>
-<li><strong><code>change_modified</code></strong> - If true, updates <code>modified</code> and <code>modified_by</code> for target parent doc</li>
+<li><strong><code>update_modified</code></strong> - If true, updates <code>modified</code> and <code>modified_by</code> for target parent doc</li>
</ul>
</div>
<br>
diff --git a/erpnext/docs/current/api/controllers/erpnext.controllers.stock_controller.html b/erpnext/docs/current/api/controllers/erpnext.controllers.stock_controller.html
index fd3dc8c..f0833eb 100644
--- a/erpnext/docs/current/api/controllers/erpnext.controllers.stock_controller.html
+++ b/erpnext/docs/current/api/controllers/erpnext.controllers.stock_controller.html
@@ -195,6 +195,20 @@
<p class="docs-attr-name">
+ <a name="update_billing_percentage" href="#update_billing_percentage" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>update_billing_percentage</b>
+ <i class="text-muted">(self, update_modified=True)</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="update_reserved_qty" href="#update_reserved_qty" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>update_reserved_qty</b>
diff --git a/erpnext/docs/current/index.html b/erpnext/docs/current/index.html
index 5762d0a..4c021c1 100644
--- a/erpnext/docs/current/index.html
+++ b/erpnext/docs/current/index.html
@@ -35,7 +35,7 @@
Version
</td>
<td>
- <code>6.16.2</code>
+ <code>6.16.4</code>
</td>
</tr>
</table>
@@ -52,4 +52,4 @@
<!-- autodoc -->
<!-- jinja -->
-<!-- static -->
+<!-- static -->
\ No newline at end of file
diff --git a/erpnext/docs/current/models/accounts/account.html b/erpnext/docs/current/models/accounts/account.html
index bbc0203..5b3103d 100644
--- a/erpnext/docs/current/models/accounts/account.html
+++ b/erpnext/docs/current/models/accounts/account.html
@@ -946,10 +946,6 @@
-
-
-
-
<li>
diff --git a/erpnext/docs/current/models/accounts/purchase_invoice.html b/erpnext/docs/current/models/accounts/purchase_invoice.html
index 197b896..1bdbcbf 100644
--- a/erpnext/docs/current/models/accounts/purchase_invoice.html
+++ b/erpnext/docs/current/models/accounts/purchase_invoice.html
@@ -1751,6 +1751,20 @@
<p class="docs-attr-name">
+ <a name="update_billing_status_in_pr" href="#update_billing_status_in_pr" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>update_billing_status_in_pr</b>
+ <i class="text-muted">(self, update_modified=True)</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="update_project" href="#update_project" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>update_project</b>
diff --git a/erpnext/docs/current/models/accounts/sales_invoice.html b/erpnext/docs/current/models/accounts/sales_invoice.html
index 9bd05d4..07e3212 100644
--- a/erpnext/docs/current/models/accounts/sales_invoice.html
+++ b/erpnext/docs/current/models/accounts/sales_invoice.html
@@ -2362,6 +2362,20 @@
<p class="docs-attr-name">
+ <a name="update_billing_status_in_dn" href="#update_billing_status_in_dn" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>update_billing_status_in_dn</b>
+ <i class="text-muted">(self, update_modified=True)</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="update_current_stock" href="#update_current_stock" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>update_current_stock</b>
diff --git a/erpnext/docs/current/models/buying/purchase_order.html b/erpnext/docs/current/models/buying/purchase_order.html
index 202cb44..bbf1dce 100644
--- a/erpnext/docs/current/models/buying/purchase_order.html
+++ b/erpnext/docs/current/models/buying/purchase_order.html
@@ -1556,6 +1556,20 @@
<p class="docs-attr-name">
+ <a name="get_last_purchase_rate" href="#get_last_purchase_rate" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>get_last_purchase_rate</b>
+ <i class="text-muted">(self)</i>
+ </p>
+ <div class="docs-attr-desc"><p>get last purchase rates for all items</p>
+</div>
+ <br>
+
+
+
+
+
+ <p class="docs-attr-name">
<a name="get_schedule_dates" href="#get_schedule_dates" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>get_schedule_dates</b>
diff --git a/erpnext/docs/current/models/setup/company.html b/erpnext/docs/current/models/setup/company.html
index 27e2294..88381d1 100644
--- a/erpnext/docs/current/models/setup/company.html
+++ b/erpnext/docs/current/models/setup/company.html
@@ -825,20 +825,6 @@
<p class="docs-attr-name">
- <a name="add_acc" href="#add_acc" class="text-muted small">
- <i class="icon-link small" style="color: #ccc;"></i></a>
- <b>add_acc</b>
- <i class="text-muted">(self, lst)</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="after_rename" href="#after_rename" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>after_rename</b>
diff --git a/erpnext/docs/current/models/setup/terms_and_conditions.html b/erpnext/docs/current/models/setup/terms_and_conditions.html
index 95acfe1..cc3fdee 100644
--- a/erpnext/docs/current/models/setup/terms_and_conditions.html
+++ b/erpnext/docs/current/models/setup/terms_and_conditions.html
@@ -64,6 +64,18 @@
<tr >
<td>2</td>
+ <td ><code>disabled</code></td>
+ <td >
+ Check</td>
+ <td >
+ Disabled
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>3</td>
<td ><code>terms</code></td>
<td >
Text Editor</td>
diff --git a/erpnext/docs/current/models/stock/delivery_note.html b/erpnext/docs/current/models/stock/delivery_note.html
index 64a872b..29b6b77 100644
--- a/erpnext/docs/current/models/stock/delivery_note.html
+++ b/erpnext/docs/current/models/stock/delivery_note.html
@@ -1316,8 +1316,20 @@
</td>
</tr>
- <tr class="info">
+ <tr >
<td>86</td>
+ <td ><code>per_billed</code></td>
+ <td >
+ Currency</td>
+ <td >
+ % Amount Billed
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr class="info">
+ <td>87</td>
<td ><code>printing_details</code></td>
<td >
Section Break</td>
@@ -1329,7 +1341,7 @@
</tr>
<tr >
- <td>87</td>
+ <td>88</td>
<td ><code>letter_head</code></td>
<td >
Link</td>
@@ -1350,7 +1362,7 @@
</tr>
<tr >
- <td>88</td>
+ <td>89</td>
<td ><code>select_print_heading</code></td>
<td >
Link</td>
@@ -1371,7 +1383,7 @@
</tr>
<tr >
- <td>89</td>
+ <td>90</td>
<td ><code>column_break_88</code></td>
<td class="info">
Column Break</td>
@@ -1383,7 +1395,7 @@
</tr>
<tr >
- <td>90</td>
+ <td>91</td>
<td ><code>print_without_amount</code></td>
<td >
Check</td>
@@ -1395,7 +1407,7 @@
</tr>
<tr class="info">
- <td>91</td>
+ <td>92</td>
<td ><code>section_break_83</code></td>
<td >
Section Break</td>
@@ -1407,7 +1419,7 @@
</tr>
<tr >
- <td>92</td>
+ <td>93</td>
<td class="danger" title="Mandatory"><code>status</code></td>
<td >
Select</td>
@@ -1418,14 +1430,15 @@
<td>
<pre>
Draft
-Submitted
+To Bill
+Completed
Cancelled
Closed</pre>
</td>
</tr>
<tr >
- <td>93</td>
+ <td>94</td>
<td ><code>per_installed</code></td>
<td >
Percent</td>
@@ -1438,7 +1451,7 @@
</tr>
<tr >
- <td>94</td>
+ <td>95</td>
<td ><code>installation_status</code></td>
<td >
Select</td>
@@ -1450,7 +1463,7 @@
</tr>
<tr >
- <td>95</td>
+ <td>96</td>
<td ><code>column_break_89</code></td>
<td class="info">
Column Break</td>
@@ -1462,7 +1475,7 @@
</tr>
<tr >
- <td>96</td>
+ <td>97</td>
<td ><code>to_warehouse</code></td>
<td >
Link</td>
@@ -1484,7 +1497,7 @@
</tr>
<tr >
- <td>97</td>
+ <td>98</td>
<td ><code>excise_page</code></td>
<td >
Data</td>
@@ -1496,7 +1509,7 @@
</tr>
<tr >
- <td>98</td>
+ <td>99</td>
<td ><code>instructions</code></td>
<td >
Text</td>
@@ -1508,7 +1521,7 @@
</tr>
<tr class="info">
- <td>99</td>
+ <td>100</td>
<td ><code>sales_team_section_break</code></td>
<td >
Section Break</td>
@@ -1522,7 +1535,7 @@
</tr>
<tr >
- <td>100</td>
+ <td>101</td>
<td ><code>sales_partner</code></td>
<td >
Link</td>
@@ -1543,7 +1556,7 @@
</tr>
<tr >
- <td>101</td>
+ <td>102</td>
<td ><code>column_break7</code></td>
<td class="info">
Column Break</td>
@@ -1555,7 +1568,7 @@
</tr>
<tr >
- <td>102</td>
+ <td>103</td>
<td ><code>commission_rate</code></td>
<td >
Float</td>
@@ -1567,7 +1580,7 @@
</tr>
<tr >
- <td>103</td>
+ <td>104</td>
<td ><code>total_commission</code></td>
<td >
Currency</td>
@@ -1581,7 +1594,7 @@
</tr>
<tr class="info">
- <td>104</td>
+ <td>105</td>
<td ><code>section_break1</code></td>
<td >
Section Break</td>
@@ -1593,7 +1606,7 @@
</tr>
<tr >
- <td>105</td>
+ <td>106</td>
<td ><code>sales_team</code></td>
<td >
Table</td>
@@ -1779,6 +1792,20 @@
<p class="docs-attr-name">
+ <a name="update_billing_status" href="#update_billing_status" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>update_billing_status</b>
+ <i class="text-muted">(self, update_modified=True)</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="update_current_stock" href="#update_current_stock" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>update_current_stock</b>
@@ -1999,6 +2026,22 @@
+
+ <p class="docs-attr-name">
+ <a name="erpnext.stock.doctype.delivery_note.delivery_note.update_billed_amount_based_on_so" href="#erpnext.stock.doctype.delivery_note.delivery_note.update_billed_amount_based_on_so" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ erpnext.stock.doctype.delivery_note.delivery_note.<b>update_billed_amount_based_on_so</b>
+ <i class="text-muted">(so_detail, update_modified=True)</i>
+ </p>
+ <div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+ <br>
+
+
+
+
+
+
<p><span class="label label-info">Public API</span>
<br><code>/api/method/erpnext.stock.doctype.delivery_note.delivery_note.update_delivery_note_status</code>
</p>
diff --git a/erpnext/docs/current/models/stock/delivery_note_item.html b/erpnext/docs/current/models/stock/delivery_note_item.html
index c7abefe..1c48c11 100644
--- a/erpnext/docs/current/models/stock/delivery_note_item.html
+++ b/erpnext/docs/current/models/stock/delivery_note_item.html
@@ -746,6 +746,20 @@
<tr >
<td>49</td>
+ <td ><code>billed_amt</code></td>
+ <td >
+ Currency</td>
+ <td >
+ Billed Amt
+
+ </td>
+ <td>
+ <pre>currency</pre>
+ </td>
+ </tr>
+
+ <tr >
+ <td>50</td>
<td ><code>page_break</code></td>
<td >
Check</td>
diff --git a/erpnext/docs/current/models/stock/price_list.html b/erpnext/docs/current/models/stock/price_list.html
index 28e2cec..60d5b2e 100644
--- a/erpnext/docs/current/models/stock/price_list.html
+++ b/erpnext/docs/current/models/stock/price_list.html
@@ -391,8 +391,6 @@
-
-
<li>
diff --git a/erpnext/docs/current/models/stock/purchase_receipt.html b/erpnext/docs/current/models/stock/purchase_receipt.html
index ee9ed27..dda3979 100644
--- a/erpnext/docs/current/models/stock/purchase_receipt.html
+++ b/erpnext/docs/current/models/stock/purchase_receipt.html
@@ -1082,7 +1082,8 @@
<td>
<pre>
Draft
-Submitted
+To Bill
+Completed
Cancelled
Closed</pre>
</td>
@@ -1157,6 +1158,18 @@
<tr >
<td>77</td>
+ <td ><code>per_billed</code></td>
+ <td >
+ Percent</td>
+ <td >
+ % Amount Billed
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>78</td>
<td class="danger" title="Mandatory"><code>company</code></td>
<td >
Link</td>
@@ -1177,7 +1190,7 @@
</tr>
<tr >
- <td>78</td>
+ <td>79</td>
<td class="danger" title="Mandatory"><code>fiscal_year</code></td>
<td >
Link</td>
@@ -1198,7 +1211,7 @@
</tr>
<tr class="info">
- <td>79</td>
+ <td>80</td>
<td ><code>printing_settings</code></td>
<td >
Section Break</td>
@@ -1210,7 +1223,7 @@
</tr>
<tr >
- <td>80</td>
+ <td>81</td>
<td ><code>letter_head</code></td>
<td >
Link</td>
@@ -1231,7 +1244,7 @@
</tr>
<tr >
- <td>81</td>
+ <td>82</td>
<td ><code>select_print_heading</code></td>
<td >
Link</td>
@@ -1252,7 +1265,7 @@
</tr>
<tr >
- <td>82</td>
+ <td>83</td>
<td ><code>other_details</code></td>
<td >
HTML</td>
@@ -1264,7 +1277,7 @@
</tr>
<tr >
- <td>83</td>
+ <td>84</td>
<td ><code>instructions</code></td>
<td >
Small Text</td>
@@ -1276,7 +1289,7 @@
</tr>
<tr >
- <td>84</td>
+ <td>85</td>
<td ><code>remarks</code></td>
<td >
Small Text</td>
@@ -1288,7 +1301,7 @@
</tr>
<tr class="info">
- <td>85</td>
+ <td>86</td>
<td ><code>transporter_info</code></td>
<td >
Section Break</td>
@@ -1302,7 +1315,7 @@
</tr>
<tr >
- <td>86</td>
+ <td>87</td>
<td ><code>transporter_name</code></td>
<td >
Data</td>
@@ -1314,7 +1327,7 @@
</tr>
<tr >
- <td>87</td>
+ <td>88</td>
<td ><code>column_break5</code></td>
<td class="info">
Column Break</td>
@@ -1326,7 +1339,7 @@
</tr>
<tr >
- <td>88</td>
+ <td>89</td>
<td ><code>lr_no</code></td>
<td >
Data</td>
@@ -1338,7 +1351,7 @@
</tr>
<tr >
- <td>89</td>
+ <td>90</td>
<td ><code>lr_date</code></td>
<td >
Date</td>
@@ -1571,6 +1584,20 @@
<p class="docs-attr-name">
+ <a name="update_billing_status" href="#update_billing_status" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ <b>update_billing_status</b>
+ <i class="text-muted">(self, update_modified=True)</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="update_ordered_qty" href="#update_ordered_qty" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>update_ordered_qty</b>
@@ -1753,6 +1780,22 @@
+
+ <p class="docs-attr-name">
+ <a name="erpnext.stock.doctype.purchase_receipt.purchase_receipt.update_billed_amount_based_on_po" href="#erpnext.stock.doctype.purchase_receipt.purchase_receipt.update_billed_amount_based_on_po" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ erpnext.stock.doctype.purchase_receipt.purchase_receipt.<b>update_billed_amount_based_on_po</b>
+ <i class="text-muted">(po_detail, update_modified=True)</i>
+ </p>
+ <div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+ <br>
+
+
+
+
+
+
<p><span class="label label-info">Public API</span>
<br><code>/api/method/erpnext.stock.doctype.purchase_receipt.purchase_receipt.update_purchase_receipt_status</code>
</p>
diff --git a/erpnext/docs/current/models/stock/purchase_receipt_item.html b/erpnext/docs/current/models/stock/purchase_receipt_item.html
index 025f291..1ee6b14 100644
--- a/erpnext/docs/current/models/stock/purchase_receipt_item.html
+++ b/erpnext/docs/current/models/stock/purchase_receipt_item.html
@@ -794,6 +794,18 @@
<tr >
<td>53</td>
+ <td ><code>billed_amt</code></td>
+ <td >
+ Currency</td>
+ <td >
+ Billed Amt
+
+ </td>
+ <td></td>
+ </tr>
+
+ <tr >
+ <td>54</td>
<td ><code>brand</code></td>
<td >
Link</td>
@@ -814,7 +826,7 @@
</tr>
<tr >
- <td>54</td>
+ <td>55</td>
<td ><code>item_group</code></td>
<td >
Link</td>
@@ -835,7 +847,7 @@
</tr>
<tr >
- <td>55</td>
+ <td>56</td>
<td ><code>rm_supp_cost</code></td>
<td >
Currency</td>
@@ -849,7 +861,7 @@
</tr>
<tr >
- <td>56</td>
+ <td>57</td>
<td ><code>item_tax_amount</code></td>
<td >
Currency</td>
@@ -863,7 +875,7 @@
</tr>
<tr >
- <td>57</td>
+ <td>58</td>
<td ><code>landed_cost_voucher_amount</code></td>
<td >
Currency</td>
@@ -875,7 +887,7 @@
</tr>
<tr >
- <td>58</td>
+ <td>59</td>
<td ><code>valuation_rate</code></td>
<td >
Currency</td>
@@ -889,7 +901,7 @@
</tr>
<tr >
- <td>59</td>
+ <td>60</td>
<td ><code>item_tax_rate</code></td>
<td >
Small Text</td>
@@ -903,7 +915,7 @@
</tr>
<tr >
- <td>60</td>
+ <td>61</td>
<td ><code>page_break</code></td>
<td >
Check</td>
diff --git a/erpnext/docs/current/models/stock/stock_entry.html b/erpnext/docs/current/models/stock/stock_entry.html
index 652d816..29bc11e 100644
--- a/erpnext/docs/current/models/stock/stock_entry.html
+++ b/erpnext/docs/current/models/stock/stock_entry.html
@@ -1192,20 +1192,6 @@
<p class="docs-attr-name">
- <a name="get_warehouse_details" href="#get_warehouse_details" class="text-muted small">
- <i class="icon-link small" style="color: #ccc;"></i></a>
- <b>get_warehouse_details</b>
- <i class="text-muted">(self, args)</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="load_items_from_bom" href="#load_items_from_bom" class="text-muted small">
<i class="icon-link small" style="color: #ccc;"></i></a>
<b>load_items_from_bom</b>
@@ -1580,6 +1566,24 @@
+
+
+
+ <p><span class="label label-info">Public API</span>
+ <br><code>/api/method/erpnext.stock.doctype.stock_entry.stock_entry.get_warehouse_details</code>
+ </p>
+ <p class="docs-attr-name">
+ <a name="erpnext.stock.doctype.stock_entry.stock_entry.get_warehouse_details" href="#erpnext.stock.doctype.stock_entry.stock_entry.get_warehouse_details" class="text-muted small">
+ <i class="icon-link small" style="color: #ccc;"></i></a>
+ erpnext.stock.doctype.stock_entry.stock_entry.<b>get_warehouse_details</b>
+ <i class="text-muted">(args)</i>
+ </p>
+ <div class="docs-attr-desc"><p><span class="text-muted">No docs</span></p>
+</div>
+ <br>
+
+
+
diff --git a/erpnext/docs/current/models/stock/warehouse.html b/erpnext/docs/current/models/stock/warehouse.html
index 2d7108b..c0fa5d3 100644
--- a/erpnext/docs/current/models/stock/warehouse.html
+++ b/erpnext/docs/current/models/stock/warehouse.html
@@ -629,8 +629,6 @@
-
-
<li>
diff --git a/erpnext/projects/doctype/time_log/time_log.js b/erpnext/projects/doctype/time_log/time_log.js
index 3a01ca5..7648a53 100644
--- a/erpnext/projects/doctype/time_log/time_log.js
+++ b/erpnext/projects/doctype/time_log/time_log.js
@@ -53,12 +53,12 @@
var calculate_cost = function(frm) {
frm.set_value("costing_amount", frm.doc.costing_rate * frm.doc.hours);
if (frm.doc.billable==1){
- frm.set_value("billing_amount", frm.doc.billing_rate * frm.doc.hours);
+ frm.set_value("billing_amount", (frm.doc.billing_rate * frm.doc.hours) + frm.doc.additional_cost);
}
}
var get_activity_cost = function(frm) {
- if (frm.doc.employee && frm.doc.activity_type){
+ if (frm.doc.activity_type){
return frappe.call({
method: "erpnext.projects.doctype.time_log.time_log.get_activity_cost",
args: {
@@ -80,6 +80,10 @@
calculate_cost(frm);
});
+frappe.ui.form.on("Time Log", "additional_cost", function(frm) {
+ calculate_cost(frm);
+});
+
frappe.ui.form.on("Time Log", "activity_type", function(frm) {
get_activity_cost(frm);
});
@@ -94,6 +98,7 @@
}
else {
frm.set_value("billing_amount", 0);
+ frm.set_value("additional_cost", 0);
}
});
diff --git a/erpnext/projects/doctype/time_log/time_log.json b/erpnext/projects/doctype/time_log/time_log.json
index 4490f97..88eae1e 100644
--- a/erpnext/projects/doctype/time_log/time_log.json
+++ b/erpnext/projects/doctype/time_log/time_log.json
@@ -1,934 +1,950 @@
{
- "allow_copy": 0,
- "allow_import": 1,
- "allow_rename": 0,
- "autoname": "naming_series:",
- "creation": "2013-04-03 16:38:41",
- "custom": 0,
- "description": "Log of Activities performed by users against Tasks that can be used for tracking time, billing.",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Setup",
+ "allow_copy": 0,
+ "allow_import": 1,
+ "allow_rename": 0,
+ "autoname": "naming_series:",
+ "creation": "2013-04-03 16:38:41",
+ "custom": 0,
+ "description": "Log of Activities performed by users against Tasks that can be used for tracking time, billing.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Setup",
"fields": [
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Series",
- "length": 0,
- "no_copy": 0,
- "options": "TL-",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 1,
+ "collapsible": 0,
+ "depends_on": "eval:!doc.for_manufacturing",
+ "fieldname": "activity_type",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Activity Type",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Activity Type",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "column_break_2",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Series",
+ "length": 0,
+ "no_copy": 0,
+ "options": "TL-",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "status",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Status",
- "length": 0,
- "no_copy": 0,
- "options": "Draft\nSubmitted\nBatched for Billing\nBilled\nCancelled",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "depends_on": "",
+ "fieldname": "project",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "label": "Project",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Project",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "section_break_4",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "depends_on": "",
+ "fieldname": "task",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Task",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Task",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "from_time",
- "fieldtype": "Datetime",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "From Time",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Status",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Draft\nSubmitted\nBatched for Billing\nBilled\nCancelled",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "default": "0",
- "fieldname": "hours",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 1,
- "label": "Hours",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "column_break_2",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "to_time",
- "fieldtype": "Datetime",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "To Time",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "from_time",
+ "fieldtype": "Datetime",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "From Time",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "column_break_8",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "default": "0",
+ "fieldname": "hours",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "label": "Hours",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "depends_on": "eval:!doc.for_manufacturing",
- "fieldname": "activity_type",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Activity Type",
- "length": 0,
- "no_copy": 0,
- "options": "Activity Type",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "to_time",
+ "fieldtype": "Datetime",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "To Time",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "depends_on": "",
- "fieldname": "project",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 1,
- "label": "Project",
- "length": 0,
- "no_copy": 0,
- "options": "Project",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "billable",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Billable",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "depends_on": "",
- "fieldname": "task",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Task",
- "length": 0,
- "no_copy": 0,
- "options": "Task",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "section_break_7",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "section_break_12",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "note",
+ "fieldtype": "Text Editor",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Note",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "user",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "User",
- "length": 0,
- "no_copy": 0,
- "options": "User",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "section_break_12",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "employee",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Employee",
- "length": 0,
- "no_copy": 0,
- "options": "Employee",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "user",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "User",
+ "length": 0,
+ "no_copy": 0,
+ "options": "User",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "column_break_3",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "employee",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Employee",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Employee",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "for_manufacturing",
- "fieldtype": "Check",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "For Manufacturing",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "column_break_3",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "billable",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Billable",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "for_manufacturing",
+ "fieldtype": "Check",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "For Manufacturing",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "depends_on": "eval:doc.for_manufacturing",
- "fieldname": "section_break_11",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "depends_on": "eval:doc.for_manufacturing",
+ "fieldname": "section_break_11",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "depends_on": "",
- "fieldname": "production_order",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Production Order",
- "length": 0,
- "no_copy": 0,
- "options": "Production Order",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "depends_on": "",
+ "fieldname": "production_order",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Production Order",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Production Order",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "depends_on": "",
- "fieldname": "operation",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Operation",
- "length": 0,
- "no_copy": 0,
- "options": "Operation",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "depends_on": "",
+ "fieldname": "operation",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Operation",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Operation",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "depends_on": "",
- "fieldname": "operation_id",
- "fieldtype": "Data",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Operation ID",
- "length": 0,
- "no_copy": 0,
- "options": "",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "depends_on": "",
+ "fieldname": "operation_id",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Operation ID",
+ "length": 0,
+ "no_copy": 0,
+ "options": "",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "column_break_14",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "column_break_14",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "depends_on": "",
- "fieldname": "workstation",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Workstation",
- "length": 0,
- "no_copy": 0,
- "options": "Workstation",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "depends_on": "",
+ "fieldname": "workstation",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Workstation",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Workstation",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "depends_on": "",
- "description": "Operation completed for how many finished goods?",
- "fieldname": "completed_qty",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Completed Qty",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "depends_on": "",
+ "description": "Operation completed for how many finished goods?",
+ "fieldname": "completed_qty",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Completed Qty",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "section_break_7",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "depends_on": "",
+ "fieldname": "section_break_24",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "note",
- "fieldtype": "Text Editor",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Note",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "default": "0",
+ "description": "",
+ "fieldname": "costing_rate",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Costing Rate based on Activity Type (per hour)",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "depends_on": "",
- "fieldname": "section_break_24",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "default": "0",
+ "fieldname": "costing_amount",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Costing Amount",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "default": "0",
- "description": "",
- "fieldname": "costing_rate",
- "fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Costing Rate based on Activity Type (per hour)",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "column_break_25",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "default": "0",
- "fieldname": "costing_amount",
- "fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Costing Amount",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "default": "0",
+ "description": "",
+ "fieldname": "billing_rate",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Billing Rate based on Activity Type (per hour)",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "column_break_25",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "depends_on": "eval:doc.billable",
+ "fieldname": "additional_cost",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Additional Cost",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "default": "0",
- "description": "",
- "fieldname": "billing_rate",
- "fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Billing Rate based on Activity Type (per hour)",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "default": "0",
+ "description": "Will be updated only if Time Log is 'Billable'",
+ "fieldname": "billing_amount",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Billing Amount",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "default": "0",
- "description": "Will be updated only if Time Log is 'Billable'",
- "fieldname": "billing_amount",
- "fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Billing Amount",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "section_break_29",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "section_break_29",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "description": "Will be updated when batched.",
+ "fieldname": "time_log_batch",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Time Log Batch",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Time Log Batch",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "description": "Will be updated when batched.",
- "fieldname": "time_log_batch",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Time Log Batch",
- "length": 0,
- "no_copy": 0,
- "options": "Time Log Batch",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "description": "Will be updated when billed.",
+ "fieldname": "sales_invoice",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Sales Invoice",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Sales Invoice",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "description": "Will be updated when billed.",
- "fieldname": "sales_invoice",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Sales Invoice",
- "length": 0,
- "no_copy": 0,
- "options": "Sales Invoice",
- "permlevel": 0,
- "print_hide": 0,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Amended From",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Time Log",
+ "permlevel": 1,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Amended From",
- "length": 0,
- "no_copy": 1,
- "options": "Time Log",
- "permlevel": 1,
- "print_hide": 1,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 1,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "title",
- "fieldtype": "Data",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Title",
- "length": 0,
- "no_copy": 1,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "allow_on_submit": 1,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "title",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Title",
+ "length": 0,
+ "no_copy": 1,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
"unique": 0
}
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "icon-time",
- "idx": 1,
- "in_create": 0,
- "in_dialog": 0,
- "is_submittable": 1,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2015-11-16 06:29:59.410559",
- "modified_by": "Administrator",
- "module": "Projects",
- "name": "Time Log",
- "owner": "Administrator",
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "icon-time",
+ "idx": 1,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 1,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2016-01-14 04:40:47.439032",
+ "modified_by": "Administrator",
+ "module": "Projects",
+ "name": "Time Log",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 1,
- "apply_user_permissions": 0,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Projects User",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "apply_user_permissions": 0,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Projects User",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "amend": 1,
- "apply_user_permissions": 0,
- "cancel": 1,
- "create": 0,
- "delete": 1,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Projects Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "apply_user_permissions": 0,
+ "cancel": 1,
+ "create": 0,
+ "delete": 1,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Projects Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 1,
"write": 1
}
- ],
- "read_only": 0,
- "read_only_onload": 0,
+ ],
+ "read_only": 0,
+ "read_only_onload": 0,
"title_field": "title"
-}
\ 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 cd20036..c2239df 100644
--- a/erpnext/projects/doctype/time_log/time_log.py
+++ b/erpnext/projects/doctype/time_log/time_log.py
@@ -236,6 +236,9 @@
self.billing_amount = self.billing_rate * self.hours
else:
self.billing_amount = 0
+
+ if self.additional_cost and self.billable:
+ self.billing_amount += self.additional_cost
def update_task_and_project(self):
"""Update costing rate in Task or Project if either is set"""
diff --git a/erpnext/projects/doctype/time_log_batch/time_log_batch.js b/erpnext/projects/doctype/time_log_batch/time_log_batch.js
index 6b5f080..b1c431c 100644
--- a/erpnext/projects/doctype/time_log_batch/time_log_batch.js
+++ b/erpnext/projects/doctype/time_log_batch/time_log_batch.js
@@ -37,14 +37,31 @@
}
});
-frappe.ui.form.on("Time Log Batch Detail", "time_log", function(frm, cdt, cdn) {
+frappe.ui.form.on("Time Log Batch Detail", "time_log", function(frm) {
+ calculate_time_and_amount(frm);
+});
+
+frappe.ui.form.on("Time Log Batch Detail", "time_logs_remove", function(frm) {
+ calculate_time_and_amount(frm);
+});
+
+frappe.ui.form.on("Time Log Batch", "onload", function(frm) {
+ if (frm.doc.__islocal && frm.doc.time_logs) {
+ calculate_time_and_amount(frm);
+ }
+});
+
+var calculate_time_and_amount = function(frm) {
var tl = frm.doc.time_logs || [];
total_hr = 0;
total_amt = 0;
for(var i=0; i<tl.length; i++) {
- total_hr += tl[i].hours;
- total_amt += tl[i].billing_amount;
+ if (tl[i].time_log) {
+ total_hr += tl[i].hours;
+ total_amt += tl[i].billing_amount;
+ }
}
cur_frm.set_value("total_hours", total_hr);
cur_frm.set_value("total_billing_amount", total_amt);
-});
\ No newline at end of file
+
+}
\ No newline at end of file
diff --git a/erpnext/public/js/pos/pos.js b/erpnext/public/js/pos/pos.js
index a348138..961071c 100644
--- a/erpnext/public/js/pos/pos.js
+++ b/erpnext/public/js/pos/pos.js
@@ -16,9 +16,9 @@
$(this.frm.wrapper).on("refresh-fields", function() {
me.refresh();
});
-
+
this.wrapper.find('input.discount-percentage').on("change", function() {
- frappe.model.set_value(me.frm.doctype, me.frm.docname,
+ frappe.model.set_value(me.frm.doctype, me.frm.docname,
"additional_discount_percentage", flt(this.value));
});
@@ -61,6 +61,9 @@
"placeholder": this.party
},
parent: this.wrapper.find(".party-area"),
+ frm: this.frm,
+ doctype: this.frm.doctype,
+ docname: this.frm.docname,
only_input: true,
});
this.party_field.make_input();
@@ -481,7 +484,7 @@
var paid_amount = flt((flt(values.paid_amount) - flt(values.change)), precision("paid_amount"));
me.frm.set_value("paid_amount", paid_amount);
-
+
// specifying writeoff amount here itself, so as to avoid recursion issue
me.frm.set_value("write_off_amount", me.frm.doc.grand_total - paid_amount);
me.frm.set_value("outstanding_amount", 0);
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 247ce78..28939ca 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -233,6 +233,7 @@
self.posting_date, self.posting_time, d.actual_qty, d.transfer_qty), NegativeStockError)
def get_stock_and_rate(self):
+ self.set_transfer_qty()
self.set_actual_qty()
self.calculate_rate_and_amount()
diff --git a/erpnext/support/doctype/issue/issue.json b/erpnext/support/doctype/issue/issue.json
index 229eccf..b11eea9 100644
--- a/erpnext/support/doctype/issue/issue.json
+++ b/erpnext/support/doctype/issue/issue.json
@@ -1,7 +1,7 @@
{
"allow_copy": 0,
- "allow_import": 0,
- "allow_rename": 0,
+ "allow_import": 1,
+ "allow_rename": 1,
"autoname": "naming_series:",
"creation": "2013-02-01 10:36:25",
"custom": 0,
@@ -24,6 +24,7 @@
"options": "icon-flag",
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -47,6 +48,7 @@
"options": "ISS-",
"permlevel": 0,
"print_hide": 1,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -69,6 +71,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
@@ -90,6 +93,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -116,6 +120,7 @@
"options": "Open\nReplied\nHold\nClosed",
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -142,6 +147,7 @@
"options": "Email",
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -163,6 +169,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -185,6 +192,7 @@
"permlevel": 0,
"precision": "",
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -210,6 +218,7 @@
"oldfieldtype": "Text",
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -232,6 +241,7 @@
"permlevel": 0,
"precision": "",
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -257,6 +267,7 @@
"oldfieldtype": "Date",
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@@ -279,6 +290,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -302,6 +314,7 @@
"options": "icon-pushpin",
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@@ -325,6 +338,7 @@
"options": "Lead",
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -348,6 +362,7 @@
"options": "Contact",
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -370,6 +385,7 @@
"permlevel": 0,
"precision": "",
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -395,6 +411,7 @@
"options": "Customer",
"permlevel": 0,
"print_hide": 1,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -419,6 +436,7 @@
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@@ -441,6 +459,7 @@
"permlevel": 0,
"precision": "",
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -466,6 +485,7 @@
"oldfieldtype": "Text",
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -489,6 +509,7 @@
"oldfieldtype": "Column Break",
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@@ -514,6 +535,7 @@
"oldfieldtype": "Date",
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@@ -538,6 +560,7 @@
"oldfieldtype": "Time",
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
"reqd": 0,
@@ -561,6 +584,7 @@
"options": "Company",
"permlevel": 0,
"print_hide": 1,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -583,6 +607,7 @@
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -606,6 +631,7 @@
"permlevel": 0,
"precision": "",
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
@@ -624,7 +650,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2015-11-16 06:29:47.774531",
+ "modified": "2016-01-14 07:45:55.840256",
"modified_by": "Administrator",
"module": "Support",
"name": "Issue",