diff --git a/bt5/erp5_accounting_l10n_pl/CategoryTemplateItem/portal_categories/grade/etat.xml b/bt5/erp5_accounting_l10n_pl/CategoryTemplateItem/portal_categories/grade/etat.xml
index 51ab64cc2949f129a8eaa6b89d57a7b462eb5341..689ecd5ab7be0cffc61ad8081755a2039db75c12 100644
--- a/bt5/erp5_accounting_l10n_pl/CategoryTemplateItem/portal_categories/grade/etat.xml
+++ b/bt5/erp5_accounting_l10n_pl/CategoryTemplateItem/portal_categories/grade/etat.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.Category</string>
-          <string>Category</string>
-        </tuple>
-        <none/>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -19,27 +16,15 @@
             </value>
         </item>
         <item>
-            <key> <string>_count</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_mt_index</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>activity_code</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <none/>
             </value>
         </item>
         <item>
-            <key> <string>activity_code</string> </key>
+            <key> <string>aggregated_portal_type</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -88,12 +73,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>bic_code</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -130,107 +109,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>creation_date</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="DateTime" module="DateTime.DateTime"/>
-                </klass>
-                <tuple>
-                  <none/>
-                </tuple>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_aday</string> </key>
-                        <value> <string>Thu</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_amon</string> </key>
-                        <value> <string>Apr</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_d</string> </key>
-                        <value> <float>38453.650457</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_day</string> </key>
-                        <value> <int>13</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_dayoffset</string> </key>
-                        <value> <int>4</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_fday</string> </key>
-                        <value> <string>Thursday</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_fmon</string> </key>
-                        <value> <string>April</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_hour</string> </key>
-                        <value> <int>15</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_millis</string> </key>
-                        <value> <long>1144942599484</long> </value>
-                    </item>
-                    <item>
-                        <key> <string>_minute</string> </key>
-                        <value> <int>36</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_month</string> </key>
-                        <value> <int>4</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_nearsec</string> </key>
-                        <value> <float>39.0</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pday</string> </key>
-                        <value> <string>Thu.</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pm</string> </key>
-                        <value> <string>pm</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pmhour</string> </key>
-                        <value> <int>3</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pmon</string> </key>
-                        <value> <string>Apr.</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_second</string> </key>
-                        <value> <float>39.484</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_t</string> </key>
-                        <value> <float>1144942599.48</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_tz</string> </key>
-                        <value> <string>Universal</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_year</string> </key>
-                        <value> <int>2006</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>time</string> </key>
-                        <value> <float>0.650456990741</float> </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
         <item>
             <key> <string>criterion_property</string> </key>
             <value>
@@ -451,6 +329,12 @@
             <key> <string>priced_quantity</string> </key>
             <value> <float>1.0</float> </value>
         </item>
+        <item>
+            <key> <string>required_aggregated_portal_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>rid</string> </key>
             <value>
@@ -517,6 +401,18 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>start_date</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>stop_date</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>string_index</string> </key>
             <value>
@@ -626,44 +522,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_accounting_l10n_pl/CategoryTemplateItem/portal_categories/group/usk.xml b/bt5/erp5_accounting_l10n_pl/CategoryTemplateItem/portal_categories/group/usk.xml
index 38ca0dc8aded1204dc77114c472cda74ce53e8b3..d7b760f4e730936cab589e3f4dfb15b04e6dc4d3 100644
--- a/bt5/erp5_accounting_l10n_pl/CategoryTemplateItem/portal_categories/group/usk.xml
+++ b/bt5/erp5_accounting_l10n_pl/CategoryTemplateItem/portal_categories/group/usk.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.Category</string>
-          <string>Category</string>
-        </tuple>
-        <none/>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -19,27 +16,15 @@
             </value>
         </item>
         <item>
-            <key> <string>_count</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_mt_index</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>activity_code</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <none/>
             </value>
         </item>
         <item>
-            <key> <string>activity_code</string> </key>
+            <key> <string>aggregated_portal_type</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -88,12 +73,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>bic_code</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -130,107 +109,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>creation_date</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="DateTime" module="DateTime.DateTime"/>
-                </klass>
-                <tuple>
-                  <none/>
-                </tuple>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_aday</string> </key>
-                        <value> <string>Thu</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_amon</string> </key>
-                        <value> <string>Apr</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_d</string> </key>
-                        <value> <float>38453.6504572</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_day</string> </key>
-                        <value> <int>13</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_dayoffset</string> </key>
-                        <value> <int>4</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_fday</string> </key>
-                        <value> <string>Thursday</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_fmon</string> </key>
-                        <value> <string>April</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_hour</string> </key>
-                        <value> <int>15</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_millis</string> </key>
-                        <value> <long>1144942599498</long> </value>
-                    </item>
-                    <item>
-                        <key> <string>_minute</string> </key>
-                        <value> <int>36</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_month</string> </key>
-                        <value> <int>4</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_nearsec</string> </key>
-                        <value> <float>39.0</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pday</string> </key>
-                        <value> <string>Thu.</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pm</string> </key>
-                        <value> <string>pm</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pmhour</string> </key>
-                        <value> <int>3</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pmon</string> </key>
-                        <value> <string>Apr.</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_second</string> </key>
-                        <value> <float>39.498</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_t</string> </key>
-                        <value> <float>1144942599.5</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_tz</string> </key>
-                        <value> <string>Universal</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_year</string> </key>
-                        <value> <int>2006</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>time</string> </key>
-                        <value> <float>0.650457152777</float> </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
         <item>
             <key> <string>criterion_property</string> </key>
             <value>
@@ -451,6 +329,12 @@
             <key> <string>priced_quantity</string> </key>
             <value> <float>1.0</float> </value>
         </item>
+        <item>
+            <key> <string>required_aggregated_portal_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>rid</string> </key>
             <value>
@@ -517,6 +401,18 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>start_date</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>stop_date</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>string_index</string> </key>
             <value>
@@ -626,44 +522,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_accounting_l10n_pl/CategoryTemplateItem/portal_categories/marital_status/married.xml b/bt5/erp5_accounting_l10n_pl/CategoryTemplateItem/portal_categories/marital_status/married.xml
index cad668ff415bd7f368f8f9e4ac5f212f62f0d6c4..df618b513a6c64f863b03588a80a8dc881fc56f7 100644
--- a/bt5/erp5_accounting_l10n_pl/CategoryTemplateItem/portal_categories/marital_status/married.xml
+++ b/bt5/erp5_accounting_l10n_pl/CategoryTemplateItem/portal_categories/marital_status/married.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.Category</string>
-          <string>Category</string>
-        </tuple>
-        <none/>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -19,27 +16,15 @@
             </value>
         </item>
         <item>
-            <key> <string>_count</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_mt_index</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>activity_code</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <none/>
             </value>
         </item>
         <item>
-            <key> <string>activity_code</string> </key>
+            <key> <string>aggregated_portal_type</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -88,12 +73,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>bic_code</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -130,107 +109,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>creation_date</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="DateTime" module="DateTime.DateTime"/>
-                </klass>
-                <tuple>
-                  <none/>
-                </tuple>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_aday</string> </key>
-                        <value> <string>Thu</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_amon</string> </key>
-                        <value> <string>Apr</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_d</string> </key>
-                        <value> <float>38453.6504573</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_day</string> </key>
-                        <value> <int>13</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_dayoffset</string> </key>
-                        <value> <int>4</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_fday</string> </key>
-                        <value> <string>Thursday</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_fmon</string> </key>
-                        <value> <string>April</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_hour</string> </key>
-                        <value> <int>15</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_millis</string> </key>
-                        <value> <long>1144942599512</long> </value>
-                    </item>
-                    <item>
-                        <key> <string>_minute</string> </key>
-                        <value> <int>36</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_month</string> </key>
-                        <value> <int>4</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_nearsec</string> </key>
-                        <value> <float>39.0</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pday</string> </key>
-                        <value> <string>Thu.</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pm</string> </key>
-                        <value> <string>pm</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pmhour</string> </key>
-                        <value> <int>3</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pmon</string> </key>
-                        <value> <string>Apr.</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_second</string> </key>
-                        <value> <float>39.512</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_t</string> </key>
-                        <value> <float>1144942599.51</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_tz</string> </key>
-                        <value> <string>Universal</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_year</string> </key>
-                        <value> <int>2006</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>time</string> </key>
-                        <value> <float>0.650457314812</float> </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
         <item>
             <key> <string>criterion_property</string> </key>
             <value>
@@ -451,6 +329,12 @@
             <key> <string>priced_quantity</string> </key>
             <value> <float>1.0</float> </value>
         </item>
+        <item>
+            <key> <string>required_aggregated_portal_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>rid</string> </key>
             <value>
@@ -517,6 +401,18 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>start_date</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>stop_date</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>string_index</string> </key>
             <value>
@@ -626,44 +522,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_accounting_l10n_pl/CategoryTemplateItem/portal_categories/marital_status/single.xml b/bt5/erp5_accounting_l10n_pl/CategoryTemplateItem/portal_categories/marital_status/single.xml
index 659462ab69ffd07e7ec05d672c618dd18f3ba5c2..d3dc44c076e04a9f53645e91715170701577d318 100644
--- a/bt5/erp5_accounting_l10n_pl/CategoryTemplateItem/portal_categories/marital_status/single.xml
+++ b/bt5/erp5_accounting_l10n_pl/CategoryTemplateItem/portal_categories/marital_status/single.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.Category</string>
-          <string>Category</string>
-        </tuple>
-        <none/>
+        <global name="Category" module="Products.ERP5Type.Document.Category"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -19,27 +16,15 @@
             </value>
         </item>
         <item>
-            <key> <string>_count</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_mt_index</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_tree</string> </key>
+            <key> <string>activity_code</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+              <none/>
             </value>
         </item>
         <item>
-            <key> <string>activity_code</string> </key>
+            <key> <string>aggregated_portal_type</string> </key>
             <value>
-              <none/>
+              <tuple/>
             </value>
         </item>
         <item>
@@ -88,12 +73,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>bic_code</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
         <item>
             <key> <string>categories</string> </key>
             <value>
@@ -130,107 +109,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>creation_date</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="DateTime" module="DateTime.DateTime"/>
-                </klass>
-                <tuple>
-                  <none/>
-                </tuple>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_aday</string> </key>
-                        <value> <string>Thu</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_amon</string> </key>
-                        <value> <string>Apr</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_d</string> </key>
-                        <value> <float>38453.6504575</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_day</string> </key>
-                        <value> <int>13</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_dayoffset</string> </key>
-                        <value> <int>4</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_fday</string> </key>
-                        <value> <string>Thursday</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_fmon</string> </key>
-                        <value> <string>April</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_hour</string> </key>
-                        <value> <int>15</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_millis</string> </key>
-                        <value> <long>1144942599526</long> </value>
-                    </item>
-                    <item>
-                        <key> <string>_minute</string> </key>
-                        <value> <int>36</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_month</string> </key>
-                        <value> <int>4</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_nearsec</string> </key>
-                        <value> <float>39.0</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pday</string> </key>
-                        <value> <string>Thu.</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pm</string> </key>
-                        <value> <string>pm</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pmhour</string> </key>
-                        <value> <int>3</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>_pmon</string> </key>
-                        <value> <string>Apr.</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_second</string> </key>
-                        <value> <float>39.526</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_t</string> </key>
-                        <value> <float>1144942599.53</float> </value>
-                    </item>
-                    <item>
-                        <key> <string>_tz</string> </key>
-                        <value> <string>Universal</string> </value>
-                    </item>
-                    <item>
-                        <key> <string>_year</string> </key>
-                        <value> <int>2006</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>time</string> </key>
-                        <value> <float>0.650457476855</float> </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
         <item>
             <key> <string>criterion_property</string> </key>
             <value>
@@ -451,6 +329,12 @@
             <key> <string>priced_quantity</string> </key>
             <value> <float>1.0</float> </value>
         </item>
+        <item>
+            <key> <string>required_aggregated_portal_type</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>rid</string> </key>
             <value>
@@ -517,6 +401,18 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>start_date</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>stop_date</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
         <item>
             <key> <string>string_index</string> </key>
             <value>
@@ -626,44 +522,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_accounting_l10n_pl/CategoryTemplateItem/portal_categories/tax_office.xml b/bt5/erp5_accounting_l10n_pl/CategoryTemplateItem/portal_categories/tax_office.xml
index 1582bebded23635d12703a79740fcec192e76f31..7b6fb205f50cdd8816af5967c67a13470cbeb3df 100644
--- a/bt5/erp5_accounting_l10n_pl/CategoryTemplateItem/portal_categories/tax_office.xml
+++ b/bt5/erp5_accounting_l10n_pl/CategoryTemplateItem/portal_categories/tax_office.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Type.Document.BaseCategory</string>
-          <string>BaseCategory</string>
-        </tuple>
-        <none/>
+        <global name="BaseCategory" module="Products.ERP5Type.Document.BaseCategory"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -18,24 +15,6 @@
               <none/>
             </value>
         </item>
-        <item>
-            <key> <string>_count</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_mt_index</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
-            </value>
-        </item>
-        <item>
-            <key> <string>_tree</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>acquisition_append_value</string> </key>
             <value> <int>0</int> </value>
@@ -189,44 +168,4 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.Length</string>
-          <string>Length</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle> <int>0</int> </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
-    <pickle>
-      <tuple>
-        <tuple>
-          <string>BTrees.OOBTree</string>
-          <string>OOBTree</string>
-        </tuple>
-        <none/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <none/>
-    </pickle>
-  </record>
 </ZopeData>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl.xml
index f4c742db4a7276635d334c461f41adec0ed507c8..7004fd6343a16ec9868eec49ee721d577a98017b 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Folder</string>
-          <string>Folder</string>
-        </tuple>
-        <none/>
+        <global name="Folder" module="OFS.Folder"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_getJournalAccountingTransactionPolishAccountingList.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_getJournalAccountingTransactionPolishAccountingList.xml
index 938c65bc24909f2377dbf730a6b151e03b610d25..809d7736fa26013c67956ec414a1c5027c356fdd 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_getJournalAccountingTransactionPolishAccountingList.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_getJournalAccountingTransactionPolishAccountingList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_profitandloss_pdf_template.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_profitandloss_pdf_template.xml
index aba5409ea8d56076cbbabf5ff7e32b520d94c5a2..393cc72772898a272aa8cbbc684edb3b44c3caf5 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_profitandloss_pdf_template.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_profitandloss_pdf_template.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewBalanceSheetAsOO.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewBalanceSheetAsOO.xml
index e3a5460b47bc9b5180fd7936a05ea6ccd391cdeb..d96b717ef901e45a4cc78b009b1fa65c691f7f81 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewBalanceSheetAsOO.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewBalanceSheetAsOO.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5OOo.OOoTemplate</string>
-          <string>OOoTemplate</string>
-        </tuple>
-        <none/>
+        <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewBalanceSheetDialog.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewBalanceSheetDialog.xml
index 64f7000cab00a30744bf0e06958fb041c9a529ca..381d2c7144a7e6a77b94d0bf30390c0948e44a70 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewBalanceSheetDialog.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewBalanceSheetDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewFiscalReportDialog.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewFiscalReportDialog.xml
index 4535ef1f6cbcf318cac2c1534384497260eca910..03c955f89f9bc4bf2b01e749a5f46ae9ca990826 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewFiscalReportDialog.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewFiscalReportDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewFiscalReportDialog/my_carryforward.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewFiscalReportDialog/my_carryforward.xml
index 8dbe618a1a1e579bde2f2232926347790a57375f..461cc5f2a66155f73b10a9377be4a94a0a9df2eb 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewFiscalReportDialog/my_carryforward.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewFiscalReportDialog/my_carryforward.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>FloatField</string>
-        </tuple>
-        <none/>
+        <global name="FloatField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewJournalAsOO.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewJournalAsOO.xml
index 5a948af1f2a85ede6f0b4aa57ec4010fbbac4df7..15ac58b54bcbaf1bba8b726ad5ceb1ffd524c943 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewJournalAsOO.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewJournalAsOO.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5OOo.OOoTemplate</string>
-          <string>OOoTemplate</string>
-        </tuple>
-        <none/>
+        <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewJournalDialogPolishAccounting.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewJournalDialogPolishAccounting.xml
index 635ed1bc7a345e4414e94c8d700614ce8e7254b0..e3ee537105793dc77f366b2fd41de3c4ea8e1e7f 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewJournalDialogPolishAccounting.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewJournalDialogPolishAccounting.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewProfitAndLoss.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewProfitAndLoss.xml
index dd5b6e863ce683edada7b4efbf11525fa861f28e..892a914f55968a211564940d230ccc70e37f9988 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewProfitAndLoss.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewProfitAndLoss.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewProfitAndLossAsOO.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewProfitAndLossAsOO.xml
index 976eaccd160df9364b3dd9078c6ba96b900dcdac..7ac7cb6f29bd836e0b77656bd2c81d8ec75684ad 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewProfitAndLossAsOO.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewProfitAndLossAsOO.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5OOo.OOoTemplate</string>
-          <string>OOoTemplate</string>
-        </tuple>
-        <none/>
+        <global name="OOoTemplate" module="Products.ERP5OOo.OOoTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewProfitAndLossReportDialog.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewProfitAndLossReportDialog.xml
index 67c9105427e7d54e8212a743a7f0f5d65b4efa9e..49c71657d790765d55fa5daf18842a300ccb1a6b 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewProfitAndLossReportDialog.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransactionModule_viewProfitAndLossReportDialog.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransaction_searchInvoiceTransactionLines.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransaction_searchInvoiceTransactionLines.xml
index 22aac2e31855eca2a529e749463624820c7d5dd8..341f6aa02bcb6243f773e6b680013ba65810e127 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransaction_searchInvoiceTransactionLines.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/AccountingTransaction_searchInvoiceTransactionLines.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/BalanceSheet_calculateCells.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/BalanceSheet_calculateCells.xml
index cc6822b87f3e142982c372feaaf849b4eb11a506..607f7718587f8cd42c548d42058605f56abfa6c1 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/BalanceSheet_calculateCells.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/BalanceSheet_calculateCells.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/BankAccount_getAccountingTransactionList.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/BankAccount_getAccountingTransactionList.xml
index afc80cc3e3e671a5dc1f133e98330a5b19e36b97..7ea45c603a977ab7982d65874154b01621fd0686 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/BankAccount_getAccountingTransactionList.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/BankAccount_getAccountingTransactionList.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -179,6 +176,7 @@ return new_result\n
                             <string>_getiter_</string>
                             <string>l</string>
                             <string>o</string>
+                            <string>_inplacevar_</string>
                             <string>None</string>
                             <string>c</string>
                           </tuple>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReportCell_calcBalance.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReportCell_calcBalance.xml
index 9d7cf1b6b8b32e3e793b2b3297092ced720c7f2f..52075bd443d3e8dedebe50372d1b8799ee235351 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReportCell_calcBalance.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReportCell_calcBalance.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReportCell_doGetInventory.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReportCell_doGetInventory.xml
index c43714465691a2b15972a413cfc850eb6f5df96f..56a28748b5a187cf31420f743ae36051609db5a1 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReportCell_doGetInventory.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReportCell_doGetInventory.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -168,6 +165,7 @@ return float ("%.2f"%(sum))\n
                             <string>account</string>
                             <string>_apply_</string>
                             <string>val</string>
+                            <string>_inplacevar_</string>
                             <string>KeyError</string>
                             <string>AttributeError</string>
                             <string>float</string>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReportCell_getWojewodztwo.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReportCell_getWojewodztwo.xml
index 59d509e06817c624564f9f810f4ed5c4d771e9c9..15ab225f20d72086e1f0c16b5d5b8813a2f399fa 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReportCell_getWojewodztwo.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReportCell_getWojewodztwo.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReport_doReport.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReport_doReport.xml
index 8af79360f916136878857dc1bca1d91acd6d89e7..ea9fd8717c396071d80f799004c25a5a4578c379 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReport_doReport.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReport_doReport.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReport_vat7.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReport_vat7.xml
index 3bd4d60a20ac5e53dc204b7d06e3739b0dc77d80..c004bbaef73de39923a2839838b4534a1fa70284 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReport_vat7.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/FiscalReport_vat7.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.PDFForm</string>
-          <string>PDFForm</string>
-        </tuple>
-        <none/>
+        <global name="PDFForm" module="Products.ERP5Form.PDFForm"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -2038,8 +2035,7 @@ cds9yazb4m03Tms=</string> </value>
         </item>
       </dictionary>
     </pickle>
-  </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
+  </record>А  <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
       <tuple>
         <tuple>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails.xml
index bc5bac1eda57bc85bc37de0ed9926c97de4d14b0..ca6f28c702ac13ba0ef4f953c3bafdbb4c2b42bc 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/label.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/label.xml
index 3d81a0593eb5f2e5767f816bb3f4cb0ce316fd57..6231bf5046d508b55b9b6fbb900d6e4ce001d533 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/label.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/label.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_gmina.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_gmina.xml
index 9eaa1ba0c905d1b76aee9567268fb58bd06a0147..969d18c08708fbf5b78eb706a50e61bf7a2af9d4 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_gmina.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_gmina.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_nr_domu.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_nr_domu.xml
index 924802bf942bbb73846e64b223baa1d2258dd4cd..1dde4d48169df18c176c5fb450def1832eb8d89c 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_nr_domu.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_nr_domu.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_nr_lokalu.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_nr_lokalu.xml
index 56bf121a51f97f3f023a3bce5f08e888e4a6d833..e79a0e3947b78e553fd130918ba4f759e6730b8b 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_nr_lokalu.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_nr_lokalu.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_poczta.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_poczta.xml
index 97f280ec4ad71f61777172693e3b4c0c305c124a..6a19b8b927391ca6368c0b777239e930c65dac34 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_poczta.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_poczta.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_powiat.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_powiat.xml
index 938d96b4584f897e28ae29b700105acda5df95f0..ef3596fb81b31dc8c6d5593360097458b797676c 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_powiat.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_powiat.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_ulica.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_ulica.xml
index c3ff5cd659edd6ae17538f065dcfe8654d86c371..ea48e8cc1c18588e1030c9ceac038ffc3b9bcba4 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_ulica.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GeographicAddress_viewPolishTaxDetails/my_ulica.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>StringField</string>
-        </tuple>
-        <none/>
+        <global name="StringField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GroupPresencePeriod_setPolishHolidayExceptions.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GroupPresencePeriod_setPolishHolidayExceptions.xml
index 38dea47b73db5b85b4749213d55527e73f271a8e..1a345bba554107b1e67e4e27a25e26ce5117b6d9 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GroupPresencePeriod_setPolishHolidayExceptions.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/GroupPresencePeriod_setPolishHolidayExceptions.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/OrganisationModule_getTaxOffices.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/OrganisationModule_getTaxOffices.xml
index 8a176d134f3227e0512b298b57469b964f3ca841..41dd231265a498cc2ebc525e9e31d5b64ea63eb8 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/OrganisationModule_getTaxOffices.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/OrganisationModule_getTaxOffices.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/Organisation_viewPolishTaxDetails.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/Organisation_viewPolishTaxDetails.xml
index e1543c44b60044551fd78d0eee897de9fafd3798..e3022a96186c576eb29c6d705b4d3f096fc63401 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/Organisation_viewPolishTaxDetails.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/Organisation_viewPolishTaxDetails.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/Organisation_viewPolishTaxDetails/my_financial_year_stop_date.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/Organisation_viewPolishTaxDetails/my_financial_year_stop_date.xml
index 09872ff1c14476d6485c7fde309e70d9b6ed7a5d..eaa9e5a215fbbf8f9b4916fddfd39f76be2aff90 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/Organisation_viewPolishTaxDetails/my_financial_year_stop_date.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/Organisation_viewPolishTaxDetails/my_financial_year_stop_date.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>DateTimeField</string>
-        </tuple>
-        <none/>
+        <global name="DateTimeField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/Organisation_viewPolishTaxDetails/my_tax_office.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/Organisation_viewPolishTaxDetails/my_tax_office.xml
index 39c91b5c055da143367c17efe0102ed5d62e586b..9a9d935d9b7f076b788672a5677c0dd63103dd4a 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/Organisation_viewPolishTaxDetails/my_tax_office.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/Organisation_viewPolishTaxDetails/my_tax_office.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.Formulator.StandardFields</string>
-          <string>ListField</string>
-        </tuple>
-        <none/>
+        <global name="ListField" module="Products.Formulator.StandardFields"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/PaymentTransaction_view.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/PaymentTransaction_view.xml
index be09419f3409a0aabc3cbf74bfa376f74776c29d..cc34ce021c95278517926930f659c1f61b4ef26b 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/PaymentTransaction_view.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/PaymentTransaction_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/ProfitAndLoss_calculateCells.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/ProfitAndLoss_calculateCells.xml
index 54c542f74ef605a712a77a2a815a29b50d563dea..80241edf9b8cdb982797879a80d60238d044890f 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/ProfitAndLoss_calculateCells.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/ProfitAndLoss_calculateCells.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/PurchaseInvoiceTransaction_view.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/PurchaseInvoiceTransaction_view.xml
index 939cca29dc0477287c5d901efaa66d93681a9ca8..e20ee2d51b4e6dd1f74df19bf50a6d35ada6c82e 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/PurchaseInvoiceTransaction_view.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/PurchaseInvoiceTransaction_view.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/SaleInvoiceTransaction_viewAccounting.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/SaleInvoiceTransaction_viewAccounting.xml
index eea964c9ed6c2a1196c402e1ad6a085ce41c132d..c65d2eefda0ee4e2d3a49db091d9e427f39053de 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/SaleInvoiceTransaction_viewAccounting.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/SaleInvoiceTransaction_viewAccounting.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.Form</string>
-          <string>ERP5Form</string>
-        </tuple>
-        <none/>
+        <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/SaleInvoiceTransaction_viewAsHTML.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/SaleInvoiceTransaction_viewAsHTML.xml
index 4174718b696786208a95398ca540bcecf9a8da01..5b554f0f4de42a46580a0f725c1fd8723ed93ca0 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/SaleInvoiceTransaction_viewAsHTML.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/SaleInvoiceTransaction_viewAsHTML.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/getBalance.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/getBalance.xml
index 3cb0334747a2af4b0349d68ff216876235dbd70b..c03b787c53126589580fc6e96ef8415cf6b80238 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/getBalance.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/getBalance.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/getCredit.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/getCredit.xml
index 47f0e70660ec0bc5410e478f6a94981517629e24..e9fa12db47aa80bcdaaa6ae757c36ae5d70894f2 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/getCredit.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/getCredit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/getDebit.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/getDebit.xml
index 2fd31e679639c9b9e0ca0f04ec19bddcd7c896e7..ce284e1b119fc1fd0b12c6266ad04f6f4ac37f34 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/getDebit.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/getDebit.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/ooo_template_spreadsheet.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/ooo_template_spreadsheet.xml
index 49d8892afba348a0f3ef78a824ba31a74d984142..41ef9afa82dbee775936ed714ec7af4298eac6e6 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/ooo_template_spreadsheet.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/ooo_template_spreadsheet.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>OFS.Image</string>
-          <string>File</string>
-        </tuple>
-        <none/>
+        <global name="File" module="OFS.Image"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/shortAccountNumberToFullGapCategory.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/shortAccountNumberToFullGapCategory.xml
index b74ce20f262243ec7943c35fc98f669a0ccfe5eb..e4c712594521a8a0809422cf337a828c0893d650 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/shortAccountNumberToFullGapCategory.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/shortAccountNumberToFullGapCategory.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/simpleTranslate.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/simpleTranslate.xml
index 83ad5ae2f8d19c21118bda7c84d4722510474325..72f936a3900fbd51d1efd9d29fad63112f6acc52 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/simpleTranslate.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/simpleTranslate.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
diff --git a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/test_FiscalReportCell_doGetInventory.xml b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/test_FiscalReportCell_doGetInventory.xml
index 59049e785d3ac2848ed71bd04ac941c4606df710..789cac15316498c5cec86bbbb49c89f900f22938 100644
--- a/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/test_FiscalReportCell_doGetInventory.xml
+++ b/bt5/erp5_accounting_l10n_pl/SkinTemplateItem/portal_skins/erp5_accounting_l10n_pl/test_FiscalReportCell_doGetInventory.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -178,6 +175,7 @@ return float ("%.2f"%(sum))\n
                             <string>None</string>
                             <string>_apply_</string>
                             <string>val</string>
+                            <string>_inplacevar_</string>
                             <string>float</string>
                           </tuple>
                         </value>
diff --git a/bt5/erp5_accounting_l10n_pl/bt/revision b/bt5/erp5_accounting_l10n_pl/bt/revision
index b74e882ae378d7e5aae630f48c20dd1e40186d98..3e932fe8f188bb6dbcb02afe1306fa6e0b90357b 100644
--- a/bt5/erp5_accounting_l10n_pl/bt/revision
+++ b/bt5/erp5_accounting_l10n_pl/bt/revision
@@ -1 +1 @@
-31
\ No newline at end of file
+34
\ No newline at end of file