Commit 0c1e408d authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

* delivery solver is not mandatory for target solvers.

* fix configuration_form_id of Resource Adoption Solver.
* remove needless delivery solver configuration from several target solvers.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31517 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 64d1a55f
......@@ -32,11 +32,7 @@
<item>
<key> <string>delivery_solver</string> </key>
<value>
<tuple>
<string>FIFO</string>
<string>LIFO</string>
<string>MinPrice</string>
</tuple>
<tuple/>
</value>
</item>
<item>
......@@ -65,6 +61,14 @@
<none/>
</value>
</item>
<item>
<key> <string>line_exclusive</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>line_grouping</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>permission</string> </key>
<value>
......
......@@ -21,7 +21,19 @@
</item>
<item>
<key> <string>configuration_form_id</string> </key>
<value> <string>ResourceReplacementSolver_viewConfiguration</string> </value>
<value> <string>Solver_viewConfiguration</string> </value>
</item>
<item>
<key> <string>configuration_property_list</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>delivery_solver</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>description</string> </key>
......@@ -49,6 +61,14 @@
<none/>
</value>
</item>
<item>
<key> <string>line_exclusive</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>line_grouping</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>permission</string> </key>
<value>
......
......@@ -32,11 +32,7 @@
<item>
<key> <string>delivery_solver</string> </key>
<value>
<tuple>
<string>FIFO</string>
<string>LIFO</string>
<string>MinPrice</string>
</tuple>
<tuple/>
</value>
</item>
<item>
......@@ -65,6 +61,14 @@
<none/>
</value>
</item>
<item>
<key> <string>line_exclusive</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>line_grouping</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>permission</string> </key>
<value>
......
......@@ -32,11 +32,7 @@
<item>
<key> <string>delivery_solver</string> </key>
<value>
<tuple>
<string>FIFO</string>
<string>LIFO</string>
<string>MinPrice</string>
</tuple>
<tuple/>
</value>
</item>
<item>
......@@ -65,6 +61,14 @@
<none/>
</value>
</item>
<item>
<key> <string>line_exclusive</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>line_grouping</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>permission</string> </key>
<value>
......
......@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>required</string> </key>
<value> <int>1</int> </value>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>size</string> </key>
......@@ -248,8 +248,7 @@
<key> <string>view_separator</string> </key>
<value> <string encoding="cdata"><![CDATA[
<br />\n
<br />
]]></string> </value>
</item>
......
41
\ No newline at end of file
42
\ No newline at end of file
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