[Erp5-report] r24140 - /erp5/trunk/products/ERP5/PropertySheet/

nobody at svn.erp5.org nobody at svn.erp5.org
Fri Oct 10 14:57:55 CEST 2008


Author: jerome
Date: Fri Oct 10 14:57:54 2008
New Revision: 24140

URL: http://svn.erp5.org?rev=24140&view=rev
Log:
also check that orders have at least one line and that quantity and resource
are defined on all lines.

Added:
    erp5/trunk/products/ERP5/PropertySheet/TradeOrderLine.py
Modified:
    erp5/trunk/products/ERP5/PropertySheet/TradeOrder.py

Modified: erp5/trunk/products/ERP5/PropertySheet/TradeOrder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/TradeOrder.py?rev=24140&r1=24139&r2=24140&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/TradeOrder.py (original)
+++ erp5/trunk/products/ERP5/PropertySheet/TradeOrder.py Fri Oct 10 14:57:54 2008
@@ -26,6 +26,7 @@
 #
 ##############################################################################
 
+from Products.CMFCore.Expression import Expression
 
 class TradeOrder:
   """
@@ -93,4 +94,11 @@
       'expression'    : 'python: object.getStopDate() >= object.getStartDate()',
       'message_expression_false': 'Delivery Date must be after Shipping Date',
     },
+    { 'id'            : 'lines',
+      'description'   : 'Lines must be defined',
+      'type'          : 'ContentExistence',
+      'portal_type'   : Expression('portal/getPortalOrderMovementTypeList'),
+      'message_no_subobject_portal_type' : \
+                                'At least one line is required',
+    },
   )

Added: erp5/trunk/products/ERP5/PropertySheet/TradeOrderLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/TradeOrderLine.py?rev=24140&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/TradeOrderLine.py (added)
+++ erp5/trunk/products/ERP5/PropertySheet/TradeOrderLine.py Fri Oct 10 14:57:54 2008
@@ -1,0 +1,50 @@
+##############################################################################
+#
+# Copyright (c) 2007 Nexedi SARL and Contributors. All Rights Reserved.
+#                    Rafael M. Monnerat <rafael at nexedi.com>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+class TradeOrderLine:
+  """
+   Trade order Line Constraints
+  """
+  _constraints = (
+    { 'id'            : 'quantity_existence',
+      'description'   : 'Property quantity must be defined',
+      'type'          : 'PropertyExistence',
+      'quantity'    : None,
+      "message_property_not_set" : 'Quantity must be defined in lines',
+      "message_no_such_property" : 'Quantity must be defined in lines'
+    },
+    { 'id'            : 'resource',
+      'description'   : 'Resource must be defined',
+      'type'          : 'CategoryMembershipArity',
+      'min_arity'     : '1',
+      'max_arity'     : '1',
+      'portal_type'   : ( ),
+      'base_category' : ('resource',),
+      'message_arity_not_in_range' : 'Product or service must be defined in lines',
+    },
+  )




More information about the Erp5-report mailing list