* OrderLine_viewFieldLibrary, PurchaseOrder_view: hide some fields if the line has sublines

* PurchaseOrder_viewODTPrintDialog: add your_format field, using oood for conversion
* PurchaseOrder_view: add edit_order to form
* PurchaseOrder_getODTDataDict, PurchaseOrder_getODTStyleSheet, PurchaseOrder_viewAsODT: add (simple) support for hierarchical orders

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20040 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_quantity_unit.xml

@@ -15,6 +15,7 @@
               <list>
                 <string>title</string>
                 <string>items</string>
+                <string>enabled</string>
               </list>
             </value>
         </item>
@@ -56,6 +57,12 @@
             <key> <string>tales</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key>                 <string>enabled</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string></string> </value>
@@ -67,7 +74,7 @@
                 <item>
                     <key>                 <string>items</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -85,6 +92,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key>                 <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_category</string> </value>
@@ -114,6 +125,22 @@
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string>not: here/hasLineContent</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
         <global name="TALESMethod" module="Products.Formulator.TALESField"/>

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_resource_title.xml

@@ -16,6 +16,7 @@
                 <string>title</string>
                 <string>portal_type</string>
                 <string>items</string>
+                <string>enabled</string>
               </list>
             </value>
         </item>
@@ -57,6 +58,12 @@
             <key> <string>tales</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key>                 <string>enabled</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string></string> </value>
@@ -68,13 +75,13 @@
                 <item>
                     <key>                 <string>items</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
                 <item>
                     <key>                 <string>portal_type</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -92,6 +99,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key>                 <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_relation_field</string> </value>
@@ -142,12 +153,28 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>REQUEST/relation_item_list</string> </value>
+            <value> <string>not: here/hasLineContent</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <tuple>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string>REQUEST/relation_item_list</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
       <tuple>
         <global name="TALESMethod" module="Products.Formulator.TALESField"/>

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/OrderLine_viewFieldLibrary/my_source_trade_title_list.xml

@@ -15,6 +15,7 @@
               <list>
                 <string>title</string>
                 <string>portal_type</string>
+                <string>enabled</string>
               </list>
             </value>
         </item>
@@ -56,6 +57,12 @@
             <key> <string>tales</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key>                 <string>enabled</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string></string> </value>
@@ -64,10 +71,18 @@
                     <key> <string>form_id</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key>                 <string>portal_type</string> </key>
+                    <value> <string></string> </value>
+                </item>
                 <item>
                     <key> <string>target</string> </key>
                     <value> <string></string> </value>
                 </item>
+                <item>
+                    <key>                 <string>title</string> </key>
+                    <value> <string></string> </value>
+                </item>
               </dictionary>
             </value>
         </item>
@@ -75,6 +90,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key>                 <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
                 <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_multi_relation_field</string> </value>
@@ -84,7 +103,7 @@
                     <value> <string>Base_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>portal_type</string> </key>
+                    <key> <string>portal_type</string> </key>
                     <value>
                       <list>
                         <tuple>
@@ -99,7 +118,7 @@
                     <value> <string>Click to edit the target</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>title</string> </key>
+                    <key> <string>title</string> </key>
                     <value> <string>Original Supplier or Worker</string> </value>
                 </item>
               </dictionary>
@@ -108,4 +127,20 @@
       </dictionary>
     </pickle>
   </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string>not: here/hasLineContent</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_getODTDataDict.xml

@@ -150,22 +150,45 @@ line_list = []\n
 total_price = 0.0\n
 total_vat = 0.0\n
 \n
-for line in context.getMovementList(sort_on=\'int_index\'):\n
+def getSubLineList(obj):\n
+  sub_list = []\n
+  for x in obj.searchFolder(portal_type=context.getPortalOrderMovementTypeList(), sort_on=\'int_index\'):\n
+    sub_list.append(x)\n
+    sub_list.extend(getSubLineList(x))\n
+  return sub_list\n
+\n
+for line in getSubLineList(context):\n
   prod_desc = line.getResource() is not None and line.getResourceValue().getDescription() or \'\'\n
   desc = getProductAndLineDesc(prod_desc, line.getDescription())\n
-  line_dict = {\n
-    \'index\': line.getIntIndex(),\n
-    \'source_reference\': getSourceReference(line),\n
-    \'reference\': line.getResource() is not None and line.getResourceValue().getReference() or \'\',\n
-    \'description\': desc,\n
-    \'total_quantity\': line.getTotalQuantity() or \'\',\n
-    \'quantity_unit\': line.getQuantityUnitTitle() or (line.getResource() and line.getResourceValue().getQuantityUnitTitle()) or \'\',\n
-    \'stop_date\': line.getStopDate() or \'\',\n
-    \'base_price\': line.getPrice() or \'\',\n
-    \'total_price\': line.getTotalPrice() or \'\',\n
-  }\n
-  total_price += line.getTotalPrice() or 0.0\n
-  total_vat += getLineVat(line)\n
+  if line.hasLineContent() or line.hasCellContent():\n
+    # summary\n
+    line_dict = {\n
+      \'style_name\': \'Item_20_Table_20_Title\',\n
+      \'index\': line.getIntIndex(),\n
+      \'source_reference\': getSourceReference(line),\n
+      \'reference\': line.getResource() is not None and line.getResourceValue().getReference() or \'\',\n
+      \'description\': desc,\n
+      \'total_quantity\': \'\',\n
+      \'quantity_unit\': \'\',\n
+      \'stop_date\': \'\',\n
+      \'base_price\': \'\',\n
+      \'total_price\': \'\',\n
+    }\n
+  else:\n
+    line_dict = {\n
+      \'style_name\': \'Table_20_Contents\',\n
+      \'index\': line.getIntIndex(),\n
+      \'source_reference\': getSourceReference(line),\n
+      \'reference\': line.getResource() is not None and line.getResourceValue().getReference() or \'\',\n
+      \'description\': desc,\n
+      \'total_quantity\': line.getTotalQuantity() or \'\',\n
+      \'quantity_unit\': line.getQuantityUnitTitle() or (line.getResource() and line.getResourceValue().getQuantityUnitTitle()) or \'\',\n
+      \'stop_date\': line.getStopDate() or \'\',\n
+      \'base_price\': line.getPrice() or \'\',\n
+      \'total_price\': line.getTotalPrice() or \'\',\n
+    }\n
+    total_price += line.getTotalPrice() or 0.0\n
+    total_vat += getLineVat(line)\n
   line_list.append(line_dict.copy())\n
 \n
 data_dict = {\n
@@ -190,15 +213,15 @@ data_dict = {\n
       context.getDestination() and context.getDestinationValue().getFaxText() or \'\'),\n
   \'destination_email\': getEmail(context.getDestination() and context.getDestinationValue().getEmailText() or \'\'),\n
 \n
-  \'destination_section_title\': context.getDestinationSectionTitle() or \'\',\n
-  \'destination_section_address\': getOneLineAddress(\n
+  \'destination_section_title\': unicode(context.getDestinationSectionTitle() or \'\', \'utf8\'),\n
+  \'destination_section_address\': unicode(getOneLineAddress(\n
       context.getDestinationSection() and context.getDestinationSectionValue().getDefaultAddressText() or \'\',\n
-      context.getDestinationSection() and context.getDestinationSectionValue().getRegionTitle() or \'\'),\n
-  \'destination_section_telfax\': getPhoneAndFax(\n
+      context.getDestinationSection() and context.getDestinationSectionValue().getRegionTitle() or \'\'), \'utf8\'),\n
+  \'destination_section_telfax\': unicode(getPhoneAndFax(\n
       context.getDestinationSection() and context.getDestinationSectionValue().getTelephoneText() or \'\',\n
-      context.getDestinationSection() and context.getDestinationSectionValue().getTelephoneText() or \'\'),\n
-  \'destination_section_email\': getEmail(context.getDestinationSection() and context.getDestinationSectionValue().getEmailText() or \'\'),\n
-  \'destination_section_vatid\': getVatId(context.getDestinationSection() and context.getDestinationSectionValue().getVatCode() or \'\'),\n
+      context.getDestinationSection() and context.getDestinationSectionValue().getTelephoneText() or \'\'), \'utf8\'),\n
+  \'destination_section_email\': unicode(getEmail(context.getDestinationSection() and context.getDestinationSectionValue().getEmailText() or \'\'), \'utf8\'),\n
+  \'destination_section_vatid\': unicode(getVatId(context.getDestinationSection() and context.getDestinationSectionValue().getVatCode() or \'\'), \'utf8\'),\n
 \n
   \'destination_decision_title\': context.getDestinationDecisionTitle() or \'\',\n
   \'destination_decision_telfax\': getPhoneAndFax(context.getDestinationDecision() and context.getDestinationDecisionValue().getTelephoneText() or \'\',\n
@@ -284,6 +307,7 @@ return data_dict\n
                             <string>line_list</string>
                             <string>total_price</string>
                             <string>total_vat</string>
+                            <string>getSubLineList</string>
                             <string>_getiter_</string>
                             <string>line</string>
                             <string>None</string>
@@ -291,6 +315,7 @@ return data_dict\n
                             <string>desc</string>
                             <string>line_dict</string>
                             <string>_inplacevar_</string>
+                            <string>unicode</string>
                             <string>data_dict</string>
                           </tuple>
                         </value>

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_getODTStyleSheet.xml

@@ -11,7 +11,7 @@
       <dictionary>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts01894202.4</string> </value>
+            <value> <string>ts05763728.32</string> </value>
         </item>
         <item>
             <key> <string>__ac_local_roles__</string> </key>
@@ -31,233 +31,236 @@
         </item>
         <item>
             <key> <string>content_type</string> </key>
-            <value> <string>application/vnd.oasis.opendocument.text</string> </value>
+            <value> <string>application/octet-stream</string> </value>
         </item>
         <item>
             <key> <string>data</string> </key>
-            <value> <string encoding="base64">UEsDBBQAAAAAAKSbQThexjIMJwAAACcAAAAIAAAAbWltZXR5cGVhcHBsaWNhdGlvbi92bmQub2Fz
-aXMub3BlbmRvY3VtZW50LnRleHRQSwMEFAAAAAAApJtBOAAAAAAAAAAAAAAAABoAAABDb25maWd1
-cmF0aW9uczIvc3RhdHVzYmFyL1BLAwQUAAgACACkm0E4AAAAAAAAAAAAAAAAJwAAAENvbmZpZ3Vy
+            <value> <string encoding="base64">UEsDBBQAAAAAALpycThexjIMJwAAACcAAAAIAAAAbWltZXR5cGVhcHBsaWNhdGlvbi92bmQub2Fz
+aXMub3BlbmRvY3VtZW50LnRleHRQSwMEFAAAAAAAunJxOAAAAAAAAAAAAAAAABoAAABDb25maWd1
+cmF0aW9uczIvc3RhdHVzYmFyL1BLAwQUAAgACAC6cnE4AAAAAAAAAAAAAAAAJwAAAENvbmZpZ3Vy
 YXRpb25zMi9hY2NlbGVyYXRvci9jdXJyZW50LnhtbAMAUEsHCAAAAAACAAAAAAAAAFBLAwQUAAAA
-AACkm0E4AAAAAAAAAAAAAAAAGAAAAENvbmZpZ3VyYXRpb25zMi9mbG9hdGVyL1BLAwQUAAAAAACk
-m0E4AAAAAAAAAAAAAAAAGgAAAENvbmZpZ3VyYXRpb25zMi9wb3B1cG1lbnUvUEsDBBQAAAAAAKSb
-QTgAAAAAAAAAAAAAAAAcAAAAQ29uZmlndXJhdGlvbnMyL3Byb2dyZXNzYmFyL1BLAwQUAAAAAACk
-m0E4AAAAAAAAAAAAAAAAGAAAAENvbmZpZ3VyYXRpb25zMi9tZW51YmFyL1BLAwQUAAAAAACkm0E4
-AAAAAAAAAAAAAAAAGAAAAENvbmZpZ3VyYXRpb25zMi90b29sYmFyL1BLAwQUAAAAAACkm0E4AAAA
-AAAAAAAAAAAAHwAAAENvbmZpZ3VyYXRpb25zMi9pbWFnZXMvQml0bWFwcy9QSwMEFAAIAAgApJtB
-OAAAAAAAAAAAAAAAAAsAAABjb250ZW50LnhtbO1cW3OcOBZ+319B9dZu7WwNNJe+b+wpO3YmqUoy
-3sRJ7T51yaBuMwOIIOF2769fCeh7QyMhbOxhHjxBOkd856ojIfWbXx59T3mAEXZRcNYxNL2jwMBG
-jhvMzzrfbt+po84v5395g2Yz14YTB9mxDwOi2igg9P8K5Q7wJO0968RRMEEAu3gSAB/iCbEnKITB
-imuyTT1J3pW2YLL0SrMnxNvcBD6SssyMdocX3JV/c0K8ze1EYFGWmdFSpW6zz1BZ5kfsqTNEte6H
-gLh7KB49N/jjrHNPSDjpdheLhbawNBTNu8Z4PO4mvWvA9poujCMvoXLsLvQgexnuGprRXdH6kICy
-+BjtNqQg9u9gVFo1gIADq+KHeWmPeJjnqMa+B1Fp30iId81rOeXNaznbvD4g9zk2GXU/0c7kz6eP
-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</string> </value>
+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</string> </value>
         </item>
         <item>
             <key> <string>precondition</string> </key>
@@ -265,7 +268,7 @@ TkYvbWFuaWZlc3QueG1sUEsFBgAAAAAPAA8A7gMAAI8tAAAAAA==</string> </value>
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <long>12691</long> </value>
+            <value> <long>12878</long> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view.xml

@@ -50,6 +50,15 @@
             <key> <string>description</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>edit_order</string> </key>
+            <value>
+              <list>
+                <string>title</string>
+                <string>reference</string>
+              </list>
+            </value>
+        </item>
         <item>
             <key> <string>encoding</string> </key>
             <value> <string>UTF-8</string> </value>

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_view/listbox_quantity_unit.xml

@@ -20,6 +20,7 @@
             <value>
               <list>
                 <string>items</string>
+                <string>enabled</string>
               </list>
             </value>
         </item>
@@ -61,6 +62,12 @@
             <key> <string>tales</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key>                 <string>enabled</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
                 <item>
                     <key> <string>extra_context</string> </key>
                     <value> <string></string> </value>
@@ -76,7 +83,7 @@
                 <item>
                     <key>                 <string>items</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
                 <item>
@@ -90,6 +97,10 @@
             <key> <string>values</string> </key>
             <value>
               <dictionary>
+                <item>
+                    <key>                 <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
                 <item>
                     <key> <string>extra_context</string> </key>
                     <value>
@@ -105,7 +116,7 @@
                     <value> <string>OrderLine_viewFieldLibrary</string> </value>
                 </item>
                 <item>
-                    <key>                 <string>items</string> </key>
+                    <key> <string>items</string> </key>
                     <value>
                       <list/>
                     </value>
@@ -117,6 +128,22 @@
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string>not: cell/hasLineContent</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <tuple>
         <global name="TALESMethod" module="Products.Formulator.TALESField"/>

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewAsODT.xml

@@ -11,13 +11,13 @@
       <dictionary>
         <item>
             <key> <string>OLE_documents_zipstring</string> </key>
-            <value> <string encoding="base64">UEsDBBQAAAAIAHGmQTg1Ytc5PgEAAEoHAAAVAAAATUVUQS1JTkYvbWFuaWZlc3QueG1stZVLasMw
+            <value> <string encoding="base64">UEsDBBQAAAAIAMp6cTg1Ytc5PgEAAEoHAAAVAAAATUVUQS1JTkYvbWFuaWZlc3QueG1stZVLasMw
 EED3PYXR3lbbVTFxAi30BOkBJvLYEeiHZhSS21cO5NM2lKZYOwmk90YjzWix2ltT7TCS9q4TT82j
 qNAp32s3duJj/V6/iNXyYWHB6QGJ29OgyvscnaedSNG1HkhT68AitaxaH9D1XiWLjtuv69vJtHyo
 LuBBG6zzwnioLjLsNdR8CNgJCMFoBZzjlDvXN0dXc61oGPcsLruHZEwdgLedkELeJbtNefNu0GOK
 xyDoWRIDJ9pALIMHpdBgnvooVYpxOmLOYnFXEcFgPDAWggcfUshPIBXCRz9GpHI3PYVeDM7em2Jw
 bWFEkq+aLQQq6riT/b1fUHJT9TRJN+pa8LcY7pRPnUhOtXoTnv38v2L+nUt8MEizYy0yzNZ41ttk
-Nw60IcmnYRPcODd83sQic/4Qz6ldyB//4fITUEsBAhQAFAAAAAgAcaZBODVi1zk+AQAASgcAABUA
+Nw60IcmnYRPcODd83sQic/4Qz6ldyB//4fITUEsBAhQAFAAAAAgAynpxODVi1zk+AQAASgcAABUA
 AAAAAAAAAAAAAAAAAAAAAE1FVEEtSU5GL21hbmlmZXN0LnhtbFBLBQYAAAAAAQABAEMAAABxAQAA
 AAA=</string> </value>
         </item>
@@ -63,11 +63,7 @@ AAA=</string> </value>
             <key> <string>_text</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-<office:document-content xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\'  xmlns:tal=\'http://xml.zope.org/namespaces/tal\'\n
-            xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\'\n
-            xmlns:metal=\'http://xml.zope.org/namespaces/metal\'\n
-            tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\'\n
-          office:version=\'1.0\'\n
+<office:document-content xmlns:office=\'urn:oasis:names:tc:opendocument:xmlns:office:1.0\' xmlns:text=\'urn:oasis:names:tc:opendocument:xmlns:text:1.0\' xmlns:number=\'urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\' xmlns:meta=\'urn:oasis:names:tc:opendocument:xmlns:meta:1.0\' xmlns:tal=\'http://xml.zope.org/namespaces/tal\' xmlns:table=\'urn:oasis:names:tc:opendocument:xmlns:table:1.0\' xmlns:style=\'urn:oasis:names:tc:opendocument:xmlns:style:1.0\' xmlns:script=\'urn:oasis:names:tc:opendocument:xmlns:script:1.0\' xmlns:xlink=\'http://www.w3.org/1999/xlink\' xmlns:math=\'http://www.w3.org/1998/Math/MathML\' xmlns:draw=\'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\' xmlns:form=\'urn:oasis:names:tc:opendocument:xmlns:form:1.0\' xmlns:ooo=\'http://openoffice.org/2004/office\' xmlns:dc=\'http://purl.org/dc/elements/1.1/\' xmlns:chart=\'urn:oasis:names:tc:opendocument:xmlns:chart:1.0\' xmlns:i18n=\'http://xml.zope.org/namespaces/i18n\' xmlns:dr3d=\'urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\' xmlns:fo=\'urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\' xmlns:xforms=\'http://www.w3.org/2002/xforms\' xmlns:dom=\'http://www.w3.org/2001/xml-events\' xmlns:ooow=\'http://openoffice.org/2004/writer\' xmlns:svg=\'urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\' xmlns:metal=\'http://xml.zope.org/namespaces/metal\' xmlns:xsd=\'http://www.w3.org/2001/XMLSchema\' xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:oooc=\'http://openoffice.org/2004/calc\' tal:attributes=\'dummy python:request.RESPONSE.setHeader("Content-Type", "text/html;; charset=utf-8")\' office:version=\'1.0\'\n
           tal:define=\'data_dict here/PurchaseOrder_getODTDataDict\'>\n
   <office:scripts/>\n
   <office:font-face-decls>\n
@@ -173,10 +169,10 @@ AAA=</string> </value>
         <style:background-image/>\n
       </style:table-cell-properties>\n
     </style:style>\n
-    <style:style style:family=\'table-row\' style:name=\'Tableau1.8\'>\n
+    <style:style style:family=\'table-row\' style:name=\'Tableau1.5\'>\n
       <style:table-row-properties style:row-height=\'4.83cm\'/>\n
     </style:style>\n
-    <style:style style:family=\'table-cell\' style:name=\'Tableau1.A8\'>\n
+    <style:style style:family=\'table-cell\' style:name=\'Tableau1.A5\'>\n
       <style:table-cell-properties style:vertical-align=\'middle\' fo:padding=\'0cm\' fo:background-color=\'transparent\' fo:border=\'none\'>\n
         <style:background-image/>\n
       </style:table-cell-properties>\n
@@ -256,6 +252,7 @@ AAA=</string> </value>
   </office:automatic-styles>\n
   <office:body>\n
     <office:text>\n
+      <office:forms form:apply-design-mode=\'false\' form:automatic-focus=\'false\'/>\n
       <text:variable-decls>\n
         <text:variable-decl text:name=\'ds_title\' office:value-type=\'string\'/>\n
         <text:variable-decl text:name=\'ds_address\' office:value-type=\'string\'/>\n
@@ -264,6 +261,8 @@ AAA=</string> </value>
         <text:variable-decl text:name=\'ds_vatid\' office:value-type=\'string\'/>\n
         <text:variable-decl text:name=\'purchase_order\' office:value-type=\'string\'/>\n
         <text:variable-decl text:name=\'purchase_order_tr\' office:value-type=\'string\'/>\n
+        <text:variable-decl text:name=\'page\' office:value-type=\'string\'/>\n
+        <text:variable-decl text:name=\'of\' office:value-type=\'string\'/>\n
       </text:variable-decls>\n
       <text:sequence-decls>\n
         <text:sequence-decl text:display-outline-level=\'0\' text:name=\'Illustration\'/>\n
@@ -300,10 +299,15 @@ AAA=</string> </value>
                         <text:variable-set text:formula=\'ooow:telfax\' text:name=\'ds_telfax\' text:display=\'none\' office:string-value=\'telfax\' office:value-type=\'string\' tal:attributes=\'office:string-value python:data_dict["destination_section_telfax"]\'/>\n
                         <text:variable-set text:formula=\'ooow:email\' text:name=\'ds_email\' text:display=\'none\' office:string-value=\'email\' office:value-type=\'string\' tal:attributes=\'office:string-value python:data_dict["destination_section_email"]\'/>\n
                         <text:variable-set text:formula=\'ooow:vatid\' text:name=\'ds_vatid\' text:display=\'none\' office:string-value=\'vatid\' office:value-type=\'string\' tal:attributes=\'office:string-value python:data_dict["destination_section_vatid"]\'/>\n
-                        <div tal:omit-tag=\'\' tal:define=\'orig_title string:Purchase Order; en_title python:here.Base_translateString(orig_title, lang="en"); my_title python:here.Base_translateString(orig_title)\'>\n
+                        <div tal:omit-tag=\'\' tal:define=\'orig_title string:Purchase Order; en_title python:here.Base_translateString(orig_title, lang="en", encoding=""); my_title python:here.Base_translateString(orig_title, encoding="");\n
+                            orig_page string:Page; en_page python:here.Base_translateString(orig_page, lang="en", encoding=""); my_page python:here.Base_translateString(orig_page, encoding="");\n
+                            orig_of string:of; en_of python:here.Base_translateString(orig_of, lang="en", encoding=""); my_of python:here.Base_translateString(orig_of, encoding="")\'>\n
                         <text:variable-set text:formula=\'ooow:purchase_order\' text:name=\'purchase_order\' text:display=\'none\' office:string-value=\'purchase_order\' office:value-type=\'string\' tal:attributes=\'office:string-value en_title\'/>\n
                         <text:variable-set text:formula=\'ooow:purchase_order_tr\' text:name=\'purchase_order_tr\' text:display=\'none\' office:string-value=\'purchase_order_tr\' office:value-type=\'string\' tal:condition=\'python:my_title!=en_title\' tal:attributes=\'office:string-value my_title\'/>\n
-                        </div><span tal:replace=\'en_string\'/>:</text:p>\n
+                        <text:variable-set text:formula=\'ooow:page\' text:name=\'page\' text:display=\'none\' office:string-value=\'page\' office:value-type=\'string\' tal:attributes=\'office:string-value my_page\'/>\n
+                        <text:variable-set text:formula=\'ooow:of\' text:name=\'of\' text:display=\'none\' office:string-value=\'of\' office:value-type=\'string\' tal:attributes=\'office:string-value my_of\'/>\n
+                        </div>\n
+                        <span tal:replace=\'en_string\'/>:</text:p>\n
                       <text:p text:style-name=\'Table_20_Heading\' tal:condition=\'python:my_string!=en_string\'><span tal:replace=\'my_string\'/>:</text:p>\n
                       </div>\n
                     </table:table-cell>\n
@@ -463,36 +467,38 @@ AAA=</string> </value>
           </table:table-row>\n
         </table:table-header-rows>\n
         <table:table-row table:style-name=\'Tableau1.3\' tal:repeat=\'line_dict python:data_dict["line_list"]\'>\n
+        <div tal:omit-tag=\'\' tal:define=\'style_name python:line_dict["style_name"]\'>\n
           <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
-            <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["index"]\'>1</text:p>\n
+            <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["index"]\' tal:attributes=\'text:style-name style_name\'>1</text:p>\n
           </table:table-cell>\n
           <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
-            <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["source_reference"]\'>source_ref</text:p>\n
+            <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["source_reference"]\' tal:attributes=\'text:style-name style_name\'>source_ref</text:p>\n
           </table:table-cell>\n
           <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
-            <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["reference"]\'>ref</text:p>\n
+            <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["reference"]\' tal:attributes=\'text:style-name style_name\'>ref</text:p>\n
           </table:table-cell>\n
           <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
-            <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["description"]\'>desc</text:p>\n
+            <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["description"]\' tal:attributes=\'text:style-name style_name\'>desc</text:p>\n
           </table:table-cell>\n
           <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
-            <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["total_quantity"]\'>qty</text:p>\n
+            <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["total_quantity"]\' tal:attributes=\'text:style-name style_name\'>qty</text:p>\n
           </table:table-cell>\n
           <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
-            <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["quantity_unit"]\'>qty_u</text:p>\n
+            <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["quantity_unit"]\' tal:attributes=\'text:style-name style_name\'>qty_u</text:p>\n
           </table:table-cell>\n
           <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
-            <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["stop_date"]\'>stop_date</text:p>\n
+            <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["stop_date"]\' tal:attributes=\'text:style-name style_name\'>stop_date</text:p>\n
           </table:table-cell>\n
           <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
-            <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["base_price"]\'>base_price</text:p>\n
+            <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["base_price"]\' tal:attributes=\'text:style-name style_name\'>base_price</text:p>\n
           </table:table-cell>\n
           <table:table-cell table:style-name=\'Tableau1.A3\' office:value-type=\'string\'>\n
-            <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["total_price"]\'>total_price</text:p>\n
+            <text:p text:style-name=\'Table_20_Contents\' tal:content=\'python:line_dict["total_price"]\' tal:attributes=\'text:style-name style_name\'>total_price</text:p>\n
           </table:table-cell>\n
+          </div>\n
         </table:table-row>\n
-        <table:table-row table:style-name=\'Tableau1.8\'>\n
-          <table:table-cell table:style-name=\'Tableau1.A8\' table:number-columns-spanned=\'9\' office:value-type=\'string\'>\n
+        <table:table-row table:style-name=\'Tableau1.5\'>\n
+          <table:table-cell table:style-name=\'Tableau1.A5\' table:number-columns-spanned=\'9\' office:value-type=\'string\'>\n
             <table:table table:style-name=\'Tableau3\' table:name=\'Tableau3\'>\n
               <table:table-column table:style-name=\'Tableau3.A\'/>\n
               <table:table-column table:style-name=\'Tableau3.B\'/>\n
@@ -629,8 +635,7 @@ AAA=</string> </value>
       <text:p text:style-name=\'P4\'/>\n
     </office:text>\n
   </office:body>\n
-</office:document-content>\n
-
+</office:document-content>
 
 ]]></string> </value>
         </item>

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewODTPrintDialog.xml

@@ -88,7 +88,9 @@
                 <item>
                     <key> <string>right</string> </key>
                     <value>
-                      <list/>
+                      <list>
+                        <string>your_format</string>
+                      </list>
                     </value>
                 </item>
               </dictionary>

bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PurchaseOrder_viewODTPrintDialog/your_format.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>delegated_list</string> </key>
+            <value>
+              <list>
+                <string>items</string>
+                <string>enabled</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>your_format</string> </value>
+        </item>
+        <item>
+            <key> <string>message_values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>external_validator_failed</string> </key>
+                    <value> <string>The input failed the external validator.</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>overrides</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>target</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>tales</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key>                 <string>enabled</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string></string> </value>
+                </item>
+                <item>
+                    <key>                 <string>items</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>target</string> </key>
+                    <value> <string></string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+        <item>
+            <key> <string>values</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>enabled</string> </key>
+                    <value> <int>1</int> </value>
+                </item>
+                <item>
+                    <key> <string>field_id</string> </key>
+                    <value> <string>your_format</string> </value>
+                </item>
+                <item>
+                    <key> <string>form_id</string> </key>
+                    <value> <string>Base_viewDialogFieldLibrary</string> </value>
+                </item>
+                <item>
+                    <key> <string>items</string> </key>
+                    <value>
+                      <list/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>target</string> </key>
+                    <value> <string>Click to edit the target</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string>python: here.Base_getConversionFormatItemList(base_content_type=\'application/vnd.oasis.opendocument.text\')</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_trade/bt/revision

-194
\ No newline at end of file
+195
\ No newline at end of file