[merge fixes]

This commit is contained in:
Saurabh
2015-10-19 16:32:24 +05:30
parent c39cef363c
commit c306b21415
10 changed files with 399 additions and 25 deletions

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"]
valid_types = ["Sales", "Maintenance", "Shopping Cart", "Drop Shipment"]
if not self.order_type:
self.order_type = "Sales"
elif self.order_type not in valid_types: