[Erp5-report] r31038 jerome - /erp5/trunk/products/ERP5/Document/

nobody at svn.erp5.org nobody at svn.erp5.org
Thu Dec 3 16:14:40 CET 2009


Author: jerome
Date: Thu Dec  3 16:14:38 2009
New Revision: 31038

URL: http://svn.erp5.org?rev=31038&view=rev
Log:
use newContent and propagate **kw

Modified:
    erp5/trunk/products/ERP5/Document/AssortedResource.py
    erp5/trunk/products/ERP5/Document/ContainerLine.py
    erp5/trunk/products/ERP5/Document/InvoiceLine.py
    erp5/trunk/products/ERP5/Document/InvoiceTransactionRule.py
    erp5/trunk/products/ERP5/Document/PaySheetLine.py
    erp5/trunk/products/ERP5/Document/PaySheetModelLine.py
    erp5/trunk/products/ERP5/Document/ProductionReportLine.py
    erp5/trunk/products/ERP5/Document/VariatedProperty.py

Modified: erp5/trunk/products/ERP5/Document/AssortedResource.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/AssortedResource.py?rev=31038&r1=31037&r2=31038&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/AssortedResource.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/AssortedResource.py [utf8] Thu Dec  3 16:14:38 2009
@@ -442,11 +442,9 @@
 
     security.declareProtected( Permissions.ModifyPortalContent, 'newCellContent' )
     def newCellContent(self, id, portal_type='Set Mapped Value', **kw):
-      """
-          This method can be overriden
-      """
-      self.invokeFactory(type_name=portal_type, id=id)
-      return self.get(id)
+      """Overriden to specify default portal type
+      """
+      return self.newContent(id=id, portal_type=portal_type, **kw)
 
     security.declarePrivate('_checkConsistency')
     def _checkConsistency(self, fixit=0):

Modified: erp5/trunk/products/ERP5/Document/ContainerLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/ContainerLine.py?rev=31038&r1=31037&r2=31038&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/ContainerLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/ContainerLine.py [utf8] Thu Dec  3 16:14:38 2009
@@ -69,11 +69,9 @@
     # Cell Related
     security.declareProtected( Permissions.ModifyPortalContent, 'newCellContent' )
     def newCellContent(self, id, portal_type='Container Cell', **kw):
+      """Overriden to specify default portal type
       """
-          This method can be overriden
-      """
-      self.invokeFactory(type_name=portal_type, id=id)
-      return self.get(id)
+      return self.newContent(id=id, portal_type=portal_type, **kw)
 
     security.declareProtected(Permissions.AccessContentsInformation, 'isAccountable')
     def isAccountable(self):

Modified: erp5/trunk/products/ERP5/Document/InvoiceLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/InvoiceLine.py?rev=31038&r1=31037&r2=31038&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/InvoiceLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/InvoiceLine.py [utf8] Thu Dec  3 16:14:38 2009
@@ -70,11 +70,9 @@
     security.declareProtected( Permissions.ModifyPortalContent,
                                'newCellContent' )
     def newCellContent(self, id, portal_type='Invoice Cell', **kw):
+      """Overriden to specify default portal type
       """
-          This method can be overriden
-      """
-      self.invokeFactory(type_name=portal_type, id=id)
-      return self.get(id)
+      return self.newContent(id=id, portal_type=portal_type, **kw)
 
     security.declareProtected( Permissions.AccessContentsInformation,
                                'isAccountable' )

Modified: erp5/trunk/products/ERP5/Document/InvoiceTransactionRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/InvoiceTransactionRule.py?rev=31038&r1=31037&r2=31038&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/InvoiceTransactionRule.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/InvoiceTransactionRule.py [utf8] Thu Dec  3 16:14:38 2009
@@ -323,12 +323,9 @@
   security.declareProtected( Permissions.ModifyPortalContent,
                               'newCellContent' )
   def newCellContent(self, id, portal_type='Accounting Rule Cell', **kw):
-    """
-      Creates a new Cell.
-    """
-    self.invokeFactory(type_name=portal_type, id=id)
-    new_cell = self.get(id)
-    return new_cell
+    """Overriden to specify default portal type
+    """
+    return self.newContent(id=id, portal_type=portal_type, **kw)
 
   security.declareProtected(Permissions.ModifyPortalContent, 'solve')
   def solve(self, applied_rule, solution_list):

Modified: erp5/trunk/products/ERP5/Document/PaySheetLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PaySheetLine.py?rev=31038&r1=31037&r2=31038&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PaySheetLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/PaySheetLine.py [utf8] Thu Dec  3 16:14:38 2009
@@ -61,12 +61,10 @@
 
     # Cell Related
     security.declareProtected( Permissions.ModifyPortalContent, 'newCellContent' )
-    def newCellContent(self, id,**kw):
+    def newCellContent(self, id, portal_type='Pay Sheet Cell', **kw):
+      """Overriden to specify default portal type
       """
-      This method can be overriden
-      """
-      self.invokeFactory(type_name="Pay Sheet Cell",id=id)
-      return self.get(id)
+      return self.newContent(id=id, portal_type=portal_type, **kw)
 
     security.declareProtected(Permissions.AccessContentsInformation,
                               'isAccountable')

Modified: erp5/trunk/products/ERP5/Document/PaySheetModelLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PaySheetModelLine.py?rev=31038&r1=31037&r2=31038&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PaySheetModelLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/PaySheetModelLine.py [utf8] Thu Dec  3 16:14:38 2009
@@ -67,9 +67,6 @@
   security.declareProtected(Permissions.ModifyPortalContent,
                             'newCellContent' )
   def newCellContent(self, id, portal_type='Pay Sheet Model Cell', **kw):
+    """Overriden to specify default portal type
     """
-      Used to be able to create Pay Sheet Model Cell. (portal_type of cells is
-      hardcoded in inheritated classes, so we have to overload this method)
-    """
-    self.invokeFactory(type_name=portal_type,id=id)
-    return self.get(id)
+    return self.newContent(id=id, portal_type=portal_type, **kw)

Modified: erp5/trunk/products/ERP5/Document/ProductionReportLine.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/ProductionReportLine.py?rev=31038&r1=31037&r2=31038&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/ProductionReportLine.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/ProductionReportLine.py [utf8] Thu Dec  3 16:14:38 2009
@@ -59,8 +59,6 @@
 
   security.declareProtected( Permissions.ModifyPortalContent, 'newCellContent')
   def newCellContent(self, id, portal_type='Production Report Cell', **kw):
+    """Overriden to specify default portal type
     """
-        This method can be overriden
-    """
-    self.invokeFactory(type_name=portal_type, id=id)
-    return self.get(id)
+    return self.newContent(id=id, portal_type=portal_type, **kw)

Modified: erp5/trunk/products/ERP5/Document/VariatedProperty.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/VariatedProperty.py?rev=31038&r1=31037&r2=31038&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/VariatedProperty.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/VariatedProperty.py [utf8] Thu Dec  3 16:14:38 2009
@@ -68,8 +68,6 @@
 
     security.declareProtected( Permissions.ModifyPortalContent, 'newCellContent' )
     def newCellContent(self, id, portal_type='Set Mapped Value', **kw):
+      """Overriden to specify default portal type
       """
-          This method can be overriden
-      """
-      self.invokeFactory(type_name=portal_type, id=id)
-      return self.get(id)
+      return self.newContent(id=id, portal_type=portal_type, **kw)




More information about the Erp5-report mailing list