Commit a9802e47 authored by Xiaowu Zhang's avatar Xiaowu Zhang Committed by Your Name

erp5_trade: can select multi resource in report

parent 6780351a
...@@ -13,7 +13,7 @@ inventory_list = getCurrentInventoryList( ...@@ -13,7 +13,7 @@ inventory_list = getCurrentInventoryList(
group_by_resource = 1, group_by_resource = 1,
group_by_variation = 1, group_by_variation = 1,
resourceType=portal.getPortalProductTypeList(), resourceType=portal.getPortalProductTypeList(),
resource_uid = context.getResourceUid(), resource_uid = context.getResourceUidList(),
at_date = at_date at_date = at_date
) )
......
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<string>my_destination_title</string> <string>my_destination_title</string>
<string>my_destination_section_title</string> <string>my_destination_section_title</string>
<string>my_valuation_method</string> <string>my_valuation_method</string>
<string>my_resource_title</string> <string>my_resource_title_list</string>
</list> </list>
</value> </value>
</item> </item>
......
...@@ -10,13 +10,17 @@ ...@@ -10,13 +10,17 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>enabled</string> <string>allow_creation</string>
<string>height</string>
<string>portal_type</string>
<string>title</string>
<string>view_separator</string>
</list> </list>
</value> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>my_resource_title</string> </value> <value> <string>my_resource_title_list</string> </value>
</item> </item>
<item> <item>
<key> <string>message_values</string> </key> <key> <string>message_values</string> </key>
...@@ -41,10 +45,6 @@ ...@@ -41,10 +45,6 @@
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -61,7 +61,21 @@ ...@@ -61,7 +61,21 @@
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item> <item>
<key> <string>target</string> </key> <key> <string>height</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>view_separator</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -72,20 +86,43 @@ ...@@ -72,20 +86,43 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>allow_creation</string> </key>
<value> <int>1</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>field_id</string> </key> <key> <string>field_id</string> </key>
<value> <string>my_view_mode_resource_title</string> </value> <value> <string>my_view_mode_source_trade_title_list</string> </value>
</item> </item>
<item> <item>
<key> <string>form_id</string> </key> <key> <string>form_id</string> </key>
<value> <string>Base_viewTradeFieldLibrary</string> </value> <value> <string>Base_viewTradeFieldLibrary</string> </value>
</item> </item>
<item> <item>
<key> <string>target</string> </key> <key> <string>height</string> </key>
<value> <string>Click to edit the target</string> </value> <value> <int>5</int> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value>
<list>
<tuple>
<string>Resource</string>
<string>Resource</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Product or Service</string> </value>
</item>
<item>
<key> <string>view_separator</string> </key>
<value> <string encoding="cdata"><![CDATA[
<br />
]]></string> </value>
</item> </item>
</dictionary> </dictionary>
</value> </value>
...@@ -93,4 +130,17 @@ ...@@ -93,4 +130,17 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: [(x, x) for x in (list(here.getPortalProductTypeList()) + list(here.getPortalServiceTypeList()))]</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment