Update from upstream/master

bt5/erp5_accounting/ActionTemplateItem/portal_types/Internal%20Invoice%20Transaction/destination_asset.xml

@@ -46,7 +46,7 @@
             <key> <string>permissions</string> </key>
             <value>
               <tuple>
-                <string>Modify portal content</string>
+                <string>View</string>
               </tuple>
             </value>
         </item>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Internal%20Invoice%20Transaction/source_asset.xml

@@ -46,7 +46,7 @@
             <key> <string>permissions</string> </key>
             <value>
               <tuple>
-                <string>Modify portal content</string>
+                <string>View</string>
               </tuple>
             </value>
         </item>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_resetGroupingReference.py

 """Resets grouping reference on this line and all related lines.
 
-This runs by default asynchronously, but can be call with `async=False` to
-run synchronously and returns the list of ungrouped lines. With `async=True`,
+This runs by default asynchronoushronously, but can be call with `asynchronous=False` to
+run synchronously and returns the list of ungrouped lines. With `asynchronous=True`,
 the returned list is always empty.
 """
 
@@ -13,7 +13,7 @@ if not context.getGroupingReference():
 portal = context.getPortalObject()
 
 resetGroupingReference = portal.ERP5Site_resetAccountingTransactionLineGroupingReference
-if async:
+if asynchronous:
   resetGroupingReference = portal.portal_simulation.activate(
       activity='SQLQueue',
       after_tag='accounting_grouping_reference'

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionLine_resetGroupingReference.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>async=True</string> </value>
+            <value> <string>asynchronous=True</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_setGroupingReference.py

@@ -121,7 +121,7 @@ else:
     if line.getGroupingReference():
       # Call AccountingTransactionLine_resetGroupingReference synchronously
       # to know the number of ungrouped lines.
-      ungrouped_line_list.extend(line.AccountingTransactionLine_resetGroupingReference(async=False))
+      ungrouped_line_list.extend(line.AccountingTransactionLine_resetGroupingReference(asynchronous=False))
 
   portal_status_message = Base_translateString('${ungrouped_line_count} lines ungrouped.',
                              mapping=dict(ungrouped_line_count=len(ungrouped_line_list)))

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isDestinationCurrencyConvertible.py

-section_value = context.getDestinationSectionValue()
+section_value = context.getDestinationSectionValue(checked_permission='Access contents information')
 
 if section_value is None or \
    section_value.getProperty('price_currency', None) is None:

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isSourceCurrencyConvertible.py

-section_value = context.getSourceSectionValue()
+section_value = context.getSourceSectionValue(checked_permission='Access contents information')
 
 if section_value is None or \
    section_value.getProperty('price_currency', None) is None:

bt5/erp5_accounting/TestTemplateItem/portal_components/test.erp5.testAccounting.py

@@ -3387,7 +3387,7 @@ class TestAccountingExport(AccountingTestCase):
                     form_id='AccountingTransaction_view')
     from Products.ERP5OOo.OOoUtils import OOoParser
     parser = OOoParser()
-    parser.openFromString(ods_data)
+    parser.openFromBytes(ods_data)
     content_xml = parser.oo_files['content.xml']
     # just make sure that we have the correct account name
     self.assertEqual(
@@ -3907,7 +3907,7 @@ class TestTransactions(AccountingTestCase):
 
     # reset from the payment line, the invoice line from the same group will be
     # ungrouped
-    payment_line.AccountingTransactionLine_resetGroupingReference(async=False)
+    payment_line.AccountingTransactionLine_resetGroupingReference(asynchronous=False)
     self.assertFalse(payment_line.getGroupingReference())
     self.assertFalse(payment_line.getGroupingDate())
     self.assertFalse(invoice_line.getGroupingReference())

bt5/erp5_base/PropertySheetTemplateItem/portal_property_sheets/CurrencyConstraint/reference_existence_constraint.xml

@@ -38,7 +38,7 @@
         </item>
         <item>
             <key> <string>message_no_such_property</string> </key>
-            <value> <string>Reference must be defined</string> </value>
+            <value> <string>Currency Code must be defined</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>

bt5/erp5_base/PropertySheetTemplateItem/portal_property_sheets/CurrencyConstraint/reference_unicity_constraint.xml

@@ -18,6 +18,14 @@
               <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
             </value>
         </item>
+        <item>
+            <key> <string>constraint_property</string> </key>
+            <value>
+              <tuple>
+                <string>reference</string>
+              </tuple>
+            </value>
+        </item>
         <item>
             <key> <string>description</string> </key>
             <value>
@@ -26,7 +34,7 @@
         </item>
         <item>
             <key> <string>filter_parameter</string> </key>
-            <value> <string>python: {\'portal_type\': (\'Currency\', ), \'validation_state\': (\'validated\', ),\'reference\': object.getReference()}</string> </value>
+            <value> <string>python: {\'portal_type\': (\'Currency\', ), \'validation_state\': (\'validated\', ), \'reference\': object.getReference()}</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
@@ -34,7 +42,7 @@
         </item>
         <item>
             <key> <string>message_invalid_attribute_unicity</string> </key>
-            <value> <string>Another currency with reference ${value} already exists</string> </value>
+            <value> <string>Another currency with Currency Code ${value} already exists</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>

bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_raiseErrorMessageInActivity.py

+'''
+  Activate this whenever we have a process going wrong and
+  we do not want disturb the user or stop (rollback) the process
+  but we do want developpers to be notified.
+'''
+context.getPortalObject().portal_activities.getActivityRuntimeEnvironment().edit(max_retry=0)
+raise RuntimeError(error_message)

bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_raiseErrorMessageInActivity.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="_reconstructor" module="copy_reg"/>
+                </klass>
+                <tuple>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                  <global name="object" module="__builtin__"/>
+                  <none/>
+                </tuple>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>error_message</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Base_raiseErrorMessageInActivity</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_big_file/DocumentTemplateItem/portal_components/document.erp5.BigFile.py

@@ -27,6 +27,10 @@ from mimetools import choose_boundary
 from Products.CMFCore.utils import _setCacheHeaders, _ViewEmulator
 from DateTime import DateTime
 import re
+import six
+
+if six.PY3:
+  long = int  # pylint:disable=redefined-builtin
 
 class BigFile(File):
   """

bt5/erp5_budget/SkinTemplateItem/portal_skins/erp5_budget/Budget_viewBudgetConsumptionReport.oot

@@ -86,6 +86,22 @@
    <number:number number:decimal-places="2" number:min-integer-digits="1"/>
    <number:text>%</number:text>
   </number:percentage-style>
+  <style:style style:name="Level1Percent" style:family="table-cell" style:parent-style-name="Level1" style:data-style-name="N11"/>
+  <style:style style:name="Level2Percent" style:family="table-cell" style:parent-style-name="Level2" style:data-style-name="N11"/>
+  <style:style style:name="Level3Percent" style:family="table-cell" style:parent-style-name="Level3" style:data-style-name="N11"/>
+  <style:style style:name="Level4Percent" style:family="table-cell" style:parent-style-name="Level4" style:data-style-name="N11"/>
+
+  <style:style style:name="Level1Cell1Percent" style:family="table-cell" style:parent-style-name="Level1Cell1" style:data-style-name="N11"/>
+  <style:style style:name="Level2Cell1Percent" style:family="table-cell" style:parent-style-name="Level2Cell1" style:data-style-name="N11"/>
+  <style:style style:name="Level3Cell1Percent" style:family="table-cell" style:parent-style-name="Level3Cell1" style:data-style-name="N11"/>
+  <style:style style:name="Level4Cell1Percent" style:family="table-cell" style:parent-style-name="Level4Cell1" style:data-style-name="N11"/>
+
+  <style:style style:name="Level2.1Percent" style:family="table-cell" style:parent-style-name="Level2.1" style:data-style-name="N11"/>
+  <style:style style:name="Level2.2Percent" style:family="table-cell" style:parent-style-name="Level2.2" style:data-style-name="N11"/>
+  <style:style style:name="Level2.3Percent" style:family="table-cell" style:parent-style-name="Level2.3" style:data-style-name="N11"/>
+  <style:style style:name="Level2.4Percent" style:family="table-cell" style:parent-style-name="Level2.4" style:data-style-name="N11"/>
+  <style:style style:name="Level2.5Percent" style:family="table-cell" style:parent-style-name="Level2.5" style:data-style-name="N11"/>
+
   <style:style style:name="ce1" style:family="table-cell" style:parent-style-name="Default">
    <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" style:vertical-align="middle"/>
    <style:paragraph-properties fo:text-align="center"/>
@@ -285,7 +301,7 @@
      <table:table-cell table:style-name="Level1" office:value-type="float" office:value="5" tal:attributes="office:value line/available_budget">
       <text:p>5</text:p>
      </table:table-cell>
-     <table:table-cell table:style-name="Level1" office:value-type="percentage" office:value="0.06" tal:attributes="office:value line/consumed_ratio">
+     <table:table-cell table:style-name="Level1Percent" office:value-type="percentage" office:value="0.06" tal:attributes="office:value line/consumed_ratio">
       <text:p>6,00%</text:p>
      </table:table-cell>
      <table:table-cell table:number-columns-repeated="768"/>
@@ -313,7 +329,7 @@
          <table:table-cell table:style-name="ce18" office:value-type="float" office:value="5" tal:attributes="office:value line/available_budget; table:style-name style">
           <text:p>5</text:p>
          </table:table-cell>
-         <table:table-cell table:style-name="ce23" office:value-type="percentage" office:value="0.06"  tal:attributes="office:value line/consumed_ratio; table:style-name style">
+         <table:table-cell table:style-name="ce23" office:value-type="percentage" office:value="0.06"  tal:attributes="office:value line/consumed_ratio; table:style-name string:${style}Percent">
            <text:p>6,00%</text:p>
          </table:table-cell>
        <table:table-cell table:number-columns-repeated="768"/>
@@ -345,7 +361,7 @@
            <table:table-cell table:style-name="Level3" office:value-type="float" office:value="5" tal:attributes="office:value subline/available_budget">
             <text:p>5</text:p>
            </table:table-cell>
-           <table:table-cell table:style-name="Level3" office:value-type="percentage" office:value="0.06"  tal:attributes="office:value subline/consumed_ratio">
+           <table:table-cell table:style-name="Level3Percent" office:value-type="percentage" office:value="0.06"  tal:attributes="office:value subline/consumed_ratio">
             <text:p>6,00%</text:p>
            </table:table-cell>
            <table:table-cell table:number-columns-repeated="1016"/>
@@ -380,7 +396,7 @@
            office:value="5" tal:attributes="office:value subsubline/available_budget">
           <text:p>5</text:p>
          </table:table-cell>
-         <table:table-cell table:style-name="Level4"
+         <table:table-cell table:style-name="Level4Percent"
            office:value-type="percentage" office:value="0.06"
            tal:attributes="office:value subsubline/consumed_ratio">
           <text:p>6,00%</text:p>

bt5/erp5_dms/ActionTemplateItem/portal_types/Web%20Illustration/send_email.xml → bt5/erp5_calendar/ActionTemplateItem/portal_types/Holiday%20Acquisition%20Module/view.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_jio_action</string>
+                <string>action_type/object_list</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_jio_action</string> </value>
+            <value> <string>object_list</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>
@@ -30,9 +30,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>icon</string> </key>
@@ -40,7 +38,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>send_email</string> </value>
+            <value> <string>view</string> </value>
         </item>
         <item>
             <key> <string>permissions</string> </key>
@@ -50,13 +48,17 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Action Information</string> </value>
+        </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>10.0</float> </value>
+            <value> <float>1.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Send by Email</string> </value>
+            <value> <string>View</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
@@ -73,7 +75,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/WebPage_viewSendByEmailDialog</string> </value>
+            <value> <string>string:${object_url}/HolidayAcquisitionModule_viewHolidayAcquisitionList</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_run_my_doc/ActionTemplateItem/portal_types/Test%20Page/send_email.xml → bt5/erp5_calendar/ActionTemplateItem/portal_types/Holiday%20Acquisition/view.xml

@@ -16,13 +16,13 @@
             <key> <string>categories</string> </key>
             <value>
               <tuple>
-                <string>action_type/object_action</string>
+                <string>action_type/object_view</string>
               </tuple>
             </value>
         </item>
         <item>
             <key> <string>category</string> </key>
-            <value> <string>object_action</string> </value>
+            <value> <string>object_view</string> </value>
         </item>
         <item>
             <key> <string>condition</string> </key>
@@ -30,9 +30,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value>
-              <none/>
-            </value>
+            <value> <string></string> </value>
         </item>
         <item>
             <key> <string>icon</string> </key>
@@ -40,7 +38,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>send_email</string> </value>
+            <value> <string>view</string> </value>
         </item>
         <item>
             <key> <string>permissions</string> </key>
@@ -50,13 +48,17 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Action Information</string> </value>
+        </item>
         <item>
             <key> <string>priority</string> </key>
-            <value> <float>10.0</float> </value>
+            <value> <float>1.0</float> </value>
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Send by Email</string> </value>
+            <value> <string>View</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
@@ -73,7 +75,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/WebPage_viewSendByEmailDialog</string> </value>
+            <value> <string>string:${object_url}/HolidayAcquisition_view</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_calendar/ActionTemplateItem/portal_types/Person/leaves.xml → bt5/erp5_calendar/ActionTemplateItem/portal_types/Person/holidays.xml

@@ -42,7 +42,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>leaves</string> </value>
+            <value> <string>holidays</string> </value>
         </item>
         <item>
             <key> <string>permissions</string> </key>
@@ -58,7 +58,7 @@
         </item>
         <item>
             <key> <string>title</string> </key>
-            <value> <string>Leaves</string> </value>
+            <value> <string>Holidays</string> </value>
         </item>
         <item>
             <key> <string>visible</string> </key>
@@ -75,7 +75,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/Entity_viewLeaveRequestPeriodList</string> </value>
+            <value> <string>string:${object_url}/Entity_viewHolidaySituation</string> </value>
         </item>
       </dictionary>
     </pickle>
@@ -88,7 +88,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>python:portal.Base_checkPermission(\'leave_request_module\', \'View\')</string> </value>
+            <value> <string>python:portal.Base_checkPermission(\'leave_request_module\', \'View\') and portal.Base_checkPermission(\'holiday_acquisition_module\', \'View\') </string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_calendar/DocumentTemplateItem/portal_components/document.erp5.HolidayAcquisition.py

+##############################################################################
+#
+# Copyright (c) 2007 Nexedi SARL and Contributors. All Rights Reserved.
+#                    Courteaud Romain <romain@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.
+#
+##############################################################################
+
+from AccessControl import ClassSecurityInfo
+
+from Products.ERP5Type import Permissions
+from erp5.component.document.Event import Event
+from Products.ZSQLCatalog.SQLCatalog import NegatedQuery, SimpleQuery
+
+class HolidayAcquisition(Event):
+
+  meta_type = 'ERP5 Holiday Acquisition'
+  portal_type = 'Holiday Acquisition'
+
+  # Declarative security
+  security = ClassSecurityInfo()
+  security.declareObjectProtected(Permissions.AccessContentsInformation)
+
+  security.declareProtected(Permissions.AccessContentsInformation,
+                            'getInventoriatedQuantity')
+  def getInventoriatedQuantity(self, default=None, *args, **kw):
+    default_quantity = self.getQuantity()
+    if self.getProperty('is_total_holiday', False):
+      remaining_quantity = self.getPortalObject().portal_simulation.getInventory(
+        portal_type=("Holiday Acquisition", "Leave Request Period"),
+        node_uid= self.getDestinationUid(),
+        at_date = self.getStartDate(),
+        simulation_state = 'confirmed',
+        uid = NegatedQuery(SimpleQuery(uid=self.getUid())))
+      return default_quantity - remaining_quantity
+    else:
+      return default_quantity
\ No newline at end of file

bt5/erp5_corporate_identity_test/PathTemplateItem/image_module/template_test_book_image_alt_span_bmp.xml → bt5/erp5_calendar/DocumentTemplateItem/portal_components/document.erp5.HolidayAcquisition.xml

@@ -2,128 +2,132 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="Image" module="erp5.portal_type"/>
+      <global name="Document Component" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
         <item>
-            <key> <string>_Access_contents_information_Permission</string> </key>
+            <key> <string>_recorded_property_dict</string> </key>
             <value>
-              <tuple>
-                <string>Assignee</string>
-                <string>Assignor</string>
-                <string>Manager</string>
-                <string>Owner</string>
-              </tuple>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
         <item>
-            <key> <string>_Add_portal_content_Permission</string> </key>
-            <value>
-              <tuple>
-                <string>Assignee</string>
-                <string>Assignor</string>
-                <string>Manager</string>
-                <string>Owner</string>
-              </tuple>
-            </value>
+            <key> <string>default_reference</string> </key>
+            <value> <string>HolidayAcquisition</string> </value>
         </item>
         <item>
-            <key> <string>_Change_local_roles_Permission</string> </key>
+            <key> <string>default_source_reference</string> </key>
             <value>
-              <tuple>
-                <string>Assignor</string>
-                <string>Manager</string>
-              </tuple>
+              <none/>
             </value>
         </item>
         <item>
-            <key> <string>_Modify_portal_content_Permission</string> </key>
+            <key> <string>description</string> </key>
             <value>
-              <tuple>
-                <string>Assignee</string>
-                <string>Assignor</string>
-                <string>Manager</string>
-                <string>Owner</string>
-              </tuple>
+              <none/>
             </value>
         </item>
         <item>
-            <key> <string>_View_Permission</string> </key>
-            <value>
-              <tuple>
-                <string>Assignee</string>
-                <string>Assignor</string>
-                <string>Manager</string>
-                <string>Owner</string>
-              </tuple>
-            </value>
+            <key> <string>id</string> </key>
+            <value> <string>document.erp5.HolidayAcquisition</string> </value>
         </item>
         <item>
-            <key> <string>_count</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Document Component</string> </value>
         </item>
         <item>
-            <key> <string>_mt_index</string> </key>
+            <key> <string>sid</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              <none/>
             </value>
         </item>
         <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>text_content_error_message</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <tuple/>
             </value>
         </item>
         <item>
-            <key> <string>content_md5</string> </key>
-            <value> <string>692504124ea7958fefe8178941ab75b1</string> </value>
-        </item>
-        <item>
-            <key> <string>content_type</string> </key>
-            <value> <string>image/png</string> </value>
-        </item>
-        <item>
-            <key> <string>height</string> </key>
-            <value> <int>842</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>template_test_book_image_alt_span_bmp</string> </value>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
         </item>
         <item>
-            <key> <string>portal_type</string> </key>
-            <value> <string>Image</string> </value>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
         </item>
         <item>
-            <key> <string>width</string> </key>
-            <value> <int>595</int> </value>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
         </item>
       </dictionary>
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <global name="Length" module="BTrees.Length"/>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary/>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
-    <pickle> <int>0</int> </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <global name="OOBTree" module="BTrees.OOBTree"/>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
     <pickle>
-      <none/>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <global name="OOBTree" module="BTrees.OOBTree"/>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
     <pickle>
-      <none/>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
     </pickle>
   </record>
 </ZopeData>

bt5/erp5_calendar/ModuleTemplateItem/holiday_acquisition_module.xml

+<module>
+ <id>holiday_acquisition_module</id>
+ <permission_list>
+  <permission type='tuple'>
+   <name>Access Transient Objects</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
+   <name>Access contents information</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
+   <name>Access session data</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
+   <name>Add portal content</name>
+   <role>Assignor</role>
+   <role>Author</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
+   <name>Add portal folders</name>
+   <role>Assignor</role>
+   <role>Author</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
+   <name>Change local roles</name>
+   <role>Assignor</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
+   <name>Copy or Move</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
+   <name>Delete objects</name>
+   <role>Assignor</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
+   <name>List folder contents</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
+   <name>Modify portal content</name>
+   <role>Assignor</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
+   <name>View</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Manager</role>
+  </permission>
+  <permission type='tuple'>
+   <name>View History</name>
+   <role>Assignee</role>
+   <role>Assignor</role>
+   <role>Associate</role>
+   <role>Auditor</role>
+   <role>Author</role>
+   <role>Manager</role>
+  </permission>
+ </permission_list>
+ <portal_type>Holiday Acquisition Module</portal_type>
+ <title>Holiday Acquisitions</title>
+</module>
\ No newline at end of file

bt5/erp5_calendar/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml

@@ -11,6 +11,9 @@
  <portal_type id="Group Presence Period">
   <item>Calendar Exception</item>
  </portal_type>
+ <portal_type id="Holiday Acquisition Module">
+  <item>Holiday Acquisition</item>
+ </portal_type>
  <portal_type id="Leave Request">
   <item>Leave Request Period</item>
  </portal_type>

bt5/erp5_calendar/PortalTypeBaseCategoryTemplateItem/base_category_list.xml

@@ -5,6 +5,9 @@
  <portal_type id="Group Calendar Module">
   <item>business_application</item>
  </portal_type>
+ <portal_type id="Holiday Acquisition Module">
+  <item>business_application</item>
+ </portal_type>
  <portal_type id="Leave Request Module">
   <item>business_application</item>
  </portal_type>

bt5/erp5_calendar/PortalTypeTemplateItem/portal_types/Holiday%20Acquisition%20Module.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Base Type" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_property_domain_dict</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>content_icon</string> </key>
+            <value> <string>folder_icon.gif</string> </value>
+        </item>
+        <item>
+            <key> <string>factory</string> </key>
+            <value> <string>addFolder</string> </value>
+        </item>
+        <item>
+            <key> <string>group_list</string> </key>
+            <value>
+              <tuple>
+                <string>module</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Holiday Acquisition Module</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Type</string> </value>
+        </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>Folder</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>short_title</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>domain_name</string> </key>
+            <value> <string>erp5_ui</string> </value>
+        </item>
+        <item>
+            <key> <string>property_name</string> </key>
+            <value> <string>short_title</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
+    <pickle>
+      <global name="TranslationInformation" module="Products.ERP5Type.TranslationProviderBase"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>domain_name</string> </key>
+            <value> <string>erp5_ui</string> </value>
+        </item>
+        <item>
+            <key> <string>property_name</string> </key>
+            <value> <string>title</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_calendar/PortalTypeTemplateItem/portal_types/Holiday%20Acquisition.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Base Type" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>acquire_local_roles</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>content_icon</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>factory</string> </key>
+            <value> <string>addXMLObject</string> </value>
+        </item>
+        <item>
+            <key> <string>group_list</string> </key>
+            <value>
+              <tuple>
+                <string>event</string>
+                <string>delivery</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Holiday Acquisition</string> </value>
+        </item>
+        <item>
+            <key> <string>init_script</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>permission</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Base Type</string> </value>
+        </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>HolidayAcquisition</string> </value>
+        </item>
+        <item>
+            <key> <string>type_interface</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_calendar/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml

@@ -15,6 +15,10 @@
   <type>Group Presence Period</type>
   <workflow>edit_workflow, group_calendar_interaction_workflow</workflow>
  </chain>
+ <chain>
+  <type>Holiday Acquisition</type>
+  <workflow>edit_workflow, holiday_acquisition_workflow</workflow>
+ </chain>
  <chain>
   <type>Leave Request</type>
   <workflow>edit_workflow, leave_request_interaction_workflow, leave_request_workflow</workflow>

bt5/erp5_corporate_identity_test/PathTemplateItem/image_module/template_test_book_embed_report_bmp.xml → bt5/erp5_calendar/PropertySheetTemplateItem/portal_property_sheets/LeaveRequestPeriodConstraint.xml

@@ -2,63 +2,10 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="Image" module="erp5.portal_type"/>
+      <global name="Property Sheet" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_Access_contents_information_Permission</string> </key>
-            <value>
-              <tuple>
-                <string>Assignee</string>
-                <string>Assignor</string>
-                <string>Manager</string>
-                <string>Owner</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>_Add_portal_content_Permission</string> </key>
-            <value>
-              <tuple>
-                <string>Assignee</string>
-                <string>Assignor</string>
-                <string>Manager</string>
-                <string>Owner</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>_Change_local_roles_Permission</string> </key>
-            <value>
-              <tuple>
-                <string>Assignor</string>
-                <string>Manager</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>_Modify_portal_content_Permission</string> </key>
-            <value>
-              <tuple>
-                <string>Assignee</string>
-                <string>Assignor</string>
-                <string>Manager</string>
-                <string>Owner</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>_View_Permission</string> </key>
-            <value>
-              <tuple>
-                <string>Assignee</string>
-                <string>Assignor</string>
-                <string>Manager</string>
-                <string>Owner</string>
-              </tuple>
-            </value>
-        </item>
         <item>
             <key> <string>_count</string> </key>
             <value>
@@ -78,28 +25,18 @@
             </value>
         </item>
         <item>
-            <key> <string>content_md5</string> </key>
-            <value> <string>dfff9e4998b1397a1a515fd9300d21f6</string> </value>
-        </item>
-        <item>
-            <key> <string>content_type</string> </key>
-            <value> <string>image/png</string> </value>
-        </item>
-        <item>
-            <key> <string>height</string> </key>
-            <value> <int>842</int> </value>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>template_test_book_embed_report_bmp</string> </value>
+            <value> <string>LeaveRequestPeriodConstraint</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>
-            <value> <string>Image</string> </value>
-        </item>
-        <item>
-            <key> <string>width</string> </key>
-            <value> <int>595</int> </value>
+            <value> <string>Property Sheet</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_calendar/PropertySheetTemplateItem/portal_property_sheets/LeaveRequestPeriodConstraint/quantity_existence_constraint.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Property Existence Constraint" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>constraint_property</string> </key>
+            <value>
+              <tuple>
+                <string>quantity</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Property quantity must be defined</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>quantity_existence_constraint</string> </value>
+        </item>
+        <item>
+            <key> <string>message_no_such_property</string> </key>
+            <value> <string>Quantity must be defined in lines</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Property Existence Constraint</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Entity_getLeaveRequestPeriodList.py

-kw = {}
-kw["node_uid"]=context.getUid()
-kw["portal_type"]="Leave Request Period"
-#raise ValueError("%s" % kw)
-return context.getPortalObject().portal_simulation.getInventoryList(**kw)

bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Entity_viewLeaveRequestPeriodList.xml → bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Entity_viewHolidaySituation.xml

@@ -93,8 +93,9 @@
                     <key> <string>hidden</string> </key>
                     <value>
                       <list>
-                        <string>listbox_date</string>
-                        <string>listbox_running_total_price</string>
+                        <string>listbox_start_date</string>
+                        <string>listbox_stop_date</string>
+                        <string>listbox_quantity</string>
                       </list>
                     </value>
                 </item>
@@ -103,6 +104,7 @@
                     <value>
                       <list>
                         <string>my_title</string>
+                        <string>my_holiday_acquired_per_month</string>
                       </list>
                     </value>
                 </item>
@@ -120,7 +122,7 @@
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Entity_viewLeaveRequestPeriodList</string> </value>
+            <value> <string>Entity_viewHolidaySituation</string> </value>
         </item>
         <item>
             <key> <string>method</string> </key>

bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Entity_viewLeaveRequestPeriodList/listbox.xml → bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Entity_viewHolidaySituation/listbox.xml

@@ -13,12 +13,15 @@
                 <string>all_columns</string>
                 <string>columns</string>
                 <string>domain_tree</string>
+                <string>editable</string>
                 <string>editable_columns</string>
+                <string>enabled</string>
                 <string>list_method</string>
                 <string>portal_types</string>
-                <string>selection_name</string>
                 <string>sort</string>
                 <string>sort_columns</string>
+                <string>stat_columns</string>
+                <string>stat_method</string>
                 <string>title</string>
                 <string>url_columns</string>
               </list>
@@ -74,10 +77,20 @@
                     <key> <string>domain_tree</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>editable_columns</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string></string> </value>
@@ -92,12 +105,6 @@
                 </item>
                 <item>
                     <key> <string>portal_types</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
-                </item>
-                <item>
-                    <key> <string>selection_name</string> </key>
                     <value> <string></string> </value>
                 </item>
                 <item>
@@ -108,6 +115,14 @@
                     <key> <string>sort_columns</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key> <string>stat_columns</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>stat_method</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string></string> </value>
@@ -150,7 +165,7 @@
                     <value>
                       <list>
                         <tuple>
-                          <string>stop_date</string>
+                          <string>start_date</string>
                           <string>Start Date</string>
                         </tuple>
                         <tuple>
@@ -158,17 +173,17 @@
                           <string>Stop Date</string>
                         </tuple>
                         <tuple>
-                          <string>Movement_getExplanationTranslatedPortalType</string>
+                          <string>resource_title</string>
                           <string>Type</string>
                         </tuple>
-                        <tuple>
-                          <string>getTranslatedSimulationStateTitle</string>
-                          <string>State</string>
-                        </tuple>
                         <tuple>
                           <string>quantity</string>
                           <string>Quantity</string>
                         </tuple>
+                        <tuple>
+                          <string>getTranslatedSimulationStateTitle</string>
+                          <string>State</string>
+                        </tuple>
                       </list>
                     </value>
                 </item>
@@ -176,6 +191,10 @@
                     <key> <string>domain_tree</string> </key>
                     <value> <int>1</int> </value>
                 </item>
+                <item>
+                    <key> <string>editable</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
                 <item>
                     <key> <string>editable_columns</string> </key>
                     <value>
@@ -194,6 +213,10 @@
                       <list/>
                     </value>
                 </item>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_view_mode_listbox</string> </value>
@@ -222,20 +245,12 @@
                     <key> <string>read_only</string> </key>
                     <value> <int>0</int> </value>
                 </item>
-                <item>
-                    <key> <string>selection_name</string> </key>
-                    <value> <string>entity_leave_period_selection</string> </value>
-                </item>
                 <item>
                     <key> <string>sort</string> </key>
                     <value>
                       <list>
                         <tuple>
-                          <string>stock.start_date</string>
-                          <string>ASC</string>
-                        </tuple>
-                        <tuple>
-                          <string>stock.uid</string>
+                          <string>stock.date</string>
                           <string>ASC</string>
                         </tuple>
                       </list>
@@ -252,13 +267,30 @@
                       </list>
                     </value>
                 </item>
+                <item>
+                    <key> <string>stat_columns</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>quantity</string>
+                          <string>Person_getTotalHolidayRemaining</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>stat_method</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
+                    </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>Transactions Related to this Entity</string> </value>
+                    <value> <string>Holiday History</string> </value>
                 </item>
                 <item>
                     <key> <string>url_columns</string> </key>
@@ -292,7 +324,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python:[(x, x) for x in here.getPortalAccountingTransactionTypeList()]</string> </value>
+            <value> <string>here/getDestination</string> </value>
         </item>
       </dictionary>
     </pickle>
@@ -318,7 +350,20 @@
       <dictionary>
         <item>
             <key> <string>method_name</string> </key>
-            <value> <string>Entity_getLeaveRequestPeriodList</string> </value>
+            <value> <string>Person_getHolidayHistoryList</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="5" aka="AAAAAAAAAAU=">
+    <pickle>
+      <global name="Method" module="Products.Formulator.MethodField"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>method_name</string> </key>
+            <value> <string>Person_getHolidayHistoryList</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Entity_viewLeaveRequestPeriodList/listbox_date.xml → bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/Entity_viewHolidaySituation/listbox_stop_date.xml

@@ -8,7 +8,7 @@
       <dictionary>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>listbox_date</string> </value>
+            <value> <string>listbox_stop_date</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>

bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/HolidayAcquisitionModule_viewHolidayAcquisitionList.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="ERP5 Form" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>action</string> </key>
+            <value> <string>Base_doSelect</string> </value>
+        </item>
+        <item>
+            <key> <string>action_title</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>edit_order</string> </key>
+            <value>
+              <list/>
+            </value>
+        </item>
+        <item>
+            <key> <string>encoding</string> </key>
+            <value> <string>UTF-8</string> </value>
+        </item>
+        <item>
+            <key> <string>enctype</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>group_list</string> </key>
+            <value>
+              <list>
+                <string>left</string>
+                <string>right</string>
+                <string>center</string>
+                <string>bottom</string>
+                <string>hidden</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>groups</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>bottom</string> </key>
+                    <value>
+                      <list>
+                        <string>listbox</string>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>center</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value>
+                      <list>
+                        <string>listbox_delivery_stop_date</string>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>left</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>right</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>HolidayAcquisitionModule_viewHolidayAcquisitionList</string> </value>
+        </item>
+        <item>
+            <key> <string>method</string> </key>
+            <value> <string>POST</string> </value>
+        </item>
+        <item>
+            <key> <string>name</string> </key>
+            <value> <string>HolidayAcquisitionModule_viewHolidayAcquisitionList</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>ERP5 Form</string> </value>
+        </item>
+        <item>
+            <key> <string>pt</string> </key>
+            <value> <string>form_list</string> </value>
+        </item>
+        <item>
+            <key> <string>row_length</string> </key>
+            <value> <int>4</int> </value>
+        </item>
+        <item>
+            <key> <string>stored_encoding</string> </key>
+            <value> <string>UTF-8</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Holiday Acquisitions</string> </value>
+        </item>
+        <item>
+            <key> <string>unicode_mode</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>update_action</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>update_action_title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/HolidayAcquisitionModule_viewHolidayAcquisitionList/listbox.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list>
+                <string>all_columns</string>
+                <string>columns</string>
+                <string>portal_types</string>
+                <string>title</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>listbox</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>target</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>target</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>all_columns</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>owner_title</string>
+                          <string>Owner</string>
+                        </tuple>
+                        <tuple>
+                          <string>creation_date</string>
+                          <string>Creation Date</string>
+                        </tuple>
+                        <tuple>
+                          <string>modification_date</string>
+                          <string>Modification Date</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>all_editable_columns</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>columns</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>title</string>
+                          <string>Title</string>
+                        </tuple>
+                        <tuple>
+                          <string>destination_title</string>
+                          <string>Person</string>
+                        </tuple>
+                        <tuple>
+                          <string>delivery.stop_date</string>
+                          <string>Date</string>
+                        </tuple>
+                        <tuple>
+                          <string>stock.quantity</string>
+                          <string>Quantity</string>
+                        </tuple>
+                        <tuple>
+                          <string>description</string>
+                          <string>Description</string>
+                        </tuple>
+                        <tuple>
+                          <string>translated_simulation_state_title</string>
+                          <string>State</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string>my_list_mode_listbox</string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string>Base_viewFieldLibrary</string> </value>
+                </item>
+                <item>
+                    <key> <string>portal_types</string> </key>
+                    <value>
+                      <list>
+                        <tuple>
+                          <string>Holiday Acquisition</string>
+                          <string>Holiday Acquisition</string>
+                        </tuple>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>target</string> </key>
+                    <value> <string>Click to edit the target</string> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Holiday Acquisitions</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/HolidayAcquisitionModule_viewHolidayAcquisitionList/listbox_delivery_stop_date.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list>
+                <string>required</string>
+                <string>title</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>listbox_delivery_stop_date</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string>my_date_time_field</string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string>Base_viewFieldLibrary</string> </value>
+                </item>
+                <item>
+                    <key> <string>required</string> </key>
+                    <value> <int>0</int> </value>
+                </item>
+                <item>
+                    <key> <string>title</string> </key>
+                    <value> <string>Stop Date</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/HolidayAcquisition_view.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="ERP5 Form" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>action</string> </key>
+            <value> <string>Base_edit</string> </value>
+        </item>
+        <item>
+            <key> <string>action_title</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>edit_order</string> </key>
+            <value> <string>[]</string> </value>
+        </item>
+        <item>
+            <key> <string>encoding</string> </key>
+            <value> <string>UTF-8</string> </value>
+        </item>
+        <item>
+            <key> <string>enctype</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>group_list</string> </key>
+            <value>
+              <list>
+                <string>left</string>
+                <string>right</string>
+                <string>center</string>
+                <string>bottom</string>
+                <string>hidden</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>groups</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>bottom</string> </key>
+                    <value>
+                      <list>
+                        <string>listbox</string>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>center</string> </key>
+                    <value>
+                      <list>
+                        <string>my_description</string>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>hidden</string> </key>
+                    <value>
+                      <list>
+                        <string>listbox_stop_date</string>
+                        <string>listbox_start_date</string>
+                        <string>listbox_quantity</string>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>left</string> </key>
+                    <value>
+                      <list>
+                        <string>my_title</string>
+                        <string>my_destination_title</string>
+                        <string>my_resource</string>
+                      </list>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>right</string> </key>
+                    <value>
+                      <list>
+                        <string>my_start_date</string>
+                        <string>my_quantity</string>
+                        <string>my_is_total_holiday</string>
+                        <string>my_translated_simulation_state_title</string>
+                      </list>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>HolidayAcquisition_view</string> </value>
+        </item>
+        <item>
+            <key> <string>method</string> </key>
+            <value> <string>POST</string> </value>
+        </item>
+        <item>
+            <key> <string>name</string> </key>
+            <value> <string>HolidayAcquisition_view</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>ERP5 Form</string> </value>
+        </item>
+        <item>
+            <key> <string>pt</string> </key>
+            <value> <string>form_view</string> </value>
+        </item>
+        <item>
+            <key> <string>row_length</string> </key>
+            <value> <int>4</int> </value>
+        </item>
+        <item>
+            <key> <string>stored_encoding</string> </key>
+            <value> <string>UTF-8</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Holiday Acquisition</string> </value>
+        </item>
+        <item>
+            <key> <string>unicode_mode</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>update_action</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>update_action_title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/HolidayAcquisition_view/my_description.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>my_description</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+                <item>
+                    <key> <unicode>line_too_long</unicode> </key>
+                    <value> <string>A line was too long.</string> </value>
+                </item>
+                <item>
+                    <key> <unicode>required_not_found</unicode> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+                <item>
+                    <key> <unicode>too_long</unicode> </key>
+                    <value> <string>You entered too many characters.</string> </value>
+                </item>
+                <item>
+                    <key> <unicode>too_many_lines</unicode> </key>
+                    <value> <string>You entered too many lines.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string>my_description</string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string>Base_viewFieldLibrary</string> </value>
+                </item>
+                <item>
+                    <key> <string>target</string> </key>
+                    <value> <string>Click to edit the target</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/HolidayAcquisition_view/my_title.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>my_title</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+                <item>
+                    <key> <unicode>required_not_found</unicode> </key>
+                    <value> <string>Input is required but no input given.</string> </value>
+                </item>
+                <item>
+                    <key> <unicode>too_long</unicode> </key>
+                    <value> <string>Too much input was given.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string>my_title</string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string>Base_viewFieldLibrary</string> </value>
+                </item>
+                <item>
+                    <key> <string>target</string> </key>
+                    <value> <string>Click to edit the target</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_calendar/WorkflowTemplateItem/portal_workflow/holiday_acquisition_workflow/script_HolidayAcquisition_checkConsistency.py

+obj = state_change['object']
+obj.Base_checkConsistency()