[minor fixes]

This commit is contained in:
Saurabh 2015-10-15 17:27:46 +05:30
parent c306b21415
commit 5b7e9a1c94
3 changed files with 4 additions and 2 deletions

View File

@ -151,6 +151,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"depends_on": "eval:doc.drop_ship==1",
"fieldname": "customer",
"fieldtype": "Link",
"hidden": 0,
@ -174,7 +175,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"depends_on": "eval:doc.order_type==\"Drop Shipment\"",
"depends_on": "eval:doc.drop_ship==1",
"fieldname": "customer_name",
"fieldtype": "Data",
"hidden": 0,

View File

@ -143,7 +143,7 @@ class SellingController(StockController):
throw(_("Total allocated percentage for sales team should be 100"))
def validate_order_type(self):
valid_types = ["Sales", "Maintenance", "Shopping Cart", "Drop Shipment"]
valid_types = ["Sales", "Maintenance", "Shopping Cart"]
if not self.order_type:
self.order_type = "Sales"
elif self.order_type not in valid_types:

View File

@ -499,6 +499,7 @@ def make_drop_shipment(source_name, target_doc=None):
target.contact_display = ""
target.contact_mobile = ""
target.contact_email = ""
target.contact_person = ""
target.ignore_pricing_rule = 1
target.run_method("set_missing_values")
target.run_method("calculate_taxes_and_totals")