Merge remote-tracking branch 'origin/master' into erp5-component

CHANGES.erp5.util.txt

 Changes
 =======
 
+0.4.22 (2013-01-08)
+-------------------
+
+ * erp5.util.taskdistribution:
+
+  - fix regression when used on Python < 2.7
+
+0.4.21 (2013-01-07)
+-------------------
+
+ * erp5.util.taskdistribution:
+
+  - really fix lock to avoid errors with concurrent RPC calls
+
+ * erp5.util.testnode:
+
+  - do not run test suites on deleted branches
+
+0.4.20 (2012-12-19)
+------------------
+
+ * erp5.util.testnode:
+
+  - Make sure to kill grandchilds when killing a process [Sebastien Robin]
+
 0.4.19 (2012-12-17)
 ------------------
 

bt5/erp5_accounting/ActionTemplateItem/portal_types/Accounting%20Transaction/add_accounting_transaction_line.xml

@@ -73,7 +73,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?portal_type=Accounting+Transaction+Line</string> </value>
+            <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?line_portal_type=Accounting+Transaction+Line</string> </value>
         </item>
       </dictionary>
     </pickle>

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

@@ -73,7 +73,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?portal_type=Internal+Invoice+Transaction+Line</string> </value>
+            <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?line_portal_type=Internal+Invoice+Transaction+Line</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Payment%20Transaction/add_accounting_transaction_line.xml

@@ -73,7 +73,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?portal_type=Accounting+Transaction+Line</string> </value>
+            <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?line_portal_type=Accounting+Transaction+Line</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Purchase%20Invoice%20Transaction/add_purchase_invoice_transaction_line.xml

@@ -73,7 +73,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?portal_type=Purchase+Invoice+Transaction+Line</string> </value>
+            <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?line_portal_type=Purchase+Invoice+Transaction+Line</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_accounting/ActionTemplateItem/portal_types/Sale%20Invoice%20Transaction/add_sale_invoice_transaction_line.xml

@@ -73,7 +73,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?portal_type=Sale+Invoice+Transaction+Line</string> </value>
+            <value> <string>string:${object_url}/AccountingTransaction_viewAddAccountingTransactionLineDialog?line_portal_type=Sale+Invoice+Transaction+Line</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_addAccountingTransactionLine.xml

@@ -58,7 +58,7 @@ from Products.ERP5Type.Message import translateString\n
 request = container.REQUEST\n
 \n
 for i in range(line_count):\n
-  context.newContent(portal_type=portal_type)\n
+  context.newContent(portal_type=line_portal_type)\n
 \n
 request.set(\'portal_status_message\',\n
     translateString(\'Accounting Transaction Lines added.\'),)\n
@@ -67,7 +67,7 @@ return getattr(context, form_id)()\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>form_id=\'view\', portal_type=\'Accounting Transaction Line\', line_count=1</string> </value>
+            <value> <string>form_id=\'view\', line_portal_type=\'Accounting Transaction Line\', line_count=1</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_init.xml

@@ -50,15 +50,15 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>transaction = context\n
-\n
-if kw.get(\'created_by_builder\', 0): \n
+            <value> <string>if kw.get(\'created_by_builder\', 0): \n
   return\n
 \n
-transaction.newContent(portal_type=\'Accounting Transaction Line\', )\n
-transaction.newContent(portal_type=\'Accounting Transaction Line\', )\n
+preference_tool = context.getPortalObject().portal_preferences\n
+context.setSourceSection(preference_tool.getPreferredAccountingTransactionSourceSection())\n
+context.setResource(preference_tool.getPreferredAccountingTransactionCurrency())\n
 \n
-context.AccountingTransaction_initFromPreferences()\n
+context.newContent(portal_type=\'Accounting Transaction Line\', )\n
+context.newContent(portal_type=\'Accounting Transaction Line\', )\n
 </string> </value>
         </item>
         <item>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewAddAccountingTransactionLineDialog.xml

@@ -86,7 +86,7 @@
                     <key> <string>left</string> </key>
                     <value>
                       <list>
-                        <string>your_portal_type</string>
+                        <string>your_line_portal_type</string>
                         <string>your_line_count</string>
                       </list>
                     </value>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewAddAccountingTransactionLineDialog/your_portal_type.xml → bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_viewAddAccountingTransactionLineDialog/your_line_portal_type.xml

@@ -8,7 +8,7 @@
       <dictionary>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>your_portal_type</string> </value>
+            <value> <string>your_line_portal_type</string> </value>
         </item>
         <item>
             <key> <string>message_values</string> </key>
@@ -267,7 +267,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>request/portal_type</string> </value>
+            <value> <string>request/line_portal_type</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/InternalInvoiceTransaction_init.xml

@@ -50,22 +50,15 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>transaction = context\n
-\n
-if kw.get(\'created_by_builder\', 0): \n
+            <value> <string>if kw.get(\'created_by_builder\', 0): \n
   return\n
 \n
-transaction.newContent(portal_type=\'Internal Invoice Transaction Line\', )\n
-transaction.newContent(portal_type=\'Internal Invoice Transaction Line\', )\n
-\n
-from Products.CMFCore.utils import getToolByName\n
-\n
-transaction = context\n
-preference_tool = getToolByName(context, \'portal_preferences\')\n
+preference_tool = context.getPortalObject().portal_preferences\n
+context.setSourceSection(preference_tool.getPreferredAccountingTransactionSourceSection())\n
+context.setResource(preference_tool.getPreferredAccountingTransactionCurrency())\n
 \n
-transaction.edit (\n
-    source_section = preference_tool.getPreferredAccountingTransactionSourceSection(),\n
-    resource = preference_tool.getPreferredAccountingTransactionCurrency())\n
+context.newContent(portal_type=\'Internal Invoice Transaction Line\', )\n
+context.newContent(portal_type=\'Internal Invoice Transaction Line\', )\n
 </string> </value>
         </item>
         <item>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_init.xml

@@ -50,19 +50,19 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>transaction = context\n
-\n
-if kw.get(\'created_by_builder\', 0): \n
+            <value> <string>if kw.get(\'created_by_builder\', 0): \n
   return\n
 \n
-transaction.newContent(portal_type=\'Accounting Transaction Line\',\n
-                       id=\'receivable\', )\n
-transaction.newContent(portal_type=\'Accounting Transaction Line\',\n
-                       id=\'payable\', )\n
-transaction.newContent(portal_type=\'Accounting Transaction Line\',\n
-                       id=\'bank\', )\n
+preference_tool = context.getPortalObject().portal_preferences\n
+context.setSourceSection(preference_tool.getPreferredAccountingTransactionSourceSection())\n
+context.setResource(preference_tool.getPreferredAccountingTransactionCurrency())\n
 \n
-context.AccountingTransaction_initFromPreferences()\n
+context.newContent(portal_type=\'Accounting Transaction Line\',\n
+                   id=\'receivable\')\n
+context.newContent(portal_type=\'Accounting Transaction Line\',\n
+                   id=\'payable\')\n
+context.newContent(portal_type=\'Accounting Transaction Line\',\n
+                   id=\'bank\')\n
 </string> </value>
         </item>
         <item>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PaymentTransaction_zSelectMovement.xml

@@ -25,7 +25,8 @@
             <value> <string>from_table_list:list\r\n
 where_expression\r\n
 order_by_expression\r\n
-max_movement_date</string> </value>
+max_movement_date\r\n
+limit_expression</string> </value>
         </item>
         <item>
             <key> <string>cache_time_</string> </key>
@@ -55,11 +56,11 @@ max_movement_date</string> </value>
         </item>
         <item>
             <key> <string>max_cache_</string> </key>
-            <value> <int>100</int> </value>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>max_rows_</string> </key>
-            <value> <int>1000</int> </value>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>src</string> </key>
@@ -107,6 +108,9 @@ WHERE\n
 \n
 <dtml-if order_by_expression>\n
   ORDER BY <dtml-var order_by_expression>\n
+</dtml-if>\n
+<dtml-if limit_expression>\n
+LIMIT <dtml-var limit_expression>\n
 </dtml-if>
 
 ]]></string> </value>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/PurchaseInvoiceTransaction_init.xml

@@ -50,25 +50,22 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>transaction = context\n
-\n
-if kw.get(\'created_by_builder\', 0): \n
+            <value> <string>if kw.get(\'created_by_builder\', 0): \n
   return\n
 \n
-from Products.CMFCore.utils import getToolByName\n
-preference_tool = getToolByName(context, \'portal_preferences\')\n
+preference_tool = context.getPortalObject().portal_preferences\n
+context.setDestinationSection(preference_tool.getPreferredAccountingTransactionSourceSection())\n
+context.setResource(preference_tool.getPreferredAccountingTransactionCurrency())\n
 \n
-transaction.edit (\n
-     # XXX getPreferredAccountingTransactionSourceSection is definitively a bad name ...\n
-    destination_section = preference_tool.getPreferredAccountingTransactionSourceSection(),\n
-    resource = preference_tool.getPreferredAccountingTransactionCurrency())\n
+if \'Invoice Line\' in context.getVisibleAllowedContentTypeList():\n
+  return\n
 \n
-transaction.newContent(portal_type=\'Purchase Invoice Transaction Line\',\n
-                       id=\'expense\', )\n
-transaction.newContent(portal_type=\'Purchase Invoice Transaction Line\',\n
-                       id=\'payable\', )\n
-transaction.newContent(portal_type=\'Purchase Invoice Transaction Line\',\n
-                       id=\'refundable_vat\', )\n
+context.newContent(portal_type=\'Purchase Invoice Transaction Line\',\n
+                   id=\'expense\', )\n
+context.newContent(portal_type=\'Purchase Invoice Transaction Line\',\n
+                   id=\'payable\', )\n
+context.newContent(portal_type=\'Purchase Invoice Transaction Line\',\n
+                   id=\'refundable_vat\', )\n
 </string> </value>
         </item>
         <item>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/SaleInvoiceTransaction_init.xml

@@ -50,19 +50,22 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>transaction = context\n
-\n
-if kw.get(\'created_by_builder\', 0): \n
+            <value> <string>if kw.get(\'created_by_builder\', 0): \n
   return\n
 \n
-transaction.newContent(portal_type=\'Sale Invoice Transaction Line\',\n
-                       id=\'income\',)\n
-transaction.newContent(portal_type=\'Sale Invoice Transaction Line\',\n
-                       id=\'receivable\', )\n
-transaction.newContent(portal_type=\'Sale Invoice Transaction Line\',\n
-                       id=\'collected_vat\',)\n
+preference_tool = context.getPortalObject().portal_preferences\n
+context.setSourceSection(preference_tool.getPreferredAccountingTransactionSourceSection())\n
+context.setResource(preference_tool.getPreferredAccountingTransactionCurrency())\n
+    \n
+if \'Invoice Line\' in context.getVisibleAllowedContentTypeList():\n
+  return\n
 \n
-context.AccountingTransaction_initFromPreferences()\n
+context.newContent(portal_type=\'Sale Invoice Transaction Line\',\n
+                   id=\'income\',)\n
+context.newContent(portal_type=\'Sale Invoice Transaction Line\',\n
+                   id=\'receivable\', )\n
+context.newContent(portal_type=\'Sale Invoice Transaction Line\',\n
+                   id=\'collected_vat\',)\n
 </string> </value>
         </item>
         <item>

bt5/erp5_accounting/bt/revision

-1505
+1508
\ No newline at end of file

bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_purchase_invoice_transaction_create_reversal.html.xml

@@ -77,6 +77,21 @@ Test for Creating Reversal Transaction for a Purchase Invoice Transaction\n
   <td>select_action</td>\n
   <td>Add Purchase Invoice Transaction</td>\n
 </tr>\n
+<tr>\n
+  <td>selectAndWait</td>\n
+  <td>name=select_action</td>\n
+  <td>label=Add Accounting Transaction Lines</td>\n
+</tr>\n
+<tr>\n
+  <td>type</td>\n
+  <td>name=field_your_line_count</td>\n
+  <td>3</td>\n
+</tr>\n
+<tr>\n
+  <td>clickAndWait</td>\n
+  <td>id=dialog_submit_button</td>\n
+  <td></td>\n
+</tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>link=Accounting View</td>\n

bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_sale_invoice_transaction_create_reversal.html.xml

@@ -77,6 +77,21 @@ Test for Creating Reversal Transaction for a Sale Invoice Transaction\n
   <td>select_action</td>\n
   <td>Add Sale Invoice Transaction</td>\n
 </tr>\n
+<tr>\n
+  <td>selectAndWait</td>\n
+  <td>name=select_action</td>\n
+  <td>label=Add Accounting Transaction Lines</td>\n
+</tr>\n
+<tr>\n
+  <td>type</td>\n
+  <td>name=field_your_line_count</td>\n
+  <td>3</td>\n
+</tr>\n
+<tr>\n
+  <td>clickAndWait</td>\n
+  <td>id=dialog_submit_button</td>\n
+  <td></td>\n
+</tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>link=Accounting View</td>\n

bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_change_state.html.xml

@@ -86,7 +86,7 @@ Test changing state in accounting module (with custom search)\n
 <tr>\n
   <td>assertText</td>\n
   <td>//span[@class="listbox-current-page-total-number workflow_action_listbox-current-page-total-number"]</td>\n
-  <td>2 records</td>\n
+  <td>1 records</td>\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n

bt5/erp5_advanced_invoicing/SkinTemplateItem/portal_skins/erp5_advanced_invoicing/Alarm_buildInvoice.xml

@@ -78,6 +78,7 @@ for builder_id in builder_id_list:\n
                           \'_updateSimulation\')\n
   activate_kw          = dict(tag=index_tag)\n
   builder.activate(\n
+    limit=100,\n
     serialization_tag=serialization_tag,\n
     after_tag=after_tag,\n
     after_method_id=after_method_id).build(activate_kw=activate_kw)\n

bt5/erp5_advanced_invoicing/bt/revision

-107
+108
\ No newline at end of file

bt5/erp5_bearer_token/TestTemplateItem/testERP5BearerToken.py

 # Copyright (c) 2002-2012 Nexedi SA and Contributors. All Rights Reserved.
 
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-import transaction
 from DateTime import DateTime
 
 class TestERP5BearerToken(ERP5TypeTestCase):
@@ -29,7 +28,6 @@ class TestERP5BearerToken(ERP5TypeTestCase):
     person = person_module.newContent(portal_type='Person',
       reference='P' + reference)
     person.newContent(portal_type = 'Assignment').open()
-    transaction.commit()
     self.tic()
     return person
 
@@ -39,7 +37,6 @@ class TestERP5BearerToken(ERP5TypeTestCase):
       priority=1,
       preferred_bearer_token_key=self.test_id)
     self.preference.enable()
-    transaction.commit()
     self.tic()
 
   def setupBearerExtraction(self):
@@ -53,7 +50,7 @@ class TestERP5BearerToken(ERP5TypeTestCase):
         ('IExtractionPlugin',))
     elif len(bearer_extraction_list) > 1:
       raise ValueError
-    transaction.commit()
+    self.commit()
 
   def afterSetUp(self):
     """
@@ -64,12 +61,10 @@ class TestERP5BearerToken(ERP5TypeTestCase):
     self.person = self.createPerson(self.test_id)
     self.setUpBearerTokenKey()
     self.setupBearerExtraction()
-    transaction.commit()
     self.tic()
 
   def beforeTearDown(self):
     self.portal.portal_preferences.deleteContent(self.preference.getId())
-    transaction.commit()
     self.tic()
 
   def test_working_token(self):
@@ -94,16 +89,13 @@ class TestERP5BearerToken(ERP5TypeTestCase):
 
   def test_no_bearer_token_key(self):
     self.preference.edit(preferred_bearer_token_key='')
-    transaction.commit()
     self.tic()
-    transaction.commit()
     self.assertRaises(ValueError, self.person.Person_getBearerToken)
 
   def test_changed_bearer_token_key(self):
     token, expiration_time = self.person.Person_getBearerToken()
     self.portal.REQUEST._auth = 'Bearer %s' % token
     self.preference.edit(preferred_bearer_token_key='changed')
-    transaction.commit()
     self.tic()
     reference = self.getTokenCredential(self.portal.REQUEST)
     self.assertEqual(reference, None)

bt5/erp5_bearer_token/bt/revision

-10
+11
\ No newline at end of file

bt5/erp5_configurator/SkinTemplateItem/portal_skins/erp5_configurator/BusinessConfiguration_validateCustomerUsername.xml

@@ -60,6 +60,11 @@ for reference in reference_list:\n
 portal = context.getPortalObject()\n
 reference = editor\n
 \n
+# check this is a not a reference from acl_user\n
+if portal.acl_users.getUserById(reference) is not None or  \\\n
+  portal.aq_parent.acl_users.getUserById(reference) is not None:\n
+    return 0\n
+\n
 # ... then check already created accounts\n
 if portal.portal_catalog.getResultValue(\n
       reference = reference, \n
@@ -93,6 +98,14 @@ return 1\n
             <key> <string>_params</string> </key>
             <value> <string>editor, REQUEST</string> </value>
         </item>
+        <item>
+            <key> <string>_proxy_roles</string> </key>
+            <value>
+              <tuple>
+                <string>Manager</string>
+	      </tuple>
+	    </value>
+	</item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>BusinessConfiguration_validateCustomerUsername</string> </value>

bt5/erp5_configurator/bt/revision

-547
+548
\ No newline at end of file

bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/Alarm_buildConfiguratorStandardInvoice.xml

@@ -85,6 +85,7 @@ for builder_id in builder_id_list:\n
                           \'_updateSimulation\')\n
   activate_kw          = dict(tag=index_tag)\n
   builder.activate(\n
+    limit=100,\n
     serialization_tag=serialization_tag,\n
     after_tag=after_tag,\n
     after_method_id=after_method_id).build(activate_kw=activate_kw)\n

bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/Alarm_buildConfiguratorStandardPackingList.xml

@@ -82,6 +82,7 @@ for builder_id in builder_id_list:\n
                           \'_updateSimulation\')\n
   activate_kw          = dict(tag=index_tag)\n
   builder.activate(\n
+    limit=100,\n
     serialization_tag=serialization_tag,\n
     after_tag=after_tag,\n
     after_method_id=after_method_id).build(activate_kw=activate_kw)\n

bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_setupEmployeeListForm/your_reference.xml

@@ -10,6 +10,7 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
+                <string>default</string>
                 <string>external_validator</string>
               </list>
             </value>
@@ -60,6 +61,16 @@
             <key> <string>tales</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>external_validator</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string></string> </value>
@@ -79,10 +90,14 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key> <string>default</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>external_validator</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -104,6 +119,19 @@
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string>string:user</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <global name="Method" module="Products.Formulator.MethodField"/>
     </pickle>

bt5/erp5_configurator_standard/SkinTemplateItem/portal_skins/erp5_configurator_standard/BusinessConfiguration_setupPreferences.xml

@@ -88,34 +88,34 @@ organisation_configurator_item_obj.setPriceCurrency(currency_reference)\n
 # XXX I think here is not a good place.(yusei)\n
 service_list = (\n
   # sale opportunity\n
-  (\'product\', \'Product\'),\n
-  (\'service\', \'Service\'),\n
+  (\'product\', dict(title=\'Product\', use=\'crm/sale_opportunity\', )),\n
+  (\'service\', dict(title=\'Service\', use=\'crm/sale_opportunity\', )),\n
   # campaign\n
-  (\'marketing_campaign\', \'Marketing Campaign\'),\n
-  (\'marketing_survey\', \'Market Survey\'),\n
-  (\'marketing_purchases\', \'Purchases Campaign\'),\n
-  (\'marketing_sales\', \'Sales Campaign\'),\n
-  (\'marketing_other\', \'Other Marketing Service\'),\n
+  (\'marketing_campaign\', dict(title=\'Marketing Campaign\', use=\'crm/campaign\', )),\n
+  (\'marketing_survey\', dict(title=\'Market Survey\', use=\'crm/campaign\', )),\n
+  (\'marketing_purchases\', dict(title=\'Purchases Campaign\', use=\'crm/campaign\', )),\n
+  (\'marketing_sales\', dict(title=\'Sales Campaign\', use=\'crm/campaign\', )),\n
+  (\'marketing_other\', dict(title=\'Other Marketing Service\', use=\'crm/campaign\', )),\n
   # support request\n
-  (\'support_administrative\', \'Administrative Support\'),\n
-  (\'support_financial\', \'Financial Support\'),\n
-  (\'support_it\', \'IT Support\'),\n
-  (\'support_other\', \'Other Support Service\'),\n
+  (\'support_administrative\', dict(title=\'Administrative Support\', use=\'crm/support_request\', )),\n
+  (\'support_financial\', dict(title=\'Financial Support\', use=\'crm/support_request\', )),\n
+  (\'support_it\', dict(title=\'IT Support\', use=\'crm/support_request\', )),\n
+  (\'support_other\', dict(title=\'Other Support Service\', use=\'crm/support_request\', )),\n
   # meeting\n
-  (\'organisation_conference\', \'Conference\'),\n
-  (\'organisation_partnership\', \'Partnership Meeting\'),\n
-  (\'organisation_purchases\', \'Purchases Meeting\'),\n
-  (\'organisation_project\', \'Project Meeting\'),\n
-  (\'organisation_sales\', \'Sales Meeting\'),\n
-  (\'organisation_other\', \'Other Meeting\'),\n
+  (\'organisation_conference\', dict(title=\'Conference\', use=\'crm/meeting\', )),\n
+  (\'organisation_partnership\', dict(title=\'Partnership Meeting\', use=\'crm/meeting\', )),\n
+  (\'organisation_purchases\', dict(title=\'Purchases Meeting\', use=\'crm/meeting\', )),\n
+  (\'organisation_project\', dict(title=\'Project Meeting\', use=\'crm/meeting\', )),\n
+  (\'organisation_sales\', dict(title=\'Sales Meeting\', use=\'crm/meeting\', )),\n
+  (\'organisation_other\', dict(title=\'Other Meeting\', use=\'crm/meeting\', )),\n
   # event\n
-  (\'event_complaint\', \'Complaint\'),\n
-  (\'event_announcement\', \'Announcement\'),\n
-  (\'event_inquiry\', \'Inquiry\'),\n
-  (\'event_advertisement\', \'Advertisement\'),\n
-  (\'event_spam\', \'Spam\'),\n
-  (\'event_information\', \'Information\'),\n
-  (\'event_other\', \'Other event\'),\n
+  (\'event_complaint\', dict(title=\'Complaint\', use=\'crm/event\', )),\n
+  (\'event_announcement\', dict(title=\'Announcement\', use=\'crm/event\', )),\n
+  (\'event_inquiry\', dict(title=\'Inquiry\', use=\'crm/event\', )),\n
+  (\'event_advertisement\', dict(title=\'Advertisement\', use=\'crm/event\', )),\n
+  (\'event_spam\', dict(title=\'Spam\', use=\'crm/event\', )),\n
+  (\'event_information\', dict(title=\'Information\', use=\'crm/event\', )),\n
+  (\'event_other\', dict(title=\'Other event\', use=\'crm/event\', )),\n
   )\n
 configuration_save.addConfigurationItem("Service Configurator Item",\n
                                         configuration_list=service_list)\n
@@ -159,38 +159,14 @@ configuration_save.addConfigurationItem(\n
 # some preparation\n
 system_prefs = dict(\n
   # CRM\n
-  preferred_campaign_resource_list = [\n
-                             \'service_module/marketing_campaign\',\n
-                             \'service_module/marketing_survey\',\n
-                             \'service_module/marketing_purchases\',\n
-                             \'service_module/marketing_sales\',\n
-                             \'service_module/marketing_other\',],\n
-  preferred_event_resource_list = [\n
-                             \'service_module/event_complaint\',\n
-                             \'service_module/event_announcement\',\n
-                             \'service_module/event_inquiry\',\n
-                             \'service_module/event_advertisement\',\n
-                             \'service_module/event_spam\',\n
-                             \'service_module/event_information\',\n
-                             \'service_module/event_other\',],\n
-  preferred_meeting_resource_list = [\n
-                             \'service_module/organisation_conference\',\n
-                             \'service_module/organisation_partnership\',\n
-                             \'service_module/organisation_purchases\',\n
-                             \'service_module/organisation_project\',\n
-                             \'service_module/organisation_sales\',\n
-                             \'service_module/organisation_other\',],\n
-  preferred_sale_opportunity_resource_list = [\n
-                             \'service_module/product\',\n
-                             \'service_module/service\',],\n
-  preferred_support_request_resource_list = [\n
-                             \'service_module/support_administrative\',\n
-                             \'service_module/support_financial\',\n
-                             \'service_module/support_it\',\n
-                             \'service_module/support_other\',],\n
+  preferred_campaign_use_list = [\'use/crm/campaign\'],\n
+  preferred_event_use_list = [\'use/crm/event\'],\n
+  preferred_meeting_use_list = [\'use/crm/meeting\'],\n
+  preferred_sale_opportunity_use_list = [\'use/crm/sale_opportunity\'],\n
+  preferred_support_request_use_list = [\'use/crm/support_request\'],\n
   preferred_event_sender_email = preferred_event_sender_email,\n
   preferred_event_assessment_form_id_list = [],\n
-  # dms\n
+  # DMS\n
   # XXX-Luke: (proposal) Allow to define, maybe use some magic of\n
   #           representation\n
   preferred_document_file_name_regular_expression = \\\n
@@ -202,23 +178,24 @@ system_prefs = dict(\n
   preferred_document_classification = \'collaborative/team\',\n
   preferred_synchronous_metadata_discovery = True,\n
   preferred_redirect_to_document = True,\n
-  # pdm\n
+  # PDM\n
   preferred_product_individual_variation_base_category_list = [\'variation\'],\n
   preferred_component_individual_variation_base_category_list = [\'variation\'],\n
   preferred_service_individual_variation_base_category_list = [\'variation\'],\n
   # trade\n
-  preferred_supplier_role_list = [\'supplier\'],\n
-  preferred_client_role_list = [\'client\'],\n
-  preferred_sale_use_list = [\'trade/sale\'],\n
-  preferred_purchase_use_list = [\'trade/purchase\'],\n
-  preferred_packing_use_list = [\'trade/container\'],\n
-  preferred_tax_use_list=[\'trade/tax\'])\n
+  preferred_supplier_role_list = [\'role/supplier\'],\n
+  preferred_client_role_list = [\'role/client\'],\n
+  preferred_sale_use_list = [\'use/trade/sale\'],\n
+  preferred_purchase_use_list = [\'use/trade/purchase\'],\n
+  preferred_packing_use_list = [\'use/trade/container\'],\n
+  preferred_tax_use_list=[\'use/trade/tax\'],\n
+  preferred_price_ratio_use_list=[\'use/trade/tax\'])\n
 \n
 configuration_save.addConfigurationItem(\n
     \'System Preference Configurator Item\',\n
     object_id = \'default_configurator_system_preference\',\n
-    description="The default system parameters for the site are set on this \'\\\n
-    \'preference",\n
+    description="The default system parameters for the site are set on this "\\\n
+    "preference",\n
     title="Default Configurator System Site Preference",\n
     **system_prefs)\n
 \n

bt5/erp5_configurator_standard/bt/revision

-645
+662
\ No newline at end of file

bt5/erp5_crm/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml

+<hidden_content_type_list>
+ <portal_type id="Event Module">
+  <item>Acknowledgement</item>
+ </portal_type>
+</hidden_content_type_list>
\ No newline at end of file

bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Base_viewEventList/ticket_listbox.xml

@@ -91,9 +91,13 @@
                           <string>Title</string>
                         </tuple>
                         <tuple>
-                          <string>resource_title</string>
+                          <string>portal_type</string>
                           <string>Type</string>
                         </tuple>
+                        <tuple>
+                          <string>resource_title</string>
+                          <string>Resource</string>
+                        </tuple>
                         <tuple>
                           <string>destination_section_title</string>
                           <string>Client</string>

bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Event_viewCreateTicketWorkflowActionDialog/additionnal_javascript.xml

@@ -186,9 +186,7 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-                    </value>
+                    <value> <string></string> </value>
                 </item>
                 <item>
                     <key> <string>unicode</string> </key>
@@ -215,7 +213,7 @@
                 </item>
                 <item>
                     <key> <string>css_class</string> </key>
-                    <value> <string>hidden</string> </value>
+                    <value> <string>hidden hiddenLabel</string> </value>
                 </item>
                 <item>
                     <key> <string>default</string> </key>
@@ -225,54 +223,34 @@
 $(function (){\n
 function toggleNatureField() {\n
 if ($("select[name=\'field_your_follow_up_ticket_type\'] option:selected").val() == \'Support Request\') {\n
-$("select[name=\'field_your_follow_up_campaign_resource\']").parent().parent().addClass("hidden");\n
-$("select[name=\'field_your_follow_up_campaign_resource\']").addClass("hidden");\n
-$("select[name=\'field_your_follow_up_meeting_resource\']").parent().parent().addClass("hidden");\n
-$("select[name=\'field_your_follow_up_meeting_resource\']").addClass("hidden");\n
-$("select[name=\'field_your_follow_up_support_request_resource\']").parent().parent().removeClass("hidden");\n
-$("select[name=\'field_your_follow_up_support_request_resource\']").removeClass("hidden");\n
-$("select[name=\'field_your_follow_up_sale_opportunity_resource\']").parent().parent().addClass("hidden");\n
-$("select[name=\'field_your_follow_up_sale_opportunity_resource\']").addClass("hidden");\n
+$("select[name=\'field_your_follow_up_campaign_resource\']").addClass("hidden").parent().parent().addClass("hidden");\n
+$("select[name=\'field_your_follow_up_meeting_resource\']").addClass("hidden").parent().parent().addClass("hidden");\n
+$("select[name=\'field_your_follow_up_support_request_resource\']").removeClass("hidden").parent().parent().removeClass("hidden");\n
+$("select[name=\'field_your_follow_up_sale_opportunity_resource\']").addClass("hidden").parent().parent().addClass("hidden");\n
 }\n
 else if ($("select[name=\'field_your_follow_up_ticket_type\'] option:selected").val() == \'Campaign\'){\n
-$("select[name=\'field_your_follow_up_campaign_resource\']").parent().parent().removeClass("hidden");\n
-$("select[name=\'field_your_follow_up_campaign_resource\']").removeClass("hidden");\n
-$("select[name=\'field_your_follow_up_meeting_resource\']").parent().parent().addClass("hidden");\n
-$("select[name=\'field_your_follow_up_meeting_resource\']").addClass("hidden");\n
-$("select[name=\'field_your_follow_up_support_request_resource\']").parent().parent().addClass("hidden");\n
-$("select[name=\'field_your_follow_up_support_request_resource\']").addClass("hidden");\n
-$("select[name=\'field_your_follow_up_sale_opportunity_resource\']").parent().parent().addClass("hidden");\n
-$("select[name=\'field_your_follow_up_sale_opportunity_resource\']").addClass("hidden");\n
+$("select[name=\'field_your_follow_up_campaign_resource\']").removeClass("hidden").parent().parent().removeClass("hidden");\n
+$("select[name=\'field_your_follow_up_meeting_resource\']").addClass("hidden").parent().parent().addClass("hidden");\n
+$("select[name=\'field_your_follow_up_support_request_resource\']").addClass("hidden").parent().parent().addClass("hidden");\n
+$("select[name=\'field_your_follow_up_sale_opportunity_resource\']").addClass("hidden").parent().parent().addClass("hidden");\n
 }\n
 else if ($("select[name=\'field_your_follow_up_ticket_type\'] option:selected").val() == \'Meeting\'){\n
-$("select[name=\'field_your_follow_up_campaign_resource\']").parent().parent().addClass("hidden");\n
-$("select[name=\'field_your_follow_up_campaign_resource\']").addClass("hidden");\n
-$("select[name=\'field_your_follow_up_meeting_resource\']").parent().parent().removeClass("hidden");\n
-$("select[name=\'field_your_follow_up_meeting_resource\']").removeClass("hidden");\n
-$("select[name=\'field_your_follow_up_support_request_resource\']").parent().parent().addClass("hidden");\n
-$("select[name=\'field_your_follow_up_support_request_resource\']").addClass("hidden");\n
-$("select[name=\'field_your_follow_up_sale_opportunity_resource\']").parent().parent().addClass("hidden");\n
-$("select[name=\'field_your_follow_up_sale_opportunity_resource\']").addClass("hidden");\n
+$("select[name=\'field_your_follow_up_campaign_resource\']").addClass("hidden").parent().parent().addClass("hidden");\n
+$("select[name=\'field_your_follow_up_meeting_resource\']").removeClass("hidden").parent().parent().removeClass("hidden");\n
+$("select[name=\'field_your_follow_up_support_request_resource\']").addClass("hidden").parent().parent().addClass("hidden");\n
+$("select[name=\'field_your_follow_up_sale_opportunity_resource\']").addClass("hidden").parent().parent().addClass("hidden");\n
 }\n
 else if ($("select[name=\'field_your_follow_up_ticket_type\'] option:selected").val() == \'Sale Opportunity\'){\n
-$("select[name=\'field_your_follow_up_campaign_resource\']").parent().parent().addClass("hidden");\n
-$("select[name=\'field_your_follow_up_campaign_resource\']").addClass("hidden");\n
-$("select[name=\'field_your_follow_up_meeting_resource\']").parent().parent().addClass("hidden");\n
-$("select[name=\'field_your_follow_up_meeting_resource\']").addClass("hidden");\n
-$("select[name=\'field_your_follow_up_support_request_resource\']").parent().parent().addClass("hidden");\n
-$("select[name=\'field_your_follow_up_support_request_resource\']").addClass("hidden");\n
-$("select[name=\'field_your_follow_up_sale_opportunity_resource\']").parent().parent().removeClass("hidden");\n
-$("select[name=\'field_your_follow_up_sale_opportunity_resource\']").removeClass("hidden");\n
+$("select[name=\'field_your_follow_up_campaign_resource\']").addClass("hidden").parent().parent().addClass("hidden");\n
+$("select[name=\'field_your_follow_up_meeting_resource\']").addClass("hidden").parent().parent().addClass("hidden");\n
+$("select[name=\'field_your_follow_up_support_request_resource\']").addClass("hidden").parent().parent().addClass("hidden");\n
+$("select[name=\'field_your_follow_up_sale_opportunity_resource\']").removeClass("hidden").parent().parent().removeClass("hidden");\n
 }\n
 else {\n
-$("select[name=\'field_your_follow_up_campaign_resource\']").parent().parent().addClass("hidden");\n
-$("select[name=\'field_your_follow_up_campaign_resource\']").addClass("hidden");\n
-$("select[name=\'field_your_follow_up_meeting_resource\']").parent().parent().addClass("hidden");\n
-$("select[name=\'field_your_follow_up_meeting_resource\']").addClass("hidden");\n
-$("select[name=\'field_your_follow_up_support_request_resource\']").parent().parent().addClass("hidden");\n
-$("select[name=\'field_your_follow_up_support_request_resource\']").addClass("hidden");\n
-$("select[name=\'field_your_follow_up_sale_opportunity_resource\']").parent().parent().addClass("hidden");\n
-$("select[name=\'field_your_follow_up_sale_opportunity_resource\']").addClass("hidden");\n
+$("select[name=\'field_your_follow_up_campaign_resource\']").addClass("hidden").parent().parent().addClass("hidden");\n
+$("select[name=\'field_your_follow_up_meeting_resource\']").addClass("hidden").parent().parent().addClass("hidden");\n
+$("select[name=\'field_your_follow_up_support_request_resource\']").addClass("hidden").parent().parent().addClass("hidden");\n
+$("select[name=\'field_your_follow_up_sale_opportunity_resource\']").addClass("hidden").parent().parent().addClass("hidden");\n
 }\n
 }\n
 $("select[name=\'field_your_follow_up_ticket_type\']").change(function(){toggleNatureField()});\n
@@ -332,7 +310,7 @@ toggleNatureField();\n
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string>show</string> </value>
+                    <value> <string>Additional Javascript</string> </value>
                 </item>
                 <item>
                     <key> <string>unicode</string> </key>
@@ -352,17 +330,4 @@ toggleNatureField();\n
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string>string:</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
 </ZopeData>

bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/SystemPreference_viewCustomerRelation.xml

@@ -88,7 +88,6 @@
                     <value>
                       <list>
                         <string>my_preferred_event_use_list</string>
-                        <string>my_preferred_event_resource_list</string>
                         <string>my_preferred_event_resource</string>
                         <string>my_preferred_event_assessment_form_id_list</string>
                         <string>my_preferred_event_sender_email</string>
@@ -100,13 +99,10 @@
                     <value>
                       <list>
                         <string>my_preferred_sale_opportunity_use_list</string>
-                        <string>my_preferred_sale_opportunity_resource_list</string>
                         <string>my_preferred_sale_opportunity_resource</string>
                         <string>my_preferred_campaign_use_list</string>
-                        <string>my_preferred_campaign_resource_list</string>
                         <string>my_preferred_campaign_resource</string>
                         <string>my_preferred_support_request_use_list</string>
-                        <string>my_preferred_support_request_resource_list</string>
                         <string>my_preferred_support_request_resource</string>
                         <string>my_preferred_meeting_use_list</string>
                         <string>my_preferred_meeting_resource_list</string>

bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/ticket_workflow/states/suspended.xml

@@ -61,6 +61,7 @@
                         <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Auditor</string>
+                        <string>Manager</string>
                       </tuple>
                     </value>
                 </item>
@@ -70,6 +71,7 @@
                       <tuple>
                         <string>Assignee</string>
                         <string>Assignor</string>
+                        <string>Manager</string>
                       </tuple>
                     </value>
                 </item>
@@ -80,6 +82,7 @@
                         <string>Assignee</string>
                         <string>Assignor</string>
                         <string>Auditor</string>
+                        <string>Manager</string>
                       </tuple>
                     </value>
                 </item>

bt5/erp5_crm/bt/revision

-599
+601
\ No newline at end of file

bt5/erp5_crm/bt/template_portal_type_hidden_content_type_list

+Event Module | Acknowledgement
\ No newline at end of file

bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Image_checkConversionFormatPermission.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>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <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>_body</string> </key>
+            <value> <string encoding="cdata"><![CDATA[
+
+if format in (\'svg\',):\n
+  image_pixels = context.getHeight()* context.getWidth()\n
+  max_pixels = 128*128 # default thumbnail size\n
+  if image_pixels > max_pixels:\n
+    # image is too big to be handled safely by ERP5 as it can lead to \n
+    # really high memory consumptions\n
+    return 0\n
+return 1\n
+
+
+]]></string> </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>format, **kw</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Image_checkConversionFormatPermission</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_dms/bt/revision

-1267
+1268
\ No newline at end of file

bt5/erp5_immobilisation/SkinTemplateItem/portal_skins/erp5_immobilisation/AmortisationTransaction_zSelectMovement.xml

@@ -16,7 +16,8 @@
             <key> <string>arguments_src</string> </key>
             <value> <string>from_table_list:list\r\n
 where_expression\r\n
-order_by_expression</string> </value>
+order_by_expression\r\n
+limit_expression</string> </value>
         </item>
         <item>
             <key> <string>cache_time_</string> </key>
@@ -46,11 +47,11 @@ order_by_expression</string> </value>
         </item>
         <item>
             <key> <string>max_cache_</string> </key>
-            <value> <int>100</int> </value>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>max_rows_</string> </key>
-            <value> <int>1000</int> </value>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>src</string> </key>
@@ -77,12 +78,14 @@ WHERE\n
   1=1\n
   <dtml-if where_expression>\n
     AND <dtml-var where_expression> \n
-  </dtml-if>\n
-  AND simulation_movement.uid = catalog.uid\n
+  </dtml-if>  AND simulation_movement.uid = catalog.uid\n
   AND category.category_uid is NULL\n
 \n
 <dtml-if order_by_expression>\n
 ORDER BY <dtml-var order_by_expression>\n
+</dtml-if>\n
+<dtml-if limit_expression>\n
+LIMIT <dtml-var limit_expression>\n
 </dtml-if>
 
 ]]></string> </value>

bt5/erp5_immobilisation/bt/revision

-180
+181
\ No newline at end of file

bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_zSelectMovement.xml

@@ -24,7 +24,8 @@
             <key> <string>arguments_src</string> </key>
             <value> <string>from_table_list:list\r\n
 where_expression\r\n
-order_by_expression</string> </value>
+order_by_expression\r\n
+limit_expression</string> </value>
         </item>
         <item>
             <key> <string>cache_time_</string> </key>
@@ -52,11 +53,11 @@ order_by_expression</string> </value>
         </item>
         <item>
             <key> <string>max_cache_</string> </key>
-            <value> <int>100</int> </value>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>max_rows_</string> </key>
-            <value> <int>100</int> </value>
+            <value> <int>0</int> </value>
         </item>
         <item>
             <key> <string>src</string> </key>
@@ -92,8 +93,9 @@ WHERE\n
 <dtml-if order_by_expression>\n
 ORDER BY <dtml-var order_by_expression>\n
 </dtml-if>\n
-\n
-
+<dtml-if limit_expression>\n
+LIMIT <dtml-var limit_expression>\n
+</dtml-if>
 
 ]]></string> </value>
         </item>

bt5/erp5_invoicing/bt/revision

-385
+386
\ No newline at end of file

bt5/erp5_jquery/bt/change_log

+2013-01-15 Kazuhiko
+* add jquery-1.8.js as jquery core 1.8.3 and jquery-1.9.js as jquery core 1.9.0, still keeping jquery.js as jquery-1.7.2.js for compatibility.
+
 2012-07-30 Kazuhiko
 * jQuery Core 1.7.2.
 

bt5/erp5_jquery/bt/copyright_list

-Copyright (c) 2010 Nexedi SA
+Copyright © 2010-2013 Nexedi SA
\ No newline at end of file

bt5/erp5_jquery/bt/description

 This  Business Template contains jQuery Core.
-Current version is jQuery 1.7.2.
+Current version contains jQuery 1.7.2, 1.8.3 and 1.9.0.
\ No newline at end of file

bt5/erp5_jquery/bt/license

-GPL
+MIT
\ No newline at end of file

bt5/erp5_jquery/bt/revision

-15
+16
\ No newline at end of file

bt5/erp5_jquery_plugin_jcarousel/bt/description

-This  Business Template contains only static files of jCarousel jQuery library.
+This  Business Template contains only static files of jCarousel jQuery library 0.2.8.
\ No newline at end of file
+http://sorgalla.com/jcarousel/
\ No newline at end of file

bt5/erp5_jquery_plugin_jcarousel/bt/license

-GPL
+MIT/GPL
\ No newline at end of file

bt5/erp5_jquery_plugin_jcarousel/bt/revision

-1
+2
\ No newline at end of file

bt5/erp5_jquery_plugin_jqgrid/PathTemplateItem/portal_skins/erp5_jquery/jquery/plugin/jqgrid/i18n.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Folder" module="OFS.Folder"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>i18n</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_jquery_plugin_jqgrid/PathTemplateItem/portal_skins/erp5_jquery/jquery/plugin/jqgrid/grid.locale-en.js.xml → bt5/erp5_jquery_plugin_jqgrid/PathTemplateItem/portal_skins/erp5_jquery/jquery/plugin/jqgrid/i18n/grid.locale-en.js.xml

@@ -12,7 +12,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts30690458.97</string> </value>
+            <value> <string>ts58176408.54</string> </value>
         </item>
         <item>
             <key> <string>__name__</string> </key>
@@ -35,7 +35,8 @@
  * http://www.opensource.org/licenses/mit-license.php\r\n
  * http://www.gnu.org/licenses/gpl.html\r\n
 **/\r\n
-$.jgrid = {\r\n
+$.jgrid = $.jgrid || {};\r\n
+$.extend($.jgrid,{\r\n
 \tdefaults : {\r\n
 \t\trecordtext: "View {0} - {1} of {2}",\r\n
 \t\temptyrecords: "No records to view",\r\n
@@ -115,9 +116,9 @@ $.jgrid = {\r\n
 \t\tmodel : "Length of colNames <> colModel!"\r\n
 \t},\r\n
 \tformatter : {\r\n
-\t\tinteger : {thousandsSeparator: " ", defaultValue: \'0\'},\r\n
-\t\tnumber : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, defaultValue: \'0.00\'},\r\n
-\t\tcurrency : {decimalSeparator:".", thousandsSeparator: " ", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: \'0.00\'},\r\n
+\t\tinteger : {thousandsSeparator: ",", defaultValue: \'0\'},\r\n
+\t\tnumber : {decimalSeparator:".", thousandsSeparator: ",", decimalPlaces: 2, defaultValue: \'0.00\'},\r\n
+\t\tcurrency : {decimalSeparator:".", thousandsSeparator: ",", decimalPlaces: 2, prefix: "", suffix:"", defaultValue: \'0.00\'},\r\n
 \t\tdate : {\r\n
 \t\t\tdayNames:   [\r\n
 \t\t\t\t"Sun", "Mon", "Tue", "Wed", "Thr", "Fri", "Sat",\r\n
@@ -128,21 +129,61 @@ $.jgrid = {\r\n
 \t\t\t\t"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"\r\n
 \t\t\t],\r\n
 \t\t\tAmPm : ["am","pm","AM","PM"],\r\n
-\t\t\tS: function (j) {return j < 11 || j > 13 ? [\'st\', \'nd\', \'rd\', \'th\'][Math.min((j - 1) % 10, 3)] : \'th\'},\r\n
+\t\t\tS: function (j) {return j < 11 || j > 13 ? [\'st\', \'nd\', \'rd\', \'th\'][Math.min((j - 1) % 10, 3)] : \'th\';},\r\n
 \t\t\tsrcformat: \'Y-m-d\',\r\n
-\t\t\tnewformat: \'d/m/Y\',\r\n
+\t\t\tnewformat: \'n/j/Y\',\r\n
 \t\t\tmasks : {\r\n
+\t\t\t\t// see http://php.net/manual/en/function.date.php for PHP format used in jqGrid\r\n
+\t\t\t\t// and see http://docs.jquery.com/UI/Datepicker/formatDate\r\n
+\t\t\t\t// and https://github.com/jquery/globalize#dates for alternative formats used frequently\r\n
+\t\t\t\t// one can find on https://github.com/jquery/globalize/tree/master/lib/cultures many\r\n
+\t\t\t\t// information about date, time, numbers and currency formats used in different countries\r\n
+\t\t\t\t// one should just convert the information in PHP format\r\n
 \t\t\t\tISO8601Long:"Y-m-d H:i:s",\r\n
 \t\t\t\tISO8601Short:"Y-m-d",\r\n
-\t\t\t\tShortDate: "n/j/Y",\r\n
-\t\t\t\tLongDate: "l, F d, Y",\r\n
-\t\t\t\tFullDateTime: "l, F d, Y g:i:s A",\r\n
-\t\t\t\tMonthDay: "F d",\r\n
-\t\t\t\tShortTime: "g:i A",\r\n
-\t\t\t\tLongTime: "g:i:s A",\r\n
+\t\t\t\t// short date:\r\n
+\t\t\t\t//    n - Numeric representation of a month, without leading zeros\r\n
+\t\t\t\t//    j - Day of the month without leading zeros\r\n
+\t\t\t\t//    Y - A full numeric representation of a year, 4 digits\r\n
+\t\t\t\t// example: 3/1/2012 which means 1 March 2012\r\n
+\t\t\t\tShortDate: "n/j/Y", // in jQuery UI Datepicker: "M/d/yyyy"\r\n
+\t\t\t\t// long date:\r\n
+\t\t\t\t//    l - A full textual representation of the day of the week\r\n
+\t\t\t\t//    F - A full textual representation of a month\r\n
+\t\t\t\t//    d - Day of the month, 2 digits with leading zeros\r\n
+\t\t\t\t//    Y - A full numeric representation of a year, 4 digits\r\n
+\t\t\t\tLongDate: "l, F d, Y", // in jQuery UI Datepicker: "dddd, MMMM dd, yyyy"\r\n
+\t\t\t\t// long date with long time:\r\n
+\t\t\t\t//    l - A full textual representation of the day of the week\r\n
+\t\t\t\t//    F - A full textual representation of a month\r\n
+\t\t\t\t//    d - Day of the month, 2 digits with leading zeros\r\n
+\t\t\t\t//    Y - A full numeric representation of a year, 4 digits\r\n
+\t\t\t\t//    g - 12-hour format of an hour without leading zeros\r\n
+\t\t\t\t//    i - Minutes with leading zeros\r\n
+\t\t\t\t//    s - Seconds, with leading zeros\r\n
+\t\t\t\t//    A - Uppercase Ante meridiem and Post meridiem (AM or PM)\r\n
+\t\t\t\tFullDateTime: "l, F d, Y g:i:s A", // in jQuery UI Datepicker: "dddd, MMMM dd, yyyy h:mm:ss tt"\r\n
+\t\t\t\t// month day:\r\n
+\t\t\t\t//    F - A full textual representation of a month\r\n
+\t\t\t\t//    d - Day of the month, 2 digits with leading zeros\r\n
+\t\t\t\tMonthDay: "F d", // in jQuery UI Datepicker: "MMMM dd"\r\n
+\t\t\t\t// short time (without seconds)\r\n
+\t\t\t\t//    g - 12-hour format of an hour without leading zeros\r\n
+\t\t\t\t//    i - Minutes with leading zeros\r\n
+\t\t\t\t//    A - Uppercase Ante meridiem and Post meridiem (AM or PM)\r\n
+\t\t\t\tShortTime: "g:i A", // in jQuery UI Datepicker: "h:mm tt"\r\n
+\t\t\t\t// long time (with seconds)\r\n
+\t\t\t\t//    g - 12-hour format of an hour without leading zeros\r\n
+\t\t\t\t//    i - Minutes with leading zeros\r\n
+\t\t\t\t//    s - Seconds, with leading zeros\r\n
+\t\t\t\t//    A - Uppercase Ante meridiem and Post meridiem (AM or PM)\r\n
+\t\t\t\tLongTime: "g:i:s A", // in jQuery UI Datepicker: "h:mm:ss tt"\r\n
 \t\t\t\tSortableDateTime: "Y-m-d\\\\TH:i:s",\r\n
 \t\t\t\tUniversalSortableDateTime: "Y-m-d H:i:sO",\r\n
-\t\t\t\tYearMonth: "F, Y"\r\n
+\t\t\t\t// month with year\r\n
+\t\t\t\t//    Y - A full numeric representation of a year, 4 digits\r\n
+\t\t\t\t//    F - A full textual representation of a month\r\n
+\t\t\t\tYearMonth: "F, Y" // in jQuery UI Datepicker: "MMMM, yyyy"\r\n
 \t\t\t},\r\n
 \t\t\treformatAfterEdit : false\r\n
 \t\t},\r\n
@@ -152,7 +193,7 @@ $.jgrid = {\r\n
 \t\tcheckbox : {disabled:true},\r\n
 \t\tidName : \'id\'\r\n
 \t}\r\n
-};\r\n
+});\r\n
 })(jQuery);\r\n
 
 
@@ -164,7 +205,7 @@ $.jgrid = {\r\n
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>3927</int> </value>
+            <value> <int>6531</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_jquery_plugin_jqgrid/PathTemplateItem/portal_skins/erp5_jquery/jquery/plugin/jqgrid/grid.locale-fr.js.xml → bt5/erp5_jquery_plugin_jqgrid/PathTemplateItem/portal_skins/erp5_jquery/jquery/plugin/jqgrid/i18n/grid.locale-fr.js.xml

@@ -12,7 +12,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts34648236.68</string> </value>
+            <value> <string>ts58176414.84</string> </value>
         </item>
         <item>
             <key> <string>__name__</string> </key>
@@ -46,9 +46,9 @@ $.extend($.jgrid,{\r\n
 \tsearch : {\r\n
 \t\tcaption: "Recherche...",\r\n
 \t\tFind: "Chercher",\r\n
-\t\tReset: "Annuler",\r\n
+\t\tReset: "Réinitialiser",\r\n
 \t\todata : [\'égal\', \'différent\', \'inférieur\', \'inférieur ou égal\',\'supérieur\',\'supérieur ou égal\', \'commence par\',\'ne commence pas par\',\'est dans\',"n\'est pas dans",\'finit par\',\'ne finit pas par\',\'contient\',\'ne contient pas\'],\r\n
-\t\tgroupOps: [\t{ op: "AND", text: "tous" },\t{ op: "OR",  text: "aucun" }\t],\r\n
+\t\tgroupOps: [\t{ op: "AND", text: "tous" },\t{ op: "OR",  text: "au moins un" }\t],\r\n
 \t\tmatchText: " correspondance",\r\n
 \t\trulesText: " règles"\r\n
 \t},\r\n
@@ -163,7 +163,7 @@ $.extend($.jgrid,{\r\n
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>4273</int> </value>
+            <value> <int>4286</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_jquery_plugin_jqgrid/PathTemplateItem/portal_skins/erp5_jquery/jquery/plugin/jqgrid/ui.jqgrid.css.xml

@@ -12,7 +12,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts30690424.51</string> </value>
+            <value> <string>ts58176310.37</string> </value>
         </item>
         <item>
             <key> <string>__name__</string> </key>
@@ -25,8 +25,8 @@
         <item>
             <key> <string>data</string> </key>
             <value> <string>/*Grid*/\r\n
-.ui-jqgrid {position: relative; font-size:11px;}\r\n
-.ui-jqgrid .ui-jqgrid-view {position: relative;left:0px; top: 0px; padding: .0em;}\r\n
+.ui-jqgrid {position: relative;}\r\n
+.ui-jqgrid .ui-jqgrid-view {position: relative;left:0px; top: 0px; padding: .0em; font-size:11px;}\r\n
 /* caption*/\r\n
 .ui-jqgrid .ui-jqgrid-titlebar {padding: .3em .2em .2em .3em; position: relative; border-left: 0px none;border-right: 0px none; border-top: 0px none;}\r\n
 .ui-jqgrid .ui-jqgrid-title { float: left; margin: .1em 0 .2em; }\r\n
@@ -66,7 +66,7 @@ tr.ui-search-toolbar select {margin: 1px 0px 0px 0px}\r\n
 .ui-jqgrid tr.ui-row-ltr td {text-align:left;border-right-width: 1px; border-right-color: inherit; border-right-style: solid;}\r\n
 .ui-jqgrid tr.ui-row-rtl td {text-align:right;border-left-width: 1px; border-left-color: inherit; border-left-style: solid;}\r\n
 .ui-jqgrid td.jqgrid-rownum { padding: 0 2px 0 2px; margin: 0px; border: 0px none;}\r\n
-.ui-jqgrid .ui-jqgrid-resize-mark { width:2px; left:0; background-color:#777; cursor: e-resize; cursor: col-resize; position:absolute; top:0; height:100px; overflow:hidden; display:none;\tborder:0 none;}\r\n
+.ui-jqgrid .ui-jqgrid-resize-mark { width:2px; left:0; background-color:#777; cursor: e-resize; cursor: col-resize; position:absolute; top:0; height:100px; overflow:hidden; display:none; border:0 none; z-index: 99999;}\r\n
 /* footer */\r\n
 .ui-jqgrid .ui-jqgrid-sdiv {position: relative; margin: 0em;padding: 0em; overflow: hidden; border-left: 0px none !important; border-top : 0px none !important; border-right : 0px none !important;}\r\n
 .ui-jqgrid .ui-jqgrid-ftable {table-layout:fixed; margin-bottom:0em;}\r\n
@@ -74,7 +74,7 @@ tr.ui-search-toolbar select {margin: 1px 0px 0px 0px}\r\n
 .ui-jqgrid tr.footrow-ltr td {text-align:left;border-right-width: 1px; border-right-color: inherit; border-right-style: solid;}\r\n
 .ui-jqgrid tr.footrow-rtl td {text-align:right;border-left-width: 1px; border-left-color: inherit; border-left-style: solid;}\r\n
 /* Pager*/\r\n
-.ui-jqgrid .ui-jqgrid-pager { border-left: 0px none !important;border-right: 0px none !important; border-bottom: 0px none !important; margin: 0px !important; padding: 0px !important; position: relative; height: 25px;white-space: nowrap;overflow: hidden;}\r\n
+.ui-jqgrid .ui-jqgrid-pager { border-left: 0px none !important;border-right: 0px none !important; border-bottom: 0px none !important; margin: 0px !important; padding: 0px !important; position: relative; height: 25px;white-space: nowrap;overflow: hidden;font-size:11px;}\r\n
 .ui-jqgrid .ui-pager-control {position: relative;}\r\n
 .ui-jqgrid .ui-pg-table {position: relative; padding-bottom:2px; width:auto; margin: 0em;}\r\n
 .ui-jqgrid .ui-pg-table td {font-weight:normal; vertical-align:middle; padding:1px;}\r\n
@@ -86,12 +86,15 @@ tr.ui-search-toolbar select {margin: 1px 0px 0px 0px}\r\n
 .ui-jqgrid .ui-pg-selbox {font-size:.8em; line-height:18px; display:block; height:18px; margin: 0em;}\r\n
 .ui-jqgrid .ui-separator {height: 18px; border-left: 1px solid #ccc ; border-right: 1px solid #ccc ; margin: 1px; float: right;}\r\n
 .ui-jqgrid .ui-paging-info {font-weight: normal;height:19px; margin-top:3px;margin-right:4px;}\r\n
-.ui-jqgrid .ui-jqgrid-pager .ui-pg-div {padding:1px 0;float:left;list-style-image:none;list-style-position:outside;list-style-type:none;position:relative;}\r\n
+.ui-jqgrid .ui-jqgrid-pager .ui-pg-div {padding:1px 0;float:left;position:relative;}\r\n
 .ui-jqgrid .ui-jqgrid-pager .ui-pg-button { cursor:pointer; }\r\n
 .ui-jqgrid .ui-jqgrid-pager .ui-pg-div  span.ui-icon {float:left;margin:0 2px;}\r\n
 .ui-jqgrid td input, .ui-jqgrid td select .ui-jqgrid td textarea { margin: 0em;}\r\n
 .ui-jqgrid td textarea {width:auto;height:auto;}\r\n
 .ui-jqgrid .ui-jqgrid-toppager {border-left: 0px none !important;border-right: 0px none !important; border-top: 0px none !important; margin: 0px !important; padding: 0px !important; position: relative; height: 25px !important;white-space: nowrap;overflow: hidden;}\r\n
+.ui-jqgrid .ui-jqgrid-toppager .ui-pg-div {padding:1px 0;float:left;position:relative;}\r\n
+.ui-jqgrid .ui-jqgrid-toppager .ui-pg-button { cursor:pointer; }\r\n
+.ui-jqgrid .ui-jqgrid-toppager .ui-pg-div  span.ui-icon {float:left;margin:0 2px;}\r\n
 /*subgrid*/\r\n
 .ui-jqgrid .ui-jqgrid-btable .ui-sgcollapsed span {display: block;}\r\n
 .ui-jqgrid .ui-subgrid {margin:0em;padding:0em; width:100%;}\r\n
@@ -101,7 +104,7 @@ tr.ui-search-toolbar select {margin: 1px 0px 0px 0px}\r\n
 .ui-jqgrid .ui-subgrid td.subgrid-cell {border-width: 0px 0px 1px 0px;}\r\n
 .ui-jqgrid .ui-th-subgrid {height:20px;}\r\n
 /* loading */\r\n
-.ui-jqgrid .loading {position: absolute; top: 45%;left: 45%;width: auto;z-index:101;padding: 6px; margin: 5px;text-align: center;font-weight: bold;display: none;border-width: 2px !important;}\r\n
+.ui-jqgrid .loading {position: absolute; top: 45%;left: 45%;width: auto;z-index:101;padding: 6px; margin: 5px;text-align: center;font-weight: bold;display: none;border-width: 2px !important; font-size:11px;}\r\n
 .ui-jqgrid .jqgrid-overlay {display:none;z-index:100;}\r\n
 * html .jqgrid-overlay {width: expression(this.parentNode.offsetWidth+\'px\');height: expression(this.parentNode.offsetHeight+\'px\');}\r\n
 * .jqgrid-overlay iframe {position:absolute;top:0;left:0;z-index:-1;width: expression(this.parentNode.offsetWidth+\'px\');height: expression(this.parentNode.offsetHeight+\'px\');}\r\n
@@ -130,7 +133,7 @@ tr.ui-search-toolbar select {margin: 1px 0px 0px 0px}\r\n
 .ui-jqdialog-content input.FormElement {padding:.3em}\r\n
 .ui-jqdialog-content .data-line {padding-top:.1em;border: 0px none;}\r\n
 \r\n
-.ui-jqdialog-content .CaptionTD {text-align: left; vertical-align: middle;border: 0px none; padding: 2px;white-space: nowrap;}\r\n
+.ui-jqdialog-content .CaptionTD {vertical-align: middle;border: 0px none; padding: 2px;white-space: nowrap;}\r\n
 .ui-jqdialog-content .DataTD {padding: 2px; border: 0px none; vertical-align: top;}\r\n
 .ui-jqdialog-content .form-view-data {white-space:pre}\r\n
 .fm-button { display: inline-block; margin:0 4px 0 0; padding: .4em .5em; text-decoration:none !important; cursor:pointer; position: relative; text-align: center; zoom: 1; }\r\n
@@ -142,6 +145,11 @@ tr.ui-search-toolbar select {margin: 1px 0px 0px 0px}\r\n
 /* End Eorm edit */\r\n
 /*.ui-jqgrid .edit-cell {}*/\r\n
 .ui-jqgrid .selected-row, div.ui-jqgrid .selected-row td {font-style : normal;border-left: 0px none;}\r\n
+/* inline edit actions button*/\r\n
+.ui-inline-del.ui-state-hover span, .ui-inline-edit.ui-state-hover span,\r\n
+.ui-inline-save.ui-state-hover span, .ui-inline-cancel.ui-state-hover span {\r\n
+    margin: -1px;\r\n
+}\r\n
 /* Tree Grid */\r\n
 .ui-jqgrid .tree-wrap {float: left; position: relative;height: 18px;white-space: nowrap;overflow: hidden;}\r\n
 .ui-jqgrid .tree-minus {position: absolute; height: 18px; width: 18px; overflow: hidden;}\r\n
@@ -159,7 +167,7 @@ tr.ui-search-toolbar select {margin: 1px 0px 0px 0px}\r\n
 .ui-jqgrid .ui-sort-rtl {left:0px;}\r\n
 .ui-jqgrid .tree-wrap-ltr {float: left;}\r\n
 .ui-jqgrid .tree-wrap-rtl {float: right;}\r\n
-.ui-jqgrid .ui-ellipsis {text-overflow:ellipsis; -moz-binding:url(\'ellipsis-xbl.xml#ellipsis\');}\r\n
+.ui-jqgrid .ui-ellipsis {text-overflow:ellipsis;}\r\n
 </string> </value>
         </item>
         <item>
@@ -168,7 +176,7 @@ tr.ui-search-toolbar select {margin: 1px 0px 0px 0px}\r\n
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>11841</int> </value>
+            <value> <int>12198</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_jquery_plugin_jqgrid/bt/description

-This  Business Template contains only static files of  JQuery's jqGrid Plugin. 
+This  Business Template contains only static files of  JQuery's jqGrid Plugin 4.4.1.
\ No newline at end of file
+* http://www.trirand.com/blog/ 
\ No newline at end of file

bt5/erp5_jquery_plugin_jqgrid/bt/license

-GPL
+MIT/GPL
\ No newline at end of file

bt5/erp5_jquery_plugin_jqgrid/bt/revision

-2
+3
\ No newline at end of file

bt5/erp5_jquery_plugin_json/PathTemplateItem/portal_skins/erp5_jquery/jquery/plugin/json.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Folder" module="OFS.Folder"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>json</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_jquery_plugin_json/PathTemplateItem/portal_skins/erp5_jquery/jquery/plugin/json/jquery.json.min.js.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="File" module="OFS.Image"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Cacheable__manager_id</string> </key>
+            <value> <string>http_cache</string> </value>
+        </item>
+        <item>
+            <key> <string>_EtagSupport__etag</string> </key>
+            <value> <string>ts58170082.7</string> </value>
+        </item>
+        <item>
+            <key> <string>__name__</string> </key>
+            <value> <string>jquery.json.min.js</string> </value>
+        </item>
+        <item>
+            <key> <string>content_type</string> </key>
+            <value> <string>application/javascript</string> </value>
+        </item>
+        <item>
+            <key> <string>data</string> </key>
+            <value> <string encoding="cdata"><![CDATA[
+
+/*! jQuery JSON plugin 2.4.0 | code.google.com/p/jquery-json */\n
+(function($){\'use strict\';var escape=/["\\\\\\x00-\\x1f\\x7f-\\x9f]/g,meta={\'\\b\':\'\\\\b\',\'\\t\':\'\\\\t\',\'\\n\':\'\\\\n\',\'\\f\':\'\\\\f\',\'\\r\':\'\\\\r\',\'"\':\'\\\\"\',\'\\\\\':\'\\\\\\\\\'},hasOwn=Object.prototype.hasOwnProperty;$.toJSON=typeof JSON===\'object\'&&JSON.stringify?JSON.stringify:function(o){if(o===null){return\'null\';}\n
+var pairs,k,name,val,type=$.type(o);if(type===\'undefined\'){return undefined;}\n
+if(type===\'number\'||type===\'boolean\'){return String(o);}\n
+if(type===\'string\'){return $.quoteString(o);}\n
+if(typeof o.toJSON===\'function\'){return $.toJSON(o.toJSON());}\n
+if(type===\'date\'){var month=o.getUTCMonth()+1,day=o.getUTCDate(),year=o.getUTCFullYear(),hours=o.getUTCHours(),minutes=o.getUTCMinutes(),seconds=o.getUTCSeconds(),milli=o.getUTCMilliseconds();if(month<10){month=\'0\'+month;}\n
+if(day<10){day=\'0\'+day;}\n
+if(hours<10){hours=\'0\'+hours;}\n
+if(minutes<10){minutes=\'0\'+minutes;}\n
+if(seconds<10){seconds=\'0\'+seconds;}\n
+if(milli<100){milli=\'0\'+milli;}\n
+if(milli<10){milli=\'0\'+milli;}\n
+return\'"\'+year+\'-\'+month+\'-\'+day+\'T\'+\n
+hours+\':\'+minutes+\':\'+seconds+\'.\'+milli+\'Z"\';}\n
+pairs=[];if($.isArray(o)){for(k=0;k<o.length;k++){pairs.push($.toJSON(o[k])||\'null\');}\n
+return\'[\'+pairs.join(\',\')+\']\';}\n
+if(typeof o===\'object\'){for(k in o){if(hasOwn.call(o,k)){type=typeof k;if(type===\'number\'){name=\'"\'+k+\'"\';}else if(type===\'string\'){name=$.quoteString(k);}else{continue;}\n
+type=typeof o[k];if(type!==\'function\'&&type!==\'undefined\'){val=$.toJSON(o[k]);pairs.push(name+\':\'+val);}}}\n
+return\'{\'+pairs.join(\',\')+\'}\';}};$.evalJSON=typeof JSON===\'object\'&&JSON.parse?JSON.parse:function(str){return eval(\'(\'+str+\')\');};$.secureEvalJSON=typeof JSON===\'object\'&&JSON.parse?JSON.parse:function(str){var filtered=str.replace(/\\\\["\\\\\\/bfnrtu]/g,\'@\').replace(/"[^"\\\\\\n\\r]*"|true|false|null|-?\\d+(?:\\.\\d*)?(?:[eE][+\\-]?\\d+)?/g,\']\').replace(/(?:^|:|,)(?:\\s*\\[)+/g,\'\');if(/^[\\],:{}\\s]*$/.test(filtered)){return eval(\'(\'+str+\')\');}\n
+throw new SyntaxError(\'Error parsing JSON, source is not valid.\');};$.quoteString=function(str){if(str.match(escape)){return\'"\'+str.replace(escape,function(a){var c=meta[a];if(typeof c===\'string\'){return c;}\n
+c=a.charCodeAt();return\'\\\\u00\'+Math.floor(c/16).toString(16)+(c%16).toString(16);})+\'"\';}\n
+return\'"\'+str+\'"\';};}(jQuery));
+
+]]></string> </value>
+        </item>
+        <item>
+            <key> <string>precondition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>size</string> </key>
+            <value> <int>2259</int> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string></string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_jquery_plugin_json/bt/change_log

+2013-01-14 Kazuhiko
+* initial commit
\ No newline at end of file

bt5/erp5_jquery_plugin_json/bt/copyright_list

+2013 © Nexedi SA
\ No newline at end of file

bt5/erp5_jquery_plugin_json/bt/dependency_list

+erp5_jquery
\ No newline at end of file

bt5/erp5_jquery_plugin_json/bt/description

+This Business Template contains only static files of jquery-json Plugin 2.4.
+* https://code.google.com/p/jquery-json/
\ No newline at end of file

bt5/erp5_jquery_plugin_json/bt/license

+MIT
\ No newline at end of file

bt5/erp5_jquery_plugin_json/bt/maintainer_list

+kazuhiko
\ No newline at end of file

bt5/erp5_jquery_plugin_json/bt/revision

+1
\ No newline at end of file

bt5/erp5_jquery_plugin_json/bt/template_format_version

+1
\ No newline at end of file

bt5/erp5_jquery_plugin_json/bt/template_path_list

+portal_skins/erp5_jquery/jquery/plugin/json
+portal_skins/erp5_jquery/jquery/plugin/json/**
\ No newline at end of file

bt5/erp5_jquery_plugin_json/bt/title

+erp5_jquery_plugin_json
\ No newline at end of file

bt5/erp5_jquery_plugin_json/bt/version

+5.4.7
\ No newline at end of file

bt5/erp5_jquery_plugin_jstorage/bt/revision

-1
+2
\ No newline at end of file

bt5/erp5_jquery_plugin_renderjs/PathTemplateItem/portal_skins/erp5_jquery/jquery/plugin/renderjs/renderjs.min.js.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="File" module="OFS.Image"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_Cacheable__manager_id</string> </key>
+            <value> <string>http_cache</string> </value>
+        </item>
+        <item>
+            <key> <string>_EtagSupport__etag</string> </key>
+            <value> <string>ts58177449.44</string> </value>
+        </item>
+        <item>
+            <key> <string>__name__</string> </key>
+            <value> <string>renderjs.min.js</string> </value>
+        </item>
+        <item>
+            <key> <string>content_type</string> </key>
+            <value> <string>application/javascript</string> </value>
+        </item>
+        <item>
+            <key> <string>data</string> </key>
+            <value> <string encoding="cdata"><![CDATA[
+
+/*global console, require, $, localStorage, document */"use strict";var RENDERJS_ENABLE_IMPLICIT_GADGET_RENDERING=!0,RENDERJS_ENABLE_IMPLICIT_INTERACTION_BIND=!0;if(typeof console=="undefined"||typeof console.log=="undefined")console={},console.log=function(){};var RenderJs=function(){var is_ready=!1;return{init:function(){RENDERJS_ENABLE_IMPLICIT_GADGET_RENDERING&&RenderJs.bootstrap($("body"));if(RENDERJS_ENABLE_IMPLICIT_INTERACTION_BIND){var a=RenderJs.GadgetIndex.getRootGadget();a!==undefined&&RenderJs.bindReady(function(){$("div[data-gadget-connection]").each(function(a,b){RenderJs.InteractionGadget.bind($(b))})})}},bootstrap:function(a){var b,c;b=a.attr("id"),c=a.attr("data-gadget")!==undefined,RenderJs.setReady(!1),c&&b!==undefined&&RenderJs.loadGadget(a),RenderJs.loadRecursiveGadget(a)},loadRecursiveGadget:function(a){var b,c,d,e;b=a.find("[data-gadget]"),b.each(function(){c=$(this),d=c.attr("id"),e=new RenderJs.Gadget(d,c),RenderJs.GadgetIndex.registerGadget(e)}),b.each(function(){RenderJs.loadGadget($(this))})},setGadgetAndRecurse:function(a,b){a.append(b),RenderJs.loadRecursiveGadget(a)},loadGadget:function(a){var b,c,d,e,f,g,h,i,j;b=a.attr("data-gadget"),c=a.attr("id"),i=RenderJs.GadgetIndex.getGadgetById(c),i===undefined&&(i=new RenderJs.Gadget(c,a),RenderJs.GadgetIndex.registerGadget(i)),d=a.attr("data-gadget-property"),d!==undefined&&(d=$.parseJSON(d),$.each(d,function(a,b){i[a]=b})),b!==undefined&&b!==""?(e=a.attr("data-gadget-cacheable"),f=a.attr("data-gadget-cache-id"),e!==undefined&&f!==undefined&&(e=Boolean(parseInt(e,10))),e?(g=RenderJs.Cache.get(f,undefined),g===undefined||g===null?$.ajax({url:b,yourCustomData:{gadget_id:c,cache_id:f},success:function(b){f=this.yourCustomData.cache_id,c=this.yourCustomData.gadget_id,RenderJs.Cache.set(f,b),RenderJs.GadgetIndex.getGadgetById(c).setReady(),RenderJs.setGadgetAndRecurse(a,b),RenderJs.checkAndTriggerReady(),RenderJs.updateGadgetData(a)}}):(h=g,i.setReady(),this.setGadgetAndRecurse(a,h),this.checkAndTriggerReady(),RenderJs.updateGadgetData(a))):$.ajax({url:b,yourCustomData:{gadget_id:c},success:function(b){c=this.yourCustomData.gadget_id,RenderJs.GadgetIndex.getGadgetById(c).setReady(),RenderJs.setGadgetAndRecurse(a,b),RenderJs.checkAndTriggerReady(),RenderJs.updateGadgetData(a)}})):(j=RenderJs.updateGadgetData(a),j||i.setReady(),RenderJs.checkAndTriggerReady())},isReady:function(){return is_ready},setReady:function(a){is_ready=a},bindReady:function(a){$("body").one("ready",a)},checkAndTriggerReady:function(){var a;return a=RenderJs.GadgetIndex.isGadgetListLoaded(),a&&(RenderJs.isReady()||(RenderJs.GadgetIndex.getRootGadget().getDom().trigger("ready"),$("body").trigger("ready"),RenderJs.setReady(!0))),a},updateGadgetData:function(gadget){var data_source,data_handler;return data_source=gadget.attr("data-gadget-source"),data_handler=gadget.attr("data-gadget-handler"),data_source!==undefined&&data_source!==""?($.ajax({url:data_source,dataType:"json",yourCustomData:{data_handler:data_handler,gadget_id:gadget.attr("id")},success:function(result){var data_handler,gadget_id;data_handler=this.yourCustomData.data_handler,gadget_id=this.yourCustomData.gadget_id,data_handler!==undefined&&(eval(data_handler+"(result)"),gadget=RenderJs.GadgetIndex.getGadgetById(gadget_id),gadget.setReady(),RenderJs.checkAndTriggerReady())}}),!0):!1},addGadget:function(a,b,c,d,e){var f,g,h;return g=$("#"+a),g.empty(),f=[\'<div  id="\'+b+\'"\',\'data-gadget="\'+c+\'"\',\'data-gadget-handler="\'+d+\'" \',\'data-gadget-source="\'+e+\'"></div>\'].join("\\n"),g.append(f),h=g.find(".gadget"),RenderJs.bootstrap(g),h},Cache:function(){return{ROOT_CACHE_ID:"APP_CACHE",getCacheId:function(a){return this.ROOT_CACHE_ID+a},hasLocalStorage:function(){var a;a="localstorage_test_12345678";try{return localStorage.setItem(a,a),localStorage.removeItem(a),!0}catch(b){return!1}},get:function(a,b){return a=this.getCacheId(a),this.hasLocalStorage()?this.LocalStorageCachePlugin.get(a,b):this.NameSpaceStorageCachePlugin.get(a,b)},set:function(a,b){a=this.getCacheId(a),this.hasLocalStorage()?this.LocalStorageCachePlugin.set(a,b):this.NameSpaceStorageCachePlugin.set(a,b)},LocalStorageCachePlugin:function(){return{get:function(a,b){return a in localStorage?JSON.parse(localStorage.getItem(a)):b},set:function(a,b){localStorage.setItem(a,JSON.stringify(b))}}}(),NameSpaceStorageCachePlugin:function(){var a={};return{get:function(b,c){return a[b]},set:function(b,c){a[b]=c}}}()}}(),Gadget:function(a,b){this.id=a,this.dom=b,this.is_ready=!1,this.getId=function(){return this.id},this.getDom=function(){return this.dom},this.isReady=function(){return this.is_ready},this.setReady=function(){this.is_ready=!0},this.remove=function(){RenderJs.GadgetIndex.unregisterGadget(this),$(this.getDom()).remove()}},TabbularGadget:function(){return{toggleVisibility:function(a){$(".selected").addClass("not_selected"),$(".selected").removeClass("selected"),a.addClass("selected"),a.removeClass("not_selected")},addNewTabGadget:function(a,b,c,d,e){var f;f=RenderJs.addGadget(a,b,c,d,e)}}}(),GadgetIndex:function(){var a=[];return{getGadgetIdListFromDom:function(a){var b=[];return $.each(a.find("[data-gadget]"),function(a,c){b.push($(c).attr("id"))}),b},setGadgetList:function(b){a=b},getGadgetList:function(){return a},registerGadget:function(b){a.push(b)},unregisterGadget:function(b){var c=$.inArray(b,a);c!==-1&&a.splice(c,1)},getGadgetById:function(a){var b;return b=undefined,$(RenderJs.GadgetIndex.getGadgetList()).each(function(c,d){d.getId()===a&&(b=d)}),b},getRootGadget:function(){return this.getGadgetList()[0]},isGadgetListLoaded:function(){var a;return a=!0,$(this.getGadgetList()).each(function(b,c){c.isReady()===!1&&(a=!1)}),a}}}(),InteractionGadget:function(){return{bind:function(a){var b,c,d=function(a,b,c,d,e){var f=function(){RenderJs.GadgetIndex.getGadgetById(b)[a].apply(null,arguments),RenderJs.GadgetIndex.getGadgetById(d).dom.trigger(c)};return f},e=function(a,b){var c=function(){RenderJs.GadgetIndex.getGadgetById(a)[b].apply(null,arguments)};return c};b=a.attr("id"),c=a.attr("data-gadget-connection"),c=$.parseJSON(c),$.each(c,function(a,b){var c,f,g,h,i,j,k,l,m;c=b.source.split("."),f=c[0],g=c[1],h=RenderJs.GadgetIndex.getGadgetById(f),i=b.destination.split("."),j=i[0],k=i[1],l=RenderJs.GadgetIndex.getGadgetById(j),h.hasOwnProperty(g)?(m="original_"+g,h[m]=h[g],h[g]=d(m,f,g,j,k),l.dom.bind(g,e(j,k))):h.dom.bind(g,e(j,k))})}}}()}}();
+
+]]></string> </value>
+        </item>
+        <item>
+            <key> <string>precondition</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>size</string> </key>
+            <value> <int>6425</int> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>renderjs.min.js</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>