WebSVN – SmartDukaan – Diff – //trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

         except InventoryServiceException as e:
             print sys.exc_info()[0]
             print e.message
             raise TransactionServiceException(110, 'Transfer price missing for itemId: ' + str(item_id) + ' and vendor: ' + str(warehouse.vendor.id))
+        if order.orderType == OrderType.B2B:
+            tinNumber = Attribute.query.filter(Attribute.orderId == order.id).filter(Attribute.name == "tinNumber").first()
+            if tinNumber is None:
+                raise TransactionServiceException(101, "Tin Number is Missing for B2B Order. Please contact engineering Team" + str(orderId))
+            if newTaxType != 0:
+                order.orderType = OrderType.B2C
         # For OUR warehouse, we need to scan out items for every billed order
         if billingType == BillingType.OURS:
             if order.productCondition == ProductCondition.GOOD:
                 for index, serialNumber in enumerate(serialNumbers):
                     try:
         if singleInvoiceAttr:
             if singleInvoiceAttr.value == "true":
                 session.commit()
                 return True
         if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:
-            order.invoice_number = get_next_invoice_number(order.orderType)
+            order.invoice_number = get_next_invoice_counter(order.orderType, whStateId)
         session.commit()
         return True
     else:
         return False

Subversion Repositories SmartDukaan