Compare commits
6 Commits
4f4717463e
...
17584d0002
| Author | SHA1 | Date | |
|---|---|---|---|
| 17584d0002 | |||
| bb5c8143fc | |||
| 2079e27402 | |||
| efc06dd98a | |||
| 5be239fced | |||
| 311e74fe18 |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1620,7 +1620,7 @@
|
|||||||
"oldfieldname": null,
|
"oldfieldname": null,
|
||||||
"fieldtype": "Select",
|
"fieldtype": "Select",
|
||||||
"oldfieldtype": null,
|
"oldfieldtype": null,
|
||||||
"options": "\nActive\nCleared\nN/A",
|
"options": "\nD0\nD1",
|
||||||
"search_index": 0,
|
"search_index": 0,
|
||||||
"show_dashboard": 0,
|
"show_dashboard": 0,
|
||||||
"hidden": 0,
|
"hidden": 0,
|
||||||
@@ -12239,7 +12239,7 @@
|
|||||||
"oldfieldname": null,
|
"oldfieldname": null,
|
||||||
"fieldtype": "Link",
|
"fieldtype": "Link",
|
||||||
"oldfieldtype": null,
|
"oldfieldtype": null,
|
||||||
"options": "Supplier",
|
"options": "Customer",
|
||||||
"search_index": 0,
|
"search_index": 0,
|
||||||
"show_dashboard": 0,
|
"show_dashboard": 0,
|
||||||
"hidden": 0,
|
"hidden": 0,
|
||||||
@@ -12352,7 +12352,7 @@
|
|||||||
"is_virtual": 0,
|
"is_virtual": 0,
|
||||||
"sort_options": 0,
|
"sort_options": 0,
|
||||||
"link_filters": null,
|
"link_filters": null,
|
||||||
"fetch_from": "customer.supplier_name",
|
"fetch_from": "customer.customer_name",
|
||||||
"show_on_timeline": 0,
|
"show_on_timeline": 0,
|
||||||
"make_attachment_public": 0,
|
"make_attachment_public": 0,
|
||||||
"documentation_url": null,
|
"documentation_url": null,
|
||||||
|
|||||||
+23
@@ -63,6 +63,29 @@
|
|||||||
<input type="text" id="cust-hours" class="form-control">
|
<input type="text" id="cust-hours" class="form-control">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="row" style="margin-top:10px;">
|
||||||
|
<div class="col-md-4">
|
||||||
|
<label>Data Status</label>
|
||||||
|
<select id="pallet-data-status" class="form-control">
|
||||||
|
<option value="D0">D0 - Unknown</option>
|
||||||
|
<option value="D1">D1 - Contains Data</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-4">
|
||||||
|
<label>Status</label>
|
||||||
|
<select id="pallet-status" class="form-control">
|
||||||
|
<option value="Received">Received</option>
|
||||||
|
<option value="Sorting">Sorting</option>
|
||||||
|
<option value="Processing">Processing</option>
|
||||||
|
<option value="Complete">Complete</option>
|
||||||
|
<option value="Shipped">Shipped</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-4">
|
||||||
|
<label>Inbound Weight (lbs)</label>
|
||||||
|
<input type="text" id="pallet-weight" class="form-control">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="row" style="margin-top:15px;">
|
<div class="row" style="margin-top:15px;">
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<button id="btn-save-cust" class="btn btn-success">Save Customer</button>
|
<button id="btn-save-cust" class="btn btn-success">Save Customer</button>
|
||||||
+4
-1
@@ -108,7 +108,10 @@ frappe.pages["customer-intake"].on_page_load = function(wrapper) {
|
|||||||
args: {
|
args: {
|
||||||
data: JSON.stringify({
|
data: JSON.stringify({
|
||||||
customer: currentCustomer.name,
|
customer: currentCustomer.name,
|
||||||
customer_number: $("#cust-number").val()
|
customer_number: $("#cust-number").val(),
|
||||||
|
data_status: $("#pallet-data-status").val(),
|
||||||
|
status: $("#pallet-status").val(),
|
||||||
|
inbound_weight: $("#pallet-weight").val()
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
callback: function(r) {
|
callback: function(r) {
|
||||||
+3
-1
@@ -77,6 +77,8 @@ def create_pallet(data):
|
|||||||
pallet = frappe.new_doc("Pallet")
|
pallet = frappe.new_doc("Pallet")
|
||||||
pallet.customer = data.get("customer")
|
pallet.customer = data.get("customer")
|
||||||
pallet.customer_number = data.get("customer_number")
|
pallet.customer_number = data.get("customer_number")
|
||||||
pallet.status = "Open"
|
pallet.data_status = data.get("data_status", "D0")
|
||||||
|
pallet.status = data.get("status", "Received")
|
||||||
|
pallet.inbound_weight = data.get("inbound_weight", "")
|
||||||
pallet.save()
|
pallet.save()
|
||||||
return {"status": "ok", "pallet": pallet.name}
|
return {"status": "ok", "pallet": pallet.name}
|
||||||
Reference in New Issue
Block a user